Merge lp:~meths/openlp/testing into lp:openlp

[Jon Tibble]

[Jon Tibble (meths)]

Complete theme fixing

[Raoul Snyman (raoul-snyman)]

review: Approve

[Tim Bentley (trb143)]

Approved

review: Approve

[lp:~meths/openlp/testing]

535. By Jon Tibble on 2009-09-13

For Jon
Fix themes 2

=== modified file 'openlp/core/ui/amendthemeform.py'
--- openlp/core/ui/amendthemeform.py	2009-09-12 17:24:16 +0000
+++ openlp/core/ui/amendthemeform.py	2009-09-13 14:12:38 +0000
@@ -201,7 +201,8 @@
         #self.theme.background_mode
         self.theme.background_startColor = theme.background_startColor.strip()
         #self.theme.background_type
-        self.theme.display_display = theme.display_display.strip()
+        if theme.display_display:
+            self.theme.display_display = theme.display_display.strip()
         self.theme.display_horizontalAlign = \
             theme.display_horizontalAlign.strip()
         self.theme.display_outline = str_to_bool(theme.display_outline)

=== modified file 'openlp/core/ui/thememanager.py'
--- openlp/core/ui/thememanager.py	2009-09-13 13:24:58 +0000
+++ openlp/core/ui/thememanager.py	2009-09-13 14:12:38 +0000
@@ -139,9 +139,8 @@
     def onEditTheme(self):
         item = self.ThemeListWidget.currentItem()
         if item is not None:
-            self.amendThemeForm.setTheme(self.getThemeData(
-                item.data(QtCore.Qt.UserRole).toString()))
-            self.amendThemeForm.loadTheme()
+            self.amendThemeForm.loadTheme(
+                unicode(item.data(QtCore.Qt.UserRole).toString()))
             self.amendThemeForm.exec_()
 
     def onDeleteTheme(self):