From 13eea26cdc662715ad2394df69672756aedaf752 Mon Sep 17 00:00:00 2001 From: doitux Date: Fri, 10 Apr 2009 23:18:38 +0000 Subject: [PATCH] remove hardcoded internetgame settings --- data/gfx/gui/table/danuxi1/action_winner.png | Bin 2961 -> 0 bytes src/gui/qt/gametable/gametableimpl.cpp | 10 +++++----- src/gui/qt/gametable/myactionbutton.cpp | 2 +- src/gui/qt/settingsdialog.ui | 6 ++++++ .../qt/settingsdialog/settingsdialogimpl.cpp | 16 +++++++++++++++- src/gui/qt/styles/gametablestylereader.h | 2 ++ src/session.cpp | 8 ++++---- 7 files changed, 33 insertions(+), 11 deletions(-) delete mode 100644 data/gfx/gui/table/danuxi1/action_winner.png diff --git a/data/gfx/gui/table/danuxi1/action_winner.png b/data/gfx/gui/table/danuxi1/action_winner.png deleted file mode 100644 index 7a176f0b77545bd1e2d7934b52deba58be8bd509..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2961 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 == 0 ) setLabelArray[(*it_c)->getMyID()]->setText(""); else - setLabelArray[(*it_c)->getMyID()]->setText(BetString+": $"+QString::number((*it_c)->getMySet(),10)); + setLabelArray[(*it_c)->getMyID()]->setText("$"+QString::number((*it_c)->getMySet(),10)); } } @@ -1320,7 +1320,7 @@ void gameTableImpl::provideMyActions(int mode) { else { // flop,turn,river if (currentHand->getCurrentBeRo()->getHighestSet() == 0 && pushButton_Fold->isCheckable() ) { - pushButtonFoldString = CheckString+" / "+FoldString; + pushButtonFoldString = CheckString+" /\n"+FoldString; } else { pushButtonFoldString = FoldString; } if (currentHand->getCurrentBeRo()->getHighestSet() == 0) { @@ -1342,7 +1342,7 @@ void gameTableImpl::provideMyActions(int mode) { pushButtonBetRaiseString = BetString+"\n$"+QString::number(getMyBetAmount()); pushButtonCallCheckString = CheckString; if( (currentGame->getActivePlayerList()->size() > 2 && currentGame->getSeatsList()->front()->getMyButton() == BUTTON_SMALL_BLIND ) || ( currentGame->getActivePlayerList()->size() <= 2 && currentGame->getSeatsList()->front()->getMyButton() == BUTTON_BIG_BLIND)) { pushButtonFoldString = FoldString; } - else { pushButtonFoldString = CheckString+" / "+FoldString; } + else { pushButtonFoldString = CheckString+" /\n"+FoldString; } pushButtonAllInString = AllInString; } @@ -1458,7 +1458,7 @@ void gameTableImpl::meInAction() { if( pushButtonBetRaiseIsChecked ) { pushButton_BetRaise->click(); pushButtonBetRaiseIsChecked = FALSE;} if( pushButtonCallCheckIsChecked ) { pushButton_CallCheck->click(); pushButtonCallCheckIsChecked = FALSE;} if( pushButtonFoldIsChecked ) { - if(lastPushButtonFoldString == "Check / Fold" && pushButton_CallCheck->text() == "Check") { + if(lastPushButtonFoldString == CheckString+" /\n"+FoldString && pushButton_CallCheck->text() == CheckString) { pushButton_CallCheck->click(); } else { @@ -2883,7 +2883,7 @@ void gameTableImpl::myButtonsCheckable(bool state) { pushButton_AllIn->setCheckable(FALSE); QString hover; - if(pushButton_AllIn->text()=="All-In") { + if(pushButton_AllIn->text()==AllInString) { myGameTableStyle->setButtonsStyle(pushButton_BetRaise, pushButton_CallCheck, pushButton_Fold, pushButton_AllIn, 0); } else { diff --git a/src/gui/qt/gametable/myactionbutton.cpp b/src/gui/qt/gametable/myactionbutton.cpp index 0987ceb3..90b5cb7c 100644 --- a/src/gui/qt/gametable/myactionbutton.cpp +++ b/src/gui/qt/gametable/myactionbutton.cpp @@ -39,6 +39,6 @@ void MyActionButton::paintEvent(QPaintEvent * event) { painter.drawText(6,6,15,15,Qt::AlignLeft,fKeyText); } else { - painter.drawText(8,11,15,15,Qt::AlignLeft,fKeyText); + painter.drawText(8,15,15,15,Qt::AlignLeft,fKeyText); } } diff --git a/src/gui/qt/settingsdialog.ui b/src/gui/qt/settingsdialog.ui index ecd0842d..75041801 100644 --- a/src/gui/qt/settingsdialog.ui +++ b/src/gui/qt/settingsdialog.ui @@ -476,6 +476,9 @@ p, li { white-space: pre-wrap; } Qt::RichText + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + @@ -576,6 +579,9 @@ p, li { white-space: pre-wrap; } Qt::RichText + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + diff --git a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp index 6a6cec75..6bcebae1 100644 --- a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp +++ b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp @@ -870,8 +870,22 @@ void settingsDialogImpl::showCurrentGameTableStylePreview() QString MaintainerName = tr("Maintainer Name"); QString MaintainerEMail = tr("Maintainer EMail"); QString CreateDate = tr("Create Date"); + QString WindowBehaviour = tr("Windows Behaviour"); + QString scaleable = tr("scaleable"); + QString fixed = tr("fixed"); + QString MinimumSize = tr("Minimum Size"); + QString MaximumSize = tr("Maximum Size"); + QString FixedSize = tr("Fixed Size"); - label_gameTableStyleInfo->setText(""+MaintainerName+": "+style.getStyleMaintainerName()+"
"+MaintainerEMail+": "+style.getStyleMaintainerEMail()+"
"+CreateDate+": "+style.getStyleCreateDate()+""); + QString windowsSubString; + if(style.getIfFixedWindowSize().toInt()) { + windowsSubString = ""+WindowBehaviour+": "+fixed+"
"+FixedSize+": "+style.getFixedWindowWidth()+"x"+style.getFixedWindowHeight(); + } + else { + windowsSubString = ""+WindowBehaviour+": "+scaleable+"
"+MinimumSize+": "+style.getMinimumWindowWidth()+"x"+style.getMinimumWindowHeight()+"
"+MaximumSize+": "+style.getMaximumWindowWidth()+"x"+style.getMaximumWindowHeight(); + } + + label_gameTableStyleInfo->setText(""+MaintainerName+": "+style.getStyleMaintainerName()+"
"+MaintainerEMail+": "+style.getStyleMaintainerEMail()+"
"+CreateDate+": "+style.getStyleCreateDate()+"
"+windowsSubString); } } diff --git a/src/gui/qt/styles/gametablestylereader.h b/src/gui/qt/styles/gametablestylereader.h index 920ec5f9..1102b8e5 100644 --- a/src/gui/qt/styles/gametablestylereader.h +++ b/src/gui/qt/styles/gametablestylereader.h @@ -69,6 +69,8 @@ public: QString getMinimumWindowHeight() const { return MinimumWindowHeight; } QString getMaximumWindowWidth() const { return MaximumWindowWidth; } QString getMaximumWindowHeight() const { return MaximumWindowHeight; } + QString getFixedWindowWidth() const { return FixedWindowWidth; } + QString getFixedWindowHeight() const { return FixedWindowHeight; } QString getIfFixedWindowSize() const { return IfFixedWindowSize; } bool getFallBack() const { return fallBack; } diff --git a/src/session.cpp b/src/session.cpp index 20aeb2c5..cad47494 100755 --- a/src/session.cpp +++ b/src/session.cpp @@ -168,7 +168,7 @@ void Session::startInternetClient() myConfig->readConfigInt("IRCServerPort"), myConfig->readConfigInt("IRCServerUseIpv6") == 1, myIrcNick, - /*myConfig->readConfigString("IRCChannel")*/ "#pokerth-lobby-07beta",//WARNING this is just for 0.7 beta to connect to testing chat ////////////// + myConfig->readConfigString("IRCChannel"), /*"#pokerth-lobby-07beta",*///WARNING this is just for 0.7 beta to connect to testing chat ////////////// myConfig->readConfigString("IRCChannelPassword")); myClientIrcThread->Run(); } @@ -177,10 +177,10 @@ void Session::startInternetClient() bool useAvatarServer = myConfig->readConfigInt("UseAvatarServer") != 0; myNetClient->Init( - myConfig->readConfigString("InternetServerAddress"), "pokerth.net/serverlist07.xml.z", 1, + myConfig->readConfigString("InternetServerAddress"), /*"pokerth.net/serverlist07.xml.z", 1,*/ //WARNING this is just for 0.7 beta to connect to testing server ////////////// -// myConfig->readConfigString("InternetServerListAddress"), -// myConfig->readConfigInt("InternetServerConfigMode") == 0, + myConfig->readConfigString("InternetServerListAddress"), + myConfig->readConfigInt("InternetServerConfigMode") == 0, /////////////////////////////////////////////////////////////////////////////// myConfig->readConfigInt("InternetServerPort"), myConfig->readConfigInt("InternetServerUseIpv6") == 1,