From 50c9830f794ae1f7e24668b95c63a166ecc44933 Mon Sep 17 00:00:00 2001
From: thomasv <thomasv@gitorious>
Date: Thu, 3 Oct 2013 18:43:33 +0200
Subject: [PATCH] show 'server lagging' icon if server lags and client does not
 use auto-connect

---
 gui/qt/main_window.py    |   3 +++
 icons.qrc                |   1 +
 icons/status_lagging.png | Bin 0 -> 1036 bytes
 lib/blockchain.py        |   9 ++++++---
 make_packages            |   2 +-
 5 files changed, 11 insertions(+), 4 deletions(-)
 create mode 100644 icons/status_lagging.png

diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
index b51c80f3..19f99c2a 100644
--- 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 f7f2b2a4..e3ee3be0 100644
--- 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
index 0000000000000000000000000000000000000000..5aec99f58a12a8fc92e65f93010704b76d63d475
GIT binary patch
literal 1036
zcmV+n1oQieP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2i*z-
z4-gmlJi@gA00WFkL_t(I%dM1MYn(+C$A4#Lo|kOW?XIRRl}KBxtP!;oD+a_638GN_
z79kg<AHsX@y(qo#J7}*o+7?8yDM76^rD-ie^R}CPNjAIB?(;lzyvT0S*E<Ieb1}^C
z{Ad2>98p#N&*ffpFn2+w5i{#VXL6PE09JG<Q@M`%g{zBt^Lh8=X@!@jq@3k)rEsM5
z*&CCSZv5DBS9<9f0L^-pT6HU1zI!+8>^8r3R_DL^MH?>!&b=!i7;C?I^R2fF@0>dy
z37%-Qgct*W_nv;cfr{n#-<EoR-T9;A^ZfIxxAmuIfS0DEoO%1;quGzk<*^VOL<I2|
zsvcB1Osu5cHmaURyU&jc-!+`cUmGelLvohOl}e>jD2ASPbrqlWNp`pC?bi4AcAeht
zHp$L5d77}Z@sMKZsZ=V3ESD=oju{#d7sf75R?bG%l|@__k?z&WJ9YAI1K(}pyG`<L
zldRLA->ze<rMj}nWaVrW7sf8mU6AQRm&MGUIW-X^+pCc7p~()KIY1E<5%!;~3SPl`
zNc(8IN2j*RnNt(NpLg%g0yiCi6P+m+N1Y}$;=n++h6E8tK=8xQ#;amfQLoVN5jjD-
z4a!HxofDloP?)QnFO9|ITf0O~uvrJAU5v;+R0eho1d3M>MVvv?Hb+aZGOX2u!Zw;>
zonXY^tl*4b%@8O9ppq-(Ua`4iMDZ5T^vO=KMwVKw*7S)uhNMU69)}(Ry;pLtWS#@%
z8ji5lYGREn9k`r%y<Ttbq+u8nI748C&<c?gB4>z$!-xVy=nR21I3t8nOuf0AW?ru!
z)}i`^`~TE4T!eE0&dNS?02>*=!a*`;1ZN-!L$Dz$|JF0qFB|}`F6zy!-@Eqf@_G`E
zmJq-g!CJvtAqotU+fQPRU<MJ49Oc%%jU?;$t__F9L8lm_^DAqu?t_gscBBYm@m}!*
z6LJq;6;%*1n7GK_TYIdmw-RG?{+V7Dk;131^T|ZXetq^tA)c8mg$0}Aj3T;UiylL!
zLMOA_SZ<~(o1Nr-HNSl05#IwfRqa0xJPM4zQsm6cY5Af!V&9uQ8QYVk&>k-a0Br4~
ztTp?7c|FM+oqXwshx%o8k4HcaSbG9EfEIyqp#1&>A08VsQ!f`d=M1L-(wx=Wp5EDP
z>#f^s{0y{!DzK@l*>eZ%0BnJg$07m*$be)J9iXRA0saHuQ_+O{e`8Pp0000<MNUMn
GLSTaISmJ~L

literal 0
HcmV?d00001

diff --git a/lib/blockchain.py b/lib/blockchain.py
index ff4524b2..ee6d99ec 100644
--- 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 4863de75..42daa2ed 100755
--- 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