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

fix SeparatorMenuItem

Browse source
This commit is contained in:
Denis Fomin 2013-01-01 19:46:04 +04:00
parent 3ec91452e8
commit 342755d58a
6 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/chat_control.py
View file

@ -525,7 +525,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
""" """
Override the default context menu and add our own menutiems Override the default context menu and add our own menutiems
""" """
item = Gtk.SeparatorMenuItem() item = Gtk.SeparatorMenuItem.new()
menu.prepend(item) menu.prepend(item)
menu2 = self.prepare_context_menu() menu2 = self.prepare_context_menu()
@ -573,7 +573,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
id_ = item.connect('activate', self.msg_textview.undo) id_ = item.connect('activate', self.msg_textview.undo)
self.handlers[id_] = item self.handlers[id_] = item
item = Gtk.SeparatorMenuItem() item = Gtk.SeparatorMenuItem.new()
menu.prepend(item) menu.prepend(item)
item = Gtk.ImageMenuItem(Gtk.STOCK_CLEAR) item = Gtk.ImageMenuItem(Gtk.STOCK_CLEAR)
@ -1066,7 +1066,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
menuitem[1]) menuitem[1])
menu.append(item) menu.append(item)
item = Gtk.SeparatorMenuItem() # separator item = Gtk.SeparatorMenuItem.new() # separator
menu.append(item) menu.append(item)
item = Gtk.ImageMenuItem(_('Color')) item = Gtk.ImageMenuItem(_('Color'))
@ -1081,7 +1081,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
item.connect('activate', self.on_font_menuitem_activale) item.connect('activate', self.on_font_menuitem_activale)
menu.append(item) menu.append(item)
item = Gtk.SeparatorMenuItem() # separator item = Gtk.SeparatorMenuItem.new() # separator
menu.append(item) menu.append(item)
item = Gtk.ImageMenuItem(_('Clear formating')) item = Gtk.ImageMenuItem(_('Clear formating'))

4
src/conversation_textview.py
View file

@ -728,7 +728,7 @@ class ConversationTextview(GObject.GObject):
""" """
separator_menuitem_was_added = False separator_menuitem_was_added = False
if not self.used_in_history_window: if not self.used_in_history_window:
item = Gtk.SeparatorMenuItem() item = Gtk.SeparatorMenuItem.new()
menu.prepend(item) menu.prepend(item)
separator_menuitem_was_added = True separator_menuitem_was_added = True
@ -739,7 +739,7 @@ class ConversationTextview(GObject.GObject):
if self.selected_phrase: if self.selected_phrase:
if not separator_menuitem_was_added: if not separator_menuitem_was_added:
item = Gtk.SeparatorMenuItem() item = Gtk.SeparatorMenuItem.new()
menu.prepend(item) menu.prepend(item)
if not self.used_in_history_window: if not self.used_in_history_window:

2
src/groupchat_control.py
View file

@ -563,7 +563,7 @@ class GroupchatControl(ChatControlBase):
and the ability to insert a nick and the ability to insert a nick
""" """
ChatControlBase.on_msg_textview_populate_popup(self, textview, menu) ChatControlBase.on_msg_textview_populate_popup(self, textview, menu)
item = Gtk.SeparatorMenuItem() item = Gtk.SeparatorMenuItem.new()
menu.prepend(item) menu.prepend(item)
item = Gtk.MenuItem(_('Insert Nickname')) item = Gtk.MenuItem(_('Insert Nickname'))

2
src/gui_menu_builder.py
View file

@ -136,7 +136,7 @@ def build_invite_submenu(invite_menuitem, list_, ignore_rooms=[]):
contacts_transport == gajim.get_transport_name_from_jid(room_jid): contacts_transport == gajim.get_transport_name_from_jid(room_jid):
rooms.append((room_jid, acct)) rooms.append((room_jid, acct))
if len(rooms): if len(rooms):
item = Gtk.SeparatorMenuItem() # separator item = Gtk.SeparatorMenuItem.new() # separator
invite_to_submenu.append(item) invite_to_submenu.append(item)
for (room_jid, account) in rooms: for (room_jid, account) in rooms:
menuitem = Gtk.MenuItem(room_jid.split('@')[0]) menuitem = Gtk.MenuItem(room_jid.split('@')[0])

30
src/roster_window.py
View file

@ -5470,7 +5470,7 @@ class RosterWindow:
item.set_sensitive(False) item.set_sensitive(False)
# Manage GC bookmarks # Manage GC bookmarks
newitem = Gtk.SeparatorMenuItem() # separator newitem = Gtk.SeparatorMenuItem.new() # separator
gc_sub_menu.append(newitem) gc_sub_menu.append(newitem)
newitem = Gtk.ImageMenuItem(_('_Manage Bookmarks...')) newitem = Gtk.ImageMenuItem(_('_Manage Bookmarks...'))
@ -5579,7 +5579,7 @@ class RosterWindow:
status_menuitem.set_submenu(sub_menu) status_menuitem.set_submenu(sub_menu)
for show in ('online', 'chat', 'away', 'xa', 'dnd', 'invisible'): for show in ('online', 'chat', 'away', 'xa', 'dnd', 'invisible'):
uf_show = helpers.get_uf_show(show, use_mnemonic=True) uf_show = helpers.get_uf_show(show, use_mnemonic=False)
item = Gtk.ImageMenuItem(uf_show) item = Gtk.ImageMenuItem(uf_show)
icon = state_images[show] icon = state_images[show]
item.set_image(icon) item.set_image(icon)
@ -5591,7 +5591,7 @@ class RosterWindow:
else: else:
item.connect('activate', self.change_status, account, show) item.connect('activate', self.change_status, account, show)
item = Gtk.SeparatorMenuItem() item = Gtk.SeparatorMenuItem.new()
sub_menu.append(item) sub_menu.append(item)
item = Gtk.ImageMenuItem(_('_Change Status Message')) item = Gtk.ImageMenuItem(_('_Change Status Message'))
@ -5602,7 +5602,7 @@ class RosterWindow:
if gajim.connections[account].connected < 2: if gajim.connections[account].connected < 2:
item.set_sensitive(False) item.set_sensitive(False)
item = Gtk.SeparatorMenuItem() item = Gtk.SeparatorMenuItem.new()
sub_menu.append(item) sub_menu.append(item)
uf_show = helpers.get_uf_show('offline', use_mnemonic=True) uf_show = helpers.get_uf_show('offline', use_mnemonic=True)
@ -5633,7 +5633,7 @@ class RosterWindow:
self.on_publish_location_toggled) self.on_publish_location_toggled)
pep_config = Gtk.ImageMenuItem(_('Configure Services...')) pep_config = Gtk.ImageMenuItem(_('Configure Services...'))
item = Gtk.SeparatorMenuItem() item = Gtk.SeparatorMenuItem.new()
pep_submenu.append(item) pep_submenu.append(item)
pep_config.set_sensitive(True) pep_config.set_sensitive(True)
pep_submenu.append(pep_config) pep_submenu.append(pep_config)
@ -5699,7 +5699,7 @@ class RosterWindow:
sub_menu.append(item) sub_menu.append(item)
item.connect('activate', self.change_status, account, show) item.connect('activate', self.change_status, account, show)
item = Gtk.SeparatorMenuItem() item = Gtk.SeparatorMenuItem.new()
sub_menu.append(item) sub_menu.append(item)
item = Gtk.ImageMenuItem(_('_Change Status Message')) item = Gtk.ImageMenuItem(_('_Change Status Message'))
@ -5853,7 +5853,7 @@ class RosterWindow:
send_group_message_item.set_sensitive(False) send_group_message_item.set_sensitive(False)
if not group in helpers.special_groups: if not group in helpers.special_groups:
item = Gtk.SeparatorMenuItem() # separator item = Gtk.SeparatorMenuItem.new() # separator
menu.append(item) menu.append(item)
# Rename # Rename
@ -5979,7 +5979,7 @@ class RosterWindow:
gui_menu_builder.build_invite_submenu(invite_item, list_) gui_menu_builder.build_invite_submenu(invite_item, list_)
menu.append(invite_item) menu.append(invite_item)
item = Gtk.SeparatorMenuItem() # separator item = Gtk.SeparatorMenuItem.new() # separator
menu.append(item) menu.append(item)
# Manage Transport submenu # Manage Transport submenu
@ -5998,7 +5998,7 @@ class RosterWindow:
manage_contacts_submenu.append(edit_groups_item) manage_contacts_submenu.append(edit_groups_item)
edit_groups_item.connect('activate', self.on_edit_groups, list_) edit_groups_item.connect('activate', self.on_edit_groups, list_)
item = Gtk.SeparatorMenuItem() # separator item = Gtk.SeparatorMenuItem.new() # separator
manage_contacts_submenu.append(item) manage_contacts_submenu.append(item)
# Block # Block
@ -6090,7 +6090,7 @@ class RosterWindow:
status_menuitems.append(status_menuitem) status_menuitems.append(status_menuitem)
menu.append(send_custom_status_menuitem) menu.append(send_custom_status_menuitem)
item = Gtk.SeparatorMenuItem() # separator item = Gtk.SeparatorMenuItem.new() # separator
menu.append(item) menu.append(item)
# Execute Command # Execute Command
@ -6131,7 +6131,7 @@ class RosterWindow:
if gajim.account_is_disconnected(account): if gajim.account_is_disconnected(account):
item.set_sensitive(False) item.set_sensitive(False)
item = Gtk.SeparatorMenuItem() # separator item = Gtk.SeparatorMenuItem.new() # separator
manage_transport_submenu.append(item) manage_transport_submenu.append(item)
# Block # Block
@ -6157,7 +6157,7 @@ class RosterWindow:
if gajim.account_is_disconnected(account): if gajim.account_is_disconnected(account):
item.set_sensitive(False) item.set_sensitive(False)
item = Gtk.SeparatorMenuItem() # separator item = Gtk.SeparatorMenuItem.new() # separator
menu.append(item) menu.append(item)
# Information # Information
@ -6207,7 +6207,7 @@ class RosterWindow:
account) account)
menu.append(disconnect_menuitem) menu.append(disconnect_menuitem)
item = Gtk.SeparatorMenuItem() # separator item = Gtk.SeparatorMenuItem.new() # separator
menu.append(item) menu.append(item)
history_menuitem = Gtk.ImageMenuItem(_('_History')) history_menuitem = Gtk.ImageMenuItem(_('_History'))
@ -6284,7 +6284,7 @@ class RosterWindow:
""" """
Add a seperator and History Manager menuitem BELOW for account menuitems Add a seperator and History Manager menuitem BELOW for account menuitems
""" """
item = Gtk.SeparatorMenuItem() # separator item = Gtk.SeparatorMenuItem.new() # separator
menu.append(item) menu.append(item)
# History manager # History manager
@ -6308,7 +6308,7 @@ class RosterWindow:
# User has at least one bookmark. # User has at least one bookmark.
if gajim.connections[account].bookmarks: if gajim.connections[account].bookmarks:
item = Gtk.SeparatorMenuItem() item = Gtk.SeparatorMenuItem.new()
gc_sub_menu.append(item) gc_sub_menu.append(item)
for bookmark in gajim.connections[account].bookmarks: for bookmark in gajim.connections[account].bookmarks:

8
src/statusicon.py
View file

@ -235,7 +235,7 @@ class StatusIcon:
sub_menu.append(item) sub_menu.append(item)
item.connect('activate', self.on_show_menuitem_activate, show) item.connect('activate', self.on_show_menuitem_activate, show)
item = Gtk.SeparatorMenuItem() item = Gtk.SeparatorMenuItem.new()
sub_menu.append(item) sub_menu.append(item)
item = Gtk.ImageMenuItem(_('_Change Status Message...')) item = Gtk.ImageMenuItem(_('_Change Status Message...'))
@ -249,7 +249,7 @@ class StatusIcon:
connected_accounts_with_private_storage = 0 connected_accounts_with_private_storage = 0
item = Gtk.SeparatorMenuItem() item = Gtk.SeparatorMenuItem.new()
sub_menu.append(item) sub_menu.append(item)
uf_show = helpers.get_uf_show('offline', use_mnemonic = True) uf_show = helpers.get_uf_show('offline', use_mnemonic = True)
@ -336,7 +336,7 @@ class StatusIcon:
gc_item.set_submenu(gc_menuitem_menu) gc_item.set_submenu(gc_menuitem_menu)
gc_sub_menu.show_all() gc_sub_menu.show_all()
newitem = Gtk.SeparatorMenuItem() # separator newitem = Gtk.SeparatorMenuItem.new() # separator
gc_sub_menu.append(newitem) gc_sub_menu.append(newitem)
newitem = Gtk.ImageMenuItem(_('_Manage Bookmarks...')) newitem = Gtk.ImageMenuItem(_('_Manage Bookmarks...'))
img = Gtk.Image.new_from_stock(Gtk.STOCK_PREFERENCES, Gtk.IconSize.MENU) img = Gtk.Image.new_from_stock(Gtk.STOCK_PREFERENCES, Gtk.IconSize.MENU)
@ -363,7 +363,7 @@ class StatusIcon:
if os.name == 'nt': if os.name == 'nt':
if self.added_hide_menuitem is False: if self.added_hide_menuitem is False:
self.systray_context_menu.prepend(Gtk.SeparatorMenuItem()) self.systray_context_menu.prepend(Gtk.SeparatorMenuItem.new())
item = Gtk.MenuItem(_('Hide this menu')) item = Gtk.MenuItem(_('Hide this menu'))
self.systray_context_menu.prepend(item) self.systray_context_menu.prepend(item)
self.added_hide_menuitem = True self.added_hide_menuitem = True