diff --git a/data/gfx/gui/misc/radiobutton_checked.png b/data/gfx/gui/misc/radiobutton_checked.png new file mode 100644 index 00000000..282a3379 Binary files /dev/null and b/data/gfx/gui/misc/radiobutton_checked.png differ diff --git a/data/gfx/gui/misc/radiobutton_checked_hover.png b/data/gfx/gui/misc/radiobutton_checked_hover.png new file mode 100644 index 00000000..3825752e Binary files /dev/null and b/data/gfx/gui/misc/radiobutton_checked_hover.png differ diff --git a/data/gfx/gui/misc/radiobutton_pressed.png b/data/gfx/gui/misc/radiobutton_pressed.png new file mode 100644 index 00000000..f3a2a982 Binary files /dev/null and b/data/gfx/gui/misc/radiobutton_pressed.png differ diff --git a/data/gfx/gui/misc/radiobutton_unchecked.png b/data/gfx/gui/misc/radiobutton_unchecked.png new file mode 100644 index 00000000..9e881223 Binary files /dev/null and b/data/gfx/gui/misc/radiobutton_unchecked.png differ diff --git a/data/gfx/gui/misc/radiobutton_unchecked_hover.png b/data/gfx/gui/misc/radiobutton_unchecked_hover.png new file mode 100644 index 00000000..0acd0453 Binary files /dev/null and b/data/gfx/gui/misc/radiobutton_unchecked_hover.png differ diff --git a/src/gui/qt/mainwindow.ui b/src/gui/qt/mainwindow.ui index dc7f2a98..0d0e1c05 100644 --- a/src/gui/qt/mainwindow.ui +++ b/src/gui/qt/mainwindow.ui @@ -742,6 +742,9 @@ + + Qt::NoFocus + Manual Action (default) @@ -752,6 +755,9 @@ + + Qt::NoFocus + Auto-Check / Auto-Fold @@ -759,6 +765,9 @@ + + Qt::NoFocus + Auto-Check / Auto-Call-Any diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp index 19ffb2e0..cb502a78 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.cpp +++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp @@ -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; }"); // away radiobuttons - radioButton_manualAction->setStyleSheet("QRadioButton { color:#F0F0F0; } QRadioButton::indicator::checked {image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_07.png }"); -// radioButton_autoCheckFold->setStyleSheet("QLabel { color: #F0F0F0; }"); -// radioButton_autoCheckCallAny->setStyleSheet("QLabel { color: #F0F0F0; }"); + QString radioButtonString("QRadioButton { color: #F0F0F0; } QRadioButton::indicator { width: 13px; height: 13px; } QRadioButton::indicator::checked { image: url("+myAppDataPath+"gfx/gui/misc/radiobutton_checked.png); }"); + + 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_LeftToolBox->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/misc/toolboxFrameBG.png) }"); @@ -3678,8 +3680,8 @@ void mainWindowImpl::changePlayingMode() { int mode; if(radioButton_manualAction->isChecked()) { mode=0; } - if(radioButton_autoCheckFold->isChecked()) { mode=1; } - if(radioButton_autoCheckCallAny->isChecked()) { mode=2; } + if(radioButton_autoCheckFold->isChecked()) { mode=2; } + if(radioButton_autoCheckCallAny->isChecked()) { mode=1; } switch (mode) { @@ -3693,6 +3695,8 @@ void mainWindowImpl::changePlayingMode() { default: { cout << "changePlayingMode ERROR!!!!" << endl; } } + + playingMode = mode; } bool mainWindowImpl::eventFilter(QObject *obj, QEvent *event) @@ -3799,7 +3803,7 @@ void mainWindowImpl::localGameModification() { } //Set the playing mode to "manual" - playingMode = 0; + radioButton_manualAction->click(); } @@ -3812,7 +3816,7 @@ void mainWindowImpl::networkGameModification() { myChat->clearNewGame(); //Set the playing mode to "manual" - playingMode = 0; + radioButton_manualAction->click(); } diff --git a/src/gui/qt/mainwindow/mainwindowimpl.h b/src/gui/qt/mainwindow/mainwindowimpl.h index 1844ce76..625efaaa 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.h +++ b/src/gui/qt/mainwindow/mainwindowimpl.h @@ -318,8 +318,7 @@ private: Log *myLog; Chat *myChat; ConfigFile *myConfig; - int playingMode; - + //Logo QLabel *label_logoleft; QLabel *label_logoright; @@ -417,6 +416,8 @@ private: int distributePotAnimCounter; + int playingMode; + //Speed int guiGameSpeed;