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

Merge branch 'set-actions-on-display' into 'master'

Browse Source 
Enable keyboard shortcuts for the display window

See merge request openlp/openlp!69
This commit is contained in:
Tomas Groth 2019-11-01 20:49:15 +00:00
commit db8e21fee4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openlp/core/ui/mainwindow.py
View File

@ -1003,8 +1003,9 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow, LogMixin, RegistryPropert
""" """
self.application.set_busy_cursor() self.application.set_busy_cursor()
self.image_manager.update_display() 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.preview_controller.screen_size_changed()
self.live_controller.setup_displays()
self.live_controller.screen_size_changed() self.live_controller.screen_size_changed()
self.setFocus() self.setFocus()
self.activateWindow() self.activateWindow()

5
openlp/core/ui/slidecontroller.py
View File

@ -175,6 +175,8 @@ class SlideController(QtWidgets.QWidget, LogMixin, RegistryProperties):
if screen.is_display: if screen.is_display:
display = DisplayWindow(self, screen) display = DisplayWindow(self, screen)
self.displays.append(display) self.displays.append(display)
if self.display:
self.__add_actions_to_widget(self.display)
@property @property
def display(self): def display(self):
@ -639,9 +641,6 @@ class SlideController(QtWidgets.QWidget, LogMixin, RegistryProperties):
if self.is_live and self.displays: if self.is_live and self.displays:
for display in self.displays: for display in self.displays:
display.resize(self.screens.current.display_geometry.size()) 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): def __add_actions_to_widget(self, widget):
""" """