# HG changeset patch
# User unc0rr
# Date 1137369407 0
# Node ID ae2950c5465cee0db8ac61f8edf33a5188e2ee4c
# Parent b6e3ae05857fc0a55993106c725fbad35b1cfc17
- Rename frontend to hedgewars and compile it to engine directory
- Added icon for windows
- Added incomplete russian translation
diff -r b6e3ae05857f -r ae2950c5465c QTfrontend/QTfrontend.pro
--- a/QTfrontend/QTfrontend.pro Sun Jan 15 23:32:58 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-######################################################################
-# Automatically generated by qmake (2.00a) ?? 5. ??? 13:58:32 2005
-######################################################################
-
-TEMPLATE = app
-TARGET +=
-DEPENDPATH += .
-INCLUDEPATH += .
-
-QT += network
-
-# Input
-HEADERS += binds.h game.h hwform.h sdlkeys.h team.h rndstr.h sha1.h gamecmds.h netclient.h
-HEADERS += teamselect.h teamselhelper.h
-FORMS += hwform.ui
-SOURCES += game.cpp main.cpp hwform.cpp team.cpp rndstr.cpp sha1.cpp gamecmds.cpp netclient.cpp
-SOURCES += teamselect.cpp teamselhelper.cpp
diff -r b6e3ae05857f -r ae2950c5465c QTfrontend/game.cpp
--- a/QTfrontend/game.cpp Sun Jan 15 23:32:58 2006 +0000
+++ b/QTfrontend/game.cpp Sun Jan 15 23:56:47 2006 +0000
@@ -230,7 +230,7 @@
arguments << "46631";
arguments << seed;
arguments << (vid_Fullscreen ? "1" : "0");
- process->start("./hw", arguments);
+ process->start("./hwengine", arguments);
}
void HWGame::AddTeam(const QString & teamname)
diff -r b6e3ae05857f -r ae2950c5465c QTfrontend/gamecmds.cpp
--- a/QTfrontend/gamecmds.cpp Sun Jan 15 23:32:58 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-/*
- * Hedgewars, a worms-like game
- * Copyright (c) 2005 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * Distributed under the terms of the BSD-modified licence:
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * with the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
- * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "gamecmds.h"
-
-GameCMDs::GameCMDs(QWidget * parent)
- : QWidget(parent)
-{
-
-}
diff -r b6e3ae05857f -r ae2950c5465c QTfrontend/gamecmds.h
--- a/QTfrontend/gamecmds.h Sun Jan 15 23:32:58 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-/*
- * Hedgewars, a worms-like game
- * Copyright (c) 2005 Andrey Korotaev <unC0Rr@gmail.com>
- *
- * Distributed under the terms of the BSD-modified licence:
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * with the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
- * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef GAMECMDS_H
-#define GAMECMDS_H
-
-#include <QWidget>
-
-class GameCMDs : public QWidget
-{
- Q_OBJECT
-
-public:
- GameCMDs(QWidget * parent = 0);
-
-private:
-
-
-};
-
-#endif
diff -r b6e3ae05857f -r ae2950c5465c QTfrontend/hedgewars.pro
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/hedgewars.pro Sun Jan 15 23:56:47 2006 +0000
@@ -0,0 +1,38 @@
+TEMPLATE = app
+TARGET = hedgewars
+DEPENDPATH += .
+INCLUDEPATH += .
+DESTDIR = ../hedgewars
+
+win32 {
+ RC_FILE = ./res/hedgewars.rc
+}
+
+QT += network
+
+HEADERS += binds.h \
+ game.h \
+ hwform.h \
+ sdlkeys.h \
+ team.h \
+ rndstr.h \
+ sha1.h \
+ netclient.h \
+ teamselect.h \
+ teamselhelper.h
+
+FORMS += hwform.ui
+
+SOURCES += game.cpp \
+ main.cpp \
+ hwform.cpp \
+ team.cpp \
+ rndstr.cpp \
+ sha1.cpp \
+ netclient.cpp \
+ teamselect.cpp \
+ teamselhelper.cpp
+
+TRANSLATIONS += translations/hedgewars_ru.ts
+
+RESOURCES += hedgewars.qrc
\ No newline at end of file
diff -r b6e3ae05857f -r ae2950c5465c QTfrontend/hedgewars.qrc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/hedgewars.qrc Sun Jan 15 23:56:47 2006 +0000
@@ -0,0 +1,5 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+ <file>translations/hedgewars_ru.qm</file>
+</qresource>
+</RCC>
diff -r b6e3ae05857f -r ae2950c5465c QTfrontend/hwform.cpp
--- a/QTfrontend/hwform.cpp Sun Jan 15 23:32:58 2006 +0000
+++ b/QTfrontend/hwform.cpp Sun Jan 15 23:56:47 2006 +0000
@@ -44,7 +44,6 @@
#include "hwform.h"
#include "sdlkeys.h"
#include "hwconsts.h"
-//#include "gamecmds.h"
#include "teamselect.h"
HWForm::HWForm(QWidget *parent)
diff -r b6e3ae05857f -r ae2950c5465c QTfrontend/main.cpp
--- a/QTfrontend/main.cpp Sun Jan 15 23:32:58 2006 +0000
+++ b/QTfrontend/main.cpp Sun Jan 15 23:56:47 2006 +0000
@@ -32,11 +32,20 @@
*/
#include <QApplication>
+#include <QTranslator>
+#include <QLocale>
#include "hwform.h"
int main(int argc, char *argv[])
{
QApplication app(argc, argv);
+
+ Q_INIT_RESOURCE(hedgewars);
+
+ QTranslator Translator;
+ Translator.load(":/translations/hedgewars_" + QLocale::system().name());
+ app.installTranslator(&Translator);
+
HWForm *Form = new HWForm;
Form->show();
return app.exec();
diff -r b6e3ae05857f -r ae2950c5465c QTfrontend/res/hedgewars.ico
Binary file QTfrontend/res/hedgewars.ico has changed
diff -r b6e3ae05857f -r ae2950c5465c QTfrontend/res/hedgewars.rc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/res/hedgewars.rc Sun Jan 15 23:56:47 2006 +0000
@@ -0,0 +1,2 @@
+IDI_ICON1 ICON DISCARDABLE "hedgewars.ico"
+
diff -r b6e3ae05857f -r ae2950c5465c QTfrontend/translations/hedgewars_ru.qm
Binary file QTfrontend/translations/hedgewars_ru.qm has changed
diff -r b6e3ae05857f -r ae2950c5465c QTfrontend/translations/hedgewars_ru.ts
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/translations/hedgewars_ru.ts Sun Jan 15 23:56:47 2006 +0000
@@ -0,0 +1,318 @@
+<!DOCTYPE TS><TS>
+<context>
+ <name>@default</name>
+ <message>
+ <source>up</source>
+ <translation>вверх</translation>
+ </message>
+ <message>
+ <source>left</source>
+ <translation>влево</translation>
+ </message>
+ <message>
+ <source>right</source>
+ <translation>вправо</translation>
+ </message>
+ <message>
+ <source>down</source>
+ <translation>вниз</translation>
+ </message>
+ <message>
+ <source>jump</source>
+ <translation>прыжок</translation>
+ </message>
+ <message>
+ <source>attack</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>put</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>switch</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>slot 1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>slot 2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>slot 3</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>slot 4</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>slot 5</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>slot 6</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>slot 7</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>slot 8</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>timer 1 sec</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>timer 2 sec</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>timer 3 sec</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>timer 4 sec</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>timer 5 sec</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>capture</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>quit</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>HWForm</name>
+ <message>
+ <source>-= by unC0Rr =-</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Simple Game</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Back</source>
+ <translation>Назад</translation>
+ </message>
+ <message>
+ <source>Team Members</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Team</source>
+ <translation>Команда</translation>
+ </message>
+ <message>
+ <source>Fort</source>
+ <translation>Форт</translation>
+ </message>
+ <message>
+ <source>Grave</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Key binds</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Actions</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Weapons</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Weapon properties</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Other</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Discard</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Save</source>
+ <translation>Сохранить</translation>
+ </message>
+ <message>
+ <source>Teams</source>
+ <translation>Команды</translation>
+ </message>
+ <message>
+ <source>New team</source>
+ <translation>Создать команду</translation>
+ </message>
+ <message>
+ <source>Edit team</source>
+ <translation>Редактировать команду</translation>
+ </message>
+ <message>
+ <source>640x480</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>800x600</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>1024x768</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>1280x1024</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Enable sound</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Fullscreen</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Net nick</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>unnamed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Play demo</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Connect</source>
+ <translation>Соединить</translation>
+ </message>
+ <message>
+ <source>Disconnect</source>
+ <translation>Разъединить</translation>
+ </message>
+ <message>
+ <source>Join</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Create</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Add Team</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Go!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Single Player</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Multiplayer</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Setup</source>
+ <translation>Настройки</translation>
+ </message>
+ <message>
+ <source>Exit</source>
+ <translation>Выход</translation>
+ </message>
+ <message>
+ <source>Demos</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Net game</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Cannot create directory %1</source>
+ <translation>Не могу создать папку %1</translation>
+ </message>
+ <message>
+ <source>Quit</source>
+ <translation>Выход</translation>
+ </message>
+ <message>
+ <source>Cannot save options to file %1</source>
+ <translation>Не могу сохранить настройки в файл %1</translation>
+ </message>
+ <message>
+ <source>Please, select demo from the list above</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>OK</source>
+ <translation type="unfinished">OK</translation>
+ </message>
+</context>
+<context>
+ <name>HWGame</name>
+ <message>
+ <source>Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Unable to start the server: %1.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Cannot save demo to file %s</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Quit</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Cannot open demofile %s</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Corrupted demo file %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>HWNet</name>
+ <message>
+ <source>Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>The host was not found. Please check the host name and port settings.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Connection refused</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+</TS>