Rework transport submenu.

This commit is contained in:
Stephan Erb 2007-08-20 22:22:46 +00:00
parent 0fca2f6323
commit f7d65baccc
1 changed files with 34 additions and 25 deletions

View File

@ -2751,27 +2751,24 @@ class RosterWindow:
contact = gajim.contacts.get_contact_with_highest_priority(account, jid) contact = gajim.contacts.get_contact_with_highest_priority(account, jid)
menu = gtk.Menu() menu = gtk.Menu()
# Log on # Connect/Didconnect
item = gtk.ImageMenuItem(_('_Log on'))
icon = gtk.image_new_from_stock(gtk.STOCK_YES, gtk.ICON_SIZE_MENU)
item.set_image(icon)
menu.append(item)
show = contact.show show = contact.show
if (show != 'offline' and show != 'error') or\ if (show != 'offline' and show != 'error') or\
gajim.account_is_disconnected(account): gajim.account_is_disconnected(account):
item.set_sensitive(False) # Log Off
item.connect('activate', self.on_agent_logging, jid, None, account) item = gtk.ImageMenuItem(_('_Log off'))
icon = gtk.image_new_from_stock(gtk.STOCK_DISCONNECT, gtk.ICON_SIZE_MENU)
# Log off item.connect('activate', self.on_agent_logging, jid, 'unavailable',
item = gtk.ImageMenuItem(_('Log _off')) account)
icon = gtk.image_new_from_stock(gtk.STOCK_NO, gtk.ICON_SIZE_MENU) else:
# Log on
item = gtk.ImageMenuItem(_('_Log on'))
icon = gtk.image_new_from_stock(gtk.STOCK_CONNECT, gtk.ICON_SIZE_MENU)
item.connect('activate', self.on_agent_logging, jid, None, account)
item.set_image(icon) item.set_image(icon)
menu.append(item) menu.append(item)
if show in ('offline', 'error') or gajim.account_is_disconnected( if show == 'error':
account):
item.set_sensitive(False) item.set_sensitive(False)
item.connect('activate', self.on_agent_logging, jid, 'unavailable',
account)
item = gtk.SeparatorMenuItem() # separator item = gtk.SeparatorMenuItem() # separator
menu.append(item) menu.append(item)
@ -2786,11 +2783,19 @@ class RosterWindow:
if gajim.account_is_disconnected(account): if gajim.account_is_disconnected(account):
item.set_sensitive(False) item.set_sensitive(False)
# Edit # Manage Transport submenu
item = gtk.ImageMenuItem(_('_Edit')) item = gtk.ImageMenuItem(_('_Manage Transport'))
icon = gtk.image_new_from_stock(gtk.STOCK_PROPERTIES, gtk.ICON_SIZE_MENU)
item.set_image(icon)
manage_transport_submenu = gtk.Menu()
item.set_submenu(manage_transport_submenu)
menu.append(item)
# Modify Transport
item = gtk.ImageMenuItem(_('_Modify Transport'))
icon = gtk.image_new_from_stock(gtk.STOCK_PREFERENCES, gtk.ICON_SIZE_MENU) icon = gtk.image_new_from_stock(gtk.STOCK_PREFERENCES, gtk.ICON_SIZE_MENU)
item.set_image(icon) item.set_image(icon)
menu.append(item) manage_transport_submenu.append(item)
item.connect('activate', self.on_edit_agent, contact, account) item.connect('activate', self.on_edit_agent, contact, account)
if gajim.account_is_disconnected(account): if gajim.account_is_disconnected(account):
item.set_sensitive(False) item.set_sensitive(False)
@ -2803,23 +2808,27 @@ class RosterWindow:
img = gtk.Image() img = gtk.Image()
img.set_from_file(path_to_kbd_input_img) img.set_from_file(path_to_kbd_input_img)
item.set_image(img) item.set_image(img)
menu.append(item) manage_transport_submenu.append(item)
item.connect('activate', self.on_rename, iter, path) item.connect('activate', self.on_rename, iter, path)
if gajim.account_is_disconnected(account): if gajim.account_is_disconnected(account):
item.set_sensitive(False) item.set_sensitive(False)
item = gtk.SeparatorMenuItem() # sepator item = gtk.SeparatorMenuItem() # separator
menu.append(item) manage_transport_submenu.append(item)
# Remove # Remove
item = gtk.ImageMenuItem(_('_Remove from Roster')) item = gtk.ImageMenuItem(_('_Remove'))
icon = gtk.image_new_from_stock(gtk.STOCK_REMOVE, gtk.ICON_SIZE_MENU) icon = gtk.image_new_from_stock(gtk.STOCK_REMOVE, gtk.ICON_SIZE_MENU)
item.set_image(icon) item.set_image(icon)
menu.append(item) manage_transport_submenu.append(item)
item.connect('activate', self.on_remove_agent, [(contact, account)]) item.connect('activate', self.on_remove_agent, [(contact, account)])
if gajim.account_is_disconnected(account): if gajim.account_is_disconnected(account):
item.set_sensitive(False) item.set_sensitive(False)
item = gtk.SeparatorMenuItem() # separator
menu.append(item)
# Information
information_menuitem = gtk.ImageMenuItem(_('_Information')) information_menuitem = gtk.ImageMenuItem(_('_Information'))
icon = gtk.image_new_from_stock(gtk.STOCK_INFO, gtk.ICON_SIZE_MENU) icon = gtk.image_new_from_stock(gtk.STOCK_INFO, gtk.ICON_SIZE_MENU)
information_menuitem.set_image(icon) information_menuitem.set_image(icon)