From 33078b426ff8860ccefecbdd19d62b5d0254c0da Mon Sep 17 00:00:00 2001 From: suutari-olli Date: Wed, 13 Apr 2016 17:10:47 +0300 Subject: [PATCH] - Reverted the Powerpoint > PowerPoint changes. --- openlp/plugins/presentations/lib/powerpointcontroller.py | 2 +- openlp/plugins/presentations/lib/pptviewcontroller.py | 2 +- openlp/plugins/presentations/lib/presentationtab.py | 2 +- openlp/plugins/presentations/presentationplugin.py | 4 ++-- .../functional/openlp_plugins/presentations/test_mediaitem.py | 2 +- .../openlp_plugins/presentations/test_powerpointcontroller.py | 2 +- .../openlp_plugins/presentations/test_pptviewcontroller.py | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/openlp/plugins/presentations/lib/powerpointcontroller.py b/openlp/plugins/presentations/lib/powerpointcontroller.py index e5e7c40b9..2e6959ade 100644 --- a/openlp/plugins/presentations/lib/powerpointcontroller.py +++ b/openlp/plugins/presentations/lib/powerpointcontroller.py @@ -60,7 +60,7 @@ class PowerpointController(PresentationController): Initialise the class """ log.debug('Initialising') - super(PowerpointController, self).__init__(plugin, 'PowerPoint', PowerpointDocument) + super(PowerpointController, self).__init__(plugin, 'Powerpoint', PowerpointDocument) self.supports = ['ppt', 'pps', 'pptx', 'ppsx', 'pptm'] self.process = None diff --git a/openlp/plugins/presentations/lib/pptviewcontroller.py b/openlp/plugins/presentations/lib/pptviewcontroller.py index f1a3a49f8..aba0aa88e 100644 --- a/openlp/plugins/presentations/lib/pptviewcontroller.py +++ b/openlp/plugins/presentations/lib/pptviewcontroller.py @@ -55,7 +55,7 @@ class PptviewController(PresentationController): """ log.debug('Initialising') self.process = None - super(PptviewController, self).__init__(plugin, 'PowerPoint Viewer', PptviewDocument) + super(PptviewController, self).__init__(plugin, 'Powerpoint Viewer', PptviewDocument) self.supports = ['ppt', 'pps', 'pptx', 'ppsx', 'pptm'] def check_available(self): diff --git a/openlp/plugins/presentations/lib/presentationtab.py b/openlp/plugins/presentations/lib/presentationtab.py index 5d272ceda..62c94832b 100644 --- a/openlp/plugins/presentations/lib/presentationtab.py +++ b/openlp/plugins/presentations/lib/presentationtab.py @@ -148,7 +148,7 @@ class PresentationTab(SettingsTab): controller = self.controllers[key] checkbox = self.presenter_check_boxes[controller.name] checkbox.setChecked(Settings().value(self.settings_section + '/' + controller.name)) - if controller.name == 'PowerPoint' and controller.is_available(): + if controller.name == 'Powerpoint' and controller.is_available(): powerpoint_available = True self.override_app_check_box.setChecked(Settings().value(self.settings_section + '/override app')) # Load PowerPoint settings diff --git a/openlp/plugins/presentations/presentationplugin.py b/openlp/plugins/presentations/presentationplugin.py index 330ff0cc5..ff14d821c 100644 --- a/openlp/plugins/presentations/presentationplugin.py +++ b/openlp/plugins/presentations/presentationplugin.py @@ -40,8 +40,8 @@ __default_settings__ = {'presentations/override app': QtCore.Qt.Unchecked, 'presentations/enable_pdf_program': QtCore.Qt.Unchecked, 'presentations/pdf_program': '', 'presentations/Impress': QtCore.Qt.Checked, - 'presentations/PowerPoint': QtCore.Qt.Checked, - 'presentations/PowerPoint Viewer': QtCore.Qt.Checked, + 'presentations/Powerpoint': QtCore.Qt.Checked, + 'presentations/Powerpoint Viewer': QtCore.Qt.Checked, 'presentations/Pdf': QtCore.Qt.Checked, 'presentations/presentations files': [], 'presentations/thumbnail_scheme': '', diff --git a/tests/functional/openlp_plugins/presentations/test_mediaitem.py b/tests/functional/openlp_plugins/presentations/test_mediaitem.py index daa2886f6..a689966ec 100644 --- a/tests/functional/openlp_plugins/presentations/test_mediaitem.py +++ b/tests/functional/openlp_plugins/presentations/test_mediaitem.py @@ -69,7 +69,7 @@ class TestMediaItem(TestCase, TestMixin): self.media_item.controllers = { 'Impress': impress_controller, 'Powerpoint': presentation_controller, - 'PowerPoint Viewer': presentation_viewer_controller, + 'Powerpoint Viewer': presentation_viewer_controller, 'Pdf': pdf_controller } diff --git a/tests/functional/openlp_plugins/presentations/test_powerpointcontroller.py b/tests/functional/openlp_plugins/presentations/test_powerpointcontroller.py index 935aa7881..c6ddb8238 100644 --- a/tests/functional/openlp_plugins/presentations/test_powerpointcontroller.py +++ b/tests/functional/openlp_plugins/presentations/test_powerpointcontroller.py @@ -76,7 +76,7 @@ class TestPowerpointController(TestCase, TestMixin): controller = PowerpointController(plugin=self.mock_plugin) # THEN: The name of the presentation controller should be correct - self.assertEqual('PowerPoint', controller.name, + self.assertEqual('Powerpoint', controller.name, 'The name of the presentation controller should be correct') diff --git a/tests/functional/openlp_plugins/presentations/test_pptviewcontroller.py b/tests/functional/openlp_plugins/presentations/test_pptviewcontroller.py index d54379db7..104c0e1fa 100644 --- a/tests/functional/openlp_plugins/presentations/test_pptviewcontroller.py +++ b/tests/functional/openlp_plugins/presentations/test_pptviewcontroller.py @@ -76,7 +76,7 @@ class TestPptviewController(TestCase, TestMixin): controller = PptviewController(plugin=self.mock_plugin) # THEN: The name of the presentation controller should be correct - self.assertEqual('PowerPoint Viewer', controller.name, + self.assertEqual('Powerpoint Viewer', controller.name, 'The name of the presentation controller should be correct') def check_available_test(self):