Merge lp:~mh21/indicator-sysmonitor/fix-743651 into lp:indicator-sysmonitor/trunk

[Michael Hofmann]

Fixes bug #743651.

[Alex Eftimie (alexeftimie)]

fix looks great, please update it to the current lp:indicator-sysmonitor.

something like:
 guide = label.format(mem=100, cpu=100) should work with customized label strings.

review: Needs Fixing

[lp:~mh21/indicator-sysmonitor/fix-743651]

5. By Michael Hofmann on 2011-04-05

Fix shifting of indicators.

Unmerged revisions

=== modified file 'indicator-sysmonitor'
--- indicator-sysmonitor	2011-03-28 18:52:46 +0000
+++ indicator-sysmonitor	2011-04-05 10:03:20 +0000
@@ -68,7 +68,7 @@
         while(self.parent.alive.isSet()):
             if self.parent.mode_user:
                 output = self._fetch_user(self.parent.user_command)
-                self.parent.update_text(output)
+                self.parent.update_text(output, output)
             else:
                 data = self._fetch()
                 self.parent.update(data)
@@ -181,7 +181,7 @@
         self.preferences_dialog = None
         self.custom_text = 'cpu: {cpu} mem: {mem}'
         self.user_command = ''
-        self.last_data, self.last_text = {}, ''
+        self.last_data, self.last_text, self.last_guide = {}, '', ''
         self.mode_user = False
         self.interval = 2
 
@@ -210,18 +210,21 @@
     def update(self, data):
         try:
           label = self.custom_text.format(mem=data['mem'], cpu=data['cpu'])
+          guide = self.custom_text.format(mem="100%", cpu="100%")
         except:
           label = 'Error: ' + self.custom_text
+          guide = label
         self.last_data = data
-        self.update_text(label)
+        self.update_text(label, guide)
 
-    def update_text(self, text):
+    def update_text(self, text, guide):
         self.last_text = text
-        self.ind.set_label(text)
+        self.last_guide = guide
+        self.ind.set_label(text, guide)
 
     def force_update(self):
         if self.mode_user:
-            self.update_text(self.last_text)
+            self.update_text(self.last_text, self.last_guide)
         else:
             self.update(self.last_data)