Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Drag/drop only one type of source

Browse Source
This commit is contained in:
prculley 2018-10-25 11:45:35 -05:00 committed by Nick Hall
parent a1c02bda9b
commit 73402dfb05
2 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gramps/gui/clipboard.py
View File

@ -1190,10 +1190,7 @@ class ClipboardListView:
def object_drag_data_get(self, widget, context, sel_data, info, time): def object_drag_data_get(self, widget, context, sel_data, info, time):
tree_selection = widget.get_selection() tree_selection = widget.get_selection()
model, paths = tree_selection.get_selected_rows() model, paths = tree_selection.get_selected_rows()
if hasattr(context, "targets"): tgs = context.list_targets()
tgs = context.targets
else:
tgs = context.list_targets()
if len(paths) == 1: if len(paths) == 1:
path = paths[0] path = paths[0]
node = model.get_iter(path) node = model.get_iter(path)
@ -1214,10 +1211,7 @@ class ClipboardListView:
time, title=None, value=None, dbid=None, time, title=None, value=None, dbid=None,
dbname=None): dbname=None):
model = widget.get_model() model = widget.get_model()
if hasattr(selection, "data"): sel_data = selection.get_data()
sel_data = selection.data
else:
sel_data = selection.get_data() # GtkSelectionData
# In Windows time is always zero. Until that is fixed, use the seconds # In Windows time is always zero. Until that is fixed, use the seconds
# of the local time to filter out double drops. # of the local time to filter out double drops.
real_time = strftime("%S") real_time = strftime("%S")
@ -1248,10 +1242,7 @@ class ClipboardListView:
if dragtype in self._target_type_to_wrapper_class_map: if dragtype in self._target_type_to_wrapper_class_map:
possible_wrappers = [dragtype] possible_wrappers = [dragtype]
else: else:
if hasattr(context, "targets"): tgs = [atm.name() for atm in context.list_targets()]
tgs = context.targets
else:
tgs = [atm.name() for atm in context.list_targets()]
possible_wrappers = [ possible_wrappers = [
target for target in tgs target for target in tgs
if target in self._target_type_to_wrapper_class_map] if target in self._target_type_to_wrapper_class_map]
@ -1293,9 +1284,8 @@ class ClipboardListView:
data = [_ob.__class__.DRAG_TARGET.drag_type, _ob, None, data = [_ob.__class__.DRAG_TARGET.drag_type, _ob, None,
_ob._type, _ob._value, _ob._dbid, _ob._dbname] _ob._type, _ob._value, _ob._dbid, _ob._dbname]
contains = model_contains(model, data) contains = model_contains(model, data)
if (contains and not if(contains and not
((context.action if hasattr(context, "action") else (context.get_actions() & Gdk.DragAction.MOVE)):
context.get_actions()) & Gdk.DragAction.MOVE)):
continue continue
drop_info = widget.get_dest_row_at_pos(x, y) drop_info = widget.get_dest_row_at_pos(x, y)
if drop_info: if drop_info:
@ -1313,8 +1303,7 @@ class ClipboardListView:
# FIXME: there is one bug here: if you multi-select and drop # FIXME: there is one bug here: if you multi-select and drop
# on self, then it moves the first, and copies the rest. # on self, then it moves the first, and copies the rest.
if ((context.action if hasattr(context, "action") else if context.get_actions() & Gdk.DragAction.MOVE:
context.get_actions()) & Gdk.DragAction.MOVE):
context.finish(True, True, time) context.finish(True, True, time)
# remember time for double drop workaround. # remember time for double drop workaround.

2
gramps/gui/views/pageview.py
View File

@ -276,7 +276,7 @@ class PageView(DbGUIElement, metaclass=ABCMeta):
def get_data(self): def get_data(self):
return self.data return self.data
class Context: class Context:
targets = [drag_type.name()] targets = [Gdk.atom_intern(drag_type.name(), False)]
action = 1 action = 1
def list_targets(self): def list_targets(self):
return Context.targets return Context.targets