finish implementing away-automode-radio-buttons
This commit is contained in:
Binary file not shown.
|
After Width: | Height: | Size: 428 B |
Binary file not shown.
|
After Width: | Height: | Size: 449 B |
Binary file not shown.
|
After Width: | Height: | Size: 421 B |
Binary file not shown.
|
After Width: | Height: | Size: 349 B |
Binary file not shown.
|
After Width: | Height: | Size: 349 B |
@@ -742,6 +742,9 @@
|
|||||||
<layout class="QGridLayout" >
|
<layout class="QGridLayout" >
|
||||||
<item row="0" column="0" >
|
<item row="0" column="0" >
|
||||||
<widget class="QRadioButton" name="radioButton_manualAction" >
|
<widget class="QRadioButton" name="radioButton_manualAction" >
|
||||||
|
<property name="focusPolicy" >
|
||||||
|
<enum>Qt::NoFocus</enum>
|
||||||
|
</property>
|
||||||
<property name="text" >
|
<property name="text" >
|
||||||
<string>Manual Action (default)</string>
|
<string>Manual Action (default)</string>
|
||||||
</property>
|
</property>
|
||||||
@@ -752,6 +755,9 @@
|
|||||||
</item>
|
</item>
|
||||||
<item row="1" column="0" >
|
<item row="1" column="0" >
|
||||||
<widget class="QRadioButton" name="radioButton_autoCheckFold" >
|
<widget class="QRadioButton" name="radioButton_autoCheckFold" >
|
||||||
|
<property name="focusPolicy" >
|
||||||
|
<enum>Qt::NoFocus</enum>
|
||||||
|
</property>
|
||||||
<property name="text" >
|
<property name="text" >
|
||||||
<string>Auto-Check / Auto-Fold</string>
|
<string>Auto-Check / Auto-Fold</string>
|
||||||
</property>
|
</property>
|
||||||
@@ -759,6 +765,9 @@
|
|||||||
</item>
|
</item>
|
||||||
<item row="2" column="0" >
|
<item row="2" column="0" >
|
||||||
<widget class="QRadioButton" name="radioButton_autoCheckCallAny" >
|
<widget class="QRadioButton" name="radioButton_autoCheckCallAny" >
|
||||||
|
<property name="focusPolicy" >
|
||||||
|
<enum>Qt::NoFocus</enum>
|
||||||
|
</property>
|
||||||
<property name="text" >
|
<property name="text" >
|
||||||
<string>Auto-Check / Auto-Call-Any</string>
|
<string>Auto-Check / Auto-Call-Any</string>
|
||||||
</property>
|
</property>
|
||||||
|
|||||||
@@ -489,9 +489,11 @@ mainWindowImpl::mainWindowImpl(ConfigFile *c, QMainWindow *parent)
|
|||||||
pushButton_FoldAllin->setStyleSheet("QPushButton { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_07.png); "+ font2String +" font-size: 11px; font-weight: bold; color: #F0F0F0; }");
|
pushButton_FoldAllin->setStyleSheet("QPushButton { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_07.png); "+ font2String +" font-size: 11px; font-weight: bold; color: #F0F0F0; }");
|
||||||
|
|
||||||
// away radiobuttons
|
// away radiobuttons
|
||||||
radioButton_manualAction->setStyleSheet("QRadioButton { color:#F0F0F0; } QRadioButton::indicator::checked {image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_07.png }");
|
QString radioButtonString("QRadioButton { color: #F0F0F0; } QRadioButton::indicator { width: 13px; height: 13px; } QRadioButton::indicator::checked { image: url("+myAppDataPath+"gfx/gui/misc/radiobutton_checked.png); }");
|
||||||
// radioButton_autoCheckFold->setStyleSheet("QLabel { color: #F0F0F0; }");
|
|
||||||
// radioButton_autoCheckCallAny->setStyleSheet("QLabel { color: #F0F0F0; }");
|
radioButton_manualAction->setStyleSheet(radioButtonString);
|
||||||
|
radioButton_autoCheckFold->setStyleSheet(radioButtonString);
|
||||||
|
radioButton_autoCheckCallAny->setStyleSheet(radioButtonString);
|
||||||
|
|
||||||
groupBox_RightToolBox->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/misc/toolboxFrameBG.png) }");
|
groupBox_RightToolBox->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/misc/toolboxFrameBG.png) }");
|
||||||
groupBox_LeftToolBox->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/misc/toolboxFrameBG.png) }");
|
groupBox_LeftToolBox->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/misc/toolboxFrameBG.png) }");
|
||||||
@@ -3678,8 +3680,8 @@ void mainWindowImpl::changePlayingMode() {
|
|||||||
int mode;
|
int mode;
|
||||||
|
|
||||||
if(radioButton_manualAction->isChecked()) { mode=0; }
|
if(radioButton_manualAction->isChecked()) { mode=0; }
|
||||||
if(radioButton_autoCheckFold->isChecked()) { mode=1; }
|
if(radioButton_autoCheckFold->isChecked()) { mode=2; }
|
||||||
if(radioButton_autoCheckCallAny->isChecked()) { mode=2; }
|
if(radioButton_autoCheckCallAny->isChecked()) { mode=1; }
|
||||||
|
|
||||||
|
|
||||||
switch (mode) {
|
switch (mode) {
|
||||||
@@ -3693,6 +3695,8 @@ void mainWindowImpl::changePlayingMode() {
|
|||||||
default: { cout << "changePlayingMode ERROR!!!!" << endl; }
|
default: { cout << "changePlayingMode ERROR!!!!" << endl; }
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
playingMode = mode;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool mainWindowImpl::eventFilter(QObject *obj, QEvent *event)
|
bool mainWindowImpl::eventFilter(QObject *obj, QEvent *event)
|
||||||
@@ -3799,7 +3803,7 @@ void mainWindowImpl::localGameModification() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
//Set the playing mode to "manual"
|
//Set the playing mode to "manual"
|
||||||
playingMode = 0;
|
radioButton_manualAction->click();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -3812,7 +3816,7 @@ void mainWindowImpl::networkGameModification() {
|
|||||||
myChat->clearNewGame();
|
myChat->clearNewGame();
|
||||||
|
|
||||||
//Set the playing mode to "manual"
|
//Set the playing mode to "manual"
|
||||||
playingMode = 0;
|
radioButton_manualAction->click();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -318,8 +318,7 @@ private:
|
|||||||
Log *myLog;
|
Log *myLog;
|
||||||
Chat *myChat;
|
Chat *myChat;
|
||||||
ConfigFile *myConfig;
|
ConfigFile *myConfig;
|
||||||
int playingMode;
|
|
||||||
|
|
||||||
//Logo
|
//Logo
|
||||||
QLabel *label_logoleft;
|
QLabel *label_logoleft;
|
||||||
QLabel *label_logoright;
|
QLabel *label_logoright;
|
||||||
@@ -417,6 +416,8 @@ private:
|
|||||||
|
|
||||||
|
|
||||||
int distributePotAnimCounter;
|
int distributePotAnimCounter;
|
||||||
|
int playingMode;
|
||||||
|
|
||||||
|
|
||||||
//Speed
|
//Speed
|
||||||
int guiGameSpeed;
|
int guiGameSpeed;
|
||||||
|
|||||||
Reference in New Issue
Block a user