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

fix DND problem when we use single click to open chat window. see #2072

This commit is contained in:
Yann Leboulanger 2007-09-14 19:16:54 +00:00
parent 41965de958
commit 1c7e5483fc
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data/glade/roster_window.glade
View File

@ -346,6 +346,7 @@
<signal name="row_expanded" handler="on_roster_treeview_row_expanded"/> <signal name="row_expanded" handler="on_roster_treeview_row_expanded"/>
<signal name="key_press_event" handler="on_roster_treeview_key_press_event"/> <signal name="key_press_event" handler="on_roster_treeview_key_press_event"/>
<signal name="row_activated" handler="on_roster_treeview_row_activated"/> <signal name="row_activated" handler="on_roster_treeview_row_activated"/>
<signal name="button_release_event" handler="on_roster_treeview_button_release_event"/>
<signal name="scroll_event" handler="on_roster_treeview_scroll_event"/> <signal name="scroll_event" handler="on_roster_treeview_scroll_event"/>
<signal name="style_set" handler="on_roster_treeview_style_set"/> <signal name="style_set" handler="on_roster_treeview_style_set"/>
</widget> </widget>

20
src/roster_window.py
View File

@ -3221,6 +3221,21 @@ class RosterWindow:
return True return True
def on_roster_treeview_button_release_event(self, widget, event):
try:
path, column, x, y = self.tree.get_path_at_pos(int(event.x),
int(event.y))
except TypeError:
return False
if event.button == 1: # Left click
if gajim.single_click and not event.state & gtk.gdk.SHIFT_MASK and \
not event.state & gtk.gdk.CONTROL_MASK:
# Check if button has been pressed on the same row
if self.clicked_path == path:
self.on_row_activated(widget, path)
self.clicked_path = None
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()
@ -3281,6 +3296,10 @@ class RosterWindow:
type_ = model[path][C_TYPE] type_ = model[path][C_TYPE]
if gajim.single_click and not event.state & gtk.gdk.SHIFT_MASK and \ if gajim.single_click and not event.state & gtk.gdk.SHIFT_MASK and \
not event.state & gtk.gdk.CONTROL_MASK: not event.state & gtk.gdk.CONTROL_MASK:
# We just save on which row we press button, and open chat window on
# button release to be able to do DND without opening chat window
self.clicked_path = path
return
self.on_row_activated(widget, path) self.on_row_activated(widget, path)
else: else:
if type_ == 'group' and x < 27: if type_ == 'group' and x < 27:
@ -5130,6 +5149,7 @@ class RosterWindow:
self.profile_avatar_menuitem_handler_id = False self.profile_avatar_menuitem_handler_id = False
self.actions_menu_needs_rebuild = True self.actions_menu_needs_rebuild = True
self.regroup = gajim.config.get('mergeaccounts') self.regroup = gajim.config.get('mergeaccounts')
self.clicked_path = None # Used remember on wich row we clicked
if len(gajim.connections) < 2: # Do not merge accounts if only one exists if len(gajim.connections) < 2: # Do not merge accounts if only one exists
self.regroup = False self.regroup = False
#FIXME: When list_accel_closures will be wrapped in pygtk #FIXME: When list_accel_closures will be wrapped in pygtk