From b528e9d89d0671a4135e87f3eabf9c9cda0116a1 Mon Sep 17 00:00:00 2001 From: doitux Date: Sun, 2 Dec 2007 00:41:56 +0000 Subject: [PATCH] update gfx files (thx to thiger) + uniform fonts color on table --- data/gfx/gui/misc/fileopen16.png | Bin 1080 -> 909 bytes data/gfx/gui/misc/lock.png | Bin 787 -> 740 bytes data/gfx/gui/misc/radiobutton_checked.png | Bin 428 -> 475 bytes .../gui/misc/radiobutton_checked_hover.png | Bin 449 -> 488 bytes data/gfx/gui/misc/radiobutton_pressed.png | Bin 421 -> 469 bytes data/gfx/gui/misc/radiobutton_unchecked.png | Bin 349 -> 379 bytes .../gui/misc/radiobutton_unchecked_hover.png | Bin 349 -> 379 bytes src/gui/qt/mainwindow.ui | 6 +++--- src/gui/qt/mainwindow/mainwindowimpl.cpp | 18 ++++++++++-------- src/gui/qt/mainwindow/mylefttabwidget.cpp | 2 +- src/gui/qt/mainwindow/myrighttabwidget.cpp | 2 +- .../qt/mainwindow/startsplash/startsplash.cpp | 2 +- 12 files changed, 16 insertions(+), 14 deletions(-) diff --git a/data/gfx/gui/misc/fileopen16.png b/data/gfx/gui/misc/fileopen16.png index 037c2da98d1c629fd33957baa64edc60197ef767..49518cf9f60b469989394d905eea5d561c710a19 100644 GIT binary patch delta 886 zcmV-+1Bv{&2#p7jB!2;OQb$4nuFf3k00006VoOIv0RI600RN!9r;`8x010qNS#tmY z3ljhU3ljkVnw%H_000McNliru*9#c{HZ!l{Ur+!50}V+;K~y-)rISrhTx9@8&%JXg z!vG_tEzmZF0b#0WNQ0oX(Fw-HjcC+`y0D3+E5pW*or#*%g@3y62e>iOjWI5aF)m!V z(2dbZQ>~?1ph$5B2IhP2d+&Yk`{k~Q3s*ir;4IF`<2mQ}Kl2t>N13~So-|F+&T#Gb zt4#KuWw>_~rBkGehjQ86=fPG*5)t?TH}-E5{1@3;OOiyTx%t`m7iLT6 zCkxZO_1+tAH-8)5)f=^2WB_d;Fxq~slrnWRcCSZVIE(3_Kt`9#+OJ!i?EK%pS;L+?GH{2jWIJf z{;rhrshz(LOyD_3ua`q+Bfk3SGuG~%SP=AveTs*RcKWj95&0e>rFaUiD+4jbbk)8MswRbx9$V%tZ#Df^f}6%4eEBE zy~Az7u0R<{sw816MO*NDJu(3}7_!D)&%kC-JFGI%H^tH6;{-vD$-x;yhLJ)b{5CzE z90MbDl30?4nmCYNRUQsl%{4zj2i01O2WCfjY2np7`O2cf#?Csih=@-_C?SxsAdCe{ zDQ~{`_M^C6tE^cKzKR{^W)}bTgVX)P%$=U6aOy0+4N%$=hbc*zlC&ars(Tgd+>g$J zH}On=b9(yJK(?n3;|xxNF$NWBQmIf*6RSXAP#F<6_3Fns;~pW!ditYar$ zGFXd$WRT(e!|?Mb1H<=Ue+9U?Sev*wSbd&6{bUJL^77Mn27d+?CI*H>mwqz<1P}`@ zlm7u-_Wk>BJ5^%+ZkvZGVS)t0!QI3z3gPGyiuYU}Vb_%h}R$p1k!oqau&p$@6 zMF0WBqM^#0n12{A!tnMJ1H;!p3=G;D>mPv(00|1emE zD8j>mot=S!4d~K;Krd9ze#~&`{vQS@ac%|$eU)ZWRYt#?m!AIx2p|@q!3@km8-B2J zGORlDhT+`%PYl0*{$}{|_bDpIKP!W%04u`}W_E@T-~Tau{QQsM{g?j?+;Th&I-1-J zmw>+h4itZX=l#FO`>!%F{QI#NAOHYC0KWeO{{8;|@bmxx>EiSNi+dpe_WAq(1s4SX z)Z+mF?%MwV>goRg*x3Y@8sss z<#`y`g_#&mTxVc-``{nLgXhc)ckljVc=G56!?UNq7(P6F%kb;ndyo@=A;$QRf$8@n zhW~%B0R#{e1JL;wF1};1Gv;Kt0hE9IosHot(174;im-)!#7~Sefjzy$baVnrbrHkmigbmzkc-ZECVwm13&<={QmNj z!Bw9dq8S8$GzT{m12Z!V!~cK3ff|6(`3FP;z47Y@!`C0b8Lr*<{0u009GJuy00M}S z#c=<7Q!^1BZgwUHVAKOs&0nzJfB*Oe^fw6qWcUTt^asfP^9z(i|1i9||7Q`y9~_2c dkYxY?1^}I)qG1v8ZJhuB002ovPDHLkV1myI1*QN1 diff --git a/data/gfx/gui/misc/lock.png b/data/gfx/gui/misc/lock.png index 46b9f656a55630a75bda9956f9b92d2b2f8e8eab..3d12129011b3d3400609340f6666c89e292a651f 100644 GIT binary patch delta 671 zcmV;Q0$}}<2IK{hBnkm@Qb$4nuFf3kks&dE3mE`1H_YQ+O#lD_WJyFpR5;6hk;_Yz zVHC!H=Y8M#uFj3I=VzF4>7akZGc=iWeD3wYLfKsVc2bzG@T0j0T*l0AA@B3>& zr&6h$+1)Fb%O`*c_}SartG4}}!t=boD2lp7WO-#}rMVk!wOXHn1>jJcrhWgwBGL`e z)6>)0CshKF=Xv+GVE`UnK?TFL`s5^kMA1e#bhdnb?rXG%>~u`m+IpMrs;Z9;@cO}1 zashaFvp#j}{LzcbJ@^}B3h`XVo_~CKZ|uzlGkWJ(aP`!Yp;g_D+Dx~y2nZHsbCiHq zvcqeq!nJe92S0e<1H+4U9F2u_Q@CW-Vc&!7+C0U{%oZnq6wG1K?=zjSv=uG`B#!v$_!wonftl zDwt{rX|l;`yMriAm!r@|Q9vlEvjGPpt4R(zz`m+3FW^M}LH=W4M3;3I-egFUp002ovPDHLk FV1jEuI#vJx delta 720 zcmV;>0x$jK1(ODlB#|*Le+eBH4iXt1=l}o!0-#AmK~y-)eUQy-TxAr-f9JgK{mk4+ zZWBfbccCfF!ayN};%BrjEZG$O8-z3q-MDan!L6&}CS<3DEJ{lPLJ|U5Xa`iV0d1-n zrpm-b;Te=fF*GSbOGKmd`GP(&3F zC_vnERA)b!zB+wBv>f=3>s#dUH~$q83&sU?K<%-rD7XP?Jvi_k3(#%-O}2X%6+r~l zx~Su$j)z(w5h(H_=y%Xuz}VvWVKHd`ap63=b8OQI5H~{I2<`hIf~X+I1>+*pqd*}B z8v}#>AsjWpe>g}HBU*q_uoiJ6#2o?~f;xy3QWQ#jqMUcT#bMiEydkt7V)76(@KJmW z0V*L#2;!lI1t|(*utCu7c_te?cMfnZ1Ri)L#E&5y1#c9*7`$O{O5l%^AMFoW^Uj5lk?G35GGjFzS}UErTs#Mx*g!_s;t5i7VIMumGRcS1wKd zdf_#HWNZ{;fi{?jz(dG$p#M+KX+O%E+t1&t0XzZEK;lOwtE}w+0000q^J diff --git a/data/gfx/gui/misc/radiobutton_checked.png b/data/gfx/gui/misc/radiobutton_checked.png index 282a33790ffbbf585c221bf9e13c6e8e90ccde55..b43921e3e2960ba172a66b13b18fee85a780db41 100644 GIT binary patch delta 408 zcmV;J0cZZK1KR_TBt!voQb$4nuFf3k00006VoOIv0RI600RN!9r;`8x010qNS#tmY z3ljhU3ljkVnw%H_000McNliru*9-vyJ1N5_uW6B6EPpadL_t(2&z;gSYr;?v!0~_5 z;tAryx?gibZ!P)i1fh0$}X}#<_wpY+~)?B1y1zLKrqr$oPP%ssnkxM9SVjSl{09 zUdH=-rzGi8mV1m@pj4kQY}VJEYCX$t`Uvlq-}?oB5Ss|cbBM?Q000013;K+&J<(B7&J=W|UF@`WWK?@U;eQ+j2Y} z*=#nPPA3kB1N;4+>-EaAEPvf@xBESx&r@|9X=&S*uIm_vfxhn_Bd3(`-ZPFP(=-A6 zd;_6rnwJ20)ZTmMd8U*SY9NRRIp-&^hB;?M1R&JFRzy%$-i4~((Y6LIW=06%EeauE zW&oEOP&30hM@s1>NGai*yCbauEu}DyBi{QbxZd9FURwRXQ`dFmoF`FLLI^nL*6Z$L gjKfDCQGN1ze?tSCsS*UY`Tzg`07*qoM6N<$f&sjip8x;= diff --git a/data/gfx/gui/misc/radiobutton_checked_hover.png b/data/gfx/gui/misc/radiobutton_checked_hover.png index 3825752e8631ebeff94d1df55f0a6caf2f86d43b..684bc5f4498dafb4ffdf4630f63fc16223fdcfc5 100644 GIT binary patch delta 421 zcmV;W0b2gS1Ly;gBt!voQb$4nuFf3k00006VoOIv0RI600RN!9r;`8x010qNS#tmY z3ljhU3ljkVnw%H_000McNliru*9-vyJ0~Qcf^LypEPp>qL_t(2&z+L7YQkU?g}550gu45rWG*FDuz)ZNmj)1k}TT+^n@4< z0WR`Dt$$Xg+r6V$yh6%|cH5%WGT3asS+BqDJDuD4Wb*c^>?M8FYGrJ@&UpO7VDNO1 z?E8Hjr$HD_na|$=ZY}{&(+Woc;BY%mgT-P^mhC(h@JzExnr{CAc`!}4m}V8gQvu5` zDo7b|YNU)Xj0%9I0<$Dp;kwO}kn1){k`=&A1y+JMUZU$Ie7}Db@cllzULuZ{0D%ew zS+*k#r#MdIADDM~2 delta 355 zcmV-p0i6Em1Hl83Bo78+OGiWi<^bjZ=DN{hUy(o`2?`GvDhn{|E|rmJEPo|QL_t(2 z&z+JnY6CG4Mc-~xtZR{+U?qG77Y4H@FcGR^_6EL#?w}hiaV30(#dmOHq%B<~$ly+8 z8pkZLap8d}2Ij%%|6ec~Ywa7*UUmu`fDY)awLgD<#R&KWzN)H1DTS1h7$YGBa?SuN zYwZT$Wen7H&2qV9GMV7LXMaAQGn>sgpU<35r;o*AG3<7`eQ}ZWUDq{D)3DucS+Cbu z$<8^n*7SYPFbn|iuRvQ>)m;F%-dbyp$0IrCwgg(G6e*<}U<{^|P)Y%`B`}pz;=Sk5 zc<+%?0!&Nb5M#s`^AIw|5Mu;5lt33kKnQ_z?k?b*LkK|#0iY{^En@m;UX6pa|002ovPDHLkV1g_- Bo)rK9 diff --git a/data/gfx/gui/misc/radiobutton_pressed.png b/data/gfx/gui/misc/radiobutton_pressed.png index f3a2a982af10ae90c20fd9f87c9e887fa8bbfd81..8a4aaa2e59704339521087e4f12f09b02a80e283 100644 GIT binary patch delta 402 zcmV;D0d4-J1JwhNBt!voQb$4nuFf3k00006VoOIv0RI600RN!9r;`8x010qNS#tmY z3ljhU3ljkVnw%H_000McNliru*9-vyJ1Z?I&P9=1EPpIXL_t(2&z;i0YQjJq!0~U= zqL3_IT3lkFlL*O8x2KPgqgy4D4|2~E>L&3O+?`ILI@BQwg<5bZO+cp(jS{Lj_=6h` zejoV#v#5pE&-Xx5y$-MdQXtiO_;tv$YTyNUb({u5_z2-+OpY-*Ww{6FX+0bO+|)r3 zc=Y>Ew0~N6%;z6S`A8IX*=~Q>Y`#?#b>GM1x0zLyv3}Sf5_Cuhja# wC#57sv8#G$CMdAkL9!EPn|}L_t(2 z&z+JzZiFxpMjs>gS%TL#QP12o2%?;|e?fDhm^NfM-#NGY+_Vy(q{4{$Zc+yGueAkTB^ zx+YCirfK4GxlooR+qSW;tA8%b@~iLrG1^;N^E^ju%`gmfU3a#ul%gmK+O}mJM}YTN zph}YDApo4d)|zEm@ZMK3P)R9q&fNha=$u1J2~fpAb`1TWthEP}#lRc{{!~zSj)BHn zix2{()I&fig%IL^niy!j_q1(GQ51JzxV`;eP4xRtT5Fth=L|xKa3I}RW6bTTkBFZ6 Zy&v&|n|aZb%31&b002ovPDHLkV1jKrkn8{e diff --git a/data/gfx/gui/misc/radiobutton_unchecked.png b/data/gfx/gui/misc/radiobutton_unchecked.png index 9e8812238433117cbdcc8c2a8ae047d0351841cd..93b091cd87fffb64aadbf50754dd66907650b0c9 100644 GIT binary patch delta 266 zcmV+l0rmdf0{a4xBnkm@Qb$4nuFf3kks&b&3;_Z=FsDohsgYYOf6_@rK~yNuozk(2 z!ax*-;Xfm!nBHwf(#8du%HC%f?38(yd6r@AWS+rNNHqvc3Y%aT!9rvTE1N__Ts3>( zcISf&_a@xM+F2hk&E!A{IKWxEI<&py4$OfcDN~fnP%0yYiV!MdyZ|h$T`g~@1>^A$ zttULj`-1Iue}hT0Xj1(bcmlr!V5Cf60syTiNSOi{0T`t+K1tIv0?0d}TmWSV)kmo5 zl>%@bkrRN6@q+ioOW=Lc-plpY>)$w?e(&n~q>sllqtW2qoi_jfh_1hP1&(8GCe`ms QG5`Po07*qoM6N<$g40)b#sB~S delta 238 zcmVlX1$YNOV~mIhB7(c)?$lZVK2-H|Mmy;Ho|F=QV`fa#bcW5g(sB!2fo}oGF~++9 zAXlYCj1eFQAd3jkWb5Ssv!|=T< oOIp{JuInD%>FfU=arF0o0ZCwO`Da@-ivR!s07*qoM6N<$f(Th`_5c6? diff --git a/data/gfx/gui/misc/radiobutton_unchecked_hover.png b/data/gfx/gui/misc/radiobutton_unchecked_hover.png index 0acd0453dd1306639cc3a5f7e20cf32e516a900c..d39e4366e6eebcf7fa0c7c4d2f9fd47a56a1b8d6 100644 GIT binary patch delta 266 zcmV+l0rmdf0{a4xBnkm@Qb$4nuFf3kks&b&3;_Z=EyPM|aFJUqf6_@rK~yNuozlH( z!!Q(v;nym7&|2EfcnX++(d^CFP`V}PT68TU*>Vxy)KwUY!Cg!@ck7_RWXNKN5c21I zaJKJ(1Ls7X#F)=FK#!9F4PXIl%oHj2w?zN8?)OU(FF25 zp(qxd$GMie{yoBIXk4kk1}?yN0ca`Xn*g9F7DyQbXaQ)YQXa|J(*nq5qD%md_uWHi z>@@8p`wEPugCL_t(2&z;gCZp1(gh2cN5%)Djc zA(8R0oT0SUoMp~3YVQ%|QY$2&CrJ5#pe4y_Rc*JMKFRETk|n$0DmmvTAZ^nDGf;q% zbN=3Y%@ueB-bDmeMOATk+?`r0z+2AwRWG7>2K9 oSzgw4rES~4?)3Tpk2v~!XT$z(L>wDR8~^|S07*qoM6N<$f(Ki0F#rGn diff --git a/src/gui/qt/mainwindow.ui b/src/gui/qt/mainwindow.ui index 3befd6f7..14b8378a 100644 --- a/src/gui/qt/mainwindow.ui +++ b/src/gui/qt/mainwindow.ui @@ -2926,7 +2926,7 @@ 0 - + @@ -2997,7 +2997,7 @@ - + 18 @@ -3385,7 +3385,7 @@ horizontalSlider_speed valueChanged(int) - label_11 + label_speedValue setNum(int) diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp index 57847bc2..c2ba3ed9 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.cpp +++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp @@ -369,11 +369,13 @@ mainWindowImpl::mainWindowImpl(ConfigFile *c, QMainWindow *parent) //Widgets Grafiken per Stylesheets setzen this->setStyleSheet("QMainWindow { background-image: url(" + myAppDataPath +"gfx/gui/table/default/table.png); background-position: bottom center; background-origin: content;}"); - menubar->setStyleSheet("QMenuBar { background-color: #145300; } QMenuBar::item { color: #669800; }"); + menubar->setStyleSheet("QMenuBar { background-color: #145300; } QMenuBar::item { color: #88BE00; }"); - pushButton_break->setStyleSheet("QPushButton:enabled { background-color: #145300; color: white;} QPushButton:disabled { background-color: #145300; color: #486F3E; font-weight: 900;}"); + pushButton_break->setStyleSheet("QPushButton:enabled { background-color: #145300; color: #88BE00;} QPushButton:disabled { background-color: #145300; color: #486F3E; font-weight: 900;}"); + label_speedString->setStyleSheet("QLabel { color: #88BE00;}"); + label_speedValue->setStyleSheet("QLabel { color: #88BE00;}"); - statusbar->setStyleSheet(" QStatusBar { "+ font1String +" font-size: 12px; color: white; }"); + statusbar->setStyleSheet(" QStatusBar { "+ font1String +" font-size: 12px; color: #88BE00; }"); //Groupbox Background for (i=1; isetStyleSheet("QLineEdit { "+ font2String +" font-size: 10px; font-weight: bold; background-color: #1D3B00; color: #F0F0F0; } QLineEdit:disabled { background-color: #316300; color: #6d7b5f }"); - pushButton_AllIn->setStyleSheet("QPushButton:enabled { background-color: #145300; color: white;} QPushButton:disabled { background-color: #145300; color: #486F3E; font-weight: 900;}"); + pushButton_AllIn->setStyleSheet("QPushButton:enabled { background-color: #145300; color: #88BE00;} QPushButton:disabled { background-color: #145300; color: #486F3E; font-weight: 900;}"); // away radiobuttons - QString radioButtonString("QRadioButton { color: #F0F0F0; } QRadioButton::indicator { width: 13px; height: 13px; } QRadioButton::indicator::checked { image: url("+myAppDataPath+"gfx/gui/misc/radiobutton_checked.png); }"); + QString radioButtonString("QRadioButton { color: #88BE00; } 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); @@ -2904,7 +2906,7 @@ void mainWindowImpl::nextRoundCleanGui() { //Clean breakbutton if(mySession->getGameType() == Session::GAME_TYPE_LOCAL) { blinkingStartButtonAnimationTimer->stop(); - pushButton_break->setStyleSheet("QPushButton { background-color: #145300; color: white;}"); + pushButton_break->setStyleSheet("QPushButton { background-color: #145300; color: #88BE00;}"); blinkingStartButtonAnimationTimer->stop(); QFontMetrics tempMetrics = this->fontMetrics(); int width = tempMetrics.width(tr("Stop")); @@ -2991,7 +2993,7 @@ void mainWindowImpl::breakButtonClicked() { blinkingStartButtonAnimationTimer->stop(); //Set default Color - pushButton_break->setStyleSheet("QPushButton { background-color: #145300; color: white;}"); + pushButton_break->setStyleSheet("QPushButton { background-color: #145300; color: #88BE00;}"); QFontMetrics tempMetrics = this->fontMetrics(); int width = tempMetrics.width(tr("Stop")); pushButton_break->setMinimumSize(width+10,20); @@ -3466,7 +3468,7 @@ void mainWindowImpl::blinkingStartButtonAnimationAction() { pushButton_break->setStyleSheet("QPushButton { background-color: #6E9E00; color: black;}"); } else { - pushButton_break->setStyleSheet("QPushButton { background-color: #145300; color: white;}"); + pushButton_break->setStyleSheet("QPushButton { background-color: #145300; color: #88BE00;}"); } } diff --git a/src/gui/qt/mainwindow/mylefttabwidget.cpp b/src/gui/qt/mainwindow/mylefttabwidget.cpp index 409b3b96..41461a72 100644 --- a/src/gui/qt/mainwindow/mylefttabwidget.cpp +++ b/src/gui/qt/mainwindow/mylefttabwidget.cpp @@ -43,7 +43,7 @@ MyLeftTabWidget::MyLeftTabWidget(QGroupBox *parent) QTabBar *myTabBar = this->tabBar(); - myTabBar->setStyleSheet("QTabBar::tab{ "+ font1String +" font-size: 11px; color: white; background-color: #145300; border: 2px solid #286400; border-bottom-color: #286400; border-top-left-radius: 4px; border-top-right-radius: 4px; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:selected, QTabBar::tab:hover { background-color: #145300; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:selected { border-color: #286400; border-bottom-color: #145300; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:!selected { margin-top: 2px; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:selected { margin-left: -4px; margin-right: -4px; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:first:selected { margin-left: 0; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:last:selected { margin-right: 0; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:only-one { margin: 0; } QTabBar::tab:disabled { font-size: 11px; font-weight: 900; color: #144D03; background-color: #144D03; border-left-color: #255704; border-right-color: #255704; border-top-color: #255704; }"); + myTabBar->setStyleSheet("QTabBar::tab{ "+ font1String +" font-size: 11px; color: #88BE00; background-color: #145300; border: 2px solid #286400; border-bottom-color: #286400; border-top-left-radius: 4px; border-top-right-radius: 4px; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:selected, QTabBar::tab:hover { background-color: #145300; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:selected { border-color: #286400; border-bottom-color: #145300; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:!selected { margin-top: 2px; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:selected { margin-left: -4px; margin-right: -4px; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:first:selected { margin-left: 0; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:last:selected { margin-right: 0; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:only-one { margin: 0; } QTabBar::tab:disabled { font-size: 11px; font-weight: 900; color: #144D03; background-color: #144D03; border-left-color: #255704; border-right-color: #255704; border-top-color: #255704; }"); } diff --git a/src/gui/qt/mainwindow/myrighttabwidget.cpp b/src/gui/qt/mainwindow/myrighttabwidget.cpp index d807969d..314fc2cb 100644 --- a/src/gui/qt/mainwindow/myrighttabwidget.cpp +++ b/src/gui/qt/mainwindow/myrighttabwidget.cpp @@ -44,7 +44,7 @@ MyRightTabWidget::MyRightTabWidget(QGroupBox *parent) QTabBar *myTabBar = this->tabBar(); - myTabBar->setStyleSheet("QTabBar::tab{ "+ font1String +" font-size: 11px; color: white; background-color: #145300; border: 2px solid #286400; border-bottom-color: #286400; border-top-left-radius: 4px; border-top-right-radius: 4px; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:selected, QTabBar::tab:hover { background-color: #145300; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:selected { border-color: #286400; border-bottom-color: #145300; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:!selected { margin-top: 2px; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:selected { margin-left: -4px; margin-right: -4px; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:first:selected { margin-left: 0; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:last:selected { margin-right: 0; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:only-one { margin: 0; } QTabBar::tab:disabled { font-size: 11px; font-weight: 900; color: #144D03; background-color: #144D03; border-left-color: #255704; border-right-color: #255704; border-top-color: #255704; }"); + myTabBar->setStyleSheet("QTabBar::tab{ "+ font1String +" font-size: 11px; color: #88BE00; background-color: #145300; border: 2px solid #286400; border-bottom-color: #286400; border-top-left-radius: 4px; border-top-right-radius: 4px; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:selected, QTabBar::tab:hover { background-color: #145300; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:selected { border-color: #286400; border-bottom-color: #145300; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:!selected { margin-top: 2px; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:selected { margin-left: -4px; margin-right: -4px; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:first:selected { margin-left: 0; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:last:selected { margin-right: 0; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:only-one { margin: 0; } QTabBar::tab:disabled { font-size: 11px; font-weight: 900; color: #144D03; background-color: #144D03; border-left-color: #255704; border-right-color: #255704; border-top-color: #255704; }"); } diff --git a/src/gui/qt/mainwindow/startsplash/startsplash.cpp b/src/gui/qt/mainwindow/startsplash/startsplash.cpp index ac2d995f..89a127f1 100644 --- a/src/gui/qt/mainwindow/startsplash/startsplash.cpp +++ b/src/gui/qt/mainwindow/startsplash/startsplash.cpp @@ -271,7 +271,7 @@ void StartSplash::paintEvent(QPaintEvent * /*event*/) { //even draw version number painter.setOpacity(1.0); painter.setFont(versionFont); - painter.setPen(QColor(102,153,0)); + painter.setPen(QColor(136,190,0)); painter.drawText(305,225,100,20,4,QString("Version %1").arg(POKERTH_BETA_RELEASE_STRING)); painter.setOpacity(opacity);