openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

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

    Requested reviews:
    OpenLP Core (openlp-core)


Fix theme import bugs
-- 
https://code.launchpad.net/~trb143/openlp/working/+merge/19428
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'openlp/core/ui/alertstab.py'
--- openlp/core/ui/alertstab.py	2009-12-31 12:52:01 +0000
+++ openlp/core/ui/alertstab.py	2010-02-16 17:45:23 +0000
@@ -209,4 +209,4 @@
         font.setPointSize(16)
         self.FontPreview.setFont(font)
         self.FontPreview.setStyleSheet(u'background-color: %s; color: %s' % \
-            (self.bg_color, self.font_color))
\ No newline at end of file
+            (self.bg_color, self.font_color))

=== modified file 'openlp/core/ui/thememanager.py'
--- openlp/core/ui/thememanager.py	2010-01-28 07:15:23 +0000
+++ openlp/core/ui/thememanager.py	2010-02-16 17:45:23 +0000
@@ -236,7 +236,7 @@
         log.info(u'New Themes %s', unicode(files))
         if len(files) > 0:
             for file in files:
-                self.config.set_last_dir(filename)
+                self.config.set_last_dir(unicode(file))
                 self.unzipTheme(file, self.path)
         self.loadThemes()
 
@@ -343,7 +343,7 @@
                 self, self.trUtf8('Error'),
                 self.trUtf8('File is not a valid theme!'),
                 QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
-            log.exception(u'Importing theme from zip file failed')
+            log.exception(u'Importing theme from zip file failed %s' % filename)
         finally:
             if zip:
                 zip.close()
@@ -400,7 +400,7 @@
         newtheme.add_display(unicode(shadow), unicode(theme.ShadowColor.name()),
             unicode(outline), unicode(theme.OutlineColor.name()),
             unicode(theme.HorizontalAlign), unicode(theme.VerticalAlign),
-            unicode(theme.WrapStyle), 0)
+            unicode(theme.WrapStyle), unicode(0))
         return newtheme.extract_xml()
 
     def saveTheme(self, name, theme_xml, theme_pretty_xml, image_from,