From 13b53e35d41e0bcf43a3e0be24789904189bbd1f Mon Sep 17 00:00:00 2001 From: Nick Hall Date: Fri, 23 Dec 2016 22:01:35 +0000 Subject: [PATCH] Add window track to merge dialogs --- gramps/gui/merge/mergecitation.py | 4 ++-- gramps/gui/merge/mergeevent.py | 4 ++-- gramps/gui/merge/mergefamily.py | 4 ++-- gramps/gui/merge/mergemedia.py | 4 ++-- gramps/gui/merge/mergenote.py | 4 ++-- gramps/gui/merge/mergeperson.py | 6 +++--- gramps/gui/merge/mergeplace.py | 5 +++-- gramps/gui/merge/mergerepository.py | 4 ++-- gramps/gui/merge/mergesource.py | 4 ++-- gramps/plugins/lib/libpersonview.py | 2 +- gramps/plugins/lib/libplaceview.py | 2 +- gramps/plugins/tool/finddupes.py | 4 ++-- gramps/plugins/view/citationlistview.py | 3 ++- gramps/plugins/view/citationtreeview.py | 4 ++-- gramps/plugins/view/eventview.py | 2 +- gramps/plugins/view/familyview.py | 2 +- gramps/plugins/view/mediaview.py | 2 +- gramps/plugins/view/noteview.py | 2 +- gramps/plugins/view/repoview.py | 2 +- gramps/plugins/view/sourceview.py | 2 +- 20 files changed, 34 insertions(+), 32 deletions(-) diff --git a/gramps/gui/merge/mergecitation.py b/gramps/gui/merge/mergecitation.py index c7e940dda..ac4c7ae47 100644 --- a/gramps/gui/merge/mergecitation.py +++ b/gramps/gui/merge/mergecitation.py @@ -55,8 +55,8 @@ class MergeCitation(ManagedWindow): """ Displays a dialog box that allows the citations to be combined into one. """ - def __init__(self, dbstate, uistate, handle1, handle2): - ManagedWindow.__init__(self, uistate, [], self.__class__) + def __init__(self, dbstate, uistate, track, handle1, handle2): + ManagedWindow.__init__(self, uistate, track, self.__class__) self.dbstate = dbstate database = dbstate.db self.citation1 = database.get_citation_from_handle(handle1) diff --git a/gramps/gui/merge/mergeevent.py b/gramps/gui/merge/mergeevent.py index 2fb853b4f..4e86b83d2 100644 --- a/gramps/gui/merge/mergeevent.py +++ b/gramps/gui/merge/mergeevent.py @@ -54,8 +54,8 @@ class MergeEvent(ManagedWindow): """ Displays a dialog box that allows the events to be combined into one. """ - def __init__(self, dbstate, uistate, handle1, handle2): - ManagedWindow.__init__(self, uistate, [], self.__class__) + def __init__(self, dbstate, uistate, track, handle1, handle2): + ManagedWindow.__init__(self, uistate, track, self.__class__) self.dbstate = dbstate database = dbstate.db self.ev1 = database.get_event_from_handle(handle1) diff --git a/gramps/gui/merge/mergefamily.py b/gramps/gui/merge/mergefamily.py index 209a66021..a97690449 100644 --- a/gramps/gui/merge/mergefamily.py +++ b/gramps/gui/merge/mergefamily.py @@ -56,8 +56,8 @@ class MergeFamily(ManagedWindow): Merges two families into a single family. Displays a dialog box that allows the families to be combined into one. """ - def __init__(self, dbstate, uistate, handle1, handle2): - ManagedWindow.__init__(self, uistate, [], self.__class__) + def __init__(self, dbstate, uistate, track, handle1, handle2): + ManagedWindow.__init__(self, uistate, track, self.__class__) self.database = dbstate.db self.fy1 = self.database.get_family_from_handle(handle1) self.fy2 = self.database.get_family_from_handle(handle2) diff --git a/gramps/gui/merge/mergemedia.py b/gramps/gui/merge/mergemedia.py index dcb1ff55b..2ce8dbfa9 100644 --- a/gramps/gui/merge/mergemedia.py +++ b/gramps/gui/merge/mergemedia.py @@ -53,8 +53,8 @@ class MergeMedia(ManagedWindow): """ Displays a dialog box that allows the media objects to be combined into one. """ - def __init__(self, dbstate, uistate, handle1, handle2): - ManagedWindow.__init__(self, uistate, [], self.__class__) + def __init__(self, dbstate, uistate, track, handle1, handle2): + ManagedWindow.__init__(self, uistate, track, self.__class__) self.dbstate = dbstate database = dbstate.db self.mo1 = database.get_media_from_handle(handle1) diff --git a/gramps/gui/merge/mergenote.py b/gramps/gui/merge/mergenote.py index e8056d968..e6e350d8e 100644 --- a/gramps/gui/merge/mergenote.py +++ b/gramps/gui/merge/mergenote.py @@ -53,8 +53,8 @@ class MergeNote(ManagedWindow): """ Displays a dialog box that allows two notes to be combined into one. """ - def __init__(self, dbstate, uistate, handle1, handle2): - ManagedWindow.__init__(self, uistate, [], self.__class__) + def __init__(self, dbstate, uistate, track, handle1, handle2): + ManagedWindow.__init__(self, uistate, track, self.__class__) self.dbstate = dbstate database = dbstate.db self.no1 = database.get_note_from_handle(handle1) diff --git a/gramps/gui/merge/mergeperson.py b/gramps/gui/merge/mergeperson.py index b6e74bc0f..740fb978c 100644 --- a/gramps/gui/merge/mergeperson.py +++ b/gramps/gui/merge/mergeperson.py @@ -78,9 +78,9 @@ class MergePerson(ManagedWindow): """ Displays a dialog box that allows the persons to be combined into one. """ - def __init__(self, dbstate, uistate, handle1, handle2, cb_update=None, - expand_context_info=True): - ManagedWindow.__init__(self, uistate, [], self.__class__) + def __init__(self, dbstate, uistate, track, handle1, handle2, + cb_update=None, expand_context_info=True): + ManagedWindow.__init__(self, uistate, track, self.__class__) self.database = dbstate.db self.pr1 = self.database.get_person_from_handle(handle1) self.pr2 = self.database.get_person_from_handle(handle2) diff --git a/gramps/gui/merge/mergeplace.py b/gramps/gui/merge/mergeplace.py index 1e8433833..5c2b96e38 100644 --- a/gramps/gui/merge/mergeplace.py +++ b/gramps/gui/merge/mergeplace.py @@ -63,8 +63,9 @@ class MergePlace(ManagedWindow): """ Displays a dialog box that allows the places to be combined into one. """ - def __init__(self, dbstate, uistate, handle1, handle2, callback=None): - ManagedWindow.__init__(self, uistate, [], self.__class__) + def __init__(self, dbstate, uistate, track, handle1, handle2, + callback=None): + ManagedWindow.__init__(self, uistate, track, self.__class__) self.dbstate = dbstate database = dbstate.db self.callback = callback diff --git a/gramps/gui/merge/mergerepository.py b/gramps/gui/merge/mergerepository.py index be1b282e3..07a521341 100644 --- a/gramps/gui/merge/mergerepository.py +++ b/gramps/gui/merge/mergerepository.py @@ -54,8 +54,8 @@ class MergeRepository(ManagedWindow): """ Displays a dialog box that allows two repositories to be combined into one. """ - def __init__(self, dbstate, uistate, handle1, handle2): - ManagedWindow.__init__(self, uistate, [], self.__class__) + def __init__(self, dbstate, uistate, track, handle1, handle2): + ManagedWindow.__init__(self, uistate, track, self.__class__) self.dbstate = dbstate database = dbstate.db self.rp1 = database.get_repository_from_handle(handle1) diff --git a/gramps/gui/merge/mergesource.py b/gramps/gui/merge/mergesource.py index ab1544042..e06d2ac21 100644 --- a/gramps/gui/merge/mergesource.py +++ b/gramps/gui/merge/mergesource.py @@ -54,8 +54,8 @@ class MergeSource(ManagedWindow): """ Displays a dialog box that allows the sources to be combined into one. """ - def __init__(self, dbstate, uistate, handle1, handle2): - ManagedWindow.__init__(self, uistate, [], self.__class__) + def __init__(self, dbstate, uistate, track, handle1, handle2): + ManagedWindow.__init__(self, uistate, track, self.__class__) self.dbstate = dbstate database = dbstate.db self.src1 = database.get_source_from_handle(handle1) diff --git a/gramps/plugins/lib/libpersonview.py b/gramps/plugins/lib/libpersonview.py index 30c9f4b04..6bdd698f0 100644 --- a/gramps/plugins/lib/libpersonview.py +++ b/gramps/plugins/lib/libpersonview.py @@ -430,7 +430,7 @@ class BasePersonView(ListView): "holding down the control key while clicking on " "the desired person."), parent=self.uistate.window) else: - MergePerson(self.dbstate, self.uistate, mlist[0], mlist[1]) + MergePerson(self.dbstate, self.uistate, [], mlist[0], mlist[1]) def tag_updated(self, handle_list): """ diff --git a/gramps/plugins/lib/libplaceview.py b/gramps/plugins/lib/libplaceview.py index 77ef29e79..265477d62 100644 --- a/gramps/plugins/lib/libplaceview.py +++ b/gramps/plugins/lib/libplaceview.py @@ -415,7 +415,7 @@ class PlaceBaseView(ListView): "place hierarchy.") ErrorDialog(msg, msg2, parent=self.uistate.window) else: - MergePlace(self.dbstate, self.uistate, mlist[0], mlist[1], + MergePlace(self.dbstate, self.uistate, [], mlist[0], mlist[1], self.merged) def merged(self): diff --git a/gramps/plugins/tool/finddupes.py b/gramps/plugins/tool/finddupes.py index 5157f0169..c570f6332 100644 --- a/gramps/plugins/tool/finddupes.py +++ b/gramps/plugins/tool/finddupes.py @@ -580,7 +580,7 @@ class DuplicatePeopleToolMatches(ManagedWindow): self.show() def build_menu_names(self, obj): - return (_("Merge candidates"),None) + return (_("Merge candidates"), _("Merge persons")) def on_help_clicked(self, obj): """Display the relevant portion of GRAMPS manual""" @@ -616,7 +616,7 @@ class DuplicatePeopleToolMatches(ManagedWindow): return (self.p1,self.p2) = self.list.get_object(iter) - MergePerson(self.dbstate, self.uistate, self.p1, self.p2, + MergePerson(self.dbstate, self.uistate, self.track, self.p1, self.p2, self.on_update, True) def on_update(self): diff --git a/gramps/plugins/view/citationlistview.py b/gramps/plugins/view/citationlistview.py index 76944876e..297a36a67 100644 --- a/gramps/plugins/view/citationlistview.py +++ b/gramps/plugins/view/citationlistview.py @@ -326,7 +326,8 @@ class CitationListView(ListView): "sources first.") ErrorDialog(msg, msg2, parent=self.uistate.window) else: - MergeCitation(self.dbstate, self.uistate, mlist[0], mlist[1]) + MergeCitation(self.dbstate, self.uistate, [], mlist[0], + mlist[1]) def get_handle_from_gramps_id(self, gid): obj = self.dbstate.db.get_citation_from_gramps_id(gid) diff --git a/gramps/plugins/view/citationtreeview.py b/gramps/plugins/view/citationtreeview.py index 833d167eb..3e2c65cf9 100644 --- a/gramps/plugins/view/citationtreeview.py +++ b/gramps/plugins/view/citationtreeview.py @@ -546,10 +546,10 @@ class CitationTreeView(ListView): ErrorDialog(msg, msg2, parent=self.uistate.window) else: - MergeCitation(self.dbstate, self.uistate, mlist[0], + MergeCitation(self.dbstate, self.uistate, [], mlist[0], mlist[1]) elif source1 and source2: - MergeSource(self.dbstate, self.uistate, mlist[0], mlist[1]) + MergeSource(self.dbstate, self.uistate, [], mlist[0], mlist[1]) else: msg = _("Cannot perform merge.") msg2 = _("Both objects must be of the same type, either " diff --git a/gramps/plugins/view/eventview.py b/gramps/plugins/view/eventview.py index 1b807db1d..81f3200d8 100644 --- a/gramps/plugins/view/eventview.py +++ b/gramps/plugins/view/eventview.py @@ -266,7 +266,7 @@ class EventView(ListView): "control key while clicking on the desired event.") ErrorDialog(msg, msg2, parent=self.uistate.window) else: - MergeEvent(self.dbstate, self.uistate, mlist[0], mlist[1]) + MergeEvent(self.dbstate, self.uistate, [], mlist[0], mlist[1]) def tag_updated(self, handle_list): """ diff --git a/gramps/plugins/view/familyview.py b/gramps/plugins/view/familyview.py index ebc5ccf75..24c3c203e 100644 --- a/gramps/plugins/view/familyview.py +++ b/gramps/plugins/view/familyview.py @@ -308,7 +308,7 @@ class FamilyView(ListView): "control key while clicking on the desired family.") ErrorDialog(msg, msg2, parent=self.uistate.window) else: - MergeFamily(self.dbstate, self.uistate, mlist[0], mlist[1]) + MergeFamily(self.dbstate, self.uistate, [], mlist[0], mlist[1]) def _make_father_active(self, obj): """ diff --git a/gramps/plugins/view/mediaview.py b/gramps/plugins/view/mediaview.py index 66eb2ecd6..630d75edf 100644 --- a/gramps/plugins/view/mediaview.py +++ b/gramps/plugins/view/mediaview.py @@ -353,7 +353,7 @@ class MediaView(ListView): "control key while clicking on the desired object.") ErrorDialog(msg, msg2, parent=self.uistate.window) else: - MergeMedia(self.dbstate, self.uistate, mlist[0], mlist[1]) + MergeMedia(self.dbstate, self.uistate, [], mlist[0], mlist[1]) def get_handle_from_gramps_id(self, gid): """ diff --git a/gramps/plugins/view/noteview.py b/gramps/plugins/view/noteview.py index 6468300d1..2002c2414 100644 --- a/gramps/plugins/view/noteview.py +++ b/gramps/plugins/view/noteview.py @@ -244,7 +244,7 @@ class NoteView(ListView): "control key while clicking on the desired note.") ErrorDialog(msg, msg2, parent=self.uistate.window) else: - MergeNote(self.dbstate, self.uistate, mlist[0], mlist[1]) + MergeNote(self.dbstate, self.uistate, [], mlist[0], mlist[1]) def tag_updated(self, handle_list): """ diff --git a/gramps/plugins/view/repoview.py b/gramps/plugins/view/repoview.py index 35854a81e..47b546f47 100644 --- a/gramps/plugins/view/repoview.py +++ b/gramps/plugins/view/repoview.py @@ -249,7 +249,7 @@ class RepositoryView(ListView): "repository.") ErrorDialog(msg, msg2, parent=self.uistate.window) else: - MergeRepository(self.dbstate, self.uistate, mlist[0], mlist[1]) + MergeRepository(self.dbstate, self.uistate, [], mlist[0], mlist[1]) def get_handle_from_gramps_id(self, gid): obj = self.dbstate.db.get_repository_from_gramps_id(gid) diff --git a/gramps/plugins/view/sourceview.py b/gramps/plugins/view/sourceview.py index 6d349a7ef..858c6a97b 100644 --- a/gramps/plugins/view/sourceview.py +++ b/gramps/plugins/view/sourceview.py @@ -232,7 +232,7 @@ class SourceView(ListView): "control key while clicking on the desired source.") ErrorDialog(msg, msg2, parent=self.uistate.window) else: - MergeSource(self.dbstate, self.uistate, mlist[0], mlist[1]) + MergeSource(self.dbstate, self.uistate, [], mlist[0], mlist[1]) def get_handle_from_gramps_id(self, gid): obj = self.dbstate.db.get_source_from_gramps_id(gid)