Skip to content

Commit

Permalink
Fix dashpay#3248: use blue logo for Traditional theme (dashpay#3441)
Browse files Browse the repository at this point in the history
* dashpay#3248 use blue logo for Traditional theme

* review tab space and blue logo name

* change file order and spaces

* Revert "review tab space and blue logo name"

This reverts commit 31e0c3d.
  • Loading branch information
10xcryptodev authored and gades committed Feb 22, 2022
1 parent 9ad299e commit 0fa61cd
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 3 deletions.
3 changes: 2 additions & 1 deletion src/Makefile.qt.include
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Copyright (c) 2013-2016 The Bitcoin Core developers
# Copyright (c) 2014-2018 The Dash Core developers
# Copyright (c) 2020-2022 The Cosanta Core developers
# Copyright (c) 2020-2021 The Cosanta Core developers
# Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php.

Expand Down Expand Up @@ -312,6 +312,7 @@ RES_IMAGES = \
qt/res/images/checked.png \
qt/res/images/cosanta_logo_horizontal.png \
qt/res/images/cosanta_logo_toolbar.png \
qt/res/images/cosanta_logo_toolbar_blue.png \
qt/res/images/qtreeview_selected.png \
qt/res/images/splash.png \
qt/res/images/unchecked.png \
Expand Down
10 changes: 8 additions & 2 deletions src/qt/bitcoingui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,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)) {
Expand Down Expand Up @@ -653,7 +653,13 @@ void BitcoinGUI::createToolBars()
toolbar->addWidget(spacer);

QLabel *logoLabel = new QLabel();
QPixmap logoPixmap(":/images/cosanta_logo_toolbar");
QString theme = settings.value("theme", "").toString();
QString logoImage = ":/images/cosanta_logo_toolbar";
if (theme == "Traditional") {
logoImage = ":/images/cosanta_logo_toolbar_blue";
}

QPixmap logoPixmap(logoImage);
logoLabel->setPixmap(logoPixmap);
toolbar->addWidget(logoLabel);

Expand Down
1 change: 1 addition & 0 deletions src/qt/cosanta.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
<file alias="checked">res/images/checked.png</file>
<file alias="cosanta_logo_horizontal">res/images/cosanta_logo_horizontal.png</file>
<file alias="cosanta_logo_toolbar">res/images/cosanta_logo_toolbar.png</file>
<file alias="cosanta_logo_toolbar_blue">res/images/cosanta_logo_toolbar_blue.png</file>
<file alias="qtreeview_selected">res/images/qtreeview_selected.png</file>
<file alias="wallet_bg">res/images/wallet_bg.png</file>
<file alias="splash">res/images/splash.png</file>
Expand Down
Binary file added src/qt/res/images/cosanta_logo_toolbar_blue.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 0fa61cd

Please sign in to comment.