From fd77fcc4faeea8ae7881210f59f185e428a748fe Mon Sep 17 00:00:00 2001 From: doitux Date: Tue, 16 Oct 2007 00:15:18 +0000 Subject: [PATCH] finish implementing away-automode-radio-buttons --- data/gfx/gui/misc/radiobutton_checked.png | Bin 0 -> 428 bytes .../gui/misc/radiobutton_checked_hover.png | Bin 0 -> 449 bytes data/gfx/gui/misc/radiobutton_pressed.png | Bin 0 -> 421 bytes data/gfx/gui/misc/radiobutton_unchecked.png | Bin 0 -> 349 bytes .../gui/misc/radiobutton_unchecked_hover.png | Bin 0 -> 349 bytes src/gui/qt/mainwindow.ui | 9 +++++++++ src/gui/qt/mainwindow/mainwindowimpl.cpp | 18 +++++++++++------- src/gui/qt/mainwindow/mainwindowimpl.h | 5 +++-- 8 files changed, 23 insertions(+), 9 deletions(-) create mode 100644 data/gfx/gui/misc/radiobutton_checked.png create mode 100644 data/gfx/gui/misc/radiobutton_checked_hover.png create mode 100644 data/gfx/gui/misc/radiobutton_pressed.png create mode 100644 data/gfx/gui/misc/radiobutton_unchecked.png create mode 100644 data/gfx/gui/misc/radiobutton_unchecked_hover.png diff --git a/data/gfx/gui/misc/radiobutton_checked.png b/data/gfx/gui/misc/radiobutton_checked.png new file mode 100644 index 0000000000000000000000000000000000000000..282a33790ffbbf585c221bf9e13c6e8e90ccde55 GIT binary patch literal 428 zcmeAS@N?(olHy`uVBq!ia0vp@Ak4uAB#T}@sR2@KN#5=*49`Gt*TtlGpa^GyM`SSr z1Gg{;GcwGYBLNg-FY)wsWxvkFFRsbbU6*hiC?s3r8d2h$pPQSSSHj?2l$uzQnxasi zS(2d;l98(5?&%xwK1DT;fq_xL)5S4FHiBX={$Y>uBgUpw>fzw=&yJ+(>aZr=9a zw)4*imr7@5-k!GZwM1LvzW4IV%cp#}XWXZJ*@W>=4fDdxS<@LRuH37BR=I47P?kam zhvjqi4Q-a`E-VUH4urV`gx+gib?@RfHoY`Aj)%HjiV0~9)1?B84_mr>y;Swkd^l&f z@>)jSr3QV<_kOGIxOeYuT-4wF!PiTl%n1y2;;?vr?e)9lp2P0)fwiBi>z$cruM}e0 R{tFn044$rjF6*2UngA6jsh9u& literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..3825752e8631ebeff94d1df55f0a6caf2f86d43b GIT binary patch literal 449 zcmeAS@N?(olHy`uVBq!ia0vp@Ak4uAB#T}@sR2@KN#5=*49`Gt*TtlGpa^GyM`SSr z1Gg{;GcwGYBLNg-FY)wsWxvkFFRsOH@J4ScP)N4KHKN2hKQ}iuuY|$5C^fMpHASI3 zvm`?yBqLS9-P1SVeTr%x0|TR~r;B5V#`(FE46~RG1zhjv1+B@RI4421hE<$xv$}!c zs-$mh`TJv;dPf4qTI_FL%-ab;XG z4SX-wY_+eiKg#igW#6h*PMWP#CP^qOvJ{!!Y!H{8vOTz@_M} zNM^B^;vnwiz|mOzPVd1SXAVaW#s%7qde43Cf6rK(e_&(v^gX*C)%*Ego)C1Xy5EpZ o@yLyLQ@56V4pHt(-}Rk)sqbu`&FVdQ&MBb@0Gau)*8l(j literal 0 HcmV?d00001 diff --git a/data/gfx/gui/misc/radiobutton_pressed.png b/data/gfx/gui/misc/radiobutton_pressed.png new file mode 100644 index 0000000000000000000000000000000000000000..f3a2a982af10ae90c20fd9f87c9e887fa8bbfd81 GIT binary patch literal 421 zcmeAS@N?(olHy`uVBq!ia0vp@Ak4uAB#T}@sR2@KN#5=*49`Gt*TtlGpa^GyM`SSr z1Gg{;GcwGYBLNg-FY)wsWxvkFFRme$ct_zJP)N4KHKN2hKQ}iuuY|$5C^fMpHASI3 zvm`?yBqLS9-P1SVeTr%x0|O(cr;B5V#`(FEZ1Y+S1l;6RMAr!yvPczdwGH2Jd(8@q zj`K~MbYmK|CAc&Wv39tmU(aNSyy@HZcZp`2Nxn(FU}KMAzQfjNwlfaQCdX#HSJvlh z;D2E3DYRsYhvvp>No$W*^B0&NyTcIYq;S6Y)h;#P;ANSQigpG}Q@y=y4w|h3j~Zr4WbFCA zCD%JpqA-oJ6aUw->VWzQ*o&g0Zka5p^p%-fay9rJ$fmH*g0yYk}XQ&GUsWAJqK Kb6Mw<&;$S)W25;1 literal 0 HcmV?d00001 diff --git a/data/gfx/gui/misc/radiobutton_unchecked.png b/data/gfx/gui/misc/radiobutton_unchecked.png new file mode 100644 index 0000000000000000000000000000000000000000..9e8812238433117cbdcc8c2a8ae047d0351841cd GIT binary patch literal 349 zcmeAS@N?(olHy`uVBq!ia0vp@Ak4uAB#T}@sR2@KN#5=*4F5rJ!QSPQfg+p*9+AZi z4BWyX%*Zfnjs#GUy~NYkmHj#wzqp!!n9Yh(ppa~dYeb22er|4RUI~M9QEFmIYKlU6 zW=V!ZNJgrHyQgo!`xMnYpu&TmE{-7@=jUFs%{t=1)AsQCSm!6+YO(A- zXOt2>_h4$&!(*;~4;oIdynN%d(6{qH9qxW_aLC%xv1%Vve3^q zz^>5EaX#hsQ-&?+Kx;TbtoS%D1G4F^2PwPYb&1d$cK2)6eal@R2TdvMY zJ!h2lUhr9vw#ou^kDm<-R8MAw=5C*Dck)f`B-PyywJe{jE972gG!AH(RQ&H=^;yvh z)_bljp{}8Y<#*;rX&;C__w#X6*@f@6hHiDo&dgZ$l4*AC(x>JH%y#SwohM=$1d?4` z7=jokt@`A#Eso2fT%eS3#@)Y)TfRPHn9{t0Wxf?|=8@=l_0-U)AY{|K+*JNPEcuJ;UJX>gTe~DWM4fMYoCy literal 0 HcmV?d00001 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;