openlp-core team mailing list archive
-
openlp-core team
-
Mailing list archive
-
Message #08609
[Merge] lp:~trb143/openlp/beta1 into lp:openlp
Tim Bentley has proposed merging lp:~trb143/openlp/beta1 into lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
Related bugs:
Bug #742636 in OpenLP: "Leading spaces in song titles are stripped"
https://bugs.launchpad.net/openlp/+bug/742636
Bug #775534 in OpenLP: "Display window is initially the same size as the primary screen, despite being on the secondary screen"
https://bugs.launchpad.net/openlp/+bug/775534
For more details, see:
https://code.launchpad.net/~trb143/openlp/beta1/+merge/59977
Fix wrong screen size bug
--
https://code.launchpad.net/~trb143/openlp/beta1/+merge/59977
Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/beta1 into lp:openlp.
=== modified file 'openlp/core/ui/generaltab.py'
--- openlp/core/ui/generaltab.py 2011-04-15 21:43:59 +0000
+++ openlp/core/ui/generaltab.py 2011-05-04 17:50:58 +0000
@@ -362,12 +362,11 @@
Receiver.send_message(u'slidecontroller_live_spin_delay',
self.timeoutSpinBox.value())
# Reset screens after initial definition
- if self.overrideChanged:
- self.screens.override[u'size'] = QtCore.QRect(
- self.customXValueEdit.value(),
- self.customYValueEdit.value(),
- self.customWidthValueEdit.value(),
- self.customHeightValueEdit.value())
+ self.screens.override[u'size'] = QtCore.QRect(
+ self.customXValueEdit.value(),
+ self.customYValueEdit.value(),
+ self.customWidthValueEdit.value(),
+ self.customHeightValueEdit.value())
if self.overrideCheckBox.isChecked():
self.screens.set_override_display()
else:
@@ -394,4 +393,4 @@
"""
Called when the width, height, x position or y position has changed.
"""
- self.overrideChanged = True
\ No newline at end of file
+ self.overrideChanged = True
Follow ups