From 390874c722c5af0b37cb94151ffb49986eab5f7d Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Wed, 14 Aug 2019 16:11:47 +0200 Subject: qt: Remove menu icons --- build_msvc/libbitcoin_qt/libbitcoin_qt.vcxproj | 30 ---------------------- contrib/debian/copyright | 12 +-------- src/Makefile.qt.include | 12 +-------- src/qt/bitcoin.qrc | 10 -------- src/qt/bitcoingui.cpp | 34 ++++++++++++------------- src/qt/res/icons/about.png | Bin 3717 -> 0 bytes src/qt/res/icons/about_qt.png | Bin 2240 -> 0 bytes src/qt/res/icons/configure.png | Bin 2865 -> 0 bytes src/qt/res/icons/debugwindow.png | Bin 1327 -> 0 bytes src/qt/res/icons/filesave.png | Bin 2359 -> 0 bytes src/qt/res/icons/info.png | Bin 2028 -> 0 bytes src/qt/res/icons/key.png | Bin 1759 -> 0 bytes src/qt/res/icons/open.png | Bin 1694 -> 0 bytes src/qt/res/icons/quit.png | Bin 1091 -> 0 bytes src/qt/res/icons/verify.png | Bin 2034 -> 0 bytes src/qt/res/src/verify.svg | 14 ---------- 16 files changed, 19 insertions(+), 93 deletions(-) delete mode 100644 src/qt/res/icons/about.png delete mode 100644 src/qt/res/icons/about_qt.png delete mode 100644 src/qt/res/icons/configure.png delete mode 100644 src/qt/res/icons/debugwindow.png delete mode 100644 src/qt/res/icons/filesave.png delete mode 100644 src/qt/res/icons/info.png delete mode 100644 src/qt/res/icons/key.png delete mode 100644 src/qt/res/icons/open.png delete mode 100644 src/qt/res/icons/quit.png delete mode 100644 src/qt/res/icons/verify.png delete mode 100644 src/qt/res/src/verify.svg diff --git a/build_msvc/libbitcoin_qt/libbitcoin_qt.vcxproj b/build_msvc/libbitcoin_qt/libbitcoin_qt.vcxproj index 73ba90aa88..f21ba7a82b 100644 --- a/build_msvc/libbitcoin_qt/libbitcoin_qt.vcxproj +++ b/build_msvc/libbitcoin_qt/libbitcoin_qt.vcxproj @@ -406,9 +406,6 @@ true - - true - @@ -416,12 +413,6 @@ - - true - - - true - true @@ -455,9 +446,6 @@ true - - true - true @@ -473,9 +461,6 @@ true - - true - true @@ -497,9 +482,6 @@ true - - true - true @@ -518,9 +500,6 @@ true - - true - true @@ -530,15 +509,9 @@ true - - true - true - - true - true @@ -575,9 +548,6 @@ true - - true - true diff --git a/contrib/debian/copyright b/contrib/debian/copyright index 8fb9df9e6c..0eccbacb96 100644 --- a/contrib/debian/copyright +++ b/contrib/debian/copyright @@ -26,21 +26,14 @@ License: GNU-All-permissive-License Files: src/qt/res/icons/add.png src/qt/res/icons/address-book.png src/qt/res/icons/chevron.png - src/qt/res/icons/configure.png - src/qt/res/icons/debugwindow.png src/qt/res/icons/edit.png src/qt/res/icons/editcopy.png src/qt/res/icons/editpaste.png src/qt/res/icons/export.png src/qt/res/icons/eye.png - src/qt/res/icons/filesave.png src/qt/res/icons/history.png - src/qt/res/icons/info.png - src/qt/res/icons/key.png src/qt/res/icons/lock_*.png - src/qt/res/icons/open.png src/qt/res/icons/overview.png - src/qt/res/icons/quit.png src/qt/res/icons/receive.png src/qt/res/icons/remove.png src/qt/res/icons/send.png @@ -76,16 +69,13 @@ License: Expat Files: src/qt/res/icons/clock*.png src/qt/res/icons/eye_*.png src/qt/res/icons/tx_in*.png - src/qt/res/icons/verify.png src/qt/res/src/clock_*.svg src/qt/res/src/tx_*.svg - src/qt/res/src/verify.svg Copyright: Stephen Hutchings, Jonas Schnelli License: Expat Comment: Modifications of Stephen Hutchings' Typicons -Files: src/qt/res/icons/about.png - src/qt/res/icons/bitcoin.* +Files: src/qt/res/icons/bitcoin.* share/pixmaps/bitcoin* src/qt/res/src/bitcoin.svg Copyright: Bitboy, Jonas Schnelli diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include index 3ae8498a87..6d8faf3883 100644 --- a/src/Makefile.qt.include +++ b/src/Makefile.qt.include @@ -250,8 +250,6 @@ BITCOIN_QT_H = \ RES_ICONS = \ qt/res/icons/add.png \ qt/res/icons/address-book.png \ - qt/res/icons/about.png \ - qt/res/icons/about_qt.png \ qt/res/icons/bitcoin.ico \ qt/res/icons/bitcoin_testnet.ico \ qt/res/icons/bitcoin.png \ @@ -261,13 +259,11 @@ RES_ICONS = \ qt/res/icons/clock3.png \ qt/res/icons/clock4.png \ qt/res/icons/clock5.png \ - qt/res/icons/configure.png \ qt/res/icons/connect0.png \ qt/res/icons/connect1.png \ qt/res/icons/connect2.png \ qt/res/icons/connect3.png \ qt/res/icons/connect4.png \ - qt/res/icons/debugwindow.png \ qt/res/icons/edit.png \ qt/res/icons/editcopy.png \ qt/res/icons/editpaste.png \ @@ -275,21 +271,16 @@ RES_ICONS = \ qt/res/icons/eye.png \ qt/res/icons/eye_minus.png \ qt/res/icons/eye_plus.png \ - qt/res/icons/filesave.png \ qt/res/icons/fontbigger.png \ qt/res/icons/fontsmaller.png \ qt/res/icons/hd_disabled.png \ qt/res/icons/hd_enabled.png \ qt/res/icons/history.png \ - qt/res/icons/info.png \ - qt/res/icons/key.png \ qt/res/icons/lock_closed.png \ qt/res/icons/lock_open.png \ qt/res/icons/network_disabled.png \ - qt/res/icons/open.png \ qt/res/icons/overview.png \ qt/res/icons/proxy.png \ - qt/res/icons/quit.png \ qt/res/icons/receive.png \ qt/res/icons/remove.png \ qt/res/icons/send.png \ @@ -302,8 +293,7 @@ RES_ICONS = \ qt/res/icons/tx_input.png \ qt/res/icons/tx_output.png \ qt/res/icons/tx_mined.png \ - qt/res/icons/warning.png \ - qt/res/icons/verify.png + qt/res/icons/warning.png BITCOIN_QT_BASE_CPP = \ qt/bantablemodel.cpp \ diff --git a/src/qt/bitcoin.qrc b/src/qt/bitcoin.qrc index fddc2a5685..037b23e4b2 100644 --- a/src/qt/bitcoin.qrc +++ b/src/qt/bitcoin.qrc @@ -2,7 +2,6 @@ res/icons/bitcoin.png res/icons/address-book.png - res/icons/quit.png res/icons/send.png res/icons/connect0.png res/icons/connect1.png @@ -20,7 +19,6 @@ res/icons/eye.png res/icons/eye_minus.png res/icons/eye_plus.png - res/icons/configure.png res/icons/receive.png res/icons/editpaste.png res/icons/editcopy.png @@ -37,14 +35,6 @@ res/icons/tx_inout.png res/icons/lock_closed.png res/icons/lock_open.png - res/icons/key.png - res/icons/filesave.png - res/icons/debugwindow.png - res/icons/open.png - res/icons/info.png - res/icons/about.png - res/icons/about_qt.png - res/icons/verify.png res/icons/warning.png res/icons/fontbigger.png res/icons/fontsmaller.png diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 3533227483..bc9af9793e 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -248,7 +248,7 @@ void BitcoinGUI::createActions() sendCoinsAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_2)); tabGroup->addAction(sendCoinsAction); - sendCoinsMenuAction = new QAction(platformStyle->TextColorIcon(":/icons/send"), sendCoinsAction->text(), this); + sendCoinsMenuAction = new QAction(sendCoinsAction->text(), this); sendCoinsMenuAction->setStatusTip(sendCoinsAction->statusTip()); sendCoinsMenuAction->setToolTip(sendCoinsMenuAction->statusTip()); @@ -259,7 +259,7 @@ void BitcoinGUI::createActions() receiveCoinsAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_3)); tabGroup->addAction(receiveCoinsAction); - receiveCoinsMenuAction = new QAction(platformStyle->TextColorIcon(":/icons/receiving_addresses"), receiveCoinsAction->text(), this); + receiveCoinsMenuAction = new QAction(receiveCoinsAction->text(), this); receiveCoinsMenuAction->setStatusTip(receiveCoinsAction->statusTip()); receiveCoinsMenuAction->setToolTip(receiveCoinsMenuAction->statusTip()); @@ -287,48 +287,48 @@ void BitcoinGUI::createActions() connect(historyAction, &QAction::triggered, this, &BitcoinGUI::gotoHistoryPage); #endif // ENABLE_WALLET - quitAction = new QAction(platformStyle->TextColorIcon(":/icons/quit"), tr("E&xit"), this); + quitAction = new QAction(tr("E&xit"), this); quitAction->setStatusTip(tr("Quit application")); quitAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Q)); quitAction->setMenuRole(QAction::QuitRole); - aboutAction = new QAction(platformStyle->TextColorIcon(":/icons/about"), tr("&About %1").arg(PACKAGE_NAME), this); + aboutAction = new QAction(tr("&About %1").arg(PACKAGE_NAME), this); aboutAction->setStatusTip(tr("Show information about %1").arg(PACKAGE_NAME)); aboutAction->setMenuRole(QAction::AboutRole); aboutAction->setEnabled(false); - aboutQtAction = new QAction(platformStyle->TextColorIcon(":/icons/about_qt"), tr("About &Qt"), this); + aboutQtAction = new QAction(tr("About &Qt"), this); aboutQtAction->setStatusTip(tr("Show information about Qt")); aboutQtAction->setMenuRole(QAction::AboutQtRole); - optionsAction = new QAction(platformStyle->TextColorIcon(":/icons/options"), tr("&Options..."), this); + optionsAction = new QAction(tr("&Options..."), this); optionsAction->setStatusTip(tr("Modify configuration options for %1").arg(PACKAGE_NAME)); optionsAction->setMenuRole(QAction::PreferencesRole); optionsAction->setEnabled(false); - toggleHideAction = new QAction(platformStyle->TextColorIcon(":/icons/about"), tr("&Show / Hide"), this); + toggleHideAction = new QAction(tr("&Show / Hide"), this); toggleHideAction->setStatusTip(tr("Show or hide the main Window")); - encryptWalletAction = new QAction(platformStyle->TextColorIcon(":/icons/lock_closed"), tr("&Encrypt Wallet..."), this); + encryptWalletAction = new QAction(tr("&Encrypt Wallet..."), this); encryptWalletAction->setStatusTip(tr("Encrypt the private keys that belong to your wallet")); encryptWalletAction->setCheckable(true); - backupWalletAction = new QAction(platformStyle->TextColorIcon(":/icons/filesave"), tr("&Backup Wallet..."), this); + backupWalletAction = new QAction(tr("&Backup Wallet..."), this); backupWalletAction->setStatusTip(tr("Backup wallet to another location")); - changePassphraseAction = new QAction(platformStyle->TextColorIcon(":/icons/key"), tr("&Change Passphrase..."), this); + changePassphraseAction = new QAction(tr("&Change Passphrase..."), this); changePassphraseAction->setStatusTip(tr("Change the passphrase used for wallet encryption")); - signMessageAction = new QAction(platformStyle->TextColorIcon(":/icons/edit"), tr("Sign &message..."), this); + signMessageAction = new QAction(tr("Sign &message..."), this); signMessageAction->setStatusTip(tr("Sign messages with your Bitcoin addresses to prove you own them")); - verifyMessageAction = new QAction(platformStyle->TextColorIcon(":/icons/verify"), tr("&Verify message..."), this); + verifyMessageAction = new QAction(tr("&Verify message..."), this); verifyMessageAction->setStatusTip(tr("Verify messages to ensure they were signed with specified Bitcoin addresses")); - openRPCConsoleAction = new QAction(platformStyle->TextColorIcon(":/icons/debugwindow"), tr("&Debug window"), this); + openRPCConsoleAction = new QAction(tr("&Debug window"), this); openRPCConsoleAction->setStatusTip(tr("Open debugging and diagnostic console")); // initially disable the debug window menu item openRPCConsoleAction->setEnabled(false); openRPCConsoleAction->setObjectName("openRPCConsoleAction"); - usedSendingAddressesAction = new QAction(platformStyle->TextColorIcon(":/icons/address-book"), tr("&Sending addresses"), this); + usedSendingAddressesAction = new QAction(tr("&Sending addresses"), this); usedSendingAddressesAction->setStatusTip(tr("Show the list of used sending addresses and labels")); - usedReceivingAddressesAction = new QAction(platformStyle->TextColorIcon(":/icons/address-book"), tr("&Receiving addresses"), this); + usedReceivingAddressesAction = new QAction(tr("&Receiving addresses"), this); usedReceivingAddressesAction->setStatusTip(tr("Show the list of used receiving addresses and labels")); - openAction = new QAction(platformStyle->TextColorIcon(":/icons/open"), tr("Open &URI..."), this); + openAction = new QAction(tr("Open &URI..."), this); openAction->setStatusTip(tr("Open a bitcoin: URI or payment request")); m_open_wallet_action = new QAction(tr("Open Wallet"), this); @@ -339,7 +339,7 @@ void BitcoinGUI::createActions() m_close_wallet_action = new QAction(tr("Close Wallet..."), this); m_close_wallet_action->setStatusTip(tr("Close wallet")); - showHelpMessageAction = new QAction(platformStyle->TextColorIcon(":/icons/info"), tr("&Command-line options"), this); + showHelpMessageAction = new QAction(tr("&Command-line options"), this); showHelpMessageAction->setMenuRole(QAction::NoRole); showHelpMessageAction->setStatusTip(tr("Show the %1 help message to get a list with possible Bitcoin command-line options").arg(PACKAGE_NAME)); diff --git a/src/qt/res/icons/about.png b/src/qt/res/icons/about.png deleted file mode 100644 index 4143be8bac..0000000000 Binary files a/src/qt/res/icons/about.png and /dev/null differ diff --git a/src/qt/res/icons/about_qt.png b/src/qt/res/icons/about_qt.png deleted file mode 100644 index c40abfd3a6..0000000000 Binary files a/src/qt/res/icons/about_qt.png and /dev/null differ diff --git a/src/qt/res/icons/configure.png b/src/qt/res/icons/configure.png deleted file mode 100644 index 5333c83d5e..0000000000 Binary files a/src/qt/res/icons/configure.png and /dev/null differ diff --git a/src/qt/res/icons/debugwindow.png b/src/qt/res/icons/debugwindow.png deleted file mode 100644 index 290fe60864..0000000000 Binary files a/src/qt/res/icons/debugwindow.png and /dev/null differ diff --git a/src/qt/res/icons/filesave.png b/src/qt/res/icons/filesave.png deleted file mode 100644 index 779cca1d52..0000000000 Binary files a/src/qt/res/icons/filesave.png and /dev/null differ diff --git a/src/qt/res/icons/info.png b/src/qt/res/icons/info.png deleted file mode 100644 index 692b50c2a9..0000000000 Binary files a/src/qt/res/icons/info.png and /dev/null differ diff --git a/src/qt/res/icons/key.png b/src/qt/res/icons/key.png deleted file mode 100644 index f301c4f38c..0000000000 Binary files a/src/qt/res/icons/key.png and /dev/null differ diff --git a/src/qt/res/icons/open.png b/src/qt/res/icons/open.png deleted file mode 100644 index 4d958f0e18..0000000000 Binary files a/src/qt/res/icons/open.png and /dev/null differ diff --git a/src/qt/res/icons/quit.png b/src/qt/res/icons/quit.png deleted file mode 100644 index 55e34de4b8..0000000000 Binary files a/src/qt/res/icons/quit.png and /dev/null differ diff --git a/src/qt/res/icons/verify.png b/src/qt/res/icons/verify.png deleted file mode 100644 index 8e2cb2cc14..0000000000 Binary files a/src/qt/res/icons/verify.png and /dev/null differ diff --git a/src/qt/res/src/verify.svg b/src/qt/res/src/verify.svg deleted file mode 100644 index 1ff11b7f5e..0000000000 --- a/src/qt/res/src/verify.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - -- cgit v1.2.3