diff --git a/gramps/gen/config.py b/gramps/gen/config.py index 4f7b2e395..560c27e52 100644 --- a/gramps/gen/config.py +++ b/gramps/gen/config.py @@ -186,12 +186,6 @@ register('geography.use-keypad', True) # note that other calls to "register" are done in realtime (when # needed), for instance to four 'interface.clipboard' variables -- # so do a recursive grep for "setup_configs" to see all the (base) names -register('interface.addmedia-height', 500) -register('interface.addmedia-width', 700) -register('interface.address-height', 450) -register('interface.address-width', 650) -register('interface.attribute-height', 350) -register('interface.attribute-width', 600) register('interface.dont-ask', False) register('interface.view-categories', ["Dashboard", "People", "Relationships", "Families", @@ -203,17 +197,11 @@ register('interface.grampletbar-close', False) register('interface.ignore-gexiv2', False) register('interface.ignore-pil', False) register('interface.ignore-osmgpsmap', False) -register('interface.lds-height', 450) -register('interface.lds-width', 600) -register('interface.location-height', 250) -register('interface.location-width', 600) register('interface.main-window-height', 500) register('interface.main-window-horiz-position', 15) register('interface.main-window-vert-position', 10) register('interface.main-window-width', 775) register('interface.mapservice', 'OpenStreetMap') -register('interface.name-height', 350) -register('interface.name-width', 600) register('interface.open-with-default-viewer', False) register('interface.pedview-layout', 0) register('interface.pedview-show-images', True) @@ -223,14 +211,10 @@ register('interface.pedview-tree-direction', 2) register('interface.pedview-show-unknown-people', False) register('interface.place-name-height', 100) register('interface.place-name-width', 450) -register('interface.relcalc-height', 400) -register('interface.relcalc-width', 600) register('interface.sidebar-text', True) register('interface.size-checked', False) register('interface.statusbar', 1) register('interface.toolbar-on', True) -register('interface.url-height', 150) -register('interface.url-width', 600) register('interface.view', True) register('interface.surname-box-height', 150) register('interface.treemodel-cache-size', 1000) diff --git a/gramps/gui/editors/addmedia.py b/gramps/gui/editors/addmedia.py index 9e5d73d9d..33ac8646d 100644 --- a/gramps/gui/editors/addmedia.py +++ b/gramps/gui/editors/addmedia.py @@ -102,9 +102,7 @@ class AddMedia(ManagedWindow): self.glade.toplevel, self.glade.get_object('title'), _('Select a media object')) - self.height_key = 'interface.addmedia-height' - self.width_key = 'interface.addmedia-width' - self._set_size() + self.setup_configs('interface.addmedia', 700, 500) self.description = self.glade.get_object("photoDescription") self.image = self.glade.get_object("image") diff --git a/gramps/gui/editors/editaddress.py b/gramps/gui/editors/editaddress.py index 435fa8453..257075630 100644 --- a/gramps/gui/editors/editaddress.py +++ b/gramps/gui/editors/editaddress.py @@ -85,13 +85,12 @@ class EditAddress(EditSecondary): EditSecondary.__init__(self, dbstate, uistate, track, addr, callback) def _local_init(self): - self.width_key = 'interface.address-width' - self.height_key = 'interface.address-height' self.top = Glade() self.set_window(self.top.toplevel, self.top.get_object("title"), _('Address Editor')) + self.setup_configs('interface.address', 650, 450) def _setup_fields(self): self.addr_start = MonitoredDate( diff --git a/gramps/gui/editors/editattribute.py b/gramps/gui/editors/editattribute.py index 4a36d9240..2722c7473 100644 --- a/gramps/gui/editors/editattribute.py +++ b/gramps/gui/editors/editattribute.py @@ -87,13 +87,12 @@ class EditAttributeRoot(EditSecondary): EditSecondary.__init__(self, state, uistate, track, attrib, callback) def _local_init(self): - self.width_key = 'interface.attribute-width' - self.height_key = 'interface.attribute-height' self.top = Glade('editattribute.glade') self.set_window(self.top.toplevel, self.top.get_object('title'), _('Attribute Editor')) + self.setup_configs('interface.attribute', 600, 350) def _connect_signals(self): self.define_cancel_button(self.top.get_object('cancel')) diff --git a/gramps/gui/editors/editldsord.py b/gramps/gui/editors/editldsord.py index 7a6bd71ec..fd371e561 100644 --- a/gramps/gui/editors/editldsord.py +++ b/gramps/gui/editors/editldsord.py @@ -151,13 +151,13 @@ class EditLdsOrd(EditSecondary): EditSecondary.__init__(self, state, uistate, track, attrib, callback) def _local_init(self): - self.width_key = 'interface.lds-width' - self.height_key = 'interface.lds-height' self.top = Glade() self.set_window(self.top.toplevel, self.top.get_object('title'), _('LDS Ordinance Editor')) + self.setup_configs('interface.lds', 600, 450) + self.share_btn = self.top.get_object('share_place') self.add_del_btn = self.top.get_object('add_del_place') diff --git a/gramps/gui/editors/editlocation.py b/gramps/gui/editors/editlocation.py index b1564ff52..3933f4e65 100644 --- a/gramps/gui/editors/editlocation.py +++ b/gramps/gui/editors/editlocation.py @@ -43,11 +43,10 @@ class EditLocation(EditSecondary): location, callback) def _local_init(self): - self.width_key = 'interface.location-width' - self.height_key = 'interface.location-height' self.top = Glade() self.set_window(self.top.toplevel, None, _('Location Editor')) + self.setup_configs('interface.location', 600, 250) def _setup_fields(self): self.street = MonitoredEntry( diff --git a/gramps/gui/editors/editname.py b/gramps/gui/editors/editname.py index 0ec2763d3..0c60b5325 100644 --- a/gramps/gui/editors/editname.py +++ b/gramps/gui/editors/editname.py @@ -114,12 +114,11 @@ class EditName(EditSecondary): track, name, callback) def _local_init(self): - self.width_key = 'interface.name-width' - self.height_key = 'interface.name-height' self.top = Glade() self.set_window(self.top.toplevel, None, _("Name Editor")) + self.setup_configs('interface.name', 600, 350) tblgnam = self.top.get_object('table23') notebook = self.top.get_object('notebook') diff --git a/gramps/gui/editors/editurl.py b/gramps/gui/editors/editurl.py index 148b10695..1f2c4c0c4 100644 --- a/gramps/gui/editors/editurl.py +++ b/gramps/gui/editors/editurl.py @@ -59,8 +59,6 @@ class EditUrl(EditSecondary): url, callback) def _local_init(self): - self.width_key = 'interface.url-width' - self.height_key = 'interface.url-height' self.top = Glade() self.jump = self.top.get_object('jump') @@ -68,6 +66,7 @@ class EditUrl(EditSecondary): self.set_window(self.top.toplevel, self.top.get_object("title"), _('Internet Address Editor')) + self.setup_configs('interface.url', 600, 150) def _connect_signals(self): self.jump.connect('clicked', self.jump_to) diff --git a/gramps/gui/glade/editldsord.glade b/gramps/gui/glade/editldsord.glade index 166627233..c6c0e8dcd 100644 --- a/gramps/gui/glade/editldsord.glade +++ b/gramps/gui/glade/editldsord.glade @@ -23,8 +23,6 @@ False - 600 - 450 dialog diff --git a/gramps/gui/glade/editlocation.glade b/gramps/gui/glade/editlocation.glade index beb29f09f..55ef52f1f 100644 --- a/gramps/gui/glade/editlocation.glade +++ b/gramps/gui/glade/editlocation.glade @@ -5,7 +5,6 @@ False - 550 dialog diff --git a/gramps/gui/glade/editname.glade b/gramps/gui/glade/editname.glade index 7036b57d8..98ba18667 100644 --- a/gramps/gui/glade/editname.glade +++ b/gramps/gui/glade/editname.glade @@ -5,7 +5,6 @@ False - 600 dialog diff --git a/gramps/gui/glade/editurl.glade b/gramps/gui/glade/editurl.glade index e99e0728d..9735b0da4 100644 --- a/gramps/gui/glade/editurl.glade +++ b/gramps/gui/glade/editurl.glade @@ -5,7 +5,6 @@ False - 600 dialog diff --git a/gramps/plugins/tool/relcalc.py b/gramps/plugins/tool/relcalc.py index f911e4a69..428799c0f 100644 --- a/gramps/plugins/tool/relcalc.py +++ b/gramps/plugins/tool/relcalc.py @@ -111,9 +111,7 @@ class RelCalc(tool.Tool, ManagedWindow): _('Relationship to %(person_name)s' ) % {'person_name' : name}, self.title) - self.height_key = 'interface.relcalc-height' - self.width_key = 'interface.relcalc-width' - self._set_size() + self.setup_configs('interface.relcalc', 600, 400) self.tree = self.glade.get_object("peopleList") self.text = self.glade.get_object("text1")