From a937d151af86d676573d8eee02a7f594ea7e5c29 Mon Sep 17 00:00:00 2001 From: prculley Date: Tue, 17 Jan 2017 08:51:29 -0600 Subject: [PATCH] fix export assistant to show textual progress steps and first step --- gramps/gui/plug/export/_exportassistant.py | 3 +++ gramps/gui/plug/export/_exportoptions.py | 12 ++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/gramps/gui/plug/export/_exportassistant.py b/gramps/gui/plug/export/_exportassistant.py index 8d2040d60..1064e5676 100644 --- a/gramps/gui/plug/export/_exportassistant.py +++ b/gramps/gui/plug/export/_exportassistant.py @@ -640,6 +640,9 @@ class ExportAssistant(ManagedWindow, Gtk.Assistant): self.progressbar.set_fraction(min(value/100.0, 1.0)) if text: self.progressbar.set_text("%s: %d%%" % (text, value)) + self.confirm.set_label( + _("Please wait while your data is selected and exported") + + "\n" + text) else: self.progressbar.set_text("%d%%" % value) while Gtk.events_pending(): diff --git a/gramps/gui/plug/export/_exportoptions.py b/gramps/gui/plug/export/_exportoptions.py index 6ce2fc379..6586f30e4 100644 --- a/gramps/gui/plug/export/_exportoptions.py +++ b/gramps/gui/plug/export/_exportoptions.py @@ -587,8 +587,8 @@ class WriterOptionBox: if self.private: if progress: progress.reset(_("Filtering private data")) - progress.progress_cnt += 1 progress.update(progress.progress_cnt) + progress.progress_cnt += 1 dbase = PrivateProxyDb(dbase) # If the restrict flag is set, apply the LivingProxyDb @@ -596,8 +596,8 @@ class WriterOptionBox: if self.restrict_num > 0: if progress: progress.reset(_("Filtering living persons")) - progress.progress_cnt += 1 progress.update(progress.progress_cnt) + progress.progress_cnt += 1 mode = [None, # include living LivingProxyDb.MODE_INCLUDE_LAST_NAME_ONLY, LivingProxyDb.MODE_REPLACE_COMPLETE_NAME, @@ -613,8 +613,8 @@ class WriterOptionBox: if self.cfilter != None and not self.cfilter.is_empty(): if progress: progress.reset(_("Applying selected person filter")) - progress.progress_cnt += 1 progress.update(progress.progress_cnt) + progress.progress_cnt += 1 dbase = FilterProxyDb( dbase, self.cfilter) @@ -623,17 +623,17 @@ class WriterOptionBox: if self.nfilter != None and not self.nfilter.is_empty(): if progress: progress.reset(_("Applying selected note filter")) - progress.progress_cnt += 1 progress.update(progress.progress_cnt) + progress.progress_cnt += 1 dbase = FilterProxyDb( dbase, note_filter=self.nfilter) # Apply the ReferencedBySelection elif proxy_name == "reference": - if progress: + if self.reference_num > 0 and progress: progress.reset(_("Filtering referenced records")) - progress.progress_cnt += 1 progress.update(progress.progress_cnt) + progress.progress_cnt += 1 if self.reference_num == 0: pass elif self.reference_num == 1: