Changeset 4490cd

Timestamp:

02/11/2011 09:48:49 PM (14 years ago)

Author:

Calum Lind <calumlind+deluge@gmail.com>

Children:

53b4a0

Parents:

7d36a4

git-author:

Calum Lind <calumlind+deluge@gmail.com> (02/11/2011 08:24:27 PM)

git-committer:

Calum Lind <calumlind+deluge@gmail.com> (02/11/2011 09:48:49 PM)

Message:

Sidebar: Enabled strings for translation and added icons to Trackers filter

Location:

deluge

Files:

• data/pixmaps/tracker_all16.png (added)
• data/pixmaps/tracker_warning16.png (added)
• ui/gtkui/filtertreeview.py (modified) (12 diffs)

deluge/ui/gtkui/filtertreeview.py

@@ -39 +39 @@
 import gtk.glade
 import pkg_resources
+import glib
 
 import deluge.component as component
@@ -57 +58 @@
     }
 
+TRACKER_PIX = {
+    "All": "tracker_all",
+    "Error": "tracker_warning",
+}
+
+def _(message): return message
 
 TRANSLATE = {
-    "state": "States",
-    "tracker_host": "Trackers",
-    "label": "Labels"
+    "state": _("States"),
+    "tracker_host": _("Trackers"),
+    "label": _("Labels"),
+    "All": _("All"),
+    "Downloading": _("Downloading"),
+    "Seeding": _("Seeding"),
+    "Paused": _("Paused"),
+    "Checking": _("Checking"),
+    "Queued": _("Queued"),
+    "Error": _("Error"),
+    "Active": _("Active"),
+    "none": _("None"),
+    "no_label": _("No Label"),
 }
 
-FILTER_COLUMN = 5
+del _
 
 def _t(text):
@@ -71 +88 @@
     return _(text)
 
+FILTER_COLUMN = 5
 
 #sidebar-treeview
@@ -85 +103 @@
 
         self.label_view = gtk.TreeView()
-        self.sidebar.add_tab(self.label_view, "filters", _("Filters"))
+        self.sidebar.add_tab(self.label_view, "filters", "Filters")
 
         #set filter to all when hidden:
@@ -107 +125 @@
 
         # Create the column
-        column = gtk.TreeViewColumn(_("Filters"))
+        column = gtk.TreeViewColumn("Filters")
         column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
         render = gtk.CellRendererPixbuf()
@@ -126 +144 @@
         # entries due to our indentation hack.
         gtk.rc_parse_string('style "treeview-style" { GtkTreeView::expander-size = 15 } class "GtkTreeView" style "treeview-style"')
-        
+
         self.label_view.set_model(self.treestore)
         self.label_view.get_selection().connect("changed", self.on_selection_changed)
@@ -145 +163 @@
 
         #initial order of state filter:
-        self.cat_nodes["state"] = self.treestore.append(None, ["cat", "state", _("State"), 0, None, False])
+        self.cat_nodes["state"] = self.treestore.append(None, ["cat", "state", _t("State"), 0, None, False])
         self.update_row("state", "All" , 0)
         self.update_row("state", "Downloading" , 0)
@@ -153 +171 @@
         self.update_row("state", "Queued" , 0)
 
+        self.cat_nodes["tracker_host"] = self.treestore.append(None, ["cat", "tracker_host", _t("Trackers"), 0, None, False])
+        self.update_row("tracker_host", "All" , 0)
+        self.update_row("tracker_host", "Error" , 0)
+        self.update_row("tracker_host", "" , 0)
+
         # We set to this expand the rows on start-up
         self.expand_rows = True
@@ -209 +232 @@
             pix = self.get_pixmap(cat, value)
             label = value
-            if cat == "state":
-                label = _(value)
+
+            if cat == "state" or cat == "tracker_host":
+                label = _t(value)
+
+            if label == "":
+                if cat == "tracker_host":
+                    label = _t("none")
+                elif cat == "label":
+                    label = _t("no_label")
+
             row = self.treestore.append(self.cat_nodes[cat],[cat, value, label, count , pix, True])
             self.filters[(cat, value)] = row
@@ -228 +259 @@
         count = model.get_value(row, 3)
         pix = model.get_value(row, 4)
-
-        if label == "" and cat == "label":
-            label = _("no label")
 
         if pix:
@@ -249 +277 @@
 
     def get_pixmap(self, cat, value):
+        pix = None
         if cat == "state":
-            pix = STATE_PIX.get(value, "dht")
-            return gtk.gdk.pixbuf_new_from_file(deluge.common.get_pixmap("%s16.png" % pix))
-
-        return None
+            pix = STATE_PIX.get(value, None)
+        elif cat == "tracker_host":
+            pix = TRACKER_PIX.get(value, None)
+
+        if pix:
+            try:
+                return gtk.gdk.pixbuf_new_from_file(deluge.common.get_pixmap("%s16.png" % pix))
+            except glib.GError as e:
+                log.warning(e)
+        return self.get_transparent_pix(16, 16)
+
+    def get_transparent_pix(self,  width, height):
+        pix = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB, True, 8, width, height)
+        pix.fill(0x0000000)
+        return pix
 
     def set_row_image(self, cat, value, filename):
@@ -263 +303 @@
 
         if not pix:
-            pix = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB, True, 8, 16, 16)
-            pix.fill(0x00000000)
+            pix = self.get_transparent_pix(16, 16)
         row = self.filters[(cat, value)]
         self.treestore.set_value(row, 4, pix)