From bee9c96b9a5bec5b593276adf6478fa9dad116b0 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Fri, 18 Jan 2013 22:24:25 +0100 Subject: [PATCH] song export fixes --- openlp/core/lib/settings.py | 4 ++++ openlp/core/ui/mainwindow.py | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/openlp/core/lib/settings.py b/openlp/core/lib/settings.py index 7defc51fb..44c5bf3e0 100644 --- a/openlp/core/lib/settings.py +++ b/openlp/core/lib/settings.py @@ -145,6 +145,10 @@ class Settings(QtCore.QSettings): u'players/background color': u'#000000', u'servicemanager/service theme': u'', u'servicemanager/last directory': u'', + u'SettingsImport/Make_Changes': u'At_Own_RISK', + u'SettingsImport/type': u'OpenLP_settings_export', + u'SettingsImport/file_date_created': datetime.datetime.now().strftime("%Y-%m-%d %H:%M"), + u'SettingsImport/version': u'', u'shortcuts/viewPreviewPanel': [QtGui.QKeySequence(u'F11')], u'shortcuts/settingsImportItem': [], u'shortcuts/settingsPluginListItem': [QtGui.QKeySequence(u'Alt+F7')], diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index ee51a626d..75a81d548 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -42,7 +42,7 @@ from PyQt4 import QtCore, QtGui from openlp.core.lib import Renderer, build_icon, OpenLPDockWidget, PluginManager, Receiver, translate, ImageManager, \ PluginStatus, ScreenList, UiStrings from openlp.core.lib.ui import create_action -from openlp.core.lib import SlideLimits, Settings +from openlp.core.lib import Settings from openlp.core.ui import AboutForm, SettingsForm, ServiceManager, ThemeManager, SlideController, PluginForm, \ MediaDockManager, ShortcutListForm, FormattingTagForm from openlp.core.ui.media import MediaController @@ -858,6 +858,8 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): continue # We have a good file, import it. for section_key in import_keys: + if u'eneral' in section_key: + section_key = section_key.lower() value = import_settings.value(section_key) if value is not None: settings.setValue(u'%s' % (section_key), value)