Merge lp:~marmyshev/openlp/bag_1225763 into lp:openlp

[Dmitriy Marmyshev]

fixed: replacing background with video unblank screen even if it blanked to theme.

[Raoul Snyman (raoul-snyman)]

You need at least one (not necessarily related) test please.

review: Needs Fixing

[Dmitriy Marmyshev (marmyshev)]

Yes, I know. but it is hard for me to start to write tests... :(
But I'll do it!

[Samuel Mehrbrodt (sam92)]

I wrote the test and created a new merge proposal: https://code.launchpad.net/~sam92/openlp/bag_1225763/+merge/214771

You can then delete this one.

=== 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():