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

use kbd_input.png (previously rename.png) for rename menuitems in roster;better names for making menus methods in roster;add (comment out though as it has a problem) rename for transport

This commit is contained in:
Nikos Kouremenos 2006-03-29 16:42:06 +00:00
parent f5b37e61b2
commit cb28e2124d
3 changed files with 42 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
data/pixmaps/rename.png → data/pixmaps/kbd_input.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 189 B

After

Width:  |  Height:  |  Size: 189 B

76
src/roster_window.py
View File

@ -1062,7 +1062,7 @@ class RosterWindow:
if jid.endswith('@' + contact.jid): if jid.endswith('@' + contact.jid):
c = gajim.contacts.get_first_contact_from_jid(account, jid) c = gajim.contacts.get_first_contact_from_jid(account, jid)
gajim.log.debug( gajim.log.debug(
'Removing contact %s due to unregistered transport %s'\ 'Removing contact %s due to unregistered transport %s'\
% (jid, contact.jid)) % (jid, contact.jid))
gajim.connections[account].unsubscribe(c.jid) gajim.connections[account].unsubscribe(c.jid)
# Transport contacts can't have 2 resources # Transport contacts can't have 2 resources
@ -1151,7 +1151,7 @@ class RosterWindow:
def on_add_special_notification_menuitem_activate(self, widget, jid): def on_add_special_notification_menuitem_activate(self, widget, jid):
dialogs.AddSpecialNotificationDialog(jid) dialogs.AddSpecialNotificationDialog(jid)
def mk_menu_user(self, event, iter): def make_contact_menu(self, event, iter):
'''Make contact's popup menu''' '''Make contact's popup menu'''
model = self.tree.get_model() model = self.tree.get_model()
jid = model[iter][C_JID].decode('utf-8') jid = model[iter][C_JID].decode('utf-8')
@ -1163,7 +1163,6 @@ class RosterWindow:
APP) APP)
roster_contact_context_menu = xml.get_widget( roster_contact_context_menu = xml.get_widget(
'roster_contact_context_menu') 'roster_contact_context_menu')
#childs = roster_contact_context_menu.get_children()
start_chat_menuitem = xml.get_widget('start_chat_menuitem') start_chat_menuitem = xml.get_widget('start_chat_menuitem')
send_single_message_menuitem = xml.get_widget('send_single_message_menuitem') send_single_message_menuitem = xml.get_widget('send_single_message_menuitem')
@ -1178,6 +1177,12 @@ class RosterWindow:
add_special_notification_menuitem.hide() add_special_notification_menuitem.hide()
add_special_notification_menuitem.set_no_show_all(True) add_special_notification_menuitem.set_no_show_all(True)
# add a special img for rename menuitem
path_to_rename_img = os.path.join(gajim.DATA_DIR, 'pixmaps', 'kbd_input.png')
img = gtk.Image()
img.set_from_file(path_to_rename_img)
rename_menuitem.set_image(img)
#skip a separator #skip a separator
subscription_menuitem = xml.get_widget('subscription_menuitem') subscription_menuitem = xml.get_widget('subscription_menuitem')
@ -1273,35 +1278,36 @@ class RosterWindow:
add_to_roster_menuitem.connect('activate', add_to_roster_menuitem.connect('activate',
self.on_add_to_roster, contact, account) self.on_add_to_roster, contact, account)
#TODO create menu for sub contacts #FIXME: create menu for sub contacts
event_button = self.get_possible_button_event(event) event_button = gtkgui_helpers.get_possible_button_event(event)
roster_contact_context_menu.popup(None, None, None, event_button, roster_contact_context_menu.popup(None, None, None, event_button,
event.time) event.time)
roster_contact_context_menu.show_all() roster_contact_context_menu.show_all()
def mk_menu_g(self, event, iter): def make_group_menu(self, event, iter):
'''Make group's popup menu''' '''Make group's popup menu'''
model = self.tree.get_model() model = self.tree.get_model()
path = model.get_path(iter) path = model.get_path(iter)
menu = gtk.Menu() menu = gtk.Menu()
rename_item = gtk.ImageMenuItem(_('Re_name')) #FIXME: this fails. why?
rename_icon = gtk.image_new_from_stock(gtk.STOCK_REFRESH, #rename_item = gtk.ImageMenuItem(_('Re_name'))
#rename_icon = gtk.image_new_from_stock(gtk.STOCK_REFRESH,
gtk.ICON_SIZE_MENU) gtk.ICON_SIZE_MENU)
rename_item.set_image(rename_icon) #rename_item.set_image(rename_icon)
menu.append(rename_item) #menu.append(rename_item)
rename_item.connect('activate', self.on_rename, iter, path) #rename_item.connect('activate', self.on_rename, iter, path)
event_button = self.get_possible_button_event(event) event_button = gtkgui_helpers.get_possible_button_event(event)
menu.popup(None, None, None, event_button, event.time) menu.popup(None, None, None, event_button, event.time)
menu.show_all() menu.show_all()
def mk_menu_agent(self, event, iter): def make_transport_menu(self, event, iter):
'''Make agent's popup menu''' '''Make transport's popup menu'''
model = self.tree.get_model() model = self.tree.get_model()
jid = model[iter][C_JID].decode('utf-8') jid = model[iter][C_JID].decode('utf-8')
path = model.get_path(iter) path = model.get_path(iter)
@ -1325,7 +1331,7 @@ class RosterWindow:
if show in ('offline', 'error'): if show in ('offline', 'error'):
item.set_sensitive(False) item.set_sensitive(False)
item.connect('activate', self.on_agent_logging, jid, 'unavailable', item.connect('activate', self.on_agent_logging, jid, 'unavailable',
account) account)
item = gtk.SeparatorMenuItem() # separator item = gtk.SeparatorMenuItem() # separator
menu.append(item) menu.append(item)
@ -1335,6 +1341,15 @@ class RosterWindow:
item.set_image(icon) item.set_image(icon)
menu.append(item) menu.append(item)
item.connect('activate', self.on_edit_agent, contact, account) item.connect('activate', self.on_edit_agent, contact, account)
item = gtk.ImageMenuItem(_('_Rename'))
# add a special img for rename menuitem
path_to_rename_img = os.path.join(gajim.DATA_DIR, 'pixmaps', 'kbd_input.png')
img = gtk.Image()
img.set_from_file(path_to_rename_img)
item.set_image(img)
menu.append(item)
item.connect('activate', self.on_rename, iter, path)
item = gtk.ImageMenuItem(_('_Remove from Roster')) item = gtk.ImageMenuItem(_('_Remove from Roster'))
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)
@ -1342,27 +1357,19 @@ class RosterWindow:
menu.append(item) menu.append(item)
item.connect('activate', self.on_remove_agent, contact, account) item.connect('activate', self.on_remove_agent, contact, account)
event_button = self.get_possible_button_event(event) event_button = gtkgui_helpers.get_possible_button_event(event)
menu.popup(None, None, None, event_button, event.time) menu.popup(None, None, None, event_button, event.time)
menu.show_all() menu.show_all()
def on_edit_account(self, widget, account): def on_edit_account(self, widget, account):
if gajim.interface.instances[account].has_key('account_modification'): if gajim.interface.instances[account].has_key('account_modification'):
gajim.interface.instances[account]['account_modification'].window.present() gajim.interface.instances[account]['account_modification'].\
window.present()
else: else:
gajim.interface.instances[account]['account_modification'] = \ gajim.interface.instances[account]['account_modification'] = \
config.AccountModificationWindow(account) config.AccountModificationWindow(account)
def get_possible_button_event(self, event):
'''mouse or keyboard caused the event?'''
if event.type == gtk.gdk.KEY_PRESS:
event_button = 0 # no event.button so pass 0
else: # BUTTON_PRESS event, so pass event.button
event_button = event.button
return event_button
def on_change_status_message_activate(self, widget, account): def on_change_status_message_activate(self, widget, account):
show = gajim.SHOW_LIST[gajim.connections[account].connected] show = gajim.SHOW_LIST[gajim.connections[account].connected]
dlg = dialogs.ChangeStatusMessageDialog(show) dlg = dialogs.ChangeStatusMessageDialog(show)
@ -1413,7 +1420,7 @@ class RosterWindow:
sub_menu.append(item) sub_menu.append(item)
item = gtk.ImageMenuItem(_('_Change Status Message')) item = gtk.ImageMenuItem(_('_Change Status Message'))
path = os.path.join(gajim.DATA_DIR, 'pixmaps', 'rename.png') path = os.path.join(gajim.DATA_DIR, 'pixmaps', 'kbd_input.png')
img = gtk.Image() img = gtk.Image()
img.set_from_file(path) img.set_from_file(path)
item.set_image(img) item.set_image(img)
@ -1450,12 +1457,11 @@ class RosterWindow:
self.on_new_message_menuitem_activate, account) self.on_new_message_menuitem_activate, account)
return account_context_menu return account_context_menu
def mk_menu_account(self, event, iter): def make_account_menu(self, event, iter):
'''Make account's popup menu''' '''Make account's popup menu'''
model = self.tree.get_model() model = self.tree.get_model()
account = model[iter][C_ACCOUNT].decode('utf-8') account = model[iter][C_ACCOUNT].decode('utf-8')
if account != 'all': if account != 'all':
menu = self.build_account_menu(account) menu = self.build_account_menu(account)
else: else:
@ -1474,7 +1480,7 @@ class RosterWindow:
item.set_submenu(account_menu) item.set_submenu(account_menu)
menu.append(item) menu.append(item)
event_button = self.get_possible_button_event(event) event_button = gtkgui_helpers.get_possible_button_event(event)
menu.popup(None, self.tree, None, event_button, event.time) menu.popup(None, self.tree, None, event_button, event.time)
menu.show_all() menu.show_all()
@ -1567,13 +1573,13 @@ _('If "%s" accepts this request you will know his or her status.') % jid)
model = self.tree.get_model() model = self.tree.get_model()
type = model[iter][C_TYPE] type = model[iter][C_TYPE]
if type == 'group': if type == 'group':
self.mk_menu_g(event, iter) self.make_group_menu(event, iter)
elif type == 'agent': elif type == 'agent':
self.mk_menu_agent(event, iter) self.make_transport_menu(event, iter)
elif type == 'contact': elif type == 'contact':
self.mk_menu_user(event, iter) self.make_contact_menu(event, iter)
elif type == 'account': elif type == 'account':
self.mk_menu_account(event, iter) self.make_account_menu(event, iter)
def show_treeview_menu(self, event): def show_treeview_menu(self, event):
try: try:
@ -3168,7 +3174,7 @@ _('If "%s" accepts this request you will know his or her status.') % jid)
# Add a Separator (self.iter_is_separator() checks on string SEPARATOR) # Add a Separator (self.iter_is_separator() checks on string SEPARATOR)
liststore.append(['SEPARATOR', None, '', True]) liststore.append(['SEPARATOR', None, '', True])
path = os.path.join(gajim.DATA_DIR, 'pixmaps', 'rename.png') path = os.path.join(gajim.DATA_DIR, 'pixmaps', 'kbd_input.png')
img = gtk.Image() img = gtk.Image()
img.set_from_file(path) img.set_from_file(path)
# sensitivity to False because by default we're offline # sensitivity to False because by default we're offline

2
src/systray.py
View File

@ -144,7 +144,7 @@ class Systray:
sub_menu.append(item) sub_menu.append(item)
item = gtk.ImageMenuItem(_('_Change Status Message...')) item = gtk.ImageMenuItem(_('_Change Status Message...'))
path = os.path.join(gajim.DATA_DIR, 'pixmaps', 'rename.png') path = os.path.join(gajim.DATA_DIR, 'pixmaps', 'kbd_input.png')
img = gtk.Image() img = gtk.Image()
img.set_from_file(path) img.set_from_file(path)
item.set_image(img) item.set_image(img)