From 4874f6a218d961d2b4b65c11d7d40a63dc7529aa Mon Sep 17 00:00:00 2001 From: suutari-olli Date: Sat, 16 Jul 2016 19:51:08 +0300 Subject: [PATCH] - Reduced comments - Removed unrequired reg_value from test. --- openlp/core/lib/mediamanageritem.py | 1 - openlp/core/ui/slidecontroller.py | 5 ----- tests/functional/openlp_core_ui/test_slidecontroller.py | 6 ++---- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/openlp/core/lib/mediamanageritem.py b/openlp/core/lib/mediamanageritem.py index 9845c81c5..6a83f955d 100644 --- a/openlp/core/lib/mediamanageritem.py +++ b/openlp/core/lib/mediamanageritem.py @@ -488,7 +488,6 @@ class MediaManagerItem(QtWidgets.QWidget, RegistryProperties): 'You must select one or more items to preview.')) else: log.debug('%s Preview requested' % self.plugin.name) - # Reset the flag for: "has doubleclick added item to service" to False. Registry().set_flag('has doubleclick added item to service', False) service_item = self.build_service_item() if service_item: diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index 851bf01fc..6fa9f4db0 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -800,9 +800,6 @@ class SlideController(DisplayController, RegistryProperties): """ Replacement item following a remote edit. This action also takes place when a song that is sent to live from Service Manager is edited. - If display is blanked, it will get unblanked if automatic unblanking is enabled. We prevent this from happening - by setting a flag to "True" and then to "False" after the processing is done. - The flag is also set to "False" on startup so display may be unblanked properly. :param item: The current service item """ @@ -979,8 +976,6 @@ class SlideController(DisplayController, RegistryProperties): def on_slide_unblank(self): """ Handle the slidecontroller unblank event. - If we are re-processing service item, don't unblank the display - (Found in def replace_service_manager_item) """ if not Registry().get_flag('replace service manager item') is True: self.on_blank_display(False) diff --git a/tests/functional/openlp_core_ui/test_slidecontroller.py b/tests/functional/openlp_core_ui/test_slidecontroller.py index 927434c2a..01f895daa 100644 --- a/tests/functional/openlp_core_ui/test_slidecontroller.py +++ b/tests/functional/openlp_core_ui/test_slidecontroller.py @@ -727,8 +727,7 @@ class TestSlideController(TestCase): slide_controller.on_preview_add_to_service = MagicMock() slide_controller.media_reset = MagicMock() Registry.create() - reg_value = True - Registry().set_flag('has doubleclick added item to service', reg_value) + Registry().set_flag('has doubleclick added item to service', True) # WHEN: on_preview_double_click is called slide_controller.on_preview_double_click() @@ -751,8 +750,7 @@ class TestSlideController(TestCase): slide_controller.on_preview_add_to_service = MagicMock() slide_controller.media_reset = MagicMock() Registry.create() - reg_value = False - Registry().set_flag('has doubleclick added item to service', reg_value) + Registry().set_flag('has doubleclick added item to service', False) # WHEN: on_preview_double_click is called slide_controller.on_preview_double_click()