diff --git a/Makefile b/Makefile
index 3328faa..3cfe85b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
#############################################################################
# Makefile for building: viergewinnt-qt
-# Generated by qmake (2.01a) (Qt 4.4.3) on: Sa Nov 1 16:10:13 2008
+# Generated by qmake (2.01a) (Qt 4.4.3) on: Di Jan 20 23:09:39 2009
# Project: viergewinnt-qt.pro
# Template: app
# Command: /usr/bin/qmake -unix -o Makefile viergewinnt-qt.pro
@@ -173,7 +173,7 @@ qmake: FORCE
dist:
@$(CHK_DIR_EXISTS) .tmp/viergewinnt-qt1.0.0 || $(MKDIR) .tmp/viergewinnt-qt1.0.0
- $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/viergewinnt-qt1.0.0/ && $(COPY_FILE) --parents about.h creategame.h findserver.h newgame.h playerwait.h renderarea.h selectmaster.h viergewinnt.h .tmp/viergewinnt-qt1.0.0/ && $(COPY_FILE) --parents about.cpp creategame.cpp findserver.cpp main.cpp newgame.cpp playerwait.cpp renderarea.cpp selectmaster.cpp viergewinnt.cpp .tmp/viergewinnt-qt1.0.0/ && $(COPY_FILE) --parents viergewinnt-qt_en.ts .tmp/viergewinnt-qt1.0.0/ && (cd `dirname .tmp/viergewinnt-qt1.0.0` && $(TAR) viergewinnt-qt1.0.0.tar viergewinnt-qt1.0.0 && $(COMPRESS) viergewinnt-qt1.0.0.tar) && $(MOVE) `dirname .tmp/viergewinnt-qt1.0.0`/viergewinnt-qt1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/viergewinnt-qt1.0.0
+ $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/viergewinnt-qt1.0.0/ && $(COPY_FILE) --parents about.h creategame.h findserver.h newgame.h playerwait.h renderarea.h selectmaster.h viergewinnt.h .tmp/viergewinnt-qt1.0.0/ && $(COPY_FILE) --parents about.cpp creategame.cpp findserver.cpp main.cpp newgame.cpp playerwait.cpp renderarea.cpp selectmaster.cpp viergewinnt.cpp .tmp/viergewinnt-qt1.0.0/ && $(COPY_FILE) --parents trans/viergewinnt-qt_en.ts .tmp/viergewinnt-qt1.0.0/ && (cd `dirname .tmp/viergewinnt-qt1.0.0` && $(TAR) viergewinnt-qt1.0.0.tar viergewinnt-qt1.0.0 && $(COMPRESS) viergewinnt-qt1.0.0.tar) && $(MOVE) `dirname .tmp/viergewinnt-qt1.0.0`/viergewinnt-qt1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/viergewinnt-qt1.0.0
clean:compiler_clean
diff --git a/about.cpp b/about.cpp
index c4dda5b..abb93ac 100644
--- a/about.cpp
+++ b/about.cpp
@@ -28,7 +28,7 @@ AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent) {
ok = new QPushButton(tr("Ok"));
connect(ok, SIGNAL(clicked()), this, SLOT(accept()));
- head = new QLabel(tr("Netzwerk-VierGewinnt Client\nProgrammiert von seba\nwww.seba-geek.de"));
+ head = new QLabel(tr("Netzwerk-VierGewinnt Client V0.8\nProgrammiert von seba\nwww.seba-geek.de"));
head->setAlignment(Qt::AlignHCenter);
body = new QLabel(tr("Erstes QT-Programm!\nDies ist ein Client für das VierGewinnt-Modul vom \"Generic Network-Server\". Endlich eine Verbesserung zum SDL-Client..."));
body->setWordWrap(true);
diff --git a/trans/viergewinnt-qt_en.ts b/trans/viergewinnt-qt_en.ts
index 1914c7b..5be0c36 100644
--- a/trans/viergewinnt-qt_en.ts
+++ b/trans/viergewinnt-qt_en.ts
@@ -4,12 +4,12 @@
AboutDialog
-
+ About
-
+ Ok
@@ -18,42 +18,51 @@
- Network-VierGewinnt Client
+ Network-VierGewinnt Client
Programmed by seba
www.seba-geek.de
-
+ First QT-Programm!
This is a client for the VierGewinnt-Module from the "Generic Network-Server". At last an improvement to the SDL-Client...
+
+
+
+ Network-VierGewinnt Client V0.8
+Programmed by seba
+www.seba-geek.de
+ CreateGameDialog
-
+ New Game
-
+ Gamename
-
+ Ok
-
+ Cancel
-
+ Unknown Game
@@ -61,147 +70,147 @@ This is a client for the VierGewinnt-Module from the "Generic Network-Serve
FindServerWidget
-
+ Sebas Network-VierGewinnt Client
-
+ Serverlist
-
+ Id
-
+ Gamename
-
+ Players
-
+ Field
-
+ Wins
-
+ Refresh
-
+ Create
-
+ Join
-
+ Change masterserver
-
+ About
-
+ Press Refresh to get the serverlist
-
+ Requesting list...
-
+ Game created
-
+ No Game was selected
-
+ Joining game..
-
+ Version accepted
-
+ Version rejected, not a GNS-Server!
-
+ Module selected
-
+ VierGewinnt-Module not found!
-
+ No games open :(
-
+ Could not join: Game full
-
+ Could not find game
-
+ Error: The masterserver hostname could not be resolved!
-
+ Error: Could not connect to masterserver!
-
+ Networkerror: '%1'
-
+ Disconnected from masterserver.
-
+ Trying to connect to
@@ -209,42 +218,42 @@ This is a client for the VierGewinnt-Module from the "Generic Network-Serve
NewGameDialog
-
+ A new game?
-
+ Ok
-
+ Cancel
-
+ New game?
-
+ Your opponent did not agree to a new game right now.
-
+ Whee, you won! :)
-
+ You have lost -.-
-
+ Your opponent agreed.
@@ -252,17 +261,17 @@ This is a client for the VierGewinnt-Module from the "Generic Network-Serve
PlayerWaitDialog
-
+ Cancel
-
+ Waiting for other player...
-
+ Waiting for other player
@@ -270,32 +279,32 @@ This is a client for the VierGewinnt-Module from the "Generic Network-Serve
SelectMasterDialog
-
+ Please enter another masterserver
-
+ Masterserver:
-
+ Masterport:
-
+ Change masterserver
-
+ The masterserver is invalid
-
+ The masterport is invalid
@@ -303,37 +312,37 @@ This is a client for the VierGewinnt-Module from the "Generic Network-Serve
VierGewinntWidget
-
+ Sebas Network-VierGewinnt Client
-
+ Gamewindow
-
+ The game has been started
-
+ to
-
+ Quit game
-
+ It's your move
-
+ It's your opponents move
diff --git a/viergewinnt-qt.pro b/viergewinnt-qt.pro
index adef0a1..f34a27f 100644
--- a/viergewinnt-qt.pro
+++ b/viergewinnt-qt.pro
@@ -11,7 +11,7 @@ QT += network
CONFIG += qt warn_on release
# Input
-TRANSLATIONS = viergewinnt-qt_en.ts
+TRANSLATIONS = trans/viergewinnt-qt_en.ts
CODECFORTR = ISO-8859-15
HEADERS += about.h \
diff --git a/viergewinnt.cpp b/viergewinnt.cpp
index 5bb2193..fe747db 100644
--- a/viergewinnt.cpp
+++ b/viergewinnt.cpp
@@ -94,7 +94,7 @@ void VierGewinntWidget::startGame() {
cleanFeld();
QTextStream sockstream(mysock);
sockstream << "TURN\n";
- sockstream << "SHOWSCORE\n";
+ sockstream << "SHOWMYSCORE\n";
}
void VierGewinntWidget::add(int row, Stein st) {