raoul
/
openlp
forked from openlp/openlp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

This is a run of the 'enable slide loop' code that gushie showed me plus my checkbox code for it

This commit is contained in:
Josh Miller 2011-05-22 14:49:16 -04:00
parent eedecf6434
commit 33dcf7c439
2 changed files with 391 additions and 391 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
openlp/core/ui/generaltab.py
View File

@ -96,9 +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.enableLoopCheckbox = QtGui.QCheckBox(self.settingsGroupBox)
self.stopLoopCheckBox.setObjectName(u'stopLoopCheckBox') self.enableLoopCheckbox.setObjectName(u'enableLoopCheckbox')
self.settingsLayout.addRow(self.stopLoopCheckBox) self.settingsLayout.addRow(self.enableLoopCheckbox)
# 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')
@ -221,7 +221,7 @@ 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', 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:'))
@ -275,8 +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', self.enableLoopCheckbox.setChecked(settings.value(u'enable slide loop',
QtCore.QVariant(False)).toBool()) QtCore.QVariant(True)).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',
@ -320,8 +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', settings.setValue(u'Enable slide loop',
QtCore.QVariant(self.stopLoopCheckBox.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()))
settings.setValue(u'ccli number', settings.setValue(u'ccli number',

4
openlp/core/ui/slidecontroller.py
View File

@ -935,7 +935,7 @@ class SlideController(QtGui.QWidget):
def onSlideSelectedNextNoloop(self): def onSlideSelectedNextNoloop(self):
self.onSlideSelectedNext(False) self.onSlideSelectedNext(False)
def onSlideSelectedNext(self, loop=QtCore.QSettings().setValue('stop loop', 'stoploop')): def onSlideSelectedNext(self, loop=(not QtCore.QSettings().value(u'enable slide loop', QtCore.QVariant(True)).toBool())):
""" """
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=QtCore.QSettings().setValue('stop loop', 'stoploop')): def onSlideSelectedPrevious(self, loop=(not QtCore.QSettings().value(u'enable slide loop', QtCore.QVariant(True)).toBool())):
""" """
Go to the previous slide. Go to the previous slide.
""" """