svn: r2502
This commit is contained in:
Don Allingham 2003-12-11 05:02:16 +00:00
parent 907b685956
commit f05bf85f76

View File

@ -249,7 +249,11 @@ def loadConfig(call):
index_visible = get_bool("/apps/gramps/index-visible") index_visible = get_bool("/apps/gramps/index-visible")
status_bar = get_int("/apps/gramps/statusbar") status_bar = get_int("/apps/gramps/statusbar")
gnome_toolbar_str = get_string("/desktop/gnome/interface/toolbar_style","BOTH") gnome_toolbar_str = get_string("/desktop/gnome/interface/toolbar_style","BOTH")
gnome_toolbar = eval("gtk.TOOLBAR_%s" % string.upper(gnome_toolbar_str))
try:
gnome_toolbar = eval("gtk.TOOLBAR_%s" % gnome_toolbar_str.upper())
except:
gnome_toolbar = 2
save_toolbar = get_int("/apps/gramps/toolbar",5) save_toolbar = get_int("/apps/gramps/toolbar",5)
if save_toolbar == 5: if save_toolbar == 5:
@ -865,22 +869,19 @@ class GrampsPreferences:
status_bar = 2 status_bar = 2
save_toolbar = self.top.get_widget("tooloptmenu").get_history() save_toolbar = self.top.get_widget("tooloptmenu").get_history()
gnome_toolbar_str = get_string("/desktop/gnome/interface/toolbar_style") gnome_toolbar_str = get_string("/desktop/gnome/interface/toolbar_style",'BOTH')
gnome_toolbar = eval("gtk.TOOLBAR_%s" % string.upper(gnome_toolbar_str)) try:
gnome_toolbar = eval("gtk.TOOLBAR_%s" % gnome_toolbar_str.upper())
except:
gnome_toolbar = 2
if save_toolbar == 5: if save_toolbar == 5:
toolbar = gnome_toolbar toolbar = gnome_toolbar
else: else:
toolbar = save_toolbar toolbar = save_toolbar
if self.top.get_widget("pvbutton").get_active(): defaultview = not self.top.get_widget("pvbutton").get_active()
defaultview = 0 familyview = not self.top.get_widget("familyview1").get_active()
else:
defaultview = 1
if self.top.get_widget("familyview1").get_active():
familyview = 0
else:
familyview = 1
iprefix = self.top.get_widget("iprefix").get_text() iprefix = self.top.get_widget("iprefix").get_text()
if iprefix == "": if iprefix == "":