Skip to content

GUI: Show warnings on all no-wallet tabs #301

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kwsantiago wants to merge 1 commit into
base: 29.x-knots
Choose a base branch
from
Open

GUI: Show warnings on all no-wallet tabs #301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 0 additions & 19 deletions src/qt/forms/overviewpage.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,25 +14,6 @@
<string>Form</string>
</property>
<layout class="QVBoxLayout" name="topLayout">
<item>
<widget class="QLabel" name="labelAlerts">
<property name="visible">
<bool>false</bool>
</property>
<property name="styleSheet">
<string notr="true">QLabel { background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0, stop:0 #F0D0A0, stop:1 #F8D488); color:#000000; }</string>
</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" stretch="1,1">
<item>
Expand Down
10 changes: 0 additions & 10 deletions src/qt/overviewpage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,10 +251,6 @@ void OverviewPage::setClientModel(ClientModel *model)
{
this->clientModel = model;
if (model) {
// Show warning, for example if this is a prerelease version
connect(model, &ClientModel::alertsChanged, this, &OverviewPage::updateAlerts);
updateAlerts(model->getStatusBarWarnings());

connect(model->getOptionsModel(), &OptionsModel::fontForMoneyChanged, this, &OverviewPage::setMonospacedFont);
setMonospacedFont(QFont() /* ignored */);
}
Expand Down Expand Up @@ -333,12 +329,6 @@ void OverviewPage::updateDisplayUnit()
}
}

void OverviewPage::updateAlerts(const QString &warnings)
{
this->ui->labelAlerts->setVisible(!warnings.isEmpty());
this->ui->labelAlerts->setText(warnings);
}

void OverviewPage::showOutOfSyncWarning(bool fShow)
{
ui->labelWalletStatus->setVisible(fShow);
Expand Down
1 change: 0 additions & 1 deletion src/qt/overviewpage.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ private Q_SLOTS:
void LimitTransactionRows();
void updateDisplayUnit();
void handleTransactionClicked(const QModelIndex &index);
void updateAlerts(const QString &warnings);
void updateWatchOnlyLabels(bool showWatchOnly);
void setMonospacedFont(const QFont&);
};
Expand Down
17 changes: 8 additions & 9 deletions src/qt/walletframe.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
#include <Qt>
#include <QApplication>
#include <QClipboard>
#include <QHBoxLayout>
#include <QLabel>
#include <QPushButton>
#include <QVBoxLayout>
Expand All @@ -33,26 +32,26 @@ WalletFrame::WalletFrame(const PlatformStyle* _platformStyle, QWidget* parent)
platformStyle(_platformStyle),
m_size_hint(OverviewPage{platformStyle, nullptr}.sizeHint())
{
// Leave HBox hook for adding a list view later
QHBoxLayout *walletFrameLayout = new QHBoxLayout(this);
QVBoxLayout *walletFrameLayout = new QVBoxLayout(this);
setContentsMargins(0,0,0,0);
walletStack = new QStackedWidget(this);
m_global_stack = new QStackedWidget(this);
m_global_stack->addWidget(walletStack);
walletFrameLayout->setContentsMargins(0,0,0,0);
walletFrameLayout->addWidget(m_global_stack);

// hbox for no wallet
QWidget* no_wallet_group = new QWidget(walletStack);
QVBoxLayout* no_wallet_layout = new QVBoxLayout(no_wallet_group);
walletFrameLayout->setSpacing(0);

m_label_alerts = new QLabel(this);
m_label_alerts->setVisible(false);
m_label_alerts->setStyleSheet("QLabel { background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0, stop:0 #F0D0A0, stop:1 #F8D488); color:#000000; }");
m_label_alerts->setWordWrap(true);
m_label_alerts->setMargin(3);
m_label_alerts->setTextInteractionFlags(Qt::TextSelectableByMouse);
no_wallet_layout->addWidget(m_label_alerts, 0, Qt::AlignTop);
walletFrameLayout->addWidget(m_label_alerts);
walletFrameLayout->addWidget(m_global_stack);

// hbox for no wallet
QWidget* no_wallet_group = new QWidget(walletStack);
QVBoxLayout* no_wallet_layout = new QVBoxLayout(no_wallet_group);

QLabel *noWallet = new QLabel(tr("No wallet has been loaded.\nGo to File > Open Wallet to load a wallet.\n- OR -"));
noWallet->setAlignment(Qt::AlignCenter);
Expand Down
Loading