openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

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

    Requested reviews:
    OpenLP Core (openlp-core)


Fix up handling of themes in settings tabs so correct values are used.
-- 
https://code.launchpad.net/~trb143/openlp/cleanups/+merge/15968
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'openlp/core/ui/themestab.py'
--- openlp/core/ui/themestab.py	2009-11-30 20:29:26 +0000
+++ openlp/core/ui/themestab.py	2009-12-10 17:20:29 +0000
@@ -137,24 +137,20 @@
         self.config.set_config(u'theme level', self.theme_level)
         self.config.set_config(u'global theme',self.global_theme)
         Receiver.send_message(u'update_global_theme', self.global_theme)
+        self.parent.RenderManager.set_global_theme(
+            self.global_theme, self.theme_level)
 
     def postSetUp(self):
         Receiver.send_message(u'update_global_theme', self.global_theme)
 
     def onSongLevelButtonPressed(self):
-        self.global_style = u'Song'
-        self.parent.RenderManager.set_global_theme(
-            self.global_theme, self.theme_level)
+        self.theme_level = ThemeLevel.Song
 
     def onServiceLevelButtonPressed(self):
-        self.global_style = u'Service'
-        self.parent.RenderManager.set_global_theme(
-            self.global_theme, self.theme_level)
+        self.theme_level = ThemeLevel.Service
 
     def onGlobalLevelButtonPressed(self):
-        self.global_style = u'Global'
-        self.parent.RenderManager.set_global_theme(
-            self.global_theme, self.theme_level)
+        self.theme_level = ThemeLevel.Global
 
     def onDefaultComboBoxChanged(self, value):
         self.global_theme = unicode(self.DefaultComboBox.currentText())