changeset a4cc671c889a in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=a4cc671c889a description: fix contact submenu
diffstat:
data/gui/contact_context_menu.ui | 315 ++++++++++++++++++++++++-------------- src/conversation_textview.py | 6 +- src/gui_menu_builder.py | 2 +- 3 files changed, 204 insertions(+), 119 deletions(-)
diffs (truncated from 611 to 300 lines):
diff -r 77bddf457c8e -r a4cc671c889a data/gui/contact_context_menu.ui --- a/data/gui/contact_context_menu.ui Mon Jan 07 00:20:18 2013 +0400 +++ b/data/gui/contact_context_menu.ui Mon Jan 07 01:07:08 2013 +0400 @@ -1,12 +1,147 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <interface> - <requires lib="gtk+" version="2.16"/> - <!-- interface-naming-policy toplevel-contextual --> + <!-- interface-requires gtk+ 3.0 --> + <object class="GtkAccelGroup" id="accelgroup1"/> + <object class="GtkImage" id="image11"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-dialog-authentication</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image12"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-orientation-portrait</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image13"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-info</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image14"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-dialog-question</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image15"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-go-up</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image16"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-go-down</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image17"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-stop</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image18"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-stop</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image19"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-stop</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-jump-to</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image20"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-stop</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image21"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-stop</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image22"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-add</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image23"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-remove</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image24"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-justify-fill</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-new</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-save</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-missing-image</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-missing-image</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image7"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-execute</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image8"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-properties</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image9"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-refresh</property> + <property name="icon-size">1</property> + </object> <object class="GtkMenu" id="contact_context_menu"> + <property name="can_focus">False</property> <child> <object class="GtkImageMenuItem" id="start_chat_menuitem"> <property name="label" translatable="yes">Start _Chat</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="image">image2</property> <property name="use_stock">False</property> @@ -15,7 +150,9 @@ <child> <object class="GtkImageMenuItem" id="send_single_message_menuitem"> <property name="label" translatable="yes">Send Single _Message...</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="image">image3</property> <property name="use_stock">False</property> @@ -24,7 +161,9 @@ <child> <object class="GtkImageMenuItem" id="send_file_menuitem"> <property name="label" translatable="yes">Send _File...</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="image">image4</property> <property name="use_stock">False</property> @@ -33,7 +172,9 @@ <child> <object class="GtkImageMenuItem" id="invite_menuitem"> <property name="label" translatable="yes">In_vite to</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="image">image5</property> <property name="use_stock">False</property> @@ -42,7 +183,9 @@ <child> <object class="GtkImageMenuItem" id="convert_to_groupchat_menuitem"> <property name="label" translatable="yes">Invite _Contacts</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="image">image1</property> <property name="use_stock">False</property> @@ -51,18 +194,23 @@ <child> <object class="GtkSeparatorMenuItem" id="encryption_separator"> <property name="visible">True</property> + <property name="can_focus">False</property> </object> </child> <child> <object class="GtkCheckMenuItem" id="toggle_gpg_menuitem"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">Toggle Open_PGP Encryption</property> <property name="use_underline">True</property> </object> </child> <child> <object class="GtkCheckMenuItem" id="toggle_e2e_menuitem"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">Toggle End to End Encryption</property> <property name="use_underline">True</property> </object> @@ -70,18 +218,22 @@ <child> <object class="GtkSeparatorMenuItem" id="menuitem3"> <property name="visible">True</property> + <property name="can_focus">False</property> </object> </child> <child> <object class="GtkImageMenuItem" id="send_custom_status_menuitem"> <property name="label" translatable="yes">Send Cus_tom Status</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="image">image6</property> <property name="use_stock">False</property> <child type="submenu"> <object class="GtkMenu" id="menu5"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> </object> </child> @@ -90,7 +242,9 @@ <child> <object class="GtkImageMenuItem" id="execute_command_menuitem"> <property name="label" translatable="yes">E_xecute Command...</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="image">image7</property> <property name="use_stock">False</property> @@ -99,7 +253,9 @@ <child> <object class="GtkImageMenuItem" id="manage_contact"> <property name="label" translatable="yes">M_anage Contact</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="use_underline">True</property> <property name="image">image8</property> @@ -107,10 +263,13 @@ <child type="submenu"> <object class="GtkMenu" id="menu2"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <child> <object class="GtkImageMenuItem" id="rename_menuitem"> <property name="label" translatable="yes">_Rename...</property> + <property name="use_action_appearance">False</property> + <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="image">image9</property> <property name="use_stock">False</property> @@ -119,6 +278,8 @@ <child> <object class="GtkImageMenuItem" id="edit_groups_menuitem"> <property name="label" translatable="yes">Edit _Groups...</property> + <property name="use_action_appearance">False</property> + <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="image">image10</property> <property name="use_stock">False</property> @@ -127,16 +288,20 @@ <child> <object class="GtkImageMenuItem" id="assign_openpgp_key_menuitem"> <property name="label" translatable="yes">Assign Open_PGP Key...</property> + <property name="use_action_appearance">False</property> + <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="image">image11</property> <property name="use_stock">False</property> - <signal name="activate" handler="on_assign_openpgp_key_menuitem_activate"/> + <signal name="activate" handler="on_assign_openpgp_key_menuitem_activate" swapped="no"/> </object> </child> <child> <object class="GtkImageMenuItem" id="set_custom_avatar_menuitem"> <property name="label" translatable="yes">Set Custom _Avatar...</property>