openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

Tim Bentley has proposed merging lp:~trb143/openlp/cleanup-config into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~trb143/openlp/cleanup-config/+merge/153455

Breakages from last merge!
-- 
https://code.launchpad.net/~trb143/openlp/cleanup-config/+merge/153455
Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/cleanup-config into lp:openlp.

=== modified file 'openlp/core/lib/renderer.py'
--- openlp/core/lib/renderer.py	2013-03-07 06:48:09 +0000
+++ openlp/core/lib/renderer.py	2013-03-14 20:25:27 +0000
@@ -31,8 +31,8 @@
 
 from PyQt4 import QtGui, QtCore, QtWebKit
 
-from openlp.core.lib import FormattingTags, ImageSource, ItemCapabilities, Registry, ScreenList, ServiceItem, \
-    expand_tags, build_lyrics_format_css, build_lyrics_outline_css
+from openlp.core.lib import Settings, FormattingTags, ImageSource, ItemCapabilities, Registry, ScreenList, \
+    ServiceItem, expand_tags, build_lyrics_format_css, build_lyrics_outline_css
 from openlp.core.lib.theme import ThemeLevel
 from openlp.core.ui import MainDisplay
 
@@ -171,13 +171,14 @@
         """
         self.theme_level = theme_level
 
-    def set_global_theme(self, global_theme_name):
+    def set_global_theme(self):
         """
         Set the global-level theme name.
 
         ``global_theme_name``
             The global-level theme's name.
         """
+        global_theme_name = Settings().value(u'themes/global theme')
         self._set_theme(global_theme_name)
         self.global_theme_name = global_theme_name
 

=== modified file 'openlp/core/ui/servicemanager.py'
--- openlp/core/ui/servicemanager.py	2013-03-12 07:17:14 +0000
+++ openlp/core/ui/servicemanager.py	2013-03-14 20:25:27 +0000
@@ -1231,7 +1231,7 @@
         Settings().setValue(self.main_window.serviceManagerSettingsSection + u'/service theme', self.service_theme)
         self.regenerate_service_Items(True)
 
-    def theme_change(self, global_theme):
+    def theme_change(self):
         """
         The theme may have changed in the settings dialog so make
         sure the theme combo box is in the correct state.

=== modified file 'openlp/core/ui/slidecontroller.py'
--- openlp/core/ui/slidecontroller.py	2013-03-07 12:59:35 +0000
+++ openlp/core/ui/slidecontroller.py	2013-03-14 20:25:27 +0000
@@ -605,11 +605,11 @@
         self.__updatePreviewSelection(slide_no)
         self.slideSelected()
 
-    def receive_spin_delay(self, value):
+    def receive_spin_delay(self):
         """
         Adjusts the value of the ``delay_spin_box`` to the given one.
         """
-        self.delay_spin_box.setValue(int(value))
+        self.delay_spin_box.setValue(Settings().value(u'general/loop delay'))
 
     def update_slide_limits(self):
         """

=== modified file 'openlp/core/ui/themestab.py'
--- openlp/core/ui/themestab.py	2013-03-10 20:19:42 +0000
+++ openlp/core/ui/themestab.py	2013-03-14 20:25:27 +0000
@@ -149,7 +149,6 @@
         settings.setValue(u'theme level', self.theme_level)
         settings.setValue(u'global theme', self.global_theme)
         settings.endGroup()
-        self.renderer.set_global_theme(self.global_theme)
         self.renderer.set_theme_level(self.theme_level)
         self.settings_form.register_post_process(u'theme_update_global')
 
@@ -182,7 +181,7 @@
         Set the global default theme
         """
         self.global_theme = self.DefaultComboBox.currentText()
-        self.renderer.set_global_theme(self.global_theme)
+        self.renderer.set_global_theme()
         self.__previewGlobalTheme()
 
     def update_theme_list(self, theme_list):
@@ -199,7 +198,7 @@
         self.DefaultComboBox.clear()
         self.DefaultComboBox.addItems(theme_list)
         find_and_set_in_combo_box(self.DefaultComboBox, self.global_theme)
-        self.renderer.set_global_theme(self.global_theme)
+        self.renderer.set_global_theme()
         self.renderer.set_theme_level(self.theme_level)
         if self.global_theme is not u'':
             self.__previewGlobalTheme()