diff --git a/electrum/gui/qt/main_window.py b/electrum/gui/qt/main_window.py index 2510663fb..e5a0ae995 100644 --- a/electrum/gui/qt/main_window.py +++ b/electrum/gui/qt/main_window.py @@ -742,6 +742,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. @@ -750,7 +751,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)) @@ -764,9 +765,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 index 1ff4ea57b..19c298adc 100644 --- a/icons.qrc +++ b/icons.qrc @@ -35,10 +35,13 @@ icons/safe-t.png icons/seed.png icons/status_connected.png + icons/status_connected_fork.png icons/status_connected_proxy.png + icons/status_connected_proxy_fork.png icons/status_disconnected.png icons/status_waiting.png icons/status_lagging.png + icons/status_lagging_fork.png icons/seal.png icons/tab_addresses.png icons/tab_coins.png diff --git a/icons/status_connected_fork.png b/icons/status_connected_fork.png new file mode 100644 index 000000000..a65c2a883 Binary files /dev/null and b/icons/status_connected_fork.png differ diff --git a/icons/status_connected_proxy_fork.png b/icons/status_connected_proxy_fork.png new file mode 100644 index 000000000..f6b4541e1 Binary files /dev/null and b/icons/status_connected_proxy_fork.png differ diff --git a/icons/status_lagging_fork.png b/icons/status_lagging_fork.png new file mode 100644 index 000000000..82826721b Binary files /dev/null and b/icons/status_lagging_fork.png differ