Merge lp:~milleja46/openlp/milleja46 into lp:openlp

[Joshua Miller]

Adds in looping of slides based on a checkbox in the general settings. Fully functional now, and corrections as noted, and extra blank deletion. changes can_loop to the setting directly

[Tim Bentley (trb143)]

line 80 longer than 80 bytes

lines 85 and 88 not needed.

QtCore.QSettings().value(self.parent.generalSettingsSection + u'/enable slide loop'
should be
QtCore.QSettings().value(u'general/enable slide loop'

review: Needs Fixing

[Jonathan Corwin (j-corwin)]

> QtCore.QSettings().value(self.parent.generalSettingsSection + u'/enable slide
> loop'
> should be
> QtCore.QSettings().value(u'general/enable slide loop'

Tim, what Joshua has is consistent with the rest of slidecontroller.py, and we've just spent the last few days telling him to replace the 'general' with the self.parent.generalSettingsSection!

[Raoul Snyman (raoul-snyman)]

@Joshua just a small thing, rename your "enable_loop" variable to "can_loop" as it makes a little more sense when you read the "if" statement.

  if can_loop:

Just makes the code a little more readable.

[Jonathan Corwin (j-corwin)]

Delete line 45

Line 88, shouldn't be pass, but:
    row = self.previewListWidget.rowCount() - 1
Otherwise row will be one greater than the highest index in the controller.

Leave the self.parent.generalSettingsSection until Tim has chance to respond to my earlier comment and I find out why he wants it changed. But it still needs splitting so it doesn't go over 80 characters.

review: Needs Fixing

[Tim Bentley (trb143)]

Accept that SlideController does it that way with Qsettings BUT the reset of the code ThemeManager which I have written does it the other way.

self.parent.generalSettingsSection + u'/enable slide is less readable than u'general/enable slide.
This is a different debate for later so ignore that comment. The rest still stand.

[Tim Bentley (trb143)]

Looks good but can_loop can be removed and the IF test applied against the QSettings directly.

This is in both situations

review: Needs Fixing

[Tim Bentley (trb143)]

Hope you are sitting down !

review: Approve

[lp:~milleja46/openlp/milleja46]

1574. By Tim Bentley on 2011-05-26

More busy and sort changes

[Jonathan Corwin (j-corwin)]

Well done, we got there in the end! :)

review: Approve

[lp:~milleja46/openlp/milleja46]

1575. By Joshua Miller on 2011-05-26

Enable or disable looping of slides based on a checkbox in the general settings

[Joshua Miller (milleja46)]

Glad it finally got approved and merged(glad Raoul finally made the connection to me about signals and slots to events and event methods) at least now we're somewhat closer to having the next version ready

=== modified file 'openlp/core/ui/generaltab.py'
--- openlp/core/ui/generaltab.py	2011-05-24 20:47:05 +0000
+++ openlp/core/ui/generaltab.py	2011-05-26 11:02:52 +0000
@@ -97,6 +97,9 @@
         self.autoPreviewCheckBox = QtGui.QCheckBox(self.settingsGroupBox)
         self.autoPreviewCheckBox.setObjectName(u'autoPreviewCheckBox')
         self.settingsLayout.addRow(self.autoPreviewCheckBox)
+        self.enableLoopCheckBox = QtGui.QCheckBox(self.settingsGroupBox)
+        self.enableLoopCheckBox.setObjectName(u'enableLoopCheckBox')
+        self.settingsLayout.addRow(self.enableLoopCheckBox)
         # Moved here from image tab
         self.timeoutLabel = QtGui.QLabel(self.settingsGroupBox)
         self.timeoutLabel.setObjectName(u'timeoutLabel')
@@ -219,6 +222,8 @@
             'Unblank display when adding new live item'))
         self.autoPreviewCheckBox.setText(translate('OpenLP.GeneralTab',
             'Automatically preview next item in service'))
+        self.enableLoopCheckBox.setText(translate('OpenLP.GeneralTab',
+            'Enable slide loop'))
         self.timeoutLabel.setText(translate('OpenLP.GeneralTab',
             'Slide loop delay:'))
         self.timeoutSpinBox.setSuffix(translate('OpenLP.GeneralTab', ' sec'))
@@ -271,6 +276,8 @@
             QtCore.QVariant(True)).toBool())
         self.autoPreviewCheckBox.setChecked(settings.value(u'auto preview',
             QtCore.QVariant(False)).toBool())
+        self.enableLoopCheckBox.setChecked(settings.value(u'enable slide loop',
+            QtCore.QVariant(True)).toBool())
         self.timeoutSpinBox.setValue(settings.value(u'loop delay',
            QtCore.QVariant(5)).toInt()[0])
         self.overrideCheckBox.setChecked(settings.value(u'override position',
@@ -314,6 +321,8 @@
             QtCore.QVariant(self.autoUnblankCheckBox.isChecked()))
         settings.setValue(u'auto preview',
             QtCore.QVariant(self.autoPreviewCheckBox.isChecked()))
+        settings.setValue(u'enable slide loop',
+            QtCore.QVariant(self.enableLoopCheckBox.isChecked()))
         settings.setValue(u'loop delay',
             QtCore.QVariant(self.timeoutSpinBox.value()))
         settings.setValue(u'ccli number',

=== modified file 'openlp/core/ui/slidecontroller.py'
--- openlp/core/ui/slidecontroller.py	2011-05-25 09:10:57 +0000
+++ openlp/core/ui/slidecontroller.py	2011-05-26 11:02:52 +0000
@@ -349,13 +349,6 @@
             QtCore.SIGNAL(u'slidecontroller_%s_previous' % self.typePrefix),
             self.onSlideSelectedPrevious)
         QtCore.QObject.connect(Receiver.get_receiver(),
-            QtCore.SIGNAL(u'slidecontroller_%s_next_noloop' % self.typePrefix),
-            self.onSlideSelectedNextNoloop)
-        QtCore.QObject.connect(Receiver.get_receiver(),
-            QtCore.SIGNAL(u'slidecontroller_%s_previous_noloop' %
-            self.typePrefix),
-            self.onSlideSelectedPreviousNoloop)
-        QtCore.QObject.connect(Receiver.get_receiver(),
             QtCore.SIGNAL(u'slidecontroller_%s_last' % self.typePrefix),
             self.onSlideSelectedLast)
         QtCore.QObject.connect(Receiver.get_receiver(),
@@ -940,10 +933,7 @@
             rect.y(), rect.width(), rect.height())
         self.slidePreview.setPixmap(winimg)
 
-    def onSlideSelectedNextNoloop(self):
-        self.onSlideSelectedNext(False)
-
-    def onSlideSelectedNext(self, loop=True):
+    def onSlideSelectedNext(self):
         """
         Go to the next slide.
         """
@@ -956,18 +946,15 @@
         else:
             row = self.previewListWidget.currentRow() + 1
             if row == self.previewListWidget.rowCount():
-                if loop:
+                if QtCore.QSettings().value(self.parent.generalSettingsSection +
+                    u'/enable slide loop', QtCore.QVariant(True)).toBool():
                     row = 0
                 else:
-                    Receiver.send_message('servicemanager_next_item')
-                    return
+                    row = self.previewListWidget.rowCount() - 1
             self.__checkUpdateSelectedSlide(row)
             self.slideSelected()
 
-    def onSlideSelectedPreviousNoloop(self):
-        self.onSlideSelectedPrevious(False)
-
-    def onSlideSelectedPrevious(self, loop=True):
+    def onSlideSelectedPrevious(self):
         """
         Go to the previous slide.
         """
@@ -980,7 +967,8 @@
         else:
             row = self.previewListWidget.currentRow() - 1
             if row == -1:
-                if loop:
+                if QtCore.QSettings().value(self.parent.generalSettingsSection +
+                    u'/enable slide loop', QtCore.QVariant(True)).toBool():
                     row = self.previewListWidget.rowCount() - 1
                 else:
                     row = 0