Fix up showing speeds in titlebar and make it an option

deluge/ui/gtkui/gtkui.py

@@ -107,7 +107,8 @@ DEFAULT_PREFS = {
     "show_statusbar": True,
     "sidebar_show_zero": False,
     "sidebar_show_trackers": False,
-    "sidebar_position": 170
+    "sidebar_position": 170,
+    "show_rate_in_title": False
 }
 
 class GtkUI:

deluge/ui/gtkui/mainwindow.py

@@ -72,6 +72,8 @@ class MainWindow(component.Component):
         self.vpaned.connect("notify::position", self.on_vpaned_position_event)
         self.window.connect("expose-event", self.on_expose_event)
 
+        self.config.register_set_function("show_rate_in_title", self._on_set_show_rate_in_title)
+
         if not(self.config["start_in_tray"] and \
                self.config["enable_system_tray"]) and not \
                 self.window.get_property("visible"):
@@ -196,13 +198,20 @@ class MainWindow(component.Component):
     def on_expose_event(self, widget, event):
         component.get("SystemTray").blink(False)
 
+    def stop(self):
+        self.window.set_title("Deluge")
+
     def update(self):
-        self.send_status_request()
+        # Update the window title
+        def _on_get_session_status(status):
+            download_rate = deluge.common.fspeed(status["download_rate"])
+            upload_rate = deluge.common.fspeed(status["upload_rate"])
+            self.window.set_title("Deluge - %s %s %s %s" % (_("Down:"), download_rate, _("Up:"), upload_rate))
+        if self.config["show_rate_in_title"]:
+            client.get_session_status(_on_get_session_status, ["download_rate", "upload_rate"])
 
-    def send_status_request(self):
-        client.get_session_status(self._on_get_session_status, ["download_rate", "upload_rate"])
-
-    def _on_get_session_status(self, status):
-        self.download_rate = deluge.common.fsize(status["download_rate"])
-        self.upload_rate = deluge.common.fsize(status["upload_rate"])
-        self.window.set_title("Deluge - %s %s/s|%s %s/s" % (_("Down:"), self.download_rate, _("Up:"), self.upload_rate))
+    def _on_set_show_rate_in_title(self, key, value):
+        if value:
+            self.update()
+        else:
+            self.window.set_title("Deluge")

deluge/ui/gtkui/preferences.py

@@ -422,6 +422,8 @@ class Preferences(component.Component):
             self.gtkui_config["lock_tray"])
         self.glade.get_widget("chk_classic_mode").set_active(
             self.gtkui_config["classic_mode"])
+        self.glade.get_widget("chk_show_rate_in_title").set_active(
+            self.gtkui_config["show_rate_in_title"])
 
         ## Other tab ##
         self.glade.get_widget("chk_show_new_releases").set_active(
@@ -606,6 +608,8 @@ class Preferences(component.Component):
             new_gtkui_config["tray_password"] = passhex
         new_gtkui_config["classic_mode"] = \
             self.glade.get_widget("chk_classic_mode").get_active()
+        new_gtkui_config["show_rate_in_title"] = \
+            self.glade.get_widget("chk_show_rate_in_title").get_active()
 
         ## Notification tab ##
         new_gtkui_config["ntf_tray_blink"] = \