openlp-core team mailing list archive
-
openlp-core team
-
Mailing list archive
-
Message #08862
[Merge] lp:~googol-hush/openlp/trivial into lp:openlp
Andreas Preikschat has proposed merging lp:~googol-hush/openlp/trivial into lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
For more details, see:
https://code.launchpad.net/~googol-hush/openlp/trivial/+merge/61015
Hello,
Just two trivial things I stumbled over:
- Prevent adjusting the loop delay spin box (on the Gerneral Tab) to 0.
- Changed title for the stage view html.
--
https://code.launchpad.net/~googol-hush/openlp/trivial/+merge/61015
Your team OpenLP Core is requested to review the proposed merge of lp:~googol-hush/openlp/trivial into lp:openlp.
=== modified file 'openlp/core/ui/generaltab.py'
--- openlp/core/ui/generaltab.py 2011-05-11 18:38:26 +0000
+++ openlp/core/ui/generaltab.py 2011-05-15 10:41:34 +0000
@@ -101,6 +101,7 @@
self.timeoutLabel.setObjectName(u'timeoutLabel')
self.timeoutSpinBox = QtGui.QSpinBox(self.settingsGroupBox)
self.timeoutSpinBox.setObjectName(u'timeoutSpinBox')
+ self.timeoutSpinBox.setRange(1, 180)
self.settingsLayout.addRow(self.timeoutLabel, self.timeoutSpinBox)
self.leftLayout.addWidget(self.settingsGroupBox)
self.leftLayout.addStretch()
=== modified file 'openlp/core/ui/slidecontroller.py'
--- openlp/core/ui/slidecontroller.py 2011-05-13 17:43:38 +0000
+++ openlp/core/ui/slidecontroller.py 2011-05-15 10:41:34 +0000
@@ -199,8 +199,7 @@
'Start/Stop continuous loop'))
self.addAction(self.toogleLoop)
self.delaySpinBox = QtGui.QSpinBox()
- self.delaySpinBox.setMinimum(1)
- self.delaySpinBox.setMaximum(180)
+ self.delaySpinBox.setRange(1, 180)
self.toolbar.addToolbarWidget(u'Image SpinBox', self.delaySpinBox)
self.delaySpinBox.setSuffix(UiStrings().Seconds)
self.delaySpinBox.setToolTip(translate('OpenLP.SlideController',
=== modified file 'openlp/plugins/remotes/html/stage.html'
--- openlp/plugins/remotes/html/stage.html 2011-05-07 08:18:02 +0000
+++ openlp/plugins/remotes/html/stage.html 2011-05-15 10:41:34 +0000
@@ -26,7 +26,7 @@
-->
<head>
<meta charset="utf-8" />
- <title>OpenLP 2.0 Remote</title>
+ <title>OpenLP 2.0 Stage View</title>
<link rel="stylesheet" href="/files/stage.css" />
<script type="text/javascript" src="/files/jquery.js"></script>
<script type="text/javascript" src="/files/stage.js"></script>
Follow ups
