OpenLP

Merge lp:~phill-ridout/openlp/screen_overide into lp:openlp

  1. screen_overide
  2. Merge into trunk
Proposed by Phill
Status: Merged
Merged at revision: 1010
Proposed branch: lp:~phill-ridout/openlp/screen_overide
Merge into: lp:openlp
Diff against target: 81 lines (+25/-25)
1 file modified
openlp/core/ui/generaltab.py (+25/-25)
To merge this branch: bzr merge lp:~phill-ridout/openlp/screen_overide
Reviewer Review Type Date Requested Status
Raoul Snyman approve Approve
Tim Bentley Approve
Review via email: mp+34620@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Tim Bentley (trb143) wrote :

Approved

review: Approve
Revision history for this message
Raoul Snyman (raoul-snyman) :
review: Approve (approve)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openlp/core/ui/generaltab.py'
2--- openlp/core/ui/generaltab.py 2010-08-26 16:08:26 +0000
3+++ openlp/core/ui/generaltab.py 2010-09-04 16:39:46 +0000
4@@ -195,6 +195,19 @@
5 self.currentYValueLabel.setObjectName(u'currentYValueLabel')
6 self.currentYLayout.addWidget(self.currentYValueLabel)
7 self.currentLayout.addLayout(self.currentYLayout)
8+ self.currentWidthLayout = QtGui.QVBoxLayout()
9+ self.currentWidthLayout.setSpacing(0)
10+ self.currentWidthLayout.setMargin(0)
11+ self.currentWidthLayout.setObjectName(u'currentWidthLayout')
12+ self.currentWidthLabel = QtGui.QLabel(self.displayGroupBox)
13+ self.currentWidthLabel.setAlignment(QtCore.Qt.AlignCenter)
14+ self.currentWidthLabel.setObjectName(u'currentWidthLabel')
15+ self.currentWidthLayout.addWidget(self.currentWidthLabel)
16+ self.currentWidthValueLabel = QtGui.QLabel(self.displayGroupBox)
17+ self.currentWidthValueLabel.setAlignment(QtCore.Qt.AlignCenter)
18+ self.currentWidthValueLabel.setObjectName(u'currentWidthValueLabel')
19+ self.currentWidthLayout.addWidget(self.currentWidthValueLabel)
20+ self.currentLayout.addLayout(self.currentWidthLayout)
21 self.currentHeightLayout = QtGui.QVBoxLayout()
22 self.currentHeightLayout.setSpacing(0)
23 self.currentHeightLayout.setMargin(0)
24@@ -209,19 +222,6 @@
25 self.currentHeightValueLabel.setObjectName(u'Height')
26 self.currentHeightLayout.addWidget(self.currentHeightValueLabel)
27 self.currentLayout.addLayout(self.currentHeightLayout)
28- self.currentWidthLayout = QtGui.QVBoxLayout()
29- self.currentWidthLayout.setSpacing(0)
30- self.currentWidthLayout.setMargin(0)
31- self.currentWidthLayout.setObjectName(u'currentWidthLayout')
32- self.currentWidthLabel = QtGui.QLabel(self.displayGroupBox)
33- self.currentWidthLabel.setAlignment(QtCore.Qt.AlignCenter)
34- self.currentWidthLabel.setObjectName(u'currentWidthLabel')
35- self.currentWidthLayout.addWidget(self.currentWidthLabel)
36- self.currentWidthValueLabel = QtGui.QLabel(self.displayGroupBox)
37- self.currentWidthValueLabel.setAlignment(QtCore.Qt.AlignCenter)
38- self.currentWidthValueLabel.setObjectName(u'currentWidthValueLabel')
39- self.currentWidthLayout.addWidget(self.currentWidthValueLabel)
40- self.currentLayout.addLayout(self.currentWidthLayout)
41 self.displayLayout.addLayout(self.currentLayout)
42 self.overrideCheckBox = QtGui.QCheckBox(self.displayGroupBox)
43 self.overrideCheckBox.setObjectName(u'overrideCheckBox')
44@@ -256,18 +256,6 @@
45 self.customYValueEdit.setObjectName(u'customYValueEdit')
46 self.customYLayout.addWidget(self.customYValueEdit)
47 self.customLayout.addLayout(self.customYLayout)
48- self.customHeightLayout = QtGui.QVBoxLayout()
49- self.customHeightLayout.setSpacing(0)
50- self.customHeightLayout.setMargin(0)
51- self.customHeightLayout.setObjectName(u'customHeightLayout')
52- self.customHeightLabel = QtGui.QLabel(self.displayGroupBox)
53- self.customHeightLabel.setAlignment(QtCore.Qt.AlignCenter)
54- self.customHeightLabel.setObjectName(u'customHeightLabel')
55- self.customHeightLayout.addWidget(self.customHeightLabel)
56- self.customHeightValueEdit = QtGui.QLineEdit(self.displayGroupBox)
57- self.customHeightValueEdit.setObjectName(u'customHeightValueEdit')
58- self.customHeightLayout.addWidget(self.customHeightValueEdit)
59- self.customLayout.addLayout(self.customHeightLayout)
60 self.customWidthLayout = QtGui.QVBoxLayout()
61 self.customWidthLayout.setSpacing(0)
62 self.customWidthLayout.setMargin(0)
63@@ -281,6 +269,18 @@
64 self.customWidthValueEdit.setObjectName(u'customWidthValueEdit')
65 self.customWidthLayout.addWidget(self.customWidthValueEdit)
66 self.customLayout.addLayout(self.customWidthLayout)
67+ self.customHeightLayout = QtGui.QVBoxLayout()
68+ self.customHeightLayout.setSpacing(0)
69+ self.customHeightLayout.setMargin(0)
70+ self.customHeightLayout.setObjectName(u'customHeightLayout')
71+ self.customHeightLabel = QtGui.QLabel(self.displayGroupBox)
72+ self.customHeightLabel.setAlignment(QtCore.Qt.AlignCenter)
73+ self.customHeightLabel.setObjectName(u'customHeightLabel')
74+ self.customHeightLayout.addWidget(self.customHeightLabel)
75+ self.customHeightValueEdit = QtGui.QLineEdit(self.displayGroupBox)
76+ self.customHeightValueEdit.setObjectName(u'customHeightValueEdit')
77+ self.customHeightLayout.addWidget(self.customHeightValueEdit)
78+ self.customLayout.addLayout(self.customHeightLayout)
79 self.displayLayout.addLayout(self.customLayout)
80 # Bottom spacer
81 self.generalRightSpacer = QtGui.QSpacerItem(20, 40,