From 7cc344dbc9025cd8a37b54c622ccd78cc36e67c3 Mon Sep 17 00:00:00 2001 From: Sander van Grieken Date: Fri, 13 Jan 2023 10:25:35 +0100 Subject: [PATCH] qml: show Tor status in NetworkOverview --- .../gui/qml/components/NetworkOverview.qml | 18 ++++++++++++++++++ electrum/gui/qml/qenetwork.py | 6 ++++++ 2 files changed, 24 insertions(+) diff --git a/electrum/gui/qml/components/NetworkOverview.qml b/electrum/gui/qml/components/NetworkOverview.qml index d2297b5fe..f1b72ca27 100644 --- a/electrum/gui/qml/components/NetworkOverview.qml +++ b/electrum/gui/qml/components/NetworkOverview.qml @@ -61,6 +61,24 @@ Pane { text: Network.proxy['host'] ? Network.proxy['host'] + ':' + Network.proxy['port'] : '' } + Label { + visible: 'mode' in Network.proxy + text: qsTr('Proxy type:'); + color: Material.accentColor + } + RowLayout { + Image { + visible: Network.isProxyTor + Layout.preferredWidth: constants.iconSizeSmall + Layout.preferredHeight: constants.iconSizeSmall + source: '../../icons/tor_logo.png' + } + Label { + visible: 'mode' in Network.proxy + text: Network.isProxyTor ? 'TOR' : Network.proxy['mode'] + } + } + Label { Layout.columnSpan: 2 text: qsTr('On-chain') diff --git a/electrum/gui/qml/qenetwork.py b/electrum/gui/qml/qenetwork.py index 462184c14..ebe780d47 100644 --- a/electrum/gui/qml/qenetwork.py +++ b/electrum/gui/qml/qenetwork.py @@ -66,6 +66,7 @@ class QENetwork(QObject, QtEventListener): def on_event_proxy_set(self, *args): self._logger.debug('proxy set') self.proxySet.emit() + self.proxyTorChanged.emit() @event_listener def on_event_status(self, *args): @@ -174,6 +175,11 @@ class QENetwork(QObject, QtEventListener): self.network.run_from_another_thread(self.network.set_parameters(net_params)) self.proxyChanged.emit() + proxyTorChanged = pyqtSignal() + @pyqtProperty(bool, notify=proxyTorChanged) + def isProxyTor(self): + return self.network.tor_proxy + @pyqtProperty('QVariant', notify=feeHistogramUpdated) def feeHistogram(self): return self._fee_histogram