From 308f4c4a95e15e5d5e4a70a6c1d0f9e048bd50bd Mon Sep 17 00:00:00 2001 From: Denis Fomin Date: Tue, 22 Oct 2013 13:43:34 +0400 Subject: [PATCH] [Darlan] Add/Remove ... Fixes #7519 --- data/gui/account_context_menu.ui | 4 +-- data/gui/roster_window.ui | 57 ++++++++------------------------ data/gui/systray_context_menu.ui | 4 +-- src/roster_window.py | 4 +-- 4 files changed, 20 insertions(+), 49 deletions(-) diff --git a/data/gui/account_context_menu.ui b/data/gui/account_context_menu.ui index a2840e785..0924fb7de 100644 --- a/data/gui/account_context_menu.ui +++ b/data/gui/account_context_menu.ui @@ -40,7 +40,7 @@ - Join _Group Chat... + Join _Group Chat True True image4 @@ -93,7 +93,7 @@ - _Modify Account + _Modify Account... True True image8 diff --git a/data/gui/roster_window.ui b/data/gui/roster_window.ui index 81259d8fc..abbc712fa 100644 --- a/data/gui/roster_window.ui +++ b/data/gui/roster_window.ui @@ -2,12 +2,6 @@ - - True - False - gtk-jump-to - 1 - True False @@ -26,6 +20,18 @@ gtk-properties 1 + + True + False + gtk-justify-fill + 1 + + + True + False + gtk-jump-to + 1 + True False @@ -80,12 +86,6 @@ gtk-save 1 - - True - False - gtk-justify-fill - 1 - 85 200 @@ -112,7 +112,6 @@ False - False True False _Actions @@ -123,8 +122,7 @@ False - _Start Chat... - False + _Start Chat True False True @@ -136,7 +134,6 @@ Send Single _Message... - False False True image2 @@ -146,8 +143,7 @@ - Join _Group Chat... - False + Join _Group Chat True False True @@ -165,7 +161,6 @@ Add _Contact... - False True False True @@ -177,7 +172,6 @@ _Discover Services - False True False True @@ -188,7 +182,6 @@ - False True False _Advanced @@ -204,7 +197,6 @@ gtk-quit - False True False True @@ -220,7 +212,6 @@ - False True False _Edit @@ -232,7 +223,6 @@ _Accounts - False True False True @@ -246,7 +236,6 @@ Profile, A_vatar - False True False True @@ -264,7 +253,6 @@ gtk-preferences - False True False True @@ -277,7 +265,6 @@ P_lugins - False True False True @@ -292,7 +279,6 @@ - False True False _View @@ -303,7 +289,6 @@ False - False True False Show _Offline Contacts @@ -314,7 +299,6 @@ - False True False Show Only _Active Contacts @@ -325,7 +309,6 @@ - False True False Show T_ransports @@ -335,7 +318,6 @@ - False True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -355,7 +337,6 @@ File _Transfers - False True False True @@ -369,7 +350,6 @@ _History - False True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -386,7 +366,6 @@ - False True False _Help @@ -397,7 +376,6 @@ _Contents - False True False Help online @@ -411,7 +389,6 @@ _FAQ - False True False Frequently Asked Questions (online) @@ -425,7 +402,6 @@ Keyboard Shortcuts - False True False True @@ -443,7 +419,6 @@ Fea_tures - False True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -457,7 +432,6 @@ gtk-about - False True False True @@ -524,9 +498,6 @@ - - - diff --git a/data/gui/systray_context_menu.ui b/data/gui/systray_context_menu.ui index f502dbcdb..12cbcc938 100644 --- a/data/gui/systray_context_menu.ui +++ b/data/gui/systray_context_menu.ui @@ -25,7 +25,7 @@ - _Group Chat + Join _Group Chat True True image3 @@ -35,7 +35,7 @@ - Send Single _Message + Send Single _Message... True True image4 diff --git a/src/roster_window.py b/src/roster_window.py index 9a1d856bf..a4cd41ea5 100644 --- a/src/roster_window.py +++ b/src/roster_window.py @@ -6014,7 +6014,7 @@ class RosterWindow: menu = Gtk.Menu() # Send single message - item = Gtk.ImageMenuItem.new_with_mnemonic(_('Send Single Message')) + item = Gtk.ImageMenuItem.new_with_mnemonic(_('Send Single Message...')) icon = Gtk.Image.new_from_stock(Gtk.STOCK_NEW, Gtk.IconSize.MENU) item.set_image(icon) item.connect('activate', @@ -6065,7 +6065,7 @@ class RosterWindow: menu.append(item) # Execute Command - item = Gtk.ImageMenuItem.new_with_mnemonic(_('Execute Command...')) + item = Gtk.ImageMenuItem.new_with_mnemonic(_('E_xecute Command...')) icon = Gtk.Image.new_from_stock(Gtk.STOCK_EXECUTE, Gtk.IconSize.MENU) item.set_image(icon) menu.append(item)