Commits

commits@gajim.org

17632 discussions

gajim: Backed out changeset: a4cc671c889a
by Denis Fomin 08 Jan '13

08 Jan '13

changeset 6753d28c6332 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=6753d28c6332 description: Backed out changeset: a4cc671c889a diffstat: data/gui/contact_context_menu.ui | 315 ++++++++++++++------------------------ src/conversation_textview.py | 6 +- src/gui_menu_builder.py | 2 +- 3 files changed, 119 insertions(+), 204 deletions(-) diffs (truncated from 611 to 300 lines): diff -r 94eb1bbd8426 -r 6753d28c6332 data/gui/contact_context_menu.ui --- a/data/gui/contact_context_menu.ui Tue Jan 08 14:52:46 2013 +0400 +++ b/data/gui/contact_context_menu.ui Tue Jan 08 14:54:11 2013 +0400 @@ -1,147 +1,12 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0"?> <interface> -  - <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"/> +  <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>

1 0

gajim: mnemonic in conversation textview
by Denis Fomin 08 Jan '13

08 Jan '13

changeset f8b738a8c636 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f8b738a8c636 description: mnemonic in conversation textview diffstat: src/conversation_textview.py | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diffs (67 lines): diff -r 6753d28c6332 -r f8b738a8c636 src/conversation_textview.py --- a/src/conversation_textview.py Tue Jan 08 14:54:11 2013 +0400 +++ b/src/conversation_textview.py Tue Jan 08 15:03:50 2013 +0400 @@ -734,7 +734,7 @@ menu.prepend(item) separator_menuitem_was_added = True - item = Gtk.ImageMenuItem(Gtk.STOCK_CLEAR) + item = Gtk.ImageMenuItem.new_from_stock(Gtk.STOCK_CLEAR, None) menu.prepend(item) id_ = item.connect('activate', self.clear) self.handlers[id_] = item @@ -745,18 +745,20 @@ menu.prepend(item) if not self.used_in_history_window: - item = Gtk.MenuItem(_('_Quote')) + item = Gtk.MenuItem.new_with_mnemonic(_('_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.new_with_mnemonic( + _('_Actions for "%s"') % _selected_phrase) menu.prepend(item) submenu = Gtk.Menu() item.set_submenu(submenu) - phrase_for_url = urllib.parse.quote(self.selected_phrase.encode('utf-8')) + phrase_for_url = urllib.parse.quote(self.selected_phrase.encode( + 'utf-8')) always_use_en = gajim.config.get('always_english_wikipedia') if always_use_en: @@ -765,12 +767,12 @@ else: link = 'http://%s.wikipedia.org/wiki/Special:Search?search=%s'\ % (gajim.LANG, phrase_for_url) - item = Gtk.MenuItem(_('Read Wikipedia Article')) + item = Gtk.MenuItem.new_with_mnemonic(_('Read _Wikipedia Article')) id_ = item.connect('activate', self.visit_url_from_menuitem, link) self.handlers[id_] = item submenu.append(item) - item = Gtk.MenuItem(_('Look it up in Dictionary')) + item = Gtk.MenuItem.new_with_mnemonic(_('Look it up in _Dictionary')) dict_link = gajim.config.get('dictionary_url') if dict_link == 'WIKTIONARY': # special link (yeah undocumented but default) @@ -803,13 +805,13 @@ item = Gtk.MenuItem(_('Web Search URL is missing an "%s"')) item.set_property('sensitive', False) else: - item = Gtk.MenuItem(_('Web Search for it')) + item = Gtk.MenuItem.new_with_mnemonic(_('Web _Search for it')) link = search_link % phrase_for_url id_ = item.connect('activate', self.visit_url_from_menuitem, link) self.handlers[id_] = item submenu.append(item) - item = Gtk.MenuItem(_('Open as Link')) + item = Gtk.MenuItem.new_with_mnemonic(_('Open as _Link')) id_ = item.connect('activate', self.visit_url_from_menuitem, link) self.handlers[id_] = item submenu.append(item)

1 0

gajim: mnemonic in roster and statusicon
by Denis Fomin 08 Jan '13

08 Jan '13

changeset 94eb1bbd8426 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=94eb1bbd8426 description: mnemonic in roster and statusicon diffstat: src/roster_window.py | 10 +++++----- src/statusicon.py | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diffs (75 lines): diff -r 4295a9ff02bb -r 94eb1bbd8426 src/roster_window.py --- a/src/roster_window.py Tue Jan 08 14:36:10 2013 +0400 +++ b/src/roster_window.py Tue Jan 08 14:52:46 2013 +0400 @@ -5583,8 +5583,8 @@ status_menuitem.set_submenu(sub_menu) for show in ('online', 'chat', 'away', 'xa', 'dnd', 'invisible'): - uf_show = helpers.get_uf_show(show, use_mnemonic=False) - item = Gtk.ImageMenuItem(uf_show) + uf_show = helpers.get_uf_show(show, use_mnemonic=True) + item = Gtk.ImageMenuItem.new_with_mnemonic(uf_show) icon = state_images[show] item.set_image(icon) sub_menu.append(item) @@ -5610,7 +5610,7 @@ sub_menu.append(item) uf_show = helpers.get_uf_show('offline', use_mnemonic=True) - item = Gtk.ImageMenuItem(uf_show) + item = Gtk.ImageMenuItem.new_with_mnemonic(uf_show) icon = state_images['offline'] item.set_image(icon) sub_menu.append(item) @@ -5697,7 +5697,7 @@ for show in ('online', 'away', 'dnd', 'invisible'): uf_show = helpers.get_uf_show(show, use_mnemonic=True) - item = Gtk.ImageMenuItem(uf_show) + item = Gtk.ImageMenuItem.new_with_mnemonic(uf_show) icon = state_images[show] item.set_image(icon) sub_menu.append(item) @@ -5715,7 +5715,7 @@ item.set_sensitive(False) uf_show = helpers.get_uf_show('offline', use_mnemonic=True) - item = Gtk.ImageMenuItem(uf_show) + item = Gtk.ImageMenuItem.new_with_mnemonic(uf_show) icon = state_images['offline'] item.set_image(icon) sub_menu.append(item) diff -r 4295a9ff02bb -r 94eb1bbd8426 src/statusicon.py --- a/src/statusicon.py Tue Jan 08 14:36:10 2013 +0400 +++ b/src/statusicon.py Tue Jan 08 14:52:46 2013 +0400 @@ -229,8 +229,8 @@ join_gc_menuitem.set_image(state_images['muc_active']) for show in ('online', 'chat', 'away', 'xa', 'dnd', 'invisible'): - uf_show = helpers.get_uf_show(show, use_mnemonic = True) - item = Gtk.ImageMenuItem(uf_show) + uf_show = helpers.get_uf_show(show, use_mnemonic=True) + item = Gtk.ImageMenuItem.new_with_mnemonic(uf_show) item.set_image(state_images[show]) sub_menu.append(item) item.connect('activate', self.on_show_menuitem_activate, show) @@ -238,7 +238,7 @@ item = Gtk.SeparatorMenuItem.new() sub_menu.append(item) - item = Gtk.ImageMenuItem(_('_Change Status Message...')) + item = Gtk.ImageMenuItem.new_with_mnemonic(_('_Change Status Message...')) gtkgui_helpers.add_image_to_menuitem(item, 'gajim-kbd_input') sub_menu.append(item) item.connect('activate', self.on_change_status_message_activate) @@ -252,8 +252,8 @@ item = Gtk.SeparatorMenuItem.new() sub_menu.append(item) - uf_show = helpers.get_uf_show('offline', use_mnemonic = True) - item = Gtk.ImageMenuItem(uf_show) + uf_show = helpers.get_uf_show('offline', use_mnemonic=True) + item = Gtk.ImageMenuItem.new_with_mnemonic(uf_show) item.set_image(state_images['offline']) sub_menu.append(item) item.connect('activate', self.on_show_menuitem_activate, 'offline')

1 0

gajim: Backed out changeset: 5bbc88f23675
by Denis Fomin 08 Jan '13

08 Jan '13

changeset 4295a9ff02bb in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4295a9ff02bb description: Backed out changeset: 5bbc88f23675 diffstat: data/gui/systray_context_menu.ui | 91 ++++++++++++++------------------------- src/roster_window.py | 39 +++++----------- src/statusicon.py | 10 ++-- 3 files changed, 51 insertions(+), 89 deletions(-) diffs (truncated from 368 to 300 lines): diff -r 3a0f3f363857 -r 4295a9ff02bb data/gui/systray_context_menu.ui --- a/data/gui/systray_context_menu.ui Tue Jan 08 14:13:52 2013 +0400 +++ b/data/gui/systray_context_menu.ui Tue Jan 08 14:36:10 2013 +0400 @@ -1,45 +1,12 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0"?> <interface> -  - <object class="GtkAccelGroup" id="accelgroup1"/> - <object class="GtkImage" id="image1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-network</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="image3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-connect</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-new</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-home</property> - <property name="icon-size">1</property> - </object> + <requires lib="gtk+" version="2.16"/> +  <object class="GtkMenu" id="systray_context_menu"> - <property name="can_focus">False</property> <child> <object class="GtkImageMenuItem" id="status_menu"> <property name="label" translatable="yes">Sta_tus</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> @@ -49,9 +16,7 @@ <child> <object class="GtkImageMenuItem" id="chat_with_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> @@ -61,9 +26,7 @@ <child> <object class="GtkImageMenuItem" id="join_gc_menuitem"> <property name="label" translatable="yes">_Group 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">image3</property> <property name="use_stock">False</property> @@ -73,9 +36,7 @@ <child> <object class="GtkImageMenuItem" id="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">image4</property> <property name="use_stock">False</property> @@ -85,34 +46,27 @@ <child> <object class="GtkSeparatorMenuItem" id="separator12"> <property name="visible">True</property> - <property name="can_focus">False</property> </object> </child> <child> <object class="GtkMenuItem" id="show_all_events_menuitem"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="label" translatable="yes">Show All Pending _Events</property> <property name="use_underline">True</property> - <signal name="activate" handler="on_show_all_events_menuitem_activate" swapped="no"/> + <signal name="activate" handler="on_show_all_events_menuitem_activate"/> </object> </child> <child> <object class="GtkCheckMenuItem" id="sounds_mute_menuitem"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="label" translatable="yes">Mute Sounds</property> <property name="use_underline">True</property> - <signal name="activate" handler="on_sounds_mute_menuitem_activate" swapped="no"/> + <signal name="activate" handler="on_sounds_mute_menuitem_activate"/> </object> </child> <child> <object class="GtkImageMenuItem" id="show_roster_menuitem"> - <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> @@ -122,32 +76,53 @@ <child> <object class="GtkImageMenuItem" id="preferences_menuitem"> <property name="label">gtk-preferences</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="use_stock">True</property> <property name="accel_group">accelgroup1</property> - <signal name="activate" handler="on_preferences_menuitem_activate" swapped="no"/> + <signal name="activate" handler="on_preferences_menuitem_activate"/> </object> </child> <child> <object class="GtkSeparatorMenuItem" id="separator"> <property name="visible">True</property> - <property name="can_focus">False</property> </object> </child> <child> <object class="GtkImageMenuItem" id="quit_menuitem"> <property name="label">gtk-quit</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="use_stock">True</property> <property name="accel_group">accelgroup1</property> - <signal name="activate" handler="on_quit_menuitem_activate" swapped="no"/> + <signal name="activate" handler="on_quit_menuitem_activate"/> </object> </child> </object> + <object class="GtkAccelGroup" id="accelgroup1"/> + <object class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="stock">gtk-network</property> + <property name="icon-size">1</property> + </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-connect</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image4"> + <property name="visible">True</property> + <property name="stock">gtk-new</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image5"> + <property name="visible">True</property> + <property name="stock">gtk-home</property> + <property name="icon-size">1</property> + </object> </interface> diff -r 3a0f3f363857 -r 4295a9ff02bb src/roster_window.py --- a/src/roster_window.py Tue Jan 08 14:13:52 2013 +0400 +++ b/src/roster_window.py Tue Jan 08 14:36:10 2013 +0400 @@ -293,8 +293,8 @@ # Draw all known groups for group in gajim.groups[account]: - self._really_draw_group(group, account) - self._really_draw_account(account) + self.draw_group(group, account) + self.draw_account(account) self.starting = False @@ -897,7 +897,7 @@ # update all contacts in the given group if self.regroup: - accounts = list(gajim.connections.keys()) + accounts = gajim.connections.keys() else: accounts = [account, ] @@ -1122,7 +1122,7 @@ self.model[child_iter][C_NAME] = text def _really_draw_groups(self): - for ag in list(self.groups_to_draw.values()): + for ag in self.groups_to_draw.values(): acct = ag['account'] grp = ag['group'] self._really_draw_group(grp, acct) @@ -1135,7 +1135,7 @@ return self.groups_to_draw[ag] = {'group': group, 'account': account} if len(self.groups_to_draw) == 1: - GObject.idle_add(self._really_draw_groups) + GObject.timeout_add(200, self._really_draw_groups) def draw_parent_contact(self, jid, account): child_iters = self._get_contact_iter(jid, account, model=self.model) @@ -1150,13 +1150,7 @@ self.draw_contact(parent_jid, parent_account) return False - def draw_contact(self, jid, account, selected=False, focus=False, - contact_instances=None, contact=None): - GObject.idle_add(self._really_draw_contact, jid, account, selected, - focus, contact_instances, contact) - - def _really_draw_contact(self, jid, account, selected=False, focus=False, - contact_instances=None, contact=None): + def draw_contact(self, jid, account, selected=False, focus=False, contact_instances=None, contact=None): """ Draw the correct state image, name BUT not avatar """ @@ -1335,10 +1329,6 @@ self.draw_pep(jid, account, pep_type, contact=contact) def draw_pep(self, jid, account, pep_type, contact=None): - GObject.idle_add(self._really_draw_pep, jid, account, pep_type, - contact) - - def _really_draw_pep(self, jid, account, pep_type, contact=None): if pep_type not in self._pep_type_to_model_column: return if not self._is_pep_shown_in_roster(pep_type): @@ -1358,9 +1348,6 @@ self.model[child_iter][model_column] = pixbuf def draw_avatar(self, jid, account): - GObject.idle_add(self._really_draw_avatar, jid, account) - - def _really_draw_avatar(self, jid, account): iters = self._get_contact_iter(jid, account, model=self.model) if not iters or not gajim.config.get('show_avatars_in_roster'): return @@ -5611,7 +5598,7 @@ item = Gtk.SeparatorMenuItem.new() sub_menu.append(item) - item = Gtk.ImageMenuItem.new_with_mnemonic(_('Change Status Message')) + item = Gtk.ImageMenuItem.new_with_mnemonic(_('_Change Status Message')) gtkgui_helpers.add_image_to_menuitem(item, 'gajim-kbd_input') sub_menu.append(item) item.connect('activate', self.on_change_status_message_activate, @@ -5622,7 +5609,7 @@ item = Gtk.SeparatorMenuItem.new() sub_menu.append(item) - uf_show = helpers.get_uf_show('offline', use_mnemonic=False) + uf_show = helpers.get_uf_show('offline', use_mnemonic=True) item = Gtk.ImageMenuItem(uf_show) icon = state_images['offline'] item.set_image(icon) @@ -5709,7 +5696,7 @@ status_menuitem.set_submenu(sub_menu) for show in ('online', 'away', 'dnd', 'invisible'): - uf_show = helpers.get_uf_show(show, use_mnemonic=False) + uf_show = helpers.get_uf_show(show, use_mnemonic=True) item = Gtk.ImageMenuItem(uf_show) icon = state_images[show] item.set_image(icon) @@ -5719,7 +5706,7 @@ item = Gtk.SeparatorMenuItem.new() sub_menu.append(item) - item = Gtk.ImageMenuItem.new_with_mnemonic(_('Change Status Message')) + item = Gtk.ImageMenuItem.new_with_mnemonic(_('_Change Status Message')) gtkgui_helpers.add_image_to_menuitem(item, 'gajim-kbd_input') sub_menu.append(item) item.connect('activate', self.on_change_status_message_activate, @@ -5727,7 +5714,7 @@ if gajim.connections[account].connected < 2: item.set_sensitive(False) - uf_show = helpers.get_uf_show('offline', use_mnemonic=False) + uf_show = helpers.get_uf_show('offline', use_mnemonic=True) item = Gtk.ImageMenuItem(uf_show)

1 0

gajim: fix not xhtml message in conversation textview
by Denis Fomin 08 Jan '13

08 Jan '13

changeset 3a0f3f363857 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3a0f3f363857 description: fix not xhtml message in conversation textview diffstat: src/conversation_textview.py | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diffs (41 lines): diff -r 3e4063cb8527 -r 3a0f3f363857 src/conversation_textview.py --- a/src/conversation_textview.py Tue Jan 08 13:22:33 2013 +0400 +++ b/src/conversation_textview.py Tue Jan 08 14:13:52 2013 +0400 @@ -998,8 +998,10 @@ print_conversation_line() """ buffer_ = self.tv.get_buffer() - - insert_tags_func = buffer_.insert_with_tags_by_name + if other_tags: + insert_tags_func = buffer_.insert_with_tags_by_name + else: + insert_tags_func = buffer_.insert # detect_and_print_special_text() is also used by # HtmlHandler.handle_specials() and there tags is Gtk.TextTag objects, # not strings @@ -1026,7 +1028,10 @@ text_before_special_text = otext[index:start] end_iter = buffer_.get_end_iter() # we insert normal text - insert_tags_func(end_iter, text_before_special_text, *other_tags) + if other_tags: + insert_tags_func(end_iter, text_before_special_text, *other_tags) + else: + buffer_.insert(end_iter, text_before_special_text) index = end # update index # now print it @@ -1158,8 +1163,10 @@ insert_tags_func = buffer_.insert_with_tags_by_name if other_tags and isinstance(other_tags[0], Gtk.TextTag): insert_tags_func = buffer_.insert_with_tags - - insert_tags_func(end_iter, special_text, *other_tags) + if other_tags: + insert_tags_func(end_iter, special_text, *other_tags) + else: + buffer_.insert(end_iter, special_text) if tags: end_iter = buffer_.get_end_iter()

1 0

gajim: fix newline in history textview and timestamp in conversa...
by Denis Fomin 08 Jan '13

08 Jan '13

changeset 3e4063cb8527 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3e4063cb8527 description: fix newline in history textview and timestamp in conversation textview diffstat: src/conversation_textview.py | 9 ++++++--- src/history_window.py | 10 +++++++--- 2 files changed, 13 insertions(+), 6 deletions(-) diffs (53 lines): diff -r 9c1550a3da4c -r 3e4063cb8527 src/conversation_textview.py --- a/src/conversation_textview.py Tue Jan 08 13:20:24 2013 +0400 +++ b/src/conversation_textview.py Tue Jan 08 13:22:33 2013 +0400 @@ -1233,8 +1233,11 @@ if current_print_time == 'always' and kind != 'info' and not simple: timestamp_str = self.get_time_to_show(tim) timestamp = time.strftime(timestamp_str, tim) - buffer_.insert_with_tags_by_name(end_iter, timestamp, - *other_tags_for_time) + if other_tags_for_time: + buffer_.insert_with_tags_by_name(end_iter, timestamp, + *other_tags_for_time) + else: + buffer_.insert (end_iter, timestamp) elif current_print_time == 'sometimes' and kind != 'info' and not simple: every_foo_seconds = 60 * gajim.config.get( 'print_ichat_every_foo_minutes') @@ -1248,7 +1251,7 @@ else: tim_format = self.get_time_to_show(tim) buffer_.insert_with_tags_by_name(end_iter, tim_format + '\n', - 'time_sometimes') + 'time_sometimes') # If there's a displaymarking, print it here. if displaymarking: self.print_displaymarking(displaymarking) diff -r 9c1550a3da4c -r 3e4063cb8527 src/history_window.py --- a/src/history_window.py Tue Jan 08 13:20:24 2013 +0400 +++ b/src/history_window.py Tue Jan 08 13:22:33 2013 +0400 @@ -472,8 +472,10 @@ after_str = gajim.config.get('after_nickname') after_str = helpers.from_one_line(after_str) format = before_str + contact_name + after_str + ' ' - buf.insert_with_tags_by_name(end_iter, format, tag_name) - + if tag_name: + buf.insert_with_tags_by_name(end_iter, format, tag_name) + else: + buf.insert(end_iter, format) if subject: message = _('Subject: %s\n') % subject + message xhtml = None @@ -486,7 +488,9 @@ else: self.history_textview.print_real_text(message, name=contact_name, xhtml=xhtml) - self.history_textview.print_real_text('\n') + buffer_ = self.history_textview.tv.get_buffer() + eob = buffer_.get_end_iter() + buffer_.insert_with_tags_by_name(eob, '\n', 'eol') def on_search_entry_activate(self, widget): text = self.search_entry.get_text()

1 0

gajim: fix some popup menus
by Denis Fomin 08 Jan '13

08 Jan '13

changeset 9c1550a3da4c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9c1550a3da4c description: fix some popup menus diffstat: src/roster_window.py | 51 ++++++++++++++++++++++++++++----------------------- 1 files changed, 28 insertions(+), 23 deletions(-) diffs (207 lines): diff -r 43b7eca946bc -r 9c1550a3da4c src/roster_window.py --- a/src/roster_window.py Tue Jan 08 13:17:09 2013 +0400 +++ b/src/roster_window.py Tue Jan 08 13:20:24 2013 +0400 @@ -5982,7 +5982,7 @@ break account = current_account if account is not None: - send_group_message_item = Gtk.ImageMenuItem( + send_group_message_item = Gtk.ImageMenuItem.new_with_mnemonic( _('Send Group M_essage')) icon = Gtk.Image.new_from_stock(Gtk.STOCK_NEW, Gtk.IconSize.MENU) send_group_message_item.set_image(icon) @@ -5991,7 +5991,7 @@ self.on_send_single_message_menuitem_activate, account, list_) # Invite to Groupchat - invite_item = Gtk.ImageMenuItem(_('In_vite to')) + invite_item = Gtk.ImageMenuItem.new_with_mnemonic(_('In_vite to')) muc_icon = gtkgui_helpers.load_icon('muc_active') if muc_icon: invite_item.set_image(muc_icon) @@ -6003,7 +6003,7 @@ menu.append(item) # Manage Transport submenu - item = Gtk.ImageMenuItem(_('_Manage Contacts')) + item = Gtk.ImageMenuItem.new_with_mnemonic(_('_Manage Contacts')) icon = Gtk.Image.new_from_stock(Gtk.STOCK_PROPERTIES, Gtk.IconSize.MENU) item.set_image(icon) @@ -6012,7 +6012,8 @@ menu.append(item) # Edit Groups - edit_groups_item = Gtk.ImageMenuItem(_('Edit _Groups')) + edit_groups_item = Gtk.ImageMenuItem.new_with_mnemonic(_( + 'Edit _Groups')) icon = Gtk.Image.new_from_stock(Gtk.STOCK_EDIT, Gtk.IconSize.MENU) edit_groups_item.set_image(icon) manage_contacts_submenu.append(edit_groups_item) @@ -6023,13 +6024,13 @@ # Block if is_blocked and privacy_rules_supported: - unblock_menuitem = Gtk.ImageMenuItem(_('_Unblock')) + unblock_menuitem = Gtk.ImageMenuItem.new_with_mnemonic(_('_Unblock')) icon = Gtk.Image.new_from_stock(Gtk.STOCK_STOP, Gtk.IconSize.MENU) unblock_menuitem.set_image(icon) unblock_menuitem.connect('activate', self.on_unblock, list_) manage_contacts_submenu.append(unblock_menuitem) else: - block_menuitem = Gtk.ImageMenuItem(_('_Block')) + block_menuitem = Gtk.ImageMenuItem.new_with_mnemonic(_('_Block')) icon = Gtk.Image.new_from_stock(Gtk.STOCK_STOP, Gtk.IconSize.MENU) block_menuitem.set_image(icon) block_menuitem.connect('activate', self.on_block, list_) @@ -6039,7 +6040,7 @@ block_menuitem.set_sensitive(False) # Remove - remove_item = Gtk.ImageMenuItem(_('_Remove')) + remove_item = Gtk.ImageMenuItem.new_with_mnemonic(_('_Remove')) icon = Gtk.Image.new_from_stock(Gtk.STOCK_REMOVE, Gtk.IconSize.MENU) remove_item.set_image(icon) manage_contacts_submenu.append(remove_item) @@ -6067,7 +6068,7 @@ menu = Gtk.Menu() # Send single message - item = Gtk.ImageMenuItem(_('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', @@ -6079,7 +6080,7 @@ blocked = True # Send Custom Status - send_custom_status_menuitem = Gtk.ImageMenuItem( + send_custom_status_menuitem = Gtk.ImageMenuItem.new_with_mnemonic( _('Send Cus_tom Status')) # add a special img for this menuitem if blocked: @@ -6114,7 +6115,7 @@ menu.append(item) # Execute Command - item = Gtk.ImageMenuItem(_('Execute Command...')) + item = Gtk.ImageMenuItem.new_with_mnemonic(_('Execute Command...')) icon = Gtk.Image.new_from_stock(Gtk.STOCK_EXECUTE, Gtk.IconSize.MENU) item.set_image(icon) menu.append(item) @@ -6124,7 +6125,7 @@ item.set_sensitive(False) # Manage Transport submenu - item = Gtk.ImageMenuItem(_('_Manage Transport')) + item = Gtk.ImageMenuItem.new_with_mnemonic(_('_Manage Transport')) icon = Gtk.Image.new_from_stock(Gtk.STOCK_PROPERTIES, Gtk.IconSize.MENU) item.set_image(icon) @@ -6133,7 +6134,7 @@ menu.append(item) # Modify Transport - item = Gtk.ImageMenuItem(_('_Modify Transport')) + item = Gtk.ImageMenuItem.new_with_mnemonic(_('_Modify Transport')) icon = Gtk.Image.new_from_stock(Gtk.STOCK_PREFERENCES, Gtk.IconSize.MENU) item.set_image(icon) @@ -6143,7 +6144,7 @@ item.set_sensitive(False) # Rename - item = Gtk.ImageMenuItem(_('_Rename')) + item = Gtk.ImageMenuItem.new_with_mnemonic(_('_Rename')) # add a special img for rename menuitem gtkgui_helpers.add_image_to_menuitem(item, 'gajim-kbd_input') manage_transport_submenu.append(item) @@ -6156,10 +6157,10 @@ # Block if blocked: - item = Gtk.ImageMenuItem(_('_Unblock')) + item = Gtk.ImageMenuItem.new_with_mnemonic(_('_Unblock')) item.connect('activate', self.on_unblock, [(contact, account)]) else: - item = Gtk.ImageMenuItem(_('_Block')) + item = Gtk.ImageMenuItem.new_with_mnemonic(_('_Block')) item.connect('activate', self.on_block, [(contact, account)]) icon = Gtk.Image.new_from_stock(Gtk.STOCK_STOP, Gtk.IconSize.MENU) @@ -6169,7 +6170,7 @@ item.set_sensitive(False) # Remove - item = Gtk.ImageMenuItem(_('_Remove')) + item = Gtk.ImageMenuItem.new_with_mnemonic(_('_Remove')) icon = Gtk.Image.new_from_stock(Gtk.STOCK_REMOVE, Gtk.IconSize.MENU) item.set_image(icon) manage_transport_submenu.append(item) @@ -6181,7 +6182,8 @@ menu.append(item) # Information - information_menuitem = Gtk.ImageMenuItem(_('_Information')) + information_menuitem = Gtk.ImageMenuItem.new_with_mnemonic(_( + '_Information')) icon = Gtk.Image.new_from_stock(Gtk.STOCK_INFO, Gtk.IconSize.MENU) information_menuitem.set_image(icon) menu.append(information_menuitem) @@ -6203,7 +6205,8 @@ menu = Gtk.Menu() if jid in gajim.interface.minimized_controls[account]: - maximize_menuitem = Gtk.ImageMenuItem(_('_Maximize')) + maximize_menuitem = Gtk.ImageMenuItem.new_with_mnemonic(_( + '_Maximize')) icon = Gtk.Image.new_from_stock(Gtk.STOCK_GOTO_TOP, Gtk.IconSize.MENU) maximize_menuitem.set_image(icon) @@ -6212,14 +6215,16 @@ menu.append(maximize_menuitem) if not gajim.gc_connected[account].get(jid, False): - connect_menuitem = Gtk.ImageMenuItem(_('_Reconnect')) + connect_menuitem = Gtk.ImageMenuItem.new_with_mnemonic(_( + '_Reconnect')) connect_icon = Gtk.Image.new_from_stock(Gtk.STOCK_CONNECT, \ Gtk.IconSize.MENU) connect_menuitem.set_image(connect_icon) connect_menuitem.connect('activate', self.on_reconnect, jid, account) menu.append(connect_menuitem) - disconnect_menuitem = Gtk.ImageMenuItem(_('_Disconnect')) + disconnect_menuitem = Gtk.ImageMenuItem.new_with_mnemonic(_( + '_Disconnect')) disconnect_icon = Gtk.Image.new_from_stock(Gtk.STOCK_DISCONNECT, \ Gtk.IconSize.MENU) disconnect_menuitem.set_image(disconnect_icon) @@ -6230,7 +6235,7 @@ item = Gtk.SeparatorMenuItem.new() # separator menu.append(item) - history_menuitem = Gtk.ImageMenuItem(_('_History')) + history_menuitem = Gtk.ImageMenuItem.new_with_mnemonic(_('_History')) history_icon = Gtk.Image.new_from_stock(Gtk.STOCK_JUSTIFY_FILL, \ Gtk.IconSize.MENU) history_menuitem.set_image(history_icon) @@ -6308,7 +6313,7 @@ menu.append(item) # History manager - item = Gtk.ImageMenuItem(_('History Manager')) + item = Gtk.ImageMenuItem.new_with_mnemonic(_('History Manager')) icon = Gtk.Image.new_from_stock(Gtk.STOCK_JUSTIFY_FILL, Gtk.IconSize.MENU) item.set_image(icon) @@ -6319,7 +6324,7 @@ """ Show join new group chat item and bookmarks list for an account """ - item = Gtk.ImageMenuItem(_('Join New Group Chat')) + item = Gtk.ImageMenuItem.new_with_mnemonic(_('Join New Group Chat')) icon = Gtk.Image.new_from_stock(Gtk.STOCK_NEW, Gtk.IconSize.MENU) item.set_image(icon) item.connect('activate', self.on_join_gc_activate, account)

1 0

gajim: [Asterix] Fix caps
by Denis Fomin 08 Jan '13

08 Jan '13

changeset 43b7eca946bc in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=43b7eca946bc description: [Asterix] Fix caps diffstat: src/common/logger.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r a863200033d5 -r 43b7eca946bc src/common/logger.py --- a/src/common/logger.py Tue Jan 08 03:03:15 2013 +0400 +++ b/src/common/logger.py Tue Jan 08 13:17:09 2013 +0400 @@ -33,7 +33,7 @@ import time import datetime from gzip import GzipFile -from io import BytesIO, StringIO +from io import BytesIO from gi.repository import GObject from common import exceptions @@ -924,7 +924,7 @@ data.extend(features) data = '\0'.join(data) # if there's a need to do more gzip, put that to a function - string = StringIO() + string = BytesIO() gzip = GzipFile(fileobj=string, mode='w') gzip.write(data) gzip.close()

1 0

gajim: fix group menu
by Denis Fomin 07 Jan '13

07 Jan '13

changeset a863200033d5 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a863200033d5 description: fix group menu diffstat: src/roster_window.py | 27 +++++++++++++++------------ 1 files changed, 15 insertions(+), 12 deletions(-) diffs (109 lines): diff -r 08b73390787c -r a863200033d5 src/roster_window.py --- a/src/roster_window.py Tue Jan 08 02:28:44 2013 +0400 +++ b/src/roster_window.py Tue Jan 08 03:03:15 2013 +0400 @@ -5611,7 +5611,7 @@ item = Gtk.SeparatorMenuItem.new() sub_menu.append(item) - item = Gtk.ImageMenuItem(_('Change Status Message')) + item = Gtk.ImageMenuItem.new_with_mnemonic(_('Change Status Message')) gtkgui_helpers.add_image_to_menuitem(item, 'gajim-kbd_input') sub_menu.append(item) item.connect('activate', self.on_change_status_message_activate, @@ -5719,7 +5719,7 @@ item = Gtk.SeparatorMenuItem.new() sub_menu.append(item) - item = Gtk.ImageMenuItem(_('Change Status Message')) + item = Gtk.ImageMenuItem.new_with_mnemonic(_('Change Status Message')) gtkgui_helpers.add_image_to_menuitem(item, 'gajim-kbd_input') sub_menu.append(item) item.connect('activate', self.on_change_status_message_activate, @@ -5797,7 +5797,8 @@ # Make special context menu if group is Groupchats if group == _('Groupchats'): - maximize_menuitem = Gtk.ImageMenuItem(_('_Maximize All')) + maximize_menuitem = Gtk.ImageMenuItem.new_with_mnemonic(_( + '_Maximize All')) icon = Gtk.Image.new_from_stock(Gtk.STOCK_GOTO_TOP, Gtk.IconSize.MENU) maximize_menuitem.set_image(icon) @@ -5806,7 +5807,7 @@ menu.append(maximize_menuitem) else: # Send Group Message - send_group_message_item = Gtk.ImageMenuItem( + send_group_message_item = Gtk.ImageMenuItem.new_with_mnemonic( _('Send Group M_essage')) icon = Gtk.Image.new_from_stock(Gtk.STOCK_NEW, Gtk.IconSize.MENU) send_group_message_item.set_image(icon) @@ -5815,10 +5816,11 @@ send_group_message_item.set_submenu(send_group_message_submenu) menu.append(send_group_message_item) - group_message_to_all_item = Gtk.MenuItem(_('To all users')) + group_message_to_all_item = Gtk.MenuItem.new_with_mnemonic(_( + 'To all users')) send_group_message_submenu.append(group_message_to_all_item) - group_message_to_all_online_item = Gtk.MenuItem( + group_message_to_all_online_item = Gtk.MenuItem.new_with_mnemonic( _('To all online users')) send_group_message_submenu.append(group_message_to_all_online_item) @@ -5829,7 +5831,7 @@ self.on_send_single_message_menuitem_activate, account, list_) # Invite to - invite_menuitem = Gtk.ImageMenuItem(_('In_vite to')) + invite_menuitem = Gtk.ImageMenuItem.new_with_mnemonic(_('In_vite to')) muc_icon = gtkgui_helpers.load_icon('muc_active') if muc_icon: invite_menuitem.set_image(muc_icon) @@ -5838,7 +5840,7 @@ menu.append(invite_menuitem) # Send Custom Status - send_custom_status_menuitem = Gtk.ImageMenuItem( + send_custom_status_menuitem = Gtk.ImageMenuItem.new_with_mnemonic( _('Send Cus_tom Status')) # add a special img for this menuitem if helpers.group_is_blocked(account, group): @@ -5874,7 +5876,7 @@ menu.append(item) # Rename - rename_item = Gtk.ImageMenuItem(_('Re_name')) + rename_item = Gtk.ImageMenuItem.new_with_mnemonic(_('Re_name')) # add a special img for rename menuitem gtkgui_helpers.add_image_to_menuitem(rename_item, 'gajim-kbd_input') menu.append(rename_item) @@ -5893,7 +5895,8 @@ if is_blocked and gajim.connections[account].\ privacy_rules_supported: - unblock_menuitem = Gtk.ImageMenuItem(_('_Unblock')) + unblock_menuitem = Gtk.ImageMenuItem.new_with_mnemonic(_( + '_Unblock')) icon = Gtk.Image.new_from_stock(Gtk.STOCK_STOP, Gtk.IconSize.MENU) unblock_menuitem.set_image(icon) @@ -5901,7 +5904,7 @@ group) menu.append(unblock_menuitem) else: - block_menuitem = Gtk.ImageMenuItem(_('_Block')) + block_menuitem = Gtk.ImageMenuItem.new_with_mnemonic(_('_Block')) icon = Gtk.Image.new_from_stock(Gtk.STOCK_STOP, Gtk.IconSize.MENU) block_menuitem.set_image(icon) @@ -5911,7 +5914,7 @@ block_menuitem.set_sensitive(False) # Remove group - remove_item = Gtk.ImageMenuItem(_('_Remove')) + remove_item = Gtk.ImageMenuItem.new_with_mnemonic(_('_Remove')) icon = Gtk.Image.new_from_stock(Gtk.STOCK_REMOVE, Gtk.IconSize.MENU) remove_item.set_image(icon)

1 0

gajim: fix some popup menus
by Denis Fomin 07 Jan '13

07 Jan '13

changeset 08b73390787c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=08b73390787c description: fix some popup menus diffstat: src/chat_control.py | 3 ++- src/profile_window.py | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diffs (46 lines): diff -r 38f18c8aa0d6 -r 08b73390787c src/chat_control.py --- a/src/chat_control.py Tue Jan 08 02:22:40 2013 +0400 +++ b/src/chat_control.py Tue Jan 08 02:28:44 2013 +0400 @@ -1973,7 +1973,7 @@ """ if event.button == 3: # right click menu = Gtk.Menu() - menuitem = Gtk.ImageMenuItem(Gtk.STOCK_SAVE_AS) + menuitem = Gtk.ImageMenuItem.new_from_stock(Gtk.STOCK_SAVE_AS, None) id_ = menuitem.connect('activate', gtkgui_helpers.on_avatar_save_as_menuitem_activate, self.contact.jid, self.contact.get_shown_name()) @@ -1983,6 +1983,7 @@ menu.connect('selection-done', lambda w: w.destroy()) # show the menu menu.show_all() + menu.attach_to_widget(widget, None) menu.popup(None, None, None, None, event.button, event.time) return True diff -r 38f18c8aa0d6 -r 08b73390787c src/profile_window.py --- a/src/profile_window.py Tue Jan 08 02:22:40 2013 +0400 +++ b/src/profile_window.py Tue Jan 08 02:28:44 2013 +0400 @@ -208,18 +208,20 @@ if pixbuf not in (None, 'ask'): nick = gajim.config.get_per('accounts', self.account, 'name') - menuitem = Gtk.ImageMenuItem(Gtk.STOCK_SAVE_AS) + menuitem = Gtk.ImageMenuItem.new_from_stock(Gtk.STOCK_SAVE_AS, + None) menuitem.connect('activate', gtkgui_helpers.on_avatar_save_as_menuitem_activate, self.jid, nick) menu.append(menuitem) # show clear - menuitem = Gtk.ImageMenuItem(Gtk.STOCK_CLEAR) + menuitem = Gtk.ImageMenuItem.new_from_stock(Gtk.STOCK_CLEAR, None) menuitem.connect('activate', self.on_clear_button_clicked) menu.append(menuitem) menu.connect('selection-done', lambda w:w.destroy()) # show the menu menu.show_all() + menu.attach_to_widget(widget, None) menu.popup(None, None, None, None, event.button, event.time) elif event.button == 1: # left click self.on_set_avatar_button_clicked(widget)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits