diff --git a/data/gfx/cards/default/defaultcarddeck.xml b/data/gfx/cards/default/defaultcarddeck.xml new file mode 100644 index 00000000..c23e6996 --- /dev/null +++ b/data/gfx/cards/default/defaultcarddeck.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/data/gfx/gui/table/default/defaulttablestyle.xml b/data/gfx/gui/table/default/defaulttablestyle.xml new file mode 100644 index 00000000..4eccd0f8 --- /dev/null +++ b/data/gfx/gui/table/default/defaulttablestyle.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/config/configfile.cpp b/src/config/configfile.cpp index 65992cdc..9c7cbb5f 100644 --- a/src/config/configfile.cpp +++ b/src/config/configfile.cpp @@ -48,7 +48,7 @@ ConfigFile::ConfigFile(char *argv0, bool readonly) : noWriteAccess(readonly) myQtToolsInterface = CreateQtToolsWrapper(); // !!!! Revisionsnummer der Configdefaults !!!!! - configRev = 60; + configRev = 61; //standard defaults logOnOffDefault = "1"; @@ -102,7 +102,12 @@ 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"); @@ -125,6 +130,12 @@ 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; @@ -147,6 +158,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("PlaySoundEffects", CONFIG_TYPE_INT, "1")); configList.push_back(ConfigInfo("SoundVolume", CONFIG_TYPE_INT, "8")); configList.push_back(ConfigInfo("PlayGameActions", CONFIG_TYPE_INT, "1")); @@ -370,7 +385,7 @@ void ConfigFile::writeBuffer() const { config->LinkEndChild( tmpElement ); tmpElement->SetAttribute("value", configBufferList[i].defaultValue); - if(configBufferList[i].type == CONFIG_TYPE_INT_LIST) { + if(configBufferList[i].type == CONFIG_TYPE_INT_LIST || configBufferList[i].type == CONFIG_TYPE_STRING_LIST) { tmpElement->SetAttribute("type", "list"); list tempList = configBufferList[i].defaultListValue; @@ -414,7 +429,7 @@ void ConfigFile::updateConfig(ConfigState myConfigState) { config->LinkEndChild( tmpElement ); tmpElement->SetAttribute("value", myQtToolsInterface->stringToUtf8(configList[i].defaultValue)); - if(configList[i].type == CONFIG_TYPE_INT_LIST) { + if(configList[i].type == CONFIG_TYPE_INT_LIST || configBufferList[i].type == CONFIG_TYPE_STRING_LIST) { tmpElement->SetAttribute("type", "list"); list tempList = configList[i].defaultListValue; @@ -520,7 +535,7 @@ void ConfigFile::updateConfig(ConfigState myConfigState) { config->LinkEndChild( tmpElement ); tmpElement->SetAttribute("value", myQtToolsInterface->stringToUtf8(configList[i].defaultValue)); - if(configList[i].type == CONFIG_TYPE_INT_LIST) { + if(configList[i].type == CONFIG_TYPE_INT_LIST || configBufferList[i].type == CONFIG_TYPE_STRING_LIST) { tmpElement->SetAttribute("type", "list"); list tempList = configList[i].defaultListValue; @@ -612,6 +627,22 @@ list ConfigFile::readConfigIntList(string varName) const return tempIntList; } +list ConfigFile::readConfigStringList(string varName) const +{ + boost::recursive_mutex::scoped_lock lock(m_configMutex); + + size_t i; + list tempStringList; + + for (i=0; i varCont) { boost::recursive_mutex::scoped_lock lock(m_configMutex); @@ -657,7 +687,6 @@ void ConfigFile::writeConfigIntList(string varName, list varCont) } } - void ConfigFile::writeConfigString(string varName, string varCont) { boost::recursive_mutex::scoped_lock lock(m_configMutex); @@ -668,3 +697,14 @@ void ConfigFile::writeConfigString(string varName, string varCont) } } + +void ConfigFile::writeConfigStringList(string varName, list varCont) +{ + boost::recursive_mutex::scoped_lock lock(m_configMutex); + + size_t i; + for (i=0; i enum ConfigState { NONEXISTING, OLD }; -enum ConfigType { CONFIG_TYPE_INT, CONFIG_TYPE_STRING, CONFIG_TYPE_INT_LIST }; +enum ConfigType { CONFIG_TYPE_INT, CONFIG_TYPE_STRING, CONFIG_TYPE_INT_LIST, CONFIG_TYPE_STRING_LIST }; class QtToolsInterface; @@ -42,12 +42,14 @@ public: void updateConfig(ConfigState); std::string readConfigString(std::string varName) const; + std::list readConfigStringList(std::string varName) const; void writeConfigString(std::string varName, std::string varCont); - + void writeConfigStringList(std::string varName, std::list varCont); int readConfigInt(std::string varName) const; std::list readConfigIntList(std::string varName) const; void writeConfigInt(std::string varName, int varCont); void writeConfigIntList(std::string varName, std::list varCont); + private: @@ -70,6 +72,11 @@ private: std::string logDir; std::string dataDir; 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.ui b/src/gui/qt/gametable.ui index d12afbb1..6260b671 100644 --- a/src/gui/qt/gametable.ui +++ b/src/gui/qt/gametable.ui @@ -1547,19 +1547,19 @@ 440 42 - 95 + 90 36 - 95 + 90 0 - 95 + 90 16777215 diff --git a/src/gui/qt/settingsdialog.ui b/src/gui/qt/settingsdialog.ui index ddb44f4e..fc0a67ae 100644 --- a/src/gui/qt/settingsdialog.ui +++ b/src/gui/qt/settingsdialog.ui @@ -1,8 +1,7 @@ - - + settingsDialog - - + + 0 0 @@ -10,163 +9,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 - - - 0 + + + 1 - - - - - - QLabel { font-weight: bold; } + + + + + + QLabel { font-weight: bold; } - + Interface - - - + + + Qt::Horizontal - - + + - - + + Language: - + comboBox_switchLanguage - + - + Qt::Horizontal - + 40 20 @@ -176,89 +175,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 @@ -266,69 +265,69 @@ - - - + + + Flipside of Cards - - + + 9 - + 0 - + 9 - + 9 - + 6 - - - + + + 0 - + 0 - - + + 2 - + 0 - - + + Own flipside picture: - - + + false - - + + false - + 27 26 - + 27 26 @@ -339,26 +338,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 @@ -366,12 +365,12 @@ p, li { white-space: pre-wrap; } - + - + Qt::Vertical - + 400 111 @@ -381,147 +380,289 @@ p, li { white-space: pre-wrap; } - - - - - - QLabel { font-weight: bold; } + + + + + + QLabel { font-weight: bold; } - + Style - - - + + + Qt::Horizontal - - - + + + Game Table Styles + + + + + + + + + + Auswählen + + + + + + + Qt::Vertical + + + + 20 + 17 + + + + + + + + Hinzufügen ... + + + + + + + Löschen + + + + + + + + + Vorschau: + + + + + + + 160 + 120 + + + + + 160 + 120 + + + + + + + + + + + - - - + + + Card Decks + + + + + + + + + + Auswählen + + + + + + + Qt::Vertical + + + + 20 + 17 + + + + + + + + Hinzufügen ... + + + + + + + Löschen + + + + + + + + + Vorschau: + + + + + + + 160 + 120 + + + + + 160 + 120 + + + + + + + + + + + - - - - - - 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 @@ -532,12 +673,12 @@ p, li { white-space: pre-wrap; } - + - + Qt::Vertical - + 400 321 @@ -547,46 +688,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 @@ -594,29 +735,29 @@ p, li { white-space: pre-wrap; } - + - - + + Start Cash: - + spinBox_startCash - - + + $ - + 1000 - + 1000000 - + 50 @@ -624,26 +765,26 @@ p, li { white-space: pre-wrap; } - + - - + + First small blind: - + spinBox_firstSmallBlind - - + + $ - + 5 - + 500 @@ -651,85 +792,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 @@ -741,43 +882,43 @@ p, li { white-space: pre-wrap; } - - - + + + 0 0 - + Raise mode: - - + + 0 - - - + + + Always double blinds - + true - - - + + + Manual blinds order: - - - + + + false - + Edit ... @@ -788,26 +929,26 @@ p, li { white-space: pre-wrap; } - + - - + + Game Speed: - + spinBox_gameSpeed - - + + 1 - + 11 - + 1 @@ -815,25 +956,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 @@ -843,46 +984,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 @@ -890,29 +1031,29 @@ p, li { white-space: pre-wrap; } - + - - + + Start Cash: - + spinBox_netStartCash - - + + $ - + 1000 - + 1000000 - + 50 @@ -920,26 +1061,26 @@ p, li { white-space: pre-wrap; } - + - - + + First small blind: - + spinBox_netFirstSmallBlind - - + + $ - + 5 - + 500 @@ -947,94 +1088,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 @@ -1046,58 +1187,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 ... @@ -1108,26 +1249,26 @@ p, li { white-space: pre-wrap; } - + - - + + Game Speed for computer opponents: - + spinBox_netGameSpeed - - + + 1 - + 11 - + 1 @@ -1135,29 +1276,29 @@ p, li { white-space: pre-wrap; } - + - - + + Timeout for player action: - + spinBox_netTimeOutPlayerAction - - + + s - + 5 - + 60 - + 20 @@ -1165,99 +1306,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 @@ -1266,11 +1407,11 @@ p, li { white-space: pre-wrap; } - - + + Qt::Vertical - + 20 40 @@ -1280,196 +1421,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 @@ -1477,111 +1618,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 @@ -1589,12 +1730,12 @@ p, li { white-space: pre-wrap; } - - - + + + Qt::Vertical - + 20 98 @@ -1602,36 +1743,36 @@ p, li { white-space: pre-wrap; } - - - + + + 0 - - + + Use password for private game: - - + + false - + QLineEdit::Password - + - + Qt::Vertical - + 437 16 @@ -1641,36 +1782,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 @@ -1678,34 +1819,34 @@ p, li { white-space: pre-wrap; } - - - - + + + + 0 0 - + 200 16777215 - + Human Player: - + Qt::AlignCenter - - - + + + Qt::Horizontal - + 40 20 @@ -1713,14 +1854,14 @@ p, li { white-space: pre-wrap; } - - + + - - + + Qt::Horizontal - + 40 20 @@ -1729,23 +1870,23 @@ p, li { white-space: pre-wrap; } - - + + 60 60 - + 60 60 - + - + 50 50 @@ -1754,11 +1895,11 @@ p, li { white-space: pre-wrap; } - - + + Qt::Horizontal - + 40 20 @@ -1768,12 +1909,12 @@ p, li { white-space: pre-wrap; } - - - + + + Qt::Horizontal - + 78 20 @@ -1781,37 +1922,37 @@ p, li { white-space: pre-wrap; } - - - - + + + + 0 0 - + 100 25 - + 100 25 - + 12 - - - + + + Qt::Horizontal - + 88 20 @@ -1821,92 +1962,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 @@ -1915,26 +2056,26 @@ p, li { white-space: pre-wrap; } - - - + + + 0 0 - + 60 60 - + 60 60 - + 50 50 @@ -1944,13 +2085,13 @@ p, li { white-space: pre-wrap; } - + Qt::Horizontal - + QSizePolicy::Fixed - + 3 20 @@ -1963,83 +2104,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 @@ -2048,26 +2189,26 @@ p, li { white-space: pre-wrap; } - - - + + + 0 0 - + 60 60 - + 60 60 - + 50 50 @@ -2077,13 +2218,13 @@ p, li { white-space: pre-wrap; } - + Qt::Horizontal - + QSizePolicy::Fixed - + 3 20 @@ -2096,83 +2237,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 @@ -2181,26 +2322,26 @@ p, li { white-space: pre-wrap; } - - - + + + 0 0 - + 60 60 - + 60 60 - + 50 50 @@ -2210,13 +2351,13 @@ p, li { white-space: pre-wrap; } - + Qt::Horizontal - + QSizePolicy::Fixed - + 3 20 @@ -2229,83 +2370,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 @@ -2314,26 +2455,26 @@ p, li { white-space: pre-wrap; } - - - + + + 0 0 - + 60 60 - + 60 60 - + 50 50 @@ -2343,13 +2484,13 @@ p, li { white-space: pre-wrap; } - + Qt::Horizontal - + QSizePolicy::Fixed - + 3 20 @@ -2362,58 +2503,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 @@ -2422,26 +2563,26 @@ p, li { white-space: pre-wrap; } - - - + + + 0 0 - + 60 60 - + 60 60 - + 50 50 @@ -2451,13 +2592,13 @@ p, li { white-space: pre-wrap; } - + Qt::Horizontal - + QSizePolicy::Fixed - + 3 20 @@ -2467,27 +2608,27 @@ p, li { white-space: pre-wrap; } - - - - + + + + 0 0 - + 100 25 - + 100 25 - + 12 @@ -2496,33 +2637,33 @@ p, li { white-space: pre-wrap; } - - + + - - + + 0 - + 0 - - - + + + 6 - + 0 - + Qt::Horizontal - + QSizePolicy::Fixed - + 3 20 @@ -2531,26 +2672,26 @@ p, li { white-space: pre-wrap; } - - - + + + 0 0 - + 60 60 - + 60 60 - + 50 50 @@ -2560,13 +2701,13 @@ p, li { white-space: pre-wrap; } - + Qt::Horizontal - + QSizePolicy::Fixed - + 3 20 @@ -2576,55 +2717,55 @@ p, li { white-space: pre-wrap; } - - - - + + + + 0 0 - + 100 25 - + 100 25 - + 12 - - - - + + + + 0 0 - + 100 0 - + 100 16777215 - + Opponent 6: - + Qt::AlignCenter @@ -2632,30 +2773,30 @@ p, li { white-space: pre-wrap; } - - + + 0 - + 0 - - - + + + 6 - + 0 - + Qt::Horizontal - + QSizePolicy::Fixed - + 3 20 @@ -2664,26 +2805,26 @@ p, li { white-space: pre-wrap; } - - - + + + 0 0 - + 60 60 - + 60 60 - + 50 50 @@ -2693,13 +2834,13 @@ p, li { white-space: pre-wrap; } - + Qt::Horizontal - + QSizePolicy::Fixed - + 3 20 @@ -2709,55 +2850,55 @@ p, li { white-space: pre-wrap; } - - - - + + + + 0 0 - + 100 25 - + 100 25 - + 12 - - - - + + + + 0 0 - + 100 0 - + 100 16777215 - + Opponent 7: - + Qt::AlignCenter @@ -2765,30 +2906,30 @@ p, li { white-space: pre-wrap; } - - + + 0 - + 0 - - - + + + 6 - + 0 - + Qt::Horizontal - + QSizePolicy::Fixed - + 3 20 @@ -2797,26 +2938,26 @@ p, li { white-space: pre-wrap; } - - - + + + 0 0 - + 60 60 - + 60 60 - + 50 50 @@ -2826,13 +2967,13 @@ p, li { white-space: pre-wrap; } - + Qt::Horizontal - + QSizePolicy::Fixed - + 3 20 @@ -2842,55 +2983,55 @@ p, li { white-space: pre-wrap; } - - - - + + + + 0 0 - + 100 25 - + 100 25 - + 12 - - - - + + + + 0 0 - + 100 0 - + 100 16777215 - + Opponent 8: - + Qt::AlignCenter @@ -2898,30 +3039,30 @@ p, li { white-space: pre-wrap; } - - + + 0 - + 0 - - - + + + 6 - + 0 - + Qt::Horizontal - + QSizePolicy::Fixed - + 3 20 @@ -2930,26 +3071,26 @@ p, li { white-space: pre-wrap; } - - - + + + 0 0 - + 60 60 - + 60 60 - + 50 50 @@ -2959,13 +3100,13 @@ p, li { white-space: pre-wrap; } - + Qt::Horizontal - + QSizePolicy::Fixed - + 3 20 @@ -2975,55 +3116,55 @@ p, li { white-space: pre-wrap; } - - - - + + + + 0 0 - + 100 25 - + 100 25 - + 12 - - - - + + + + 0 0 - + 100 0 - + 100 16777215 - + Opponent 10: - + Qt::AlignCenter @@ -3035,25 +3176,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 @@ -3063,59 +3204,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 @@ -3123,65 +3264,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) @@ -3190,29 +3331,29 @@ p, li { white-space: pre-wrap; } - - - - QLabel { font-weight: bold; } + + + + QLabel { font-weight: bold; } - + Log Messages - - - + + + Qt::Horizontal - + - + Qt::Vertical - + 20 40 @@ -3226,19 +3367,19 @@ p, li { white-space: pre-wrap; } - - - + + + Qt::Horizontal - - - + + + Qt::Horizontal - + QDialogButtonBox::Cancel|QDialogButtonBox::Ok @@ -3337,7 +3478,7 @@ p, li { white-space: pre-wrap; } buttonBox - + @@ -3346,11 +3487,11 @@ p, li { white-space: pre-wrap; } stackedWidget setCurrentIndex(int) - + 127 60 - + 281 85 @@ -3362,11 +3503,11 @@ p, li { white-space: pre-wrap; } lineEdit_OwnFlipsideFilename setEnabled(bool) - + 360 373 - + 723 374 @@ -3378,11 +3519,11 @@ p, li { white-space: pre-wrap; } pushButton_openFlipsidePicture setEnabled(bool) - + 360 373 - + 752 375 @@ -3394,11 +3535,11 @@ p, li { white-space: pre-wrap; } settingsDialog reject() - + 595 520 - + 599 497 @@ -3410,11 +3551,11 @@ p, li { white-space: pre-wrap; } lineEdit_InternetGamePassword setEnabled(bool) - + 411 443 - + 717 444 @@ -3426,11 +3567,11 @@ p, li { white-space: pre-wrap; } label_soundVolume setNum(int) - + 648 98 - + 336 99 @@ -3442,11 +3583,11 @@ p, li { white-space: pre-wrap; } pushButton_editManualBlindsOrder setEnabled(bool) - + 753 220 - + 753 256 @@ -3458,11 +3599,11 @@ p, li { white-space: pre-wrap; } pushButton_netEditManualBlindsOrder setEnabled(bool) - + 756 218 - + 756 245 @@ -3474,11 +3615,11 @@ p, li { white-space: pre-wrap; } lineEdit_avatarServerAddress setEnabled(bool) - + 314 318 - + 366 320