From 8f695a03c11bb50c796c00100def99083008f97d Mon Sep 17 00:00:00 2001 From: crowning- Date: Mon, 1 Jun 2015 09:55:07 +0200 Subject: [PATCH 1/2] Statusbar icons for tDASH added --- src/qt/bitcoingui.cpp | 7 ++++++- src/qt/dash.qrc | 4 ++++ src/qt/res/icons/unit_dash.png | Bin 442 -> 353 bytes src/qt/res/icons/unit_duffs.png | Bin 369 -> 330 bytes src/qt/res/icons/unit_mdash.png | Bin 429 -> 393 bytes src/qt/res/icons/unit_tdash.png | Bin 0 -> 373 bytes src/qt/res/icons/unit_tduffs.png | Bin 0 -> 346 bytes src/qt/res/icons/unit_tmdash.png | Bin 0 -> 409 bytes src/qt/res/icons/unit_tudash.png | Bin 0 -> 393 bytes src/qt/res/icons/unit_udash.png | Bin 417 -> 378 bytes 10 files changed, 10 insertions(+), 1 deletion(-) mode change 100755 => 100644 src/qt/dash.qrc mode change 100644 => 100755 src/qt/res/icons/unit_dash.png mode change 100644 => 100755 src/qt/res/icons/unit_duffs.png mode change 100644 => 100755 src/qt/res/icons/unit_mdash.png create mode 100755 src/qt/res/icons/unit_tdash.png create mode 100755 src/qt/res/icons/unit_tduffs.png create mode 100755 src/qt/res/icons/unit_tmdash.png create mode 100755 src/qt/res/icons/unit_tudash.png mode change 100644 => 100755 src/qt/res/icons/unit_udash.png diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 832408bce1b7..120e4776ca31 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -1170,7 +1170,12 @@ void UnitDisplayStatusBarControl::setOptionsModel(OptionsModel *optionsModel) /** When Display Units are changed on OptionsModel it will refresh the display text of the control on the status bar */ void UnitDisplayStatusBarControl::updateDisplayUnit(int newUnits) { - setPixmap(QIcon(":/icons/unit_" + BitcoinUnits::id(newUnits)).pixmap(31,STATUSBAR_ICONSIZE)); + if(Params().NetworkID() == CBaseChainParams::MAIN){ + setPixmap(QIcon(":/icons/unit_" + BitcoinUnits::id(newUnits)).pixmap(39,STATUSBAR_ICONSIZE)); + } + else{ + setPixmap(QIcon(":/icons/unit_t" + BitcoinUnits::id(newUnits)).pixmap(39,STATUSBAR_ICONSIZE)); + } } /** Shows context menu with Display Unit options by the mouse coordinates */ diff --git a/src/qt/dash.qrc b/src/qt/dash.qrc old mode 100755 new mode 100644 index ffe18ef25b79..9e4fa270f403 --- a/src/qt/dash.qrc +++ b/src/qt/dash.qrc @@ -40,6 +40,10 @@ res/icons/unit_mdash.png res/icons/unit_udash.png res/icons/unit_duffs.png + res/icons/unit_tdash.png + res/icons/unit_tmdash.png + res/icons/unit_tudash.png + res/icons/unit_tduffs.png res/icons/lock_closed.png res/icons/lock_open.png res/icons/key.png diff --git a/src/qt/res/icons/unit_dash.png b/src/qt/res/icons/unit_dash.png old mode 100644 new mode 100755 index 8160c8245f86362e5823c00c80f362f4543ba5cd..8b29a6addcecbb2e5f4d2d1c0181a52e4a8597a2 GIT binary patch delta 315 zcmV-B0mS~g1K|Q8iBL{Q4GJ0x0000DNk~Le0000d0000G2nGNE0F~TkAdw+4e+B^t z3?cjxwSNEr0PaadK~zY`?bN$U13?tV@m~`NqNK6N3)o7CWhyP~Q%GJw-yo1QK7_T{ z+1m+%pf4a6R^GtU!ayKIA&oX?VOVxSaSayxhhff*Gv6>5YHI#BpUGIDUr;lM{2&+K z#1-B#!$rihzC~;OSX@RQ^8$hAe>jafA3)KVuKCxW*xRCD$b#m5RH=cGx@Nr!+#;7`HfB*0FX=cHb@OwT|hs9>ftw zx%zR$;TcKz3B@H}aEmz;dQ{+21!wWueiH$17)zti!FX^{X5p_T!eKG(5 N002ovPDHLkV1kQag^~aO delta 404 zcmV;F0c-x@0=fesiBL{Q4GJ0x0000DNk~Le0000V0000G2nGNE0Pgst?2#cce*^>< z3>k#!XY>F70Y^zhK~y-)?bJUgCtw%{@Q)wM38l!N{25$vCRrpIlp7?|IVFahC`swc za=N-vk}MVm23e?+nX;Hp$##hp3UOUgQi|nKzkVSmgWpq6y*+>4@AG`0=Y2^_THaVb z;S_hc!aC|xV!q%8wMn)Qn8iipe~%#p9r&G+KaKvxBj8OqL_Vsqgf$e0KLexK!f;aF z5E{^k7JNk)icpq9y2)#J$box72W9l}9)ml< z5Cfn5!_xo&0RBltK~y-)?bOdI#8DIn@DB?_DWxgNL}7!4G!MY6Ean;Pl$5QSrLwZ+ z0a#c_9>9W>rPOFPGg1~77XB3}rPv%bO)@vh>i4bFIepLVeD68ucFB;THEQVpA-{q< zY+@Dn*!U~)cMLaiT_{9+gL(Aee+hHw{;gOq_VI{ae1v!zYjLKCYt$p(Y|EIzMNDEF zo$U$Y<>+D%hYfr#4BEnvNAW^%Zdp^h=X>#>au~oFZn1;YIA6h7#FxlNAv}o_yoAqZ dA4i6N#V3g9GtDtNYUTg{002ovPDHLkV1gqxlI{Qi diff --git a/src/qt/res/icons/unit_mdash.png b/src/qt/res/icons/unit_mdash.png old mode 100644 new mode 100755 index a89b33981bd71d08a4bbd96abf7359af23c3440c..0752dd3803fc4794cabc4b6b0b4c9893f7df3d71 GIT binary patch delta 355 zcmV-p0i6D=1BnA6iBL{Q4GJ0x0000DNk~Le0000d0000G2nGNE0F~TkAdw+4e+B^t z3nnczwi^Hd0TxL_K~zY`?bN?Y13?hS@sCABL`h?j7qFF}rIi-;K_n00AF#6!OyfgX zi=DllAPD*bVqxQ7u(VJRMFpGK%)zl<5`z&e?hDJ#&fLxZc4v1fDf!>DbL|t2f^V7; zZzldJoZua=I0|2uw`i`u#bq?`e^wyy5c|>RxxxxYF&6esKjPY0#tYW5kqAhCXv7X? z)bNOE^tD{<3H2W=x~sS~%-|A>iGW^7HnAJ_UW_xA@PJcnW46O_$+vG4jbJG3;Y2_$ zaTk~idp^c_Dj}+cbFB8ebKUH2Wu5M@`sog(oWS#6iAyiU4z`kft?lF&Qd06;z5r2WWciKQL|p&?002ovPDHLkV1k70 Bn^*t< delta 391 zcmV;20eJq21FZugiBL{Q4GJ0x0000DNk~Le0000V0000G2nGNE0Pgst?2#cce*^>< z4hYL~0Xj)UK~y-)?b5$Xm0=jh@y`*hz{$Y^Ny0(gM1zRJ(SJZVP=lmMb5NiS zx(U*xK}%3@1{Wiw$p0WAr6zHSKwZq=NrT|fkJEC!@FKN_!}-F^dq3CvT=&g$KMxHW zoHGV-f;zt92`-fWzrqqKS@&ZZf8Vi=A&g9;yvLR3 zBdJlx8#ztEM;s(y!4ca3at+P+fvdQavA@lDyW)9>Hax|Cr z@M}E4b6iZ!Mw`MMF6A(l^!bgSiC^XBYxo>-Bi}>p;{)!-yqd=}hu)04pq4iKP)pv$s(}5Of1#VdWQC zS||vjf*@ma1CNl%Kq6S=58<76Z|>vdgoKus|Ho0H$I11DtmOV-^oND|BF^!FH=IT- zKexzu5_97Uo#DO2;0X?5O}W7arZE%xu8z4hsj`7A63pr08QoZWN$&;y2?A&&xw6_8 z_CoK+K4%?IxWEpUD?%s+(wMnxtb|^TeM%=xjc|p{zf3NDt%HiEA5@$>kJq~9zA-n! z2eFIo!t5yO@PMVzQ&_`gU314_;mL~ZDS2J4N TaFM$k00000NkvXXu0mjfP~Dyi literal 0 HcmV?d00001 diff --git a/src/qt/res/icons/unit_tduffs.png b/src/qt/res/icons/unit_tduffs.png new file mode 100755 index 0000000000000000000000000000000000000000..ef5a892b4fe3606a3eb374001091a93ffa6dcc98 GIT binary patch literal 346 zcmeAS@N?(olHy`uVBq!ia0vp^>Od^O!3HF!-bqscQfx`y?k)`fL2$v|<&%LToCO|{ z#S9F5M?jcysy3fAP>{XE)7O>#J{uz&ufUcoEi6Ex=bkQ(As)xyUbgjOc9dXyaD0B) zm8<8DT~pdCHqFvOp^7!oV|7_{xR}P1VP$R+xJi zWD8oXcx-a#R-jH^S8qW4qHftc;%2{Uo=C1!E-1G+Vsxvb=V!Gge=xTqd}pqCjuUHx3vIVCg!02R@WMgRZ+ literal 0 HcmV?d00001 diff --git a/src/qt/res/icons/unit_tmdash.png b/src/qt/res/icons/unit_tmdash.png new file mode 100755 index 0000000000000000000000000000000000000000..65f5d889ed48c6574595f3badad37c344f45951c GIT binary patch literal 409 zcmV;K0cQS*P)g;*|-u5iyT<)xiibm*>h(vJ@oMZu$$sZ>Ul@K&HIhWH!|^Y9N`tu zIEYxQZWc)qaY+uZ~V zPscuuQiy8e6pKZi>oi}T#HAgs<$QfD=O{<<*sZt^j1>4GHn5gy(2O|T#OR2Vn!!o8 z;`TyBr>mrdOAKcklyM#TDt2&-HymQD+pDC99{v)awGnS%n2S8A00000NkvXXu0mjf D37Dt? literal 0 HcmV?d00001 diff --git a/src/qt/res/icons/unit_tudash.png b/src/qt/res/icons/unit_tudash.png new file mode 100755 index 0000000000000000000000000000000000000000..3c2209ae76e66522c399d30470f50bf116ac984b GIT binary patch literal 393 zcmV;40e1e0P)Y$-$M2Uw6PZ4#)q&LJ9`@y6hU7=EUdhN zrG<(hDhM(*|3DaKm%$5I%z==T|Age^goGM3{vY-do+a%Aos#+8(7T2DG*0k_7aT?{ zU$=;?in**0@8Gq>-~o1`PjQK53}Yntbyag&iI}#sIh{x_M+*;VM&C-bN6b_Rpt89^ z$(7aCuoZke#yOU7k5g=5Za@&(UzoeVeDH-Br)Y$!9?r4yo#e(UnoF;>-RJb}K36%3 z=c?xN*Ef!%MEt}=g$J>T^}+_dsKYI0gAZX5XI0JRDLi2{5%NTPPrs5HHGUIcd|GLoUE-Bs00000NkvXXu0mjf*fym~ literal 0 HcmV?d00001 diff --git a/src/qt/res/icons/unit_udash.png b/src/qt/res/icons/unit_udash.png old mode 100644 new mode 100755 index c6168459350f0869a1fe29c9ca60087dce0493ee..c6a459804beb174d8d2d05f1d5cee2a34fe111fe GIT binary patch delta 340 zcmV-a0jvI@1Ns6XiBL{Q4GJ0x0000DNk~Le0000d0000G2nGNE0F~TkAdw+4e+B^t z3n@lRP0QC7sTFJP5rjV2BD4YDtw#VokRhcJuH zZW9ziUqB2d|AEnwVZ+BG6U=E1jBsca?hXPoZp<8dueF+-;8qW2mOL)29X~m z@g-c~3m-U*SXQ^F*Pq2@^zm6BfA9oHvFEwPCZ;hH_I(v`qY^)j_hW(?9lW3&dncEB zMR&}8wTMe&J2(jYF#L=SJmV63SSk5k@~c*HH&_jOE&M#K5H-X#wkDn2+?b!WSMv6~ zk{%0quOcoxiSsxs5tkl_ee5Q6h7pHHEQdXXbzD^umrdji+ljcMtE7cHD$FKz+IWb3 m7sq(QH_owG=T*|sFe$%X-d{ByduR&)00000fheg0-*yTiBL{Q4GJ0x0000DNk~Le0000V0000G2nGNE0Pgst?2#cce*^>< z4lwj>of-fD0WL{IK~y-)?b6RHA zDMhM8yaG>X#z@G%8}hcr<)=}L-`ERv)=?RjE!O-2pHP>OF?pGmD7=L!QLNxY*w2W~ z;uorM8+mEG;yLW4*i@akjE{1PK@1dpxW$JRVr9y_ ZA8)|-J2VT>AC&+A002ovPDHLkV1jOstl Date: Mon, 1 Jun 2015 10:27:46 +0200 Subject: [PATCH 2/2] Statusbar_Icons: makefile for Gitian fixed --- src/Makefile.qt.include | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) mode change 100644 => 100755 src/Makefile.qt.include diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include old mode 100644 new mode 100755 index d3b8412f0fd2..41707aea93f2 --- a/src/Makefile.qt.include +++ b/src/Makefile.qt.include @@ -222,7 +222,11 @@ RES_ICONS = \ qt/res/icons/unit_dash.png \ qt/res/icons/unit_mdash.png \ qt/res/icons/unit_udash.png \ - qt/res/icons/unit_duffs.png + qt/res/icons/unit_duffs.png \ + qt/res/icons/unit_tdash.png \ + qt/res/icons/unit_tmdash.png \ + qt/res/icons/unit_tudash.png \ + qt/res/icons/unit_tduffs.png BITCOIN_QT_CPP = \ qt/bitcoinaddressvalidator.cpp \