From 13dcff9aa775d32c3028dc871681accd2a70457c Mon Sep 17 00:00:00 2001 From: Tomas Groth Date: Fri, 1 Nov 2019 20:49:14 +0000 Subject: [PATCH] Reuse the slidecontroller actions on the display window to enable shortcuts to work for the display window. Fixes bug #286. --- openlp/core/ui/mainwindow.py | 3 ++- openlp/core/ui/slidecontroller.py | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index 16ca79072..cedd6c836 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -1003,8 +1003,9 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow, LogMixin, RegistryPropert """ self.application.set_busy_cursor() self.image_manager.update_display() - # self.renderer.update_display() + self.renderer.resize(self.live_controller.screens.current.display_geometry.size()) self.preview_controller.screen_size_changed() + self.live_controller.setup_displays() self.live_controller.screen_size_changed() self.setFocus() self.activateWindow() diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index ad89dffd8..5fb4ad7da 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -175,6 +175,8 @@ class SlideController(QtWidgets.QWidget, LogMixin, RegistryProperties): if screen.is_display: display = DisplayWindow(self, screen) self.displays.append(display) + if self.display: + self.__add_actions_to_widget(self.display) @property def display(self): @@ -639,9 +641,6 @@ class SlideController(QtWidgets.QWidget, LogMixin, RegistryProperties): if self.is_live and self.displays: for display in self.displays: display.resize(self.screens.current.display_geometry.size()) - # if self.is_live: - # self.__add_actions_to_widget(self.display) - # The SlidePreview's ratio. def __add_actions_to_widget(self, widget): """