From 2ccd6a01f00da6562e80c15b511a5aa6dfc6df4d Mon Sep 17 00:00:00 2001 From: Phill Ridout Date: Tue, 14 Nov 2017 22:13:38 +0000 Subject: [PATCH] Set the default filter in accordance to the current service file type Fixes: https://launchpad.net/bugs/1673251 --- openlp/core/ui/servicemanager.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index 3e1d0f544..81edd4930 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -704,15 +704,19 @@ class ServiceManager(QtWidgets.QWidget, RegistryBase, Ui_ServiceManager, LogMixi directory_path = Settings().value(self.main_window.service_manager_settings_section + '/last directory') if directory_path: default_file_path = directory_path / default_file_path - # 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. lite_filter = translate('OpenLP.ServiceManager', 'OpenLP Service Files - lite (*.oszl)') packaged_filter = translate('OpenLP.ServiceManager', 'OpenLP Service Files (*.osz)') - + if self._file_name.endswith('oszl'): + default_filter = lite_filter + else: + default_filter = packaged_filter + # 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('oszl') or self.service_has_all_original_files: file_path, filter_used = FileDialog.getSaveFileName( self.main_window, UiStrings().SaveService, default_file_path, - '{packaged};; {lite}'.format(packaged=packaged_filter, lite=lite_filter)) + '{packaged};; {lite}'.format(packaged=packaged_filter, lite=lite_filter), + default_filter) else: file_path, filter_used = FileDialog.getSaveFileName( self.main_window, UiStrings().SaveService, default_file_path,