From f18ba1680674e515c075c17ce4c978f23ea69e0d Mon Sep 17 00:00:00 2001 From: doitux Date: Sun, 29 Mar 2009 20:45:37 +0000 Subject: [PATCH] next steps skinning implementation (TESTING!!!) --- data/gfx/gui/misc/rating.png | Bin 0 -> 665 bytes data/gfx/gui/table/default/action_set.png | Bin 1376 -> 0 bytes .../gui/table/default/defaulttablestyle.xml | 5 +- data/gfx/gui/table/default/preview.png | Bin 0 -> 19500 bytes pokerth_game.pro | 4 + src/config/configfile.cpp | 21 +- src/config/configfile.h | 2 - src/gui/qt/gametable/gametableimpl.cpp | 7 +- src/gui/qt/settingsdialog.ui | 2221 +++++++++-------- .../qt/settingsdialog/settingsdialogimpl.cpp | 24 + src/gui/qt/styles/gametablestylereader.cpp | 179 ++ src/gui/qt/styles/gametablestylereader.h | 101 + 12 files changed, 1430 insertions(+), 1134 deletions(-) create mode 100755 data/gfx/gui/misc/rating.png delete mode 100644 data/gfx/gui/table/default/action_set.png create mode 100644 data/gfx/gui/table/default/preview.png create mode 100644 src/gui/qt/styles/gametablestylereader.cpp create mode 100644 src/gui/qt/styles/gametablestylereader.h diff --git a/data/gfx/gui/misc/rating.png b/data/gfx/gui/misc/rating.png new file mode 100755 index 0000000000000000000000000000000000000000..b47a7d609e7a51a066d17334f8bd5040e628aef6 GIT binary patch literal 665 zcmV;K0%rY*P)H`mp)s9rK0xC zTn^mJIWzZinUoTnfr3AvG@g83nrM6RUk3AI`VD>iKp(}S;$8jrKN)-((>sKkK5z6K zQ;hDTN}#l#quj2)GI)2#*y`5#>r~Ha9kvVD9#Xw$G`Fr!Q!S0(urkCqx3od-V}$F8 z9cnb0+Sb)?#CGqeD#9Q*iv=uw%sXDAZ2HYw8H&7e;DUdj<*%u|TjFgqd;88t)MyHj z0^p>hXf=SO8xRK^qESO(X40ut=8mY2jZZbltomlTg9iqnhZ@OlaGP>pq8Tl`#7_XIs{CXZEVUxVA{Si#!ug z$8(3XLmD$ksUtL!HVGRD>I;zHzvAU|&1?L?$?T|jv^K<5j1TkA1KDJ!5urk?2^L)@ zlkj!f1oaL~JyeQA*TtSyjfxgHj*Kx;C3OH6Axa=*0Z1N>!F6SH!#!Xenks@Ys{t;t z9fU?OC@lf5fg{BFA4o>W1Li&ev-e<`7Tl&s-Naz@4R4+wl|9A~OY57G?kd03CEiSad^g zZEa<4bO1wgWnpw>WFU8GbZ8({Xk{QrNlj4iWF>9@00hWML_t(o!|j({Y?D$JEX9I^my1cSNJ(mKiI#(W1}tF@W}|A!?!H9#u4MKy zvV3uEh~1n8wAj%Q$Imc6Qb-^<^}1CB+bj>3$vPy)7)%Z~4<9pboUulO4-Zg6iYlAo zyBOWyI-hrSWyy%fURcn}ML@?E9>+k00o-_Qg*6*DEqZB|S&y53(v(rF3asm`FVaqD zh#&wl1~E~Hg@P4l9(H>E`LoZ+NWNAjhwuXh)UyD9IXuJ!)9@usn`$=C)SclFUBm&I z*}NewG|HT12iE~;X9Ei0ZK`FXWn4jaj6@UZl&sVdWRQ;;p^Q=rQDWe#xY1VmT!n5w zdkK?=73gPxF7~jRDE(6z=?5T;gd}C{jZEAK_-#cF&Xb^tGgv8RE)CRSl*;GK*SB+k zFtC}&NO6c}2KkU`D%n93t-!skM+Yn*O+1AlJ2iw&YvjEE7j zO(+FohPW)cM3*=wW(tHt91)|!FSZHM2D5_~-?|fJ{CWs7P{?TC9_T z2p1^(!^UBPRH>@$5&I82JAUP2)_N_82~N?>UaZU{ikn_QO*LlV3BI6*VV>n_${DAF z7A81~2`EQFnoDfN%5=6 zwXC27cl;*H)%$3ngE(MCPo^VDMz`QJ>UPy^v=(TUGRnznCWzsUwEZ~nYWj-usd=wE zD)mZva;r3PBEmcJ)6vkmxs8t5dR5-!0aCPHy7Y{zEqjBNR - + + + @@ -15,7 +17,6 @@ - diff --git a/data/gfx/gui/table/default/preview.png b/data/gfx/gui/table/default/preview.png new file mode 100644 index 0000000000000000000000000000000000000000..6fb9ad9375dac55c4cb0b0a9737012133a7afdd0 GIT binary patch literal 19500 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 P00000NkvXXu0mjf6g)_G literal 0 HcmV?d00001 diff --git a/pokerth_game.pro b/pokerth_game.pro index d4cf40ad..c2b9f4cc 100644 --- a/pokerth_game.pro +++ b/pokerth_game.pro @@ -52,6 +52,7 @@ INCLUDEPATH += . \ src/gui/qt/settingsdialog/manualblindsorderdialog \ src/gui/qt/startnetworkgamedialog \ src/gui/qt/startwindow \ + src/gui/qt/styles \ src/gui/qt/changehumanplayernamedialog \ src/gui/qt/changecompleteblindsdialog \ src/gui/qt/mymessagedialog \ @@ -91,6 +92,7 @@ DEPENDPATH += . \ src/gui/qt/settingsdialog/manualblindsorderdialog \ src/gui/qt/startnetworkgamedialog \ src/gui/qt/startwindow \ + src/gui/qt/styles \ src/gui/qt/changehumanplayernamedialog \ src/gui/qt/changecompleteblindsdialog \ src/gui/qt/mymessagedialog \ @@ -175,6 +177,7 @@ HEADERS += \ src/gui/qt/settingsdialog/manualblindsorderdialog/manualblindsorderdialogimpl.h \ src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.h \ src/gui/qt/startwindow/startwindowimpl.h \ + src/gui/qt/styles/gametablestylereader.h \ src/gui/qt/changehumanplayernamedialog/changehumanplayernamedialogimpl.h \ src/gui/qt/changecompleteblindsdialog/changecompleteblindsdialogimpl.h \ src/gui/qt/gamelobbydialog/gamelobbydialogimpl.h \ @@ -238,6 +241,7 @@ SOURCES += \ src/gui/qt/settingsdialog/manualblindsorderdialog/manualblindsorderdialogimpl.cpp \ src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.cpp \ src/gui/qt/startwindow/startwindowimpl.cpp \ + src/gui/qt/styles/gametablestylereader.cpp \ src/gui/qt/changehumanplayernamedialog/changehumanplayernamedialogimpl.cpp \ src/gui/qt/changecompleteblindsdialog/changecompleteblindsdialogimpl.cpp \ src/gui/qt/mymessagedialog/mymessagedialogimpl.cpp \ diff --git a/src/config/configfile.cpp b/src/config/configfile.cpp index 9c7cbb5f..e24d022c 100644 --- a/src/config/configfile.cpp +++ b/src/config/configfile.cpp @@ -102,12 +102,6 @@ ConfigFile::ConfigFile(char *argv0, bool readonly) : noWriteAccess(readonly) mkdir(dataDir.c_str()); mkdir(cacheDir.c_str()); - ////define GameTableStyle - defaultGameTableStyle = myQtToolsInterface->getDataPathStdString(myArgv0)+"gfx\\gui\\table\\default\\defaulttablestyle.xml"; - gameTableStyleList.push_back(defaultGameTableStyle); - ////define CardDeck - defaultCardDeck = myQtToolsInterface->getDataPathStdString(myArgv0)+"gfx\\cards\\default\\defaultcarddeck.xml"; - cardDeckList.push_back(defaultCardDeck); #else //define app-dir const char *homePath = getenv("HOME"); @@ -130,12 +124,6 @@ ConfigFile::ConfigFile(char *argv0, bool readonly) : noWriteAccess(readonly) mkdir(cacheDir.c_str(), MODUS); } - ////define GameTableStyle - defaultGameTableStyle = myQtToolsInterface->getDataPathStdString(myArgv0)+"gfx/gui/table/default/defaulttablestyle.xml"; - gameTableStyleList.push_back(defaultGameTableStyle); - ////define CardDeck - defaultCardDeck = myQtToolsInterface->getDataPathStdString(myArgv0)+"gfx/cards/default/defaultcarddeck.xml"; - cardDeckList.push_back(defaultCardDeck); #endif ostringstream tempIntToString; @@ -158,10 +146,10 @@ ConfigFile::ConfigFile(char *argv0, bool readonly) : noWriteAccess(readonly) configList.push_back(ConfigInfo("FlipsideTux", CONFIG_TYPE_INT, "1")); configList.push_back(ConfigInfo("FlipsideOwn", CONFIG_TYPE_INT, "0")); configList.push_back(ConfigInfo("FlipsideOwnFile", CONFIG_TYPE_STRING, "")); - configList.push_back(ConfigInfo("GameTableStylesList", CONFIG_TYPE_STRING_LIST, "GameTableStyles", gameTableStyleList)); - configList.push_back(ConfigInfo("CurrentGameTableStyle", CONFIG_TYPE_STRING, defaultGameTableStyle)); - configList.push_back(ConfigInfo("CardDecksList", CONFIG_TYPE_STRING_LIST, "CardDecks", cardDeckList)); - configList.push_back(ConfigInfo("CurrentCardDeck", CONFIG_TYPE_STRING, defaultCardDeck)); + configList.push_back(ConfigInfo("GameTableStylesList", CONFIG_TYPE_STRING_LIST, "GameTableStyles")); + configList.push_back(ConfigInfo("CurrentGameTableStyle", CONFIG_TYPE_STRING, "")); + configList.push_back(ConfigInfo("CardDecksList", CONFIG_TYPE_STRING_LIST, "CardDecks")); + configList.push_back(ConfigInfo("CurrentCardDeck", CONFIG_TYPE_STRING, "")); configList.push_back(ConfigInfo("PlaySoundEffects", CONFIG_TYPE_INT, "1")); configList.push_back(ConfigInfo("SoundVolume", CONFIG_TYPE_INT, "8")); configList.push_back(ConfigInfo("PlayGameActions", CONFIG_TYPE_INT, "1")); @@ -298,7 +286,6 @@ ConfigFile::ConfigFile(char *argv0, bool readonly) : noWriteAccess(readonly) } } - fillBuffer(); } } diff --git a/src/config/configfile.h b/src/config/configfile.h index ff2cd534..50d29993 100644 --- a/src/config/configfile.h +++ b/src/config/configfile.h @@ -74,8 +74,6 @@ private: std::string cacheDir; std::string defaultGameTableStyle; std::string defaultCardDeck; - std::list gameTableStyleList; - std::list cardDeckList; int configRev; bool noWriteAccess; diff --git a/src/gui/qt/gametable/gametableimpl.cpp b/src/gui/qt/gametable/gametableimpl.cpp index c6c47bf1..8d73bf88 100755 --- a/src/gui/qt/gametable/gametableimpl.cpp +++ b/src/gui/qt/gametable/gametableimpl.cpp @@ -41,7 +41,7 @@ #include "configfile.h" #include "sdlplayer.h" -// #include "stylesheetreader.h" +#include "gametablestylereader.h" #include #include @@ -75,8 +75,9 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent) //Sound mySDLPlayer = new SDLPlayer(myConfig); - //styleSheetReader -// myStyleSheetReader = new StyleSheetReader(QString(myAppDataPath+"gfx/stylesheet.xml").toStdString()); +// gameTableStyleReader + GameTableStyleReader myGameTableStyleReader(myConfig, this); + myGameTableStyleReader.readStyleFile(QString::fromUtf8(myConfig->readConfigString("CurrentGameTableStyle").c_str())); //Player0 pixmapCardsLabel needs Myw pixmapLabel_card0b->setMyW(this); diff --git a/src/gui/qt/settingsdialog.ui b/src/gui/qt/settingsdialog.ui index fc0a67ae..ad4d6fa4 100644 --- a/src/gui/qt/settingsdialog.ui +++ b/src/gui/qt/settingsdialog.ui @@ -1,7 +1,8 @@ - + + settingsDialog - - + + 0 0 @@ -9,163 +10,163 @@ 530 - + 785 530 - + Settings - - - + + + - - + + 190 0 - + 190 16777215 - + 32 32 - + false - + true - + Interface - - + + :/gfx/preferences-desktop.png:/gfx/preferences-desktop.png - + Style - - + + :/gfx/fill-color.png:/gfx/fill-color.png - + Sound - - + + :/gfx/speaker.png:/gfx/speaker.png - + Local Game - - + + :/gfx/swbuttonlocalgame.png:/gfx/swbuttonlocalgame.png - + Network Game - - + + :/gfx/swbuttonjoinnetworkgame.png:/gfx/swbuttonjoinnetworkgame.png - + Internet Game - - + + :/gfx/swbuttoninternetgame.png:/gfx/swbuttoninternetgame.png - + Nicks/Avatars - - + + :/gfx/system_users.png:/gfx/system_users.png - + Log Messages - - + + :/gfx/utilities-log-viewer.png:/gfx/utilities-log-viewer.png - - + + 1 - - - - - - QLabel { font-weight: bold; } + + + + + + QLabel { font-weight: bold; } - + Interface - - - + + + Qt::Horizontal - - + + - - + + Language: - + comboBox_switchLanguage - + - + Qt::Horizontal - + 40 20 @@ -175,89 +176,89 @@ - - - - - + + + + + Show intro on startup - - - + + + Show left toolbox - - - + + + Show right toolbox - - - + + + Show statusbar messages - - - + + + Show fade-out animation for non-winning cards - - - + + + Show flip-card animation - - - + + + Reverse order of F-Keys (F1 - F4) - - - + + + Show own cards only on mouse click - - - + + + Show cards chance monitor - - - + + + Show buttons for small blind and big blind - - - + + + Network / Internet Game - - - - + + + + Switch keyboard focus to bet-input-field if it's your turn @@ -265,69 +266,69 @@ - - - + + + Flipside of Cards - - + + 9 - + 0 - + 9 - + 9 - + 6 - - - + + + 0 - + 0 - - + + 2 - + 0 - - + + Own flipside picture: - - + + false - - + + false - + 27 26 - + 27 26 @@ -338,26 +339,26 @@ - - - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style="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: Best quality with image ratio like </span><span style=" font-weight:600; font-style:italic;">width=100, height=140.</span></p></body></html> +</style></head><body style="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: Best quality with image ratio like </span><span style=" font-weight:600; font-style:italic;">width=100, height=140.</span></p></body></html> - + true - - - + + + Default - + true @@ -365,12 +366,12 @@ p, li { white-space: pre-wrap; } - + - + Qt::Vertical - + 400 111 @@ -380,49 +381,46 @@ p, li { white-space: pre-wrap; } - - - - - - QLabel { font-weight: bold; } + + + + + + QLabel { font-weight: bold; } - + Style - - - + + + Qt::Horizontal - - - + + + Game Table Styles - - - - - - + + + - - - Auswählen + + + Select - - + + Qt::Vertical - + 20 17 @@ -431,42 +429,42 @@ p, li { white-space: pre-wrap; } - - - Hinzufügen ... + + + Add ... - - - Löschen + + + Remove - - - - Vorschau: + + + + Preview: - - - - + + + + 160 120 - + 160 120 - + @@ -474,33 +472,33 @@ p, li { white-space: pre-wrap; } + + + - - - + + + Card Decks - - - - - - + + + - - - Auswählen + + + Select - - + + Qt::Vertical - + 20 17 @@ -509,42 +507,42 @@ p, li { white-space: pre-wrap; } - - - Hinzufügen ... + + + Add ... - - - Löschen + + + Remove - - - - Vorschau: + + + + Preview: - - - - + + + + 160 120 - + 160 120 - + @@ -552,117 +550,120 @@ p, li { white-space: pre-wrap; } + + + - - - - - - QLabel { font-weight: bold; } + + + + + + QLabel { font-weight: bold; } - + Sound - - - + + + Qt::Horizontal - - - + + + Play sound effects - + true - + true - - - - + + + + 6 - + 0 - - + + Sound Volume: - - + + 20 0 - + 10 - - + + 1 - + 10 - + 8 - + Qt::Horizontal - - - + + + Sound Categories - - + + 0 - - - - Play game actions sounds like "check", "call", "raise" + + + + Play game actions sounds like "check", "call", "raise" - - - + + + Play lobby chat notifications - - - - Play network/internet game notifications like "player joined the game" + + + + Play network/internet game notifications like "player joined the game" - + false @@ -673,12 +674,12 @@ p, li { white-space: pre-wrap; } - + - + Qt::Vertical - + 400 321 @@ -688,46 +689,46 @@ p, li { white-space: pre-wrap; } - - + + - - - QLabel { font-weight: bold; } + + + QLabel { font-weight: bold; } - + Local Game Settings - - + + Qt::Horizontal - + - - + + Number of players: - + spinBox_quantityPlayers - - + + 2 - + 10 - + 10 @@ -735,29 +736,29 @@ p, li { white-space: pre-wrap; } - + - - + + Start Cash: - + spinBox_startCash - - + + $ - + 1000 - + 1000000 - + 50 @@ -765,26 +766,26 @@ p, li { white-space: pre-wrap; } - + - - + + First small blind: - + spinBox_firstSmallBlind - - + + $ - + 5 - + 500 @@ -792,85 +793,85 @@ p, li { white-space: pre-wrap; } - + - - + + Raise blinds: - - + + 9 - + 0 - + 9 - - - + + + Every: - + true - - - + + + 1 - - - - + + + + 0 0 - + hands - - - + + + Every: - - - + + + 1 - - - - + + + + 0 0 - + minutes - + - + Qt::Vertical - + 20 5 @@ -882,43 +883,43 @@ p, li { white-space: pre-wrap; } - - - + + + 0 0 - + Raise mode: - - + + 0 - - - + + + Always double blinds - + true - - - + + + Manual blinds order: - - - + + + false - + Edit ... @@ -929,26 +930,26 @@ p, li { white-space: pre-wrap; } - + - - + + Game Speed: - + spinBox_gameSpeed - - + + 1 - + 11 - + 1 @@ -956,25 +957,25 @@ p, li { white-space: pre-wrap; } - - - Pause between hands (press "start" button to go on) + + + Pause between hands (press "start" button to go on) - - + + Show game settings dialog on every new game - + Qt::Vertical - + 437 285 @@ -984,46 +985,46 @@ p, li { white-space: pre-wrap; } - - + + - - - QLabel { font-weight: bold; } + + + QLabel { font-weight: bold; } - + Network Game Settings - - + + Qt::Horizontal - + - - + + Maximum number of players: - + spinBox_netQuantityPlayers - - + + 2 - + 10 - + 10 @@ -1031,29 +1032,29 @@ p, li { white-space: pre-wrap; } - + - - + + Start Cash: - + spinBox_netStartCash - - + + $ - + 1000 - + 1000000 - + 50 @@ -1061,26 +1062,26 @@ p, li { white-space: pre-wrap; } - + - - + + First small blind: - + spinBox_netFirstSmallBlind - - + + $ - + 5 - + 500 @@ -1088,94 +1089,94 @@ p, li { white-space: pre-wrap; } - + - - + + 16777215 105 - + Raise blinds: - - + + 6 - + 0 - + 6 - + 6 - - - + + + Every: - + true - - - + + + 1 - - - - + + + + 0 0 - + hands - - - + + + Every: - - - + + + 1 - - - - + + + + 0 0 - + minutes - + - + Qt::Vertical - + 20 10 @@ -1187,58 +1188,58 @@ p, li { white-space: pre-wrap; } - - - + + + 0 0 - + 16777215 105 - + Raise mode: - - + + 6 - + 0 - + 6 - + 6 - - - + + + Always double blinds - + true - - - + + + Manual blinds order: - - - + + + false - + Edit ... @@ -1249,26 +1250,26 @@ p, li { white-space: pre-wrap; } - + - - + + Game Speed for computer opponents: - + spinBox_netGameSpeed - - + + 1 - + 11 - + 1 @@ -1276,29 +1277,29 @@ p, li { white-space: pre-wrap; } - + - - + + Timeout for player action: - + spinBox_netTimeOutPlayerAction - - + + s - + 5 - + 60 - + 20 @@ -1306,99 +1307,99 @@ p, li { white-space: pre-wrap; } - - + + Network Server Settings - - + + 6 - + 0 - + 6 - + 6 - + 6 - - - + + + 60 - + QLineEdit::Password - - - + + + Server Password: - + lineEdit_serverPassword - - - + + + 80 - + 65535 - + 7234 - - - + + + Server Port: - + spinBox_serverPort - - - + + + Use SCTP - - - + + + Use IPv6 - - - - <a href="http://en.wikipedia.org/wiki/Ipv6">What is this?</a> + + + + <a href="http://en.wikipedia.org/wiki/Ipv6">What is this?</a> - + true - - - - <a href="http://en.wikipedia.org/wiki/Stream_Control_Transmission_Protocol">What is this?</a> + + + + <a href="http://en.wikipedia.org/wiki/Stream_Control_Transmission_Protocol">What is this?</a> - + true @@ -1407,11 +1408,11 @@ p, li { white-space: pre-wrap; } - - + + Qt::Vertical - + 20 40 @@ -1421,196 +1422,196 @@ p, li { white-space: pre-wrap; } - - - - - - QLabel { font-weight: bold; } + + + + + + QLabel { font-weight: bold; } - + Internet Game Settings - - - + + + Qt::Horizontal - - - - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> + + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style="font-weight:400; font-style:normal;"> -<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 "Maximum number of players", "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> +</style></head><body style="font-weight:400; font-style:normal;"> +<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 "Maximum number of players", "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> - + true - - - + + + 300 0 - + 300 16777215 - + Internet Server - - - - + + + + Automatic Server Configuration URL - + true - - - - + + + + Serverlist Address: - - + + - - - + + + 0 116 - + Manual Server Configuration - + true - + false - - - - + + + + Server Address: - + lineEdit_InternetServerAddress - - - + + + 60 - - - + + + Server Port: - + spinBox_InternetServerPort - - - + + + 80 - + 65535 - + 7234 - - - + + + Server Password: - + lineEdit_InternetServerPassword - - - + + + QLineEdit::Password - - - + + + Avatar Server: - - + + - - - + + + Use IPv6 - - - - <a href="http://en.wikipedia.org/wiki/Ipv6">What is this?</a> + + + + <a href="http://en.wikipedia.org/wiki/Ipv6">What is this?</a> - + true - - - + + + Use SCTP - - - - <a href="http://en.wikipedia.org/wiki/Stream_Control_Transmission_Protocol">What is this?</a> + + + + <a href="http://en.wikipedia.org/wiki/Stream_Control_Transmission_Protocol">What is this?</a> - + true @@ -1618,111 +1619,111 @@ p, li { white-space: pre-wrap; } - - - + + + Lobby Chat (IRC) - + true - - - - + + + + Server Address: - + lineEdit_IRCServerAddress - - - + + + chat.freenode.net - + 60 - - - + + + Server Port: - + spinBox_IRCServerPort - - - - + + + + 0 0 - + 80 - + 65535 - + 6667 - - - + + + Channel: - + lineEdit_IRCChannel - - - + + + Password: - + lineEdit_IRCChannelPassword - - - + + + QLineEdit::Password - - - + + + Use IPv6 - - - - <a href="http://en.wikipedia.org/wiki/Ipv6">What is this?</a> + + + + <a href="http://en.wikipedia.org/wiki/Ipv6">What is this?</a> - + true - - - + + + #pokerth @@ -1730,12 +1731,12 @@ p, li { white-space: pre-wrap; } - - - + + + Qt::Vertical - + 20 98 @@ -1743,36 +1744,36 @@ p, li { white-space: pre-wrap; } - - - + + + 0 - - + + Use password for private game: - - + + false - + QLineEdit::Password - + - + Qt::Vertical - + 437 16 @@ -1782,36 +1783,36 @@ p, li { white-space: pre-wrap; } - - - - - - QLabel { font-weight: bold; } + + + + + + QLabel { font-weight: bold; } - + Player Nicks/Avatars - - - + + + Qt::Horizontal - - - + + + 0 - - - + + + Qt::Horizontal - + 40 20 @@ -1819,34 +1820,34 @@ p, li { white-space: pre-wrap; } - - - - + + + + 0 0 - + 200 16777215 - + Human Player: - + Qt::AlignCenter - - - + + + Qt::Horizontal - + 40 20 @@ -1854,14 +1855,14 @@ p, li { white-space: pre-wrap; } - - + + - - + + Qt::Horizontal - + 40 20 @@ -1870,23 +1871,23 @@ p, li { white-space: pre-wrap; } - - + + 60 60 - + 60 60 - + - + 50 50 @@ -1895,11 +1896,11 @@ p, li { white-space: pre-wrap; } - - + + Qt::Horizontal - + 40 20 @@ -1909,12 +1910,12 @@ p, li { white-space: pre-wrap; } - - - + + + Qt::Horizontal - + 78 20 @@ -1922,37 +1923,37 @@ p, li { white-space: pre-wrap; } - - - - + + + + 0 0 - + 100 25 - + 100 25 - + 12 - - - + + + Qt::Horizontal - + 88 20 @@ -1962,92 +1963,92 @@ p, li { white-space: pre-wrap; } - - - + + + Computer Engine - - - + + + - - + + 0 - + 0 - - - - + + + + 0 0 - + 100 25 - + 100 25 - + 12 - - - - + + + + 0 0 - + 100 0 - + 100 16777215 - + Opponent 1: - + Qt::AlignCenter - - - + + + 6 - + 0 - + Qt::Horizontal - + QSizePolicy::Fixed - + 3 20 @@ -2056,26 +2057,26 @@ p, li { white-space: pre-wrap; } - - - + + + 0 0 - + 60 60 - + 60 60 - + 50 50 @@ -2085,13 +2086,13 @@ p, li { white-space: pre-wrap; } - + Qt::Horizontal - + QSizePolicy::Fixed - + 3 20 @@ -2104,83 +2105,83 @@ p, li { white-space: pre-wrap; } - - + + 0 - + 0 - - - - + + + + 0 0 - + 100 25 - + 100 25 - + 12 - - - - + + + + 0 0 - + 100 0 - + 100 16777215 - + Opponent 2: - + Qt::AlignCenter - - - + + + 6 - + 0 - + Qt::Horizontal - + QSizePolicy::Fixed - + 3 20 @@ -2189,26 +2190,26 @@ p, li { white-space: pre-wrap; } - - - + + + 0 0 - + 60 60 - + 60 60 - + 50 50 @@ -2218,13 +2219,13 @@ p, li { white-space: pre-wrap; } - + Qt::Horizontal - + QSizePolicy::Fixed - + 3 20 @@ -2237,83 +2238,83 @@ p, li { white-space: pre-wrap; } - - + + 0 - + 0 - - - - + + + + 0 0 - + 100 0 - + 100 16777215 - + Opponent 3: - + Qt::AlignCenter - - - - + + + + 0 0 - + 100 25 - + 100 25 - + 12 - - - + + + 6 - + 0 - + Qt::Horizontal - + QSizePolicy::Fixed - + 3 20 @@ -2322,26 +2323,26 @@ p, li { white-space: pre-wrap; } - - - + + + 0 0 - + 60 60 - + 60 60 - + 50 50 @@ -2351,13 +2352,13 @@ p, li { white-space: pre-wrap; } - + Qt::Horizontal - + QSizePolicy::Fixed - + 3 20 @@ -2370,83 +2371,83 @@ p, li { white-space: pre-wrap; } - - + + 0 - + 0 - - - - + + + + 0 0 - + 100 25 - + 100 25 - + 12 - - - - + + + + 0 0 - + 100 0 - + 100 16777215 - + Opponent 4: - + Qt::AlignCenter - - - + + + 6 - + 0 - + Qt::Horizontal - + QSizePolicy::Fixed - + 3 20 @@ -2455,26 +2456,26 @@ p, li { white-space: pre-wrap; } - - - + + + 0 0 - + 60 60 - + 60 60 - + 50 50 @@ -2484,13 +2485,13 @@ p, li { white-space: pre-wrap; } - + Qt::Horizontal - + QSizePolicy::Fixed - + 3 20 @@ -2503,58 +2504,58 @@ p, li { white-space: pre-wrap; } - - + + 0 - + 0 - - - - + + + + 0 0 - + 100 0 - + 100 16777215 - + Opponent 5: - + Qt::AlignCenter - - - + + + 6 - + 0 - + Qt::Horizontal - + QSizePolicy::Fixed - + 3 20 @@ -2563,26 +2564,26 @@ p, li { white-space: pre-wrap; } - - - + + + 0 0 - + 60 60 - + 60 60 - + 50 50 @@ -2592,13 +2593,13 @@ p, li { white-space: pre-wrap; } - + Qt::Horizontal - + QSizePolicy::Fixed - + 3 20 @@ -2608,27 +2609,27 @@ p, li { white-space: pre-wrap; } - - - - + + + + 0 0 - + 100 25 - + 100 25 - + 12 @@ -2637,33 +2638,33 @@ p, li { white-space: pre-wrap; } - - + + - - + + 0 - + 0 - - - + + + 6 - + 0 - + Qt::Horizontal - + QSizePolicy::Fixed - + 3 20 @@ -2672,26 +2673,26 @@ p, li { white-space: pre-wrap; } - - - + + + 0 0 - + 60 60 - + 60 60 - + 50 50 @@ -2701,13 +2702,13 @@ p, li { white-space: pre-wrap; } - + Qt::Horizontal - + QSizePolicy::Fixed - + 3 20 @@ -2717,55 +2718,55 @@ p, li { white-space: pre-wrap; } - - - - + + + + 0 0 - + 100 25 - + 100 25 - + 12 - - - - + + + + 0 0 - + 100 0 - + 100 16777215 - + Opponent 6: - + Qt::AlignCenter @@ -2773,30 +2774,30 @@ p, li { white-space: pre-wrap; } - - + + 0 - + 0 - - - + + + 6 - + 0 - + Qt::Horizontal - + QSizePolicy::Fixed - + 3 20 @@ -2805,26 +2806,26 @@ p, li { white-space: pre-wrap; } - - - + + + 0 0 - + 60 60 - + 60 60 - + 50 50 @@ -2834,13 +2835,13 @@ p, li { white-space: pre-wrap; } - + Qt::Horizontal - + QSizePolicy::Fixed - + 3 20 @@ -2850,55 +2851,55 @@ p, li { white-space: pre-wrap; } - - - - + + + + 0 0 - + 100 25 - + 100 25 - + 12 - - - - + + + + 0 0 - + 100 0 - + 100 16777215 - + Opponent 7: - + Qt::AlignCenter @@ -2906,30 +2907,30 @@ p, li { white-space: pre-wrap; } - - + + 0 - + 0 - - - + + + 6 - + 0 - + Qt::Horizontal - + QSizePolicy::Fixed - + 3 20 @@ -2938,26 +2939,26 @@ p, li { white-space: pre-wrap; } - - - + + + 0 0 - + 60 60 - + 60 60 - + 50 50 @@ -2967,13 +2968,13 @@ p, li { white-space: pre-wrap; } - + Qt::Horizontal - + QSizePolicy::Fixed - + 3 20 @@ -2983,55 +2984,55 @@ p, li { white-space: pre-wrap; } - - - - + + + + 0 0 - + 100 25 - + 100 25 - + 12 - - - - + + + + 0 0 - + 100 0 - + 100 16777215 - + Opponent 8: - + Qt::AlignCenter @@ -3039,30 +3040,30 @@ p, li { white-space: pre-wrap; } - - + + 0 - + 0 - - - + + + 6 - + 0 - + Qt::Horizontal - + QSizePolicy::Fixed - + 3 20 @@ -3071,26 +3072,26 @@ p, li { white-space: pre-wrap; } - - - + + + 0 0 - + 60 60 - + 60 60 - + 50 50 @@ -3100,13 +3101,13 @@ p, li { white-space: pre-wrap; } - + Qt::Horizontal - + QSizePolicy::Fixed - + 3 20 @@ -3116,55 +3117,55 @@ p, li { white-space: pre-wrap; } - - - - + + + + 0 0 - + 100 25 - + 100 25 - + 12 - - - - + + + + 0 0 - + 100 0 - + 100 16777215 - + Opponent 10: - + Qt::AlignCenter @@ -3176,25 +3177,25 @@ p, li { white-space: pre-wrap; } - - - - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> + + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style="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: Best avatar quality with image ratio like </span><span style=" font-weight:600; font-style:italic;">width=50, height=50.</span></p></body></html> +</style></head><body style="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: Best avatar quality with image ratio like </span><span style=" font-weight:600; font-style:italic;">width=50, height=50.</span></p></body></html> - + true - + - + Qt::Vertical - + 20 40 @@ -3204,59 +3205,59 @@ p, li { white-space: pre-wrap; } - - - + + + 9 - + 6 - - - + + + Enable/Disable Logging - + true - + true - - - - + + + + Log File Directory: - + lineEdit_logDir - - - + + + 2 - + - - + + 27 26 - + 27 26 - + ../../../../../../.designer/backup../../../../../../.designer/backup @@ -3264,65 +3265,65 @@ p, li { white-space: pre-wrap; } - - - + + + Store log files for - + spinBox_logStoreDuration - - - + + + Day(s) - + 1 - + 7 - + 2 - - - + + + Write log after every: - + false - + comboBox_logInterval - - - - + + + + 0 0 - + action (high frequent disc access) - + hand (medium disc access) - + game (low disc access) @@ -3331,29 +3332,29 @@ p, li { white-space: pre-wrap; } - - - - QLabel { font-weight: bold; } + + + + QLabel { font-weight: bold; } - + Log Messages - - - + + + Qt::Horizontal - + - + Qt::Vertical - + 20 40 @@ -3367,19 +3368,19 @@ p, li { white-space: pre-wrap; } - - - + + + Qt::Horizontal - - - + + + Qt::Horizontal - + QDialogButtonBox::Cancel|QDialogButtonBox::Ok @@ -3478,7 +3479,7 @@ p, li { white-space: pre-wrap; } buttonBox - + @@ -3487,11 +3488,11 @@ p, li { white-space: pre-wrap; } stackedWidget setCurrentIndex(int) - + 127 60 - + 281 85 @@ -3503,11 +3504,11 @@ p, li { white-space: pre-wrap; } lineEdit_OwnFlipsideFilename setEnabled(bool) - + 360 373 - + 723 374 @@ -3519,11 +3520,11 @@ p, li { white-space: pre-wrap; } pushButton_openFlipsidePicture setEnabled(bool) - + 360 373 - + 752 375 @@ -3535,11 +3536,11 @@ p, li { white-space: pre-wrap; } settingsDialog reject() - + 595 520 - + 599 497 @@ -3551,11 +3552,11 @@ p, li { white-space: pre-wrap; } lineEdit_InternetGamePassword setEnabled(bool) - + 411 443 - + 717 444 @@ -3567,11 +3568,11 @@ p, li { white-space: pre-wrap; } label_soundVolume setNum(int) - + 648 98 - + 336 99 @@ -3583,11 +3584,11 @@ p, li { white-space: pre-wrap; } pushButton_editManualBlindsOrder setEnabled(bool) - + 753 220 - + 753 256 @@ -3599,11 +3600,11 @@ p, li { white-space: pre-wrap; } pushButton_netEditManualBlindsOrder setEnabled(bool) - + 756 218 - + 756 245 @@ -3615,11 +3616,11 @@ p, li { white-space: pre-wrap; } lineEdit_avatarServerAddress setEnabled(bool) - + 314 318 - + 366 320 diff --git a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp index d77018db..da19f754 100644 --- a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp +++ b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp @@ -19,6 +19,7 @@ ***************************************************************************/ #include "settingsdialogimpl.h" #include "myavatarlistitem.h" +#include "gametablestylereader.h" #include "configfile.h" #include @@ -225,6 +226,29 @@ void settingsDialogImpl::exec() { } lineEdit_OwnFlipsideFilename->setText(QString::fromUtf8(myConfig->readConfigString("FlipsideOwnFile").c_str())); + //S t y l e +// define PokerTH default GameTableStyle +// GameTableStyleReader defaultStyle(myConfig); +// defaultStyle.readStyleFile(QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str())+"/gfx/gui/table/default/defaulttablestyle.xml"); +// +// QListWidgetItem *defaultItem = new QListWidgetItem(defaultStyle.getStyleDescription(),listWidget_gameTableStyles); +// defaultItem->setData(15, QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str())+"/gfx/gui/table/default/defaulttablestyle.xml"); +// defaultItem->setIcon(QIcon(QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str())+"/gfx/gui/misc/rating.png")); + + //load secondary styles into list + + + //show selected gametablestyles preview +// QFileInfo info(defaultGameTableStyleFile); +// QPixmap preview(info.absolutePath()+"/"+defaultStyle.getPreview()); +// if(preview.height() > 160 || preview.width() > 120) label_gameTableStylePreview->setPixmap(preview.scaled(160,120,Qt::KeepAspectRatio,Qt::SmoothTransformation)); +// else label_gameTableStylePreview->setPixmap(preview); + + + //define PokerTH default CardDeck +// defaultCardDeck = myQtToolsInterface->getDataPathStdString(myArgv0)+"gfx/cards/default/defaultcarddeck.xml"; + + //Sound groupBox_playSoundEffects->setChecked(myConfig->readConfigInt("PlaySoundEffects")); horizontalSlider_soundVolume->setValue(myConfig->readConfigInt("SoundVolume")); diff --git a/src/gui/qt/styles/gametablestylereader.cpp b/src/gui/qt/styles/gametablestylereader.cpp new file mode 100644 index 00000000..5580106d --- /dev/null +++ b/src/gui/qt/styles/gametablestylereader.cpp @@ -0,0 +1,179 @@ +/*************************************************************************** + * Copyright (C) 2006 by Felix Hammer * + * f.hammer@web.de * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + ***************************************************************************/ +#include "gametablestylereader.h" +#include +#include +#include +#include + + +using namespace std; + +GameTableStyleReader::GameTableStyleReader(ConfigFile *c, gameTableImpl *w) : myConfig(c), myW(w) +{ + +} + + +GameTableStyleReader::~GameTableStyleReader() +{ +} + +void GameTableStyleReader::readStyleFile(QString file) { + + string tinyFileName; + + //if style file failed --> default style fallback + if(QFile(file).exists()) { + currentFileName = QFile(file).fileName(); + tinyFileName = currentFileName.toStdString(); + + QMessageBox::warning(myW, tr("WORKS"), + currentFileName, + QMessageBox::Ok); + } + else { + currentFileName = QFile(QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str())+"/gfx/gui/table/default/defaulttablestyle.xml").fileName(); + tinyFileName = currentFileName.toStdString(); + QMessageBox::warning(myW, tr("FALLBACK"), + currentFileName, + QMessageBox::Ok); + + } + QFileInfo info(currentFileName); + currentFileDir = info.absolutePath(); + + //start reading the file and fill vars + string tempString1(""); + TiXmlDocument doc(tinyFileName); + + if(doc.LoadFile()) { + TiXmlHandle docHandle( &doc ); + + TiXmlElement* itemsList = docHandle.FirstChild( "PokerTH" ).FirstChild( "TableStyle" ).FirstChild().ToElement(); + for( ; itemsList; itemsList=itemsList->NextSiblingElement()) { + const char *tmpStr1 = itemsList->Attribute("value"); + if (tmpStr1) { + tempString1 = tmpStr1; + + if(itemsList->ValueStr() == "StyleDescription") { StyleDescription = QString::fromUtf8(tempString1.c_str()); } + else if(itemsList->ValueStr() == "StyleMaintainerEMail") { StyleMaintainerEMail = QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "Preview") { Preview = QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "IfFixedWindowSize") { IfFixedWindowSize = QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "FixedWindowWidth") { FixedWindowWidth = QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "FixedWindowHeight") { FixedWindowHeight = QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "MinimumWindowWidth") { MinimumWindowWidth = QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "MinimumWindowHeight") { MinimumWindowHeight = QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "MaximumWindowWidth") { MaximumWindowWidth = QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "MaximumWindowHeight") { MaximumWindowHeight = QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "ActionAllIn") { ActionAllIn = QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "ActionRaise") { ActionRaise = QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "ActionBet") { ActionBet = QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "ActionCall") { ActionCall = QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "ActionCheck") { ActionCheck = QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "ActionFold") { ActionFold = QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "ActionWinner") { ActionWinner = QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "BigBlindPuck") { BigBlindPuck = QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "SmallBlindPuck") { SmallBlindPuck = QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "DealerPuck") { DealerPuck = QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "DefaultAvatar") { DefaultAvatar = QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "CardHolderFlop") { CardHolderFlop = QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "CardHolderTurn") { CardHolderTurn = QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "CardHolderRiver") { CardHolderRiver = QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "FoldButtonDefault") { FoldButtonDefault = QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "FoldButtonHover") { FoldButtonHover = QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "FoldButtonChecked") { FoldButtonChecked = QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "FoldButtonCheckedHover") { FoldButtonCheckedHover = QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "CheckCallButtonDefault") { CheckCallButtonDefault = QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "CheckCallButtonHover") { CheckCallButtonHover = QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "CheckCallButtonChecked") { CheckCallButtonChecked = QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "CheckCallButtonCheckedHover") { CheckCallButtonCheckedHover = QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "BetRaiseButtonDefault") { BetRaiseButtonDefault = QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "BetRaiseButtonHover") { BetRaiseButtonHover = QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "BetRaiseButtonChecked") { BetRaiseButtonChecked = QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "BetRaiseButtonCheckedHover") { BetRaiseButtonCheckedHover = QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "AllInButtonDefault") { AllInButtonDefault = QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "AllInButtonHover") { AllInButtonHover = QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "AllInButtonChecked") { AllInButtonChecked = QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "AllInButtonCheckedHover") { AllInButtonCheckedHover = QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "PlayerSeatInActive") { PlayerSeatInActive = QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "PlayerSeatActive") { PlayerSeatActive = QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "Table") { Table = QString::fromUtf8(tempString1.c_str()); } + +// std::cout << "ÖLP" << itemsList->ValueStr() <<"§4s"<< itemsList->ValueStr()<<"§89"<< endl; + } + } + wrongItems.clear(); + + if(IfFixedWindowSize == "") { wrongItems << "IfFixedWindowSize"; } + if(FixedWindowWidth == "") { wrongItems << "FixedWindowWidth"; } + if(FixedWindowHeight == "") { wrongItems << "FixedWindowHeight"; } + if(MinimumWindowWidth == "") { wrongItems << "MinimumWindowWidth"; } + if(MinimumWindowHeight == "") { wrongItems << "MinimumWindowHeight"; } + if(MaximumWindowWidth == "") { wrongItems << "MaximumWindowWidth"; } + if(MaximumWindowHeight == "") { wrongItems << "MaximumWindowHeight"; } + if(ActionAllIn == "") { wrongItems << "ActionAllIn"; } + if(ActionRaise == "") { wrongItems << "ActionRaise"; } + if(ActionBet == "") { wrongItems << "ActionBet"; } + if(ActionCall == "") { wrongItems << "ActionCall"; } + if(ActionCheck == "") { wrongItems << "ActionCheck"; } + if(ActionFold == "") { wrongItems << "ActionFold"; } + if(ActionWinner == "") { wrongItems << "ActionWinner"; } + if(BigBlindPuck == "") { wrongItems << "BigBlindPuck"; } + if(SmallBlindPuck == "") { wrongItems << "SmallBlindPuck"; } + if(DealerPuck == "") { wrongItems << "DealerPuck"; } + if(DefaultAvatar == "") { wrongItems << "DefaultAvatar"; } + if(CardHolderFlop == "") { wrongItems << "CardHolderFlop"; } + if(CardHolderTurn == "") { wrongItems << "CardHolderTurn"; } + if(CardHolderRiver == "") { wrongItems << "CardHolderRiver"; } + if(FoldButtonDefault == "") { wrongItems << "FoldButtonDefault"; } + if(FoldButtonHover == "") { wrongItems << "FoldButtonHover"; } + if(FoldButtonChecked == "") { wrongItems << "FoldButtonChecked"; } + if(FoldButtonCheckedHover == "") { wrongItems << "FoldButtonCheckedHover"; } + if(CheckCallButtonDefault == "") { wrongItems << "CheckCallButtonDefault"; } + if(CheckCallButtonHover == "") { wrongItems << "CheckCallButtonHover"; } + if(CheckCallButtonChecked == "") { wrongItems << "CheckCallButtonChecked"; } + if(CheckCallButtonCheckedHover == "") { wrongItems << "CheckCallButtonCheckedHover"; } + if(BetRaiseButtonDefault == "") { wrongItems << "BetRaiseButtonDefault"; } + if(BetRaiseButtonHover == "") { wrongItems << "BetRaiseButtonHover"; } + if(BetRaiseButtonChecked == "") { wrongItems << "BetRaiseButtonChecked"; } + if(BetRaiseButtonCheckedHover == "") { wrongItems << "BetRaiseButtonCheckedHover"; } + if(AllInButtonDefault == "") { wrongItems << "AllInButtonDefault"; } + if(AllInButtonHover == "") { wrongItems << "AllInButtonHover"; } + if(AllInButtonChecked == "") { wrongItems << "AllInButtonChecked"; } + if(AllInButtonCheckedHover == "") { wrongItems << "AllInButtonCheckedHover"; } + if(PlayerSeatActive == "") { wrongItems << "PlayerSeatActive"; } + if(PlayerSeatInActive == "") { wrongItems << "PlayerSeatInActive"; } + if(Table == "") { wrongItems << "Table"; } + + //if one or more items are wrong or left show detailed error message + if(!wrongItems.isEmpty() && myW != 0) showErrorMessage(StyleDescription, wrongItems, StyleMaintainerEMail); + } +} + +void GameTableStyleReader::showErrorMessage(QString style, QStringList failedItems, QString email) +{ + QString items = failedItems.join(", "); + + QMessageBox::warning(myW, tr("Game Table Style Error"), + tr("Selected game table style \"%1\" seems to be incomplete or defective. \nThe value of \"%2\" is wrong or left. Please contact the style builder %3.").arg(style).arg(items).arg(email), + QMessageBox::Ok); +} + diff --git a/src/gui/qt/styles/gametablestylereader.h b/src/gui/qt/styles/gametablestylereader.h new file mode 100644 index 00000000..e44ae146 --- /dev/null +++ b/src/gui/qt/styles/gametablestylereader.h @@ -0,0 +1,101 @@ +/*************************************************************************** + * Copyright (C) 2009 by Felix Hammer * + * f.hammer@web.de * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + ***************************************************************************/ +#ifndef GAMETABLESTYLEREADER_H +#define GAMETABLESTYLEREADER_H + +#include "tinyxml.h" +#include "gametableimpl.h" +#include "configfile.h" +#include +#include +#include + +class GameTableStyleReader : public QObject { +Q_OBJECT +public: + GameTableStyleReader(ConfigFile *c, gameTableImpl *w =0 ); + ~GameTableStyleReader(); + + void readStyleFile(QString); + + void showErrorMessage(QString, QStringList, QString); + + QString getStyleDescription() const { return StyleDescription; } + QString getPreview() const { return Preview; } + + + + +private: + + QString StyleDescription; + QString StyleMaintainerEMail; + QString Preview; + QString IfFixedWindowSize; + QString FixedWindowWidth; + QString FixedWindowHeight; + QString MinimumWindowWidth; + QString MinimumWindowHeight; + QString MaximumWindowWidth; + QString MaximumWindowHeight; + QString ActionAllIn; + QString ActionRaise; + QString ActionBet; + QString ActionCall; + QString ActionCheck; + QString ActionFold; + QString ActionWinner; + QString BigBlindPuck; + QString SmallBlindPuck; + QString DealerPuck; + QString DefaultAvatar; + QString CardHolderFlop; + QString CardHolderTurn; + QString CardHolderRiver; + QString FoldButtonDefault; + QString FoldButtonHover; + QString FoldButtonChecked; + QString FoldButtonCheckedHover; + QString CheckCallButtonDefault; + QString CheckCallButtonHover; + QString CheckCallButtonChecked; + QString CheckCallButtonCheckedHover; + QString BetRaiseButtonDefault; + QString BetRaiseButtonHover; + QString BetRaiseButtonChecked; + QString BetRaiseButtonCheckedHover; + QString AllInButtonDefault; + QString AllInButtonHover; + QString AllInButtonChecked; + QString AllInButtonCheckedHover; + QString PlayerSeatInActive; + QString PlayerSeatActive; + QString Table; + + QString currentFileName; + QString currentFileDir; + + QStringList wrongItems; + + ConfigFile *myConfig; + gameTableImpl *myW; +}; + +#endif