Partially merge dashpay#3604:

- BitcoinGUI::updateWalletStatus() - Make WalletFrame::currentWalletView public
xdustinface · Sep 12, 2020 · 55fec55 · 55fec55
1 parent 2bb94c7
commit 55fec55
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
@@ -1524,6 +1524,20 @@ void BitcoinGUI::setEncryptionStatus(int status)
 }
 #endif // ENABLE_WALLET
 
+void BitcoinGUI::updateWalletStatus()
+{
+    if (!walletFrame) {
+        return
+    }
+    WalletView * const walletView = walletFrame->currentWalletView();
+    if (!walletView) {
+        return;
+    }
+    WalletModel * const walletModel = walletView->getWalletModel();
+    setEncryptionStatus(walletModel->getEncryptionStatus());
+    setHDStatus(walletModel->hdEnabled());
+}
+
 void BitcoinGUI::showNormalIfMinimized(bool fToggleHidden)
 {
     if(!clientModel)

diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h
@@ -69,6 +69,9 @@ class BitcoinGUI : public QMainWindow
     */
     bool addWallet(const QString& name, WalletModel *walletModel);
     bool setCurrentWallet(const QString& name);
+    /** Set the UI status indicators based on the currently selected wallet.
+    */
+    void updateWalletStatus();
     void removeAllWallets();
 #endif // ENABLE_WALLET
     bool enableWallet;

diff --git a/src/qt/walletframe.h b/src/qt/walletframe.h
@@ -56,6 +56,7 @@ class WalletFrame : public QFrame
 
     bool bOutOfSync;
 
+public:
     WalletView *currentWalletView();
 
 public Q_SLOTS: