From e6ed0612e34c7f14eafc226f9ffec8cc07ad710d Mon Sep 17 00:00:00 2001 From: Paul Culley Date: Thu, 9 Jan 2020 11:37:31 -0600 Subject: [PATCH] Fix Progen import to correctly handle AKA surnames (#959) * Fix Progen import dialog and progress meter for correct parent window * Fix Progen import to correctly handle AKA surnames Fixes #11462 --- gramps/plugins/importer/importprogen.py | 4 +++- gramps/plugins/lib/libprogen.py | 10 ++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/gramps/plugins/importer/importprogen.py b/gramps/plugins/importer/importprogen.py index 0f951d7c2..00bc2cde0 100644 --- a/gramps/plugins/importer/importprogen.py +++ b/gramps/plugins/importer/importprogen.py @@ -258,7 +258,8 @@ class ProgenOptions(ManagedWindow): # display window if GUI active if self.uistate: - ManagedWindow.__init__(self, self.uistate, [], self.__class__) + ManagedWindow.__init__(self, self.uistate, [], self.__class__, + modal=True) self._display() def __on_source_button_toggled(self, widget): @@ -580,6 +581,7 @@ class ProgenOptions(ManagedWindow): widget.grab_focus() # creates a modal window and display immediatly! + self.show() self.glade.toplevel.run() def _collect(self): diff --git a/gramps/plugins/lib/libprogen.py b/gramps/plugins/lib/libprogen.py index 46832f955..fb1c60fdb 100644 --- a/gramps/plugins/lib/libprogen.py +++ b/gramps/plugins/lib/libprogen.py @@ -729,7 +729,8 @@ class ProgenParser(UpdateCallback): # provide feedback about import progress (GUI / TXT) if self.uistate: - self.progress = ProgressMeter(_("Import from Pro-Gen"), '') + self.progress = ProgressMeter(_("Import from Pro-Gen"), '', + parent=self.uistate.window) else: UpdateCallback.__init__(self, user.callback) @@ -1331,9 +1332,10 @@ class ProgenParser(UpdateCallback): if attr: person.add_attribute(attr) else: - self.__add_name(person, citation.handle, NameType.AKA, - ' '.join(alias_text[0:-1]), - '', alias_text[-1].split(), '') + self.__add_name( + person, citation.handle if citation else None, + NameType.AKA, ' '.join(alias_text[0:-1]), + '', alias_text[-1], '') # process F09 Person Code refn_code = recflds[person_ix[9]] # F09: INDI REFN/INDI CODE