code changes implemented

openlp/core/common/settings.py

@@ -291,6 +291,7 @@ class Settings(QtCore.QSettings):
         'presentations/thumbnail_scheme': '',
         'presentations/powerpoint slide click advance': QtCore.Qt.Unchecked,
         'presentations/powerpoint control window': QtCore.Qt.Unchecked,
+        'presentations/impress use display setting': QtCore.Qt.Unchecked,
         'presentations/last directory': None,
         'servicemanager/last directory': None,
         'servicemanager/last file': None,

openlp/plugins/presentations/lib/impresscontroller.py

@@ -37,6 +37,7 @@ from PyQt5 import QtCore
 
 from openlp.core.common import delete_file, get_uno_command, get_uno_instance, is_win, trace_error_handler
 from openlp.core.common.registry import Registry
+from openlp.core.common.settings import Settings
 from openlp.core.display.screens import ScreenList
 from openlp.plugins.presentations.lib.presentationcontroller import PresentationController, PresentationDocument, \
     TextType
@@ -233,10 +234,10 @@ class ImpressController(PresentationController):
                 'com.sun.star.configuration.ConfigurationUpdateAccess', properties)
             # Get the specific setting for presentation screen
             presenter_screen_enabled = impress_conf_props.getHierarchicalPropertyValue(
-                'Misc/Start/EnablePresenterScreen')
+                'Misc/Start/PresenterScreen')
             # If the presentation screen is enabled we disable it
             if presenter_screen_enabled != set_visible:
-                impress_conf_props.setHierarchicalPropertyValue('Misc/Start/EnablePresenterScreen', set_visible)
+                impress_conf_props.setHierarchicalPropertyValue('Misc/Start/PresenterScreen', set_visible)
                 impress_conf_props.commitChanges()
                 # if set_visible is False this is an attempt to disable the Presenter Screen
                 # so we make a note that it has been disabled, so it can be enabled again on close.
@@ -312,7 +313,18 @@ class ImpressDocument(PresentationDocument):
             log.warning('Presentation {url} could not be loaded'.format(url=url))
             return False
         self.presentation = self.document.getPresentation()
-        self.presentation.Display = ScreenList().current.number + 1
+        # OpenOffice uses a screen numbering scheme where the primary display is 1 and the external monitor 2
+        # but OpenLP sets screen numbers based on screen coordinates (geometry)
+        # so we work out what OpenOffice display to use based on which of the openlp screens is primary
+        # unless the user has defined in Settings to use the impress Slide Show setting for presentation display
+        if not Settings().value('presentations/impress use display setting'):
+            public_display_screen_number = ScreenList().current.number
+            screens = list(ScreenList())
+            if screens[public_display_screen_number].is_primary:
+                presentation_screen = 1
+            else:
+                presentation_screen = 2
+            self.presentation.Display = presentation_screen
         self.control = None
         self.create_thumbnails()
         self.create_titles_and_notes()

openlp/plugins/presentations/lib/presentationtab.py

@@ -76,6 +76,15 @@ class PresentationTab(SettingsTab):
         self.ppt_window_check_box.setObjectName('ppt_window_check_box')
         self.powerpoint_layout.addWidget(self.ppt_window_check_box)
         self.left_layout.addWidget(self.powerpoint_group_box)
+        # Impress
+        self.impress_group_box = QtWidgets.QGroupBox(self.left_column)
+        self.impress_group_box.setObjectName('impress_group_box')
+        self.impress_layout = QtWidgets.QVBoxLayout(self.impress_group_box)
+        self.impress_layout.setObjectName('impress_layout')
+        self.odp_display_check_box = QtWidgets.QCheckBox(self.impress_group_box)
+        self.odp_display_check_box.setObjectName('odp_display_check_box')
+        self.impress_layout.addWidget(self.odp_display_check_box)
+        self.left_layout.addWidget(self.impress_group_box)
         # setup layout
         self.left_layout.addStretch()
         self.right_column.setSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Preferred)
@@ -101,6 +110,10 @@ class PresentationTab(SettingsTab):
             translate('PresentationPlugin.PresentationTab',
                       'Let PowerPoint control the size and monitor of the presentations\n'
                       '(This may fix PowerPoint scaling issues in Windows 8 and 10)'))
+        self.impress_group_box.setTitle(translate('PresentationPlugin.PresentationTab', 'Impress options'))
+        self.odp_display_check_box.setText(
+            translate('PresentationPlugin.PresentationTab',
+                      'Use Impress Slide Show Settings / Presentation Display setting'))
 
     def set_controller_text(self, checkbox, controller):
         if checkbox.isEnabled():
@@ -120,12 +133,17 @@ class PresentationTab(SettingsTab):
             checkbox.setChecked(self.settings.value('presentations/' + controller.name))
             if controller.name == 'Powerpoint' and controller.is_available():
                 powerpoint_available = True
+            if controller.name == 'Impress' and controller.is_available():
+                impress_available = True
         self.override_app_check_box.setChecked(self.settings.value('presentations/override app'))
         # Load PowerPoint settings
         self.ppt_slide_click_check_box.setChecked(self.settings.value('presentations/powerpoint slide click advance'))
         self.ppt_slide_click_check_box.setEnabled(powerpoint_available)
         self.ppt_window_check_box.setChecked(self.settings.value('presentations/powerpoint control window'))
         self.ppt_window_check_box.setEnabled(powerpoint_available)
+        # Load Impress settings
+        self.odp_display_check_box.setChecked(self.settings.value('presentations/impress use display setting'))
+        self.odp_display_check_box.setEnabled(impress_available)
 
     def save(self):
         """
@@ -160,6 +178,11 @@ class PresentationTab(SettingsTab):
         if self.settings.value(setting_key) != self.ppt_window_check_box.checkState():
             self.settings.setValue(setting_key, self.ppt_window_check_box.checkState())
             changed = True
+        # Save impress setting
+        setting_key = 'presentations/impress use display setting'
+        if self.settings.value(setting_key) != self.odp_display_check_box.checkState():
+            self.settings.setValue(setting_key, self.odp_display_check_box.checkState())
+            changed = True
         if changed:
             self.settings_form.register_post_process('mediaitem_suffix_reset')
             self.settings_form.register_post_process('mediaitem_presentation_rebuild')