From 254f6915ed137407b122863775baeb76415d1dcb Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Fri, 18 Jan 2013 13:25:05 +0100 Subject: [PATCH] changed keys --- openlp/core/lib/settings.py | 4 ++-- openlp/plugins/songusage/forms/songusagedetailform.py | 6 +++--- openlp/plugins/songusage/songusageplugin.py | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/openlp/core/lib/settings.py b/openlp/core/lib/settings.py index 930a61662..0b87fcba5 100644 --- a/openlp/core/lib/settings.py +++ b/openlp/core/lib/settings.py @@ -231,11 +231,11 @@ class Settings(QtCore.QSettings): __obsolete_settings__ = [ (u'bibles/bookname language', u'bibles/book name language', []), (u'general/enable slide loop', u'advanced/slide limits', [(SlideLimits.Wrap, True), (SlideLimits.End, False)]) -# song usage/last directory 1 -> last directory import +# songusage/last directory 1 -> songusage/last directory export # bibles/last directory 1 -> bibles/last directory backup +# songs/last directory 1 -> songs/last directory import # themes/last directory -> themes/last directory import # themes/last directory 1-> themes/last directory export -# songs/last directory 1 -> songs/last directory import ] @staticmethod diff --git a/openlp/plugins/songusage/forms/songusagedetailform.py b/openlp/plugins/songusage/forms/songusagedetailform.py index a62246e6c..c455e079c 100644 --- a/openlp/plugins/songusage/forms/songusagedetailform.py +++ b/openlp/plugins/songusage/forms/songusagedetailform.py @@ -61,7 +61,7 @@ class SongUsageDetailForm(QtGui.QDialog, Ui_SongUsageDetailDialog): fromDate = Settings().value(self.plugin.settingsSection + u'/from date') self.fromDate.setSelectedDate(fromDate) self.toDate.setSelectedDate(toDate) - self.fileLineEdit.setText(Settings().value(self.plugin.settingsSection + u'/last directory')) + self.fileLineEdit.setText(Settings().value(self.plugin.settingsSection + u'/last directory export')) def defineOutputLocation(self): """ @@ -69,9 +69,9 @@ class SongUsageDetailForm(QtGui.QDialog, Ui_SongUsageDetailDialog): """ path = QtGui.QFileDialog.getExistingDirectory(self, translate('SongUsagePlugin.SongUsageDetailForm', 'Output File Location'), - Settings().value(self.plugin.settingsSection + u'/last directory')) + Settings().value(self.plugin.settingsSection + u'/last directory export')) if path: - Settings().setValue(self.plugin.settingsSection + u'/last directory', path) + Settings().setValue(self.plugin.settingsSection + u'/last directory export', path) self.fileLineEdit.setText(path) def accept(self): diff --git a/openlp/plugins/songusage/songusageplugin.py b/openlp/plugins/songusage/songusageplugin.py index 9dccbfad9..b39d65ed9 100644 --- a/openlp/plugins/songusage/songusageplugin.py +++ b/openlp/plugins/songusage/songusageplugin.py @@ -52,7 +52,8 @@ __default_settings__ = { u'songusage/db type': u'sqlite', u'songusage/active': False, u'songusage/to date': QtCore.QDate(YEAR, 8, 31), - u'songusage/from date': QtCore.QDate(YEAR - 1, 9, 1) + u'songusage/from date': QtCore.QDate(YEAR - 1, 9, 1), + u'songusage/last directory export': u'' }