Changeset 671 for trunk

Timestamp:

02/05/08 07:25:54 (10 months ago)

Author:

daelstorm

Message:

Display flag in metadata dialog

Files:

• trunk/nicotine+/pynicotine/gtkgui/entrydialog.py (modified) (5 diffs)

trunk/nicotine+/pynicotine/gtkgui/entrydialog.py

@@ -124 +124 @@
                 
                 hbox4.pack_start(self.Country, False, False)
-
+                self.Flag = gtk.Image()
+                self.Flag.hide()
+                hbox4.pack_start(self.Flag, False, False)
                 
                 self.buttonbox = gtk.HBox(False, 2)
@@ -221 +223 @@
                         self.Position.hide()
                         self.Country.hide()
+                        self.Flag.hide()
                         self.Queue.hide()
                         self.Immediate.hide()
@@ -233 +236 @@
                         self.Position.show()
                         self.Country.show()
+                        self.Flag.show()
                         self.Queue.show()
                         self.Immediate.show()
@@ -243 +247 @@
                         
                 self.current = item
-                
+                data = self.data[self.current]
                 More = False
                 if len(self.data.keys()) > 1:
@@ -251 +255 @@
                 self.DownloadAll.set_sensitive(More)
                 
-                self.Username.set_text  (self.data[self.current]["user"])
-                self.Filename.set_text  (self.data[self.current]["filename"])
-                self.Directory.set_text (self.data[self.current]["directory"])
-                self.Size.set_text      (str(self.data[self.current]["size"]))
-                self.Speed.set_text     (self.data[self.current]["speed"])
-                self.Position.set_text  (str(self.data[self.current]["position"]))
-                if self.data[self.current]["bitrate"] not in ("", None):
-                        self.Bitrate.set_text(self.data[self.current]["bitrate"])
+                self.Username.set_text(data["user"])
+                self.Filename.set_text(data["filename"])
+                self.Directory.set_text(data["directory"])
+                self.Size.set_text(str(data["size"]))
+                self.Speed.set_text(data["speed"])
+                self.Position.set_text(str(data["position"]))
+                if data["bitrate"] not in ("", None):
+                        self.Bitrate.set_text(data["bitrate"])
                 else:
                         self.Bitrate.set_text("")
-                self.Length.set_text    (self.data[self.current]["length"])
-                self.Queue.set_text     (self.data[self.current]["queue"])
-                self.Immediate.set_text (str(self.data[self.current]["immediate"] == "Y"))
-                
-                if self.data[self.current]["country"] not in ("", None):
-                        self.Country.set_markup(_("<b>Country Code:</b> ")+self.data[self.current]["country"] )
+                self.Length.set_text(data["length"])
+                self.Queue.set_text(data["queue"])
+                self.Immediate.set_text(str(data["immediate"] == "Y"))
+                country =  data["country"]
+                if country not in ("", None):
+                        self.Country.set_markup(_("<b>Country Code:</b> ")+country )
                         self.Country.show()
+                        self.Flag.set_from_pixbuf(self.nicotine.GetFlagImage("flag_"+country) )
+                        self.Flag.show()
                 else:
                         self.Country.set_text("")
                         self.Country.hide()
+                        self.Flag.set_from_pixbuf(None)
+                        self.Flag.hide()
                 
         def quit(self, w=None, event=None):