From 8cd4a75482b035713ea9b59ccd196ee442ebc206 Mon Sep 17 00:00:00 2001 From: Paul Franklin Date: Wed, 2 Nov 2016 10:15:03 -0700 Subject: [PATCH] enable merge dialogs to remember their size --- gramps/gen/config.py | 18 ++++++++++++++++++ gramps/gui/glade/mergecitation.glade | 1 - gramps/gui/glade/mergeevent.glade | 1 - gramps/gui/glade/mergefamily.glade | 1 - gramps/gui/glade/mergemedia.glade | 1 - gramps/gui/glade/mergenote.glade | 1 - gramps/gui/glade/mergeperson.glade | 2 -- gramps/gui/glade/mergeplace.glade | 1 - gramps/gui/glade/mergerepository.glade | 1 - gramps/gui/glade/mergesource.glade | 1 - gramps/gui/merge/mergecitation.py | 3 +++ gramps/gui/merge/mergeevent.py | 3 +++ gramps/gui/merge/mergefamily.py | 3 +++ gramps/gui/merge/mergemedia.py | 3 +++ gramps/gui/merge/mergenote.py | 3 +++ gramps/gui/merge/mergeperson.py | 3 +++ gramps/gui/merge/mergeplace.py | 3 +++ gramps/gui/merge/mergerepository.py | 3 +++ gramps/gui/merge/mergesource.py | 3 +++ 19 files changed, 45 insertions(+), 10 deletions(-) diff --git a/gramps/gen/config.py b/gramps/gen/config.py index 6e5e63672..0e322c408 100644 --- a/gramps/gen/config.py +++ b/gramps/gen/config.py @@ -235,6 +235,24 @@ register('interface.media-ref-width', 600) register('interface.media-sel-height', 450) register('interface.media-sel-width', 600) register('interface.media-width', 650) +register('interface.merge-citation-height', 250) +register('interface.merge-citation-width', 500) +register('interface.merge-event-height', 250) +register('interface.merge-event-width', 500) +register('interface.merge-family-height', 250) +register('interface.merge-family-width', 500) +register('interface.merge-media-height', 250) +register('interface.merge-media-width', 500) +register('interface.merge-note-height', 250) +register('interface.merge-note-width', 600) +register('interface.merge-person-height', 400) +register('interface.merge-person-width', 700) +register('interface.merge-place-height', 250) +register('interface.merge-place-width', 500) +register('interface.merge-repository-height', 250) +register('interface.merge-repository-width', 500) +register('interface.merge-source-height', 250) +register('interface.merge-source-width', 500) register('interface.name-height', 350) register('interface.name-width', 600) register('interface.note-height', 500) diff --git a/gramps/gui/glade/mergecitation.glade b/gramps/gui/glade/mergecitation.glade index bb970903e..a2e7761fc 100644 --- a/gramps/gui/glade/mergecitation.glade +++ b/gramps/gui/glade/mergecitation.glade @@ -5,7 +5,6 @@ False True - 500 dialog diff --git a/gramps/gui/glade/mergeevent.glade b/gramps/gui/glade/mergeevent.glade index a4fd8e8b0..2e7721cba 100644 --- a/gramps/gui/glade/mergeevent.glade +++ b/gramps/gui/glade/mergeevent.glade @@ -5,7 +5,6 @@ False True - 500 dialog diff --git a/gramps/gui/glade/mergefamily.glade b/gramps/gui/glade/mergefamily.glade index 27b30a476..ba2b845ad 100644 --- a/gramps/gui/glade/mergefamily.glade +++ b/gramps/gui/glade/mergefamily.glade @@ -5,7 +5,6 @@ False True - 500 dialog diff --git a/gramps/gui/glade/mergemedia.glade b/gramps/gui/glade/mergemedia.glade index 92ece9cde..e358ea2a1 100644 --- a/gramps/gui/glade/mergemedia.glade +++ b/gramps/gui/glade/mergemedia.glade @@ -5,7 +5,6 @@ False True - 500 dialog diff --git a/gramps/gui/glade/mergenote.glade b/gramps/gui/glade/mergenote.glade index d130e4aa9..38eadd43c 100644 --- a/gramps/gui/glade/mergenote.glade +++ b/gramps/gui/glade/mergenote.glade @@ -5,7 +5,6 @@ False True - 600 dialog diff --git a/gramps/gui/glade/mergeperson.glade b/gramps/gui/glade/mergeperson.glade index 95f5f631d..cfb6ec1d9 100644 --- a/gramps/gui/glade/mergeperson.glade +++ b/gramps/gui/glade/mergeperson.glade @@ -5,8 +5,6 @@ False True - 700 - 400 dialog diff --git a/gramps/gui/glade/mergeplace.glade b/gramps/gui/glade/mergeplace.glade index b7bc3512a..c79cee223 100644 --- a/gramps/gui/glade/mergeplace.glade +++ b/gramps/gui/glade/mergeplace.glade @@ -5,7 +5,6 @@ False True - 500 dialog diff --git a/gramps/gui/glade/mergerepository.glade b/gramps/gui/glade/mergerepository.glade index f71d253a7..895c9f1d9 100644 --- a/gramps/gui/glade/mergerepository.glade +++ b/gramps/gui/glade/mergerepository.glade @@ -5,7 +5,6 @@ False True - 500 dialog diff --git a/gramps/gui/glade/mergesource.glade b/gramps/gui/glade/mergesource.glade index a154e4328..57f120745 100644 --- a/gramps/gui/glade/mergesource.glade +++ b/gramps/gui/glade/mergesource.glade @@ -5,7 +5,6 @@ False True - 500 dialog diff --git a/gramps/gui/merge/mergecitation.py b/gramps/gui/merge/mergecitation.py index a62c1a45f..9e6e9aa59 100644 --- a/gramps/gui/merge/mergecitation.py +++ b/gramps/gui/merge/mergecitation.py @@ -66,6 +66,9 @@ class MergeCitation(ManagedWindow): self.set_window(self._gladeobj.toplevel, self.get_widget('citation_title'), _("Merge Citations")) + self.height_key = 'interface.merge-citation-height' + self.width_key = 'interface.merge-citation-width' + self._set_size() # Detailed Selection widgets page1 = self.citation1.get_page() diff --git a/gramps/gui/merge/mergeevent.py b/gramps/gui/merge/mergeevent.py index 339347e01..1e8319a9c 100644 --- a/gramps/gui/merge/mergeevent.py +++ b/gramps/gui/merge/mergeevent.py @@ -65,6 +65,9 @@ class MergeEvent(ManagedWindow): self.set_window(self._gladeobj.toplevel, self.get_widget("event_title"), _("Merge Events")) + self.height_key = 'interface.merge-event-height' + self.width_key = 'interface.merge-event-width' + self._set_size() # Detailed selection widgets type1 = str(self.ev1.get_type()) diff --git a/gramps/gui/merge/mergefamily.py b/gramps/gui/merge/mergefamily.py index 6ba11cbc3..68276364d 100644 --- a/gramps/gui/merge/mergefamily.py +++ b/gramps/gui/merge/mergefamily.py @@ -66,6 +66,9 @@ class MergeFamily(ManagedWindow): self.set_window(self._gladeobj.toplevel, self.get_widget("family_title"), _("Merge Families")) + self.height_key = 'interface.merge-family-height' + self.width_key = 'interface.merge-family-width' + self._set_size() # Detailed selection widgets father1 = self.fy1.get_father_handle() diff --git a/gramps/gui/merge/mergemedia.py b/gramps/gui/merge/mergemedia.py index fd5a656c1..af606d535 100644 --- a/gramps/gui/merge/mergemedia.py +++ b/gramps/gui/merge/mergemedia.py @@ -64,6 +64,9 @@ class MergeMedia(ManagedWindow): self.set_window(self._gladeobj.toplevel, self.get_widget('object_title'), _("Merge Media Objects")) + self.height_key = 'interface.merge-media-height' + self.width_key = 'interface.merge-media-width' + self._set_size() # Detailed selection Widgets desc1 = self.mo1.get_description() diff --git a/gramps/gui/merge/mergenote.py b/gramps/gui/merge/mergenote.py index 18966898e..2eddd8c62 100644 --- a/gramps/gui/merge/mergenote.py +++ b/gramps/gui/merge/mergenote.py @@ -64,6 +64,9 @@ class MergeNote(ManagedWindow): self.set_window(self._gladeobj.toplevel, self.get_widget("note_title"), _("Merge Notes")) + self.height_key = 'interface.merge-note-height' + self.width_key = 'interface.merge-note-width' + self._set_size() # Detailed selection widgets text1 = self.no1.get_styledtext() diff --git a/gramps/gui/merge/mergeperson.py b/gramps/gui/merge/mergeperson.py index 05a5d74d0..dc9027387 100644 --- a/gramps/gui/merge/mergeperson.py +++ b/gramps/gui/merge/mergeperson.py @@ -87,6 +87,9 @@ class MergePerson(ManagedWindow): self.set_window(self._gladeobj.toplevel, self.get_widget("person_title"), _("Merge People")) + self.height_key = 'interface.merge-person-height' + self.width_key = 'interface.merge-person-width' + self._set_size() # Detailed selection widgets name1 = name_displayer.display_name(self.pr1.get_primary_name()) diff --git a/gramps/gui/merge/mergeplace.py b/gramps/gui/merge/mergeplace.py index 43e503d97..0630843b1 100644 --- a/gramps/gui/merge/mergeplace.py +++ b/gramps/gui/merge/mergeplace.py @@ -75,6 +75,9 @@ class MergePlace(ManagedWindow): self.set_window(self._gladeobj.toplevel, self.get_widget('place_title'), _("Merge Places")) + self.height_key = 'interface.merge-place-height' + self.width_key = 'interface.merge-place-width' + self._set_size() # Detailed selection widgets if not config.get('preferences.place-auto'): diff --git a/gramps/gui/merge/mergerepository.py b/gramps/gui/merge/mergerepository.py index 8b16d497a..0e7d167f6 100644 --- a/gramps/gui/merge/mergerepository.py +++ b/gramps/gui/merge/mergerepository.py @@ -65,6 +65,9 @@ class MergeRepository(ManagedWindow): self.set_window(self._gladeobj.toplevel, self.get_widget('repository_title'), _("Merge Repositories")) + self.height_key = 'interface.merge-repository-height' + self.width_key = 'interface.merge-repository-width' + self._set_size() # Detailed selection widgets name1 = self.rp1.get_name() diff --git a/gramps/gui/merge/mergesource.py b/gramps/gui/merge/mergesource.py index bbdb59ecf..86d55dccc 100644 --- a/gramps/gui/merge/mergesource.py +++ b/gramps/gui/merge/mergesource.py @@ -65,6 +65,9 @@ class MergeSource(ManagedWindow): self.set_window(self._gladeobj.toplevel, self.get_widget('source_title'), _("Merge Sources")) + self.height_key = 'interface.merge-source-height' + self.width_key = 'interface.merge-source-width' + self._set_size() # Detailed Selection widgets title1 = self.src1.get_title()