Skip to content

Commit 390874c

Browse files
committed
qt: Remove menu icons
1 parent 8fc7f0c commit 390874c

File tree

16 files changed

+19
-93
lines changed

16 files changed

+19
-93
lines changed

build_msvc/libbitcoin_qt/libbitcoin_qt.vcxproj

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -406,22 +406,13 @@
406406
<None Include="..\..\src\qtes\src\tx_inout.svg">
407407
<DeploymentContent>true</DeploymentContent>
408408
</None>
409-
<None Include="..\..\src\qtes\src\verify.svg">
410-
<DeploymentContent>true</DeploymentContent>
411-
</None>
412409
<None Include="GeneratedFiles\bitcoin.moc" />
413410
<None Include="GeneratedFiles\bitcoinamountfield.moc" />
414411
<None Include="GeneratedFiles\intro.moc" />
415412
<None Include="GeneratedFiles\overviewpage.moc" />
416413
<None Include="GeneratedFilespcconsole.moc" />
417414
</ItemGroup>
418415
<ItemGroup>
419-
<Image Include="..\..\src\qtes\icons\about.png">
420-
<DeploymentContent>true</DeploymentContent>
421-
</Image>
422-
<Image Include="..\..\src\qtes\icons\about_qt.png">
423-
<DeploymentContent>true</DeploymentContent>
424-
</Image>
425416
<Image Include="..\..\src\qtes\icons\add.png">
426417
<DeploymentContent>true</DeploymentContent>
427418
</Image>
@@ -455,9 +446,6 @@
455446
<Image Include="..\..\src\qtes\icons\clock5.png">
456447
<DeploymentContent>true</DeploymentContent>
457448
</Image>
458-
<Image Include="..\..\src\qtes\icons\configure.png">
459-
<DeploymentContent>true</DeploymentContent>
460-
</Image>
461449
<Image Include="..\..\src\qtes\icons\connect0.png">
462450
<DeploymentContent>true</DeploymentContent>
463451
</Image>
@@ -473,9 +461,6 @@
473461
<Image Include="..\..\src\qtes\icons\connect4.png">
474462
<DeploymentContent>true</DeploymentContent>
475463
</Image>
476-
<Image Include="..\..\src\qtes\icons\debugwindow.png">
477-
<DeploymentContent>true</DeploymentContent>
478-
</Image>
479464
<Image Include="..\..\src\qtes\icons\edit.png">
480465
<DeploymentContent>true</DeploymentContent>
481466
</Image>
@@ -497,9 +482,6 @@
497482
<Image Include="..\..\src\qtes\icons\eye_plus.png">
498483
<DeploymentContent>true</DeploymentContent>
499484
</Image>
500-
<Image Include="..\..\src\qtes\icons\filesave.png">
501-
<DeploymentContent>true</DeploymentContent>
502-
</Image>
503485
<Image Include="..\..\src\qtes\icons\fontbigger.png">
504486
<DeploymentContent>true</DeploymentContent>
505487
</Image>
@@ -518,9 +500,6 @@
518500
<Image Include="..\..\src\qtes\icons\info.png">
519501
<DeploymentContent>true</DeploymentContent>
520502
</Image>
521-
<Image Include="..\..\src\qtes\icons\key.png">
522-
<DeploymentContent>true</DeploymentContent>
523-
</Image>
524503
<Image Include="..\..\src\qtes\icons\lock_closed.png">
525504
<DeploymentContent>true</DeploymentContent>
526505
</Image>
@@ -530,15 +509,9 @@
530509
<Image Include="..\..\src\qtes\icons\network_disabled.png">
531510
<DeploymentContent>true</DeploymentContent>
532511
</Image>
533-
<Image Include="..\..\src\qtes\icons\open.png">
534-
<DeploymentContent>true</DeploymentContent>
535-
</Image>
536512
<Image Include="..\..\src\qtes\icons\overview.png">
537513
<DeploymentContent>true</DeploymentContent>
538514
</Image>
539-
<Image Include="..\..\src\qtes\icons\quit.png">
540-
<DeploymentContent>true</DeploymentContent>
541-
</Image>
542515
<Image Include="..\..\src\qtes\iconseceive.png">
543516
<DeploymentContent>true</DeploymentContent>
544517
</Image>
@@ -575,9 +548,6 @@
575548
<Image Include="..\..\src\qtes\icons\tx_output.png">
576549
<DeploymentContent>true</DeploymentContent>
577550
</Image>
578-
<Image Include="..\..\src\qtes\icons\verify.png">
579-
<DeploymentContent>true</DeploymentContent>
580-
</Image>
581551
<Image Include="..\..\src\qtes\icons\warning.png">
582552
<DeploymentContent>true</DeploymentContent>
583553
</Image>

contrib/debian/copyright

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,21 +26,14 @@ License: GNU-All-permissive-License
2626
Files: src/qt/res/icons/add.png
2727
src/qt/res/icons/address-book.png
2828
src/qt/res/icons/chevron.png
29-
src/qt/res/icons/configure.png
30-
src/qt/res/icons/debugwindow.png
3129
src/qt/res/icons/edit.png
3230
src/qt/res/icons/editcopy.png
3331
src/qt/res/icons/editpaste.png
3432
src/qt/res/icons/export.png
3533
src/qt/res/icons/eye.png
36-
src/qt/res/icons/filesave.png
3734
src/qt/res/icons/history.png
38-
src/qt/res/icons/info.png
39-
src/qt/res/icons/key.png
4035
src/qt/res/icons/lock_*.png
41-
src/qt/res/icons/open.png
4236
src/qt/res/icons/overview.png
43-
src/qt/res/icons/quit.png
4437
src/qt/res/icons/receive.png
4538
src/qt/res/icons/remove.png
4639
src/qt/res/icons/send.png
@@ -76,16 +69,13 @@ License: Expat
7669
Files: src/qt/res/icons/clock*.png
7770
src/qt/res/icons/eye_*.png
7871
src/qt/res/icons/tx_in*.png
79-
src/qt/res/icons/verify.png
8072
src/qt/res/src/clock_*.svg
8173
src/qt/res/src/tx_*.svg
82-
src/qt/res/src/verify.svg
8374
Copyright: Stephen Hutchings, Jonas Schnelli
8475
License: Expat
8576
Comment: Modifications of Stephen Hutchings' Typicons
8677

87-
Files: src/qt/res/icons/about.png
88-
src/qt/res/icons/bitcoin.*
78+
Files: src/qt/res/icons/bitcoin.*
8979
share/pixmaps/bitcoin*
9080
src/qt/res/src/bitcoin.svg
9181
Copyright: Bitboy, Jonas Schnelli

src/Makefile.qt.include

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -250,8 +250,6 @@ BITCOIN_QT_H = \
250250
RES_ICONS = \
251251
qt/res/icons/add.png \
252252
qt/res/icons/address-book.png \
253-
qt/res/icons/about.png \
254-
qt/res/icons/about_qt.png \
255253
qt/res/icons/bitcoin.ico \
256254
qt/res/icons/bitcoin_testnet.ico \
257255
qt/res/icons/bitcoin.png \
@@ -261,35 +259,28 @@ RES_ICONS = \
261259
qt/res/icons/clock3.png \
262260
qt/res/icons/clock4.png \
263261
qt/res/icons/clock5.png \
264-
qt/res/icons/configure.png \
265262
qt/res/icons/connect0.png \
266263
qt/res/icons/connect1.png \
267264
qt/res/icons/connect2.png \
268265
qt/res/icons/connect3.png \
269266
qt/res/icons/connect4.png \
270-
qt/res/icons/debugwindow.png \
271267
qt/res/icons/edit.png \
272268
qt/res/icons/editcopy.png \
273269
qt/res/icons/editpaste.png \
274270
qt/res/icons/export.png \
275271
qt/res/icons/eye.png \
276272
qt/res/icons/eye_minus.png \
277273
qt/res/icons/eye_plus.png \
278-
qt/res/icons/filesave.png \
279274
qt/res/icons/fontbigger.png \
280275
qt/res/icons/fontsmaller.png \
281276
qt/res/icons/hd_disabled.png \
282277
qt/res/icons/hd_enabled.png \
283278
qt/res/icons/history.png \
284-
qt/res/icons/info.png \
285-
qt/res/icons/key.png \
286279
qt/res/icons/lock_closed.png \
287280
qt/res/icons/lock_open.png \
288281
qt/res/icons/network_disabled.png \
289-
qt/res/icons/open.png \
290282
qt/res/icons/overview.png \
291283
qt/res/icons/proxy.png \
292-
qt/res/icons/quit.png \
293284
qt/res/icons/receive.png \
294285
qt/res/icons/remove.png \
295286
qt/res/icons/send.png \
@@ -302,8 +293,7 @@ RES_ICONS = \
302293
qt/res/icons/tx_input.png \
303294
qt/res/icons/tx_output.png \
304295
qt/res/icons/tx_mined.png \
305-
qt/res/icons/warning.png \
306-
qt/res/icons/verify.png
296+
qt/res/icons/warning.png
307297

308298
BITCOIN_QT_BASE_CPP = \
309299
qt/bantablemodel.cpp \

src/qt/bitcoin.qrc

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<qresource prefix="/icons">
33
<file alias="bitcoin">res/icons/bitcoin.png</file>
44
<file alias="address-book">res/icons/address-book.png</file>
5-
<file alias="quit">res/icons/quit.png</file>
65
<file alias="send">res/icons/send.png</file>
76
<file alias="connect_0">res/icons/connect0.png</file>
87
<file alias="connect_1">res/icons/connect1.png</file>
@@ -20,7 +19,6 @@
2019
<file alias="eye">res/icons/eye.png</file>
2120
<file alias="eye_minus">res/icons/eye_minus.png</file>
2221
<file alias="eye_plus">res/icons/eye_plus.png</file>
23-
<file alias="options">res/icons/configure.png</file>
2422
<file alias="receiving_addresses">res/icons/receive.png</file>
2523
<file alias="editpaste">res/icons/editpaste.png</file>
2624
<file alias="editcopy">res/icons/editcopy.png</file>
@@ -37,14 +35,6 @@
3735
<file alias="tx_inout">res/icons/tx_inout.png</file>
3836
<file alias="lock_closed">res/icons/lock_closed.png</file>
3937
<file alias="lock_open">res/icons/lock_open.png</file>
40-
<file alias="key">res/icons/key.png</file>
41-
<file alias="filesave">res/icons/filesave.png</file>
42-
<file alias="debugwindow">res/icons/debugwindow.png</file>
43-
<file alias="open">res/icons/open.png</file>
44-
<file alias="info">res/icons/info.png</file>
45-
<file alias="about">res/icons/about.png</file>
46-
<file alias="about_qt">res/icons/about_qt.png</file>
47-
<file alias="verify">res/icons/verify.png</file>
4838
<file alias="warning">res/icons/warning.png</file>
4939
<file alias="fontbigger">res/icons/fontbigger.png</file>
5040
<file alias="fontsmaller">res/icons/fontsmaller.png</file>

src/qt/bitcoingui.cpp

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ void BitcoinGUI::createActions()
248248
sendCoinsAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_2));
249249
tabGroup->addAction(sendCoinsAction);
250250

251-
sendCoinsMenuAction = new QAction(platformStyle->TextColorIcon(":/icons/send"), sendCoinsAction->text(), this);
251+
sendCoinsMenuAction = new QAction(sendCoinsAction->text(), this);
252252
sendCoinsMenuAction->setStatusTip(sendCoinsAction->statusTip());
253253
sendCoinsMenuAction->setToolTip(sendCoinsMenuAction->statusTip());
254254

@@ -259,7 +259,7 @@ void BitcoinGUI::createActions()
259259
receiveCoinsAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_3));
260260
tabGroup->addAction(receiveCoinsAction);
261261

262-
receiveCoinsMenuAction = new QAction(platformStyle->TextColorIcon(":/icons/receiving_addresses"), receiveCoinsAction->text(), this);
262+
receiveCoinsMenuAction = new QAction(receiveCoinsAction->text(), this);
263263
receiveCoinsMenuAction->setStatusTip(receiveCoinsAction->statusTip());
264264
receiveCoinsMenuAction->setToolTip(receiveCoinsMenuAction->statusTip());
265265

@@ -287,48 +287,48 @@ void BitcoinGUI::createActions()
287287
connect(historyAction, &QAction::triggered, this, &BitcoinGUI::gotoHistoryPage);
288288
#endif // ENABLE_WALLET
289289

290-
quitAction = new QAction(platformStyle->TextColorIcon(":/icons/quit"), tr("E&xit"), this);
290+
quitAction = new QAction(tr("E&xit"), this);
291291
quitAction->setStatusTip(tr("Quit application"));
292292
quitAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Q));
293293
quitAction->setMenuRole(QAction::QuitRole);
294-
aboutAction = new QAction(platformStyle->TextColorIcon(":/icons/about"), tr("&About %1").arg(PACKAGE_NAME), this);
294+
aboutAction = new QAction(tr("&About %1").arg(PACKAGE_NAME), this);
295295
aboutAction->setStatusTip(tr("Show information about %1").arg(PACKAGE_NAME));
296296
aboutAction->setMenuRole(QAction::AboutRole);
297297
aboutAction->setEnabled(false);
298-
aboutQtAction = new QAction(platformStyle->TextColorIcon(":/icons/about_qt"), tr("About &Qt"), this);
298+
aboutQtAction = new QAction(tr("About &Qt"), this);
299299
aboutQtAction->setStatusTip(tr("Show information about Qt"));
300300
aboutQtAction->setMenuRole(QAction::AboutQtRole);
301-
optionsAction = new QAction(platformStyle->TextColorIcon(":/icons/options"), tr("&Options..."), this);
301+
optionsAction = new QAction(tr("&Options..."), this);
302302
optionsAction->setStatusTip(tr("Modify configuration options for %1").arg(PACKAGE_NAME));
303303
optionsAction->setMenuRole(QAction::PreferencesRole);
304304
optionsAction->setEnabled(false);
305-
toggleHideAction = new QAction(platformStyle->TextColorIcon(":/icons/about"), tr("&Show / Hide"), this);
305+
toggleHideAction = new QAction(tr("&Show / Hide"), this);
306306
toggleHideAction->setStatusTip(tr("Show or hide the main Window"));
307307

308-
encryptWalletAction = new QAction(platformStyle->TextColorIcon(":/icons/lock_closed"), tr("&Encrypt Wallet..."), this);
308+
encryptWalletAction = new QAction(tr("&Encrypt Wallet..."), this);
309309
encryptWalletAction->setStatusTip(tr("Encrypt the private keys that belong to your wallet"));
310310
encryptWalletAction->setCheckable(true);
311-
backupWalletAction = new QAction(platformStyle->TextColorIcon(":/icons/filesave"), tr("&Backup Wallet..."), this);
311+
backupWalletAction = new QAction(tr("&Backup Wallet..."), this);
312312
backupWalletAction->setStatusTip(tr("Backup wallet to another location"));
313-
changePassphraseAction = new QAction(platformStyle->TextColorIcon(":/icons/key"), tr("&Change Passphrase..."), this);
313+
changePassphraseAction = new QAction(tr("&Change Passphrase..."), this);
314314
changePassphraseAction->setStatusTip(tr("Change the passphrase used for wallet encryption"));
315-
signMessageAction = new QAction(platformStyle->TextColorIcon(":/icons/edit"), tr("Sign &message..."), this);
315+
signMessageAction = new QAction(tr("Sign &message..."), this);
316316
signMessageAction->setStatusTip(tr("Sign messages with your Bitcoin addresses to prove you own them"));
317-
verifyMessageAction = new QAction(platformStyle->TextColorIcon(":/icons/verify"), tr("&Verify message..."), this);
317+
verifyMessageAction = new QAction(tr("&Verify message..."), this);
318318
verifyMessageAction->setStatusTip(tr("Verify messages to ensure they were signed with specified Bitcoin addresses"));
319319

320-
openRPCConsoleAction = new QAction(platformStyle->TextColorIcon(":/icons/debugwindow"), tr("&Debug window"), this);
320+
openRPCConsoleAction = new QAction(tr("&Debug window"), this);
321321
openRPCConsoleAction->setStatusTip(tr("Open debugging and diagnostic console"));
322322
// initially disable the debug window menu item
323323
openRPCConsoleAction->setEnabled(false);
324324
openRPCConsoleAction->setObjectName("openRPCConsoleAction");
325325

326-
usedSendingAddressesAction = new QAction(platformStyle->TextColorIcon(":/icons/address-book"), tr("&Sending addresses"), this);
326+
usedSendingAddressesAction = new QAction(tr("&Sending addresses"), this);
327327
usedSendingAddressesAction->setStatusTip(tr("Show the list of used sending addresses and labels"));
328-
usedReceivingAddressesAction = new QAction(platformStyle->TextColorIcon(":/icons/address-book"), tr("&Receiving addresses"), this);
328+
usedReceivingAddressesAction = new QAction(tr("&Receiving addresses"), this);
329329
usedReceivingAddressesAction->setStatusTip(tr("Show the list of used receiving addresses and labels"));
330330

331-
openAction = new QAction(platformStyle->TextColorIcon(":/icons/open"), tr("Open &URI..."), this);
331+
openAction = new QAction(tr("Open &URI..."), this);
332332
openAction->setStatusTip(tr("Open a bitcoin: URI or payment request"));
333333

334334
m_open_wallet_action = new QAction(tr("Open Wallet"), this);
@@ -339,7 +339,7 @@ void BitcoinGUI::createActions()
339339
m_close_wallet_action = new QAction(tr("Close Wallet..."), this);
340340
m_close_wallet_action->setStatusTip(tr("Close wallet"));
341341

342-
showHelpMessageAction = new QAction(platformStyle->TextColorIcon(":/icons/info"), tr("&Command-line options"), this);
342+
showHelpMessageAction = new QAction(tr("&Command-line options"), this);
343343
showHelpMessageAction->setMenuRole(QAction::NoRole);
344344
showHelpMessageAction->setStatusTip(tr("Show the %1 help message to get a list with possible Bitcoin command-line options").arg(PACKAGE_NAME));
345345

src/qt/res/icons/about.png

-3.63 KB
Binary file not shown.

src/qt/res/icons/about_qt.png

-2.19 KB
Binary file not shown.

src/qt/res/icons/configure.png

-2.8 KB
Binary file not shown.

src/qt/res/icons/debugwindow.png

-1.3 KB
Binary file not shown.

src/qt/res/icons/filesave.png

-2.3 KB
Binary file not shown.

0 commit comments

Comments
 (0)