From 4490cd371aa60f290fbc0b6b78c24fac1523bd15 Mon Sep 17 00:00:00 2001
From: Calum Lind <calumlind+deluge@gmail.com>
Date: Fri, 11 Feb 2011 20:24:27 +0000
Subject: [PATCH] Sidebar: Enabled strings for translation and added icons to
 Trackers filter

---
 deluge/data/pixmaps/tracker_all16.png     | Bin 0 -> 1097 bytes
 deluge/data/pixmaps/tracker_warning16.png | Bin 0 -> 683 bytes
 deluge/ui/gtkui/filtertreeview.py         |  79 ++++++++++++++++------
 3 files changed, 59 insertions(+), 20 deletions(-)
 create mode 100644 deluge/data/pixmaps/tracker_all16.png
 create mode 100644 deluge/data/pixmaps/tracker_warning16.png

diff --git a/deluge/data/pixmaps/tracker_all16.png b/deluge/data/pixmaps/tracker_all16.png
new file mode 100644
index 0000000000000000000000000000000000000000..36756bbcc50598f12930a2ef3c2cf4fa5a7f6b1d
GIT binary patch
literal 1097
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7Sc;uILpV4%IBGajIv5xj
zI14-?iy0VruY)k7lg8`{1_lPn64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xh
zq!<_&_&|z6GD~t&89eh!Qj79ZOVo<LHZm|Uh=61qOG`5Hix|8TvrCf{f=f~}^HPhR
z{r;}cz`&pgk`K-=ElN&h$S5f(u+rDh%FNA8OxDXSEzV5NNX*I6ORmaHdmP8Wz#Q-C
z;uvDl8#>uLBPNx>?fn1y*6SyfC&`_?VdIlAM=ii>QRR$)=oLz_D-wD`TwXZEM0AU^
z1Zi^a5NHm)<8|PHQ&7h1b0Hc+Mk*dY9EQ1a7xt(b&-|XER%~3X{{7#&s9Br;S#<OF
z1$cc_lCS++JzeeUgbADCxvX+GOj#@D_+#nOA3w_F?J5iP=W*)A%atATKIML@t2-}d
z=M`P6sMjf_u7cJNdAPG3&6o_c>oS97XSr`*b*Xf*u&{i@dDgS}e7n25*6w^Q&%Y&J
z#%8r;NpFqa@jA8BVJ64pK26xxW|Vcxw&(6#J)d9G)8)%wKfm(!_BIxch?V*4dB1Mm
z|2?cf?9sIevs_;J$+%8cFgaz@G^fyErMpql+ewfAWb5uNtykU0B*0sHy}CA6-}nCC
zm&Gfm^iI^?uxsvt@>}hx&m!)2B}f~do0H{onZ=1iNBUg7RaD2Z&2xi1O23}=*W+k-
z@{jR#wBRf0==t-foL+Wto5b(rwvE-nZ{Db0Fx~O%-)o^OqOq5^?pxNTwNcb-!)EEF
z+qX;mX5HB4s!{A=H+$Ls<L&FOdh1M8%zt*H`$$Iqs;ezinyWH5F7|z8rF~n{%Pac^
zk6M9c$){Fjq2Fx!;kyI89v1HYaLp<r>bBdB%AP&E1!4ZFKHHSrMS4`u39&B>=x8bk
zw%FvEUOb~}PI%O;0I!8p7A;*k$^CNi6IW4%3%b#3*XOy#ofQ+YmG!fES0r~%N7$mE
zFyYBh^LY>Monh9S^U>%+X_t$Vm(twl7t91!uy$@rpZCrs#C2oy-w>J0CKc%mCO;Eu
zUcS4~ELrV8tB>4SJz+lfPPfB1q9hkaJUg-J$`p}pf1W<P&mFe%_|Z3$ZJib}JS>>-
zb84<xS+a|=;HQ-WzfVd$ESTVPZOO&x^Yeqby*TP7Gyb1DGsNom=jM}<pIv-yr==S2
z-_lfH*d1fzptsT6PEw^f;Zf1f42zeKum7$y&VG{j&hP(@Rm?kNUe3N;oGotaxA*Pr
z^XDuVXCB<$JZWx%#PZ9&pFQ=zZZ(|}HvQw@8!3tZJ|44otbfXXJn7X7i83|qNy=yM
zy^_x7pCh)mxAanUbf>_i1e3GB(r(D@w@*#yc^tN(E<eQAC*nBEd5e$7#ABU06g9ur
uDZX&g^i~wpJ^d}Y^W%dvbCWIq^Iu_GSJGYZ^dtiV1B0ilpUXO@geCy%ROt!;

literal 0
HcmV?d00001

diff --git a/deluge/data/pixmaps/tracker_warning16.png b/deluge/data/pixmaps/tracker_warning16.png
new file mode 100644
index 0000000000000000000000000000000000000000..219432c44d6d57179930a1f307e3c48e89afc4ab
GIT binary patch
literal 683
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7Sc;uILpV4%IBGajIv5xj
zI14-?iy0VruY)k7lg8`{1_lPn64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xh
zq!<{OG(24#Lo9lGFYnC`4wO0e@%{Tb#l@3nKUwCP>~%>zb7SVOMWsTH+)WBsPM%yU
z>ndI-&>h-!>FD&OuL1<i&8J`6?<i1MAT-5kVMx@j4ByEnC(qjIX@v;C+$>{Z^W50h
zea+S_-aprgOtr}0u(pfuu=hpxvc<9fTWfhW-tIM8`ZCeBsL;q{qPT4JTRrXaCrx^D
zWTw0Lg%~Xl$$Jy?cH0~)83iRFU)|MzTzrxwkN7J7d>km<X=^XC!TfycNq;ec)>pFb
zqFx<EE>&*s^=D3h`QPYj$UC`8>*OAFwI(m|fSZa2Y=0Q_12(3Lxt6kQE8nSgGci7@
zG-Th2JD0eMy|rJ|aHh__@g*SdwY70><J#;;rX`;oRbEv-s#<YHaMM2Lb=pm*z9<Qb
zo4-3gTPQkex8gf{2iF~<AB+3=R=xOVm=mygLYYR2Ois4^UHit&s|KC#W|-`(WB5_x
zYNRVW*Lz3Bq%#VI@=aRqoB5n=^;klWym#wSJD9iU;-h=F*8He%SoU<^>z!`xre7`^
zW`r$>OI!7%uqxp2J++X1i+*>{SkUu2VHF=Y!>7D9yVM^xm!4PU<qJMP^7DSP!~9w%
zhu3d?H;CnUJU*=Tb#3XsoZwK!<30@i#fCD%*Dn5aJoGo#MWiF?^H&{(8^7cdHk!Hc
z_dI&D=JL~p<)>^+91nyTbunM4*k6?(_A);G@B6O|h2rKvj!6dRfBN*8jr-c8Z7)lE
lIDRYHO!m9~bHh*0<lwnU1$qzp85kHCJYD@<);T3K0RW--DaHT*

literal 0
HcmV?d00001

diff --git a/deluge/ui/gtkui/filtertreeview.py b/deluge/ui/gtkui/filtertreeview.py
index 31487bb74..787d62303 100644
--- a/deluge/ui/gtkui/filtertreeview.py
+++ b/deluge/ui/gtkui/filtertreeview.py
@@ -38,6 +38,7 @@
 import gtk
 import gtk.glade
 import pkg_resources
+import glib
 
 import deluge.component as component
 import deluge.common
@@ -56,20 +57,37 @@ STATE_PIX = {
     "Active": "active"
     }
 
-
-TRANSLATE = {
-    "state": "States",
-    "tracker_host": "Trackers",
-    "label": "Labels"
+TRACKER_PIX = {
+    "All": "tracker_all",
+    "Error": "tracker_warning",
 }
 
-FILTER_COLUMN = 5
+def _(message): return message
+
+TRANSLATE = {
+    "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"),
+}
+
+del _
 
 def _t(text):
     if text in TRANSLATE:
         text = TRANSLATE[text]
     return _(text)
 
+FILTER_COLUMN = 5
 
 #sidebar-treeview
 class FilterTreeView(component.Component):
@@ -84,7 +102,7 @@ class FilterTreeView(component.Component):
         self.tracker_icons = component.get("TrackerIcons")
 
         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:
         self.sidebar.notebook.connect("hide", self._on_hide)
@@ -106,7 +124,7 @@ class FilterTreeView(component.Component):
         self.treestore = gtk.TreeStore(str, str, str, int, gtk.gdk.Pixbuf, bool)
 
         # Create the column
-        column = gtk.TreeViewColumn(_("Filters"))
+        column = gtk.TreeViewColumn("Filters")
         column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
         render = gtk.CellRendererPixbuf()
         self.renderpix = render
@@ -125,7 +143,7 @@ class FilterTreeView(component.Component):
         # Force the theme to use an expander-size of 15 so that we don't cut out
         # 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)
         self.create_model_filter()
@@ -144,7 +162,7 @@ class FilterTreeView(component.Component):
         self.filters = {}
 
         #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)
         self.update_row("state", "Seeding" , 0)
@@ -152,6 +170,11 @@ class FilterTreeView(component.Component):
         self.update_row("state", "Paused" , 0)
         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
 
@@ -208,8 +231,16 @@ class FilterTreeView(component.Component):
         else:
             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,9 +259,6 @@ class FilterTreeView(component.Component):
         count = model.get_value(row, 3)
         pix = model.get_value(row, 4)
 
-        if label == "" and cat == "label":
-            label = _("no label")
-
         if pix:
             self.renderpix.set_property("visible", True)
         else:
@@ -248,11 +276,23 @@ class FilterTreeView(component.Component):
         cell.set_property('text', txt)
 
     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))
+            pix = STATE_PIX.get(value, None)
+        elif cat == "tracker_host":
+            pix = TRACKER_PIX.get(value, None)
 
-        return 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):
         pix = None
@@ -262,8 +302,7 @@ class FilterTreeView(component.Component):
             log.debug(e)
 
         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)
         return False