Changeset 98ca37


Ignore:
Timestamp:
02/11/2011 10:10:00 PM (14 years ago)
Author:
Calum Lind <calumlind+deluge@gmail.com>
Branches:
2.0.x, develop, extjs4-port, master
Children:
1e0005f
Parents:
f87377
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 10:10:00 PM)
Message:

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

Location:
deluge
Files:
2 added
1 edited

Legend:

Unmodified
Added
Removed
  • deluge/ui/gtkui/filtertreeview.py

    rf87377 r98ca37  
    4040import logging
    4141import pkg_resources
     42import glib
    4243
    4344import deluge.component as component
     
    5960    }
    6061
     62TRACKER_PIX = {
     63    "All": "tracker_all",
     64    "Error": "tracker_warning",
     65}
     66
     67def _(message): return message
    6168
    6269TRANSLATE = {
    63     "state": "States",
    64     "tracker_host": "Trackers",
    65     "label": "Labels",
    66     "owner": "Owner"
     70    "state": _("States"),
     71    "tracker_host": _("Trackers"),
     72    "label": _("Labels"),
     73    "owner": _("Owner"),
     74    "All": _("All"),
     75    "Downloading": _("Downloading"),
     76    "Seeding": _("Seeding"),
     77    "Paused": _("Paused"),
     78    "Checking": _("Checking"),
     79    "Queued": _("Queued"),
     80    "Error": _("Error"),
     81    "Active": _("Active"),
     82    "none": _("None"),
     83    "no_label": _("No Label"),
    6784}
    6885
    69 FILTER_COLUMN = 5
     86del _
    7087
    7188def _t(text):
     
    7491    return _(text)
    7592
     93FILTER_COLUMN = 5
    7694
    7795#sidebar-treeview
     
    88106
    89107        self.label_view = gtk.TreeView()
    90         self.sidebar.add_tab(self.label_view, "filters", _("Filters"))
     108        self.sidebar.add_tab(self.label_view, "filters", "Filters")
    91109
    92110        #set filter to all when hidden:
     
    110128
    111129        # Create the column
    112         column = gtk.TreeViewColumn(_("Filters"))
     130        column = gtk.TreeViewColumn("Filters")
    113131        column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
    114132        render = gtk.CellRendererPixbuf()
     
    148166
    149167        #initial order of state filter:
    150         self.cat_nodes["state"] = self.treestore.append(None, ["cat", "state", _("State"), 0, None, False])
     168        self.cat_nodes["state"] = self.treestore.append(None, ["cat", "state", _t("State"), 0, None, False])
    151169        self.update_row("state", "All" , 0)
    152170        self.update_row("state", "Downloading" , 0)
     
    156174        self.update_row("state", "Queued" , 0)
    157175
     176        self.cat_nodes["tracker_host"] = self.treestore.append(None, ["cat", "tracker_host", _t("Trackers"), 0, None, False])
     177        self.update_row("tracker_host", "All" , 0)
     178        self.update_row("tracker_host", "Error" , 0)
     179        self.update_row("tracker_host", "" , 0)
     180
    158181        # We set to this expand the rows on start-up
    159182        self.expand_rows = True
     
    212235            pix = self.get_pixmap(cat, value)
    213236            label = value
    214             if cat == "state":
    215                 label = _(value)
     237
     238            if cat == "state" or cat == "tracker_host":
     239                label = _t(value)
     240
     241            if label == "":
     242                if cat == "tracker_host":
     243                    label = _t("none")
     244                elif cat == "label":
     245                    label = _t("no_label")
     246
    216247            row = self.treestore.append(self.cat_nodes[cat],[cat, value, label, count , pix, True])
    217248            self.filters[(cat, value)] = row
     
    231262        count = model.get_value(row, 3)
    232263        pix = model.get_value(row, 4)
    233 
    234         if label == "" and cat == "label":
    235             label = _("no label")
    236264
    237265        if pix:
     
    252280
    253281    def get_pixmap(self, cat, value):
     282        pix = None
    254283        if cat == "state":
    255             pix = STATE_PIX.get(value, "dht")
    256             return gtk.gdk.pixbuf_new_from_file(deluge.common.get_pixmap("%s16.png" % pix))
    257 
    258         return None
     284            pix = STATE_PIX.get(value, None)
     285        elif cat == "tracker_host":
     286            pix = TRACKER_PIX.get(value, None)
     287
     288        if pix:
     289            try:
     290                return gtk.gdk.pixbuf_new_from_file(deluge.common.get_pixmap("%s16.png" % pix))
     291            except glib.GError as e:
     292                log.warning(e)
     293        return self.get_transparent_pix(16, 16)
     294
     295    def get_transparent_pix(self,  width, height):
     296        pix = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB, True, 8, width, height)
     297        pix.fill(0x0000000)
     298        return pix
    259299
    260300    def set_row_image(self, cat, value, filename):
     
    266306
    267307        if not pix:
    268             pix = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB, True, 8, 16, 16)
    269             pix.fill(0x00000000)
     308            pix = self.get_transparent_pix(16, 16)
    270309        row = self.filters[(cat, value)]
    271310        self.treestore.set_value(row, 4, pix)
Note: See TracChangeset for help on using the changeset viewer.