openlp-core team mailing list archive

[Andreas Preikschat <andreaspreikschat@xxxxxxxxxx>]

Andreas Preikschat has proposed merging lp:~googol/openlp/central-settings-place into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #1096559 in OpenLP: "Central place for default settings"
  https://bugs.launchpad.net/openlp/+bug/1096559

For more details, see:
https://code.launchpad.net/~googol/openlp/central-settings-place/+merge/144656

Hello,

- fixed a traceback in the service manager
-- 
https://code.launchpad.net/~googol/openlp/central-settings-place/+merge/144656
Your team OpenLP Core is requested to review the proposed merge of lp:~googol/openlp/central-settings-place into lp:openlp.

=== modified file 'openlp/core/ui/servicemanager.py'
--- openlp/core/ui/servicemanager.py	2013-01-21 19:47:53 +0000
+++ openlp/core/ui/servicemanager.py	2013-01-24 09:24:28 +0000
@@ -849,7 +849,8 @@
             service_item.auto_play_slides_loop = False
             self.autoPlaySlidesLoop.setChecked(False)
         if service_item.auto_play_slides_once and service_item.timed_slide_interval == 0:
-            service_item.timed_slide_interval = Settings().value(u'loop delay')
+            service_item.timed_slide_interval = Settings().value(
+                self.mainwindow.generalSettingsSection + u'/loop delay')
         self.setModified()
 
     def toggleAutoPlaySlidesLoop(self):
@@ -863,7 +864,8 @@
             service_item.auto_play_slides_once = False
             self.autoPlaySlidesOnce.setChecked(False)
         if service_item.auto_play_slides_loop and service_item.timed_slide_interval == 0:
-            service_item.timed_slide_interval = Settings().value(u'loop delay')
+            service_item.timed_slide_interval = Settings().value(
+                self.mainwindow.generalSettingsSection + u'/loop delay')
         self.setModified()
 
     def onTimedSlideInterval(self):
@@ -874,7 +876,7 @@
         item = self.findServiceItem()[0]
         service_item = self.serviceItems[item][u'service_item']
         if service_item.timed_slide_interval == 0:
-            timed_slide_interval = Settings().value(u'loop delay')
+            timed_slide_interval = Settings().value(self.mainwindow.generalSettingsSection + u'/loop delay')
         else:
             timed_slide_interval = service_item.timed_slide_interval
         timed_slide_interval, ok = QtGui.QInputDialog.getInteger(self, translate('OpenLP.ServiceManager',