tMerge branch 'master' of git://github.com/spesmilo/electrum - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 9ad62a4f06a0e713fe79535d8c857263c22a0c75
DIR parent d944a09da5fc8a4abfd3c503b6d96b2cbe563a9f
HTML Author: ThomasV <thomasv@electrum.org>
Date: Sat, 25 Feb 2017 14:56:18 +0100
Merge branch 'master' of git://github.com/spesmilo/electrum
Diffstat:
M gui/qt/main_window.py | 5 ++++-
M icons.qrc | 1 +
A icons/status_connected_proxy.png | 0
3 files changed, 5 insertions(+), 1 deletion(-)
---
DIR diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
t@@ -660,7 +660,10 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
# append fiat balance and price
if self.fx.is_enabled():
text += self.fx.get_fiat_status_text(c + u + x) or ''
- icon = QIcon(":icons/status_connected.png")
+ if not self.network.proxy:
+ icon = QIcon(":icons/status_connected.png")
+ else:
+ icon = QIcon(":icons/status_connected_proxy.png")
else:
text = _("Not connected")
icon = QIcon(":icons/status_disconnected.png")
DIR diff --git a/icons.qrc b/icons.qrc
t@@ -26,6 +26,7 @@
<file>icons/preferences.png</file>
<file>icons/seed.png</file>
<file>icons/status_connected.png</file>
+ <file>icons/status_connected_proxy.png</file>
<file>icons/status_disconnected.png</file>
<file>icons/status_waiting.png</file>
<file>icons/status_lagging.png</file>
DIR diff --git a/icons/status_connected_proxy.png b/icons/status_connected_proxy.png
Binary files differ.