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
9 changes: 1 addition & 8 deletions src/Makefile.qt.include
Original file line number Diff line number Diff line change
Expand Up @@ -162,10 +162,9 @@ BITCOIN_QT_H = \

RES_ICONS = \
qt/res/icons/bitcoin.ico \
qt/res/icons/bitcoin.png \
qt/res/icons/drkblue/add.png \
qt/res/icons/drkblue/address-book.png \
qt/res/icons/drkblue/bitcoin.ico \
qt/res/icons/drkblue/bitcoin.png \
qt/res/icons/drkblue/browse.png \
qt/res/icons/drkblue/clock1.png \
qt/res/icons/drkblue/clock2.png \
Expand Down Expand Up @@ -215,8 +214,6 @@ RES_ICONS = \
qt/res/icons/drkblue/verify.png \
qt/res/icons/crownium/add.png \
qt/res/icons/crownium/address-book.png \
qt/res/icons/crownium/bitcoin.ico \
qt/res/icons/crownium/bitcoin.png \
qt/res/icons/crownium/browse.png \
qt/res/icons/crownium/clock1.png \
qt/res/icons/crownium/clock2.png \
Expand Down Expand Up @@ -266,8 +263,6 @@ RES_ICONS = \
qt/res/icons/crownium/verify.png \
qt/res/icons/light/add.png \
qt/res/icons/light/address-book.png \
qt/res/icons/light/bitcoin.ico \
qt/res/icons/light/bitcoin.png \
qt/res/icons/light/browse.png \
qt/res/icons/light/clock1.png \
qt/res/icons/light/clock2.png \
Expand Down Expand Up @@ -317,8 +312,6 @@ RES_ICONS = \
qt/res/icons/light/verify.png \
qt/res/icons/trad/add.png \
qt/res/icons/trad/address-book.png \
qt/res/icons/trad/bitcoin.ico \
qt/res/icons/trad/bitcoin.png \
qt/res/icons/trad/browse.png \
qt/res/icons/trad/clock1.png \
qt/res/icons/trad/clock2.png \
Expand Down
7 changes: 3 additions & 4 deletions src/qt/dash.qrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<!DOCTYPE RCC><RCC version="1.0">
<qresource prefix="/icons">
<file alias="bitcoin">res/icons/bitcoin.png</file>
</qresource>
<qresource prefix="/icons/drkblue">
<file alias="bitcoin">res/icons/drkblue/bitcoin.png</file>
<file alias="address-book">res/icons/drkblue/address-book.png</file>
<file alias="quit">res/icons/drkblue/quit.png</file>
<file alias="send">res/icons/drkblue/send.png</file>
Expand Down Expand Up @@ -52,7 +54,6 @@
<file alias="verify">res/icons/drkblue/verify.png</file>
</qresource>
<qresource prefix="/icons/crownium">
<file alias="bitcoin">res/icons/crownium/bitcoin.png</file>
<file alias="address-book">res/icons/crownium/address-book.png</file>
<file alias="quit">res/icons/crownium/quit.png</file>
<file alias="send">res/icons/crownium/send.png</file>
Expand Down Expand Up @@ -104,7 +105,6 @@
<file alias="verify">res/icons/crownium/verify.png</file>
</qresource>
<qresource prefix="/icons/light">
<file alias="bitcoin">res/icons/light/bitcoin.png</file>
<file alias="address-book">res/icons/light/address-book.png</file>
<file alias="quit">res/icons/light/quit.png</file>
<file alias="send">res/icons/light/send.png</file>
Expand Down Expand Up @@ -156,7 +156,6 @@
<file alias="verify">res/icons/light/verify.png</file>
</qresource>
<qresource prefix="/icons/trad">
<file alias="bitcoin">res/icons/trad/bitcoin.png</file>
<file alias="address-book">res/icons/trad/address-book.png</file>
<file alias="quit">res/icons/trad/quit.png</file>
<file alias="send">res/icons/trad/send.png</file>
Expand Down
2 changes: 1 addition & 1 deletion src/qt/networkstyle.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ NetworkStyle::NetworkStyle(const QString &appName, const int iconColorHueShift,
{
QString theme = GUIUtil::getThemeName();
// load pixmap
QPixmap appIconPixmap(":/icons/" + theme + "/bitcoin");
QPixmap appIconPixmap(":/icons/bitcoin");
QPixmap splashImagePixmap(":/images/" + theme + "/splash");

if(iconColorHueShift != 0 && iconColorSaturationReduction != 0)
Expand Down
Binary file removed src/qt/res/icons/crownium/bitcoin.icns
Binary file not shown.
Binary file removed src/qt/res/icons/crownium/bitcoin.ico
Binary file not shown.
Binary file removed src/qt/res/icons/crownium/bitcoin.png
Binary file not shown.
Binary file removed src/qt/res/icons/crownium/bitcoin_testnet.ico
Binary file not shown.
Binary file removed src/qt/res/icons/crownium/bitcoin_testnet.png
Binary file not shown.
Binary file removed src/qt/res/icons/drkblue/bitcoin.icns
Binary file not shown.
Binary file removed src/qt/res/icons/drkblue/bitcoin.ico
Binary file not shown.
Binary file removed src/qt/res/icons/light/bitcoin.icns
Binary file not shown.
Binary file removed src/qt/res/icons/light/bitcoin.ico
Binary file not shown.
Binary file removed src/qt/res/icons/light/bitcoin.png
Binary file not shown.
Binary file removed src/qt/res/icons/light/bitcoin_testnet.ico
Binary file not shown.
Binary file removed src/qt/res/icons/light/bitcoin_testnet.png
Binary file not shown.
Binary file removed src/qt/res/icons/light/dash.icns
Binary file not shown.
Binary file removed src/qt/res/icons/trad/bitcoin.icns
Binary file not shown.
Binary file removed src/qt/res/icons/trad/bitcoin.ico
Binary file not shown.
Binary file removed src/qt/res/icons/trad/bitcoin.png
Binary file not shown.
Binary file removed src/qt/res/icons/trad/bitcoin_testnet.ico
Binary file not shown.
Binary file removed src/qt/res/icons/trad/bitcoin_testnet.png
Binary file not shown.