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

- The new method now also stops loops.

Browse Source
This commit is contained in:
Olli Suutari 2016-09-02 18:41:16 +03:00
parent 4f48cb5df2
commit 2c4dbda42f
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -235,7 +235,7 @@ class SlideController(DisplayController, RegistryProperties):
self.hide_menu.setMenu(QtWidgets.QMenu(translate('OpenLP.SlideController', 'Hide'), self.toolbar)) self.hide_menu.setMenu(QtWidgets.QMenu(translate('OpenLP.SlideController', 'Hide'), self.toolbar))
self.toolbar.add_toolbar_widget(self.hide_menu) self.toolbar.add_toolbar_widget(self.hide_menu)
# The order of the blank to modes in Shortcuts list comes from here. # The order of the blank to modes in Shortcuts list comes from here.
self.escape_item = create_action(self, 'escapeItem', self.desktop_screen_enable = create_action(self, 'escapeItem',
text=translate('OpenLP.SlideController', 'Show Desktop'), text=translate('OpenLP.SlideController', 'Show Desktop'),
can_shortcuts=True, context=QtCore.Qt.WidgetWithChildrenShortcut, can_shortcuts=True, context=QtCore.Qt.WidgetWithChildrenShortcut,
category=self.category, category=self.category,
@ -259,7 +259,7 @@ class SlideController(DisplayController, RegistryProperties):
self.hide_menu.menu().addAction(self.blank_screen) self.hide_menu.menu().addAction(self.blank_screen)
self.hide_menu.menu().addAction(self.theme_screen) self.hide_menu.menu().addAction(self.theme_screen)
self.hide_menu.menu().addAction(self.desktop_screen) self.hide_menu.menu().addAction(self.desktop_screen)
self.hide_menu.menu().addAction(self.escape_item) self.hide_menu.menu().addAction(self.desktop_screen_enable)
# Wide menu of display control buttons. # Wide menu of display control buttons.
self.blank_screen_button = QtWidgets.QToolButton(self.toolbar) self.blank_screen_button = QtWidgets.QToolButton(self.toolbar)
self.blank_screen_button.setObjectName('blank_screen_button') self.blank_screen_button.setObjectName('blank_screen_button')
@ -612,7 +612,7 @@ class SlideController(DisplayController, RegistryProperties):
widget.addActions([ widget.addActions([
self.previous_item, self.next_item, self.previous_item, self.next_item,
self.previous_service, self.next_service, self.previous_service, self.next_service,
self.escape_item, self.desktop_screen_enable,
self.desktop_screen, self.desktop_screen,
self.theme_screen, self.theme_screen,
self.blank_screen]) self.blank_screen])
@ -1043,6 +1043,8 @@ class SlideController(DisplayController, RegistryProperties):
self.desktop_screen.setChecked(checked) self.desktop_screen.setChecked(checked)
Registry().execute('live_display_hide', HideMode.Screen) Registry().execute('live_display_hide', HideMode.Screen)
self.desktop_screen.setChecked(True) self.desktop_screen.setChecked(True)
self.update_preview()
self.on_toggle_loop()
def blank_plugin(self): def blank_plugin(self):
""" """

4
tests/functional/openlp_core_ui/test_slidecontroller.py
View File

@ -697,7 +697,7 @@ class TestSlideController(TestCase):
slide_controller.next_item = MagicMock() slide_controller.next_item = MagicMock()
slide_controller.previous_service = MagicMock() slide_controller.previous_service = MagicMock()
slide_controller.next_service = MagicMock() slide_controller.next_service = MagicMock()
slide_controller.escape_item = MagicMock() slide_controller.desktop_screen_enable = MagicMock()
slide_controller.desktop_screen = MagicMock() slide_controller.desktop_screen = MagicMock()
slide_controller.blank_screen = MagicMock() slide_controller.blank_screen = MagicMock()
slide_controller.theme_screen = MagicMock() slide_controller.theme_screen = MagicMock()
@ -709,7 +709,7 @@ class TestSlideController(TestCase):
mocked_widget.addActions.assert_called_with([ mocked_widget.addActions.assert_called_with([
slide_controller.previous_item, slide_controller.next_item, slide_controller.previous_item, slide_controller.next_item,
slide_controller.previous_service, slide_controller.next_service, slide_controller.previous_service, slide_controller.next_service,
slide_controller.escape_item, slide_controller.desktop_screen, slide_controller.desktop_screen_enable, slide_controller.desktop_screen,
slide_controller.theme_screen, slide_controller.blank_screen slide_controller.theme_screen, slide_controller.blank_screen
]) ])