openlp-core team mailing list archive

[Jon Tibble <meths@xxxxxxxxxxxxxx>]

Jon Tibble has proposed merging lp:~meths/openlp/trivialfixes into lp:openlp.

    Requested reviews:
    OpenLP Core (openlp-core)


Fix i18n for the new theme title - method will not accept a QString, has to be string.

Clean up new theme code
-- 
https://code.launchpad.net/~meths/openlp/trivialfixes/+merge/14164
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'openlp/core/ui/thememanager.py'
--- openlp/core/ui/thememanager.py	2009-10-25 14:41:15 +0000
+++ openlp/core/ui/thememanager.py	2009-10-29 13:25:27 +0000
@@ -266,16 +266,7 @@
         try:
             xml = file_to_xml(xml_file)
         except:
-            newtheme = ThemeXML()
-            newtheme.new_document(self.trUtf8(u'New Theme'))
-            newtheme.add_background_solid(unicode(u'#000000'))
-            newtheme.add_font(unicode(QtGui.QFont().family()),
-                unicode(u'#FFFFFF'), unicode(30), u'False')
-            newtheme.add_font(unicode(QtGui.QFont().family()),
-                unicode(u'#FFFFFF'), unicode(12), u'False', u'footer')
-            newtheme.add_display(u'False', unicode(u'#FFFFFF'), u'False',
-                unicode(u'#FFFFFF'), unicode(0), unicode(0), unicode(0))
-            xml = newtheme.extract_xml()
+            xml = baseTheme()
         theme = ThemeXML()
         theme.parse(xml)
         self.cleanTheme(theme)
@@ -454,7 +445,7 @@
     def baseTheme(self):
         log.debug(u'base theme created')
         newtheme = ThemeXML()
-        newtheme.new_document(self.trUtf8(u'New Theme'))
+        newtheme.new_document(unicode(self.trUtf8(u'New Theme')))
         newtheme.add_background_solid(unicode(u'#000000'))
         newtheme.add_font(unicode(QtGui.QFont().family()), unicode(u'#FFFFFF'),
             unicode(30), u'False')