Head

openlp/core/lib/htmlbuilder.py

@@ -164,8 +164,8 @@ sup {
             text.innerHTML = new_text;
             return;
         }
-        // Fade text out. 0.2 to minimize the time "nothing" is shown on the screen.
-        text.style.opacity = '0.2';
+        // Fade text out. 0.1 to minimize the time "nothing" is shown on the screen.
+        text.style.opacity = '0.1';
         // Fade new text in after the old text has finished fading out.
         timer = window.setTimeout(function(){_show_text(text, new_text)}, 400);
     }

openlp/core/lib/serviceitem.py

@@ -636,14 +636,17 @@ class ServiceItem(object):
         for frame in self._raw_frames:
             if self.is_image() and not os.path.exists(frame[u'path']):
                 self.is_valid = False
+                break
             elif self.is_command():
                 file_name = os.path.join(frame[u'path'], frame[u'title'])
                 if not os.path.exists(file_name):
                     self.is_valid = False
+                    break
                 if suffix_list and not self.is_text():
                     file_suffix = frame[u'title'].split(u'.')[-1]
                     if file_suffix.lower() not in suffix_list:
                         self.is_valid = False
+                        break
 
     def _get_renderer(self):
         """

openlp/core/ui/media/mediacontroller.py

@@ -440,7 +440,7 @@ class MediaController(object):
         controller.media_info = MediaInfo()
         controller.media_info.volume = 0
         controller.media_info.file_info = QtCore.QFileInfo(service_item.get_frame_path())
-        display = controller._display
+        display = controller.preview_display
         if not self._check_file_type(controller, display, service_item):
             # Media could not be loaded correctly
             critical_error_message_box(translate('MediaPlugin.MediaItem', 'Unsupported File'),

openlp/core/ui/media/webkitplayer.py

@@ -450,7 +450,7 @@ class WebkitPlayer(MediaPlayer):
             currentTime = display.frame.evaluateJavaScript(u'show_flash("currentTime");')
             length = display.frame.evaluateJavaScript(u'show_flash("length");')
         else:
-            if display.frame.evaluateJavaScript(u'show_video("isEnded");') == 'true':
+            if display.frame.evaluateJavaScript(u'show_video("isEnded");'):
                 self.stop(display)
             currentTime = display.frame.evaluateJavaScript(u'show_video("currentTime");')
             # check if conversion was ok and value is not 'NaN'

openlp/plugins/alerts/forms/alertform.py

@@ -198,10 +198,8 @@ class AlertForm(QtGui.QDialog, Ui_AlertDialog):
             QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.No | QtGui.QMessageBox.Yes)) == QtGui.QMessageBox.No:
             self.parameter_edit.setFocus()
             return False
-
         text = text.replace(u'<>', self.parameter_edit.text())
         self.plugin.alerts_manager.display_alert(text)
-        self.plugin.alertsmanager.display_alert(text)
         return True
 
     def on_current_row_changed(self, row):

scripts/resources.patch

@@ -1,14 +1,16 @@
---- openlp/core/resources.py.old    Mon Jun 21 23:16:19 2010
-+++ openlp/core/resources.py    Mon Jun 21 23:27:48 2010
+=== modified file 'openlp/core/resources.py'
+--- openlp/core/resources.py    2013-03-12 08:44:54 +0000
++++ openlp/core/resources.py    2013-03-12 08:45:42 +0000
 @@ -1,10 +1,35 @@
  # -*- coding: utf-8 -*-
-+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
-
+-
 -# Resource object code
 -#
 -#
 -# WARNING! All changes made in this file will be lost!
 -
++# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
++
 +###############################################################################
 +# OpenLP - Open Source Lyrics Projection                                      #
 +# --------------------------------------------------------------------------- #
@@ -41,23 +43,21 @@
  from PyQt4 import QtCore
 
  qt_resource_data = "\
-@@ -48643,9 +48664,16 @@
+@@ -71953,9 +71978,14 @@
  "
 
  def qInitResources():
--    QtCore.qRegisterResourceData(0x01, qt_resource_struct, qt_resource_name, qt_resource_data)
 +    """
 +    Initialise OpenLP resources at application startup.
 +    """
-+    QtCore.qRegisterResourceData(0x01, qt_resource_struct, qt_resource_name,
-+        qt_resource_data)
+     QtCore.qRegisterResourceData(0x01, qt_resource_struct, qt_resource_name, qt_resource_data)
 
  def qCleanupResources():
--    QtCore.qUnregisterResourceData(0x01, qt_resource_struct, qt_resource_name, qt_resource_data)
 +    """
 +    Cleanup OpenLP resources when the application shuts down.
 +    """
-+    QtCore.qUnregisterResourceData(0x01, qt_resource_struct, qt_resource_name,
-+        qt_resource_data)
+     QtCore.qUnregisterResourceData(0x01, qt_resource_struct, qt_resource_name, qt_resource_data)
 
 -qInitResources()
+
+

tests/functional/openlp_core_lib/test_image_manager.py

@@ -5,7 +5,7 @@
 import os
 from unittest import TestCase
 
-from PyQt4 import QtGui
+from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import Registry, ImageManager, ScreenList
 
@@ -43,6 +43,12 @@ class TestImageManager(TestCase):
         # THEN returned record is a type of image
         self.assertEqual(isinstance(image, QtGui.QImage), True, u'The returned object should be a QImage')
 
+        # WHEN: The image bytes are requested.
+        byte_array = self.image_manager.get_image_bytes(TEST_PATH, u'church.jpg')
+
+        # THEN: Type should be a byte array.
+        self.assertEqual(isinstance(byte_array, QtCore.QByteArray), True, u'The returned object should be a QByteArray')
+
         # WHEN the image is retrieved has not been loaded
         # THEN a KeyError is thrown
         with self.assertRaises(KeyError) as context: