diff --git a/data/gui/contact_context_menu.ui b/data/gui/contact_context_menu.ui index 463098316..dfd28cf14 100644 --- a/data/gui/contact_context_menu.ui +++ b/data/gui/contact_context_menu.ui @@ -1,147 +1,12 @@ - + - - - - True - False - gtk-dialog-authentication - 1 - - - True - False - gtk-orientation-portrait - 1 - - - True - False - gtk-info - 1 - - - True - False - gtk-dialog-question - 1 - - - True - False - gtk-go-up - 1 - - - True - False - gtk-go-down - 1 - - - True - False - gtk-stop - 1 - - - True - False - gtk-stop - 1 - - - True - False - gtk-stop - 1 - - - True - False - gtk-jump-to - 1 - - - True - False - gtk-stop - 1 - - - True - False - gtk-stop - 1 - - - True - False - gtk-add - 1 - - - True - False - gtk-remove - 1 - - - True - False - gtk-justify-fill - 1 - - - True - False - gtk-new - 1 - - - True - False - gtk-save - 1 - - - True - False - gtk-missing-image - 1 - - - True - False - gtk-missing-image - 1 - - - True - False - gtk-execute - 1 - - - True - False - gtk-properties - 1 - - - True - False - gtk-refresh - 1 - + + - False Start _Chat - False True - False True image2 False @@ -150,9 +15,7 @@ Send Single _Message... - False True - False True image3 False @@ -161,9 +24,7 @@ Send _File... - False True - False True image4 False @@ -172,9 +33,7 @@ In_vite to - False True - False True image5 False @@ -183,9 +42,7 @@ Invite _Contacts - False True - False True image1 False @@ -194,23 +51,18 @@ True - False - False True - False Toggle Open_PGP Encryption True - False True - False Toggle End to End Encryption True @@ -218,22 +70,18 @@ True - False Send Cus_tom Status - False True - False True image6 False True - False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -242,9 +90,7 @@ E_xecute Command... - False True - False True image7 False @@ -253,9 +99,7 @@ M_anage Contact - False True - False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK True image8 @@ -263,13 +107,10 @@ True - False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK _Rename... - False - False True image9 False @@ -278,8 +119,6 @@ Edit _Groups... - False - False True image10 False @@ -288,20 +127,16 @@ Assign Open_PGP Key... - False - False True image11 False - + Set Custom _Avatar... - False True - False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK True image12 @@ -311,8 +146,6 @@ Add Special _Notification... - False - False True True image13 @@ -322,27 +155,21 @@ True - False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK _Subscription - False - False True image14 False - False _Allow him/her to see my status - False True - False True image15 False @@ -351,9 +178,7 @@ A_sk to see his/her status - False True - False True image16 False @@ -362,9 +187,7 @@ _Forbid him/her to see my status - False True - False True image17 False @@ -377,9 +200,7 @@ _Unblock - False True - False True image18 False @@ -388,9 +209,7 @@ _Block - False True - False True image19 False @@ -399,8 +218,6 @@ _Unignore - False - False True True image20 @@ -410,8 +227,6 @@ _Ignore - False - False True True image21 @@ -421,8 +236,6 @@ _Add to Roster... - False - False True image22 False @@ -431,8 +244,6 @@ Remo_ve - False - False True image23 False @@ -445,14 +256,11 @@ True - False gtk-info - False - False True True accelgroup1 @@ -461,24 +269,131 @@ _History - False - False True image24 False + + True + gtk-jump-to + 1 + + + True + gtk-new + 1 + + + True + gtk-save + 1 + + + True + gtk-missing-image + 1 + True - False gtk-missing-image 1 + + True + gtk-missing-image + 1 + + + True + gtk-execute + 1 + + + True + gtk-refresh + 1 + True - False gtk-edit 1 + + True + gtk-dialog-authentication + 1 + + + True + gtk-orientation-portrait + 1 + + + True + gtk-info + 1 + + + True + gtk-go-up + 1 + + + True + gtk-go-down + 1 + + + True + gtk-stop + 1 + + + True + gtk-dialog-question + 1 + + + True + gtk-stop + 1 + + + True + gtk-stop + 1 + + + True + gtk-stop + 1 + + + True + gtk-stop + 1 + + + True + gtk-add + 1 + + + True + gtk-remove + 1 + + + True + gtk-properties + 1 + + + True + gtk-justify-fill + 1 + + diff --git a/src/conversation_textview.py b/src/conversation_textview.py index cd2dc4970..be65d2570 100644 --- a/src/conversation_textview.py +++ b/src/conversation_textview.py @@ -734,7 +734,7 @@ class ConversationTextview(GObject.GObject): menu.prepend(item) separator_menuitem_was_added = True - item = Gtk.ImageMenuItem.new_from_stock(Gtk.STOCK_CLEAR, None) + item = Gtk.ImageMenuItem(Gtk.STOCK_CLEAR) menu.prepend(item) id_ = item.connect('activate', self.clear) self.handlers[id_] = item @@ -745,14 +745,14 @@ class ConversationTextview(GObject.GObject): menu.prepend(item) if not self.used_in_history_window: - item = Gtk.MenuItem(_('Quote')) + item = Gtk.MenuItem(_('_Quote')) id_ = item.connect('activate', self.on_quote) self.handlers[id_] = item menu.prepend(item) _selected_phrase = helpers.reduce_chars_newlines( self.selected_phrase, 25, 2) - item = Gtk.MenuItem(_('Actions for "%s"') % _selected_phrase) + item = Gtk.MenuItem(_('_Actions for "%s"') % _selected_phrase) menu.prepend(item) submenu = Gtk.Menu() item.set_submenu(submenu) diff --git a/src/gui_menu_builder.py b/src/gui_menu_builder.py index 556de66a7..fabef8dc8 100644 --- a/src/gui_menu_builder.py +++ b/src/gui_menu_builder.py @@ -91,7 +91,7 @@ def build_invite_submenu(invite_menuitem, list_, ignore_rooms=[]): return invite_to_submenu = Gtk.Menu() invite_menuitem.set_submenu(invite_to_submenu) - invite_to_new_room_menuitem = Gtk.ImageMenuItem(_('New Group Chat')) + invite_to_new_room_menuitem = Gtk.ImageMenuItem(_('_New Group Chat')) icon = Gtk.Image.new_from_stock(Gtk.STOCK_NEW, Gtk.IconSize.MENU) invite_to_new_room_menuitem.set_image(icon) if len(contact_list) > 1: # several resources