Skip to content

Commit 8d681b8

Browse files
author
timlinux
committed
Use grid layout not form layout (preserves compatibility with older qt versions)
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@12199 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 674cec9 commit 8d681b8

File tree

1 file changed

+119
-155
lines changed

1 file changed

+119
-155
lines changed

‎src/plugins/copyright_label/pluginguibase.ui

+119-155
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>360</width>
10-
<height>331</height>
9+
<width>397</width>
10+
<height>326</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
@@ -18,170 +18,133 @@
1818
<normaloff/>
1919
</iconset>
2020
</property>
21-
<widget class="QTextEdit" name="txtCopyrightText">
22-
<property name="geometry">
23-
<rect>
24-
<x>10</x>
25-
<y>50</y>
26-
<width>341</width>
27-
<height>161</height>
28-
</rect>
29-
</property>
30-
<property name="html">
31-
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
21+
<layout class="QGridLayout" name="gridLayout">
22+
<item row="0" column="0" colspan="2">
23+
<widget class="QCheckBox" name="cboxEnabled">
24+
<property name="text">
25+
<string>Enable copyright label</string>
26+
</property>
27+
<property name="checked">
28+
<bool>true</bool>
29+
</property>
30+
</widget>
31+
</item>
32+
<item row="1" column="0" colspan="2">
33+
<widget class="QLabel" name="label_2">
34+
<property name="text">
35+
<string>&amp;Enter your copyright label here:</string>
36+
</property>
37+
<property name="buddy">
38+
<cstring>txtCopyrightText</cstring>
39+
</property>
40+
</widget>
41+
</item>
42+
<item row="2" column="0" colspan="2">
43+
<widget class="QTextEdit" name="txtCopyrightText">
44+
<property name="html">
45+
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
3246
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
3347
p, li { white-space: pre-wrap; }
34-
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
35-
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Verdana'; font-size:10pt;&quot;&gt;© QGIS 2009&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
36-
</property>
37-
</widget>
38-
<widget class="QCheckBox" name="cboxEnabled">
39-
<property name="geometry">
40-
<rect>
41-
<x>10</x>
42-
<y>10</y>
43-
<width>339</width>
44-
<height>18</height>
45-
</rect>
46-
</property>
47-
<property name="text">
48-
<string>Enable copyright label</string>
49-
</property>
50-
<property name="checked">
51-
<bool>true</bool>
52-
</property>
53-
</widget>
54-
<widget class="QDialogButtonBox" name="buttonBox">
55-
<property name="geometry">
56-
<rect>
57-
<x>10</x>
58-
<y>300</y>
59-
<width>341</width>
60-
<height>25</height>
61-
</rect>
62-
</property>
63-
<property name="orientation">
64-
<enum>Qt::Horizontal</enum>
65-
</property>
66-
<property name="standardButtons">
67-
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok</set>
68-
</property>
69-
</widget>
70-
<widget class="QLabel" name="label_2">
71-
<property name="geometry">
72-
<rect>
73-
<x>10</x>
74-
<y>30</y>
75-
<width>181</width>
76-
<height>16</height>
77-
</rect>
78-
</property>
79-
<property name="text">
80-
<string>&amp;Enter your copyright label here:</string>
81-
</property>
82-
<property name="buddy">
83-
<cstring>txtCopyrightText</cstring>
84-
</property>
85-
</widget>
86-
<widget class="QWidget" name="">
87-
<property name="geometry">
88-
<rect>
89-
<x>10</x>
90-
<y>220</y>
91-
<width>341</width>
92-
<height>81</height>
93-
</rect>
94-
</property>
95-
<layout class="QFormLayout" name="formLayout">
96-
<property name="fieldGrowthPolicy">
97-
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
98-
</property>
99-
<item row="0" column="0">
100-
<widget class="QLabel" name="textLabel16">
48+
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
49+
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Verdana';&quot;&gt;© QGIS 2009&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
50+
</property>
51+
</widget>
52+
</item>
53+
<item row="3" column="0">
54+
<widget class="QLabel" name="textLabel16">
55+
<property name="text">
56+
<string>&amp;Placement</string>
57+
</property>
58+
<property name="buddy">
59+
<cstring>cboPlacement</cstring>
60+
</property>
61+
</widget>
62+
</item>
63+
<item row="3" column="1">
64+
<widget class="QComboBox" name="cboPlacement">
65+
<item>
10166
<property name="text">
102-
<string>&amp;Placement</string>
67+
<string>Bottom Left</string>
10368
</property>
104-
<property name="buddy">
105-
<cstring>cboPlacement</cstring>
106-
</property>
107-
</widget>
108-
</item>
109-
<item row="0" column="1">
110-
<widget class="QComboBox" name="cboPlacement">
111-
<item>
112-
<property name="text">
113-
<string>Bottom Left</string>
114-
</property>
115-
</item>
116-
<item>
117-
<property name="text">
118-
<string>Top Left</string>
119-
</property>
120-
</item>
121-
<item>
122-
<property name="text">
123-
<string>Bottom Right</string>
124-
</property>
125-
</item>
126-
<item>
127-
<property name="text">
128-
<string>Top Right</string>
129-
</property>
130-
</item>
131-
</widget>
132-
</item>
133-
<item row="1" column="0">
134-
<widget class="QLabel" name="textLabel15">
69+
</item>
70+
<item>
13571
<property name="text">
136-
<string>&amp;Orientation</string>
137-
</property>
138-
<property name="buddy">
139-
<cstring>cboOrientation</cstring>
72+
<string>Top Left</string>
14073
</property>
141-
</widget>
142-
</item>
143-
<item row="1" column="1">
144-
<widget class="QComboBox" name="cboOrientation">
145-
<item>
146-
<property name="text">
147-
<string>Horizontal</string>
148-
</property>
149-
</item>
150-
<item>
151-
<property name="text">
152-
<string>Vertical</string>
153-
</property>
154-
</item>
155-
</widget>
156-
</item>
157-
<item row="2" column="0">
158-
<widget class="QLabel" name="label">
74+
</item>
75+
<item>
15976
<property name="text">
160-
<string>&amp;Color</string>
77+
<string>Bottom Right</string>
16178
</property>
162-
<property name="buddy">
163-
<cstring>pbnColorChooser</cstring>
79+
</item>
80+
<item>
81+
<property name="text">
82+
<string>Top Right</string>
16483
</property>
165-
</widget>
166-
</item>
167-
<item row="2" column="1">
168-
<widget class="QgsColorButton" name="pbnColorChooser">
169-
<property name="sizePolicy">
170-
<sizepolicy hsizetype="Fixed" vsizetype="Expanding">
171-
<horstretch>0</horstretch>
172-
<verstretch>0</verstretch>
173-
</sizepolicy>
84+
</item>
85+
</widget>
86+
</item>
87+
<item row="4" column="0">
88+
<widget class="QLabel" name="textLabel15">
89+
<property name="text">
90+
<string>&amp;Orientation</string>
91+
</property>
92+
<property name="buddy">
93+
<cstring>cboOrientation</cstring>
94+
</property>
95+
</widget>
96+
</item>
97+
<item row="4" column="1">
98+
<widget class="QComboBox" name="cboOrientation">
99+
<item>
100+
<property name="text">
101+
<string>Horizontal</string>
174102
</property>
175-
<property name="minimumSize">
176-
<size>
177-
<width>100</width>
178-
<height>0</height>
179-
</size>
103+
</item>
104+
<item>
105+
<property name="text">
106+
<string>Vertical</string>
180107
</property>
181-
</widget>
182-
</item>
183-
</layout>
184-
</widget>
108+
</item>
109+
</widget>
110+
</item>
111+
<item row="5" column="0">
112+
<widget class="QLabel" name="label">
113+
<property name="text">
114+
<string>&amp;Color</string>
115+
</property>
116+
<property name="buddy">
117+
<cstring>pbnColorChooser</cstring>
118+
</property>
119+
</widget>
120+
</item>
121+
<item row="5" column="1">
122+
<widget class="QgsColorButton" name="pbnColorChooser">
123+
<property name="sizePolicy">
124+
<sizepolicy hsizetype="Fixed" vsizetype="Expanding">
125+
<horstretch>0</horstretch>
126+
<verstretch>0</verstretch>
127+
</sizepolicy>
128+
</property>
129+
<property name="minimumSize">
130+
<size>
131+
<width>100</width>
132+
<height>0</height>
133+
</size>
134+
</property>
135+
</widget>
136+
</item>
137+
<item row="6" column="0" colspan="2">
138+
<widget class="QDialogButtonBox" name="buttonBox">
139+
<property name="orientation">
140+
<enum>Qt::Horizontal</enum>
141+
</property>
142+
<property name="standardButtons">
143+
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok</set>
144+
</property>
145+
</widget>
146+
</item>
147+
</layout>
185148
</widget>
186149
<layoutdefault spacing="6" margin="11"/>
187150
<customwidgets>
@@ -192,6 +155,7 @@ p, li { white-space: pre-wrap; }
192155
</customwidget>
193156
</customwidgets>
194157
<tabstops>
158+
<tabstop>cboxEnabled</tabstop>
195159
<tabstop>txtCopyrightText</tabstop>
196160
<tabstop>cboPlacement</tabstop>
197161
<tabstop>cboOrientation</tabstop>

0 commit comments

Comments
 (0)