diff --git a/gramps2/src/GrampsCfg.py b/gramps2/src/GrampsCfg.py index da762603d..aadc9e2a9 100644 --- a/gramps2/src/GrampsCfg.py +++ b/gramps2/src/GrampsCfg.py @@ -48,7 +48,6 @@ import gnome.ui # #------------------------------------------------------------------------- import RelLib -#from Date import * import const import Utils @@ -528,6 +527,7 @@ class GrampsPreferences: self.build() self.build_ext() self.apply.set_sensitive(0) + self.window.show() def build_tree(self): prev = None @@ -967,7 +967,7 @@ class GrampsPreferences: # update the config file sync() - _callback() + _callback(1) def on_object_toggled(self,obj): """Called by the elements on the property box to set the changed flag, diff --git a/gramps2/src/gramps_main.py b/gramps2/src/gramps_main.py index f7cb9e9d4..0a6d8d51c 100755 --- a/gramps2/src/gramps_main.py +++ b/gramps2/src/gramps_main.py @@ -137,7 +137,7 @@ class Gramps: self.db.set_sprefix(GrampsCfg.sprefix) self.db.set_pprefix(GrampsCfg.pprefix) - GrampsCfg.loadConfig(self.full_update) + GrampsCfg.loadConfig(self.update_display) self.relationship = Plugins.relationship_function() self.init_interface() @@ -807,26 +807,7 @@ class Gramps: def full_update(self): """Brute force display update, updating all the pages""" - - self.complete_rebuild() - page = self.views.get_current_page() - - if page == 1: - self.family_view.load_family() - elif page == 2: - self.pedigree_view.load_canvas(self.active_person) - elif page == 3: - self.source_view.load_sources() - elif page == 4: - if len(self.db.getPlaceKeys()) > 2000: - self.status_text(_('Updating display - this may take a few seconds...')) - else: - self.status_text(_('Updating display...')) - self.place_view.load_places() - self.modify_statusbar() - self.place_loaded = 1 - elif page == 5: - self.media_view.load_media() + self.update_display(1) self.toolbar.set_style(GrampsCfg.toolbar) def update_display(self,changed): diff --git a/gramps2/src/preferences.glade b/gramps2/src/preferences.glade index a985a4661..489c3a249 100644 --- a/gramps2/src/preferences.glade +++ b/gramps2/src/preferences.glade @@ -5,7 +5,6 @@ - True GRAMPS Preferences GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE @@ -136,8 +135,6 @@ False GTK_POS_TOP False - 2 - 2 False