openlp-core team mailing list archive

[Andreas Preikschat <andreaspreikschat@xxxxxxxxxx>]

Andreas Preikschat has proposed merging lp:~googol/openlp/central-settings-place into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #1096559 in OpenLP: "Central place for default settings"
  https://bugs.launchpad.net/openlp/+bug/1096559

For more details, see:
https://code.launchpad.net/~googol/openlp/central-settings-place/+merge/147197

Hello,

- fixed saving/opening of a service

http://pastebin.com/LBjSmhFY
-- 
https://code.launchpad.net/~googol/openlp/central-settings-place/+merge/147197
Your team OpenLP Core is requested to review the proposed merge of lp:~googol/openlp/central-settings-place into lp:openlp.

=== modified file 'openlp/core/lib/settings.py'
--- openlp/core/lib/settings.py	2013-02-04 21:07:38 +0000
+++ openlp/core/lib/settings.py	2013-02-07 18:06:24 +0000
@@ -143,6 +143,7 @@
         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 @@
         (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', []),

=== modified file 'openlp/core/ui/servicemanager.py'
--- openlp/core/ui/servicemanager.py	2013-02-05 08:05:28 +0000
+++ openlp/core/ui/servicemanager.py	2013-02-07 18:06:24 +0000
@@ -661,11 +661,11 @@
         # 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