diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py index f4afeaff6..02f6970ac 100644 --- a/openlp/core/lib/renderer.py +++ b/openlp/core/lib/renderer.py @@ -57,14 +57,14 @@ class Renderer(object): 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 @@ class Renderer(object): 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() @@ -306,7 +306,7 @@ class Renderer(object): """ log.debug(u'_build_text_rectangle') main_rect = self.get_main_rectangle(theme) - footer_rect = self.get_main_rectangle(theme) + footer_rect = self.get_footer_rectangle(theme) self._set_text_rectangle(main_rect, footer_rect) def get_main_rectangle(self, theme): diff --git a/openlp/core/lib/serviceitem.py b/openlp/core/lib/serviceitem.py index 510d71cde..0eb0c866f 100644 --- a/openlp/core/lib/serviceitem.py +++ b/openlp/core/lib/serviceitem.py @@ -122,9 +122,8 @@ class ServiceItem(object): 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 @@ class ServiceItem(object): 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 = [] diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py index d57b7ec5a..a0b6675a4 100644 --- a/openlp/core/ui/maindisplay.py +++ b/openlp/core/ui/maindisplay.py @@ -345,7 +345,7 @@ class MainDisplay(QtGui.QGraphicsView): """ # 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') @@ -372,6 +372,7 @@ class MainDisplay(QtGui.QGraphicsView): self.webView.setVisible(False) self.videoWidget.setVisible(True) self.audio.setVolume(vol) + return True def videoState(self, newState, oldState): """ diff --git a/openlp/plugins/media/lib/mediaitem.py b/openlp/plugins/media/lib/mediaitem.py index f2e0bbc06..c8f746851 100644 --- a/openlp/plugins/media/lib/mediaitem.py +++ b/openlp/plugins/media/lib/mediaitem.py @@ -39,7 +39,7 @@ from openlp.core.lib.ui import UiStrings, critical_error_message_box 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 @@ class MediaMediaItem(MediaManagerItem): 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 @@ class MediaMediaItem(MediaManagerItem): 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 @@ class MediaMediaItem(MediaManagerItem): 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.')):