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

Change also context menu 'send status' icon in roster.

This commit is contained in:
Julien Pivotto 2007-06-03 16:42:43 +00:00
parent 24f42e7549
commit 99f36260f9
2 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/gajim.py
View File

@ -2215,7 +2215,8 @@ class Interface:
# handler when an emoticon is clicked in emoticons_menu # handler when an emoticon is clicked in emoticons_menu
self.emoticon_menuitem_clicked = None self.emoticon_menuitem_clicked = None
self.minimized_controls = {} self.minimized_controls = {}
self.status_sent = {} self.status_sent_to_users = {}
self.status_sent_to_groups = {}
self.default_colors = { self.default_colors = {
'inmsgcolor': gajim.config.get('inmsgcolor'), 'inmsgcolor': gajim.config.get('inmsgcolor'),
'outmsgcolor': gajim.config.get('outmsgcolor'), 'outmsgcolor': gajim.config.get('outmsgcolor'),

36
src/roster_window.py
View File

@ -2005,10 +2005,10 @@ class RosterWindow:
add_special_notification_menuitem.set_no_show_all(True) add_special_notification_menuitem.set_no_show_all(True)
# send custom status icon # send custom status icon
if gajim.interface.status_sent.has_key(account) and \ if gajim.interface.status_sent_to_users.has_key(account) and \
jid in gajim.interface.status_sent[account]: jid in gajim.interface.status_sent_to_users[account]:
send_custom_status_menuitem.set_image( send_custom_status_menuitem.set_image(
self.load_icon(gajim.interface.status_sent[account][jid])) self.load_icon(gajim.interface.status_sent_to_users[account][jid]))
else: else:
send_custom_status_menuitem.set_image(None) send_custom_status_menuitem.set_image(None)
@ -2521,8 +2521,12 @@ class RosterWindow:
send_custom_status_menuitem = gtk.ImageMenuItem(_('Send Cus_tom Status')) send_custom_status_menuitem = gtk.ImageMenuItem(_('Send Cus_tom Status'))
# add a special img for this menuitem # add a special img for this menuitem
icon = gtk.image_new_from_stock(gtk.STOCK_GO_UP, gtk.ICON_SIZE_MENU) if gajim.interface.status_sent_to_groups.has_key(account) and \
send_custom_status_menuitem.set_image(icon) group in gajim.interface.status_sent_to_groups[account]:
send_custom_status_menuitem.set_image(self.load_icon(
gajim.interface.status_sent_to_groups[account][group]))
else:
send_custom_status_menuitem.set_image(None)
status_menuitems = gtk.Menu() status_menuitems = gtk.Menu()
send_custom_status_menuitem.set_submenu(status_menuitems) send_custom_status_menuitem.set_submenu(status_menuitems)
iconset = gajim.config.get('iconset') iconset = gajim.config.get('iconset')
@ -2532,7 +2536,7 @@ class RosterWindow:
state_images = self.load_iconset(path) state_images = self.load_iconset(path)
status_menuitem = gtk.ImageMenuItem(helpers.get_uf_show(s)) status_menuitem = gtk.ImageMenuItem(helpers.get_uf_show(s))
status_menuitem.connect('activate', self.on_send_custom_status, list_, status_menuitem.connect('activate', self.on_send_custom_status, list_,
s) s, group)
icon = state_images[s] icon = state_images[s]
status_menuitem.set_image(icon) status_menuitem.set_image(icon)
status_menuitems.append(status_menuitem) status_menuitems.append(status_menuitem)
@ -3222,8 +3226,10 @@ class RosterWindow:
gajim.SHOW_LIST.index('invisible') gajim.SHOW_LIST.index('invisible')
gajim.connections[account].change_status(status, txt, auto) gajim.connections[account].change_status(status, txt, auto)
if gajim.interface.status_sent.has_key(account): if gajim.interface.status_sent_to_users.has_key(account):
gajim.interface.status_sent[account] = {} gajim.interface.status_sent_to_users[account] = {}
if gajim.interface.status_sent_to_groups.has_key(account):
gajim.interface.status_sent_to_groups[account] = {}
if not gajim.interface.minimized_controls.has_key(account): if not gajim.interface.minimized_controls.has_key(account):
gajim.interface.minimized_controls[account] = {} gajim.interface.minimized_controls[account] = {}
for gc_control in gajim.interface.msg_win_mgr.get_controls( for gc_control in gajim.interface.msg_win_mgr.get_controls(
@ -3286,16 +3292,22 @@ class RosterWindow:
else: else:
change(None, account, status) change(None, account, status)
def on_send_custom_status(self, widget, contact_list, show): def on_send_custom_status(self, widget, contact_list, show, group=None):
'''send custom status''' '''send custom status'''
dlg = dialogs.ChangeStatusMessageDialog(show) dlg = dialogs.ChangeStatusMessageDialog(show)
message = dlg.run() message = dlg.run()
if message is not None: # None if user pressed Cancel if message is not None: # None if user pressed Cancel
for (contact, account) in contact_list: for (contact, account) in contact_list:
accounts = []
if group and account not in accounts:
if not gajim.interface.status_sent_to_groups.has_key(account):
gajim.interface.status_sent_to_groups[account] = {}
gajim.interface.status_sent_to_groups[account][group] = show
accounts.append(group)
self.send_status(account, show, message, to = contact.jid) self.send_status(account, show, message, to = contact.jid)
if not gajim.interface.status_sent.has_key(account): if not gajim.interface.status_sent_to_users.has_key(account):
gajim.interface.status_sent[account] = {} gajim.interface.status_sent_to_users[account] = {}
gajim.interface.status_sent[account][contact.jid] = show gajim.interface.status_sent_to_users[account][contact.jid] = show
def on_status_combobox_changed(self, widget): def on_status_combobox_changed(self, widget):
'''When we change our status via the combobox''' '''When we change our status via the combobox'''