Skip to content

Commit 30c235b

Browse files
gui: Update about logo icon to denote chain type
Adding the networkStyle parameter to the HelpMessageDialog creator on utilitydialog, updating all calls where its instance is being created from bitcoingui.cpp. In the object itself, use this new parameter object to build the about window title and set the icon of the about logo widget.
1 parent dcfbf3c commit 30c235b

File tree

3 files changed

+25
-6
lines changed

3 files changed

+25
-6
lines changed

src/qt/bitcoingui.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ BitcoinGUI::BitcoinGUI(interfaces::Node& node, const PlatformStyle *_platformSty
103103
updateWindowTitle();
104104

105105
rpcConsole = new RPCConsole(node, _platformStyle, nullptr);
106-
helpMessageDialog = new HelpMessageDialog(this, false);
106+
helpMessageDialog = new HelpMessageDialog(this, false, m_network_style);
107107
#ifdef ENABLE_WALLET
108108
if(enableWallet)
109109
{
@@ -920,7 +920,7 @@ void BitcoinGUI::aboutClicked()
920920
if(!clientModel)
921921
return;
922922

923-
auto dlg = new HelpMessageDialog(this, /*about=*/true);
923+
auto dlg = new HelpMessageDialog(this, /*about=*/true, m_network_style);
924924
GUIUtil::ShowModalDialogAsynchronously(dlg);
925925
}
926926

src/qt/utilitydialog.cpp

+18-3
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212

1313
#include <qt/guiutil.h>
1414

15+
#include <qt/networkstyle.h>
16+
1517
#include <clientversion.h>
1618
#include <common/args.h>
1719
#include <init.h>
@@ -29,7 +31,7 @@
2931
#include <QVBoxLayout>
3032

3133
/** "Help message" or "About" dialog box */
32-
HelpMessageDialog::HelpMessageDialog(QWidget *parent, bool about) :
34+
HelpMessageDialog::HelpMessageDialog(QWidget *parent, bool about, const NetworkStyle *networkStyle) :
3335
QDialog(parent, GUIUtil::dialog_flags),
3436
ui(new Ui::HelpMessageDialog)
3537
{
@@ -39,8 +41,8 @@ HelpMessageDialog::HelpMessageDialog(QWidget *parent, bool about) :
3941

4042
if (about)
4143
{
42-
setWindowTitle(tr("About %1").arg(PACKAGE_NAME));
43-
44+
this->setAboutWindowTitle(networkStyle);
45+
this->setChainTypeIconOnAboutLogo(networkStyle);
4446
std::string licenseInfo = LicenseInfo();
4547
/// HTML-format the license message from the core
4648
QString licenseInfoHTML = QString::fromStdString(LicenseInfo());
@@ -135,6 +137,19 @@ void HelpMessageDialog::on_okButton_accepted()
135137
close();
136138
}
137139

140+
void HelpMessageDialog::setAboutWindowTitle(const NetworkStyle *networkStyle)
141+
{
142+
QString aboutTitle = tr("About %1").arg(PACKAGE_NAME);
143+
if ((networkStyle) && (Params().GetChainType() != ChainType::MAIN)) aboutTitle.append(" " + networkStyle->getTitleAddText());
144+
setWindowTitle(aboutTitle);
145+
}
146+
147+
void HelpMessageDialog::setChainTypeIconOnAboutLogo(const NetworkStyle *networkStyle)
148+
{
149+
const QSize requiredSize(1024,1024);
150+
if (networkStyle) ui->aboutLogo->setPixmap(networkStyle->getAppIcon().pixmap(requiredSize));
151+
}
152+
138153

139154
/** "Shutdown" window */
140155
ShutdownWindow::ShutdownWindow(QWidget *parent, Qt::WindowFlags f):

src/qt/utilitydialog.h

+5-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
#include <QDialog>
99
#include <QWidget>
1010

11+
class NetworkStyle;
12+
1113
QT_BEGIN_NAMESPACE
1214
class QMainWindow;
1315
QT_END_NAMESPACE
@@ -22,7 +24,7 @@ class HelpMessageDialog : public QDialog
2224
Q_OBJECT
2325

2426
public:
25-
explicit HelpMessageDialog(QWidget *parent, bool about);
27+
explicit HelpMessageDialog(QWidget *parent, bool about, const NetworkStyle *networkStyle = nullptr);
2628
~HelpMessageDialog();
2729

2830
void printToConsole();
@@ -34,6 +36,8 @@ class HelpMessageDialog : public QDialog
3436

3537
private Q_SLOTS:
3638
void on_okButton_accepted();
39+
void setAboutWindowTitle(const NetworkStyle *networkStyle = nullptr);
40+
void setChainTypeIconOnAboutLogo(const NetworkStyle *networkStyle = nullptr);
3741
};
3842

3943

0 commit comments

Comments
 (0)