diff --git a/data/translations/pokerth_de.qm b/data/translations/pokerth_de.qm index f6892cd2..8b8a455f 100644 Binary files a/data/translations/pokerth_de.qm and b/data/translations/pokerth_de.qm differ diff --git a/pokerth_lib.pro b/pokerth_lib.pro index 06192cb4..3a196ed2 100644 --- a/pokerth_lib.pro +++ b/pokerth_lib.pro @@ -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 \ diff --git a/src/core/libircclient/include/config.h b/src/core/libircclient/include/config.h new file mode 100644 index 00000000..8e3c0cf6 --- /dev/null +++ b/src/core/libircclient/include/config.h @@ -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 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 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 header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_SELECT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_SOCKET_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the 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 and . */ +#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 does not define. */ +/* #undef size_t */ diff --git a/src/gui/qt/mainwindow/mylefttabwidget.cpp b/src/gui/qt/mainwindow/mylefttabwidget.cpp index 1bc02fd0..73f2c44e 100644 --- a/src/gui/qt/mainwindow/mylefttabwidget.cpp +++ b/src/gui/qt/mainwindow/mylefttabwidget.cpp @@ -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; }"); } diff --git a/src/gui/qt/mainwindow/myrighttabwidget.cpp b/src/gui/qt/mainwindow/myrighttabwidget.cpp index 256a329e..4858e53a 100644 --- a/src/gui/qt/mainwindow/myrighttabwidget.cpp +++ b/src/gui/qt/mainwindow/myrighttabwidget.cpp @@ -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; }"); } diff --git a/ts/pokerth_de.ts b/ts/pokerth_de.ts index d070556b..66a860d0 100644 --- a/ts/pokerth_de.ts +++ b/ts/pokerth_de.ts @@ -191,22 +191,22 @@ p, li { white-space: pre-wrap; } Resolving address... - + Adresse auflösen... Connecting to server... - + Mit Server verbinden... Starting session... - + Starte Session... Connection established! - + Verbindung aufgebaut! @@ -221,11 +221,6 @@ p, li { white-space: pre-wrap; } Game Speed for computer opponents: Spielgeschwindigkeit für Computergegner: - - - Hands before raise small blind: - Runden vor der Erhöhung des Small Blind: - Timeout for player action (sec): @@ -259,12 +254,12 @@ p, li { white-space: pre-wrap; } Hands before raise blinds: - + Runden vor Erhöhung der Blinds: Small Blind: - Small Blind: + Small Blind: @@ -299,11 +294,6 @@ p, li { white-space: pre-wrap; } Cancel Abbrechen - - - Hands before raise small blind: - Runden vor der Erhöhung des Small Blind: - Timeout for player action (sec): @@ -322,7 +312,7 @@ p, li { white-space: pre-wrap; } Hands before raise blinds: - + Runden vor Erhöhung der Blinds: @@ -402,30 +392,25 @@ p, li { white-space: pre-wrap; } Kick Entfernen - - - Leave - Verlassen - Lobby-Chat - + Lobby-Chat Hands before raise blinds: - + Runden vor Erhöhung der Blinds: Small Blind: - Small Blind: + Small Blind: Leave Game - + Spiel verlassen @@ -433,22 +418,22 @@ p, li { white-space: pre-wrap; } game - + Spiel - Join a private Game - + Joining a private Game + Einem Privatspiel beitreten - You like to join a private game. Please enter the password! - + You are about to join a private game. Please enter the password! + Dies ist ein Privatspiel. Bitte Kennwort eingeben! Game Info - Spieldaten + Spieldaten @@ -458,7 +443,7 @@ p, li { white-space: pre-wrap; } You should not kick yourself from this game! - Sie sollten sich nicht selbst des Spieles verweisen ;)! + Sie sollten sich nicht selbst des Spieles verweisen ;)! @@ -806,7 +791,7 @@ p, li { white-space: pre-wrap; } Ctrl+I - + Ctrl+I @@ -1064,15 +1049,10 @@ Wenn der Server hinter einem NAT-Router betrieben wird, stellen Sie sicher, dass Number of players: Anzahl der Spieler: - - - Hands before raise small blind: - Runden vor der Erhöhung des Small Blind: - Hands before raise blinds: - + Runden vor Erhöhung der Blinds: @@ -1169,9 +1149,9 @@ p, li { white-space: pre-wrap; } Engine Version: - - Server Settings - Servereinstellungen + + Network Server Settings + Servereinstellungen @@ -1188,11 +1168,6 @@ p, li { white-space: pre-wrap; } Server Password: Server Passwort: - - - Network Game Default Settings - Einstellungen für Netzwerkspiel - Computer Engine @@ -1308,11 +1283,6 @@ p, li { white-space: pre-wrap; } Show game settings dialog on every new game Zeige den Dialog Spieleinstellungen bei jedem neuen Spiel - - - Hands before raise small blind: - Runden vor der Erhöhung des Small Blind: - Number of players: @@ -1392,7 +1362,7 @@ p, li { white-space: pre-wrap; } <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Nimbus Sans L'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">Hinweis: Die beste Avatar-Qualität erhalten Sie folgenden Seitenverhältnissen: </span><span style=" font-weight:600; font-style:italic;">Breite = 50, Höhe = 50.</span></p></body></html> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">Hinweis: Die beste Avatar-Qualität erhalten Sie mit folgenden Seitenverhältnissen: </span><span style=" font-weight:600; font-style:italic;">Breite = 50, Höhe = 50.</span></p></body></html> @@ -1452,7 +1422,7 @@ p, li { white-space: pre-wrap; } Hands before raise blinds: - + Runden vor Erhöhung der Blinds: @@ -1465,27 +1435,30 @@ p, li { white-space: pre-wrap; } p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Nimbus Sans L'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">Note: Default </span><span style=" font-weight:600; font-style:italic;">Game Settings</span><span style=" font-style:italic;"> like "</span>Maximum number of players", "<span style=" font-style:italic;">Start Cash" and "Small Blind" will be used </span><span style=" font-weight:600; font-style:italic;">from Network Game Settings.</span></p></body></html> - + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Nimbus Sans L'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">Hinweis: Standard-</span><span style=" font-weight:600; font-style:italic;">Spieleinstellungen</span><span style=" font-style:italic;"> - wie "</span>Maximale Anzahl Spieler", "<span style=" font-style:italic;">Startgeld" und "Small Blind" - werden von den </span><span style=" font-weight:600; font-style:italic;">Einstellungen für Netzwerkspiel</span> <span style=" font-style:italic;">übernommen.</span></p></body></html> Internet Server Settings (Dedicated Server) - + Internetserver-Einstellungen (dedizierter Server) Server Address: - + Serveradresse: Use password for private game: - + Benutze Passwort für Privatspiele: Lobby Chat Settings (IRC Server) - + Lobby-Chat-Einstellungen (IRC-Server) @@ -1495,7 +1468,7 @@ p, li { white-space: pre-wrap; } Channel: - + Kanal: @@ -1585,7 +1558,7 @@ Bitte wählen Sie ein gültiges Verzeichnis! Fill up with computer opponents - Mit Computergegnern auffüllen + Mit Computergegnern auffüllen