openlp-core team mailing list archive

[Dmitriy Marmyshev <marmyshev@xxxxxxxxx>]

Dmitriy Marmyshev has proposed merging lp:~marmyshev/openlp/bag_1225763 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #1225763 in OpenLP: "Replacing background with video unblank screen even if "Blanked to Theme""
  https://bugs.launchpad.net/openlp/+bug/1225763

For more details, see:
https://code.launchpad.net/~marmyshev/openlp/bag_1225763/+merge/186243

fixed: replacing background with video unblank screen even if it blanked to theme.
-- 
https://code.launchpad.net/~marmyshev/openlp/bag_1225763/+merge/186243
Your team OpenLP Core is requested to review the proposed merge of lp:~marmyshev/openlp/bag_1225763 into lp:openlp.

=== modified file '.bzrignore'
--- .bzrignore	2013-09-14 02:42:12 +0000
+++ .bzrignore	2013-09-18 05:24:10 +0000
@@ -2,6 +2,7 @@
 *.*~
 \#*\#
 *.eric4project
+*.eric5project
 *.ropeproject
 *.e4*
 .eric4project

=== modified file 'openlp/core/ui/media/mediacontroller.py'
--- openlp/core/ui/media/mediacontroller.py	2013-08-31 18:17:38 +0000
+++ openlp/core/ui/media/mediacontroller.py	2013-09-18 05:24:10 +0000
@@ -527,7 +527,8 @@
         else:
             self.media_volume(controller, controller.media_info.volume)
         if status:
-            display.frame.evaluateJavaScript('show_blank("desktop");')
+            if not controller.media_info.is_background:
+                display.frame.evaluateJavaScript('show_blank("desktop");')
             self.current_media_players[controller.controller_type].set_visible(display, True)
             # Flash needs to be played and will not AutoPlay
             if controller.media_info.is_flash:
@@ -538,7 +539,7 @@
                 controller.mediabar.actions['playbackPause'].setVisible(True)
             controller.mediabar.actions['playbackStop'].setVisible(True)
             if controller.is_live:
-                if controller.hide_menu.defaultAction().isChecked():
+                if controller.hide_menu.defaultAction().isChecked() and not controller.media_info.is_background:
                     controller.hide_menu.defaultAction().trigger()
         # Start Timer for ui updates
         if not self.timer.isActive():