From 5b4ce8124d2c195655ddd9306972674528ce0564 Mon Sep 17 00:00:00 2001 From: Jon Tibble Date: Tue, 3 Nov 2009 20:04:38 +0000 Subject: [PATCH] Fix theme loading --- openlp/core/ui/thememanager.py | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py index 8b3bd3076..e6f5e11e6 100644 --- a/openlp/core/ui/thememanager.py +++ b/openlp/core/ui/thememanager.py @@ -78,17 +78,25 @@ class ThemeManager(QtGui.QWidget): self.ThemeListWidget.addAction( contextMenuAction(self.ThemeListWidget, u':/themes/theme_edit.png', self.trUtf8(u'Edit a theme'), self.onEditTheme)) - self.ThemeListWidget.addAction(contextMenuSeparator(self.ThemeListWidget)) self.ThemeListWidget.addAction( - contextMenuAction(self.ThemeListWidget, u':/themes/theme_delete.png', - self.trUtf8(u'Delete theme'), self.onDeleteTheme)) + contextMenuSeparator(self.ThemeListWidget)) self.ThemeListWidget.addAction( - contextMenuAction(self.ThemeListWidget, u':/themes/theme_export.png', - self.trUtf8(u'Make Global'), self.changeGlobalFromScreen)) + contextMenuAction(self.ThemeListWidget, + u':/themes/theme_delete.png', + self.trUtf8(u'Delete theme'), + self.onDeleteTheme)) self.ThemeListWidget.addAction( - contextMenuAction(self.ThemeListWidget, u':/themes/theme_export.png', - self.trUtf8(u'Export theme'), self.onExportTheme)) - self.ThemeListWidget.addAction(contextMenuSeparator(self.ThemeListWidget)) + contextMenuAction(self.ThemeListWidget, + u':/themes/theme_export.png', + self.trUtf8(u'Make Global'), + self.changeGlobalFromScreen)) + self.ThemeListWidget.addAction( + contextMenuAction(self.ThemeListWidget, + u':/themes/theme_export.png', + self.trUtf8(u'Export theme'), + self.onExportTheme)) + self.ThemeListWidget.addAction( + contextMenuSeparator(self.ThemeListWidget)) #Signals QtCore.QObject.connect(self.ThemeListWidget, QtCore.SIGNAL(u'doubleClicked(QModelIndex)'), @@ -472,7 +480,7 @@ class ThemeManager(QtGui.QWidget): #theme.display_outline_color theme.display_shadow = str_to_bool(theme.display_shadow) #theme.display_shadow_color - theme.display_verticalAlign = theme.display_verticalAlign.strip() + theme.display_verticalAlign = int(theme.display_verticalAlign.strip()) theme.display_wrapStyle = theme.display_wrapStyle.strip() theme.font_footer_color = theme.font_footer_color.strip() theme.font_footer_height = theme.font_footer_height.strip()