- Reverted the Powerpoint > PowerPoint changes.

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
 

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):

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

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': '',

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
         }
 

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')
 
 

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):