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

when clicking on a contact in roster : remove duplicate code, also open awaiting events when middle clicking 

instead of always open chat
This commit is contained in:
Jean-Marie Traissard 2006-05-21 19:35:33 +00:00
parent d0bb4b3f53
commit c462cbba16
1 changed files with 8 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/roster_window.py
View File

@ -1715,13 +1715,14 @@ _('If "%s" accepts this request you will know his or her status.') % jid)
def on_roster_treeview_button_press_event(self, widget, event): def on_roster_treeview_button_press_event(self, widget, event):
# hide tooltip, no matter the button is pressed # hide tooltip, no matter the button is pressed
self.tooltip.hide_tooltip() self.tooltip.hide_tooltip()
if event.button == 3: # Right click
try: try:
path, column, x, y = self.tree.get_path_at_pos(int(event.x), path, column, x, y = self.tree.get_path_at_pos(int(event.x),
int(event.y)) int(event.y))
except TypeError: except TypeError:
self.tree.get_selection().unselect_all() self.tree.get_selection().unselect_all()
return return False
if event.button == 3: # Right click
self.tree.get_selection().select_path(path) self.tree.get_selection().select_path(path)
model = self.tree.get_model() model = self.tree.get_model()
iter = model.get_iter(path) iter = model.get_iter(path)
@ -1729,28 +1730,12 @@ _('If "%s" accepts this request you will know his or her status.') % jid)
return True return True
elif event.button == 2: # Middle click elif event.button == 2: # Middle click
try:
path, column, x, y = self.tree.get_path_at_pos(int(event.x),
int(event.y))
except TypeError:
self.tree.get_selection().unselect_all()
return
self.tree.get_selection().select_path(path) self.tree.get_selection().select_path(path)
model = self.tree.get_model() model = self.tree.get_model()
iter = model.get_iter(path) iter = model.get_iter(path)
type = model[iter][C_TYPE] type = model[iter][C_TYPE]
if type in ('agent', 'contact'): if type in ('agent', 'contact'):
account = model[iter][C_ACCOUNT].decode('utf-8') self.on_roster_treeview_row_activated(widget, path)
jid = model[iter][C_JID].decode('utf-8')
win = None
c = gajim.contacts.get_contact_with_highest_priority(account, jid)
if gajim.interface.msg_win_mgr.has_window(c.jid, account):
win = gajim.interface.msg_win_mgr.get_window(c.jid, account)
elif c:
self.new_chat(c, account)
win = gajim.interface.msg_win_mgr.get_window(jid, account)
win.set_active_tab(jid, account)
win.window.present()
elif type == 'account': elif type == 'account':
account = model[iter][C_ACCOUNT].decode('utf-8') account = model[iter][C_ACCOUNT].decode('utf-8')
if account != 'all': if account != 'all':
@ -1774,12 +1759,6 @@ _('If "%s" accepts this request you will know his or her status.') % jid)
return True return True
elif event.button == 1: # Left click elif event.button == 1: # Left click
try:
path, column, x, y = self.tree.get_path_at_pos(int(event.x),
int(event.y))
except TypeError:
self.tree.get_selection().unselect_all()
return False
model = self.tree.get_model() model = self.tree.get_model()
iter = model.get_iter(path) iter = model.get_iter(path)
type = model[iter][C_TYPE] type = model[iter][C_TYPE]