tsimplify prev commit - electrum - Electrum Bitcoin wallet (HTM) git clone https://git.parazyd.org/electrum (DIR) Log (DIR) Files (DIR) Refs (DIR) Submodules --- (DIR) commit bb9871ded7aadd20381461b5205a99799af52d48 (DIR) parent f037f06e74a22f8675cfaf0bb88ef2e7626bfb69 (HTM) Author: ThomasV <thomasv@electrum.org> Date: Wed, 10 Oct 2018 19:24:24 +0200 simplify prev commit Diffstat: M electrum/gui/qt/main_window.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- (DIR) diff --git a/electrum/gui/qt/main_window.py b/electrum/gui/qt/main_window.py t@@ -743,7 +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()) + fork_str = "_fork" if len(self.network.get_blockchains())>1 else "" # 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. t@@ -752,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") if num_chains <= 1 else QIcon(":icons/status_lagging_fork.png") + icon = QIcon(":icons/status_lagging%s.png"%fork_str) else: c, u, x = self.wallet.get_balance() text = _("Balance" ) + ": %s "%(self.format_amount_and_units(c)) t@@ -766,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") if num_chains <= 1 else QIcon(":icons/status_connected_fork.png") + icon = QIcon(":icons/status_connected%s.png"%fork_str) else: - icon = QIcon(":icons/status_connected_proxy.png") if num_chains <= 1 else QIcon(":icons/status_connected_proxy_fork.png") + icon = QIcon(":icons/status_connected_proxy%s.png%fork_str") else: if self.network.proxy: text = "{} ({})".format(_("Not connected"), _("proxy enabled"))