sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove hardcoded internetgame settings

Browse Source
This commit is contained in:
doitux
2009-04-10 23:18:38 +00:00
parent 72108d7ec3
commit 13eea26cdc
7 changed files with 33 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/gfx/gui/table/danuxi1/action_winner.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.9 KiB

src/gui/qt/gametable/gametableimpl.cpp
+5 -5
View File
@@ -686,7 +686,7 @@ void gameTableImpl::refreshSet() {
if( (*it_c)->getMySet() == 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 {
src/gui/qt/gametable/myactionbutton.cpp
+1 -1
View File
@@ -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);
}
}
src/gui/qt/settingsdialog.ui
+6
View File
@@ -476,6 +476,9 @@ p, li { white-space: pre-wrap; }
<property name="textFormat" >
<enum>Qt::RichText</enum>
</property>
<property name="alignment" >
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
</widget>
</item>
</layout>
@@ -576,6 +579,9 @@ p, li { white-space: pre-wrap; }
<property name="textFormat" >
<enum>Qt::RichText</enum>
</property>
<property name="alignment" >
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
</widget>
</item>
</layout>
src/gui/qt/settingsdialog/settingsdialogimpl.cpp
+15 -1
View File
@@ -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("<b>"+MaintainerName+":</b> "+style.getStyleMaintainerName()+"<br><b>"+MaintainerEMail+":</b> "+style.getStyleMaintainerEMail()+"<br><b>"+CreateDate+":</b> "+style.getStyleCreateDate()+"");
QString windowsSubString;
if(style.getIfFixedWindowSize().toInt()) {
windowsSubString = "<b>"+WindowBehaviour+":</b> "+fixed+"<br><b>"+FixedSize+":</b> "+style.getFixedWindowWidth()+"x"+style.getFixedWindowHeight();
}
else {
windowsSubString = "<b>"+WindowBehaviour+":</b> "+scaleable+"<br><b>"+MinimumSize+":</b> "+style.getMinimumWindowWidth()+"x"+style.getMinimumWindowHeight()+"<br><b>"+MaximumSize+":</b> "+style.getMaximumWindowWidth()+"x"+style.getMaximumWindowHeight();
}
label_gameTableStyleInfo->setText("<b>"+MaintainerName+":</b> "+style.getStyleMaintainerName()+"<br><b>"+MaintainerEMail+":</b> "+style.getStyleMaintainerEMail()+"<br><b>"+CreateDate+":</b> "+style.getStyleCreateDate()+"<br>"+windowsSubString);
}
}
src/gui/qt/styles/gametablestylereader.h
+2
View File
@@ -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; }
src/session.cpp
+4 -4
View File
@@ -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,