Make Dash logo (app icon) theme-independent

This commit is contained in:
UdjinM6 2016-02-25 03:57:43 +03:00
parent a0099242dc
commit eed3a48150
21 changed files with 5 additions and 13 deletions

View File

@ -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 \
@ -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 \
@ -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 \
@ -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 \

View File

@ -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>
@ -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>
@ -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>
@ -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>

View File

@ -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)

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.4 KiB