Changeset 654 for trunk

Timestamp:

12/04/07 11:33:48 (12 months ago)

Author:

daelstorm

Message:

Bugfixes: list colors in settings fixed; traceback with userlist->browse fixed

Location:

trunk/nicotine+/pynicotine/gtkgui

Files:

• chatrooms.py (modified) (1 diff)
• frame.py (modified) (3 diffs)
• search.py (modified) (2 diffs)
• settingswindow.py (modified) (2 diffs)
• utils.py (modified) (1 diff)

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

@@ -1142 +1142 @@
                 
         def UpdateColours(self):
-
+                self.frame.ChangeListFont(self.UserList, self.frame.np.config.sections["ui"]["listfont"])
                 map = self.ChatScroll.get_style().copy()
                 self.backupcolor = map.text[gtk.STATE_NORMAL]

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

@@ -1036 +1036 @@
                         colour = None
                 cellrenderer.set_property("foreground", colour)
-                cellrenderer.set_property("font", self.np.config.sections["ui"]["listfont"])
                 
         def changecolour(self, tag, colour):
@@ -1059 +1058 @@
                 for c in listview.get_columns():
                         for r in c.get_cell_renderers():
-                                if type(r) is gtk.CellRendererText:
+                                if type(r)  in (gtk.CellRendererText, gtk.CellRendererCombo):
                                         r.set_property("font", font)
                                 
@@ -1123 +1122 @@
                         widget.modify_fg(gtk.STATE_NORMAL, colour)
                         
+                if type(widget) is gtk.TreeView:
+                        colour = self.np.config.sections["ui"]["search"]
+                        if colour == "":
+                                colour = None
+                        for c in widget.get_columns():
+                                for r in c.get_cell_renderers():
+                                        if type(r) in (gtk.CellRendererText, gtk.CellRendererCombo):
+                                                r.set_property("foreground", colour)
                                         
         def logMessage(self, msg, debug = None):

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

@@ -186 +186 @@
                 self.UpdateColours()
                 self.show()
+                
         def SetInterval(self, msg):
                 self.interval = msg.seconds
@@ -923 +924 @@
                 self.frame.SetTextBG(self.FilterFreeSlot)
                 font = self.frame.np.config.sections["ui"]["searchfont"]
-                if font == "":
-                        font = 'default font'
-                for c in self.ResultsList.get_columns():
-                        for r in c.get_cell_renderers():
-                                r.set_property("font", font)
+
+                self.frame.ChangeListFont(self.ResultsList, font)
                 
         def GetUserStatus(self, msg):

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

@@ -1073 +1073 @@
                 
         def OnDefaultColours(self, widget):
-                #self.colors = ["chatlocal", "chatremote", "chatme", "chathilite", "textbg", "inputcolor", "search", "searchq", "searchoffline", "useraway", "urlcolor", "useronline", "useroffline", "tab_default", "tab_changed", "tab_hilite"]
                 
                 for option in self.colors:
@@ -2144 +2143 @@
                                 widget.disconnect(handler_id)
                         self.handler_ids[widget].remove(handler_id)
+                        
+
+        def ColourWidgets(self, widget):
+                if type(widget) in (gtk.Entry, gtk.SpinButton, gtk.TextView, gtk.TreeView, gtk.CheckButton, gtk.RadioButton):
+                        self.SetTextBG(widget)
+                if type(widget) is gtk.TreeView:
+                        self.frame.ChangeListFont(widget, self.frame.np.config.sections["ui"]["listfont"])
+                        
+        def UpdateColours(self):
+                for widget in self.__dict__.values():
+                        #if type(widget) in (gtk.Entry, gtk.SpinButton, gtk.TextView, gtk.TreeView, gtk.CheckButton, gtk.RadioButton):
+                        self.ColourWidgets(widget)
+                for name, page in self.pages.items():
+                        for widget in page.__dict__.values():
+                                self.ColourWidgets(widget)
+
                                 
-        def UpdateColours(self):
-                for name, page in self.pages.items():
-
-                        for widget in page.__dict__.values() + self.__dict__.values():
-
-                                if type(widget) in (gtk.Entry, gtk.SpinButton, gtk.TextView, gtk.TreeView, gtk.CheckButton, gtk.RadioButton):
-                                        self.SetTextBG(widget)
                                         
         def SetTextBG(self, widget, bgcolor="", fgcolor=""):

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

@@ -845 +845 @@
                 self.frame.LocalUserInfoRequest(self.user)
         
-        def OnBrowseUser(self, widget, room):
+        def OnBrowseUser(self, widget):
                 self.frame.BrowseUser(self.user)