From 2214478e87b222c486140eb8cb74717cec2e7f87 Mon Sep 17 00:00:00 2001 From: Nikos Kouremenos Date: Sat, 11 Jun 2005 13:45:48 +0000 Subject: [PATCH] fixing colors and prettying the gc and chat window a bit --- src/groupchat_window.py | 11 +++++++---- src/gtkgui.glade | 6 +++--- src/roster_window.py | 6 +++--- src/tabbed_chat_window.py | 4 ++-- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/groupchat_window.py b/src/groupchat_window.py index 46db852d0..35851733f 100644 --- a/src/groupchat_window.py +++ b/src/groupchat_window.py @@ -647,10 +647,10 @@ class GroupchatWindow(chat.Chat): # set the fg colour of the label to white self.name_labels[room_jid].modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse('white')) - gc_banner_eventbox = self.xmls[room_jid].get_widget('gc_banner_eventbox') + banner_eventbox = self.xmls[room_jid].get_widget('banner_eventbox') # get the background color from the current theme bgcolor = gajim.config.get('accountbgcolor') - gc_banner_eventbox.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse(bgcolor)) + banner_eventbox.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse(bgcolor)) # connect the menuitems to their respective functions xm = gtk.glade.XML(GTKGUI_GLADE, 'gc_actions_menu', APP) @@ -703,10 +703,13 @@ class GroupchatWindow(chat.Chat): conversation_textview.grab_focus() def tree_cell_data_func(self, column, renderer, model, iter, data=None): - if not model.iter_parent(iter): # is iter toplevel? (ie. group) + if model.iter_parent(iter): + bgcolor = gajim.config.get('userbgcolor') + renderer.set_property('cell-background', bgcolor) + else: # it is root (eg. group) bgcolor = gajim.config.get('groupbgcolor') renderer.set_property('cell-background', bgcolor) - renderer.set_property('cell-background', bgcolor) + def on_actions_button_clicked(self, button): """popup action menu""" diff --git a/src/gtkgui.glade b/src/gtkgui.glade index c47e7c24a..1f108d31a 100644 --- a/src/gtkgui.glade +++ b/src/gtkgui.glade @@ -8173,7 +8173,7 @@ Custom 0 - + - 0 + 3 False False @@ -9702,7 +9702,7 @@ JID: whatever@jabber.org 0 - 5 + 3 False False diff --git a/src/roster_window.py b/src/roster_window.py index fa23554aa..556c6cc08 100644 --- a/src/roster_window.py +++ b/src/roster_window.py @@ -795,7 +795,7 @@ class RosterWindow: model = self.tree.get_model() iter = model.get_iter(path) type = model.get_value(iter, 2) - if (type == 'group'): + if type == 'group': if x < 20: # first cell in 1st column (the arrow SINGLE clicked) if (self.tree.row_expanded(path)): self.tree.collapse_row(path) @@ -1192,8 +1192,8 @@ class RosterWindow: account = model.get_value(iter, 4) type = model.get_value(iter, 2) jid = model.get_value(iter, 3) - if (type == 'group') or (type == 'account'): - if (self.tree.row_expanded(path)): + if type == 'group' or type == 'account': + if self.tree.row_expanded(path): self.tree.collapse_row(path) else: self.tree.expand_row(path, False) diff --git a/src/tabbed_chat_window.py b/src/tabbed_chat_window.py index befd7e82d..fa79a56f8 100644 --- a/src/tabbed_chat_window.py +++ b/src/tabbed_chat_window.py @@ -132,7 +132,7 @@ class TabbedChatWindow(chat.Chat): pixbufloader.write(img_decoded) pixbuf = pixbufloader.get_pixbuf() pixbufloader.close() - scaled_buf = pixbuf.scale_simple(46, 46, gtk.gdk.INTERP_HYPER) + scaled_buf = pixbuf.scale_simple(52, 52, gtk.gdk.INTERP_HYPER) image = self.xmls[vcard['jid']].get_widget('avatar_image') image.set_from_pixbuf(scaled_buf) image.show_all() @@ -165,7 +165,7 @@ class TabbedChatWindow(chat.Chat): banner_status_image.set_from_animation(image.get_animation()) status_image.set_from_animation(image.get_animation()) elif image.get_storage_type() == gtk.IMAGE_PIXBUF: - # make a copy because one will be scaled, one not (tab icon) + # make a copy because one will be scaled, one not (tab icon) pix = image.get_pixbuf() scaled_pix = pix.scale_simple(32, 32, gtk.gdk.INTERP_BILINEAR) banner_status_image.set_from_pixbuf(scaled_pix)