From f23e6033141a9115311cb5eab51af76f6c7a44de Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Thu, 5 Jun 2014 17:25:37 +0100 Subject: [PATCH] Fix up interface better --- openlp/core/ui/servicemanager.py | 9 ++++++--- openlp/plugins/presentations/lib/mediaitem.py | 2 +- tests/functional/openlp_core_ui/test_servicemanager.py | 7 +++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index 9d4613c33..52afb5edc 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -401,9 +401,12 @@ class ServiceManager(OpenLPMixin, RegistryMixin, QtGui.QWidget, Ui_ServiceManage :param suffix_list: New Suffix's to be supported """ - for suffix in suffix_list: - if suffix not in self.suffixes: - self.suffixes.append(suffix) + if isinstance(suffix_list, str): + self.suffixes.append(suffix_list) + else: + for suffix in suffix_list: + if suffix not in self.suffixes: + self.suffixes.append(suffix) def on_new_service_clicked(self, field=None): """ diff --git a/openlp/plugins/presentations/lib/mediaitem.py b/openlp/plugins/presentations/lib/mediaitem.py index fe3246586..5b503d50f 100644 --- a/openlp/plugins/presentations/lib/mediaitem.py +++ b/openlp/plugins/presentations/lib/mediaitem.py @@ -92,7 +92,7 @@ class PresentationMediaItem(MediaManagerItem): for file_type in file_types: if file_type not in file_type_string: file_type_string += '*.%s ' % file_type - self.service_manager.supported_suffixes([file_type]) + self.service_manager.supported_suffixes(file_type) self.on_new_file_masks = translate('PresentationPlugin.MediaItem', 'Presentations (%s)') % file_type_string def required_icons(self): diff --git a/tests/functional/openlp_core_ui/test_servicemanager.py b/tests/functional/openlp_core_ui/test_servicemanager.py index f3deb56c7..d04c898a3 100644 --- a/tests/functional/openlp_core_ui/test_servicemanager.py +++ b/tests/functional/openlp_core_ui/test_servicemanager.py @@ -83,6 +83,9 @@ class TestServiceManager(TestCase): # GIVEN: A new service manager instance. service_manager = ServiceManager(None) # WHEN: a suffix is added. - service_manager.supported_suffixes(['txt']) + service_manager.supported_suffixes('txt') + service_manager.supported_suffixes(['pptx', 'ppt']) # THEN: The the controller should be registered in the registry. - self.assertEqual('txt' in service_manager.suffixes, True, 'The suffix should be in the list') + self.assertEqual('txt' in service_manager.suffixes, True, 'The suffix txt should be in the list') + self.assertEqual('ppt' in service_manager.suffixes, True, 'The suffix ppt should be in the list') + self.assertEqual('pptx' in service_manager.suffixes, True, 'The suffix pptx should be in the list')