From 09c961bf108fe62e13553cdfef114f1beca540cf Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Sat, 7 May 2005 02:41:08 +0000 Subject: [PATCH] * src/gramps_main.py: fix beta warning dialog svn: r4499 --- ChangeLog | 3 +++ src/gramps_main.py | 31 +++++++++++++++++++++---------- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1377d4b67..65a95209b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2005-05-06 Don Allingham + * src/gramps_main.py: fix beta warning dialog + 2005-05-03 Don Allingham * src/ListBox.py: added to CVS * src/Makefile.am: added ListBox.py diff --git a/src/gramps_main.py b/src/gramps_main.py index 02ebc84dc..88994e5c6 100755 --- a/src/gramps_main.py +++ b/src/gramps_main.py @@ -145,16 +145,8 @@ class Gramps(GrampsDBCallback.GrampsDBCallback): try: GrampsCfg.loadConfig() - - - if GrampsKeys.get_betawarn() == 0: - WarningDialog(_("Use at your own risk"), - _("This is an unstable development version of GRAMPS. " - "It is intended as a technology preview. Do not trust your " - "family database to this development version. This version may " - "contain bugs which could corrupt your database.")) - GrampsKeys.save_betawarn(1) - GrampsKeys.sync() + + self.beta_warn() self.RelClass = PluginMgr.relationship_class self.relationship = self.RelClass(self.db) @@ -162,12 +154,18 @@ class Gramps(GrampsDBCallback.GrampsDBCallback): self.init_interface() + except OSError, msg: + ErrorDialog(_("Configuration error"),str(msg)) + return except Errors.GConfSchemaError, val: ErrorDialog(_("Configuration error"), str(val) + _("\n\nPossibly the installation of GRAMPS was incomplete." " Make sure the GConf schema of GRAMPS is properly installed.")) gtk.main_quit() return + except: + DisplayTrace.DisplayTrace() + return if not mime_type_is_defined(const.app_gramps): ErrorDialog(_("Configuration error"), @@ -207,6 +205,19 @@ class Gramps(GrampsDBCallback.GrampsDBCallback): self.db.set_researcher(GrampsCfg.get_researcher()) + def beta_warn(self): + if not GrampsKeys.get_betawarn(): + return + WarningDialog( + "Use at your own risk", + "This is an unstable development version of GRAMPS. " + "It is intended as a technology preview. Do not trust " + "your family database to this development version. " + "This version may contain bugs which could corrupt " + "your database.") + GrampsKeys.save_betawarn(1) + GrampsKeys.sync() + def date_format_key_update(self,client,cnxn_id,entry,data): GrampsCfg.set_calendar_date_format() self.familyview_key_update(client,cnxn_id,entry,data)