From 8bfdc9acaadea086d19fabbf838ddd4c9e313a05 Mon Sep 17 00:00:00 2001 From: ntrgn Date: Mon, 11 Aug 2014 18:46:57 +0200 Subject: [PATCH] qt: better looking trayicon Github-Pull: #4678 Rebased-By: Wladimir J. van der Laan --- doc/assets-attribution.md | 1 - src/Makefile.qt.include | 2 -- src/qt/bitcoin.qrc | 2 -- src/qt/bitcoingui.cpp | 4 ++-- src/qt/res/icons/toolbar.png | Bin 815 -> 0 bytes src/qt/res/icons/toolbar_testnet.png | Bin 678 -> 0 bytes 6 files changed, 2 insertions(+), 7 deletions(-) delete mode 100644 src/qt/res/icons/toolbar.png delete mode 100644 src/qt/res/icons/toolbar_testnet.png diff --git a/doc/assets-attribution.md b/doc/assets-attribution.md index 61b457a28..cd864f254 100644 --- a/doc/assets-attribution.md +++ b/doc/assets-attribution.md @@ -100,5 +100,4 @@ Jonas Schnelli src/qt/res/icons/bitcoin.icns, src/qt/res/src/bitcoin.svg, src/qt/res/src/bitcoin.ico, src/qt/res/src/bitcoin.png, src/qt/res/src/bitcoin_testnet.png, docs/bitcoin_logo_doxygen.png, - src/qt/res/icons/toolbar.png, src/qt/res/icons/toolbar_testnet.png, src/qt/res/images/splash.png, src/qt/res/images/splash_testnet.png diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include index 2052264dc..7e6fa5cb8 100644 --- a/src/Makefile.qt.include +++ b/src/Makefile.qt.include @@ -245,8 +245,6 @@ RES_ICONS = \ qt/res/icons/remove.png \ qt/res/icons/send.png \ qt/res/icons/synced.png \ - qt/res/icons/toolbar.png \ - qt/res/icons/toolbar_testnet.png \ qt/res/icons/transaction0.png \ qt/res/icons/transaction2.png \ qt/res/icons/transaction_conflicted.png \ diff --git a/src/qt/bitcoin.qrc b/src/qt/bitcoin.qrc index 357c6470d..6dba62035 100644 --- a/src/qt/bitcoin.qrc +++ b/src/qt/bitcoin.qrc @@ -4,7 +4,6 @@ res/icons/address-book.png res/icons/quit.png res/icons/send.png - res/icons/toolbar.png res/icons/connect0_16.png res/icons/connect1_16.png res/icons/connect2_16.png @@ -24,7 +23,6 @@ res/icons/editcopy.png res/icons/add.png res/icons/bitcoin_testnet.png - res/icons/toolbar_testnet.png res/icons/edit.png res/icons/history.png res/icons/overview.png diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index e3257e859..bfca5e8d1 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -479,12 +479,12 @@ void BitcoinGUI::createTrayIcon(bool fIsTestnet) if (!fIsTestnet) { trayIcon->setToolTip(tr("Bitcoin Core client")); - trayIcon->setIcon(QIcon(":/icons/toolbar")); + trayIcon->setIcon(QIcon(":/icons/bitcoin")); } else { trayIcon->setToolTip(tr("Bitcoin Core client") + " " + tr("[testnet]")); - trayIcon->setIcon(QIcon(":/icons/toolbar_testnet")); + trayIcon->setIcon(QIcon(":/icons/bitcoin_testnet")); } trayIcon->show(); diff --git a/src/qt/res/icons/toolbar.png b/src/qt/res/icons/toolbar.png deleted file mode 100644 index c82d96519c508857f70bf4b8555b9dd46d197272..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 815 zcmV+~1JL}5P)d(T6uv!%s(Cf0wP(>`a)6I8H zCz|*cT4qFm5d~7F0I7zBhD4O)+-=|P5THQC4?OSye7?{3$MYi=BQ7|AO3(+G5_ADc zaoWukv0SnbvdLq7Vl!Hk$I;3GPhx;(ZhY)vOv~l{%9JJL7df%H=uQ$)9}2;)hSwGZ z_ag=1WPv(8&}Q)VT?=`zpxk>s>OQ*S;jyVjnFJgP4CU(HjF)hI(|qK_k7D|_k0*ha zQ1oR}|A(A52PL6{gHS5UP72+ZRQ-1|g0gQN(-{j-#Yc8p&6#jTz-w1R;8j3VFit0K zG7}P8H~IUG7DctAAq=xN2A=XzOxDIuA5W$aNa0*G9iCy-YWuBWZ30ijZKHr{7N74? zor;aC{D@d)gA%UjZ-OHj?us3ltBD7C(_u*`vu|dac46o&cnfz$3L7cdJ^)?`uhgPS zGZn2`t0IiSvLrM`h{-f&o!jB7-v#s>@ubD5_0b`Lq2C5lwv=|VhUQ3}?H!0N;$|$_Q6aHMkO{PsWXjb6W$#-~t6bItSG(u#i#`Fu7 z5fB_9Kso*0K(1C1TQ{!s8_iX9poW2mr|_jn_aWyfeLU-M?E1rTq%JW`VPLmy*<#Du zdBfYp`P@7MRIwP&QFbXrcm5j_WM(vKA(YZUC5gdY{oBT?=4;jyTzZ#vci~jIX#h{tURAs zh-Vk&d3enFP|3pU&`NVkk|?Wz3I?dv_?}wi1;kQVOdC>%ZwIx)p_)LYB+@{cdScKT t*m`caSbMn`$W`i{YJanMQl$H0!e3`9l*5^G{qFz(002ovPDHLkV1k1EfPer1 diff --git a/src/qt/res/icons/toolbar_testnet.png b/src/qt/res/icons/toolbar_testnet.png deleted file mode 100644 index 5995bc06672c9884960f20098441c2afb5dd022c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 678 zcmV;X0$KfuP)E>~n~v+l>!m#L zYVNzJ)wS+H%AciogZ|II<@SHxE$9EUZ`%D|c-#B`k~;xF!y^B-9o6W@s=51&W+%`l zs76LePXYM{7TorDI_rkb7myst@W#DrsD}6zi@PCfuG^`4GQL};Jb9w5Q`tIY zvk6zU(w5&11<8Tb0A1t%-#t^*1FTs@j*SWE%q>8ZK?=Z6}=171P{5ahSLDkj`owoyXN`<^wP+wr9Izf+=!56BBZ?|lZk7UWV; zIK5Ue&xzjz*8m6c3|4*gXu#zq!*~*A4m}ddx12;Yy}zouYA37 zKi>S{nJwlGOf(xo$roe*6h8$f^^G7oqH`rM;8cMzuH{tTlAOHXW M07*qoM6N<$f)V3D;{X5v