libircclient compiles on linux; german translation update; tabfixes for windows

This commit is contained in:
doitux
2007-09-07 18:00:52 +00:00
parent 75c02ec8c0
commit 94c8bb14ec
6 changed files with 149 additions and 64 deletions
Binary file not shown.
+2
View File
@@ -70,6 +70,7 @@ HEADERS += \
src/core/tinyxml/tinystr.h \
src/core/tinyxml/tinyxml.h \
src/core/libircclient/include/libircclient.h \
src/core/libircclient/include/config.h \
src/engine/local_engine/cardsvalue.h \
src/engine/local_engine/localboard.h \
src/engine/local_engine/localenginefactory.h \
@@ -108,6 +109,7 @@ SOURCES += \
src/core/tinyxml/tinyxml.cpp \
src/core/tinyxml/tinyxmlerror.cpp \
src/core/tinyxml/tinyxmlparser.cpp \
src/core/libircclient/src/libircclient.c \
src/engine/local_engine/cardsvalue.cpp \
src/engine/local_engine/localboard.cpp \
src/engine/local_engine/localenginefactory.cpp \
+104
View File
@@ -0,0 +1,104 @@
/* include/config.h. Generated by configure. */
/* include/config.h.in. Generated from configure.in by autoheader. */
/* Define to 1 if you have the `gethostbyname_r' function. */
#define HAVE_GETHOSTBYNAME_R 1
/* Define to 1 if you have the `inet_ntoa' function. */
#define HAVE_INET_NTOA 1
/* Define to 1 if you have the <inttypes.h> header file. */
#define HAVE_INTTYPES_H 1
/* Define to 1 if you have the `localtime_r' function. */
#define HAVE_LOCALTIME_R 1
/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
to 0 otherwise. */
#define HAVE_MALLOC 1
/* Define to 1 if you have the <memory.h> header file. */
#define HAVE_MEMORY_H 1
/* Define to 1 if you have the `socket' function. */
#define HAVE_SOCKET 1
/* Define to 1 if `stat' has the bug that it succeeds when given the
zero-length file name argument. */
/* #undef HAVE_STAT_EMPTY_STRING_BUG */
/* Define to 1 if stdbool.h conforms to C99. */
#define HAVE_STDBOOL_H 1
/* Define to 1 if you have the <stdint.h> header file. */
#define HAVE_STDINT_H 1
/* Define to 1 if you have the <stdlib.h> header file. */
#define HAVE_STDLIB_H 1
/* Define to 1 if you have the <strings.h> header file. */
#define HAVE_STRINGS_H 1
/* Define to 1 if you have the <string.h> header file. */
#define HAVE_STRING_H 1
/* Define to 1 if you have the <sys/select.h> header file. */
#define HAVE_SYS_SELECT_H 1
/* Define to 1 if you have the <sys/socket.h> header file. */
#define HAVE_SYS_SOCKET_H 1
/* Define to 1 if you have the <sys/stat.h> header file. */
#define HAVE_SYS_STAT_H 1
/* Define to 1 if you have the <sys/types.h> header file. */
#define HAVE_SYS_TYPES_H 1
/* Define to 1 if you have the <unistd.h> header file. */
#define HAVE_UNISTD_H 1
/* Define to 1 if the system has the type `_Bool'. */
#define HAVE__BOOL 1
/* Define to 1 if `lstat' dereferences a symlink specified with a trailing
slash. */
#define LSTAT_FOLLOWS_SLASHED_SYMLINK 1
/* Define to the address where bug reports for this package should be sent. */
#define PACKAGE_BUGREPORT "tim@krasnogorsk.ru"
/* Define to the full name of this package. */
#define PACKAGE_NAME "libircclient"
/* Define to the full name and version of this package. */
#define PACKAGE_STRING "libircclient 1.2"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "libircclient"
/* Define to the version of this package. */
#define PACKAGE_VERSION "1.2"
/* Define to the type of arg 1 for `select'. */
#define SELECT_TYPE_ARG1 int
/* Define to the type of args 2, 3 and 4 for `select'. */
#define SELECT_TYPE_ARG234 (fd_set *)
/* Define to the type of arg 5 for `select'. */
#define SELECT_TYPE_ARG5 (struct timeval *)
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
#define TIME_WITH_SYS_TIME 1
/* Define to empty if `const' does not conform to ANSI C. */
/* #undef const */
/* Define to rpl_malloc if the replacement function should be used. */
/* #undef malloc */
/* Define to `unsigned' if <sys/types.h> does not define. */
/* #undef size_t */
+4 -1
View File
@@ -27,12 +27,15 @@ MyLeftTabWidget::MyLeftTabWidget(QGroupBox *parent)
#ifdef _WIN32
QString font1String("font-family: \"Arial\";");
int padding = 4;
#else
QString font1String("font-family: \"Nimbus Sans L\";");
int padding = 0;
#endif
QTabBar *myTabBar = this->tabBar();
myTabBar->setStyleSheet("QTabBar::tab{ "+ font1String +" font-size: 11px; color: white; background-color: #145300; border: 2px solid #286400; border-bottom-color: #145300; border-top-left-radius: 4px; border-top-right-radius: 4px; min-width: 8ex; padding: 0px;} QTabBar::tab:selected, QTabBar::tab:hover { background-color: #145300; } QTabBar::tab:selected { border-color: #286400; border-bottom-color: #145300; } QTabBar::tab:!selected { margin-top: 2px; } QTabBar::tab:selected { margin-left: -4px; margin-right: -4px; } QTabBar::tab:first:selected { margin-left: 0; } QTabBar::tab:last:selected { margin-right: 0; } QTabBar::tab:only-one { margin: 0; }");
myTabBar->setStyleSheet("QTabBar::tab{ "+ font1String +" font-size: 11px; color: white; background-color: #145300; border: 2px solid #286400; border-bottom-color: #286400; border-top-left-radius: 4px; border-top-right-radius: 4px; min-width: 8ex; padding: "+QString::number(padding,10)+"px;} QTabBar::tab:selected, QTabBar::tab:hover { background-color: #145300; } QTabBar::tab:selected { border-color: #286400; border-bottom-color: #145300; } QTabBar::tab:!selected { margin-top: 2px; } QTabBar::tab:selected { margin-left: -4px; margin-right: -4px; } QTabBar::tab:first:selected { margin-left: 0; } QTabBar::tab:last:selected { margin-right: 0; } QTabBar::tab:only-one { margin: 0; } QTabBar::tab:disabled { font-size: 11px; font-weight: 900; color: #144D03; background-color: #144D03; border-left-color: #255704; border-right-color: #255704; border-top-color: #255704; }");
}
+4 -1
View File
@@ -27,12 +27,15 @@ MyRightTabWidget::MyRightTabWidget(QGroupBox *parent)
#ifdef _WIN32
QString font1String("font-family: \"Arial\";");
int padding = 4;
#else
QString font1String("font-family: \"Nimbus Sans L\";");
int padding = 0;
#endif
QTabBar *myTabBar = this->tabBar();
myTabBar->setStyleSheet("QTabBar::tab{ "+ font1String +" font-size: 11px; color: white; background-color: #145300; border: 2px solid #286400; border-bottom-color: #145300; border-top-left-radius: 4px; border-top-right-radius: 4px; min-width: 8ex; padding: 0px;} QTabBar::tab:selected, QTabBar::tab:hover { background-color: #145300; } QTabBar::tab:selected { border-color: #286400; border-bottom-color: #145300; } QTabBar::tab:!selected { margin-top: 2px; } QTabBar::tab:selected { margin-left: -4px; margin-right: -4px; } QTabBar::tab:first:selected { margin-left: 0; } QTabBar::tab:last:selected { margin-right: 0; } QTabBar::tab:only-one { margin: 0; }");
myTabBar->setStyleSheet("QTabBar::tab{ "+ font1String +" font-size: 11px; color: white; background-color: #145300; border: 2px solid #286400; border-bottom-color: #286400; border-top-left-radius: 4px; border-top-right-radius: 4px; min-width: 8ex; padding: "+QString::number(padding,10)+"px;} QTabBar::tab:selected, QTabBar::tab:hover { background-color: #145300; } QTabBar::tab:selected { border-color: #286400; border-bottom-color: #145300; } QTabBar::tab:!selected { margin-top: 2px; } QTabBar::tab:selected { margin-left: -4px; margin-right: -4px; } QTabBar::tab:first:selected { margin-left: 0; } QTabBar::tab:last:selected { margin-right: 0; } QTabBar::tab:only-one { margin: 0; } QTabBar::tab:disabled { font-size: 11px; font-weight: 900; color: #144D03; background-color: #144D03; border-left-color: #255704; border-right-color: #255704; border-top-color: #255704; }");
}
+35 -62
View File
@@ -191,22 +191,22 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../src/gui/qt/connecttoserverdialog/connecttoserverdialogimpl.cpp" line="43"/>
<source>Resolving address...</source>
<translation type="unfinished"></translation>
<translation>Adresse auflösen...</translation>
</message>
<message>
<location filename="../src/gui/qt/connecttoserverdialog/connecttoserverdialogimpl.cpp" line="45"/>
<source>Connecting to server...</source>
<translation type="unfinished"></translation>
<translation>Mit Server verbinden...</translation>
</message>
<message>
<location filename="../src/gui/qt/connecttoserverdialog/connecttoserverdialogimpl.cpp" line="47"/>
<source>Starting session...</source>
<translation type="unfinished"></translation>
<translation>Starte Session...</translation>
</message>
<message>
<location filename="../src/gui/qt/connecttoserverdialog/connecttoserverdialogimpl.cpp" line="49"/>
<source>Connection established!</source>
<translation type="unfinished"></translation>
<translation>Verbindung aufgebaut!</translation>
</message>
</context>
<context>
@@ -221,11 +221,6 @@ p, li { white-space: pre-wrap; }
<source>Game Speed for computer opponents:</source>
<translation>Spielgeschwindigkeit für Computergegner:</translation>
</message>
<message>
<location filename="../../../../src/gui/qt/createinternetgamedialog.ui" line="54"/>
<source>Hands before raise small blind:</source>
<translation type="obsolete">Runden vor der Erhöhung des Small Blind:</translation>
</message>
<message>
<location filename="../src/gui/qt/createinternetgamedialog.ui" line="85"/>
<source>Timeout for player action (sec):</source>
@@ -259,12 +254,12 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../src/gui/qt/createinternetgamedialog.ui" line="78"/>
<source>Hands before raise blinds:</source>
<translation type="unfinished"></translation>
<translation>Runden vor Erhöhung der Blinds:</translation>
</message>
<message>
<location filename="../src/gui/qt/createinternetgamedialog.ui" line="145"/>
<source>Small Blind:</source>
<translation type="unfinished">Small Blind:</translation>
<translation>Small Blind:</translation>
</message>
</context>
<context>
@@ -299,11 +294,6 @@ p, li { white-space: pre-wrap; }
<source>Cancel</source>
<translation>Abbrechen</translation>
</message>
<message>
<location filename="../../../../src/gui/qt/createnetworkgamedialog.ui" line="130"/>
<source>Hands before raise small blind:</source>
<translation type="obsolete">Runden vor der Erhöhung des Small Blind:</translation>
</message>
<message>
<location filename="../src/gui/qt/createnetworkgamedialog.ui" line="85"/>
<source>Timeout for player action (sec):</source>
@@ -322,7 +312,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../src/gui/qt/createnetworkgamedialog.ui" line="78"/>
<source>Hands before raise blinds:</source>
<translation type="unfinished"></translation>
<translation>Runden vor Erhöhung der Blinds:</translation>
</message>
</context>
<context>
@@ -402,30 +392,25 @@ p, li { white-space: pre-wrap; }
<source>Kick</source>
<translation>Entfernen</translation>
</message>
<message>
<location filename="../../../../src/gui/qt/gamelobbydialog.ui" line="301"/>
<source>Leave</source>
<translation type="obsolete">Verlassen</translation>
</message>
<message>
<location filename="../src/gui/qt/gamelobbydialog.ui" line="57"/>
<source>Lobby-Chat</source>
<translation type="unfinished"></translation>
<translation>Lobby-Chat</translation>
</message>
<message>
<location filename="../src/gui/qt/gamelobbydialog.ui" line="297"/>
<source>Hands before raise blinds:</source>
<translation type="unfinished"></translation>
<translation>Runden vor Erhöhung der Blinds:</translation>
</message>
<message>
<location filename="../src/gui/qt/gamelobbydialog.ui" line="318"/>
<source>Small Blind:</source>
<translation type="unfinished">Small Blind:</translation>
<translation>Small Blind:</translation>
</message>
<message>
<location filename="../src/gui/qt/gamelobbydialog.ui" line="384"/>
<source>Leave Game</source>
<translation type="unfinished"></translation>
<translation>Spiel verlassen</translation>
</message>
</context>
<context>
@@ -433,22 +418,22 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp" line="69"/>
<source>game</source>
<translation type="unfinished"></translation>
<translation>Spiel</translation>
</message>
<message>
<location filename="../src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp" line="94"/>
<source>Join a private Game</source>
<translation type="unfinished"></translation>
<source>Joining a private Game</source>
<translation>Einem Privatspiel beitreten</translation>
</message>
<message>
<location filename="../src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp" line="95"/>
<source>You like to join a private game. Please enter the password!</source>
<translation type="unfinished"></translation>
<source>You are about to join a private game. Please enter the password!</source>
<translation>Dies ist ein Privatspiel. Bitte Kennwort eingeben!</translation>
</message>
<message>
<location filename="../src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp" line="230"/>
<source>Game Info</source>
<translation type="unfinished">Spieldaten</translation>
<translation>Spieldaten</translation>
</message>
<message>
<location filename="../src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp" line="369"/>
@@ -458,7 +443,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp" line="370"/>
<source>You should not kick yourself from this game!</source>
<translation type="unfinished">Sie sollten sich nicht selbst des Spieles verweisen ;)!</translation>
<translation>Sie sollten sich nicht selbst des Spieles verweisen ;)!</translation>
</message>
</context>
<context>
@@ -806,7 +791,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../src/gui/qt/mainwindow.ui" line="2755"/>
<source>Ctrl+I</source>
<translation type="unfinished"></translation>
<translation>Ctrl+I</translation>
</message>
</context>
<context>
@@ -1064,15 +1049,10 @@ Wenn der Server hinter einem NAT-Router betrieben wird, stellen Sie sicher, dass
<source>Number of players:</source>
<translation>Anzahl der Spieler:</translation>
</message>
<message>
<location filename="../../../../src/gui/qt/newgamedialog.ui" line="127"/>
<source>Hands before raise small blind:</source>
<translation type="obsolete">Runden vor der Erhöhung des Small Blind:</translation>
</message>
<message>
<location filename="../src/gui/qt/newgamedialog.ui" line="151"/>
<source>Hands before raise blinds:</source>
<translation type="unfinished"></translation>
<translation>Runden vor Erhöhung der Blinds:</translation>
</message>
</context>
<context>
@@ -1169,9 +1149,9 @@ p, li { white-space: pre-wrap; }
<translation>Engine Version:</translation>
</message>
<message>
<location filename="../../../../src/gui/qt/settingsdialog.ui" line="475"/>
<source>Server Settings</source>
<translation type="obsolete">Servereinstellungen</translation>
<location filename="../../../../src/gui/qt/settingsdialog.ui" line="584"/>
<source>Network Server Settings</source>
<translation>Servereinstellungen</translation>
</message>
<message>
<location filename="../src/gui/qt/settingsdialog.ui" line="1086"/>
@@ -1188,11 +1168,6 @@ p, li { white-space: pre-wrap; }
<source>Server Password:</source>
<translation>Server Passwort:</translation>
</message>
<message>
<location filename="../../../../src/gui/qt/settingsdialog.ui" line="574"/>
<source>Network Game Default Settings</source>
<translation type="obsolete">Einstellungen für Netzwerkspiel</translation>
</message>
<message>
<location filename="../src/gui/qt/settingsdialog.ui" line="1198"/>
<source>Computer Engine</source>
@@ -1308,11 +1283,6 @@ p, li { white-space: pre-wrap; }
<source>Show game settings dialog on every new game</source>
<translation>Zeige den Dialog Spieleinstellungen bei jedem neuen Spiel</translation>
</message>
<message>
<location filename="../../../../src/gui/qt/settingsdialog.ui" line="689"/>
<source>Hands before raise small blind:</source>
<translation type="obsolete">Runden vor der Erhöhung des Small Blind:</translation>
</message>
<message>
<location filename="../src/gui/qt/settingsdialog.ui" line="451"/>
<source>Number of players:</source>
@@ -1392,7 +1362,7 @@ p, li { white-space: pre-wrap; }
<translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Nimbus Sans L&apos;; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Hinweis: Die beste Avatar-Qualität erhalten Sie folgenden Seitenverhältnissen: &lt;/span&gt;&lt;span style=&quot; font-weight:600; font-style:italic;&quot;&gt;Breite = 50, Höhe = 50.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Hinweis: Die beste Avatar-Qualität erhalten Sie mit folgenden Seitenverhältnissen: &lt;/span&gt;&lt;span style=&quot; font-weight:600; font-style:italic;&quot;&gt;Breite = 50, Höhe = 50.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<location filename="../src/gui/qt/settingsdialog.ui" line="19"/>
@@ -1452,7 +1422,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../src/gui/qt/settingsdialog.ui" line="819"/>
<source>Hands before raise blinds:</source>
<translation type="unfinished"></translation>
<translation>Runden vor Erhöhung der Blinds:</translation>
</message>
<message>
<location filename="../src/gui/qt/settingsdialog.ui" line="584"/>
@@ -1465,27 +1435,30 @@ p, li { white-space: pre-wrap; }
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Nimbus Sans L&apos;; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Note: Default &lt;/span&gt;&lt;span style=&quot; font-weight:600; font-style:italic;&quot;&gt;Game Settings&lt;/span&gt;&lt;span style=&quot; font-style:italic;&quot;&gt; like &quot;&lt;/span&gt;Maximum number of players&quot;, &quot;&lt;span style=&quot; font-style:italic;&quot;&gt;Start Cash&quot; and &quot;Small Blind&quot; will be used &lt;/span&gt;&lt;span style=&quot; font-weight:600; font-style:italic;&quot;&gt;from Network Game Settings.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
<translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Nimbus Sans L&apos;; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Hinweis: Standard-&lt;/span&gt;&lt;span style=&quot; font-weight:600; font-style:italic;&quot;&gt;Spieleinstellungen&lt;/span&gt;&lt;span style=&quot; font-style:italic;&quot;&gt; - wie &quot;&lt;/span&gt;Maximale Anzahl Spieler&quot;, &quot;&lt;span style=&quot; font-style:italic;&quot;&gt;Startgeld&quot; und &quot;Small Blind&quot; - werden von den &lt;/span&gt;&lt;span style=&quot; font-weight:600; font-style:italic;&quot;&gt;Einstellungen für Netzwerkspiel&lt;/span&gt; &lt;span style=&quot; font-style:italic;&quot;&gt;übernommen.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<location filename="../src/gui/qt/settingsdialog.ui" line="918"/>
<source>Internet Server Settings (Dedicated Server)</source>
<translation type="unfinished"></translation>
<translation>Internetserver-Einstellungen (dedizierter Server)</translation>
</message>
<message>
<location filename="../src/gui/qt/settingsdialog.ui" line="1069"/>
<source>Server Address:</source>
<translation type="unfinished"></translation>
<translation>Serveradresse:</translation>
</message>
<message>
<location filename="../src/gui/qt/settingsdialog.ui" line="1044"/>
<source>Use password for private game:</source>
<translation type="unfinished"></translation>
<translation>Benutze Passwort für Privatspiele:</translation>
</message>
<message>
<location filename="../src/gui/qt/settingsdialog.ui" line="1063"/>
<source>Lobby Chat Settings (IRC Server)</source>
<translation type="unfinished"></translation>
<translation>Lobby-Chat-Einstellungen (IRC-Server)</translation>
</message>
<message>
<location filename="../src/gui/qt/settingsdialog.ui" line="1076"/>
@@ -1495,7 +1468,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../src/gui/qt/settingsdialog.ui" line="1106"/>
<source>Channel:</source>
<translation type="unfinished"></translation>
<translation>Kanal:</translation>
</message>
<message>
<location filename="../src/gui/qt/settingsdialog.ui" line="1113"/>
@@ -1585,7 +1558,7 @@ Bitte wählen Sie ein gültiges Verzeichnis!</translation>
<message>
<location filename="../src/gui/qt/startnetworkgamedialog.ui" line="28"/>
<source>Fill up with computer opponents</source>
<translation type="unfinished">Mit Computergegnern auffüllen</translation>
<translation>Mit Computergegnern auffüllen</translation>
</message>
</context>
<context>