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

restore old behaviour of systray: left click open pending event if any, else hide/show roster. Fixes #4436

This commit is contained in:
Yann Leboulanger 2009-02-12 11:07:09 +00:00
parent a1c40f9b08
commit 70ade3b845
1 changed files with 22 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/systray.py
View File

@ -64,10 +64,6 @@ class Systray:
self.added_hide_menuitem = False self.added_hide_menuitem = False
self.img_tray = gtk.Image() self.img_tray = gtk.Image()
self.status = 'offline' self.status = 'offline'
self.double_click = False
self.double_click_id = None
self.double_click_time = gtk.settings_get_default().get_property(
'gtk-double-click-time')
self.xml = gtkgui_helpers.get_glade('systray_context_menu.glade') self.xml = gtkgui_helpers.get_glade('systray_context_menu.glade')
self.systray_context_menu = self.xml.get_widget('systray_context_menu') self.systray_context_menu = self.xml.get_widget('systray_context_menu')
self.xml.signal_autoconnect(self) self.xml.signal_autoconnect(self)
@ -327,26 +323,25 @@ class Systray:
gajim.interface.roster.on_quit_request() gajim.interface.roster.on_quit_request()
def on_left_click(self): def on_left_click(self):
self.double_click_id = None
if self.double_click:
self.double_click = False
return
win = gajim.interface.roster.window win = gajim.interface.roster.window
# toggle visible/hidden for roster window if len(gajim.events.get_systray_events()) == 0:
if win.get_property('visible') and (win.get_property('has-toplevel-focus') or \ # No pending events, so toggle visible/hidden for roster window
os.name == 'nt'): if win.get_property('visible') and (win.get_property(
# visible in ANY virtual desktop? 'has-toplevel-focus')):
# visible in ANY virtual desktop?
# we could be in another VD right now. eg vd2 # we could be in another VD right now. eg vd2
# and we want to show it in vd2 # and we want to show it in vd2
if not gtkgui_helpers.possibly_move_window_in_current_desktop(win): if not gtkgui_helpers.possibly_move_window_in_current_desktop(win):
win.hide() # else we hide it from VD that was visible in win.hide() # else we hide it from VD that was visible in
else:
# in Windows (perhaps other Window Managers too) minimize state
# is remembered, so make sure it's not minimized (iconified)
# because user wants to see roster
win.deiconify()
win.present()
else: else:
# in Windows (perhaps other Window Managers too) minimize state self.handle_first_event()
# is remembered, so make sure it's not minimized (iconified)
# because user wants to see roster
win.deiconify()
win.present()
def handle_first_event(self): def handle_first_event(self):
account, jid, event = gajim.events.get_first_systray_event() account, jid, event = gajim.events.get_first_systray_event()
@ -355,27 +350,18 @@ class Systray:
def on_middle_click(self): def on_middle_click(self):
'''middle click raises window to have complete focus (fe. get kbd events) '''middle click raises window to have complete focus (fe. get kbd events)
but if already raised, it hides it''' but if already raised, it hides it'''
if gajim.events.get_nb_systray_events() == 0: win = gajim.interface.roster.window
return if win.is_active(): # is it fully raised? (eg does it receive kbd events?)
self.handle_first_event() win.hide()
else:
win.present()
def on_clicked(self, widget, event): def on_clicked(self, widget, event):
self.on_tray_leave_notify_event(widget, None) self.on_tray_leave_notify_event(widget, None)
if event.type == gtk.gdk._2BUTTON_PRESS:
if len(gajim.events.get_systray_events()) == 0:
return
self.double_click = True
self.on_middle_click()
if event.type != gtk.gdk.BUTTON_PRESS: if event.type != gtk.gdk.BUTTON_PRESS:
return return
if event.button == 1: # Left click if event.button == 1: # Left click
if len(gajim.events.get_systray_events()) == 0: self.on_left_click()
self.on_left_click()
else:
if self.double_click_id:
gobject.source_remove(self.double_click_id)
self.double_click_id = gobject.timeout_add(
self.double_click_time, self.on_left_click)
elif event.button == 2: # middle click elif event.button == 2: # middle click
self.on_middle_click() self.on_middle_click()
elif event.button == 3: # right click elif event.button == 3: # right click