Skip to content

Commit 8d75115

Browse files
hebastohebasto
committed
qt: Add privacy feature to Overview page
1 parent 73d8ef7 commit 8d75115

File tree

9 files changed

+78
-27
lines changed

9 files changed

+78
-27
lines changed

‎src/qt/bitcoingui.cpp

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -350,6 +350,11 @@ void BitcoinGUI::createActions()
350350
showHelpMessageAction->setMenuRole(QAction::NoRole);
351351
showHelpMessageAction->setStatusTip(tr("Show the %1 help message to get a list with possible Bitcoin command-line options").arg(PACKAGE_NAME));
352352

353+
m_mask_values_action = new QAction(tr("&Mask values"), this);
354+
m_mask_values_action->setShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_M));
355+
m_mask_values_action->setStatusTip(tr("Mask the values in the Overview tab"));
356+
m_mask_values_action->setCheckable(true);
357+
353358
connect(quitAction, &QAction::triggered, qApp, QApplication::quit);
354359
connect(aboutAction, &QAction::triggered, this, &BitcoinGUI::aboutClicked);
355360
connect(aboutQtAction, &QAction::triggered, qApp, QApplication::aboutQt);
@@ -412,6 +417,8 @@ void BitcoinGUI::createActions()
412417
connect(activity, &CreateWalletActivity::finished, activity, &QObject::deleteLater);
413418
activity->create();
414419
});
420+
421+
connect(m_mask_values_action, &QAction::toggled, this, &BitcoinGUI::setPrivacy);
415422
}
416423
#endif // ENABLE_WALLET
417424

@@ -452,6 +459,8 @@ void BitcoinGUI::createMenuBar()
452459
settings->addAction(encryptWalletAction);
453460
settings->addAction(changePassphraseAction);
454461
settings->addSeparator();
462+
settings->addAction(m_mask_values_action);
463+
settings->addSeparator();
455464
}
456465
settings->addAction(optionsAction);
457466

@@ -1398,6 +1407,12 @@ void BitcoinGUI::unsubscribeFromCoreSignals()
13981407
m_handler_question->disconnect();
13991408
}
14001409

1410+
bool BitcoinGUI::isPrivacyModeActivated() const
1411+
{
1412+
assert(m_mask_values_action);
1413+
return m_mask_values_action->isChecked();
1414+
}
1415+
14011416
UnitDisplayStatusBarControl::UnitDisplayStatusBarControl(const PlatformStyle *platformStyle) :
14021417
optionsModel(nullptr),
14031418
menu(nullptr)

‎src/qt/bitcoingui.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,8 @@ class BitcoinGUI : public QMainWindow
9898
/** Disconnect core signals from GUI client */
9999
void unsubscribeFromCoreSignals();
100100

101+
bool isPrivacyModeActivated() const;
102+
101103
protected:
102104
void changeEvent(QEvent *e);
103105
void closeEvent(QCloseEvent *event);
@@ -154,6 +156,7 @@ class BitcoinGUI : public QMainWindow
154156
QAction* m_close_wallet_action{nullptr};
155157
QAction* m_wallet_selector_label_action = nullptr;
156158
QAction* m_wallet_selector_action = nullptr;
159+
QAction* m_mask_values_action{nullptr};
157160

158161
QLabel *m_wallet_selector_label = nullptr;
159162
QComboBox* m_wallet_selector = nullptr;
@@ -206,6 +209,7 @@ class BitcoinGUI : public QMainWindow
206209
void receivedURI(const QString &uri);
207210
/** Signal raised when RPC console shown */
208211
void consoleShown(RPCConsole* console);
212+
void setPrivacy(bool privacy);
209213

210214
public Q_SLOTS:
211215
/** Set number of connections shown in the UI */

‎src/qt/forms/overviewpage.ui

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>596</width>
10-
<height>342</height>
9+
<width>798</width>
10+
<height>318</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
@@ -118,6 +118,7 @@
118118
<widget class="QLabel" name="labelWatchPending">
119119
<property name="font">
120120
<font>
121+
<family>Monospace</family>
121122
<weight>75</weight>
122123
<bold>true</bold>
123124
</font>
@@ -129,7 +130,7 @@
129130
<string>Unconfirmed transactions to watch-only addresses</string>
130131
</property>
131132
<property name="text">
132-
<string notr="true">0.000 000 00 BTC</string>
133+
<string notr="true">0.00000000 BTC</string>
133134
</property>
134135
<property name="alignment">
135136
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -143,6 +144,7 @@
143144
<widget class="QLabel" name="labelUnconfirmed">
144145
<property name="font">
145146
<font>
147+
<family>Monospace</family>
146148
<weight>75</weight>
147149
<bold>true</bold>
148150
</font>
@@ -154,7 +156,7 @@
154156
<string>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</string>
155157
</property>
156158
<property name="text">
157-
<string notr="true">0.000 000 00 BTC</string>
159+
<string notr="true">0.00000000 BTC</string>
158160
</property>
159161
<property name="alignment">
160162
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -168,6 +170,7 @@
168170
<widget class="QLabel" name="labelWatchImmature">
169171
<property name="font">
170172
<font>
173+
<family>Monospace</family>
171174
<weight>75</weight>
172175
<bold>true</bold>
173176
</font>
@@ -179,7 +182,7 @@
179182
<string>Mined balance in watch-only addresses that has not yet matured</string>
180183
</property>
181184
<property name="text">
182-
<string notr="true">0.000 000 00 BTC</string>
185+
<string notr="true">0.00000000 BTC</string>
183186
</property>
184187
<property name="alignment">
185188
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -226,6 +229,7 @@
226229
<widget class="QLabel" name="labelImmature">
227230
<property name="font">
228231
<font>
232+
<family>Monospace</family>
229233
<weight>75</weight>
230234
<bold>true</bold>
231235
</font>
@@ -237,7 +241,7 @@
237241
<string>Mined balance that has not yet matured</string>
238242
</property>
239243
<property name="text">
240-
<string notr="true">0.000 000 00 BTC</string>
244+
<string notr="true">0.00000000 BTC</string>
241245
</property>
242246
<property name="alignment">
243247
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -271,6 +275,7 @@
271275
<widget class="QLabel" name="labelTotal">
272276
<property name="font">
273277
<font>
278+
<family>Monospace</family>
274279
<weight>75</weight>
275280
<bold>true</bold>
276281
</font>
@@ -282,7 +287,7 @@
282287
<string>Your current total balance</string>
283288
</property>
284289
<property name="text">
285-
<string notr="true">0.000 000 00 BTC</string>
290+
<string notr="true">21 000 000.00000000 BTC</string>
286291
</property>
287292
<property name="alignment">
288293
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -296,6 +301,7 @@
296301
<widget class="QLabel" name="labelWatchTotal">
297302
<property name="font">
298303
<font>
304+
<family>Monospace</family>
299305
<weight>75</weight>
300306
<bold>true</bold>
301307
</font>
@@ -307,7 +313,7 @@
307313
<string>Current total balance in watch-only addresses</string>
308314
</property>
309315
<property name="text">
310-
<string notr="true">0.000 000 00 BTC</string>
316+
<string notr="true">21 000 000.00000000 BTC</string>
311317
</property>
312318
<property name="alignment">
313319
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -338,6 +344,7 @@
338344
<widget class="QLabel" name="labelBalance">
339345
<property name="font">
340346
<font>
347+
<family>Monospace</family>
341348
<weight>75</weight>
342349
<bold>true</bold>
343350
</font>
@@ -349,7 +356,7 @@
349356
<string>Your current spendable balance</string>
350357
</property>
351358
<property name="text">
352-
<string notr="true">0.000 000 00 BTC</string>
359+
<string notr="true">21 000 000.00000000 BTC</string>
353360
</property>
354361
<property name="alignment">
355362
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -363,6 +370,7 @@
363370
<widget class="QLabel" name="labelWatchAvailable">
364371
<property name="font">
365372
<font>
373+
<family>Monospace</family>
366374
<weight>75</weight>
367375
<bold>true</bold>
368376
</font>
@@ -374,7 +382,7 @@
374382
<string>Your current balance in watch-only addresses</string>
375383
</property>
376384
<property name="text">
377-
<string notr="true">0.000 000 00 BTC</string>
385+
<string notr="true">21 000 000.00000000 BTC</string>
378386
</property>
379387
<property name="alignment">
380388
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>

‎src/qt/overviewpage.cpp

Lines changed: 33 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@
1616
#include <qt/walletmodel.h>
1717

1818
#include <QAbstractItemDelegate>
19+
#include <QApplication>
1920
#include <QPainter>
21+
#include <QStatusTipEvent>
2022

2123
#define DECORATION_SIZE 54
2224
#define NUM_ITEMS 5
@@ -152,6 +154,21 @@ void OverviewPage::handleOutOfSyncWarningClicks()
152154
Q_EMIT outOfSyncWarningClicked();
153155
}
154156

157+
void OverviewPage::setPrivacy(bool privacy)
158+
{
159+
m_privacy = privacy;
160+
if (m_balances.balance != -1) {
161+
setBalance(m_balances);
162+
}
163+
164+
ui->listTransactions->setVisible(!m_privacy);
165+
166+
const QString status_tip = m_privacy ? tr("Privacy mode activated for the Overview tab. To unmask the values, uncheck Settings->Mask values.") : "";
167+
setStatusTip(status_tip);
168+
QStatusTipEvent event(status_tip);
169+
QApplication::sendEvent(this, &event);
170+
}
171+
155172
OverviewPage::~OverviewPage()
156173
{
157174
delete ui;
@@ -163,25 +180,25 @@ void OverviewPage::setBalance(const interfaces::WalletBalances& balances)
163180
m_balances = balances;
164181
if (walletModel->wallet().isLegacy()) {
165182
if (walletModel->wallet().privateKeysDisabled()) {
166-
ui->labelBalance->setText(BitcoinUnits::formatWithUnit(unit, balances.watch_only_balance, false, BitcoinUnits::separatorAlways));
167-
ui->labelUnconfirmed->setText(BitcoinUnits::formatWithUnit(unit, balances.unconfirmed_watch_only_balance, false, BitcoinUnits::separatorAlways));
168-
ui->labelImmature->setText(BitcoinUnits::formatWithUnit(unit, balances.immature_watch_only_balance, false, BitcoinUnits::separatorAlways));
169-
ui->labelTotal->setText(BitcoinUnits::formatWithUnit(unit, balances.watch_only_balance + balances.unconfirmed_watch_only_balance + balances.immature_watch_only_balance, false, BitcoinUnits::separatorAlways));
183+
ui->labelBalance->setText(BitcoinUnits::formatWithPrivacy(unit, balances.watch_only_balance, BitcoinUnits::separatorAlways, m_privacy));
184+
ui->labelUnconfirmed->setText(BitcoinUnits::formatWithPrivacy(unit, balances.unconfirmed_watch_only_balance, BitcoinUnits::separatorAlways, m_privacy));
185+
ui->labelImmature->setText(BitcoinUnits::formatWithPrivacy(unit, balances.immature_watch_only_balance, BitcoinUnits::separatorAlways, m_privacy));
186+
ui->labelTotal->setText(BitcoinUnits::formatWithPrivacy(unit, balances.watch_only_balance + balances.unconfirmed_watch_only_balance + balances.immature_watch_only_balance, BitcoinUnits::separatorAlways, m_privacy));
170187
} else {
171-
ui->labelBalance->setText(BitcoinUnits::formatWithUnit(unit, balances.balance, false, BitcoinUnits::separatorAlways));
172-
ui->labelUnconfirmed->setText(BitcoinUnits::formatWithUnit(unit, balances.unconfirmed_balance, false, BitcoinUnits::separatorAlways));
173-
ui->labelImmature->setText(BitcoinUnits::formatWithUnit(unit, balances.immature_balance, false, BitcoinUnits::separatorAlways));
174-
ui->labelTotal->setText(BitcoinUnits::formatWithUnit(unit, balances.balance + balances.unconfirmed_balance + balances.immature_balance, false, BitcoinUnits::separatorAlways));
175-
ui->labelWatchAvailable->setText(BitcoinUnits::formatWithUnit(unit, balances.watch_only_balance, false, BitcoinUnits::separatorAlways));
176-
ui->labelWatchPending->setText(BitcoinUnits::formatWithUnit(unit, balances.unconfirmed_watch_only_balance, false, BitcoinUnits::separatorAlways));
177-
ui->labelWatchImmature->setText(BitcoinUnits::formatWithUnit(unit, balances.immature_watch_only_balance, false, BitcoinUnits::separatorAlways));
178-
ui->labelWatchTotal->setText(BitcoinUnits::formatWithUnit(unit, balances.watch_only_balance + balances.unconfirmed_watch_only_balance + balances.immature_watch_only_balance, false, BitcoinUnits::separatorAlways));
188+
ui->labelBalance->setText(BitcoinUnits::formatWithPrivacy(unit, balances.balance, BitcoinUnits::separatorAlways, m_privacy));
189+
ui->labelUnconfirmed->setText(BitcoinUnits::formatWithPrivacy(unit, balances.unconfirmed_balance, BitcoinUnits::separatorAlways, m_privacy));
190+
ui->labelImmature->setText(BitcoinUnits::formatWithPrivacy(unit, balances.immature_balance, BitcoinUnits::separatorAlways, m_privacy));
191+
ui->labelTotal->setText(BitcoinUnits::formatWithPrivacy(unit, balances.balance + balances.unconfirmed_balance + balances.immature_balance, BitcoinUnits::separatorAlways, m_privacy));
192+
ui->labelWatchAvailable->setText(BitcoinUnits::formatWithPrivacy(unit, balances.watch_only_balance, BitcoinUnits::separatorAlways, m_privacy));
193+
ui->labelWatchPending->setText(BitcoinUnits::formatWithPrivacy(unit, balances.unconfirmed_watch_only_balance, BitcoinUnits::separatorAlways, m_privacy));
194+
ui->labelWatchImmature->setText(BitcoinUnits::formatWithPrivacy(unit, balances.immature_watch_only_balance, BitcoinUnits::separatorAlways, m_privacy));
195+
ui->labelWatchTotal->setText(BitcoinUnits::formatWithPrivacy(unit, balances.watch_only_balance + balances.unconfirmed_watch_only_balance + balances.immature_watch_only_balance, BitcoinUnits::separatorAlways, m_privacy));
179196
}
180197
} else {
181-
ui->labelBalance->setText(BitcoinUnits::formatWithUnit(unit, balances.balance, false, BitcoinUnits::separatorAlways));
182-
ui->labelUnconfirmed->setText(BitcoinUnits::formatWithUnit(unit, balances.unconfirmed_balance, false, BitcoinUnits::separatorAlways));
183-
ui->labelImmature->setText(BitcoinUnits::formatWithUnit(unit, balances.immature_balance, false, BitcoinUnits::separatorAlways));
184-
ui->labelTotal->setText(BitcoinUnits::formatWithUnit(unit, balances.balance + balances.unconfirmed_balance + balances.immature_balance, false, BitcoinUnits::separatorAlways));
198+
ui->labelBalance->setText(BitcoinUnits::formatWithPrivacy(unit, balances.balance, BitcoinUnits::separatorAlways, m_privacy));
199+
ui->labelUnconfirmed->setText(BitcoinUnits::formatWithPrivacy(unit, balances.unconfirmed_balance, BitcoinUnits::separatorAlways, m_privacy));
200+
ui->labelImmature->setText(BitcoinUnits::formatWithPrivacy(unit, balances.immature_balance, BitcoinUnits::separatorAlways, m_privacy));
201+
ui->labelTotal->setText(BitcoinUnits::formatWithPrivacy(unit, balances.balance + balances.unconfirmed_balance + balances.immature_balance, BitcoinUnits::separatorAlways, m_privacy));
185202
}
186203
// only show immature (newly mined) balance if it's non-zero, so as not to complicate things
187204
// for the non-mining users

‎src/qt/overviewpage.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ class OverviewPage : public QWidget
3939

4040
public Q_SLOTS:
4141
void setBalance(const interfaces::WalletBalances& balances);
42+
void setPrivacy(bool privacy);
4243

4344
Q_SIGNALS:
4445
void transactionClicked(const QModelIndex &index);
@@ -49,6 +50,7 @@ public Q_SLOTS:
4950
ClientModel *clientModel;
5051
WalletModel *walletModel;
5152
interfaces::WalletBalances m_balances;
53+
bool m_privacy{false};
5254

5355
TxViewDelegate *txdelegate;
5456
std::unique_ptr<TransactionFilterProxy> filter;

‎src/qt/test/wallettests.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ void TestGUI(interfaces::Node& node)
202202
OverviewPage overviewPage(platformStyle.get());
203203
overviewPage.setWalletModel(&walletModel);
204204
QLabel* balanceLabel = overviewPage.findChild<QLabel*>("labelBalance");
205-
QString balanceText = balanceLabel->text();
205+
QString balanceText = balanceLabel->text().trimmed();
206206
int unit = walletModel.getOptionsModel()->getDisplayUnit();
207207
CAmount balance = walletModel.wallet().getBalance();
208208
QString balanceComparison = BitcoinUnits::formatWithUnit(unit, balance, false, BitcoinUnits::separatorAlways);

‎src/qt/walletframe.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ bool WalletFrame::addWallet(WalletModel *walletModel)
5353
walletView->setClientModel(clientModel);
5454
walletView->setWalletModel(walletModel);
5555
walletView->showOutOfSyncWarning(bOutOfSync);
56+
walletView->setPrivacy(gui->isPrivacyModeActivated());
5657

5758
WalletView* current_wallet_view = currentWalletView();
5859
if (current_wallet_view) {
@@ -73,6 +74,7 @@ bool WalletFrame::addWallet(WalletModel *walletModel)
7374
connect(walletView, &WalletView::encryptionStatusChanged, gui, &BitcoinGUI::updateWalletStatus);
7475
connect(walletView, &WalletView::incomingTransaction, gui, &BitcoinGUI::incomingTransaction);
7576
connect(walletView, &WalletView::hdEnabledStatusChanged, gui, &BitcoinGUI::updateWalletStatus);
77+
connect(gui, &BitcoinGUI::setPrivacy, walletView, &WalletView::setPrivacy);
7678

7779
return true;
7880
}

‎src/qt/walletview.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,8 @@ WalletView::WalletView(const PlatformStyle *_platformStyle, QWidget *parent):
8585
connect(sendCoinsPage, &SendCoinsDialog::message, this, &WalletView::message);
8686
// Pass through messages from transactionView
8787
connect(transactionView, &TransactionView::message, this, &WalletView::message);
88+
89+
connect(this, &WalletView::setPrivacy, overviewPage, &OverviewPage::setPrivacy);
8890
}
8991

9092
WalletView::~WalletView()

‎src/qt/walletview.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ public Q_SLOTS:
115115
void requestedSyncWarningInfo();
116116

117117
Q_SIGNALS:
118+
void setPrivacy(bool privacy);
118119
void transactionClicked();
119120
void coinsSent();
120121
/** Fired when a message should be reported to the user */

0 commit comments

Comments
 (0)