raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Fix code so will actually start and long line lenght which broken standards

Browse Source 
bzr-revno: 2555
This commit is contained in:
Tim Bentley 2015-09-10 23:59:06 +02:00 committed by Raoul Snyman
commit 41756630b4
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openlp/core/lib/formattingtags.py
View File

@ -185,8 +185,8 @@ class FormattingTags(object):
A boolean stating whether this is a build-in tag or not. Should be ``True`` in most cases.
* temporary
A temporary tag will not be saved, but is also considered when displaying text containing the tag. It has
to be a ``boolean``.
A temporary tag will not be saved, but is also considered when displaying text containing the tag. It
has to be a ``boolean``.
"""
FormattingTags.html_expands.extend(tags)

16
openlp/plugins/media/lib/mediaitem.py
View File

@ -52,10 +52,20 @@ class MediaMediaItem(MediaManagerItem, RegistryProperties):
log.info('%s MediaMediaItem loaded', __name__)
def __init__(self, parent, plugin):
self.setup()
super(MediaMediaItem, self).__init__(parent, plugin)
def setup(self):
"""
Allow early setup to be mocked.
"""
self.icon_path = 'images/image'
self.background = False
self.automatic = ''
super(MediaMediaItem, self).__init__(parent, plugin)
self.optical_icon = build_icon(':/media/media_optical.png')
self.video_icon = build_icon(':/media/media_video.png')
self.audio_icon = build_icon(':/media/media_audio.png')
self.error_icon = build_icon(':/general/general_delete.png')
def setup_item(self):
"""
@ -64,10 +74,6 @@ class MediaMediaItem(MediaManagerItem, RegistryProperties):
self.single_service_item = False
self.has_search = True
self.media_object = None
self.optical_icon = build_icon(':/media/media_optical.png')
self.video_icon = build_icon(':/media/media_video.png')
self.audio_icon = build_icon(':/media/media_audio.png')
self.error_icon = build_icon(':/general/general_delete.png')
self.display_controller = DisplayController(self.parent())
self.display_controller.controller_layout = QtGui.QVBoxLayout()
self.media_controller.register_controller(self.display_controller)