From ebb9b53589d83a30741a5bc4fdb7a9ed80ddeba4 Mon Sep 17 00:00:00 2001 From: Bastien Jacquet Date: Sun, 26 Oct 2014 10:12:19 +0100 Subject: [PATCH] Add Support for dragging from the add/choose selector of Place/Source/Media/Note-Entry --- gramps/gui/editors/editcitation.py | 1 + gramps/gui/editors/editevent.py | 1 + gramps/gui/editors/editeventref.py | 1 + gramps/gui/editors/editldsord.py | 2 + gramps/gui/editors/objectentries.py | 125 +++++++++++++--------------- gramps/gui/glade/editcitation.glade | 16 ++-- gramps/gui/glade/editevent.glade | 15 ++-- gramps/gui/glade/editeventref.glade | 15 ++-- gramps/gui/glade/editldsord.glade | 14 +++- 9 files changed, 106 insertions(+), 84 deletions(-) diff --git a/gramps/gui/editors/editcitation.py b/gramps/gui/editors/editcitation.py index ab8d1fe68..0ca190d82 100644 --- a/gramps/gui/editors/editcitation.py +++ b/gramps/gui/editors/editcitation.py @@ -172,6 +172,7 @@ class EditCitation(EditPrimary): """ self.source_field = SourceEntry(self.dbstate, self.uistate, self.track, self.glade.get_object("source"), + self.glade.get_object("source_event_box"), self.obj.set_reference_handle, self.obj.get_reference_handle, self.add_del_btn, self.share_btn, diff --git a/gramps/gui/editors/editevent.py b/gramps/gui/editors/editevent.py index 5c7ef8381..88b31095f 100644 --- a/gramps/gui/editors/editevent.py +++ b/gramps/gui/editors/editevent.py @@ -137,6 +137,7 @@ class EditEvent(EditPrimary): self.place_field = PlaceEntry(self.dbstate, self.uistate, self.track, self.top.get_object("place"), + self.top.get_object("place_event_box"), self.obj.set_place_handle, self.obj.get_place_handle, self.add_del_btn, self.share_btn) diff --git a/gramps/gui/editors/editeventref.py b/gramps/gui/editors/editeventref.py index 04dac44ba..8c19d720d 100644 --- a/gramps/gui/editors/editeventref.py +++ b/gramps/gui/editors/editeventref.py @@ -132,6 +132,7 @@ class EditEventRef(EditReference): self.uistate, self.track, self.top.get_object("eer_place"), + self.top.get_object("eer_place_event_box"), self.source.set_place_handle, self.source.get_place_handle, self.share_btn, diff --git a/gramps/gui/editors/editldsord.py b/gramps/gui/editors/editldsord.py index 9d86ed9cd..4f4d8c6dc 100644 --- a/gramps/gui/editors/editldsord.py +++ b/gramps/gui/editors/editldsord.py @@ -186,6 +186,7 @@ class EditLdsOrd(EditSecondary): self.uistate, self.track, self.top.get_object("place"), + self.top.get_object("place_event_box"), self.obj.set_place_handle, self.obj.get_place_handle, self.add_del_btn, @@ -373,6 +374,7 @@ class EditFamilyLdsOrd(EditSecondary): self.uistate, self.track, self.top.get_object("place"), + self.top.get_object("place_event_box"), self.obj.set_place_handle, self.obj.get_place_handle, self.add_del_btn, diff --git a/gramps/gui/editors/objectentries.py b/gramps/gui/editors/objectentries.py index 7f2331ad4..32bef6d61 100644 --- a/gramps/gui/editors/objectentries.py +++ b/gramps/gui/editors/objectentries.py @@ -74,11 +74,14 @@ class ObjEntry(object): SHARE_STR = "" ADD_STR = "" DEL_STR = "" + _DND_TYPE = None + _DND_ICON = None - def __init__(self, dbstate, uistate, track, label, set_val, + def __init__(self, dbstate, uistate, track, label, label_event_box, set_val, get_val, add_edt, share, callback=None): """Pass the dbstate and uistate and present track. label is a Gtk.Label that shows the persent value + label_event_box is a Gtk.EventBox used for allowing drag from the label set_val is function that is called when handle changes, use it to update the calling module get_val is function that is called to obtain handle from calling @@ -88,6 +91,7 @@ class ObjEntry(object): this button should not be present. """ self.label = label + self.label_event_box = label_event_box self.add_edt = add_edt self.share = share self.dbstate = dbstate @@ -98,8 +102,6 @@ class ObjEntry(object): self.track = track self.callback = callback - #connect drag and drop - self._init_dnd() #set the object specific code self._init_object() @@ -143,10 +145,36 @@ class ObjEntry(object): if self.callback: self.callback() - def _init_dnd(self): - """inheriting objects must set this + def _update_dnd_capability(self): """ - pass + Connect drag and drop of object entry + Drop is always allowed + Drag only allowed when object is set + """ + if self._DND_TYPE: + if not self.label.drag_dest_get_target_list(): + self.label.drag_dest_set(Gtk.DestDefaults.ALL, [], Gdk.DragAction.COPY) + tglist = Gtk.TargetList.new([]) + tglist.add(self._DND_TYPE.atom_drag_type, self._DND_TYPE.target_flags, + self._DND_TYPE.app_id) + self.label.drag_dest_set_target_list(tglist) + self.label.connect('drag_data_received', self.drag_data_received) + # Set the drag action from this box + if self._DND_TYPE: + if self.get_val(): + if not self.label.drag_source_get_target_list(): + self.label_event_box.drag_source_set(Gdk.ModifierType.BUTTON1_MASK, + [], Gdk.DragAction.COPY) + tglist = Gtk.TargetList.new([]) + tglist.add(self._DND_TYPE.atom_drag_type, self._DND_TYPE.target_flags, + self._DND_TYPE.app_id) + self.label_event_box.drag_source_set_target_list(tglist) + if self._DND_ICON: + self.label_event_box.drag_source_set_icon_stock(self._DND_ICON) + self.label_event_box.connect('drag_data_get', self.drag_data_get) + else: + if self.label.drag_source_get_target_list(): + self.label_event_box.drag_source_unset() def _init_object(self): """inheriting objects can use this to set extra variables @@ -192,10 +220,15 @@ class ObjEntry(object): def drag_data_received(self, widget, context, x, y, selection, info, time): (drag_type, idval, obj, val) = pickle.loads(selection.get_data()) - data = self.get_from_handle(obj) self.obj_added(data) - + + def drag_data_get(self, widget, context, sel_data, info, time): + # get the selected object, returning if not is defined + if info == self._DND_TYPE.app_id: + data = (self._DND_TYPE.drag_type, id(self), self.get_val(), 0) + sel_data.set(self._DND_TYPE.atom_drag_type, 8, pickle.dumps(data)) + def obj_added(self, data): """ callback from adding an object to the entry""" self.set_val(data.handle) @@ -254,6 +287,7 @@ class ObjEntry(object): image.show() self.add_edt.add(image) self.add_edt.set_tooltip_text(self.ADD_STR) + self._update_dnd_capability() class PlaceEntry(ObjEntry): """ @@ -267,30 +301,15 @@ class PlaceEntry(ObjEntry): SHARE_STR = _('Select an existing place') ADD_STR = _('Add a new place') DEL_STR = _('Remove place') + _DND_TYPE = DdTargets.PLACE_LINK + _DND_ICON = 'gramps-place' - def __init__(self, dbstate, uistate, track, label, set_val, + def __init__(self, dbstate, uistate, track, label, label_event_box, set_val, get_val, add_edt, share, skip=[]): - ObjEntry.__init__(self, dbstate, uistate, track, label, set_val, + ObjEntry.__init__(self, dbstate, uistate, track, label, label_event_box, set_val, get_val, add_edt, share) self.skip = skip - def _init_dnd(self): - """connect drag and drop of places - """ - self.label.drag_dest_set(Gtk.DestDefaults.ALL, [], Gdk.DragAction.COPY) - tglist = Gtk.TargetList.new([]) - tglist.add(DdTargets.PLACE_LINK.atom_drag_type, DdTargets.PLACE_LINK.target_flags, - DdTargets.PLACE_LINK.app_id) - self.label.drag_dest_set_target_list(tglist) - self.label.connect('drag_data_received', self.drag_data_received) - - def drag_data_received(self, widget, context, x, y, selection, info, time): - (drag_type, idval, obj, val) = pickle.loads(selection.get_data()) - - if obj not in self.skip: - data = self.get_from_handle(obj) - self.obj_added(data) - def get_from_handle(self, handle): """ return the object given the hande """ @@ -321,29 +340,21 @@ class SourceEntry(ObjEntry): Handles the selection of a existing or new Source. Supports Drag and Drop to select a source. """ - EMPTY_TEXT = "%s" % _('First add a source using the buttons') + EMPTY_TEXT = "%s" % _('To select a source, use drag-and-drop ' + 'or use the buttons') EMPTY_TEXT_RED = "%s" % _('First add a source using the button') EDIT_STR = _('Edit source') SHARE_STR = _('Select an existing source') ADD_STR = _('Add a new source') DEL_STR = _('Remove source') + _DND_TYPE = DdTargets.SOURCE_LINK + _DND_ICON = 'gramps-source' - def __init__(self, dbstate, uistate, track, label, set_val, + def __init__(self, dbstate, uistate, track, label, label_event_box, set_val, get_val, add_edt, share, callback): - ObjEntry.__init__(self, dbstate, uistate, track, label, set_val, + ObjEntry.__init__(self, dbstate, uistate, track, label, label_event_box, set_val, get_val, add_edt, share, callback) - def _init_dnd(self): - """connect drag and drop of sources - """ - self.label.drag_dest_set(Gtk.DestDefaults.ALL, [], Gdk.DragAction.COPY) - tglist = Gtk.TargetList.new([]) - tglist.add(DdTargets.SOURCE_LINK.atom_drag_type, - DdTargets.SOURCE_LINK.target_flags, - DdTargets.SOURCE_LINK.app_id) - self.label.drag_dest_set_target_list(tglist) - self.label.connect('drag_data_received', self.drag_data_received) - def get_from_handle(self, handle): """ return the object given the handle """ @@ -382,22 +393,14 @@ class MediaEntry(ObjEntry): SHARE_STR = _('Select an existing media object') ADD_STR = _('Add a new media object') DEL_STR = _('Remove media object') + _DND_TYPE = DdTargets.MEDIAOBJ + _DND_ICON = 'gramps-media' - def __init__(self, dbstate, uistate, track, label, set_val, + def __init__(self, dbstate, uistate, track, label, label_event_box, set_val, get_val, add_edt, share): - ObjEntry.__init__(self, dbstate, uistate, track, label, set_val, + ObjEntry.__init__(self, dbstate, uistate, track, label, label_event_box, set_val, get_val, add_edt, share) - def _init_dnd(self): - """connect drag and drop of places - """ - self.label.drag_dest_set(Gtk.DestDefaults.ALL, [], Gdk.DragAction.COPY) - tglist = Gtk.TargetList.new([]) - tglist.add(DdTargets.MEDIAOBJ.atom_drag_type, DdTargets.MEDIAOBJ.target_flags, - DdTargets.MEDIAOBJ.app_id) - self.label.drag_dest_set_target_list(tglist) - self.label.connect('drag_data_received', self.drag_data_received) - def get_from_handle(self, handle): """ return the object given the hande """ @@ -436,10 +439,12 @@ class NoteEntry(ObjEntry): SHARE_STR = _('Select an existing note') ADD_STR = _('Add a new note') DEL_STR = _('Remove note') + _DND_TYPE = DdTargets.NOTE_LINK + _DND_ICON = 'gramps-notes' - def __init__(self, dbstate, uistate, track, label, set_val, + def __init__(self, dbstate, uistate, track, label, label_event_box, set_val, get_val, add_edt, share): - ObjEntry.__init__(self, dbstate, uistate, track, label, set_val, + ObjEntry.__init__(self, dbstate, uistate, track, label, label_event_box, set_val, get_val, add_edt, share) self.notetype = None @@ -453,16 +458,6 @@ class NoteEntry(ObjEntry): """ return self.notetype - def _init_dnd(self): - """connect drag and drop of places - """ - self.label.drag_dest_set(Gtk.DestDefaults.ALL, [], Gdk.DragAction.COPY) - tglist = Gtk.TargetList.new([]) - tglist.add(DdTargets.NOTE_LINK.atom_drag_type, DdTargets.NOTE_LINK.target_flags, - DdTargets.NOTE_LINK.app_id) - self.label.drag_dest_set_target_list(tglist) - self.label.connect('drag_data_received', self.drag_data_received) - def get_from_handle(self, handle): """ return the object given the hande """ diff --git a/gramps/gui/glade/editcitation.glade b/gramps/gui/glade/editcitation.glade index 922007166..e695687ec 100644 --- a/gramps/gui/glade/editcitation.glade +++ b/gramps/gui/glade/editcitation.glade @@ -308,11 +308,17 @@ Very High =Direct and primary evidence used, or by dominance of the evidence

True False - - - True - False - 0 + source_event_box + + False + + + True + False + 0 + end + + True diff --git a/gramps/gui/glade/editevent.glade b/gramps/gui/glade/editevent.glade index 64011219e..00fd6e272 100644 --- a/gramps/gui/glade/editevent.glade +++ b/gramps/gui/glade/editevent.glade @@ -236,11 +236,16 @@ True False - - True - False - 0 - end + + False + + + True + False + 0 + end + + True diff --git a/gramps/gui/glade/editeventref.glade b/gramps/gui/glade/editeventref.glade index facdbd12b..2b0824d6b 100644 --- a/gramps/gui/glade/editeventref.glade +++ b/gramps/gui/glade/editeventref.glade @@ -316,11 +316,16 @@ True False - - True - False - 0 - + + False + + + True + False + 0 + + + True True diff --git a/gramps/gui/glade/editldsord.glade b/gramps/gui/glade/editldsord.glade index adcd02b25..439194901 100644 --- a/gramps/gui/glade/editldsord.glade +++ b/gramps/gui/glade/editldsord.glade @@ -346,10 +346,16 @@ True False - - True - False - 0 + + False + + + True + False + 0 + end + + True