openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

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

    Requested reviews:
    OpenLP Core (openlp-core)


Fix the add Custom button feature
-- 
https://code.launchpad.net/~trb143/openlp/cleanups/+merge/16257
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'openlp/core/lib/songxmlhandler.py'
--- openlp/core/lib/songxmlhandler.py	2009-11-30 20:29:26 +0000
+++ openlp/core/lib/songxmlhandler.py	2009-12-16 18:12:17 +0000
@@ -134,6 +134,7 @@
         ``xml``
             The XML of the song to be parsed.
         """
+        self.song_xml = None
         try:
             self.song_xml = ElementTree(
                 element=XML(unicode(xml).encode('unicode-escape')))

=== modified file 'openlp/plugins/custom/forms/editcustomform.py'
--- openlp/plugins/custom/forms/editcustomform.py	2009-11-30 20:29:26 +0000
+++ openlp/plugins/custom/forms/editcustomform.py	2009-12-16 18:12:17 +0000
@@ -106,7 +106,7 @@
         for themename in themelist:
             self.ThemeComboBox.addItem(themename)
 
-    def loadCustom(self, id, preview):
+    def loadCustom(self, id, preview=False):
         self.customSlide = CustomSlide()
         self.initialise()
         if id != 0: