diff --git a/gramps/gen/config.py b/gramps/gen/config.py index d4a31333a..22475632b 100644 --- a/gramps/gen/config.py +++ b/gramps/gen/config.py @@ -226,24 +226,6 @@ register('interface.media-ref-height', 450) register('interface.media-ref-width', 600) register('interface.media-sel-height', 450) register('interface.media-sel-width', 600) -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-sel-height', 450) diff --git a/gramps/gui/merge/mergecitation.py b/gramps/gui/merge/mergecitation.py index 9e6e9aa59..c7e940dda 100644 --- a/gramps/gui/merge/mergecitation.py +++ b/gramps/gui/merge/mergecitation.py @@ -66,9 +66,7 @@ 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() + self.setup_configs('interface.merge-citation', 500, 250) # Detailed Selection widgets page1 = self.citation1.get_page() diff --git a/gramps/gui/merge/mergeevent.py b/gramps/gui/merge/mergeevent.py index d85c39935..2fb853b4f 100644 --- a/gramps/gui/merge/mergeevent.py +++ b/gramps/gui/merge/mergeevent.py @@ -65,9 +65,7 @@ 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() + self.setup_configs('interface.merge-event', 500, 250) # Detailed selection widgets type1 = str(self.ev1.get_type()) diff --git a/gramps/gui/merge/mergefamily.py b/gramps/gui/merge/mergefamily.py index ceb5954da..209a66021 100644 --- a/gramps/gui/merge/mergefamily.py +++ b/gramps/gui/merge/mergefamily.py @@ -66,9 +66,7 @@ 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() + self.setup_configs('interface.merge-family', 500, 250) # Detailed selection widgets father1 = self.fy1.get_father_handle() diff --git a/gramps/gui/merge/mergemedia.py b/gramps/gui/merge/mergemedia.py index af606d535..dcb1ff55b 100644 --- a/gramps/gui/merge/mergemedia.py +++ b/gramps/gui/merge/mergemedia.py @@ -64,9 +64,7 @@ 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() + self.setup_configs('interface.merge-media', 500, 250) # Detailed selection Widgets desc1 = self.mo1.get_description() diff --git a/gramps/gui/merge/mergenote.py b/gramps/gui/merge/mergenote.py index 2eddd8c62..e8056d968 100644 --- a/gramps/gui/merge/mergenote.py +++ b/gramps/gui/merge/mergenote.py @@ -64,9 +64,7 @@ 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() + self.setup_configs('interface.merge-note', 600, 250) # Detailed selection widgets text1 = self.no1.get_styledtext() diff --git a/gramps/gui/merge/mergeperson.py b/gramps/gui/merge/mergeperson.py index dc9027387..9aa300efb 100644 --- a/gramps/gui/merge/mergeperson.py +++ b/gramps/gui/merge/mergeperson.py @@ -87,9 +87,7 @@ 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() + self.setup_configs('interface.merge-person', 700, 400) # 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 0630843b1..1e8433833 100644 --- a/gramps/gui/merge/mergeplace.py +++ b/gramps/gui/merge/mergeplace.py @@ -75,9 +75,7 @@ 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() + self.setup_configs('interface.merge-place', 500, 250) # 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 0e7d167f6..be1b282e3 100644 --- a/gramps/gui/merge/mergerepository.py +++ b/gramps/gui/merge/mergerepository.py @@ -65,9 +65,7 @@ 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() + self.setup_configs('interface.merge-repository', 500, 250) # Detailed selection widgets name1 = self.rp1.get_name() diff --git a/gramps/gui/merge/mergesource.py b/gramps/gui/merge/mergesource.py index 86d55dccc..ab1544042 100644 --- a/gramps/gui/merge/mergesource.py +++ b/gramps/gui/merge/mergesource.py @@ -65,9 +65,7 @@ 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() + self.setup_configs('interface.merge-source', 500, 250) # Detailed Selection widgets title1 = self.src1.get_title()