diff --git a/openlp/core/ui/generaltab.py b/openlp/core/ui/generaltab.py
index e3380f8ea..4f7c73a82 100644
--- a/openlp/core/ui/generaltab.py
+++ b/openlp/core/ui/generaltab.py
@@ -179,36 +179,36 @@ class GeneralTab(SettingsTab):
self.rightLayout.addWidget(self.audioGroupBox)
self.rightLayout.addStretch()
# Service Item Slide Advance
- self.SlideGroupBox = QtGui.QGroupBox(self.rightColumn)
- self.SlideGroupBox.setObjectName(u'SlideGroupBox')
- self.SlideLayout = QtGui.QFormLayout(self.SlideGroupBox)
- self.SlideLayout.setLabelAlignment(
+ self.slideGroupBox = QtGui.QGroupBox(self.rightColumn)
+ self.slideGroupBox.setObjectName(u'slideGroupBox')
+ self.slideLayout = QtGui.QFormLayout(self.slideGroupBox)
+ self.slideLayout.setLabelAlignment(
QtCore.Qt.AlignLeft | QtCore.Qt.AlignTop)
- self.SlideLayout.setFormAlignment(
+ self.slideLayout.setFormAlignment(
QtCore.Qt.AlignLeft | QtCore.Qt.AlignTop)
- self.SlideLayout.setObjectName(u'SlideLayout')
- self.EndSlideRadioButton = QtGui.QRadioButton(self.SlideGroupBox)
- self.EndSlideRadioButton.setObjectName(u'EndSlideRadioButton')
- self.EndSlideLabel = QtGui.QLabel(self.SlideGroupBox)
- self.EndSlideLabel.setWordWrap(True)
- self.EndSlideLabel.setObjectName(u'EndSlideLabel')
- self.SlideLayout.addRow(self.EndSlideRadioButton, self.EndSlideLabel)
- self.WrapSlideRadioButton = QtGui.QRadioButton(self.SlideGroupBox)
- self.WrapSlideRadioButton.setObjectName(u'WrapSlideRadioButton')
- self.WrapSlideLabel = QtGui.QLabel(self.SlideGroupBox)
- self.WrapSlideLabel.setWordWrap(True)
- self.WrapSlideLabel.setObjectName(u'WrapSlideLabel')
- self.SlideLayout.addRow(self.WrapSlideRadioButton,
- self.WrapSlideLabel)
- self.NextSlideRadioButton = QtGui.QRadioButton(self.SlideGroupBox)
- self.NextSlideRadioButton.setChecked(True)
- self.NextSlideRadioButton.setObjectName(u'NextSlideRadioButton')
- self.NextSlideLabel = QtGui.QLabel(self.SlideGroupBox)
- self.NextSlideLabel.setWordWrap(True)
- self.NextSlideLabel.setObjectName(u'NextSlideLabel')
- self.SlideLayout.addRow(self.NextSlideRadioButton,
- self.NextSlideLabel)
- self.rightLayout.addWidget(self.SlideGroupBox)
+ self.slideLayout.setObjectName(u'slideLayout')
+ self.endSlideRadioButton = QtGui.QRadioButton(self.slideGroupBox)
+ self.endSlideRadioButton.setObjectName(u'endSlideRadioButton')
+ self.endSlideLabel = QtGui.QLabel(self.slideGroupBox)
+ self.endSlideLabel.setWordWrap(True)
+ self.endSlideLabel.setObjectName(u'endSlideLabel')
+ self.slideLayout.addRow(self.endSlideRadioButton, self.endSlideLabel)
+ self.wrapSlideRadioButton = QtGui.QRadioButton(self.slideGroupBox)
+ self.wrapSlideRadioButton.setObjectName(u'wrapSlideRadioButton')
+ self.wrapSlideLabel = QtGui.QLabel(self.slideGroupBox)
+ self.wrapSlideLabel.setWordWrap(True)
+ self.wrapSlideLabel.setObjectName(u'wrapSlideLabel')
+ self.slideLayout.addRow(self.wrapSlideRadioButton,
+ self.wrapSlideLabel)
+ self.nextSlideRadioButton = QtGui.QRadioButton(self.slideGroupBox)
+ self.nextSlideRadioButton.setChecked(True)
+ self.nextSlideRadioButton.setObjectName(u'nextSlideRadioButton')
+ self.nextSlideLabel = QtGui.QLabel(self.slideGroupBox)
+ self.nextSlideLabel.setWordWrap(True)
+ self.nextSlideLabel.setObjectName(u'nextSlideLabel')
+ self.slideLayout.addRow(self.nextSlideRadioButton,
+ self.nextSlideLabel)
+ self.rightLayout.addWidget(self.slideGroupBox)
self.rightLayout.addStretch()
# Signals and slots
QtCore.QObject.connect(self.overrideCheckBox,
@@ -226,11 +226,11 @@ class GeneralTab(SettingsTab):
# Reload the tab, as the screen resolution/count may have changed.
QtCore.QObject.connect(Receiver.get_receiver(),
QtCore.SIGNAL(u'config_screen_changed'), self.load)
- QtCore.QObject.connect(self.EndSlideRadioButton,
+ QtCore.QObject.connect(self.endSlideRadioButton,
QtCore.SIGNAL(u'pressed()'), self.onEndSlideButtonPressed)
- QtCore.QObject.connect(self.WrapSlideRadioButton,
+ QtCore.QObject.connect(self.wrapSlideRadioButton,
QtCore.SIGNAL(u'pressed()'), self.onWrapSlideButtonPressed)
- QtCore.QObject.connect(self.NextSlideRadioButton,
+ QtCore.QObject.connect(self.nextSlideRadioButton,
QtCore.SIGNAL(u'pressed()'), self.onNextSlideButtonPressed)
# Remove for now
self.usernameLabel.setVisible(False)
@@ -291,24 +291,24 @@ class GeneralTab(SettingsTab):
self.startPausedCheckBox.setText(
translate('OpenLP.GeneralTab', 'Start background audio paused'))
# Slide Advance
- self.SlideGroupBox.setTitle(
+ self.slideGroupBox.setTitle(
translate('OpenLP.GeneralTab', 'Service Item Slide Advance'))
- self.EndSlideRadioButton.setText(
+ self.endSlideRadioButton.setText(
translate('OpenLP.GeneralTab', '&End Slide'))
- self.EndSlideLabel.setText(
+ self.endSlideLabel.setText(
translate('OpenLP.GeneralTab', 'Up and down arrow keys '
- 'stop at the top and bottom slides of each Service Item. '))
- self.WrapSlideRadioButton.setText(
+ 'stop at the top and bottom slides of each Service Item.'))
+ self.wrapSlideRadioButton.setText(
translate('OpenLP.GeneralTab', '&Wrap Slide'))
- self.WrapSlideLabel.setText(
+ self.wrapSlideLabel.setText(
translate('OpenLP.GeneralTab', 'Up and down arrow keys '
- 'wrap around at the top and bottom slides of each Service Item. '))
- self.NextSlideRadioButton.setText(
+ 'wrap around at the top and bottom slides of each Service Item.'))
+ self.nextSlideRadioButton.setText(
translate('OpenLP.GeneralTab', '&Next Slide'))
- self.NextSlideLabel.setText(
+ self.nextSlideLabel.setText(
translate('OpenLP.GeneralTab', 'Up and down arrow keys '
'advance to the the next or previous Service Item from the '
- 'top and bottom slides of each Service Item. '))
+ 'top and bottom slides of each Service Item.'))
def load(self):
"""
@@ -367,11 +367,11 @@ class GeneralTab(SettingsTab):
u'slide advance', QtCore.QVariant(SlideAdvance.End)).toInt()[0]
settings.endGroup()
if self.slide_advance == SlideAdvance.End:
- self.EndSlideRadioButton.setChecked(True)
+ self.endSlideRadioButton.setChecked(True)
elif self.slide_advance == SlideAdvance.Wrap:
- self.WrapSlideRadioButton.setChecked(True)
+ self.wrapSlideRadioButton.setChecked(True)
else:
- self.NextSlideRadioButton.setChecked(True)
+ self.nextSlideRadioButton.setChecked(True)
def save(self):
"""
diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py
index 75312f3d5..0868aad94 100644
--- a/openlp/core/ui/mainwindow.py
+++ b/openlp/core/ui/mainwindow.py
@@ -1310,16 +1310,16 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
log.debug(u'Loading QSettings')
# Migrate Wrap Settings to Slide Advance Settings
if QtCore.QSettings().contains(self.generalSettingsSection +
- u'/enable slide loop'):
- if QtCore.QSettings().value(self.generalSettingsSection +
+ u'/enable slide loop'):
+ if QtCore.QSettings().value(self.generalSettingsSection +
u'/enable slide loop', QtCore.QVariant(True)).toBool():
- slide_advance = SlideAdvance.Wrap
- else:
- slide_advance = SlideAdvance.End
- QtCore.QSettings().setValue(self.generalSettingsSection +
- u'/slide advance', QtCore.QVariant(slide_advance))
- QtCore.QSettings().remove(self.generalSettingsSection +
- u'/enable slide loop')
+ QtCore.QSettings().setValue(self.generalSettingsSection +
+ u'/slide advance', QtCore.QVariant(SlideAdvance.Wrap))
+ else:
+ QtCore.QSettings().setValue(self.generalSettingsSection +
+ u'/slide advance', QtCore.QVariant(SlideAdvance.End))
+ QtCore.QSettings().remove(self.generalSettingsSection +
+ u'/enable slide loop')
settings = QtCore.QSettings()
# Remove obsolete entries.
settings.remove(u'custom slide')
diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py
index 34d6ff1dc..ef59a0083 100644
--- a/openlp/core/ui/slidecontroller.py
+++ b/openlp/core/ui/slidecontroller.py
@@ -1164,7 +1164,7 @@ class SlideController(Controller):
rect.y(), rect.width(), rect.height())
self.slidePreview.setPixmap(winimg)
- def onSlideSelectedNext(self):
+ def onSlideSelectedNext(self, wrap=None):
"""
Go to the next slide.
"""
@@ -1177,17 +1177,24 @@ class SlideController(Controller):
else:
row = self.previewListWidget.currentRow() + 1
if row == self.previewListWidget.rowCount():
- if QtCore.QSettings().value(
- self.parent().generalSettingsSection + u'/slide advance',
- QtCore.QVariant(SlideAdvance.End)).toInt()[0] \
- == SlideAdvance.Wrap:
- row = 0
- elif QtCore.QSettings().value(
- self.parent().generalSettingsSection + u'/slide advance',
- QtCore.QVariant(SlideAdvance.End)).toInt()[0] \
- == SlideAdvance.Next:
- self.serviceNext()
- return
+ if wrap is None:
+ if QtCore.QSettings().value(
+ self.parent().generalSettingsSection +
+ u'/slide advance',
+ QtCore.QVariant(SlideAdvance.End)).toInt()[0] \
+ == SlideAdvance.Wrap:
+ row = 0
+ elif QtCore.QSettings().value(
+ self.parent().generalSettingsSection +
+ u'/slide advance',
+ QtCore.QVariant(SlideAdvance.End)).toInt()[0] \
+ == SlideAdvance.Next:
+ self.serviceNext()
+ return
+ else:
+ row = self.previewListWidget.rowCount() - 1
+ elif wrap:
+ row = 0
else:
row = self.previewListWidget.rowCount() - 1
self.__checkUpdateSelectedSlide(row)
@@ -1207,16 +1214,16 @@ class SlideController(Controller):
row = self.previewListWidget.currentRow() - 1
if row == -1:
if QtCore.QSettings().value(
- self.parent().generalSettingsSection + u'/slide advance',
- QtCore.QVariant(SlideAdvance.End)).toInt()[0] \
- == SlideAdvance.Wrap:
- row = self.previewListWidget.rowCount() - 1
- elif QtCore.QSettings().value(
- self.parent().generalSettingsSection + u'/slide advance',
- QtCore.QVariant(SlideAdvance.End)).toInt()[0] \
- == SlideAdvance.Next:
- self.servicePrevious()
- return
+ self.parent().generalSettingsSection + u'/slide advance',
+ QtCore.QVariant(SlideAdvance.End)).toInt()[0] \
+ == SlideAdvance.Wrap:
+ row = self.previewListWidget.rowCount() - 1
+ elif QtCore.QSettings().value(
+ self.parent().generalSettingsSection + u'/slide advance',
+ QtCore.QVariant(SlideAdvance.End)).toInt()[0] \
+ == SlideAdvance.Next:
+ self.servicePrevious()
+ return
else:
row = 0
self.__checkUpdateSelectedSlide(row)
diff --git a/resources/i18n/en_GB.ts b/resources/i18n/en_GB.ts
index 29910a46b..19ec72522 100644
--- a/resources/i18n/en_GB.ts
+++ b/resources/i18n/en_GB.ts
@@ -2321,18 +2321,18 @@ To cancel the First Time Wizard completely (and not start OpenLP), press the Can
- Up and down arrow keys stop at the top and bottom slides of each Service Item.
- Up and down arrow keys stop at the top and bottom slides of each Service Item.
+ Up and down arrow keys stop at the top and bottom slides of each Service Item.
+ Up and down arrow keys stop at the top and bottom slides of each Service Item.
- Up and down arrow keys wrap around at the top and bottom slides of each Service Item.
- Up and down arrow keys wrap around at the top and bottom slides of each Service Item.
+ Up and down arrow keys wrap around at the top and bottom slides of each Service Item.
+ Up and down arrow keys wrap around at the top and bottom slides of each Service Item.
- Up and down arrow keys advance to the the next or previous Service Item from the top and bottom slides of each Service Item.
- Up and down arrow keys advance to the the next or previous Service Item from the top and bottom slides of each Service Item.
+ Up and down arrow keys advance to the the next or previous Service Item from the top and bottom slides of each Service Item.
+ Up and down arrow keys advance to the the next or previous Service Item from the top and bottom slides of each Service Item.