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

Dnd is back

Browse source
This commit is contained in:
Yann Leboulanger 2013-08-01 11:41:37 +02:00
parent 025f879f25
commit 97d9991a48
2 changed files with 18 additions and 15 deletions

2
src/common/helpers.py
View file

@ -410,7 +410,7 @@ def build_command(executable, parameter):
return command return command
def get_file_path_from_dnd_dropped_uri(uri): def get_file_path_from_dnd_dropped_uri(uri):
path = urllib.unquote(uri) # escape special chars path = urllib.parse.unquote(uri) # escape special chars
path = path.strip('\r\n\x00') # remove \r\n and NULL path = path.strip('\r\n\x00') # remove \r\n and NULL
# get the path to file # get the path to file
if re.match('^file:///[a-zA-Z]:/', path): # windows if re.match('^file:///[a-zA-Z]:/', path): # windows

31
src/roster_window.py
View file

@ -4453,7 +4453,7 @@ class RosterWindow:
data = '' data = ''
if path.get_depth() >= 2: if path.get_depth() >= 2:
data = model[path][C_JID] data = model[path][C_JID]
selection.set(selection.target, 8, data) selection.set_text(data, -1)
def drag_begin(self, treeview, context): def drag_begin(self, treeview, context):
self.dragging = True self.dragging = True
@ -4619,14 +4619,14 @@ class RosterWindow:
self.remove_contact_from_groups(c_source.jid, account, self.remove_contact_from_groups(c_source.jid, account,
[grp_source]) [grp_source])
if context.action in (Gdk.DragAction.MOVE, Gdk.DragAction.COPY): if context.get_action() in (Gdk.DragAction.MOVE, Gdk.DragAction.COPY):
context.finish(True, True, etime) context.finish(True, True, etime)
def drag_drop(self, treeview, context, x, y, timestamp): def drag_drop(self, treeview, context, x, y, timestamp):
target_list = treeview.drag_dest_get_target_list() target_list = treeview.drag_dest_get_target_list()
target = treeview.drag_dest_find_target(context, target_list) target = treeview.drag_dest_find_target(context, target_list)
treeview.drag_get_data(context, target) treeview.drag_get_data(context, target, 0)
context.finish(False, True) context.finish(False, True, 0)
return True return True
def move_group(self, old_name, new_name, account): def move_group(self, old_name, new_name, account):
@ -4637,14 +4637,15 @@ class RosterWindow:
def drag_data_received_data(self, treeview, context, x, y, selection, info, def drag_data_received_data(self, treeview, context, x, y, selection, info,
etime): etime):
treeview.stop_emission('drag_data_received') treeview.stop_emission_by_name('drag_data_received')
drop_info = treeview.get_dest_row_at_pos(x, y) drop_info = treeview.get_dest_row_at_pos(x, y)
if not drop_info: if not drop_info:
return return
if not selection.data: data = selection.get_data().decode()
if not data:
return # prevents tb when several entrys are dragged return # prevents tb when several entrys are dragged
model = treeview.get_model() model = treeview.get_model()
data = selection.data
path_dest, position = drop_info path_dest, position = drop_info
if position == Gtk.TreeViewDropPosition.BEFORE and len(path_dest) == 2 \ if position == Gtk.TreeViewDropPosition.BEFORE and len(path_dest) == 2 \
@ -6611,13 +6612,15 @@ class RosterWindow:
# signals # signals
self.TARGET_TYPE_URI_LIST = 80 self.TARGET_TYPE_URI_LIST = 80
TARGETS = [('MY_TREE_MODEL_ROW', self.tree.enable_model_drag_source(Gdk.ModifierType.BUTTON1_MASK,
Gtk.TargetFlags.SAME_APP | Gtk.TargetFlags.SAME_WIDGET, 0)] [], Gdk.DragAction.DEFAULT | Gdk.DragAction.MOVE | \
TARGETS2 = [('MY_TREE_MODEL_ROW', Gtk.TargetFlags.SAME_WIDGET, 0), Gdk.DragAction.COPY)
('text/uri-list', 0, self.TARGET_TYPE_URI_LIST)] self.tree.drag_source_add_text_targets()
self.tree.enable_model_drag_source(Gdk.ModifierType.BUTTON1_MASK, TARGETS, self.tree.enable_model_drag_dest([], Gdk.DragAction.DEFAULT)
Gdk.DragAction.DEFAULT | Gdk.DragAction.MOVE | Gdk.DragAction.COPY) dst_targets = Gtk.TargetList.new([])
self.tree.enable_model_drag_dest(TARGETS2, Gdk.DragAction.DEFAULT) dst_targets.add_text_targets(0)
dst_targets.add_uri_targets(self.TARGET_TYPE_URI_LIST)
self.tree.drag_dest_set_target_list(dst_targets)
self.tree.connect('drag_begin', self.drag_begin) self.tree.connect('drag_begin', self.drag_begin)
self.tree.connect('drag_end', self.drag_end) self.tree.connect('drag_end', self.drag_end)
self.tree.connect('drag_drop', self.drag_drop) self.tree.connect('drag_drop', self.drag_drop)