show 'server lagging' icon if server lags and client does not use auto-connect

diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
index b51c80f..19f99c2 100644 (file)
--- a/gui/qt/main_window.py
+++ b/gui/qt/main_window.py
@@ -535,6 +535,9 @@ class ElectrumWindow(QMainWindow):
             if not self.wallet.up_to_date:
                 text = _("Synchronizing...")
                 icon = QIcon(":icons/status_waiting.png")
+            elif self.network.is_lagging:
+                text = _("Server is lagging")
+                icon = QIcon(":icons/status_lagging.png")
             else:
                 c, u = self.wallet.get_account_balance(self.current_account)
                 text =  _( "Balance" ) + ": %s "%( self.format_amount(c) ) + self.base_unit()

diff --git a/icons.qrc b/icons.qrc
index f7f2b2a..e3ee3be 100644 (file)
--- a/icons.qrc
+++ b/icons.qrc
@@ -15,6 +15,7 @@
     <file>icons/status_connected.png</file>
     <file>icons/status_disconnected.png</file>
     <file>icons/status_waiting.png</file>
+    <file>icons/status_lagging.png</file>
     <file>icons/switchgui.png</file>
     <file>icons/unconfirmed.png</file>
     <file>icons/network.png</file>

diff --git a/icons/status_lagging.png b/icons/status_lagging.png
new file mode 100644 (file)
index 0000000..5aec99f
Binary files /dev/null and b/icons/status_lagging.png differ

diff --git a/lib/blockchain.py b/lib/blockchain.py
index ff4524b..ee6d99e 100644 (file)
--- a/lib/blockchain.py
+++ b/lib/blockchain.py
@@ -37,6 +37,7 @@ class Blockchain(threading.Thread):
         self.set_local_height()
         self.queue = Queue.Queue()
         self.servers_height = {}
+        self.is_lagging = False
 
     
     def stop(self):
@@ -91,15 +92,17 @@ class Blockchain(threading.Thread):
                     print_error("error", i.server)
                     # todo: dismiss that server
 
-                self.network.trigger_callback('updated')
-
             h = self.servers_height.get(self.network.interface.server)
             if h is not None and h < height - 1:
                 print_error( "Server is lagging", height, h)
                 if self.config.get('auto_cycle'):
                     self.network.set_server(i.server)
                 else:
-                    self.network.interface.stop()
+                    self.network.is_lagging = True
+            else:
+                self.network.is_lagging = False
+                
+            self.network.trigger_callback('updated')
 
 
                     

diff --git a/make_packages b/make_packages
index 4863de7..42daa2e 100755 (executable)
--- a/make_packages
+++ b/make_packages
@@ -10,7 +10,7 @@ if __name__ == '__main__':
         sys.exit()
 
     os.system("python mki18n.py")
-    os.system("pyrcc4 icons.qrc -o gui/icons_rc.py")
+    os.system("pyrcc4 icons.qrc -o gui/qt/icons_rc.py")
     os.system("python setup.py sdist --format=zip,gztar")
     
     _tgz="Electrum-%s.tar.gz"%version