Changeset 7b72d7

Timestamp:

04/28/2009 02:35:08 AM (16 years ago)

Author:

Andrew Resch <andrewresch@gmail.com>

Branches:

2.0.x, develop, extjs4-port, master

Children:

78b5c0

Parents:

925dcd

Message:

Made TrackerIcons a component to prevent trying to get an icon multiple
times
Fixed showing the wrong tracker icon in the TorrentView when the icon
could not be retrieved from the tracker

Location:

deluge/ui

Files:

• gtkui/filtertreeview.py (modified) (2 diffs)
• gtkui/gtkui.py (modified) (2 diffs)
• gtkui/torrentview.py (modified) (2 diffs)
• tracker_icons.py (modified) (3 diffs)

deluge/ui/gtkui/filtertreeview.py

@@ -31 +31 @@
 import deluge.component as component
 import deluge.common
-from deluge.ui.tracker_icons import TrackerIcons
 from deluge.log import LOG as log
 from deluge.ui.client import client
@@ -72 +71 @@
         self.sidebar = component.get("SideBar")
         self.config = ConfigManager("gtkui.conf")
-        self.tracker_icons = TrackerIcons()
+        self.tracker_icons = component.get("TrackerIcons")
 
         self.label_view = gtk.TreeView()

deluge/ui/gtkui/gtkui.py

@@ -51 +51 @@
 from pluginmanager import PluginManager
 from ipcinterface import IPCInterface
+from deluge.ui.tracker_icons import TrackerIcons
 
 from queuedtorrents import QueuedTorrents
@@ -167 +168 @@
         client.set_disconnect_callback(self.__on_disconnect)
 
+        self.trackericons = TrackerIcons()
         # Initialize various components of the gtkui
         self.mainwindow = MainWindow()

deluge/ui/gtkui/torrentview.py

@@ -76 +76 @@
 
 def cell_data_trackericon(column, cell, model, row, data):
-    icon_path = TrackerIcons().get(model[row][data])
+    icon_path = component.get("TrackerIcons").get(model[row][data])
     if icon_path:
         try:
@@ -82 +82 @@
         except Exception, e:
             pass
-        if cell.get_property("pixbuf") != icon:
-            cell.set_property("pixbuf", icon)
+    else:
+        icon = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB, True, 8, 16, 16)
+        icon.fill(0x00000000)
+
+    if cell.get_property("pixbuf") != icon:
+        cell.set_property("pixbuf", icon)
 
 

deluge/ui/tracker_icons.py

@@ -32 +32 @@
 import os
 import deluge.configmanager
+import deluge.component as component
 
 #some servers don't have their favicon at the expected location
@@ -61 +62 @@
     return data
 
-class TrackerIcons(object):
+class TrackerIcons(component.Component):
     def __init__(self):
+        component.Component.__init__(self, "TrackerIcons")
         #set image cache dir
         self.image_dir = os.path.join(deluge.configmanager.get_config_dir(), "icons")
@@ -141 +143 @@
             f.write(icon_data)
             f.close()
-            self.images[tracker_host] = filename
         else:
             filename = None
+
+        self.images[tracker_host] = filename
 
         if callback: