From ca6668d83e4e7b1491ef37ce1509717286c0e083 Mon Sep 17 00:00:00 2001 From: Jean-Marie Traissard Date: Wed, 12 Apr 2006 14:30:30 +0000 Subject: [PATCH] In account and systray menu, put groupchat before single so menuitems with submenus are grouped and it's easier to choose where to click. Add back disco to account menu. Use the good label for account->group chat (doesn't break string freeze) --- src/gtkgui.glade | 54 ++++++++++++++++++++++++++++++-------------- src/roster_window.py | 12 ++++++---- 2 files changed, 44 insertions(+), 22 deletions(-) diff --git a/src/gtkgui.glade b/src/gtkgui.glade index a527c7c08..8360787ef 100644 --- a/src/gtkgui.glade +++ b/src/gtkgui.glade @@ -10859,15 +10859,15 @@ Custom - + True - Send Single _Message + _Group Chat True - + True - gtk-new + gtk-connect 1 0.5 0.5 @@ -10879,15 +10879,15 @@ Custom - + True - _Group Chat + Send Single _Message True - + True - gtk-connect + gtk-new 1 0.5 0.5 @@ -16752,15 +16752,15 @@ Maybe I'll refactor later - + True - Send Single _Message... + _Group Chat True - + True - gtk-new + gtk-connect 1 0.5 0.5 @@ -16770,17 +16770,17 @@ Maybe I'll refactor later - + - + True - _Join New Room... + Send Single _Message... True - + True - gtk-connect + gtk-new 1 0.5 0.5 @@ -16811,6 +16811,26 @@ Maybe I'll refactor later + + + True + _Discover Services... + True + + + + True + gtk-find + 1 + 0.5 + 0.5 + 0 + 0 + + + + + True diff --git a/src/roster_window.py b/src/roster_window.py index 9b21cdf2b..0cf220b2e 100644 --- a/src/roster_window.py +++ b/src/roster_window.py @@ -1497,11 +1497,11 @@ class RosterWindow: childs = account_context_menu.get_children() status_menuitem = childs[0] - new_message_menuitem = childs[1] - join_group_chat_menuitem = childs[2] + join_group_chat_menuitem = childs[1] + new_message_menuitem = childs[2] add_contact_menuitem = childs[3] - edit_account_menuitem = childs[4] - + service_discovery_menuitem = childs[4] + edit_account_menuitem = childs[5] sub_menu = gtk.Menu() status_menuitem.set_submenu(sub_menu) @@ -1535,6 +1535,8 @@ class RosterWindow: edit_account_menuitem.connect('activate', self.on_edit_account, account) add_contact_menuitem.connect('activate', self.on_add_new_contact, account) + service_discovery_menuitem.connect('activate', + self.on_service_disco_menuitem_activate, account) gc_sub_menu = gtk.Menu() # gc is always a submenu join_group_chat_menuitem.set_submenu(gc_sub_menu) @@ -1544,7 +1546,7 @@ class RosterWindow: # make some items insensitive if account is offline if gajim.connections[account].connected < 2: - for widget in [add_contact_menuitem, + for widget in [add_contact_menuitem, service_discovery_menuitem, join_group_chat_menuitem, new_message_menuitem]: widget.set_sensitive(False)