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 ?
This commit is contained in:
Jean-Marie Traissard
parent
e3c9a07aaa
commit
5143fcc0dd
246
src/gtkgui.glade
246
src/gtkgui.glade
|
|
@ -10838,26 +10838,6 @@ Custom</property>
|
||||||
</widget>
|
</widget>
|
||||||
</child>
|
</child>
|
||||||
|
|
||||||
<child>
|
|
||||||
<widget class="GtkImageMenuItem" id="join_gc_menuitem">
|
|
||||||
<property name="visible">True</property>
|
|
||||||
<property name="label" translatable="yes">_Group Chat</property>
|
|
||||||
<property name="use_underline">True</property>
|
|
||||||
|
|
||||||
<child internal-child="image">
|
|
||||||
<widget class="GtkImage" id="image1445">
|
|
||||||
<property name="visible">True</property>
|
|
||||||
<property name="stock">gtk-connect</property>
|
|
||||||
<property name="icon_size">1</property>
|
|
||||||
<property name="xalign">0.5</property>
|
|
||||||
<property name="yalign">0.5</property>
|
|
||||||
<property name="xpad">0</property>
|
|
||||||
<property name="ypad">0</property>
|
|
||||||
</widget>
|
|
||||||
</child>
|
|
||||||
</widget>
|
|
||||||
</child>
|
|
||||||
|
|
||||||
<child>
|
<child>
|
||||||
<widget class="GtkImageMenuItem" id="chat_with_menuitem">
|
<widget class="GtkImageMenuItem" id="chat_with_menuitem">
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
|
|
@ -10898,6 +10878,26 @@ Custom</property>
|
||||||
</widget>
|
</widget>
|
||||||
</child>
|
</child>
|
||||||
|
|
||||||
|
<child>
|
||||||
|
<widget class="GtkImageMenuItem" id="join_gc_menuitem">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="label" translatable="yes">_Group Chat</property>
|
||||||
|
<property name="use_underline">True</property>
|
||||||
|
|
||||||
|
<child internal-child="image">
|
||||||
|
<widget class="GtkImage" id="image1445">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="stock">gtk-connect</property>
|
||||||
|
<property name="icon_size">1</property>
|
||||||
|
<property name="xalign">0.5</property>
|
||||||
|
<property name="yalign">0.5</property>
|
||||||
|
<property name="xpad">0</property>
|
||||||
|
<property name="ypad">0</property>
|
||||||
|
</widget>
|
||||||
|
</child>
|
||||||
|
</widget>
|
||||||
|
</child>
|
||||||
|
|
||||||
<child>
|
<child>
|
||||||
<widget class="GtkSeparatorMenuItem" id="separator12">
|
<widget class="GtkSeparatorMenuItem" id="separator12">
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
|
|
@ -16751,12 +16751,118 @@ Maybe I'll refactor later</property>
|
||||||
</widget>
|
</widget>
|
||||||
</child>
|
</child>
|
||||||
|
|
||||||
|
<child>
|
||||||
|
<widget class="GtkImageMenuItem" id="edit_account_menuitem">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="label" translatable="yes">_Modify Account...</property>
|
||||||
|
<property name="use_underline">True</property>
|
||||||
|
|
||||||
|
<child internal-child="image">
|
||||||
|
<widget class="GtkImage" id="image1231">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="stock">gtk-preferences</property>
|
||||||
|
<property name="icon_size">1</property>
|
||||||
|
<property name="xalign">0.5</property>
|
||||||
|
<property name="yalign">0.5</property>
|
||||||
|
<property name="xpad">0</property>
|
||||||
|
<property name="ypad">0</property>
|
||||||
|
</widget>
|
||||||
|
</child>
|
||||||
|
</widget>
|
||||||
|
</child>
|
||||||
|
|
||||||
<child>
|
<child>
|
||||||
<widget class="GtkSeparatorMenuItem" id="separator7">
|
<widget class="GtkSeparatorMenuItem" id="separator7">
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
</widget>
|
</widget>
|
||||||
</child>
|
</child>
|
||||||
|
|
||||||
|
<child>
|
||||||
|
<widget class="GtkImageMenuItem" id="new_message_menuitem">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="label" translatable="yes">Send _New Message...</property>
|
||||||
|
<property name="use_underline">True</property>
|
||||||
|
|
||||||
|
<child internal-child="image">
|
||||||
|
<widget class="GtkImage" id="image1235">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="stock">gtk-new</property>
|
||||||
|
<property name="icon_size">1</property>
|
||||||
|
<property name="xalign">0.5</property>
|
||||||
|
<property name="yalign">0.5</property>
|
||||||
|
<property name="xpad">0</property>
|
||||||
|
<property name="ypad">0</property>
|
||||||
|
</widget>
|
||||||
|
</child>
|
||||||
|
</widget>
|
||||||
|
</child>
|
||||||
|
|
||||||
|
<child>
|
||||||
|
<widget class="GtkImageMenuItem" id="join_group_chat_menuitem">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="label" translatable="yes">_Join New Room...</property>
|
||||||
|
<property name="use_underline">True</property>
|
||||||
|
|
||||||
|
<child internal-child="image">
|
||||||
|
<widget class="GtkImage" id="image1234">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="stock">gtk-connect</property>
|
||||||
|
<property name="icon_size">1</property>
|
||||||
|
<property name="xalign">0.5</property>
|
||||||
|
<property name="yalign">0.5</property>
|
||||||
|
<property name="xpad">0</property>
|
||||||
|
<property name="ypad">0</property>
|
||||||
|
</widget>
|
||||||
|
</child>
|
||||||
|
</widget>
|
||||||
|
</child>
|
||||||
|
|
||||||
|
<child>
|
||||||
|
<widget class="GtkSeparatorMenuItem" id="separator_before_add">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
</widget>
|
||||||
|
</child>
|
||||||
|
|
||||||
|
<child>
|
||||||
|
<widget class="GtkImageMenuItem" id="add_contact_menuitem">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="label" translatable="yes">_Add Contact...</property>
|
||||||
|
<property name="use_underline">True</property>
|
||||||
|
|
||||||
|
<child internal-child="image">
|
||||||
|
<widget class="GtkImage" id="image1233">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="stock">gtk-add</property>
|
||||||
|
<property name="icon_size">1</property>
|
||||||
|
<property name="xalign">0.5</property>
|
||||||
|
<property name="yalign">0.5</property>
|
||||||
|
<property name="xpad">0</property>
|
||||||
|
<property name="ypad">0</property>
|
||||||
|
</widget>
|
||||||
|
</child>
|
||||||
|
</widget>
|
||||||
|
</child>
|
||||||
|
|
||||||
|
<child>
|
||||||
|
<widget class="GtkImageMenuItem" id="service_discovery_menuitem">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="label" translatable="yes">_Discover Services...</property>
|
||||||
|
<property name="use_underline">True</property>
|
||||||
|
|
||||||
|
<child internal-child="image">
|
||||||
|
<widget class="GtkImage" id="image1232">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="stock">gtk-find</property>
|
||||||
|
<property name="icon_size">1</property>
|
||||||
|
<property name="xalign">0.5</property>
|
||||||
|
<property name="yalign">0.5</property>
|
||||||
|
<property name="xpad">0</property>
|
||||||
|
<property name="ypad">0</property>
|
||||||
|
</widget>
|
||||||
|
</child>
|
||||||
|
</widget>
|
||||||
|
</child>
|
||||||
|
|
||||||
<child>
|
<child>
|
||||||
<widget class="GtkImageMenuItem" id="advanced_actions_menuitem">
|
<widget class="GtkImageMenuItem" id="advanced_actions_menuitem">
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
|
|
@ -16849,106 +16955,6 @@ Maybe I'll refactor later</property>
|
||||||
</child>
|
</child>
|
||||||
</widget>
|
</widget>
|
||||||
</child>
|
</child>
|
||||||
|
|
||||||
<child>
|
|
||||||
<widget class="GtkImageMenuItem" id="edit_account_menuitem">
|
|
||||||
<property name="visible">True</property>
|
|
||||||
<property name="label" translatable="yes">_Modify Account...</property>
|
|
||||||
<property name="use_underline">True</property>
|
|
||||||
|
|
||||||
<child internal-child="image">
|
|
||||||
<widget class="GtkImage" id="image1231">
|
|
||||||
<property name="visible">True</property>
|
|
||||||
<property name="stock">gtk-preferences</property>
|
|
||||||
<property name="icon_size">1</property>
|
|
||||||
<property name="xalign">0.5</property>
|
|
||||||
<property name="yalign">0.5</property>
|
|
||||||
<property name="xpad">0</property>
|
|
||||||
<property name="ypad">0</property>
|
|
||||||
</widget>
|
|
||||||
</child>
|
|
||||||
</widget>
|
|
||||||
</child>
|
|
||||||
|
|
||||||
<child>
|
|
||||||
<widget class="GtkImageMenuItem" id="service_discovery_menuitem">
|
|
||||||
<property name="visible">True</property>
|
|
||||||
<property name="label" translatable="yes">_Discover Services...</property>
|
|
||||||
<property name="use_underline">True</property>
|
|
||||||
|
|
||||||
<child internal-child="image">
|
|
||||||
<widget class="GtkImage" id="image1232">
|
|
||||||
<property name="visible">True</property>
|
|
||||||
<property name="stock">gtk-find</property>
|
|
||||||
<property name="icon_size">1</property>
|
|
||||||
<property name="xalign">0.5</property>
|
|
||||||
<property name="yalign">0.5</property>
|
|
||||||
<property name="xpad">0</property>
|
|
||||||
<property name="ypad">0</property>
|
|
||||||
</widget>
|
|
||||||
</child>
|
|
||||||
</widget>
|
|
||||||
</child>
|
|
||||||
|
|
||||||
<child>
|
|
||||||
<widget class="GtkImageMenuItem" id="add_contact_menuitem">
|
|
||||||
<property name="visible">True</property>
|
|
||||||
<property name="label" translatable="yes">_Add Contact...</property>
|
|
||||||
<property name="use_underline">True</property>
|
|
||||||
|
|
||||||
<child internal-child="image">
|
|
||||||
<widget class="GtkImage" id="image1233">
|
|
||||||
<property name="visible">True</property>
|
|
||||||
<property name="stock">gtk-add</property>
|
|
||||||
<property name="icon_size">1</property>
|
|
||||||
<property name="xalign">0.5</property>
|
|
||||||
<property name="yalign">0.5</property>
|
|
||||||
<property name="xpad">0</property>
|
|
||||||
<property name="ypad">0</property>
|
|
||||||
</widget>
|
|
||||||
</child>
|
|
||||||
</widget>
|
|
||||||
</child>
|
|
||||||
|
|
||||||
<child>
|
|
||||||
<widget class="GtkImageMenuItem" id="join_group_chat_menuitem">
|
|
||||||
<property name="visible">True</property>
|
|
||||||
<property name="label" translatable="yes">_Join New Room...</property>
|
|
||||||
<property name="use_underline">True</property>
|
|
||||||
|
|
||||||
<child internal-child="image">
|
|
||||||
<widget class="GtkImage" id="image1234">
|
|
||||||
<property name="visible">True</property>
|
|
||||||
<property name="stock">gtk-connect</property>
|
|
||||||
<property name="icon_size">1</property>
|
|
||||||
<property name="xalign">0.5</property>
|
|
||||||
<property name="yalign">0.5</property>
|
|
||||||
<property name="xpad">0</property>
|
|
||||||
<property name="ypad">0</property>
|
|
||||||
</widget>
|
|
||||||
</child>
|
|
||||||
</widget>
|
|
||||||
</child>
|
|
||||||
|
|
||||||
<child>
|
|
||||||
<widget class="GtkImageMenuItem" id="new_message_menuitem">
|
|
||||||
<property name="visible">True</property>
|
|
||||||
<property name="label" translatable="yes">Send _New Message...</property>
|
|
||||||
<property name="use_underline">True</property>
|
|
||||||
|
|
||||||
<child internal-child="image">
|
|
||||||
<widget class="GtkImage" id="image1235">
|
|
||||||
<property name="visible">True</property>
|
|
||||||
<property name="stock">gtk-new</property>
|
|
||||||
<property name="icon_size">1</property>
|
|
||||||
<property name="xalign">0.5</property>
|
|
||||||
<property name="yalign">0.5</property>
|
|
||||||
<property name="xpad">0</property>
|
|
||||||
<property name="ypad">0</property>
|
|
||||||
</widget>
|
|
||||||
</child>
|
|
||||||
</widget>
|
|
||||||
</child>
|
|
||||||
</widget>
|
</widget>
|
||||||
|
|
||||||
<widget class="GtkWindow" id="xml_console_window">
|
<widget class="GtkWindow" id="xml_console_window">
|
||||||
|
|
|
||||||
|
|
@ -1485,17 +1485,19 @@ class RosterWindow:
|
||||||
childs = account_context_menu.get_children()
|
childs = account_context_menu.get_children()
|
||||||
|
|
||||||
status_menuitem = childs[0]
|
status_menuitem = childs[0]
|
||||||
# we skip the separator
|
edit_account_menuitem = childs[1]
|
||||||
# skip advanced_actions_menuitem, childs[2]
|
# 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')
|
xml_console_menuitem = xml.get_widget('xml_console_menuitem')
|
||||||
set_motd_menuitem = xml.get_widget('set_motd_menuitem')
|
set_motd_menuitem = xml.get_widget('set_motd_menuitem')
|
||||||
update_motd_menuitem = xml.get_widget('update_motd_menuitem')
|
update_motd_menuitem = xml.get_widget('update_motd_menuitem')
|
||||||
delete_motd_menuitem = xml.get_widget('delete_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()
|
sub_menu = gtk.Menu()
|
||||||
status_menuitem.set_submenu(sub_menu)
|
status_menuitem.set_submenu(sub_menu)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue