diff --git a/gramps/NEWS b/gramps/NEWS index ec825ed83..cf9817ccf 100644 --- a/gramps/NEWS +++ b/gramps/NEWS @@ -1,3 +1,6 @@ +Version 0.4.0 + + Version 0.3.2 * Fixed Style Editor on WebPage.py, to allow styles to be edited. * WebPage generator now lists more information, including sources. diff --git a/gramps/src/Config.py b/gramps/src/Config.py index f22ae90b0..72185906c 100644 --- a/gramps/src/Config.py +++ b/gramps/src/Config.py @@ -349,15 +349,15 @@ def on_propertybox_apply(obj,page): status_bar = 2 dbdir_temp = prefsTop.get_widget("dbdir").get_full_path(1) - if os.path.isdir(dbdir_temp): + if dbdir_temp != None and os.path.isdir(dbdir_temp): db_dir = os.path.normpath(dbdir_temp) + os.sep repdir_temp = prefsTop.get_widget("repdir").get_full_path(1) - if os.path.isdir(repdir_temp): + if repdir_temp != None and os.path.isdir(repdir_temp): report_dir = os.path.normpath(repdir_temp) + os.sep webdir_temp = prefsTop.get_widget("htmldir").get_full_path(1) - if os.path.isdir(webdir_temp): + if webdir_temp != None and os.path.isdir(webdir_temp): web_dir = os.path.normpath(webdir_temp) + os.sep paper_preference = paper_obj.get_data("d") @@ -507,6 +507,13 @@ def display_preferences_box(): detail.set_active(show_detail) tabs.set_active(usetabs) + if status_bar == 0: + prefsTop.get_widget("stat1").set_active(1) + elif status_bar == 1: + prefsTop.get_widget("stat2").set_active(1) + else: + prefsTop.get_widget("stat3").set_active(1) + display_attr_obj.set_active(display_attr) prefsTop.get_widget("attr_name").set_text(attr_name) diff --git a/gramps/src/const.py b/gramps/src/const.py index 28b79d9b7..502c0a678 100644 --- a/gramps/src/const.py +++ b/gramps/src/const.py @@ -30,8 +30,8 @@ _ = intl.gettext # #------------------------------------------------------------------------- editor = "gimp" -zipcmd = "/usr/bin/zip -r -q" -convert = "/usr/X11R6/bin/convert" +zipcmd = "zip -r -q" +convert = "convert" #------------------------------------------------------------------------- #