Browse Source

Merge pull request #4758 from SomberNight/qt_fork_icon

qt network status: display 'fork' in icon when chain split is detected
3.3.3.1
ThomasV 6 years ago
committed by GitHub
parent
commit
f037f06e74
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 7
      electrum/gui/qt/main_window.py
  2. 3
      icons.qrc
  3. BIN
      icons/status_connected_fork.png
  4. BIN
      icons/status_connected_proxy_fork.png
  5. BIN
      icons/status_lagging_fork.png

7
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"))

3
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>

BIN
icons/status_connected_fork.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 62 KiB

BIN
icons/status_connected_proxy_fork.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 60 KiB

BIN
icons/status_lagging_fork.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 62 KiB

Loading…
Cancel
Save