Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions src/Makefile.qt.include
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +209,6 @@ RES_ICONS = \
qt/res/icons/drkblue/tx_mined.png \
qt/res/icons/drkblue/about.png \
qt/res/icons/drkblue/about_qt.png \
qt/res/icons/drkblue/info.png \
qt/res/icons/drkblue/open.png \
qt/res/icons/drkblue/verify.png \
qt/res/icons/crownium/add.png \
qt/res/icons/crownium/address-book.png \
Expand Down Expand Up @@ -258,8 +256,6 @@ RES_ICONS = \
qt/res/icons/crownium/tx_mined.png \
qt/res/icons/crownium/about.png \
qt/res/icons/crownium/about_qt.png \
qt/res/icons/crownium/info.png \
qt/res/icons/crownium/open.png \
qt/res/icons/crownium/verify.png \
qt/res/icons/light/add.png \
qt/res/icons/light/address-book.png \
Expand Down Expand Up @@ -307,8 +303,6 @@ RES_ICONS = \
qt/res/icons/light/tx_mined.png \
qt/res/icons/light/about.png \
qt/res/icons/light/about_qt.png \
qt/res/icons/light/info.png \
qt/res/icons/light/open.png \
qt/res/icons/light/verify.png \
qt/res/icons/trad/add.png \
qt/res/icons/trad/address-book.png \
Expand Down Expand Up @@ -356,8 +350,6 @@ RES_ICONS = \
qt/res/icons/trad/tx_mined.png \
qt/res/icons/trad/about.png \
qt/res/icons/trad/about_qt.png \
qt/res/icons/trad/info.png \
qt/res/icons/trad/open.png \
qt/res/icons/trad/verify.png

BITCOIN_QT_CPP = \
Expand Down
4 changes: 2 additions & 2 deletions src/qt/bitcoingui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -391,10 +391,10 @@ void BitcoinGUI::createActions()
usedReceivingAddressesAction = new QAction(QIcon(":/icons/" + theme + "/address-book"), tr("&Receiving addresses..."), this);
usedReceivingAddressesAction->setStatusTip(tr("Show the list of used receiving addresses and labels"));

openAction = new QAction(QIcon(":/icons/" + theme + "/open"), tr("Open &URI..."), this);
openAction = new QAction(QApplication::style()->standardIcon(QStyle::SP_DirOpenIcon), tr("Open &URI..."), this);

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it would be nice if we would also:

  1. remove references like https://github.com/dashpay/dash/blob/v0.12.1.x/src/qt/dash.qrc#L50, https://github.com/dashpay/dash/blob/v0.12.1.x/src/Makefile.qt.include#L213 etc for all themes
  2. remove resources themselves (i.e. file info.png in this case, for all themes too)

openAction->setStatusTip(tr("Open a dash: URI or payment request"));

showHelpMessageAction = new QAction(QIcon(":/icons/" + theme + "/info"), tr("&Command-line options"), this);
showHelpMessageAction = new QAction(QApplication::style()->standardIcon(QStyle::SP_MessageBoxInformation), tr("&Command-line options"), this);

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here

showHelpMessageAction->setMenuRole(QAction::NoRole);
showHelpMessageAction->setStatusTip(tr("Show the Dash Core help message to get a list with possible Dash command-line options"));

Expand Down
8 changes: 0 additions & 8 deletions src/qt/dash.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,6 @@
<file alias="drkblue_editcopy">res/icons/drkblue/drkblue_editcopy.png</file>
<file alias="drkblue_remove">res/icons/drkblue/drkblue_remove.png</file>
<file alias="browse">res/icons/drkblue/browse.png</file>
<file alias="open">res/icons/drkblue/open.png</file>
<file alias="info">res/icons/drkblue/info.png</file>
<file alias="about">res/icons/drkblue/about.png</file>
<file alias="about_qt">res/icons/drkblue/about_qt.png</file>
<file alias="verify">res/icons/drkblue/verify.png</file>
Expand Down Expand Up @@ -98,8 +96,6 @@
<file alias="drkblue_editcopy">res/icons/crownium/drkblue_editcopy.png</file>
<file alias="drkblue_remove">res/icons/crownium/drkblue_remove.png</file>
<file alias="browse">res/icons/crownium/browse.png</file>
<file alias="open">res/icons/crownium/open.png</file>
<file alias="info">res/icons/crownium/info.png</file>
<file alias="about">res/icons/crownium/about.png</file>
<file alias="about_qt">res/icons/crownium/about_qt.png</file>
<file alias="verify">res/icons/crownium/verify.png</file>
Expand Down Expand Up @@ -149,8 +145,6 @@
<file alias="drkblue_editcopy">res/icons/light/drkblue_editcopy.png</file>
<file alias="drkblue_remove">res/icons/light/drkblue_remove.png</file>
<file alias="browse">res/icons/light/browse.png</file>
<file alias="open">res/icons/light/open.png</file>
<file alias="info">res/icons/light/info.png</file>
<file alias="about">res/icons/light/about.png</file>
<file alias="about_qt">res/icons/light/about_qt.png</file>
<file alias="verify">res/icons/light/verify.png</file>
Expand Down Expand Up @@ -200,8 +194,6 @@
<file alias="drkblue_editcopy">res/icons/trad/drkblue_editcopy.png</file>
<file alias="drkblue_remove">res/icons/trad/drkblue_remove.png</file>
<file alias="browse">res/icons/trad/browse.png</file>
<file alias="open">res/icons/trad/open.png</file>
<file alias="info">res/icons/trad/info.png</file>
<file alias="about">res/icons/trad/about.png</file>
<file alias="about_qt">res/icons/trad/about_qt.png</file>
<file alias="verify">res/icons/trad/verify.png</file>
Expand Down
Binary file modified src/qt/res/icons/crownium/about.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/crownium/about_qt.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/qt/res/icons/crownium/info.png
Binary file not shown.
Binary file removed src/qt/res/icons/crownium/open.png
Binary file not shown.
Binary file modified src/qt/res/icons/drkblue/about.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/drkblue/about_qt.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/qt/res/icons/drkblue/info.png
Binary file not shown.
Binary file removed src/qt/res/icons/drkblue/open.png
Binary file not shown.
Binary file modified src/qt/res/icons/light/about.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/light/about_qt.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/qt/res/icons/light/info.png
Binary file not shown.
Binary file removed src/qt/res/icons/light/open.png
Binary file not shown.
Binary file modified src/qt/res/icons/trad/about.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/trad/about_qt.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/qt/res/icons/trad/info.png
Binary file not shown.
Binary file removed src/qt/res/icons/trad/open.png
Binary file not shown.