raoul
/
openlp
forked from openlp/openlp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- Reverted the Powerpoint > PowerPoint changes.

This commit is contained in:
suutari-olli 2016-04-13 17:10:47 +03:00
parent 6a0108ced1
commit 33078b426f
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openlp/plugins/presentations/lib/powerpointcontroller.py
View File

@ -60,7 +60,7 @@ class PowerpointController(PresentationController):
Initialise the class Initialise the class
""" """
log.debug('Initialising') 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.supports = ['ppt', 'pps', 'pptx', 'ppsx', 'pptm']
self.process = None self.process = None

2
openlp/plugins/presentations/lib/pptviewcontroller.py
View File

@ -55,7 +55,7 @@ class PptviewController(PresentationController):
""" """
log.debug('Initialising') log.debug('Initialising')
self.process = None 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'] self.supports = ['ppt', 'pps', 'pptx', 'ppsx', 'pptm']
def check_available(self): def check_available(self):

2
openlp/plugins/presentations/lib/presentationtab.py
View File

@ -148,7 +148,7 @@ class PresentationTab(SettingsTab):
controller = self.controllers[key] controller = self.controllers[key]
checkbox = self.presenter_check_boxes[controller.name] checkbox = self.presenter_check_boxes[controller.name]
checkbox.setChecked(Settings().value(self.settings_section + '/' + 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 powerpoint_available = True
self.override_app_check_box.setChecked(Settings().value(self.settings_section + '/override app')) self.override_app_check_box.setChecked(Settings().value(self.settings_section + '/override app'))
# Load PowerPoint settings # Load PowerPoint settings

4
openlp/plugins/presentations/presentationplugin.py
View File

@ -40,8 +40,8 @@ __default_settings__ = {'presentations/override app': QtCore.Qt.Unchecked,
'presentations/enable_pdf_program': QtCore.Qt.Unchecked, 'presentations/enable_pdf_program': QtCore.Qt.Unchecked,
'presentations/pdf_program': '', 'presentations/pdf_program': '',
'presentations/Impress': QtCore.Qt.Checked, 'presentations/Impress': QtCore.Qt.Checked,
'presentations/PowerPoint': QtCore.Qt.Checked, 'presentations/Powerpoint': QtCore.Qt.Checked,
'presentations/PowerPoint Viewer': QtCore.Qt.Checked, 'presentations/Powerpoint Viewer': QtCore.Qt.Checked,
'presentations/Pdf': QtCore.Qt.Checked, 'presentations/Pdf': QtCore.Qt.Checked,
'presentations/presentations files': [], 'presentations/presentations files': [],
'presentations/thumbnail_scheme': '', 'presentations/thumbnail_scheme': '',

2
tests/functional/openlp_plugins/presentations/test_mediaitem.py
View File

@ -69,7 +69,7 @@ class TestMediaItem(TestCase, TestMixin):
self.media_item.controllers = { self.media_item.controllers = {
'Impress': impress_controller, 'Impress': impress_controller,
'Powerpoint': presentation_controller, 'Powerpoint': presentation_controller,
'PowerPoint Viewer': presentation_viewer_controller, 'Powerpoint Viewer': presentation_viewer_controller,
'Pdf': pdf_controller 'Pdf': pdf_controller
} }

2
tests/functional/openlp_plugins/presentations/test_powerpointcontroller.py
View File

@ -76,7 +76,7 @@ class TestPowerpointController(TestCase, TestMixin):
controller = PowerpointController(plugin=self.mock_plugin) controller = PowerpointController(plugin=self.mock_plugin)
# THEN: The name of the presentation controller should be correct # 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') 'The name of the presentation controller should be correct')

2
tests/functional/openlp_plugins/presentations/test_pptviewcontroller.py
View File

@ -76,7 +76,7 @@ class TestPptviewController(TestCase, TestMixin):
controller = PptviewController(plugin=self.mock_plugin) controller = PptviewController(plugin=self.mock_plugin)
# THEN: The name of the presentation controller should be correct # 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') 'The name of the presentation controller should be correct')
def check_available_test(self): def check_available_test(self):