From eedecf643409da5210ef0d0cea433f40401fd12a Mon Sep 17 00:00:00 2001
From: Josh Miller <milleja46@gmail.com>
Date: Sat, 21 May 2011 15:01:40 -0400
Subject: [PATCH] testing

---
 openlp/core/ui/generaltab.py      | 16 +++++++++++++---
 openlp/core/ui/slidecontroller.py |  5 +++--
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/openlp/core/ui/generaltab.py b/openlp/core/ui/generaltab.py
index 75cb8fa98..0f238ca0a 100644
--- a/openlp/core/ui/generaltab.py
+++ b/openlp/core/ui/generaltab.py
@@ -95,7 +95,10 @@ class GeneralTab(SettingsTab):
         self.settingsLayout.addRow(self.autoUnblankCheckBox)
         self.autoPreviewCheckBox = QtGui.QCheckBox(self.settingsGroupBox)
         self.autoPreviewCheckBox.setObjectName(u'autoPreviewCheckBox')
-        self.settingsLayout.addRow(self.autoPreviewCheckBox)
+        self.settingsLayout.addRow(self.autoPreviewCheckBox)
+        self.stopLoopCheckBox = QtGui.QCheckBox(self.settingsGroupBox)
+        self.stopLoopCheckBox.setObjectName(u'stopLoopCheckBox')
+        self.settingsLayout.addRow(self.stopLoopCheckBox)
         # Moved here from image tab
         self.timeoutLabel = QtGui.QLabel(self.settingsGroupBox)
         self.timeoutLabel.setObjectName(u'timeoutLabel')
@@ -217,7 +220,9 @@ class GeneralTab(SettingsTab):
         self.autoUnblankCheckBox.setText(translate('OpenLP.GeneralTab',
             'Unblank display when adding new live item'))
         self.autoPreviewCheckBox.setText(translate('OpenLP.GeneralTab',
-            'Automatically preview next item in service'))
+            'Automatically preview next item in service'))
+        self.stopLoopCheckBox.setText(translate('OpenLP.GeneralTab',
+            'Enable slide loop'))
         self.timeoutLabel.setText(translate('OpenLP.GeneralTab',
             'Slide loop delay:'))
         self.timeoutSpinBox.setSuffix(translate('OpenLP.GeneralTab', ' sec'))
@@ -269,6 +274,8 @@ class GeneralTab(SettingsTab):
         self.checkForUpdatesCheckBox.setChecked(settings.value(u'update check',
             QtCore.QVariant(True)).toBool())
         self.autoPreviewCheckBox.setChecked(settings.value(u'auto preview',
+            QtCore.QVariant(False)).toBool())
+        self.stopLoopCheckBox.setChecked(settings.value(u'stop Loop',
             QtCore.QVariant(False)).toBool())
         self.timeoutSpinBox.setValue(settings.value(u'loop delay',
            QtCore.QVariant(5)).toInt()[0])
@@ -312,7 +319,9 @@ class GeneralTab(SettingsTab):
         settings.setValue(u'auto unblank',
             QtCore.QVariant(self.autoUnblankCheckBox.isChecked()))
         settings.setValue(u'auto preview',
-            QtCore.QVariant(self.autoPreviewCheckBox.isChecked()))
+            QtCore.QVariant(self.autoPreviewCheckBox.isChecked()))
+        settings.setValue(u'stoploop',
+            QtCore.QVariant(self.stopLoopCheckBox.isChecked()))
         settings.setValue(u'loop delay',
             QtCore.QVariant(self.timeoutSpinBox.value()))
         settings.setValue(u'ccli number',
@@ -378,3 +387,4 @@ class GeneralTab(SettingsTab):
         Called when the width, height, x position or y position has changed.
         """
         self.display_changed = True
+
diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py
index c298f897f..66e5f100a 100644
--- a/openlp/core/ui/slidecontroller.py
+++ b/openlp/core/ui/slidecontroller.py
@@ -935,7 +935,7 @@ class SlideController(QtGui.QWidget):
     def onSlideSelectedNextNoloop(self):
         self.onSlideSelectedNext(False)
 
-    def onSlideSelectedNext(self, loop=True):
+    def onSlideSelectedNext(self, loop=QtCore.QSettings().setValue('stop loop',  'stoploop')):
         """
         Go to the next slide.
         """
@@ -959,7 +959,7 @@ class SlideController(QtGui.QWidget):
     def onSlideSelectedPreviousNoloop(self):
         self.onSlideSelectedPrevious(False)
 
-    def onSlideSelectedPrevious(self, loop=True):
+    def onSlideSelectedPrevious(self, loop=QtCore.QSettings().setValue('stop loop',  'stoploop')):
         """
         Go to the previous slide.
         """
@@ -1168,3 +1168,4 @@ class SlideController(QtGui.QWidget):
             return HideMode.Screen
         else:
             return None
+