electrum

commit f037f06e74a22f8675cfaf0bb88ef2e7626bfb69
parent 87b05e1c9e1b7163e5f100765656b26b96c8a144
Author: ThomasV <thomasv@electrum.org>
Date:   Wed, 10 Oct 2018 19:18:11 +0200

Merge pull request #4758 from SomberNight/qt_fork_icon

qt network status: display 'fork' in icon when chain split is detected
Diffstat:
M
electrum/gui/qt/main_window.py
 | 
7
++++---
M
icons.qrc
 | 
3
+++
A
icons/status_connected_fork.png
 | 
0

A
icons/status_connected_proxy_fork.png
 | 
0

A
icons/status_lagging_fork.png
 | 
0

5 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/electrum/gui/qt/main_window.py b/electrum/gui/qt/main_window.py
@@ -743,6 +743,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
         elif self.network.is_connected():
             server_height = self.network.get_server_height()
             server_lag = self.network.get_local_height() - server_height
+            num_chains = len(self.network.get_blockchains())
             # Server height can be 0 after switching to a new server
             # until we get a headers subscription request response.
             # Display the synchronizing message in that case.
@@ -751,7 +752,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
                 icon = QIcon(":icons/status_waiting.png")
             elif server_lag > 1:
                 text = _("Server is lagging ({} blocks)").format(server_lag)
-                icon = QIcon(":icons/status_lagging.png")
+                icon = QIcon(":icons/status_lagging.png") if num_chains <= 1 else QIcon(":icons/status_lagging_fork.png")
             else:
                 c, u, x = self.wallet.get_balance()
                 text =  _("Balance" ) + ": %s "%(self.format_amount_and_units(c))
@@ -765,9 +766,9 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
                     text += self.fx.get_fiat_status_text(c + u + x,
                         self.base_unit(), self.get_decimal_point()) or ''
                 if not self.network.proxy:
-                    icon = QIcon(":icons/status_connected.png")
+                    icon = QIcon(":icons/status_connected.png") if num_chains <= 1 else QIcon(":icons/status_connected_fork.png")
                 else:
-                    icon = QIcon(":icons/status_connected_proxy.png")
+                    icon = QIcon(":icons/status_connected_proxy.png") if num_chains <= 1 else QIcon(":icons/status_connected_proxy_fork.png")
         else:
             if self.network.proxy:
                 text = "{} ({})".format(_("Not connected"), _("proxy enabled"))
diff --git a/icons.qrc b/icons.qrc
@@ -35,10 +35,13 @@
     <file>icons/safe-t.png</file>
     <file>icons/seed.png</file>
     <file>icons/status_connected.png</file>
+    <file>icons/status_connected_fork.png</file>
     <file>icons/status_connected_proxy.png</file>
+    <file>icons/status_connected_proxy_fork.png</file>
     <file>icons/status_disconnected.png</file>
     <file>icons/status_waiting.png</file>
     <file>icons/status_lagging.png</file>
+    <file>icons/status_lagging_fork.png</file>
     <file>icons/seal.png</file>
     <file>icons/tab_addresses.png</file>
     <file>icons/tab_coins.png</file>
diff --git a/icons/status_connected_fork.png b/icons/status_connected_fork.png
Binary files differ.
diff --git a/icons/status_connected_proxy_fork.png b/icons/status_connected_proxy_fork.png
Binary files differ.
diff --git a/icons/status_lagging_fork.png b/icons/status_lagging_fork.png
Binary files differ.