Skip to content

Commit 593ba69

Browse files
committed
Add warning messages to the debug window
1 parent bfd7e54 commit 593ba69

File tree

4 files changed

+41
-3
lines changed

4 files changed

+41
-3
lines changed

src/qt/forms/debugwindow.ui

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,25 @@
1414
<string>Debug window</string>
1515
</property>
1616
<layout class="QVBoxLayout" name="verticalLayout_2">
17+
<item>
18+
<widget class="QLabel" name="label_alerts">
19+
<property name="visible">
20+
<bool>false</bool>
21+
</property>
22+
<property name="styleSheet">
23+
<string notr="true">QLabel { background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0, stop:0 #F0D0A0, stop:1 #F8D488); color:#000000; }</string>
24+
</property>
25+
<property name="wordWrap">
26+
<bool>true</bool>
27+
</property>
28+
<property name="margin">
29+
<number>3</number>
30+
</property>
31+
<property name="textInteractionFlags">
32+
<set>Qt::TextSelectableByMouse</set>
33+
</property>
34+
</widget>
35+
</item>
1736
<item>
1837
<widget class="QTabWidget" name="tabWidget">
1938
<property name="currentIndex">

src/qt/overviewpage.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -204,9 +204,8 @@ void OverviewPage::updateWatchOnlyLabels(bool showWatchOnly)
204204
void OverviewPage::setClientModel(ClientModel *model)
205205
{
206206
this->clientModel = model;
207-
if(model)
208-
{
209-
// Show warning if this is a prerelease version
207+
if (model) {
208+
// Show warning, for example if this is a prerelease version
210209
connect(model, &ClientModel::alertsChanged, this, &OverviewPage::updateAlerts);
211210
updateAlerts(model->getStatusBarWarnings());
212211
}

src/qt/rpcconsole.cpp

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -563,6 +563,17 @@ bool RPCConsole::eventFilter(QObject* obj, QEvent *event)
563563
void RPCConsole::setClientModel(ClientModel *model)
564564
{
565565
clientModel = model;
566+
567+
bool wallet_enabled{false};
568+
#ifdef ENABLE_WALLET
569+
wallet_enabled = WalletModel::isWalletEnabled();
570+
#endif // ENABLE_WALLET
571+
if (model && !wallet_enabled) {
572+
// Show warning, for example if this is a prerelease version
573+
connect(model, &ClientModel::alertsChanged, this, &RPCConsole::updateAlerts);
574+
updateAlerts(model->getStatusBarWarnings());
575+
}
576+
566577
ui->trafficGraph->setClientModel(model);
567578
if (model && clientModel->getPeerTableModel() && clientModel->getBanTableModel()) {
568579
// Keep up to date with client
@@ -1289,3 +1300,9 @@ QString RPCConsole::tabTitle(TabTypes tab_type) const
12891300
{
12901301
return ui->tabWidget->tabText(tab_type);
12911302
}
1303+
1304+
void RPCConsole::updateAlerts(const QString& warnings)
1305+
{
1306+
this->ui->label_alerts->setVisible(!warnings.isEmpty());
1307+
this->ui->label_alerts->setText(warnings);
1308+
}

src/qt/rpcconsole.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,9 @@ public Q_SLOTS:
169169

170170
/** Update UI with latest network info from model. */
171171
void updateNetworkState();
172+
173+
private Q_SLOTS:
174+
void updateAlerts(const QString& warnings);
172175
};
173176

174177
#endif // BITCOIN_QT_RPCCONSOLE_H

0 commit comments

Comments
 (0)