* src/GrampsLocale.py: handle platform specific locale issues
* src/DateDisplay.py: use GrampsLocale * src/DateParser.py: use GrampsLocale * src/DisplayModels.py: use GrampsLocale * src/Exporter.py: start conversion to Assistant * src/RecentFiles.py: fcntl option for broken platforms * src/StartupDialog.py: convert to Assistant * src/ViewManager.py: remove debug statement * src/RelLib/_PrimaryObject.py: use GrampsLocale * src/plugins/Checkpoint.py: use GrampsLocale * src/plugins/NavWebPage.py: use GrampsLocale svn: r5644
This commit is contained in:
@ -43,13 +43,6 @@ import gtk.glade
|
||||
import Assistant
|
||||
import const
|
||||
|
||||
if not const.no_gconf:
|
||||
try:
|
||||
import gconf
|
||||
except ImportError:
|
||||
import gnome.gconf
|
||||
gconf = gnome.gconf
|
||||
|
||||
import GrampsKeys
|
||||
from QuestionDialog import ErrorDialog
|
||||
|
||||
@ -59,10 +52,6 @@ from QuestionDialog import ErrorDialog
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
if not const.no_gconf:
|
||||
client = gconf.client_get_default()
|
||||
client.add_dir("/apps/gramps",gconf.CLIENT_PRELOAD_NONE)
|
||||
|
||||
def need_to_run():
|
||||
val = GrampsKeys.get_startup()
|
||||
if val < const.startup:
|
||||
@ -76,6 +65,9 @@ def upgrade_prefs():
|
||||
On failure, print message and return False.
|
||||
"""
|
||||
try:
|
||||
client = gconf.client_get_default()
|
||||
client.add_dir("/apps/gramps",gconf.CLIENT_PRELOAD_NONE)
|
||||
|
||||
GrampsKeys.save_fprefix(client.get_string('/apps/gramps/fprefix'))
|
||||
GrampsKeys.save_sprefix(client.get_string('/apps/gramps/sprefix'))
|
||||
GrampsKeys.save_pprefix(client.get_string('/apps/gramps/pprefix'))
|
||||
@ -104,10 +96,8 @@ def upgrade_prefs():
|
||||
toolbar = -1
|
||||
GrampsKeys.save_toolbar(toolbar)
|
||||
GrampsKeys.save_toolbar_on(client.get_bool('/apps/gramps/toolbar-on'))
|
||||
print "Successfully imported preferences from the 1.0.x version."
|
||||
return True
|
||||
except:
|
||||
print "Failed to import preferences from the 1.0.x version."
|
||||
return False
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
|
Reference in New Issue
Block a user