Skip to content

Commit 4ab5611

Browse files
DelazJnyalldawson
DelazJ
authored and
nyalldawson
committed
Standardize map canvas decorations items dialog
Modify "Location" label by "Placement" in scale Bar Decoration Reorder options of Scale Bar and Copyright decorations dialog in order to set "Placement" options after item's design properties
1 parent 6854902 commit 4ab5611

File tree

2 files changed

+194
-191
lines changed

2 files changed

+194
-191
lines changed

‎src/ui/qgsdecorationcopyrightdialog.ui

Lines changed: 133 additions & 131 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,20 @@
1515
</property>
1616
<property name="windowIcon">
1717
<iconset>
18-
<normaloff>.</normaloff>.</iconset>
18+
<normaloff/>
19+
</iconset>
1920
</property>
2021
<layout class="QGridLayout" name="gridLayout">
22+
<item row="1" column="0" colspan="2">
23+
<widget class="QDialogButtonBox" name="buttonBox">
24+
<property name="orientation">
25+
<enum>Qt::Horizontal</enum>
26+
</property>
27+
<property name="standardButtons">
28+
<set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok</set>
29+
</property>
30+
</widget>
31+
</item>
2132
<item row="0" column="0" colspan="2">
2233
<widget class="QGroupBox" name="grpEnable">
2334
<property name="minimumSize">
@@ -46,68 +57,129 @@
4657
</property>
4758
</widget>
4859
</item>
49-
<item row="3" column="0">
50-
<widget class="QLabel" name="lblMargin">
51-
<property name="minimumSize">
52-
<size>
53-
<width>155</width>
54-
<height>0</height>
55-
</size>
56-
</property>
57-
<property name="text">
58-
<string>Margin from edge</string>
59-
</property>
60-
</widget>
61-
</item>
62-
<item row="5" column="1" colspan="2">
63-
<layout class="QHBoxLayout" name="horizontalLayout_3">
60+
<item row="6" column="1" colspan="2">
61+
<layout class="QHBoxLayout" name="horizontalLayout_2">
6462
<item>
65-
<widget class="QComboBox" name="cboOrientation">
63+
<widget class="QLabel" name="textLabel1_4">
64+
<property name="text">
65+
<string>Horizontal</string>
66+
</property>
67+
</widget>
68+
</item>
69+
<item>
70+
<widget class="QgsSpinBox" name="spnHorizontal">
6671
<property name="minimumSize">
6772
<size>
68-
<width>150</width>
73+
<width>90</width>
6974
<height>0</height>
7075
</size>
7176
</property>
72-
<item>
73-
<property name="text">
74-
<string>Horizontal</string>
75-
</property>
76-
</item>
77-
<item>
78-
<property name="text">
79-
<string>Vertical</string>
80-
</property>
81-
</item>
77+
<property name="maximumSize">
78+
<size>
79+
<width>16777215</width>
80+
<height>16777215</height>
81+
</size>
82+
</property>
83+
<property name="minimum">
84+
<number>0</number>
85+
</property>
86+
<property name="maximum">
87+
<number>100</number>
88+
</property>
8289
</widget>
8390
</item>
8491
<item>
85-
<spacer name="horizontalSpacer_2">
86-
<property name="orientation">
87-
<enum>Qt::Horizontal</enum>
92+
<widget class="QLabel" name="textLabel1_5">
93+
<property name="text">
94+
<string>Vertical</string>
8895
</property>
89-
<property name="sizeHint" stdset="0">
96+
</widget>
97+
</item>
98+
<item>
99+
<widget class="QgsSpinBox" name="spnVertical">
100+
<property name="minimumSize">
90101
<size>
91-
<width>40</width>
92-
<height>20</height>
102+
<width>90</width>
103+
<height>0</height>
93104
</size>
94105
</property>
95-
</spacer>
106+
<property name="maximumSize">
107+
<size>
108+
<width>16777215</width>
109+
<height>16777215</height>
110+
</size>
111+
</property>
112+
<property name="maximum">
113+
<number>100</number>
114+
</property>
115+
</widget>
116+
</item>
117+
<item>
118+
<widget class="QgsUnitSelectionWidget" name="wgtUnitSelection" native="true">
119+
<property name="focusPolicy">
120+
<enum>Qt::StrongFocus</enum>
121+
</property>
122+
</widget>
96123
</item>
97124
</layout>
98125
</item>
126+
<item row="5" column="1" colspan="2">
127+
<widget class="QComboBox" name="cboPlacement"/>
128+
</item>
99129
<item row="1" column="0" colspan="3">
100130
<widget class="QTextEdit" name="txtCopyrightText">
101131
<property name="html">
102132
<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;
103133
&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;
104134
p, li { white-space: pre-wrap; }
105135
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
106-
&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 2013&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
136+
&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 2016&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
107137
</property>
108138
</widget>
109139
</item>
110140
<item row="5" column="0">
141+
<widget class="QLabel" name="textLabel16">
142+
<property name="maximumSize">
143+
<size>
144+
<width>100</width>
145+
<height>16777215</height>
146+
</size>
147+
</property>
148+
<property name="text">
149+
<string>&amp;Placement</string>
150+
</property>
151+
<property name="buddy">
152+
<cstring>cboPlacement</cstring>
153+
</property>
154+
</widget>
155+
</item>
156+
<item row="6" column="0">
157+
<widget class="QLabel" name="lblMargin">
158+
<property name="minimumSize">
159+
<size>
160+
<width>155</width>
161+
<height>0</height>
162+
</size>
163+
</property>
164+
<property name="text">
165+
<string>Margin from edge</string>
166+
</property>
167+
</widget>
168+
</item>
169+
<item row="3" column="0">
170+
<widget class="QLabel" name="label">
171+
<property name="maximumSize">
172+
<size>
173+
<width>100</width>
174+
<height>16777215</height>
175+
</size>
176+
</property>
177+
<property name="text">
178+
<string>Color</string>
179+
</property>
180+
</widget>
181+
</item>
182+
<item row="4" column="0">
111183
<widget class="QLabel" name="textLabel15">
112184
<property name="maximumSize">
113185
<size>
@@ -123,7 +195,7 @@ p, li { white-space: pre-wrap; }
123195
</property>
124196
</widget>
125197
</item>
126-
<item row="4" column="1" colspan="2">
198+
<item row="3" column="1" colspan="2">
127199
<layout class="QHBoxLayout" name="horizontalLayout">
128200
<item>
129201
<widget class="QgsColorButtonV2" name="pbnColorChooser">
@@ -159,117 +231,46 @@ p, li { white-space: pre-wrap; }
159231
</item>
160232
</layout>
161233
</item>
162-
<item row="3" column="1" colspan="2">
163-
<layout class="QHBoxLayout" name="horizontalLayout_2">
164-
<item>
165-
<widget class="QLabel" name="textLabel1_4">
166-
<property name="text">
167-
<string>Horizontal</string>
168-
</property>
169-
</widget>
170-
</item>
234+
<item row="4" column="1" colspan="2">
235+
<layout class="QHBoxLayout" name="horizontalLayout_3">
171236
<item>
172-
<widget class="QgsSpinBox" name="spnHorizontal">
237+
<widget class="QComboBox" name="cboOrientation">
173238
<property name="minimumSize">
174239
<size>
175-
<width>90</width>
240+
<width>150</width>
176241
<height>0</height>
177242
</size>
178243
</property>
179-
<property name="maximumSize">
180-
<size>
181-
<width>16777215</width>
182-
<height>16777215</height>
183-
</size>
184-
</property>
185-
<property name="minimum">
186-
<number>0</number>
187-
</property>
188-
<property name="maximum">
189-
<number>100</number>
190-
</property>
191-
</widget>
192-
</item>
193-
<item>
194-
<widget class="QLabel" name="textLabel1_5">
195-
<property name="text">
196-
<string>Vertical</string>
197-
</property>
244+
<item>
245+
<property name="text">
246+
<string>Horizontal</string>
247+
</property>
248+
</item>
249+
<item>
250+
<property name="text">
251+
<string>Vertical</string>
252+
</property>
253+
</item>
198254
</widget>
199255
</item>
200256
<item>
201-
<widget class="QgsSpinBox" name="spnVertical">
202-
<property name="minimumSize">
203-
<size>
204-
<width>90</width>
205-
<height>0</height>
206-
</size>
257+
<spacer name="horizontalSpacer_2">
258+
<property name="orientation">
259+
<enum>Qt::Horizontal</enum>
207260
</property>
208-
<property name="maximumSize">
261+
<property name="sizeHint" stdset="0">
209262
<size>
210-
<width>16777215</width>
211-
<height>16777215</height>
263+
<width>40</width>
264+
<height>20</height>
212265
</size>
213266
</property>
214-
<property name="maximum">
215-
<number>100</number>
216-
</property>
217-
</widget>
218-
</item>
219-
<item>
220-
<widget class="QgsUnitSelectionWidget" name="wgtUnitSelection" native="true">
221-
<property name="focusPolicy">
222-
<enum>Qt::StrongFocus</enum>
223-
</property>
224-
</widget>
267+
</spacer>
225268
</item>
226269
</layout>
227270
</item>
228-
<item row="2" column="1" colspan="2">
229-
<widget class="QComboBox" name="cboPlacement"/>
230-
</item>
231-
<item row="4" column="0">
232-
<widget class="QLabel" name="label">
233-
<property name="maximumSize">
234-
<size>
235-
<width>100</width>
236-
<height>16777215</height>
237-
</size>
238-
</property>
239-
<property name="text">
240-
<string>Color</string>
241-
</property>
242-
</widget>
243-
</item>
244-
<item row="2" column="0">
245-
<widget class="QLabel" name="textLabel16">
246-
<property name="maximumSize">
247-
<size>
248-
<width>100</width>
249-
<height>16777215</height>
250-
</size>
251-
</property>
252-
<property name="text">
253-
<string>&amp;Placement</string>
254-
</property>
255-
<property name="buddy">
256-
<cstring>cboPlacement</cstring>
257-
</property>
258-
</widget>
259-
</item>
260271
</layout>
261272
</widget>
262273
</item>
263-
<item row="1" column="0" colspan="2">
264-
<widget class="QDialogButtonBox" name="buttonBox">
265-
<property name="orientation">
266-
<enum>Qt::Horizontal</enum>
267-
</property>
268-
<property name="standardButtons">
269-
<set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok</set>
270-
</property>
271-
</widget>
272-
</item>
273274
</layout>
274275
</widget>
275276
<layoutdefault spacing="6" margin="11"/>
@@ -295,12 +296,13 @@ p, li { white-space: pre-wrap; }
295296
<tabstops>
296297
<tabstop>grpEnable</tabstop>
297298
<tabstop>txtCopyrightText</tabstop>
299+
<tabstop>pbnColorChooser</tabstop>
300+
<tabstop>cboOrientation</tabstop>
298301
<tabstop>cboPlacement</tabstop>
299302
<tabstop>spnHorizontal</tabstop>
300303
<tabstop>spnVertical</tabstop>
301304
<tabstop>wgtUnitSelection</tabstop>
302-
<tabstop>pbnColorChooser</tabstop>
303-
<tabstop>cboOrientation</tabstop>
305+
<tabstop>buttonBox</tabstop>
304306
</tabstops>
305307
<resources/>
306308
<connections/>

0 commit comments

Comments
 (0)