From 5143fcc0dd43948d6478b9acabc0967801e40c84 Mon Sep 17 00:00:00 2001 From: Jean-Marie Traissard Date: Sun, 9 Apr 2006 16:53:09 +0000 Subject: [PATCH] Always use the same sort in the menu lists (account-actions) FIXME : in right click on account, open_new_message open a new_chat. So what do we want ? --- src/gtkgui.glade | 250 ++++++++++++++++++++++--------------------- src/roster_window.py | 16 +-- 2 files changed, 137 insertions(+), 129 deletions(-) diff --git a/src/gtkgui.glade b/src/gtkgui.glade index d65f188dc..00f5753c2 100644 --- a/src/gtkgui.glade +++ b/src/gtkgui.glade @@ -10837,26 +10837,6 @@ Custom - - - - True - _Group Chat - True - - - - True - gtk-connect - 1 - 0.5 - 0.5 - 0 - 0 - - - - @@ -10897,7 +10877,27 @@ Custom + + + + True + _Group Chat + True + + + True + gtk-connect + 1 + 0.5 + 0.5 + 0 + 0 + + + + + True @@ -16751,12 +16751,118 @@ Maybe I'll refactor later + + + True + _Modify Account... + True + + + + True + gtk-preferences + 1 + 0.5 + 0.5 + 0 + 0 + + + + + True + + + True + Send _New Message... + True + + + + True + gtk-new + 1 + 0.5 + 0.5 + 0 + 0 + + + + + + + + True + _Join New Room... + True + + + + True + gtk-connect + 1 + 0.5 + 0.5 + 0 + 0 + + + + + + + + True + + + + + + True + _Add Contact... + True + + + + True + gtk-add + 1 + 0.5 + 0.5 + 0 + 0 + + + + + + + + True + _Discover Services... + True + + + + True + gtk-find + 1 + 0.5 + 0.5 + 0 + 0 + + + + + True @@ -16774,8 +16880,8 @@ Maybe I'll refactor later 0 - - + + @@ -16849,106 +16955,6 @@ Maybe I'll refactor later - - - - True - _Modify Account... - True - - - - True - gtk-preferences - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - _Discover Services... - True - - - - True - gtk-find - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - _Add Contact... - True - - - - True - gtk-add - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - _Join New Room... - True - - - - True - gtk-connect - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - Send _New Message... - True - - - - True - gtk-new - 1 - 0.5 - 0.5 - 0 - 0 - - - - diff --git a/src/roster_window.py b/src/roster_window.py index c509b5cfe..a7d56cf91 100644 --- a/src/roster_window.py +++ b/src/roster_window.py @@ -1485,17 +1485,19 @@ class RosterWindow: childs = account_context_menu.get_children() status_menuitem = childs[0] - # we skip the separator - # skip advanced_actions_menuitem, childs[2] + edit_account_menuitem = childs[1] + # we skip the separator childs[2] + #FIXME : new_message open a new chat. So what do we want ? + new_message_menuitem = childs[3] + join_group_chat_menuitem = childs[4] + # we skip the separator childs[5] + add_contact_menuitem = childs[6] + service_discovery_menuitem = childs[7] + # skip advanced_actions_menuitem, childs[8] xml_console_menuitem = xml.get_widget('xml_console_menuitem') set_motd_menuitem = xml.get_widget('set_motd_menuitem') update_motd_menuitem = xml.get_widget('update_motd_menuitem') delete_motd_menuitem = xml.get_widget('delete_motd_menuitem') - edit_account_menuitem = childs[3] - service_discovery_menuitem = childs[4] - add_contact_menuitem = childs[5] - join_group_chat_menuitem = childs[6] - new_message_menuitem = childs[7] sub_menu = gtk.Menu() status_menuitem.set_submenu(sub_menu)