From 28ea251866c06749750a676df170a4710ac93b9d Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Thu, 7 Feb 2013 19:00:40 +0100 Subject: [PATCH] fixed servicemanager bugs preventing saving/opening a service --- openlp/core/lib/settings.py | 2 +- openlp/core/ui/servicemanager.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/openlp/core/lib/settings.py b/openlp/core/lib/settings.py index 78e8004c4..7e72c6d4c 100644 --- a/openlp/core/lib/settings.py +++ b/openlp/core/lib/settings.py @@ -143,6 +143,7 @@ class Settings(QtCore.QSettings): u'media/players': u'webkit', u'media/override player': QtCore.Qt.Unchecked, u'players/background color': u'#000000', + u'servicemanager/last directory': u'', u'servicemanager/last file': u'', u'servicemanager/service theme': u'', u'SettingsImport/file_date_created': datetime.datetime.now().strftime("%Y-%m-%d %H:%M"), @@ -242,7 +243,6 @@ class Settings(QtCore.QSettings): (u'media/background color', u'players/background color', []), (u'themes/last directory', u'themes/last directory import', []), (u'themes/last directory 1', u'themes/last directory export', []), - (u'servicemanager/last directory', u'', []), (u'songs/last directory 1', u'songs/last directory import', []), (u'songusage/last directory 1', u'songusage/last directory export', []), (u'user interface/mainwindow splitter geometry', u'user interface/main window splitter geometry', []), diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index 778f8d8cb..cfa0d4707 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -661,11 +661,11 @@ class ServiceManager(QtGui.QWidget, ServiceManagerDialog): # SaveAs from osz to oszl is not valid as the files will be deleted # on exit which is not sensible or usable in the long term. if self._file_name.endswith(u'oszl') or self.service_has_all_original_files: - file_name = QtGui.QFileDialog.getSavefile_name(self.main_window, UiStrings().SaveService, path, + file_name = QtGui.QFileDialog.getSaveFileName(self.main_window, UiStrings().SaveService, path, translate('OpenLP.ServiceManager', 'OpenLP Service Files (*.osz);; OpenLP Service Files - lite (*.oszl)')) else: - file_name = QtGui.QFileDialog.getSavefile_name(self.main_window, UiStrings().SaveService, path, + file_name = QtGui.QFileDialog.getSaveFileName(self.main_window, UiStrings().SaveService, path, translate('OpenLP.ServiceManager', 'OpenLP Service Files (*.osz);;')) if not file_name: return False