From ec7a7b74fee96699a01ec1a13e4638bb75adb36a Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sat, 10 May 2014 08:38:38 +0100 Subject: [PATCH 1/6] test --- tests/helpers/testmixin.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/helpers/testmixin.py b/tests/helpers/testmixin.py index b4e8a5c59..0b168d45e 100644 --- a/tests/helpers/testmixin.py +++ b/tests/helpers/testmixin.py @@ -62,3 +62,9 @@ class TestMixin(object): """ os.close(self.fd) os.unlink(Settings().fileName()) + + + + + + From 983db7b0f007db500fa3b08b58ec5e768ec857d6 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sat, 31 May 2014 21:07:46 +0100 Subject: [PATCH 2/6] fix pep --- tests/helpers/testmixin.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/helpers/testmixin.py b/tests/helpers/testmixin.py index 0b168d45e..757623027 100644 --- a/tests/helpers/testmixin.py +++ b/tests/helpers/testmixin.py @@ -67,4 +67,3 @@ class TestMixin(object): - From 7bea1ea7de2f86ff087ba1f234b14edd40a50fef Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sat, 31 May 2014 21:10:59 +0100 Subject: [PATCH 3/6] fix pep --- tests/helpers/testmixin.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tests/helpers/testmixin.py b/tests/helpers/testmixin.py index 757623027..b4e8a5c59 100644 --- a/tests/helpers/testmixin.py +++ b/tests/helpers/testmixin.py @@ -62,8 +62,3 @@ class TestMixin(object): """ os.close(self.fd) os.unlink(Settings().fileName()) - - - - - From a912db6abf9a5a48d0dbd5cf5102be6dffb3e035 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sun, 1 Jun 2014 18:12:00 +0100 Subject: [PATCH 4/6] new bug --- openlp/core/ui/servicemanager.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index 70cbd6141..9d4613c33 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -1081,6 +1081,7 @@ class ServiceManager(OpenLPMixin, RegistryMixin, QtGui.QWidget, Ui_ServiceManage :param field: :param message: The data passed in from a remove message """ + self.log_debug(message) self.set_item(int(message)) def set_item(self, index): @@ -1089,7 +1090,7 @@ class ServiceManager(OpenLPMixin, RegistryMixin, QtGui.QWidget, Ui_ServiceManage :param index: The index of the service item list to be actioned. """ - if 0 >= index < self.service_manager_list.topLevelItemCount(): + if 0 <= index < self.service_manager_list.topLevelItemCount(): item = self.service_manager_list.topLevelItem(index) self.service_manager_list.setCurrentItem(item) self.make_live() From f23e6033141a9115311cb5eab51af76f6c7a44de Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Thu, 5 Jun 2014 17:25:37 +0100 Subject: [PATCH 5/6] 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') From 567b3f4b579b9c7b2c0430582aefb9f208a17699 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Thu, 5 Jun 2014 17:32:29 +0100 Subject: [PATCH 6/6] Fix up description --- tests/functional/openlp_core_ui/test_servicemanager.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/functional/openlp_core_ui/test_servicemanager.py b/tests/functional/openlp_core_ui/test_servicemanager.py index d04c898a3..2c76ed965 100644 --- a/tests/functional/openlp_core_ui/test_servicemanager.py +++ b/tests/functional/openlp_core_ui/test_servicemanager.py @@ -82,10 +82,10 @@ class TestServiceManager(TestCase): """ # GIVEN: A new service manager instance. service_manager = ServiceManager(None) - # WHEN: a suffix is added. + # WHEN: a suffix is added as an individual or a list. service_manager.supported_suffixes('txt') service_manager.supported_suffixes(['pptx', 'ppt']) - # THEN: The the controller should be registered in the registry. + # THEN: The suffixes should be available to test. 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')