diff --git a/openlp/core/ui/alertstab.py b/openlp/core/ui/alertstab.py index d2e38e048..7efd6acfc 100644 --- a/openlp/core/ui/alertstab.py +++ b/openlp/core/ui/alertstab.py @@ -209,4 +209,4 @@ class AlertsTab(SettingsTab): 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)) diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py index 0bf005891..8ece41ac2 100644 --- a/openlp/core/ui/thememanager.py +++ b/openlp/core/ui/thememanager.py @@ -236,7 +236,7 @@ class ThemeManager(QtGui.QWidget): 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 @@ class ThemeManager(QtGui.QWidget): 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 @@ class ThemeManager(QtGui.QWidget): 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, diff --git a/version.txt b/version.txt index b40e76f0f..c2c836e5d 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.9.0-703 +1.9.0-704