Browse Source

qt: better looking trayicon

Github-Pull: #4678
Rebased-By: Wladimir J. van der Laan <laanwj@gmail.com>
pull/1/head
ntrgn 8 years ago committed by Wladimir J. van der Laan
parent
commit
8bfdc9acaa
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
  1. 1
      doc/assets-attribution.md
  2. 2
      src/Makefile.qt.include
  3. 2
      src/qt/bitcoin.qrc
  4. 4
      src/qt/bitcoingui.cpp
  5. BIN
      src/qt/res/icons/toolbar.png
  6. BIN
      src/qt/res/icons/toolbar_testnet.png

1
doc/assets-attribution.md

@ -100,5 +100,4 @@ Jonas Schnelli @@ -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

2
src/Makefile.qt.include

@ -245,8 +245,6 @@ RES_ICONS = \ @@ -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 \

2
src/qt/bitcoin.qrc

@ -4,7 +4,6 @@ @@ -4,7 +4,6 @@
<file alias="address-book">res/icons/address-book.png</file>
<file alias="quit">res/icons/quit.png</file>
<file alias="send">res/icons/send.png</file>
<file alias="toolbar">res/icons/toolbar.png</file>
<file alias="connect_0">res/icons/connect0_16.png</file>
<file alias="connect_1">res/icons/connect1_16.png</file>
<file alias="connect_2">res/icons/connect2_16.png</file>
@ -24,7 +23,6 @@ @@ -24,7 +23,6 @@
<file alias="editcopy">res/icons/editcopy.png</file>
<file alias="add">res/icons/add.png</file>
<file alias="bitcoin_testnet">res/icons/bitcoin_testnet.png</file>
<file alias="toolbar_testnet">res/icons/toolbar_testnet.png</file>
<file alias="edit">res/icons/edit.png</file>
<file alias="history">res/icons/history.png</file>
<file alias="overview">res/icons/overview.png</file>

4
src/qt/bitcoingui.cpp

@ -479,12 +479,12 @@ void BitcoinGUI::createTrayIcon(bool fIsTestnet) @@ -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();

BIN
src/qt/res/icons/toolbar.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 815 B

BIN
src/qt/res/icons/toolbar_testnet.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 678 B

Loading…
Cancel
Save