dashpay#3248 use blue logo for Traditional theme

10xcryptodev · Apr 19, 2020 · 5ff6acf · 5ff6acf
1 parent de931a2
commit 5ff6acf
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
@@ -309,6 +309,7 @@ RES_IMAGES = \
   qt/res/images/arrow_right_small.png \
   qt/res/images/arrow_up_small.png \
   qt/res/images/checked.png \
+  qt/res/images/dash_logo_blue.png \
   qt/res/images/dash_logo_horizontal.png \
   qt/res/images/dash_logo_toolbar.png \
   qt/res/images/qtreeview_selected.png \

diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
@@ -246,7 +246,7 @@ BitcoinGUI::BitcoinGUI(const PlatformStyle *_platformStyle, const NetworkStyle *
 #ifndef Q_OS_MAC
     // Apply some styling to scrollbars
     QString theme = settings.value("theme", "").toString();
-    if (theme != "trad") { // No scrollbar styling for the traditional theme
+    if (theme != "Traditional") { // No scrollbar styling for the traditional theme
         QFile qFile(QString(":/css/scrollbars"));
         QString styleSheet;
         if (qFile.open(QFile::ReadOnly)) {
@@ -598,7 +598,13 @@ void BitcoinGUI::createToolBars()
         toolbar->addWidget(spacer);
 
         QLabel *logoLabel = new QLabel();
-        QPixmap logoPixmap(":/images/dash_logo_toolbar");
+        QString theme = settings.value("theme", "").toString();
+        QString logoImage = ":/images/dash_logo_toolbar";
+         if (theme == "Traditional") {
+           logoImage = ":/images/dash_logo_blue";
+         }
+
+        QPixmap logoPixmap(logoImage);
         logoLabel->setPixmap(logoPixmap);
         toolbar->addWidget(logoLabel);
 

diff --git a/src/qt/dash.qrc b/src/qt/dash.qrc
@@ -69,6 +69,7 @@
         <file alias="arrow_right_small">res/images/arrow_right_small.png</file>
         <file alias="arrow_up_small">res/images/arrow_up_small.png</file>
         <file alias="checked">res/images/checked.png</file>
+        <file alias="dash_logo_blue">res/images/dash_logo_blue.png</file>
         <file alias="dash_logo_horizontal">res/images/dash_logo_horizontal.png</file>
         <file alias="dash_logo_toolbar">res/images/dash_logo_toolbar.png</file>
         <file alias="qtreeview_selected">res/images/qtreeview_selected.png</file>

diff --git a/src/qt/res/images/dash_logo_blue.png b/src/qt/res/images/dash_logo_blue.png