Ticket #2010: titlebar.patch

deluge/common.py

@@ -319 +319 @@
     fspeed_gb = fspeed_mb / 1024.0
     return "%.1f %s" % (fspeed_gb, _("GiB/s"))
 
+def fspeedtitle(bps):
+    fspeed_kb = bps / 1024.0
+    if fspeed_kb < 1024:
+        return "%.1f%s" % (fspeed_kb, _("K"))
+    fspeed_mb = fspeed_kb / 1024.0
+    if fspeed_mb < 1024:
+        return "%.1f%s" % (fspeed_mb, _("M"))
+    fspeed_gb = fspeed_mb / 1024.0
+    return "%.1f%s" % (fspeed_gb, _("G"))
+
 def fpeer(num_peers, total_peers):
     """
     Formats a string to show 'num_peers' ('total_peers')

deluge/ui/gtkui/mainwindow.py

@@ -230 +230 @@
     def update(self):
         # 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))
+            download_rate = deluge.common.fspeedtitle(status["payload_download_rate"])
+            upload_rate = deluge.common.fspeedtitle(status["payload_upload_rate"])
+            self.window.set_title("%s%s %s%s - Deluge" % (_("D:"), download_rate, _("U:"), upload_rate))
         if self.config["show_rate_in_title"]:
-            client.core.get_session_status(["download_rate", "upload_rate"]).addCallback(_on_get_session_status)
+            client.core.get_session_status(["payload_download_rate", "payload_upload_rate"]).addCallback(_on_get_session_status)
 
     def _on_set_show_rate_in_title(self, key, value):
         if value:

deluge/ui/web/js/deluge-all/Formatters.js

@@ -92 +92 @@
                 return (!bytes && !showZero) ? '' : fsize(bytes, showZero) + '/s';
         },
         
+        speedtitle: function(bytes, showZero) {
+                if (!bytes && !showZero) return '';
+                bytes = bytes / 1024.0;
+        
+                if (bytes < 1024) { return bytes.toFixed(1)  + 'K'; }
+                else { bytes = bytes / 1024; }
+        
+                if (bytes < 1024) { return bytes.toFixed(1)  + 'M'; }
+                else { bytes = bytes / 1024; }
+        
+                return bytes.toFixed(1) + 'G'
+        },
+
         /**
          * Formats a string to show time in a human readable form.
          *
@@ -150 +163 @@
 }
 var fsize = Deluge.Formatters.size;
 var fspeed = Deluge.Formatters.speed;
+var fspeedtitle = Deluge.Formatters.speedtitle;
 var ftime = Deluge.Formatters.timeRemaining;
 var fdate = Deluge.Formatters.date;
 var fplain = Deluge.Formatters.plain;

deluge/ui/web/js/deluge-all/UI.js

@@ -169 +169 @@
 
                 if (deluge.config.show_session_speed) {
                         document.title = this.originalTitle +
-                                ' (Down: ' + fspeed(data['stats'].download_rate, true) +
-                                ' Up: ' + fspeed(data['stats'].upload_rate, true) + ')';
+                                ' (D:' + fspeedtitle(data['stats'].download_rate, true) +
+                                ' U:' + fspeedtitle(data['stats'].upload_rate, true) + ')';
                 }
                 if (Ext.areObjectsEqual(this.filters, this.oldFilters)) {
                         deluge.torrents.update(data['torrents']);