From ce1ab6ee5eb5b9ba2cdb236518d61cedf634a624 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sat, 26 Feb 2011 09:26:17 +0000 Subject: [PATCH] Initial bits --- openlp.pyw | 8 +++++++- openlp/core/utils/languagemanager.py | 3 +-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/openlp.pyw b/openlp.pyw index 85ba81fba..565d5936f 100755 --- a/openlp.pyw +++ b/openlp.pyw @@ -172,6 +172,10 @@ class OpenLP(QtGui.QApplication): self.setApplicationVersion(app_version[u'version']) if os.name == u'nt': self.setStyleSheet(application_stylesheet) + # First time checks in settings + if QtCore.QSettings().value( + u'general/first time', QtCore.QVariant(True)).toBool(): + print "first time" show_splash = QtCore.QSettings().value( u'general/show splash', QtCore.QVariant(True)).toBool() if show_splash: @@ -273,7 +277,9 @@ def main(): qInitResources() # Now create and actually run the application. app = OpenLP(qt_args) - #i18n Set Language + # Define the settings environment + QtCore.QSettings(u'OpenLP', u'OpenLP') + # i18n Set Language language = LanguageManager.get_language() appTranslator = LanguageManager.get_translator(language) app.installTranslator(appTranslator) diff --git a/openlp/core/utils/languagemanager.py b/openlp/core/utils/languagemanager.py index ced2fa843..43d2a8e67 100644 --- a/openlp/core/utils/languagemanager.py +++ b/openlp/core/utils/languagemanager.py @@ -89,8 +89,7 @@ class LanguageManager(object): """ Retrieve a saved language to use from settings """ - settings = QtCore.QSettings(u'OpenLP', u'OpenLP') - language = unicode(settings.value( + language = unicode(QtCore.QSettings().value( u'general/language', QtCore.QVariant(u'[en]')).toString()) log.info(u'Language file: \'%s\' Loaded from conf file' % language) reg_ex = QtCore.QRegExp("^\[(.*)\]")