qt: Add "All connections are via Tor" icon to the status bar

bitcoin-core · Sep 10, 2020 · 082a680 · 082a680
1 parent 285ee93
commit 082a680
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 0 deletions.
diff --git a/src/interfaces/node.cpp b/src/interfaces/node.cpp
@@ -87,6 +87,12 @@ class NodeImpl : public Node
         }
     }
     bool getProxy(Network net, proxyType& proxy_info) override { return GetProxy(net, proxy_info); }
+
+    bool hasTorOnlyConnections() override
+    {
+        return HasTorOnlyConnections();
+    }
+
     size_t getNodeCount(CConnman::NumConnections flags) override
     {
         return m_context->connman ? m_context->connman->GetNodeCount(flags) : 0;

diff --git a/src/interfaces/node.h b/src/interfaces/node.h
@@ -87,6 +87,9 @@ class Node
     //! Get proxy.
     virtual bool getProxy(Network net, proxyType& proxy_info) = 0;
 
+    //! Check if Tor only connections are allowed by settings.
+    virtual bool hasTorOnlyConnections() = 0;
+
     //! Get number of connections.
     virtual size_t getNodeCount(CConnman::NumConnections flags) = 0;
 

diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
@@ -77,6 +77,7 @@ const std::string BitcoinGUI::DEFAULT_UIPLATFORM =
 BitcoinGUI::BitcoinGUI(interfaces::Node& node, const PlatformStyle *_platformStyle, const NetworkStyle *networkStyle, QWidget *parent) :
     QMainWindow(parent),
     m_node(node),
+    m_tor_icon{new GUIUtil::ClickableLabel()},
     trayIconMenu{new QMenu()},
     platformStyle(_platformStyle),
     m_network_style(networkStyle)
@@ -160,6 +161,7 @@ BitcoinGUI::BitcoinGUI(interfaces::Node& node, const PlatformStyle *_platformSty
         frameBlocksLayout->addWidget(labelWalletEncryptionIcon);
         frameBlocksLayout->addWidget(labelWalletHDStatusIcon);
     }
+    frameBlocksLayout->addWidget(m_tor_icon);
     frameBlocksLayout->addWidget(labelProxyIcon);
     frameBlocksLayout->addStretch();
     frameBlocksLayout->addWidget(connectionsControl);
@@ -202,6 +204,9 @@ BitcoinGUI::BitcoinGUI(interfaces::Node& node, const PlatformStyle *_platformSty
     connect(labelProxyIcon, &GUIUtil::ClickableLabel::clicked, [this] {
         openOptionsDialogWithTab(OptionsDialog::TAB_NETWORK);
     });
+    connect(m_tor_icon, &GUIUtil::ClickableLabel::clicked, [this] {
+        openOptionsDialogWithTab(OptionsDialog::TAB_NETWORK);
+    });
 
     connect(labelBlocksIcon, &GUIUtil::ClickableLabel::clicked, this, &BitcoinGUI::showModalOverlay);
     connect(progressBar, &GUIUtil::ClickableProgressBar::clicked, this, &BitcoinGUI::showModalOverlay);
@@ -602,6 +607,7 @@ void BitcoinGUI::setClientModel(ClientModel *_clientModel, interfaces::BlockAndH
 
         rpcConsole->setClientModel(_clientModel, tip_info->block_height, tip_info->block_time, tip_info->verification_progress);
 
+        updateTorIcon();
         updateProxyIcon();
 
 #ifdef ENABLE_WALLET
@@ -1317,6 +1323,17 @@ void BitcoinGUI::updateProxyIcon()
     }
 }
 
+void BitcoinGUI::updateTorIcon()
+{
+    if (clientModel->hasTorOnlyConnections()) {
+        m_tor_icon->setPixmap(platformStyle->SingleColorIcon(":/icons/tor_connected").pixmap(STATUSBAR_ICONSIZE, STATUSBAR_ICONSIZE));
+        m_tor_icon->setToolTip(tr("All connections are <b>via Tor</b> only"));
+        m_tor_icon->show();
+    } else {
+        m_tor_icon->hide();
+    }
+}
+
 void BitcoinGUI::updateWindowTitle()
 {
     QString window_title = PACKAGE_NAME;

diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h
@@ -121,6 +121,7 @@ class BitcoinGUI : public QMainWindow
     UnitDisplayStatusBarControl* unitDisplayControl = nullptr;
     QLabel* labelWalletEncryptionIcon = nullptr;
     QLabel* labelWalletHDStatusIcon = nullptr;
+    GUIUtil::ClickableLabel* m_tor_icon{nullptr};
     GUIUtil::ClickableLabel* labelProxyIcon = nullptr;
     GUIUtil::ClickableLabel* connectionsControl = nullptr;
     GUIUtil::ClickableLabel* labelBlocksIcon = nullptr;
@@ -263,6 +264,7 @@ public Q_SLOTS:
 private:
     /** Set the proxy-enabled icon as shown in the UI. */
     void updateProxyIcon();
+    void updateTorIcon();
     void updateWindowTitle();
 
 public Q_SLOTS:

diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp
@@ -320,3 +320,8 @@ bool ClientModel::getProxyInfo(std::string& ip_port) const
     }
     return false;
 }
+
+bool ClientModel::hasTorOnlyConnections() const
+{
+    return m_node.hasTorOnlyConnections();
+}
diff --git a/src/qt/clientmodel.h b/src/qt/clientmodel.h
@@ -77,6 +77,8 @@ class ClientModel : public QObject
 
     bool getProxyInfo(std::string& ip_port) const;
 
+    bool hasTorOnlyConnections() const;
+
     // caches for the best header: hash, number of blocks and block time
     mutable std::atomic<int> cachedBestHeaderHeight;
     mutable std::atomic<int64_t> cachedBestHeaderTime;