openlp-core team mailing list archive

[Azaziah <suutari.olli@xxxxxxxxx>]

Azaziah has proposed merging lp:~suutari-olli/openlp/fix-blank-to-modes-during-single-screen into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~suutari-olli/openlp/fix-blank-to-modes-during-single-screen/+merge/283725

This branch fixes the issue where Blank to desktop, 
black and theme won't work if Live screen has stolen focus.

Examples of this happening: Clicking anything in the live window or certain single screen mode scenarios.

This was achieved by adding 3 lines of code, one for each method under the definition
of methods available in this screen mode.

I also explained this in a comment I inserted to the code.

Since the only way to screw this seems to be by removing these additions,
a test for them being there makes no sense at all.

Jenkins seems to be broken at the moment, but these 3 
rows of code should not really break anything.
--------------------------------
lp:~suutari-olli/openlp/fix-blank-to-modes-during-single-screen (revision 2611)
[←[1;32mSUCCESS←[1;m] https://ci.openlp.io/job/Branch-01-Pull/1270/
[←[1;32mSUCCESS←[1;m] https://ci.openlp.io/job/Branch-02-Functional-Tests/1194/
[←[1;32mSUCCESS←[1;m] https://ci.openlp.io/job/Branch-03-Interface-Tests/1133/
[←[1;32mSUCCESS←[1;m] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tes
ts/969/
[←[1;31mFAILURE←[1;m] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Test
s/561/
Stopping after failure
-- 
Your team OpenLP Core is requested to review the proposed merge of lp:~suutari-olli/openlp/fix-blank-to-modes-during-single-screen into lp:openlp.

=== modified file 'openlp/core/ui/slidecontroller.py'
--- openlp/core/ui/slidecontroller.py	2016-01-13 21:00:46 +0000
+++ openlp/core/ui/slidecontroller.py	2016-01-23 16:58:47 +0000
@@ -603,11 +603,17 @@
         Add actions to the widget specified by `widget`
 
         :param widget: The UI widget for the actions
+        This defines the controls available when Live display has stolen focus.
+        Examples of this happening: Clicking anything in the live window or certain single screen mode scenarios.
+        Needles to say, blank to modes should not be removed from here.
         """
         widget.addActions([
             self.previous_item, self.next_item,
             self.previous_service, self.next_service,
-            self.escape_item])
+            self.escape_item,
+            self.desktop_screen,
+            self.theme_screen,
+            self.blank_screen])
 
     def preview_size_changed(self):
         """