openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

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

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  #693150 Custom Slide Display footer option
  https://bugs.launchpad.net/bugs/693150
  #693202 delete theme
  https://bugs.launchpad.net/bugs/693202

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

Fix image error text
Add Guard to video background.
-- 
https://code.launchpad.net/~trb143/openlp/bugs/+merge/45066
Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/bugs into lp:openlp.

=== modified file 'openlp/plugins/images/lib/mediaitem.py'
--- openlp/plugins/images/lib/mediaitem.py	2011-01-02 21:34:33 +0000
+++ openlp/plugins/images/lib/mediaitem.py	2011-01-03 19:56:30 +0000
@@ -217,12 +217,21 @@
             if os.path.exists(filename):
                 (path, name) = os.path.split(filename)
                 self.parent.liveController.display.directImage(name, filename)
+<<<<<<< TREE
             else:
                 QtGui.QMessageBox.critical(self,
                     translate('ImagePlugin.MediaItem', 'Live Background Could '
                     'Not Be Replaced'),
                     unicode(translate('ImagePlugin.MediaItem',
                     'The image %s no longer exists.')) % filename)
+=======
+            else:
+                QtGui.QMessageBox.critical(self,
+                    translate('ImagePlugin.MediaItem', 'Live background could '
+                    'not be replaced.'),
+                    unicode(translate('ImagePlugin.MediaItem',
+                    'The image %s no longer exists.')) % filename)
+>>>>>>> MERGE-SOURCE
         self.resetButton.setVisible(True)
 
     def onPreviewClick(self):

=== modified file 'openlp/plugins/media/lib/mediaitem.py'
--- openlp/plugins/media/lib/mediaitem.py	2010-12-31 19:22:41 +0000
+++ openlp/plugins/media/lib/mediaitem.py	2011-01-03 19:56:30 +0000
@@ -108,11 +108,19 @@
 
     def onReplaceClick(self):
         if check_item_selected(self.listView,
-            translate('ImagePlugin.MediaItem',
+            translate('MediaPlugin.MediaItem',
             'You must select a media file to replace the background with.')):
             item = self.listView.currentItem()
             filename = unicode(item.data(QtCore.Qt.UserRole).toString())
-            self.parent.liveController.display.video(filename, 0, True)
+            if os.path.exists(filename):
+                (path, name) = os.path.split(filename)
+                self.parent.liveController.display.video(filename, 0, True)
+            else:
+                QtGui.QMessageBox.critical(self,
+                    translate('MediaPlugin.MediaItem', 'Live background could '
+                    'not be replaced.'),
+                    unicode(translate('ImagePlugin.MediaItem',
+                    'The media file %s no longer exists.')) % filename)
         self.resetButton.setVisible(True)
 
     def generateSlideData(self, service_item, item=None, xmlVersion=False):

=== modified file 'openlp/plugins/media/mediaplugin.py'
--- openlp/plugins/media/mediaplugin.py	2010-12-31 19:22:41 +0000
+++ openlp/plugins/media/mediaplugin.py	2011-01-03 19:56:30 +0000
@@ -79,7 +79,7 @@
         return MediaTab(self.name)
 
     def getMediaManagerItem(self):
-        # Create the MediaManagerItem object
+        # Create the MediaManagerItem object.
         return MediaMediaItem(self, self, self.icon)
 
     def about(self):