openlp-core team mailing list archive

[Andreas Preikschat <andreaspreikschat@xxxxxxxxxx>]

Andreas Preikschat has proposed merging lp:~googol-hush/openlp/fixes into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  #598393 After adding a new image to a selected (image) item in the service manager it is not selected anymore
  https://bugs.launchpad.net/bugs/598393
  #727710 Previewing Images refreshes Live Controller
  https://bugs.launchpad.net/bugs/727710

For more details, see:
https://code.launchpad.net/~googol-hush/openlp/fixes/+merge/52450

Hello

Fixed Bug #727710

As only the live slidecontroller connects to the "maindisplay_active" signal, it should only be send from the live screen.
-- 
https://code.launchpad.net/~googol-hush/openlp/fixes/+merge/52450
Your team OpenLP Core is requested to review the proposed merge of lp:~googol-hush/openlp/fixes into lp:openlp.

=== modified file 'openlp/core/ui/maindisplay.py'
--- openlp/core/ui/maindisplay.py	2011-03-06 15:29:25 +0000
+++ openlp/core/ui/maindisplay.py	2011-03-07 18:09:53 +0000
@@ -245,7 +245,8 @@
             js = u'show_image("");'
         self.frame.evaluateJavaScript(js)
         # Update the preview frame.
-        Receiver.send_message(u'maindisplay_active')
+        if self.isLive:
+            Receiver.send_message(u'maindisplay_active')
 
     def resetImage(self):
         """
@@ -259,7 +260,8 @@
             self.displayImage(None)
         self.override = {}
         # Update the preview frame.
-        Receiver.send_message(u'maindisplay_active')
+        if self.isLive:
+            Receiver.send_message(u'maindisplay_active')
 
     def resetVideo(self):
         """
@@ -276,7 +278,8 @@
             self.frame.evaluateJavaScript(u'show_video("close");')
         self.override = {}
         # Update the preview frame.
-        Receiver.send_message(u'maindisplay_active')
+        if self.isLive:
+            Receiver.send_message(u'maindisplay_active')
 
     def videoPlay(self):
         """
@@ -347,7 +350,8 @@
             self.videoWidget.setVisible(True)
             self.audio.setVolume(vol)
         # Update the preview frame.
-        Receiver.send_message(u'maindisplay_active')
+        if self.isLive:
+            Receiver.send_message(u'maindisplay_active')
         return self.preview()
 
     def videoStart(self, newState, oldState):
@@ -481,7 +485,8 @@
             self.videoPlay()
         self.hideMode = None
         # Trigger actions when display is active again
-        Receiver.send_message(u'maindisplay_active')
+        if self.isLive:
+            Receiver.send_message(u'maindisplay_active')
 
     def __hideMouse(self):
         # Hide mouse cursor when moved over display if enabled in settings

=== modified file 'openlp/core/ui/slidecontroller.py'
--- openlp/core/ui/slidecontroller.py	2011-03-05 18:38:33 +0000
+++ openlp/core/ui/slidecontroller.py	2011-03-07 18:09:53 +0000
@@ -162,7 +162,7 @@
             self.themeScreen.setText(
                 translate('OpenLP.SlideController', 'Blank to Theme'))
             self.desktopScreen = icon_action(self.hideMenu, u'Desktop Screen',
-                    u':/slides/slide_desktop.png', False)
+                u':/slides/slide_desktop.png', False)
             self.desktopScreen.setText(
                 translate('OpenLP.SlideController', 'Show Desktop'))
             self.hideMenu.setDefaultAction(self.blankScreen)