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

don't change selection while Drag and Droping. fixes #2532

Browse source
This commit is contained in:
Yann Leboulanger 2006-12-29 17:41:13 +00:00
parent 5e424e873f
commit 9284e84f3e
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/roster_window.py
View file

@ -150,6 +150,9 @@ class RosterWindow:
self.add_contact_to_roster(jid, account) self.add_contact_to_roster(jid, account)
iters = self.get_contact_iter(jid, account) iters = self.get_contact_iter(jid, account)
path = self.tree.get_model().get_path(iters[0]) path = self.tree.get_model().get_path(iters[0])
if self.draging:
# do not change selection while DND'ing
return
# popup == False so we show awaiting event in roster # popup == False so we show awaiting event in roster
# show and select contact line in roster (even if he is not in roster) # show and select contact line in roster (even if he is not in roster)
self.tree.expand_row(path[0:1], False) self.tree.expand_row(path[0:1], False)
@ -3111,10 +3114,11 @@ class RosterWindow:
if popup: if popup:
if not ctrl: if not ctrl:
self.new_chat(contact, account, resource = resource_for_chat) self.new_chat(contact, account, resource = resource_for_chat)
if path: if path and not self.draging:
# we curently see contact in our roster OR he # we curently see contact in our roster OR he
# is not in the roster at all. # is not in the roster at all.
# show and select his line in roster # show and select his line in roster
# do not change selection while DND'ing
self.tree.expand_row(path[0:1], False) self.tree.expand_row(path[0:1], False)
self.tree.expand_row(path[0:2], False) self.tree.expand_row(path[0:2], False)
self.tree.scroll_to_cell(path) self.tree.scroll_to_cell(path)
@ -3915,6 +3919,12 @@ class RosterWindow:
data = model[path][C_JID] data = model[path][C_JID]
selection.set(selection.target, 8, data) selection.set(selection.target, 8, data)
def drag_begin(self, treeview, context):
self.draging = True
def drag_end(self, treeview, context):
self.draging = False
def on_drop_in_contact(self, widget, account_source, c_source, account_dest, def on_drop_in_contact(self, widget, account_source, c_source, account_dest,
c_dest, was_big_brother, context, etime): c_dest, was_big_brother, context, etime):
if not gajim.connections[account_source].metacontacts_supported or not \ if not gajim.connections[account_source].metacontacts_supported or not \
@ -4397,6 +4407,8 @@ class RosterWindow:
self.tree.enable_model_drag_source(gtk.gdk.BUTTON1_MASK, TARGETS, self.tree.enable_model_drag_source(gtk.gdk.BUTTON1_MASK, TARGETS,
gtk.gdk.ACTION_DEFAULT | gtk.gdk.ACTION_MOVE | gtk.gdk.ACTION_COPY) gtk.gdk.ACTION_DEFAULT | gtk.gdk.ACTION_MOVE | gtk.gdk.ACTION_COPY)
self.tree.enable_model_drag_dest(TARGETS2, gtk.gdk.ACTION_DEFAULT) self.tree.enable_model_drag_dest(TARGETS2, gtk.gdk.ACTION_DEFAULT)
self.tree.connect('drag_begin', self.drag_begin)
self.tree.connect('drag_end', self.drag_end)
self.tree.connect('drag_data_get', self.drag_data_get_data) self.tree.connect('drag_data_get', self.drag_data_get_data)
self.tree.connect('drag_data_received', self.drag_data_received_data) self.tree.connect('drag_data_received', self.drag_data_received_data)
self.xml.signal_autoconnect(self) self.xml.signal_autoconnect(self)