Merge lp:~googol-deactivatedaccount/openlp/bug-871272 into lp:openlp

[Andreas Preikschat]

- Fixed bug 871272 (When slides are in the foreground openlp reports 'Error: No display item to ammend' in latest build)
- Docstrings

Hello,

1) Fixed bug 871272 (When slides are in the foreground openlp reports 'Error: No display item to ammend' in latest build)
2) Docstrings

[Tim Bentley (trb143)]

rendermanager does not exist any more so needs to be changed to renderer.

review: Needs Fixing

[Tim Bentley (trb143)]

review: Approve

=== modified file 'openlp/core/lib/renderer.py'
--- openlp/core/lib/renderer.py	2011-10-12 04:51:03 +0000
+++ openlp/core/lib/renderer.py	2011-10-16 14:49:24 +0000
@@ -57,14 +57,14 @@
 
     def __init__(self, imageManager, themeManager):
         """
-        Initialise the render manager.
+        Initialise the renderer.
 
     ``imageManager``
-        A ImageManager instance which takes care of e. g. caching and resizing
+        A imageManager instance which takes care of e. g. caching and resizing
         images.
 
     ``themeManager``
-        The ThemeManager instance, used to get the current theme details.
+        The themeManager instance, used to get the current theme details.
         """
         log.debug(u'Initialisation started')
         self.themeManager = themeManager
@@ -81,7 +81,7 @@
 
     def update_display(self):
         """
-        Updates the render manager's information about the current screen.
+        Updates the renderer's information about the current screen.
         """
         log.debug(u'Update Display')
         self._calculate_default()

=== modified file 'openlp/core/lib/serviceitem.py'
--- openlp/core/lib/serviceitem.py	2011-10-03 16:53:54 +0000
+++ openlp/core/lib/serviceitem.py	2011-10-16 14:49:24 +0000
@@ -122,9 +122,8 @@
 
     def _new_item(self):
         """
-        Method to set the internal id of the item
-        This is used to compare service items to see if they are
-        the same
+        Method to set the internal id of the item. This is used to compare
+        service items to see if they are the same.
         """
         self._uuid = unicode(uuid.uuid1())
 
@@ -160,9 +159,8 @@
     def render(self, use_override=False):
         """
         The render method is what generates the frames for the screen and
-        obtains the display information from the renderemanager.
-        At this point all the slides are built for the given
-        display size.
+        obtains the display information from the renderer. At this point all
+        slides are built for the given display size.
         """
         log.debug(u'Render called')
         self._display_frames = []

=== modified file 'openlp/core/ui/maindisplay.py'
--- openlp/core/ui/maindisplay.py	2011-10-03 17:27:34 +0000
+++ openlp/core/ui/maindisplay.py	2011-10-16 14:49:24 +0000
@@ -355,7 +355,7 @@
         """
         # We request a background video but have no service Item
         if isBackground and not hasattr(self, u'serviceItem'):
-            return None
+            return False
         if not self.mediaObject:
             self.createMediaObject()
         log.debug(u'video')
@@ -385,6 +385,7 @@
         # Update the preview frame.
         if self.isLive:
             Receiver.send_message(u'maindisplay_active')
+        return True
 
     def videoState(self, newState, oldState):
         """

=== modified file 'openlp/plugins/media/lib/mediaitem.py'
--- openlp/plugins/media/lib/mediaitem.py	2011-09-06 17:53:43 +0000
+++ openlp/plugins/media/lib/mediaitem.py	2011-10-16 14:49:24 +0000
@@ -39,7 +39,7 @@
 
 log = logging.getLogger(__name__)
 
-CLAPPERBOARD = QtGui.QPixmap(u':/media/media_video.png').toImage()
+CLAPPERBOARD = QtGui.QImage(u':/media/media_video.png')
 
 class MediaMediaItem(MediaManagerItem):
     """
@@ -95,14 +95,14 @@
 
     def onResetClick(self):
         """
-        Called to reset the Live backgound with the media selected,
+        Called to reset the Live backgound with the media selected.
         """
         self.resetAction.setVisible(False)
         self.plugin.liveController.display.resetVideo()
 
     def videobackgroundReplaced(self):
         """
-        Triggered by main display on change of serviceitem
+        Triggered by main display on change of serviceitem.
         """
         self.resetAction.setVisible(False)
 
@@ -179,8 +179,7 @@
 
     def mediaStateWait(self, mediaState):
         """
-        Wait for the video to change its state
-        Wait no longer than 5 seconds.
+        Wait for the video to change its state. Wait no longer than 5 seconds.
         """
         start = datetime.now()
         while self.mediaObject.state() != mediaState:
@@ -198,7 +197,7 @@
 
     def onDeleteClick(self):
         """
-        Remove a media item from the list
+        Remove a media item from the list.
         """
         if check_item_selected(self.listView, translate('MediaPlugin.MediaItem',
             'You must select a media file to delete.')):