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)


Provide black background for html videos instead of default theme
Fix author load match bug - remove the leading blank when more than one author.
-- 
https://code.launchpad.net/~trb143/openlp/bugs/+merge/41500
Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/bugs into lp:openlp.

=== modified file 'openlp/core/ui/themeform.py'
--- openlp/core/ui/themeform.py	2010-11-19 18:05:49 +0000
+++ openlp/core/ui/themeform.py	2010-11-22 19:02:59 +0000
@@ -569,6 +569,15 @@
                 (QtGui.QMessageBox.Ok),
                 QtGui.QMessageBox.Ok)
             return
+        if self.theme.theme_name == u'-1' or self.theme.theme_name == u'None':
+            QtGui.QMessageBox.critical(self,
+                translate('OpenLP.ThemeForm', 'Theme Name Invalid'),
+                translate('OpenLP.ThemeForm',
+                    'Invalid theme name. '
+                    'Please enter one.'),
+                (QtGui.QMessageBox.Ok),
+                QtGui.QMessageBox.Ok)
+            return
         save_from = None
         save_to = None
         if self.theme.background_type == \

=== modified file 'openlp/plugins/media/lib/mediaitem.py'
--- openlp/plugins/media/lib/mediaitem.py	2010-10-27 19:40:38 +0000
+++ openlp/plugins/media/lib/mediaitem.py	2010-11-22 19:02:59 +0000
@@ -125,6 +125,8 @@
         service_item.title = unicode(
             translate('MediaPlugin.MediaItem', 'Media'))
         service_item.add_capability(ItemCapabilities.RequiresMedia)
+        # force a nonexistent theme
+        service_item.theme = -1
         frame = u':/media/image_clapperboard.png'
         (path, name) = os.path.split(filename)
         service_item.add_from_command(path, name, frame)

=== modified file 'openlp/plugins/songs/lib/mediaitem.py'
--- openlp/plugins/songs/lib/mediaitem.py	2010-11-20 18:14:43 +0000
+++ openlp/plugins/songs/lib/mediaitem.py	2010-11-22 19:02:59 +0000
@@ -409,7 +409,7 @@
                 Song.search_title.like(u'%' +
                     item.data_string[u'title'].split(u'@')[0] + u'%'),
                 Song.search_title.asc())
-            author_list = item.data_string[u'authors'].split(u',')
+            author_list = item.data_string[u'authors'].split(u', ')
             editId = 0
             uuid = 0
             if search_results: