openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

Tim Bentley has proposed merging lp:~trb143/openlp/fix1 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~trb143/openlp/fix1/+merge/270742

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

lp:~trb143/openlp/fix1 (revision 2556)
[SUCCESS] https//ci.openlp.io/job/Branch-01-Pull/1058/
[SUCCESS] https//ci.openlp.io/job/Branch-02-Functional-Tests/981/
[SUCCESS] https//ci.openlp.io/job/Branch-03-Interface-Tests/923/
[SUCCESS] https//ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/810/
[SUCCESS] https//ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/408/
[SUCCESS] https//ci.openlp.io/job/Branch-05a-Code_Analysis/536/
[SUCCESS] https//ci.openlp.io/job/Branch-05b-Test_Coverage/407/

-- 
Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/fix1 into lp:openlp.

=== modified file 'openlp/core/lib/formattingtags.py'
--- openlp/core/lib/formattingtags.py	2015-09-08 19:13:59 +0000
+++ openlp/core/lib/formattingtags.py	2015-09-10 20:39:04 +0000
@@ -185,8 +185,8 @@
                 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)
 

=== modified file 'openlp/plugins/media/lib/mediaitem.py'
--- openlp/plugins/media/lib/mediaitem.py	2015-09-09 20:02:19 +0000
+++ openlp/plugins/media/lib/mediaitem.py	2015-09-10 20:39:04 +0000
@@ -52,10 +52,20 @@
     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 @@
         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)