diff --git a/src/config.py b/src/config.py index 8ae4eddf9..fd140b19d 100644 --- a/src/config.py +++ b/src/config.py @@ -422,7 +422,7 @@ class Preferences_window: def on_preferences_window_show(self, widget): self.notebook.set_current_page(0) - + ''' theme_combobox = self.xml.get_widget('theme_combobox') model = theme_combobox.get_model() active = theme_combobox.get_active() @@ -432,6 +432,7 @@ class Preferences_window: fonts_colors_table.show() else: fonts_colors_table.hide() + ''' def on_preferences_window_key_press_event(self, widget, event): if event.keyval == gtk.keysyms.Escape: @@ -557,6 +558,7 @@ class Preferences_window: model = widget.get_model() active = widget.get_active() theme = model[active][0] + ''' fonts_colors_table = self.xml.get_widget('fonts_colors_table') if theme == 'custom': fonts_colors_table.show() @@ -578,6 +580,7 @@ class Preferences_window: else: widg.set_font_name(self.theme_default[theme][font_widgets[w]]) self.on_widget_font_set(widg, font_widgets[w]) + ''' gajim.config.set('roster_theme', theme) # begin repainting themed widgets throughout diff --git a/src/gtkgui.glade b/src/gtkgui.glade index 80fbb3a1e..4e29b0074 100644 --- a/src/gtkgui.glade +++ b/src/gtkgui.glade @@ -2930,17 +2930,6 @@ - - - True - - - 0 - False - True - - - True @@ -2979,341 +2968,84 @@ True - - - 0 - False - True - - - - - - True - 4 - 4 - False - 6 - 12 - - True - Account: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - Group: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 1 - 2 - 3 - fill - - - - - - - True - Contact: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 1 - 3 - 4 - fill - - - - - - + True True - True - True - False - False + GTK_RELIEF_NORMAL True - - - - 2 - 3 - 1 - 2 - fill - - - - - - True - True - True - True - False - False - True - - - - 2 - 3 - 2 - 3 - fill - - - + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 - - - True - True - True - True - False - False - True - - - - 2 - 3 - 3 - 4 - fill - - - + + + True + False + 2 - - - True - Text color - False - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - - - 1 - 2 - 0 - 1 - fill - - - + + + True + gtk-edit + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + - - - True - Text font - False - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 + + + True + Edit... + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + - 2 - 3 - 0 - 1 - fill - - - - - - - True - Background color - False - False - GTK_JUSTIFY_CENTER - True - False - 0.5 - 0.5 - 0 - 0 - - - 3 - 4 - 0 - 1 - fill - - - - - - - True - True - False - True - - - - 3 - 4 - 1 - 2 - - - - - - - - True - True - False - True - - - - 3 - 4 - 2 - 3 - - - - - - - - True - True - False - True - - - - 3 - 4 - 3 - 4 - - - - - - - - True - True - False - True - - - - 1 - 2 - 1 - 2 - - - - - - - - True - True - False - True - - - - 1 - 2 - 2 - 3 - - - - - - - - True - True - False - True - - - - 1 - 2 - 3 - 4 - - + 0 + False + False 0 - True + False True @@ -13440,26 +13172,78 @@ the Jabber network. True False - 6 + 12 - + True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT + False + 6 - + True True - False - False - False - True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + True + True + False + False + False + True + + + + 0 + True + True + + + + + + True + GTK_BUTTONBOX_DEFAULT_STYLE + 6 + + + + True + True + True + gtk-add + True + GTK_RELIEF_NORMAL + True + + + + + + + True + True + True + gtk-remove + True + GTK_RELIEF_NORMAL + True + + + + + + 0 + False + True + @@ -13659,7 +13443,7 @@ the Jabber network. - + True If checked, Gajim will join this groupchat on startup True @@ -13670,6 +13454,7 @@ the Jabber network. False False True + 0 @@ -13699,18 +13484,31 @@ the Jabber network. True GTK_BUTTONBOX_END - 0 + 12 - + True True True - gtk-close + gtk-cancel True GTK_RELIEF_NORMAL True - + + + + + + + True + True + True + gtk-ok + True + GTK_RELIEF_NORMAL + True + @@ -14289,4 +14087,564 @@ the Jabber network. + + 6 + True + Roster Themes Customization + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + True + False + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST + + + + True + False + 0 + + + + True + False + 12 + + + + True + False + 6 + + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + True + True + False + False + False + True + + + + + 0 + True + True + + + + + + True + GTK_BUTTONBOX_DEFAULT_STYLE + 6 + + + + True + True + True + gtk-add + True + GTK_RELIEF_NORMAL + True + + + + + + True + True + True + gtk-remove + True + GTK_RELIEF_NORMAL + True + + + + + 0 + False + True + + + + + 0 + True + True + + + + + + True + 5 + 4 + False + 6 + 12 + + + + True + Account: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 1 + 2 + fill + + + + + + + True + Group: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 2 + 3 + fill + + + + + + + True + Contact: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 3 + 4 + fill + + + + + + + True + True + True + True + False + False + True + + + + 2 + 3 + 1 + 2 + fill + + + + + + + True + True + True + True + False + False + True + + + + 2 + 3 + 2 + 3 + fill + + + + + + + True + True + True + True + False + False + True + + + + 2 + 3 + 3 + 4 + fill + + + + + + + True + Text color + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + 1 + 2 + 0 + 1 + fill + + + + + + + True + Text font + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + 2 + 3 + 0 + 1 + fill + + + + + + + True + Background color + False + False + GTK_JUSTIFY_CENTER + True + False + 0.5 + 0.5 + 0 + 0 + + + 3 + 4 + 0 + 1 + fill + + + + + + + True + True + False + True + + + + 3 + 4 + 1 + 2 + + + + + + + + True + True + False + True + + + + 3 + 4 + 2 + 3 + + + + + + + + True + True + False + True + + + + 3 + 4 + 3 + 4 + + + + + + + + True + True + False + True + + + + 1 + 2 + 1 + 2 + + + + + + + + True + True + False + True + + + + 1 + 2 + 2 + 3 + + + + + + + + True + True + False + True + + + + 1 + 2 + 3 + 4 + + + + + + + + True + True + True + True + False + False + True + + + + 2 + 3 + 4 + 5 + fill + + + + + + + + 3 + 4 + 4 + 5 + + + + + + + + + 1 + 2 + 4 + 5 + + + + + + + + True + The bar line which is on top of chat windows + True + False + + + + True + Banner: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + + + 0 + 1 + 4 + 5 + fill + + + + + + 0 + True + True + + + + + 0 + False + True + + + + + + True + GTK_BUTTONBOX_END + 0 + + + + True + True + True + gtk-close + True + GTK_RELIEF_NORMAL + True + + + + + 0 + False + True + + + + + + diff --git a/src/roster_window.py b/src/roster_window.py index 501ec13a7..b003c9715 100644 --- a/src/roster_window.py +++ b/src/roster_window.py @@ -305,7 +305,11 @@ class Roster_window: for account in gajim.connections: our_jid = gajim.config.get_per('accounts', account, 'name') + '@' +\ gajim.config.get_per('accounts', account, 'hostname') - item = gtk.MenuItem(_('as ') + our_jid) + lbl = gtk.Label() + lbl.set_markup('abc') + item = gtk.MenuItem() + item.add(lbl) + #item = gtk.MenuItem(_('as ') + our_jid) sub_menu.append(item) item.connect('activate', self.on_join_gc_activate, account) sub_menu.show_all()