copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Backed out changeset: a4cc671c889a

This commit is contained in:
Denis Fomin 2013-01-08 14:54:11 +04:00
parent bf5c8248b2
commit 224284f735
3 changed files with 119 additions and 204 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

315
data/gui/contact_context_menu.ui
View File

@ -1,147 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0"?>
<interface>
<!-- 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>
<requires lib="gtk+" version="2.16"/>
<!-- interface-naming-policy toplevel-contextual -->
<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>
@ -150,9 +15,7 @@
<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>
@ -161,9 +24,7 @@
<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>
@ -172,9 +33,7 @@
<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>
@ -183,9 +42,7 @@
<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>
@ -194,23 +51,18 @@
<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>
@ -218,22 +70,18 @@
<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>
@ -242,9 +90,7 @@
<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>
@ -253,9 +99,7 @@
<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>
@ -263,13 +107,10 @@
<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>
@ -278,8 +119,6 @@
<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>
@ -288,20 +127,16 @@
<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" swapped="no"/>
<signal name="activate" handler="on_assign_openpgp_key_menuitem_activate"/>
</object>
</child>
<child>
<object class="GtkImageMenuItem" id="set_custom_avatar_menuitem">
<property name="label" translatable="yes">Set Custom _Avatar...</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">image12</property>
@ -311,8 +146,6 @@
<child>
<object class="GtkImageMenuItem" id="add_special_notification_menuitem">
<property name="label" translatable="yes">Add Special _Notification...</property>
<property name="use_action_appearance">False</property>
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
<property name="use_underline">True</property>
<property name="image">image13</property>
@ -322,27 +155,21 @@
<child>
<object class="GtkSeparatorMenuItem" id="separatormenuitem1">
<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>
<child>
<object class="GtkImageMenuItem" id="subscription_menuitem">
<property name="label" translatable="yes">_Subscription</property>
<property name="use_action_appearance">False</property>
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="image">image14</property>
<property name="use_stock">False</property>
<child type="submenu">
<object class="GtkMenu" id="subscription_menuitem_menu">
<property name="can_focus">False</property>
<child>
<object class="GtkImageMenuItem" id="resend_authorization_to_menuitem">
<property name="label" translatable="yes">_Allow him/her to see my 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">image15</property>
<property name="use_stock">False</property>
@ -351,9 +178,7 @@
<child>
<object class="GtkImageMenuItem" id="rerequest_authorization_from_menuitem">
<property name="label" translatable="yes">A_sk to see his/her 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">image16</property>
<property name="use_stock">False</property>
@ -362,9 +187,7 @@
<child>
<object class="GtkImageMenuItem" id="forbid_him/her_to_see_my_status1">
<property name="label" translatable="yes">_Forbid him/her to see my 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">image17</property>
<property name="use_stock">False</property>
@ -377,9 +200,7 @@
<child>
<object class="GtkImageMenuItem" id="unblock_menuitem">
<property name="label" translatable="yes">_Unblock</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">image18</property>
<property name="use_stock">False</property>
@ -388,9 +209,7 @@
<child>
<object class="GtkImageMenuItem" id="block_menuitem">
<property name="label" translatable="yes">_Block</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">image19</property>
<property name="use_stock">False</property>
@ -399,8 +218,6 @@
<child>
<object class="GtkImageMenuItem" id="unignore_menuitem">
<property name="label" translatable="yes">_Unignore</property>
<property name="use_action_appearance">False</property>
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
<property name="use_underline">True</property>
<property name="image">image20</property>
@ -410,8 +227,6 @@
<child>
<object class="GtkImageMenuItem" id="ignore_menuitem">
<property name="label" translatable="yes">_Ignore</property>
<property name="use_action_appearance">False</property>
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
<property name="use_underline">True</property>
<property name="image">image21</property>
@ -421,8 +236,6 @@
<child>
<object class="GtkImageMenuItem" id="add_to_roster_menuitem">
<property name="label" translatable="yes">_Add to Roster...</property>
<property name="use_action_appearance">False</property>
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="image">image22</property>
<property name="use_stock">False</property>
@ -431,8 +244,6 @@
<child>
<object class="GtkImageMenuItem" id="remove_from_roster_menuitem">
<property name="label" translatable="yes">Remo_ve</property>
<property name="use_action_appearance">False</property>
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="image">image23</property>
<property name="use_stock">False</property>
@ -445,14 +256,11 @@
<child>
<object class="GtkSeparatorMenuItem" id="last_separator">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
</child>
<child>
<object class="GtkImageMenuItem" id="information_menuitem">
<property name="label">gtk-info</property>
<property name="use_action_appearance">False</property>
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="accel_group">accelgroup1</property>
@ -461,24 +269,131 @@
<child>
<object class="GtkImageMenuItem" id="history_menuitem">
<property name="label" translatable="yes">_History</property>
<property name="use_action_appearance">False</property>
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="image">image24</property>
<property name="use_stock">False</property>
</object>
</child>
</object>
<object class="GtkImage" id="image2">
<property name="visible">True</property>
<property name="stock">gtk-jump-to</property>
<property name="icon-size">1</property>
</object>
<object class="GtkImage" id="image3">
<property name="visible">True</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="stock">gtk-save</property>
<property name="icon-size">1</property>
</object>
<object class="GtkImage" id="image5">
<property name="visible">True</property>
<property name="stock">gtk-missing-image</property>
<property name="icon-size">1</property>
</object>
<object class="GtkImage" id="image1">
<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="stock">gtk-missing-image</property>
<property name="icon-size">1</property>
</object>
<object class="GtkImage" id="image7">
<property name="visible">True</property>
<property name="stock">gtk-execute</property>
<property name="icon-size">1</property>
</object>
<object class="GtkImage" id="image9">
<property name="visible">True</property>
<property name="stock">gtk-refresh</property>
<property name="icon-size">1</property>
</object>
<object class="GtkImage" id="image10">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-edit</property>
<property name="icon-size">1</property>
</object>
<object class="GtkImage" id="image11">
<property name="visible">True</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="stock">gtk-orientation-portrait</property>
<property name="icon-size">1</property>
</object>
<object class="GtkImage" id="image13">
<property name="visible">True</property>
<property name="stock">gtk-info</property>
<property name="icon-size">1</property>
</object>
<object class="GtkImage" id="image15">
<property name="visible">True</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="stock">gtk-go-down</property>
<property name="icon-size">1</property>
</object>
<object class="GtkImage" id="image17">
<property name="visible">True</property>
<property name="stock">gtk-stop</property>
<property name="icon-size">1</property>
</object>
<object class="GtkImage" id="image14">
<property name="visible">True</property>
<property name="stock">gtk-dialog-question</property>
<property name="icon-size">1</property>
</object>
<object class="GtkImage" id="image18">
<property name="visible">True</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="stock">gtk-stop</property>
<property name="icon-size">1</property>
</object>
<object class="GtkImage" id="image20">
<property name="visible">True</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="stock">gtk-stop</property>
<property name="icon-size">1</property>
</object>
<object class="GtkImage" id="image22">
<property name="visible">True</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="stock">gtk-remove</property>
<property name="icon-size">1</property>
</object>
<object class="GtkImage" id="image8">
<property name="visible">True</property>
<property name="stock">gtk-properties</property>
<property name="icon-size">1</property>
</object>
<object class="GtkImage" id="image24">
<property name="visible">True</property>
<property name="stock">gtk-justify-fill</property>
<property name="icon-size">1</property>
</object>
<object class="GtkAccelGroup" id="accelgroup1"/>
</interface>

6
src/conversation_textview.py
View File

@ -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)

2
src/gui_menu_builder.py
View File

@ -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