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

testing

Browse Source
This commit is contained in:
Josh Miller 2011-05-21 15:01:40 -04:00
parent fab9706402
commit eedecf6434
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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

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

@ -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