forked from openlp/openlp
A switch of code to see if it worked and doesn't for the enable loop
This commit is contained in:
parent
33dcf7c439
commit
6d577395a4
|
@ -222,7 +222,7 @@ class GeneralTab(SettingsTab):
|
||||||
self.autoPreviewCheckBox.setText(translate('OpenLP.GeneralTab',
|
self.autoPreviewCheckBox.setText(translate('OpenLP.GeneralTab',
|
||||||
'Automatically preview next item in service'))
|
'Automatically preview next item in service'))
|
||||||
self.enableLoopCheckbox.setText(translate('OpenLP.GeneralTab',
|
self.enableLoopCheckbox.setText(translate('OpenLP.GeneralTab',
|
||||||
'Enable slide loop'))
|
'enable slide loop'))
|
||||||
self.timeoutLabel.setText(translate('OpenLP.GeneralTab',
|
self.timeoutLabel.setText(translate('OpenLP.GeneralTab',
|
||||||
'Slide loop delay:'))
|
'Slide loop delay:'))
|
||||||
self.timeoutSpinBox.setSuffix(translate('OpenLP.GeneralTab', ' sec'))
|
self.timeoutSpinBox.setSuffix(translate('OpenLP.GeneralTab', ' sec'))
|
||||||
|
@ -320,7 +320,7 @@ class GeneralTab(SettingsTab):
|
||||||
QtCore.QVariant(self.autoUnblankCheckBox.isChecked()))
|
QtCore.QVariant(self.autoUnblankCheckBox.isChecked()))
|
||||||
settings.setValue(u'auto preview',
|
settings.setValue(u'auto preview',
|
||||||
QtCore.QVariant(self.autoPreviewCheckBox.isChecked()))
|
QtCore.QVariant(self.autoPreviewCheckBox.isChecked()))
|
||||||
settings.setValue(u'Enable slide loop',
|
settings.setValue(u'enable slide loop',
|
||||||
QtCore.QVariant(self.enableLoopCheckbox.isChecked()))
|
QtCore.QVariant(self.enableLoopCheckbox.isChecked()))
|
||||||
settings.setValue(u'loop delay',
|
settings.setValue(u'loop delay',
|
||||||
QtCore.QVariant(self.timeoutSpinBox.value()))
|
QtCore.QVariant(self.timeoutSpinBox.value()))
|
||||||
|
|
|
@ -935,10 +935,15 @@ class SlideController(QtGui.QWidget):
|
||||||
def onSlideSelectedNextNoloop(self):
|
def onSlideSelectedNextNoloop(self):
|
||||||
self.onSlideSelectedNext(False)
|
self.onSlideSelectedNext(False)
|
||||||
|
|
||||||
def onSlideSelectedNext(self, loop=(not QtCore.QSettings().value(u'enable slide loop', QtCore.QVariant(True)).toBool())):
|
def onSlideSelectedNext(self, loop):
|
||||||
"""
|
"""
|
||||||
Go to the next slide.
|
Go to the next slide.
|
||||||
"""
|
"""
|
||||||
|
if checked:
|
||||||
|
loop = QtCore.QSettings().remove(self.parent.generalSettingsSection + u'general/enable slide loop', QtCore.QVariant(True)).toBool()
|
||||||
|
else:
|
||||||
|
loop = QtCore.QSettings().value(
|
||||||
|
u'general/enable slide loop')
|
||||||
if not self.serviceItem:
|
if not self.serviceItem:
|
||||||
return
|
return
|
||||||
Receiver.send_message(u'%s_next' % self.serviceItem.name.lower(),
|
Receiver.send_message(u'%s_next' % self.serviceItem.name.lower(),
|
||||||
|
@ -959,10 +964,15 @@ class SlideController(QtGui.QWidget):
|
||||||
def onSlideSelectedPreviousNoloop(self):
|
def onSlideSelectedPreviousNoloop(self):
|
||||||
self.onSlideSelectedPrevious(False)
|
self.onSlideSelectedPrevious(False)
|
||||||
|
|
||||||
def onSlideSelectedPrevious(self, loop=(not QtCore.QSettings().value(u'enable slide loop', QtCore.QVariant(True)).toBool())):
|
def onSlideSelectedPrevious(self, loop):
|
||||||
"""
|
"""
|
||||||
Go to the previous slide.
|
Go to the previous slide.
|
||||||
"""
|
"""
|
||||||
|
if checked:
|
||||||
|
loop = QtCore.QSettings().remove(self.parent.generalSettingsSection + u'/enable slide loop', QtCore.QVariant(True)).toBool()
|
||||||
|
else:
|
||||||
|
loop = QtCore.QSettings().value(
|
||||||
|
u'general/enable slide loop')
|
||||||
if not self.serviceItem:
|
if not self.serviceItem:
|
||||||
return
|
return
|
||||||
Receiver.send_message(u'%s_previous' % self.serviceItem.name.lower(),
|
Receiver.send_message(u'%s_previous' % self.serviceItem.name.lower(),
|
||||||
|
|
Loading…
Reference in New Issue