mirror of
https://github.com/feather-wallet/feather.git
synced 2024-12-23 03:59:29 +00:00
Merge pull request 'Settings: add hide balance feature' (#133) from tobtoht/feather:hide_balance into master
Reviewed-on: https://git.wownero.com/feather/feather/pulls/133
This commit is contained in:
commit
87fd142ffd
5 changed files with 25 additions and 2 deletions
|
@ -660,10 +660,18 @@ void MainWindow::onWalletOpened() {
|
||||||
|
|
||||||
void MainWindow::onBalanceUpdated(double balance, double unlocked, const QString &balance_str, const QString &unlocked_str) {
|
void MainWindow::onBalanceUpdated(double balance, double unlocked, const QString &balance_str, const QString &unlocked_str) {
|
||||||
qDebug() << Q_FUNC_INFO;
|
qDebug() << Q_FUNC_INFO;
|
||||||
|
bool hide = config()->get(Config::hideBalance).toBool();
|
||||||
|
|
||||||
auto label_str = QString("Balance: %1 XMR").arg(unlocked_str);
|
auto label_str = QString("Balance: %1 XMR").arg(unlocked_str);
|
||||||
if(balance > unlocked)
|
if(balance > unlocked)
|
||||||
label_str += QString(" (+%1 XMR unconfirmed)").arg(QString::number(balance - unlocked, 'f'));
|
label_str += QString(" (+%1 XMR unconfirmed)").arg(QString::number(balance - unlocked, 'f'));
|
||||||
|
|
||||||
|
if (hide) {
|
||||||
|
label_str = "Balance: HIDDEN";
|
||||||
|
}
|
||||||
|
|
||||||
m_statusLabelBalance->setText(label_str);
|
m_statusLabelBalance->setText(label_str);
|
||||||
|
m_balanceWidget->setHidden(hide);
|
||||||
}
|
}
|
||||||
|
|
||||||
void MainWindow::onSynchronized() {
|
void MainWindow::onSynchronized() {
|
||||||
|
|
|
@ -22,6 +22,11 @@ Settings::Settings(QWidget *parent) :
|
||||||
connect(ui->btnCopyToClipboard, &QPushButton::clicked, this, &Settings::copyToClipboard);
|
connect(ui->btnCopyToClipboard, &QPushButton::clicked, this, &Settings::copyToClipboard);
|
||||||
connect(ui->checkBox_checkForAppUpdates, &QCheckBox::clicked, this, &Settings::checkboxExternalLinkWarn);
|
connect(ui->checkBox_checkForAppUpdates, &QCheckBox::clicked, this, &Settings::checkboxExternalLinkWarn);
|
||||||
connect(ui->checkBox_externalLink, &QCheckBox::clicked, this, &Settings::checkboxExternalLinkWarn);
|
connect(ui->checkBox_externalLink, &QCheckBox::clicked, this, &Settings::checkboxExternalLinkWarn);
|
||||||
|
connect(ui->checkBox_hideBalance, &QCheckBox::toggled, [this](bool toggled){
|
||||||
|
config()->set(Config::hideBalance, toggled);
|
||||||
|
m_ctx->updateBalance();
|
||||||
|
});
|
||||||
|
|
||||||
connect(ui->closeButton, &QDialogButtonBox::accepted, this, &Settings::close);
|
connect(ui->closeButton, &QDialogButtonBox::accepted, this, &Settings::close);
|
||||||
|
|
||||||
// nodes
|
// nodes
|
||||||
|
@ -32,6 +37,7 @@ Settings::Settings(QWidget *parent) :
|
||||||
// setup checkboxes
|
// setup checkboxes
|
||||||
ui->checkBox_externalLink->setChecked(config()->get(Config::warnOnExternalLink).toBool());
|
ui->checkBox_externalLink->setChecked(config()->get(Config::warnOnExternalLink).toBool());
|
||||||
ui->checkBox_checkForAppUpdates->setChecked(config()->get(Config::checkForAppUpdates).toBool());
|
ui->checkBox_checkForAppUpdates->setChecked(config()->get(Config::checkForAppUpdates).toBool());
|
||||||
|
ui->checkBox_hideBalance->setChecked(config()->get(Config::hideBalance).toBool());
|
||||||
|
|
||||||
// setup comboboxes
|
// setup comboboxes
|
||||||
auto settingsHomeWidget = config()->get(Config::homeWidget).toString();
|
auto settingsHomeWidget = config()->get(Config::homeWidget).toString();
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>1019</width>
|
<width>1019</width>
|
||||||
<height>358</height>
|
<height>396</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="windowTitle">
|
<property name="windowTitle">
|
||||||
|
@ -196,6 +196,13 @@
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
<item row="6" column="0">
|
||||||
|
<widget class="QCheckBox" name="checkBox_hideBalance">
|
||||||
|
<property name="text">
|
||||||
|
<string>Hide balance</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
<widget class="QWidget" name="tab_node">
|
<widget class="QWidget" name="tab_node">
|
||||||
|
|
|
@ -47,6 +47,7 @@ static const QHash<Config::ConfigKey, ConfigDirective> configStrings = {
|
||||||
{Config::geometry, {QS("geometry"), {}}},
|
{Config::geometry, {QS("geometry"), {}}},
|
||||||
{Config::windowState, {QS("windowState"), {}}},
|
{Config::windowState, {QS("windowState"), {}}},
|
||||||
{Config::firstRun,{QS("firstRun"), false}},
|
{Config::firstRun,{QS("firstRun"), false}},
|
||||||
|
{Config::hideBalance, {QS("hideBalance"), false}}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -44,7 +44,8 @@ public:
|
||||||
showTabXMRig,
|
showTabXMRig,
|
||||||
geometry,
|
geometry,
|
||||||
windowState,
|
windowState,
|
||||||
firstRun
|
firstRun,
|
||||||
|
hideBalance
|
||||||
};
|
};
|
||||||
|
|
||||||
~Config() override;
|
~Config() override;
|
||||||
|
|
Loading…
Reference in a new issue