sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 03:52:49 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge #14879: qt: Add warning messages to the debug window

Browse Source 
593ba696fb32da558091ac02ad87c4893db4ce97 Add warning messages to the debug window (Hennadii Stepanov)

Pull request description:

  Fix: #11016

  This PR adds warning messages to the debug window in `-disablewallet` mode.

  ![screenshot from 2018-12-06 01-01-27](https://user-images.githubusercontent.com/32963518/49550070-413c1c80-f8f3-11e8-9865-efb49ea8da45.png)

ACKs for top commit:
  jonasschnelli:
    utACK 593ba696fb32da558091ac02ad87c4893db4ce97
  promag:
    ACK 593ba696fb32da558091ac02ad87c4893db4ce97, agree with @Sjors https://github.com/bitcoin/bitcoin/pull/14879#pullrequestreview-196433092 above.
  ryanofsky:
    utACK 593ba696fb32da558091ac02ad87c4893db4ce97

Tree-SHA512: a8ca78529bb16813ba7bfaf5ccd4349189979f08e78ea857746a6fb00fd9d7ed98d8f06f384830acba21dac57070060af23f6be8249398feb32a6efff1333de8

14879 followup: move label_alerts css styling into css files and align it with the style of labelAlerts on OverviewPage

Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com>
This commit is contained in:
MarcoFalke 2019-08-28 16:02:31 -04:00 committed by UdjinM6
parent 27b5d68562
commit 8b0f3f7945
6 changed files with 56 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/qt/forms/debugwindow.ui
View File

@ -14,6 +14,22 @@
<string>Tools window</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QLabel" name="label_alerts">
<property name="visible">
<bool>false</bool>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="margin">
<number>3</number>
</property>
<property name="textInteractionFlags">
<set>Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_Buttons_2">
<property name="spacing">

5
src/qt/overviewpage.cpp
View File

@ -251,9 +251,8 @@ void OverviewPage::updateWatchOnlyLabels(bool showWatchOnly)
void OverviewPage::setClientModel(ClientModel *model)
{
this->clientModel = model;
if(model)
{
// Show warning if this is a prerelease version
if (model) {
// Show warning, for example if this is a prerelease version
connect(model, &ClientModel::alertsChanged, this, &OverviewPage::updateAlerts);
updateAlerts(model->getStatusBarWarnings());
}

7
src/qt/res/css/general.css
View File

@ -1586,6 +1586,13 @@ QWidget#RPCConsole QLabel#peerHeading,
QWidget#RPCConsole QLabel#banHeading {
}
QWidget#RPCConsole QLabel#label_alerts {
background-color: #c79304;
color: #222222;
border-radius: 5px;
padding: 5px;
}
QWidget#RPCConsole QLabel#labelNetwork,
QWidget#RPCConsole QLabel#label_10,
QWidget#RPCConsole QLabel#labelMempoolTitle { /* Margin between Network and Block Chain headers */

11
src/qt/res/css/traditional.css
View File

@ -250,6 +250,17 @@ QWidget .QFrame#frame_2 QListView { /* Transaction List */
margin-right: 10px;
}
/******************************************************
RPCConsole
******************************************************/
QWidget#RPCConsole QLabel#label_alerts {
background-color: #c79304;
color: #222222;
border-radius: 5px;
padding: 5px;
}
/******************************************************
SendCoinsDialog
******************************************************/

17
src/qt/rpcconsole.cpp
View File

@ -583,6 +583,17 @@ bool RPCConsole::eventFilter(QObject* obj, QEvent *event)
void RPCConsole::setClientModel(ClientModel *model, int bestblock_height, int64_t bestblock_date, uint256 bestblock_hash, double verification_progress)
{
clientModel = model;
bool wallet_enabled{false};
#ifdef ENABLE_WALLET
wallet_enabled = WalletModel::isWalletEnabled();
#endif // ENABLE_WALLET
if (model && !wallet_enabled) {
// Show warning, for example if this is a prerelease version
connect(model, &ClientModel::alertsChanged, this, &RPCConsole::updateAlerts);
updateAlerts(model->getStatusBarWarnings());
}
ui->trafficGraph->setClientModel(model);
if (model && clientModel->getPeerTableModel() && clientModel->getBanTableModel()) {
// Keep up to date with client
@ -1441,3 +1452,9 @@ QKeySequence RPCConsole::tabShortcut(TabTypes tab_type) const
assert(false);
}
void RPCConsole::updateAlerts(const QString& warnings)
{
this->ui->label_alerts->setVisible(!warnings.isEmpty());
this->ui->label_alerts->setText(warnings);
}

3
src/qt/rpcconsole.h
View File

@ -192,6 +192,9 @@ private:
/** Update UI with latest network info from model. */
void updateNetworkState();
private Q_SLOTS:
void updateAlerts(const QString& warnings);
};
#endif // BITCOIN_QT_RPCCONSOLE_H