forked from openlp/openlp
testing
This commit is contained in:
parent
fab9706402
commit
eedecf6434
@ -96,6 +96,9 @@ class GeneralTab(SettingsTab):
|
|||||||
self.autoPreviewCheckBox = QtGui.QCheckBox(self.settingsGroupBox)
|
self.autoPreviewCheckBox = QtGui.QCheckBox(self.settingsGroupBox)
|
||||||
self.autoPreviewCheckBox.setObjectName(u'autoPreviewCheckBox')
|
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
|
# Moved here from image tab
|
||||||
self.timeoutLabel = QtGui.QLabel(self.settingsGroupBox)
|
self.timeoutLabel = QtGui.QLabel(self.settingsGroupBox)
|
||||||
self.timeoutLabel.setObjectName(u'timeoutLabel')
|
self.timeoutLabel.setObjectName(u'timeoutLabel')
|
||||||
@ -218,6 +221,8 @@ class GeneralTab(SettingsTab):
|
|||||||
'Unblank display when adding new live item'))
|
'Unblank display when adding new live item'))
|
||||||
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.stopLoopCheckBox.setText(translate('OpenLP.GeneralTab',
|
||||||
|
'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'))
|
||||||
@ -270,6 +275,8 @@ class GeneralTab(SettingsTab):
|
|||||||
QtCore.QVariant(True)).toBool())
|
QtCore.QVariant(True)).toBool())
|
||||||
self.autoPreviewCheckBox.setChecked(settings.value(u'auto preview',
|
self.autoPreviewCheckBox.setChecked(settings.value(u'auto preview',
|
||||||
QtCore.QVariant(False)).toBool())
|
QtCore.QVariant(False)).toBool())
|
||||||
|
self.stopLoopCheckBox.setChecked(settings.value(u'stop Loop',
|
||||||
|
QtCore.QVariant(False)).toBool())
|
||||||
self.timeoutSpinBox.setValue(settings.value(u'loop delay',
|
self.timeoutSpinBox.setValue(settings.value(u'loop delay',
|
||||||
QtCore.QVariant(5)).toInt()[0])
|
QtCore.QVariant(5)).toInt()[0])
|
||||||
self.overrideCheckBox.setChecked(settings.value(u'override position',
|
self.overrideCheckBox.setChecked(settings.value(u'override position',
|
||||||
@ -313,6 +320,8 @@ 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'stoploop',
|
||||||
|
QtCore.QVariant(self.stopLoopCheckBox.isChecked()))
|
||||||
settings.setValue(u'loop delay',
|
settings.setValue(u'loop delay',
|
||||||
QtCore.QVariant(self.timeoutSpinBox.value()))
|
QtCore.QVariant(self.timeoutSpinBox.value()))
|
||||||
settings.setValue(u'ccli number',
|
settings.setValue(u'ccli number',
|
||||||
@ -378,3 +387,4 @@ class GeneralTab(SettingsTab):
|
|||||||
Called when the width, height, x position or y position has changed.
|
Called when the width, height, x position or y position has changed.
|
||||||
"""
|
"""
|
||||||
self.display_changed = True
|
self.display_changed = True
|
||||||
|
|
||||||
|
@ -935,7 +935,7 @@ class SlideController(QtGui.QWidget):
|
|||||||
def onSlideSelectedNextNoloop(self):
|
def onSlideSelectedNextNoloop(self):
|
||||||
self.onSlideSelectedNext(False)
|
self.onSlideSelectedNext(False)
|
||||||
|
|
||||||
def onSlideSelectedNext(self, loop=True):
|
def onSlideSelectedNext(self, loop=QtCore.QSettings().setValue('stop loop', 'stoploop')):
|
||||||
"""
|
"""
|
||||||
Go to the next slide.
|
Go to the next slide.
|
||||||
"""
|
"""
|
||||||
@ -959,7 +959,7 @@ class SlideController(QtGui.QWidget):
|
|||||||
def onSlideSelectedPreviousNoloop(self):
|
def onSlideSelectedPreviousNoloop(self):
|
||||||
self.onSlideSelectedPrevious(False)
|
self.onSlideSelectedPrevious(False)
|
||||||
|
|
||||||
def onSlideSelectedPrevious(self, loop=True):
|
def onSlideSelectedPrevious(self, loop=QtCore.QSettings().setValue('stop loop', 'stoploop')):
|
||||||
"""
|
"""
|
||||||
Go to the previous slide.
|
Go to the previous slide.
|
||||||
"""
|
"""
|
||||||
@ -1168,3 +1168,4 @@ class SlideController(QtGui.QWidget):
|
|||||||
return HideMode.Screen
|
return HideMode.Screen
|
||||||
else:
|
else:
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user