Skip to content

Commit 31aac02

Browse files
jonasschnellijonasschnelli
committed
Qt: new icons
- flat and b/w icons seems to be the new trend - support for HiDPI/retina - change icon sizes - fix assets-attribution.md - removed unused icons
1 parent 2262415 commit 31aac02

118 files changed

Lines changed: 303 additions & 1956 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎doc/assets-attribution.md‎

Lines changed: 36 additions & 83 deletions

‎src/Makefile.qt.include‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,8 @@ BITCOIN_QT_H = \
212212
RES_ICONS = \
213213
qt/res/icons/add.png \
214214
qt/res/icons/address-book.png \
215+
qt/res/icons/about.png \
216+
qt/res/icons/about_qt.png \
215217
qt/res/icons/bitcoin.ico \
216218
qt/res/icons/bitcoin.png \
217219
qt/res/icons/bitcoin_testnet.ico \
@@ -222,11 +224,11 @@ RES_ICONS = \
222224
qt/res/icons/clock4.png \
223225
qt/res/icons/clock5.png \
224226
qt/res/icons/configure.png \
225-
qt/res/icons/connect0_16.png \
226-
qt/res/icons/connect1_16.png \
227-
qt/res/icons/connect2_16.png \
228-
qt/res/icons/connect3_16.png \
229-
qt/res/icons/connect4_16.png \
227+
qt/res/icons/connect0.png \
228+
qt/res/icons/connect1.png \
229+
qt/res/icons/connect2.png \
230+
qt/res/icons/connect3.png \
231+
qt/res/icons/connect4.png \
230232
qt/res/icons/debugwindow.png \
231233
qt/res/icons/edit.png \
232234
qt/res/icons/editcopy.png \
@@ -237,11 +239,12 @@ RES_ICONS = \
237239
qt/res/icons/eye_plus.png \
238240
qt/res/icons/filesave.png \
239241
qt/res/icons/history.png \
242+
qt/res/icons/info.png \
240243
qt/res/icons/key.png \
241244
qt/res/icons/lock_closed.png \
242245
qt/res/icons/lock_open.png \
246+
qt/res/icons/open.png \
243247
qt/res/icons/overview.png \
244-
qt/res/icons/qrcode.png \
245248
qt/res/icons/quit.png \
246249
qt/res/icons/receive.png \
247250
qt/res/icons/remove.png \
@@ -256,7 +259,8 @@ RES_ICONS = \
256259
qt/res/icons/tx_mined.png \
257260
qt/res/icons/unit_btc.png \
258261
qt/res/icons/unit_mbtc.png \
259-
qt/res/icons/unit_ubtc.png
262+
qt/res/icons/unit_ubtc.png \
263+
qt/res/icons/verify.png
260264

261265
BITCOIN_QT_CPP = \
262266
qt/bitcoinaddressvalidator.cpp \

‎src/qt/bitcoin.qrc‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
<file alias="address-book">res/icons/address-book.png</file>
55
<file alias="quit">res/icons/quit.png</file>
66
<file alias="send">res/icons/send.png</file>
7-
<file alias="connect_0">res/icons/connect0_16.png</file>
8-
<file alias="connect_1">res/icons/connect1_16.png</file>
9-
<file alias="connect_2">res/icons/connect2_16.png</file>
10-
<file alias="connect_3">res/icons/connect3_16.png</file>
11-
<file alias="connect_4">res/icons/connect4_16.png</file>
7+
<file alias="connect_0">res/icons/connect0.png</file>
8+
<file alias="connect_1">res/icons/connect1.png</file>
9+
<file alias="connect_2">res/icons/connect2.png</file>
10+
<file alias="connect_3">res/icons/connect3.png</file>
11+
<file alias="connect_4">res/icons/connect4.png</file>
1212
<file alias="transaction_0">res/icons/transaction0.png</file>
1313
<file alias="transaction_confirmed">res/icons/transaction2.png</file>
1414
<file alias="transaction_conflicted">res/icons/transaction_conflicted.png</file>
@@ -43,8 +43,12 @@
4343
<file alias="lock_open">res/icons/lock_open.png</file>
4444
<file alias="key">res/icons/key.png</file>
4545
<file alias="filesave">res/icons/filesave.png</file>
46-
<file alias="qrcode">res/icons/qrcode.png</file>
4746
<file alias="debugwindow">res/icons/debugwindow.png</file>
47+
<file alias="open">res/icons/open.png</file>
48+
<file alias="info">res/icons/info.png</file>
49+
<file alias="about">res/icons/about.png</file>
50+
<file alias="about_qt">res/icons/about_qt.png</file>
51+
<file alias="verify">res/icons/verify.png</file>
4852
</qresource>
4953
<qresource prefix="/images">
5054
<file alias="about">res/images/about.png</file>
@@ -87,5 +91,6 @@
8791
<file alias="spinner-032">res/movies/spinner-032.png</file>
8892
<file alias="spinner-033">res/movies/spinner-033.png</file>
8993
<file alias="spinner-034">res/movies/spinner-034.png</file>
94+
<file alias="spinner-035">res/movies/spinner-035.png</file>
9095
</qresource>
9196
</RCC>

‎src/qt/bitcoingui.cpp‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -285,20 +285,16 @@ void BitcoinGUI::createActions(const NetworkStyle *networkStyle)
285285
quitAction->setStatusTip(tr("Quit application"));
286286
quitAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Q));
287287
quitAction->setMenuRole(QAction::QuitRole);
288-
aboutAction = new QAction(networkStyle->getAppIcon(), tr("&About Bitcoin Core"), this);
288+
aboutAction = new QAction(QIcon(":/icons/about"), tr("&About Bitcoin Core"), this);
289289
aboutAction->setStatusTip(tr("Show information about Bitcoin Core"));
290290
aboutAction->setMenuRole(QAction::AboutRole);
291-
#if QT_VERSION < 0x050000
292-
aboutQtAction = new QAction(QIcon(":/trolltech/qmessagebox/images/qtlogo-64.png"), tr("About &Qt"), this);
293-
#else
294-
aboutQtAction = new QAction(QIcon(":/qt-project.org/qmessagebox/images/qtlogo-64.png"), tr("About &Qt"), this);
295-
#endif
291+
aboutQtAction = new QAction(QIcon(":/icons/about_qt"), tr("About &Qt"), this);
296292
aboutQtAction->setStatusTip(tr("Show information about Qt"));
297293
aboutQtAction->setMenuRole(QAction::AboutQtRole);
298294
optionsAction = new QAction(QIcon(":/icons/options"), tr("&Options..."), this);
299295
optionsAction->setStatusTip(tr("Modify configuration options for Bitcoin"));
300296
optionsAction->setMenuRole(QAction::PreferencesRole);
301-
toggleHideAction = new QAction(networkStyle->getAppIcon(), tr("&Show / Hide"), this);
297+
toggleHideAction = new QAction(QIcon(":/icons/about"), tr("&Show / Hide"), this);
302298
toggleHideAction->setStatusTip(tr("Show or hide the main Window"));
303299

304300
encryptWalletAction = new QAction(QIcon(":/icons/lock_closed"), tr("&Encrypt Wallet..."), this);
@@ -310,7 +306,7 @@ void BitcoinGUI::createActions(const NetworkStyle *networkStyle)
310306
changePassphraseAction->setStatusTip(tr("Change the passphrase used for wallet encryption"));
311307
signMessageAction = new QAction(QIcon(":/icons/edit"), tr("Sign &message..."), this);
312308
signMessageAction->setStatusTip(tr("Sign messages with your Bitcoin addresses to prove you own them"));
313-
verifyMessageAction = new QAction(QIcon(":/icons/transaction_0"), tr("&Verify message..."), this);
309+
verifyMessageAction = new QAction(QIcon(":/icons/verify"), tr("&Verify message..."), this);
314310
verifyMessageAction->setStatusTip(tr("Verify messages to ensure they were signed with specified Bitcoin addresses"));
315311

316312
openRPCConsoleAction = new QAction(QIcon(":/icons/debugwindow"), tr("&Debug window"), this);
@@ -321,10 +317,10 @@ void BitcoinGUI::createActions(const NetworkStyle *networkStyle)
321317
usedReceivingAddressesAction = new QAction(QIcon(":/icons/address-book"), tr("&Receiving addresses..."), this);
322318
usedReceivingAddressesAction->setStatusTip(tr("Show the list of used receiving addresses and labels"));
323319

324-
openAction = new QAction(QApplication::style()->standardIcon(QStyle::SP_FileIcon), tr("Open &URI..."), this);
320+
openAction = new QAction(QIcon(":/icons/open"), tr("Open &URI..."), this);
325321
openAction->setStatusTip(tr("Open a bitcoin: URI or payment request"));
326322

327-
showHelpMessageAction = new QAction(QApplication::style()->standardIcon(QStyle::SP_MessageBoxInformation), tr("&Command-line options"), this);
323+
showHelpMessageAction = new QAction(QIcon(":/icons/info"), tr("&Command-line options"), this);
328324
showHelpMessageAction->setStatusTip(tr("Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options"));
329325

330326
connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit()));

‎src/qt/forms/sendcoinsentry.ui‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,12 @@
6767
<iconset resource="../bitcoin.qrc">
6868
<normaloff>:/icons/address-book</normaloff>:/icons/address-book</iconset>
6969
</property>
70+
<property name="iconSize">
71+
<size>
72+
<width>22</width>
73+
<height>22</height>
74+
</size>
75+
</property>
7076
<property name="shortcut">
7177
<string>Alt+A</string>
7278
</property>
@@ -84,6 +90,12 @@
8490
<iconset resource="../bitcoin.qrc">
8591
<normaloff>:/icons/editpaste</normaloff>:/icons/editpaste</iconset>
8692
</property>
93+
<property name="iconSize">
94+
<size>
95+
<width>22</width>
96+
<height>22</height>
97+
</size>
98+
</property>
8799
<property name="shortcut">
88100
<string>Alt+P</string>
89101
</property>
@@ -101,6 +113,12 @@
101113
<iconset resource="../bitcoin.qrc">
102114
<normaloff>:/icons/remove</normaloff>:/icons/remove</iconset>
103115
</property>
116+
<property name="iconSize">
117+
<size>
118+
<width>22</width>
119+
<height>22</height>
120+
</size>
121+
</property>
104122
</widget>
105123
</item>
106124
</layout>

‎src/qt/res/icons/about.png‎

5.79 KB

‎src/qt/res/icons/about_qt.png‎

3.03 KB

‎src/qt/res/icons/add.png‎

13.8 KB

‎src/qt/res/icons/address-book.png‎

14.1 KB

‎src/qt/res/icons/clock1.png‎

1.55 KB

0 commit comments

Comments
 (0)