diff --git a/data/gfx/gui/table/danuxi1/action_allin.png b/data/gfx/gui/misc/actionpics/action_allin.png similarity index 100% rename from data/gfx/gui/table/danuxi1/action_allin.png rename to data/gfx/gui/misc/actionpics/action_allin.png diff --git a/data/gfx/gui/table/danuxi1/action_bet.png b/data/gfx/gui/misc/actionpics/action_bet.png similarity index 100% rename from data/gfx/gui/table/danuxi1/action_bet.png rename to data/gfx/gui/misc/actionpics/action_bet.png diff --git a/data/gfx/gui/table/danuxi1/action_call.png b/data/gfx/gui/misc/actionpics/action_call.png similarity index 100% rename from data/gfx/gui/table/danuxi1/action_call.png rename to data/gfx/gui/misc/actionpics/action_call.png diff --git a/data/gfx/gui/table/danuxi1/action_check.png b/data/gfx/gui/misc/actionpics/action_check.png similarity index 100% rename from data/gfx/gui/table/danuxi1/action_check.png rename to data/gfx/gui/misc/actionpics/action_check.png diff --git a/data/gfx/gui/table/danuxi1/action_fold.png b/data/gfx/gui/misc/actionpics/action_fold.png similarity index 100% rename from data/gfx/gui/table/danuxi1/action_fold.png rename to data/gfx/gui/misc/actionpics/action_fold.png diff --git a/data/gfx/gui/table/danuxi1/action_raise.png b/data/gfx/gui/misc/actionpics/action_raise.png similarity index 100% rename from data/gfx/gui/table/danuxi1/action_raise.png rename to data/gfx/gui/misc/actionpics/action_raise.png diff --git a/data/gfx/gui/table/default/action_winner.png b/data/gfx/gui/misc/actionpics/action_winner.png similarity index 100% rename from data/gfx/gui/table/default/action_winner.png rename to data/gfx/gui/misc/actionpics/action_winner.png diff --git a/data/gfx/gui/table/danuxi1/action_template.xcf b/data/gfx/gui/table/danuxi1/action_template.xcf deleted file mode 100644 index 5a865810..00000000 Binary files a/data/gfx/gui/table/danuxi1/action_template.xcf and /dev/null differ diff --git a/data/gfx/gui/table/danuxi1/danuxi1tablestyle.xml b/data/gfx/gui/table/danuxi1/danuxi1tablestyle.xml index 1f79387b..945f6d61 100644 --- a/data/gfx/gui/table/danuxi1/danuxi1tablestyle.xml +++ b/data/gfx/gui/table/danuxi1/danuxi1tablestyle.xml @@ -11,13 +11,13 @@ - - - - - - - + + + + + + + diff --git a/data/gfx/gui/table/default/action_allin.png b/data/gfx/gui/table/default/action_allin.png deleted file mode 100644 index f99507e2..00000000 Binary files a/data/gfx/gui/table/default/action_allin.png and /dev/null differ diff --git a/data/gfx/gui/table/default/action_bet.png b/data/gfx/gui/table/default/action_bet.png deleted file mode 100644 index 82b2a504..00000000 Binary files a/data/gfx/gui/table/default/action_bet.png and /dev/null differ diff --git a/data/gfx/gui/table/default/action_call.png b/data/gfx/gui/table/default/action_call.png deleted file mode 100644 index 5566174e..00000000 Binary files a/data/gfx/gui/table/default/action_call.png and /dev/null differ diff --git a/data/gfx/gui/table/default/action_check.png b/data/gfx/gui/table/default/action_check.png deleted file mode 100644 index 6f76e635..00000000 Binary files a/data/gfx/gui/table/default/action_check.png and /dev/null differ diff --git a/data/gfx/gui/table/default/action_fold.png b/data/gfx/gui/table/default/action_fold.png deleted file mode 100644 index 2e56d3bb..00000000 Binary files a/data/gfx/gui/table/default/action_fold.png and /dev/null differ diff --git a/data/gfx/gui/table/default/action_raise.png b/data/gfx/gui/table/default/action_raise.png deleted file mode 100644 index 8051bbf9..00000000 Binary files a/data/gfx/gui/table/default/action_raise.png and /dev/null differ diff --git a/data/gfx/gui/table/default/defaulttablestyle.xml b/data/gfx/gui/table/default/defaulttablestyle.xml index 4c44de75..2d686e02 100644 --- a/data/gfx/gui/table/default/defaulttablestyle.xml +++ b/data/gfx/gui/table/default/defaulttablestyle.xml @@ -15,13 +15,6 @@ - - - - - - - @@ -57,7 +50,14 @@ - + + + + + + + + diff --git a/src/config/configfile.cpp b/src/config/configfile.cpp index d8acf1bc..10cd5f59 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 = 64; + configRev = 65; //standard defaults logOnOffDefault = "1"; @@ -139,6 +139,7 @@ ConfigFile::ConfigFile(char *argv0, bool readonly) : noWriteAccess(readonly) configList.push_back(ConfigInfo("ShowFlipCardsAnimation", CONFIG_TYPE_INT, "1")); configList.push_back(ConfigInfo("ShowBlindButtons", CONFIG_TYPE_INT, "1")); configList.push_back(ConfigInfo("ShowCardsChanceMonitor", CONFIG_TYPE_INT, "1")); + configList.push_back(ConfigInfo("DontTranslateInternationalPokerStringsFromStyle", CONFIG_TYPE_INT, "0")); configList.push_back(ConfigInfo("AntiPeekMode", CONFIG_TYPE_INT, "0")); configList.push_back(ConfigInfo("AlternateFKeysUserActionMode", CONFIG_TYPE_INT, "0")); configList.push_back(ConfigInfo("EnableBetInputFocusSwitch", CONFIG_TYPE_INT, "0")); diff --git a/src/gui/qt/settingsdialog.ui b/src/gui/qt/settingsdialog.ui index f30b5471..5b567793 100644 --- a/src/gui/qt/settingsdialog.ui +++ b/src/gui/qt/settingsdialog.ui @@ -212,13 +212,6 @@ - - - - Show buttons for small blind and big blind - - - @@ -240,6 +233,20 @@ + + + + Show buttons for small blind and big blind + + + + + + + Don't translate poker strings like check, call, raise from game table style + + + @@ -3399,7 +3406,6 @@ p, li { white-space: pre-wrap; } checkBox_showRightToolbox checkBox_showFadeOutCardsAnimation checkBox_alternateFKeysUserActionMode - checkBox_showBlindButtons checkBox_enableBetInputFocusSwitch radioButton_flipsideTux radioButton_flipsideOwn diff --git a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp index 39b33377..5b1ce317 100644 --- a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp +++ b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp @@ -228,6 +228,7 @@ void settingsDialogImpl::exec() { checkBox_alternateFKeysUserActionMode->setChecked(myConfig->readConfigInt("AlternateFKeysUserActionMode")); checkBox_enableBetInputFocusSwitch->setChecked(myConfig->readConfigInt("EnableBetInputFocusSwitch")); checkBox_cardsChanceMonitor->setChecked(myConfig->readConfigInt("ShowCardsChanceMonitor")); + checkBox_dontTranslatePokerStrings->setChecked(myConfig->readConfigInt("DontTranslateInternationalPokerStringsFromStyle")); radioButton_flipsideTux->setChecked(myConfig->readConfigInt("FlipsideTux")); radioButton_flipsideOwn->setChecked(myConfig->readConfigInt("FlipsideOwn")); @@ -513,6 +514,7 @@ void settingsDialogImpl::isAccepted() { myConfig->writeConfigInt("ShowCardsChanceMonitor", checkBox_cardsChanceMonitor->isChecked()); myConfig->writeConfigInt("AntiPeekMode", checkBox_antiPeekMode->isChecked()); myConfig->writeConfigInt("AlternateFKeysUserActionMode", checkBox_alternateFKeysUserActionMode->isChecked()); + myConfig->writeConfigInt("DontTranslateInternationalPokerStringsFromStyle", checkBox_dontTranslatePokerStrings->isChecked()); myConfig->writeConfigInt("EnableBetInputFocusSwitch", checkBox_enableBetInputFocusSwitch->isChecked()); myConfig->writeConfigInt("FlipsideTux", radioButton_flipsideTux->isChecked()); myConfig->writeConfigInt("FlipsideOwn", radioButton_flipsideOwn->isChecked()); diff --git a/src/gui/qt/styles/gametablestylereader.cpp b/src/gui/qt/styles/gametablestylereader.cpp index 7fd9e314..2e85b7b4 100644 --- a/src/gui/qt/styles/gametablestylereader.cpp +++ b/src/gui/qt/styles/gametablestylereader.cpp @@ -117,13 +117,13 @@ void GameTableStyleReader::readStyleFile(QString file) { else if (itemsList->ValueStr() == "MaximumWindowHeight") { MaximumWindowHeight = QString::fromUtf8(tempString1.c_str()); } // PICS else if (itemsList->ValueStr() == "Preview") { Preview = currentDir+QString::fromUtf8(tempString1.c_str()); } - else if (itemsList->ValueStr() == "ActionAllIn") { ActionAllIn = currentDir+QString::fromUtf8(tempString1.c_str()); } - else if (itemsList->ValueStr() == "ActionRaise") { ActionRaise = currentDir+QString::fromUtf8(tempString1.c_str()); } - else if (itemsList->ValueStr() == "ActionBet") { ActionBet = currentDir+QString::fromUtf8(tempString1.c_str()); } - else if (itemsList->ValueStr() == "ActionCall") { ActionCall = currentDir+QString::fromUtf8(tempString1.c_str()); } - else if (itemsList->ValueStr() == "ActionCheck") { ActionCheck = currentDir+QString::fromUtf8(tempString1.c_str()); } - else if (itemsList->ValueStr() == "ActionFold") { ActionFold = currentDir+QString::fromUtf8(tempString1.c_str()); } - else if (itemsList->ValueStr() == "ActionWinner") { ActionWinner = currentDir+QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "ActionAllInI18N") { ActionAllInI18N = currentDir+QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "ActionRaiseI18N") { ActionRaiseI18N = currentDir+QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "ActionBetI18N") { ActionBetI18N = currentDir+QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "ActionCallI18N") { ActionCallI18N = currentDir+QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "ActionCheckI18N") { ActionCheckI18N = currentDir+QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "ActionFoldI18N") { ActionFoldI18N = currentDir+QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "ActionWinnerI18N") { ActionWinnerI18N = currentDir+QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "BigBlindPuck") { BigBlindPuck = currentDir+QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "SmallBlindPuck") { SmallBlindPuck = currentDir+QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "DealerPuck") { DealerPuck = currentDir+QString::fromUtf8(tempString1.c_str()); } @@ -217,128 +217,146 @@ void GameTableStyleReader::readStyleFile(QString file) { // std::cout << "ÖLP" << itemsList->ValueStr() <<"§4s"<< itemsList->ValueStr()<<"§89"<< endl; } } - wrongItems.clear(); + + //check if style items are left and if pictures where not found and show warning + leftItems.clear(); + itemPicsLeft.clear(); // INFOS - if(StyleDescription == "") { wrongItems << "StyleDescription"; } + if(StyleDescription == "") { leftItems << "StyleDescription"; } // WINDOWS SETTINGS - 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(IfFixedWindowSize == "") { leftItems << "IfFixedWindowSize"; } + if(FixedWindowWidth == "") { leftItems << "FixedWindowWidth"; } + if(FixedWindowHeight == "") { leftItems << "FixedWindowHeight"; } + if(MinimumWindowWidth == "") { leftItems << "MinimumWindowWidth"; } + if(MinimumWindowHeight == "") { leftItems << "MinimumWindowHeight"; } + if(MaximumWindowWidth == "") { leftItems << "MaximumWindowWidth"; } + if(MaximumWindowHeight == "") { leftItems << "MaximumWindowHeight"; } // PICS - 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(RadioButtonPressed == "") { wrongItems << "RadioButtonPressed"; } - if(RadioButtonChecked == "") { wrongItems << "RadioButtonChecked"; } - if(RadioButtonCheckedHover == "") { wrongItems << "RadioButtonCheckedHover"; } - if(RadioButtonUnchecked == "") { wrongItems << "RadioButtonUnchecked"; } - if(RadioButtonUncheckedHover == "") { wrongItems << "RadioButtonUncheckedHover"; } - if(PlayerTopSeatActive == "") { wrongItems << "PlayerTopSeatActive"; } - if(PlayerTopSeatInactive == "") { wrongItems << "PlayerTopSeatInactive"; } - if(PlayerBottomSeatActive == "") { wrongItems << "PlayerBottomSeatActive"; } - if(PlayerBottomSeatInactive == "") { wrongItems << "PlayerBottomSeatInactive"; } - if(Table == "") { wrongItems << "Table"; } - if(HandRanking == "") { wrongItems << "HandRanking"; } - if(ToolBoxBackground == "") { wrongItems << "ToolBoxBackground"; } + if(ActionAllInI18N == "") { leftItems << "ActionAllInI18N"; } + else if(ActionAllInI18N != QString(currentDir+"NULL") && !QFile(ActionAllInI18N).exists()) { itemPicsLeft << "ActionAllInI18N = "+ActionAllInI18N; } + if(ActionRaiseI18N == "") { leftItems << "ActionRaiseI18N"; } + else if(ActionRaiseI18N != QString(currentDir+"NULL") && !QFile(ActionRaiseI18N).exists()) { itemPicsLeft << "ActionRaiseI18N = "+ActionRaiseI18N; } + if(ActionBetI18N == "") { leftItems << "ActionBetI18N"; } + else if(ActionBetI18N != QString(currentDir+"NULL") && !QFile(ActionBetI18N).exists()) { itemPicsLeft << "ActionBetI18N = "+ActionBetI18N; } + if(ActionCallI18N == "") { leftItems << "ActionCallI18N"; } + else if(ActionCallI18N != QString(currentDir+"NULL") && !QFile(ActionCallI18N).exists()) { itemPicsLeft << "ActionCallI18N = "+ActionCallI18N; } + if(ActionCheckI18N == "") { leftItems << "ActionCheckI18N"; } + if(ActionFoldI18N == "") { leftItems << "ActionFoldI18N"; } + if(ActionWinnerI18N == "") { leftItems << "ActionWinnerI18N"; } + if(BigBlindPuck == "") { leftItems << "BigBlindPuck"; } + if(SmallBlindPuck == "") { leftItems << "SmallBlindPuck"; } + if(DealerPuck == "") { leftItems << "DealerPuck"; } + if(DefaultAvatar == "") { leftItems << "DefaultAvatar"; } + if(CardHolderFlop == "") { leftItems << "CardHolderFlop"; } + if(CardHolderTurn == "") { leftItems << "CardHolderTurn"; } + if(CardHolderRiver == "") { leftItems << "CardHolderRiver"; } + if(FoldButtonDefault == "") { leftItems << "FoldButtonDefault"; } + if(FoldButtonHover == "") { leftItems << "FoldButtonHover"; } + if(FoldButtonChecked == "") { leftItems << "FoldButtonChecked"; } + if(FoldButtonCheckedHover == "") { leftItems << "FoldButtonCheckedHover"; } + if(CheckCallButtonDefault == "") { leftItems << "CheckCallButtonDefault"; } + if(CheckCallButtonHover == "") { leftItems << "CheckCallButtonHover"; } + if(CheckCallButtonChecked == "") { leftItems << "CheckCallButtonChecked"; } + if(CheckCallButtonCheckedHover == "") { leftItems << "CheckCallButtonCheckedHover"; } + if(BetRaiseButtonDefault == "") { leftItems << "BetRaiseButtonDefault"; } + if(BetRaiseButtonHover == "") { leftItems << "BetRaiseButtonHover"; } + if(BetRaiseButtonChecked == "") { leftItems << "BetRaiseButtonChecked"; } + if(BetRaiseButtonCheckedHover == "") { leftItems << "BetRaiseButtonCheckedHover"; } + if(AllInButtonDefault == "") { leftItems << "AllInButtonDefault"; } + if(AllInButtonHover == "") { leftItems << "AllInButtonHover"; } + if(AllInButtonChecked == "") { leftItems << "AllInButtonChecked"; } + if(AllInButtonCheckedHover == "") { leftItems << "AllInButtonCheckedHover"; } + if(RadioButtonPressed == "") { leftItems << "RadioButtonPressed"; } + if(RadioButtonChecked == "") { leftItems << "RadioButtonChecked"; } + if(RadioButtonCheckedHover == "") { leftItems << "RadioButtonCheckedHover"; } + if(RadioButtonUnchecked == "") { leftItems << "RadioButtonUnchecked"; } + if(RadioButtonUncheckedHover == "") { leftItems << "RadioButtonUncheckedHover"; } + if(PlayerTopSeatActive == "") { leftItems << "PlayerTopSeatActive"; } + if(PlayerTopSeatInactive == "") { leftItems << "PlayerTopSeatInactive"; } + if(PlayerBottomSeatActive == "") { leftItems << "PlayerBottomSeatActive"; } + if(PlayerBottomSeatInactive == "") { leftItems << "PlayerBottomSeatInactive"; } + if(Table == "") { leftItems << "Table"; } + if(HandRanking == "") { leftItems << "HandRanking"; } + if(ToolBoxBackground == "") { leftItems << "ToolBoxBackground"; } // COLORS - if(FKeyIndicatorColor == "") { wrongItems << "FKeyIndicatorColor"; } - if(ChanceLabelPossibleColor == "") { wrongItems << "ChanceLabelPossibleColor"; } - if(ChanceLabelImpossibleColor == "") { wrongItems << "ChanceLabelImpossibleColor"; } - if(ChatLogTextColor == "") { wrongItems << "ChatLogTextColor"; } - if(ChatTextNickNotifyColor == "") { wrongItems << "ChatTextNickNotifyColor"; } - if(ChatLogBgColor == "") { wrongItems << "ChatLogBgColor"; } - if(ChatLogScrollBarBorderColor == "") { wrongItems << "ChatLogScrollBarBorderColor"; } - if(ChatLogScrollBarBgColor == "") { wrongItems << "ChatLogScrollBarBgColor"; } - if(ChatLogScrollBarHandleBorderColor == "") { wrongItems << "ChatLogScrollBarHandleBorderColor"; } - if(ChatLogScrollBarHandleBgColor == "") { wrongItems << "ChatLogScrollBarHandleBgColor"; } - if(ChatLogScrollBarArrowBorderColor == "") { wrongItems << "ChatLogScrollBarArrowBorderColor"; } - if(ChatLogScrollBarArrowBgColor == "") { wrongItems << "ChatLogScrollBarArrowBgColor"; } - if(LogWinnerMainPotColor == "") { wrongItems << "LogWinnerMainPotColor"; } - if(LogWinnerSidePotColor == "") { wrongItems << "LogWinnerSidePotColor"; } - if(LogPlayerSitsOutColor == "") { wrongItems << "LogPlayerSitsOutColor"; } - if(LogNewGameAdminColor == "") { wrongItems << "LogNewGameAdminColor"; } - if(TabWidgetBorderColor == "") { wrongItems << "TabWidgetBorderColor"; } - if(TabWidgetBgColor == "") { wrongItems << "TabWidgetBgColor"; } - if(TabWidgetTextColor == "") { wrongItems << "TabWidgetTextColor"; } - if(MenuBgColor == "") { wrongItems << "MenuBgColor"; } - if(MenuTextColor == "") { wrongItems << "MenuTextColor"; } - if(BreakLobbyButtonBgColor == "") { wrongItems << "BreakLobbyButtonBgColor"; } - if(BreakLobbyButtonTextColor == "") { wrongItems << "BreakLobbyButtonTextColor"; } - if(BreakLobbyButtonBgDisabledColor == "") { wrongItems << "BreakLobbyButtonBgDisabledColor"; } - if(BreakLobbyButtonTextDisabledColor == "") { wrongItems << "BreakLobbyButtonTextDisabledColor"; } - if(BreakLobbyButtonBgBlinkColor == "") { wrongItems << "BreakLobbyButtonBgBlinkColor"; } - if(BreakLobbyButtonTextBlinkColor == "") { wrongItems << "BreakLobbyButtonTextBlinkColor"; } - if(PlayerCashTextColor == "") { wrongItems << "PlayerCashTextColor"; } - if(PlayerBetTextColor == "") { wrongItems << "PlayerBetTextColor"; } - if(PlayerNickTextColor == "") { wrongItems << "PlayerNickTextColor"; } - if(BoardBigTextColor == "") { wrongItems << "BoardBigTextColor"; } - if(BoardSmallTextColor == "") { wrongItems << "BoardSmallTextColor"; } - if(SpeedTextColor == "") { wrongItems << "SpeedTextColor"; } - if(VoteButtonBgColor == "") { wrongItems << "VoteButtonBgColor"; } - if(VoteButtonTextColor == "") { wrongItems << "VoteButtonTextColor"; } - if(BetInputTextColor == "") { wrongItems << "BetInputTextColor"; } - if(BetInputBgColor == "") { wrongItems << "BetInputBgColor"; } - if(BetInputDisabledTextColor == "") { wrongItems << "BetInputDisabledTextColor"; } - if(BetInputDisabledBgColor == "") { wrongItems << "BetInputDisabledBgColor"; } - if(FoldButtonTextColor == "") { wrongItems << "FoldButtonTextColor"; } - if(FoldButtonCheckableTextColor == "") { wrongItems << "FoldButtonCheckableTextColor"; } - if(CheckCallButtonTextColor == "") { wrongItems << "CheckCallButtonTextColor"; } - if(CheckCallButtonCheckableTextColor == "") { wrongItems << "CheckCallButtonCheckableTextColor"; } - if(BetRaiseButtonTextColor == "") { wrongItems << "BetRaiseButtonTextColor"; } - if(BetRaiseButtonCheckableTextColor == "") { wrongItems << "BetRaiseButtonCheckableTextColor"; } - if(AllInButtonTextColor == "") { wrongItems << "AllInButtonTextColor"; } - if(AllInButtonCheckableTextColor == "") { wrongItems << "AllInButtonCheckableTextColor"; } - if(BetSpeedSliderGrooveBgColor == "") { wrongItems << "BetSpeedSliderGrooveBgColor"; } - if(BetSpeedSliderGrooveBorderColor == "") { wrongItems << "BetSpeedSliderGrooveBorderColor"; } - if(BetSpeedSliderHandleBgColor == "") { wrongItems << "BetSpeedSliderHandleBgColor"; } - if(BetSpeedSliderHandleBorderColor == "") { wrongItems << "BetSpeedSliderHandleBorderColor"; } + if(FKeyIndicatorColor == "") { leftItems << "FKeyIndicatorColor"; } + if(ChanceLabelPossibleColor == "") { leftItems << "ChanceLabelPossibleColor"; } + if(ChanceLabelImpossibleColor == "") { leftItems << "ChanceLabelImpossibleColor"; } + if(ChatLogTextColor == "") { leftItems << "ChatLogTextColor"; } + if(ChatTextNickNotifyColor == "") { leftItems << "ChatTextNickNotifyColor"; } + if(ChatLogBgColor == "") { leftItems << "ChatLogBgColor"; } + if(ChatLogScrollBarBorderColor == "") { leftItems << "ChatLogScrollBarBorderColor"; } + if(ChatLogScrollBarBgColor == "") { leftItems << "ChatLogScrollBarBgColor"; } + if(ChatLogScrollBarHandleBorderColor == "") { leftItems << "ChatLogScrollBarHandleBorderColor"; } + if(ChatLogScrollBarHandleBgColor == "") { leftItems << "ChatLogScrollBarHandleBgColor"; } + if(ChatLogScrollBarArrowBorderColor == "") { leftItems << "ChatLogScrollBarArrowBorderColor"; } + if(ChatLogScrollBarArrowBgColor == "") { leftItems << "ChatLogScrollBarArrowBgColor"; } + if(LogWinnerMainPotColor == "") { leftItems << "LogWinnerMainPotColor"; } + if(LogWinnerSidePotColor == "") { leftItems << "LogWinnerSidePotColor"; } + if(LogPlayerSitsOutColor == "") { leftItems << "LogPlayerSitsOutColor"; } + if(LogNewGameAdminColor == "") { leftItems << "LogNewGameAdminColor"; } + if(TabWidgetBorderColor == "") { leftItems << "TabWidgetBorderColor"; } + if(TabWidgetBgColor == "") { leftItems << "TabWidgetBgColor"; } + if(TabWidgetTextColor == "") { leftItems << "TabWidgetTextColor"; } + if(MenuBgColor == "") { leftItems << "MenuBgColor"; } + if(MenuTextColor == "") { leftItems << "MenuTextColor"; } + if(BreakLobbyButtonBgColor == "") { leftItems << "BreakLobbyButtonBgColor"; } + if(BreakLobbyButtonTextColor == "") { leftItems << "BreakLobbyButtonTextColor"; } + if(BreakLobbyButtonBgDisabledColor == "") { leftItems << "BreakLobbyButtonBgDisabledColor"; } + if(BreakLobbyButtonTextDisabledColor == "") { leftItems << "BreakLobbyButtonTextDisabledColor"; } + if(BreakLobbyButtonBgBlinkColor == "") { leftItems << "BreakLobbyButtonBgBlinkColor"; } + if(BreakLobbyButtonTextBlinkColor == "") { leftItems << "BreakLobbyButtonTextBlinkColor"; } + if(PlayerCashTextColor == "") { leftItems << "PlayerCashTextColor"; } + if(PlayerBetTextColor == "") { leftItems << "PlayerBetTextColor"; } + if(PlayerNickTextColor == "") { leftItems << "PlayerNickTextColor"; } + if(BoardBigTextColor == "") { leftItems << "BoardBigTextColor"; } + if(BoardSmallTextColor == "") { leftItems << "BoardSmallTextColor"; } + if(SpeedTextColor == "") { leftItems << "SpeedTextColor"; } + if(VoteButtonBgColor == "") { leftItems << "VoteButtonBgColor"; } + if(VoteButtonTextColor == "") { leftItems << "VoteButtonTextColor"; } + if(BetInputTextColor == "") { leftItems << "BetInputTextColor"; } + if(BetInputBgColor == "") { leftItems << "BetInputBgColor"; } + if(BetInputDisabledTextColor == "") { leftItems << "BetInputDisabledTextColor"; } + if(BetInputDisabledBgColor == "") { leftItems << "BetInputDisabledBgColor"; } + if(FoldButtonTextColor == "") { leftItems << "FoldButtonTextColor"; } + if(FoldButtonCheckableTextColor == "") { leftItems << "FoldButtonCheckableTextColor"; } + if(CheckCallButtonTextColor == "") { leftItems << "CheckCallButtonTextColor"; } + if(CheckCallButtonCheckableTextColor == "") { leftItems << "CheckCallButtonCheckableTextColor"; } + if(BetRaiseButtonTextColor == "") { leftItems << "BetRaiseButtonTextColor"; } + if(BetRaiseButtonCheckableTextColor == "") { leftItems << "BetRaiseButtonCheckableTextColor"; } + if(AllInButtonTextColor == "") { leftItems << "AllInButtonTextColor"; } + if(AllInButtonCheckableTextColor == "") { leftItems << "AllInButtonCheckableTextColor"; } + if(BetSpeedSliderGrooveBgColor == "") { leftItems << "BetSpeedSliderGrooveBgColor"; } + if(BetSpeedSliderGrooveBorderColor == "") { leftItems << "BetSpeedSliderGrooveBorderColor"; } + if(BetSpeedSliderHandleBgColor == "") { leftItems << "BetSpeedSliderHandleBgColor"; } + if(BetSpeedSliderHandleBorderColor == "") { leftItems << "BetSpeedSliderHandleBorderColor"; } // SIZE - if(ChatLogTextSize == "") { wrongItems << "ChatLogTextSize"; } + if(ChatLogTextSize == "") { leftItems << "ChatLogTextSize"; } - //if one or more items are wrong or left show detailed error message - if(!wrongItems.isEmpty() && myW != 0) showErrorMessage(StyleDescription, wrongItems, StyleMaintainerEMail); + //if one or more items are left show detailed error message + if(!leftItems.isEmpty() && myW != 0) showLeftItemsErrorMessage(StyleDescription, leftItems, StyleMaintainerEMail); + //if one or more pictures where not found show detailed error message + if(!itemPicsLeft.isEmpty() && myW != 0) showItemPicsLeftErrorMessage(StyleDescription, itemPicsLeft, StyleMaintainerEMail); } else { qDebug() << "could not load game table style file: " << tinyFileName.c_str(); } } -void GameTableStyleReader::showErrorMessage(QString style, QStringList failedItems, QString email) +void GameTableStyleReader::showLeftItemsErrorMessage(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(s) of \"%2\" is/are wrong or left. \n\nPlease contact the game table style builder %3.").arg(style).arg(items).arg(email), + tr("Current game table style \"%1\" seems to be incomplete or defective. \n\nThe value(s) of \"%2\" is/are left. \n\nPlease contact the game table style builder %3.").arg(style).arg(items).arg(email), + QMessageBox::Ok); +} + +void GameTableStyleReader::showItemPicsLeftErrorMessage(QString style, QStringList picsLeft, QString email) +{ + QString pics = picsLeft.join("\n"); + + QMessageBox::warning(myW, tr("Game Table Style Error"), + tr("One or more pictures from current game table style \"%1\" where not found: \n\n\"%2\" \n\nPlease contact the game table style builder %3.").arg(style).arg(pics).arg(email), QMessageBox::Ok); } @@ -465,19 +483,19 @@ QString GameTableStyleReader::getActionPic(int action) { // 1 = fold, 2 = check, 3 = call, 4 = bet, 5 = raise, 6 = allin, 7 = winner switch(action) { - case 1: { return ActionFold; } + case 1: { return ActionFoldI18N; } break; - case 2: { return ActionCheck; } + case 2: { return ActionCheckI18N; } break; - case 3: { return ActionCall; } + case 3: { return ActionCallI18N; } break; - case 4: { return ActionBet; } + case 4: { return ActionBetI18N; } break; - case 5: { return ActionRaise; } + case 5: { return ActionRaiseI18N; } break; - case 6: { return ActionAllIn; } + case 6: { return ActionAllInI18N; } break; - case 7: { return ActionWinner; } + case 7: { return ActionWinnerI18N; } break; default: return QString(""); } diff --git a/src/gui/qt/styles/gametablestylereader.h b/src/gui/qt/styles/gametablestylereader.h index 96b3fc4b..81b42c1b 100644 --- a/src/gui/qt/styles/gametablestylereader.h +++ b/src/gui/qt/styles/gametablestylereader.h @@ -37,7 +37,8 @@ public: void readStyleFile(QString); - void showErrorMessage(QString, QStringList, QString); + void showLeftItemsErrorMessage(QString, QStringList, QString); + void showItemPicsLeftErrorMessage(QString, QStringList, QString); QString getStyleDescription() const { return StyleDescription; } QString getCurrentFileName() const { return currentFileName; } @@ -114,13 +115,13 @@ private: QString MaximumWindowHeight; // PICS QString Preview; - QString ActionAllIn; - QString ActionRaise; - QString ActionBet; - QString ActionCall; - QString ActionCheck; - QString ActionFold; - QString ActionWinner; + QString ActionAllInI18N; + QString ActionRaiseI18N; + QString ActionBetI18N; + QString ActionCallI18N; + QString ActionCheckI18N; + QString ActionFoldI18N; + QString ActionWinnerI18N; QString BigBlindPuck; QString SmallBlindPuck; QString DealerPuck; @@ -229,8 +230,9 @@ private: QString currentFileName; QString currentDir; - QStringList wrongItems; - + QStringList leftItems; + QStringList itemPicsLeft; + ConfigFile *myConfig; gameTableImpl *myW;