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
  #704522 Cannot append images to image item from loaded service
  https://bugs.launchpad.net/bugs/704522

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

Fix bug unable to add images to save service item. #704522
-- 
https://code.launchpad.net/~trb143/openlp/bugs/+merge/46818
Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/bugs into lp:openlp.

=== modified file 'openlp/core/lib/serviceitem.py'
--- openlp/core/lib/serviceitem.py	2011-01-12 19:31:46 +0000
+++ openlp/core/lib/serviceitem.py	2011-01-19 20:09:13 +0000
@@ -243,7 +243,7 @@
         file to represent this item.
         """
         service_header = {
-            u'name': self.name.lower(),
+            u'name': self.name,
             u'plugin': self.name,
             u'theme': self.theme,
             u'title': self.title,

=== modified file 'openlp/core/ui/servicemanager.py'
--- openlp/core/ui/servicemanager.py	2011-01-19 04:30:11 +0000
+++ openlp/core/ui/servicemanager.py	2011-01-19 20:09:13 +0000
@@ -1082,7 +1082,7 @@
         """
         link = event.mimeData()
         if link.hasText():
-            plugin = event.mimeData().text()
+            plugin = unicode(event.mimeData().text())
             item = self.serviceManagerList.itemAt(event.pos())
             # ServiceManager started the drag and drop
             if plugin == u'ServiceManager':