Skip to content

Commit 963d26a

Browse files
author
timlinux
committedOct 3, 2009
User interface cleanups to copyright, delim text and n-arrow plugins
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@11753 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
final-1_7_1final-1_7_0
1 parent 89347b4 commit 963d26a

File tree

4 files changed

+461
-797
lines changed

4 files changed

+461
-797
lines changed
 

‎src/plugins/copyright_label/pluginguibase.ui

Lines changed: 92 additions & 215 deletions
Original file line numberDiff line numberDiff line change
@@ -13,264 +13,132 @@
1313
<string>Copyright Label Plugin</string>
1414
</property>
1515
<property name="windowIcon" >
16-
<iconset>
17-
<normaloff/>
18-
</iconset>
16+
<iconset/>
1917
</property>
2018
<layout class="QGridLayout" >
21-
<property name="leftMargin" >
22-
<number>9</number>
23-
</property>
24-
<property name="topMargin" >
25-
<number>9</number>
26-
</property>
27-
<property name="rightMargin" >
28-
<number>9</number>
29-
</property>
30-
<property name="bottomMargin" >
31-
<number>9</number>
32-
</property>
33-
<property name="horizontalSpacing" >
34-
<number>6</number>
35-
</property>
36-
<property name="verticalSpacing" >
37-
<number>6</number>
38-
</property>
39-
<item row="3" column="2" >
40-
<layout class="QHBoxLayout" >
41-
<property name="spacing" >
42-
<number>6</number>
43-
</property>
44-
<property name="leftMargin" >
45-
<number>0</number>
46-
</property>
47-
<property name="topMargin" >
48-
<number>0</number>
49-
</property>
50-
<property name="rightMargin" >
51-
<number>0</number>
52-
</property>
53-
<property name="bottomMargin" >
54-
<number>0</number>
55-
</property>
56-
<item>
57-
<widget class="QLabel" name="label" >
58-
<property name="text" >
59-
<string>Color</string>
60-
</property>
61-
</widget>
62-
</item>
63-
<item>
64-
<widget class="QgsColorButton" name="pbnColorChooser" >
65-
<property name="sizePolicy" >
66-
<sizepolicy vsizetype="Expanding" hsizetype="Fixed" >
67-
<horstretch>0</horstretch>
68-
<verstretch>0</verstretch>
69-
</sizepolicy>
70-
</property>
71-
<property name="minimumSize" >
72-
<size>
73-
<width>100</width>
74-
<height>0</height>
75-
</size>
76-
</property>
77-
</widget>
78-
</item>
79-
<item>
80-
<spacer>
81-
<property name="orientation" >
82-
<enum>Qt::Horizontal</enum>
83-
</property>
84-
<property name="sizeHint" >
85-
<size>
86-
<width>40</width>
87-
<height>20</height>
88-
</size>
89-
</property>
90-
</spacer>
91-
</item>
92-
</layout>
93-
</item>
94-
<item row="0" column="2" >
19+
<item row="0" column="0" colspan="4" >
9520
<widget class="QTextEdit" name="textEdit3" >
9621
<property name="readOnly" >
9722
<bool>true</bool>
9823
</property>
9924
<property name="html" >
10025
<string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
10126
p, li { white-space: pre-wrap; }
102-
&lt;/style>&lt;/head>&lt;body style=" font-family:'Verdana'; font-size:10pt; font-weight:400; font-style:normal;">
103-
&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;">&lt;span style=" font-size:12pt;">Description&lt;/span>&lt;/p>
104-
&lt;p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;">&lt;/p>
105-
&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;">Enter your copyright label below. This plugin supports basic html markup tags for formatting the label. For example:&lt;/p>
106-
&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;">&lt;span style=" font-weight:600;">&amp;lt;B&amp;gt; Bold text &amp;lt;/B&amp;gt; &lt;/span>&lt;/p>
107-
&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt; font-weight:600;">&lt;span style=" font-weight:400; font-style:italic;">&amp;lt;I&amp;gt; Italics &amp;lt;/I&amp;gt;&lt;/span>&lt;/p>
108-
&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt; font-style:italic;">&lt;span style=" font-style:normal;">(note: &amp;amp;copy; gives a copyright symbol)&lt;/span>&lt;/p>&lt;/body>&lt;/html></string>
27+
&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;">
28+
&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt;">&lt;span style=" font-size:12pt;">Description&lt;/span>&lt;/p>
29+
&lt;p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt;">&lt;/p>
30+
&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt;">Enter your copyright label below. This plugin supports basic html markup tags for formatting the label. For example:&lt;/p>
31+
&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt;">&lt;span style=" font-weight:600;">&amp;lt;b&amp;gt; Bold text &amp;lt;/b&amp;gt; &lt;/span>&lt;/p>
32+
&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt; font-weight:600;">&lt;span style=" font-weight:400; font-style:italic;">&amp;lt;i&amp;gt; Italics &amp;lt;/i&amp;gt;&lt;/span>&lt;/p>
33+
&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt; font-style:italic;">&lt;span style=" font-style:normal;">(note: &amp;amp;copy; gives a copyright symbol)&lt;/span>&lt;/p>&lt;/body>&lt;/html></string>
10934
</property>
11035
</widget>
11136
</item>
112-
<item row="4" column="2" >
113-
<layout class="QHBoxLayout" >
114-
<property name="spacing" >
115-
<number>6</number>
116-
</property>
117-
<property name="leftMargin" >
118-
<number>0</number>
119-
</property>
120-
<property name="topMargin" >
121-
<number>0</number>
122-
</property>
123-
<property name="rightMargin" >
124-
<number>0</number>
125-
</property>
126-
<property name="bottomMargin" >
127-
<number>0</number>
128-
</property>
129-
<item>
130-
<spacer>
131-
<property name="orientation" >
132-
<enum>Qt::Horizontal</enum>
133-
</property>
134-
<property name="sizeType" >
135-
<enum>QSizePolicy::Expanding</enum>
136-
</property>
137-
<property name="sizeHint" >
138-
<size>
139-
<width>131</width>
140-
<height>20</height>
141-
</size>
142-
</property>
143-
</spacer>
144-
</item>
145-
<item>
146-
<widget class="QCheckBox" name="cboxEnabled" >
147-
<property name="text" >
148-
<string>Enable Copyright Label</string>
149-
</property>
150-
<property name="checked" >
151-
<bool>true</bool>
152-
</property>
153-
</widget>
154-
</item>
155-
</layout>
156-
</item>
157-
<item row="1" column="2" >
37+
<item row="1" column="0" colspan="4" >
15838
<widget class="QTextEdit" name="txtCopyrightText" >
15939
<property name="html" >
16040
<string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
16141
p, li { white-space: pre-wrap; }
162-
&lt;/style>&lt;/head>&lt;body style=" font-family:'Verdana'; font-size:10pt; font-weight:400; font-style:normal;">
163-
&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">© QGIS 2009&lt;/p>&lt;/body>&lt;/html></string>
42+
&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;">
43+
&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Verdana';">© QGIS 2009&lt;/p>&lt;/body>&lt;/html></string>
16444
</property>
16545
</widget>
16646
</item>
167-
<item row="2" column="2" >
168-
<layout class="QHBoxLayout" >
169-
<property name="spacing" >
170-
<number>6</number>
171-
</property>
172-
<property name="leftMargin" >
173-
<number>0</number>
174-
</property>
175-
<property name="topMargin" >
176-
<number>0</number>
47+
<item row="2" column="0" >
48+
<widget class="QLabel" name="textLabel16" >
49+
<property name="text" >
50+
<string>Placement</string>
17751
</property>
178-
<property name="rightMargin" >
179-
<number>0</number>
180-
</property>
181-
<property name="bottomMargin" >
182-
<number>0</number>
52+
<property name="buddy" >
53+
<cstring>cboPlacement</cstring>
18354
</property>
55+
</widget>
56+
</item>
57+
<item row="2" column="1" >
58+
<widget class="QComboBox" name="cboPlacement" >
18459
<item>
185-
<widget class="QLabel" name="textLabel16" >
186-
<property name="text" >
187-
<string>Placement</string>
188-
</property>
189-
</widget>
60+
<property name="text" >
61+
<string>Bottom Left</string>
62+
</property>
19063
</item>
19164
<item>
192-
<widget class="QComboBox" name="cboPlacement" >
193-
<item>
194-
<property name="text" >
195-
<string>Bottom Left</string>
196-
</property>
197-
</item>
198-
<item>
199-
<property name="text" >
200-
<string>Top Left</string>
201-
</property>
202-
</item>
203-
<item>
204-
<property name="text" >
205-
<string>Bottom Right</string>
206-
</property>
207-
</item>
208-
<item>
209-
<property name="text" >
210-
<string>Top Right</string>
211-
</property>
212-
</item>
213-
</widget>
65+
<property name="text" >
66+
<string>Top Left</string>
67+
</property>
21468
</item>
21569
<item>
216-
<widget class="QLabel" name="textLabel15" >
217-
<property name="text" >
218-
<string>Orientation</string>
219-
</property>
220-
</widget>
70+
<property name="text" >
71+
<string>Bottom Right</string>
72+
</property>
22173
</item>
22274
<item>
223-
<widget class="QComboBox" name="cboOrientation" >
224-
<item>
225-
<property name="text" >
226-
<string>Horizontal</string>
227-
</property>
228-
</item>
229-
<item>
230-
<property name="text" >
231-
<string>Vertical</string>
232-
</property>
233-
</item>
234-
</widget>
75+
<property name="text" >
76+
<string>Top Right</string>
77+
</property>
23578
</item>
236-
</layout>
79+
</widget>
23780
</item>
238-
<item rowspan="5" row="0" column="1" >
239-
<widget class="Line" name="line1" >
240-
<property name="maximumSize" >
241-
<size>
242-
<width>2</width>
243-
<height>32767</height>
244-
</size>
81+
<item row="2" column="2" >
82+
<widget class="QLabel" name="textLabel15" >
83+
<property name="text" >
84+
<string>Orientation</string>
24585
</property>
246-
<property name="frameShape" >
247-
<enum>QFrame::VLine</enum>
86+
<property name="buddy" >
87+
<cstring>cboOrientation</cstring>
24888
</property>
249-
<property name="frameShadow" >
250-
<enum>QFrame::Sunken</enum>
89+
</widget>
90+
</item>
91+
<item row="2" column="3" >
92+
<widget class="QComboBox" name="cboOrientation" >
93+
<item>
94+
<property name="text" >
95+
<string>Horizontal</string>
96+
</property>
97+
</item>
98+
<item>
99+
<property name="text" >
100+
<string>Vertical</string>
101+
</property>
102+
</item>
103+
</widget>
104+
</item>
105+
<item row="3" column="0" >
106+
<widget class="QLabel" name="label" >
107+
<property name="text" >
108+
<string>Color</string>
251109
</property>
252-
<property name="orientation" >
253-
<enum>Qt::Vertical</enum>
110+
<property name="buddy" >
111+
<cstring>pbnColorChooser</cstring>
254112
</property>
255113
</widget>
256114
</item>
257-
<item rowspan="5" row="0" column="0" >
258-
<widget class="QLabel" name="pixmapLabel2" >
259-
<property name="maximumSize" >
115+
<item row="3" column="1" >
116+
<widget class="QgsColorButton" name="pbnColorChooser" >
117+
<property name="sizePolicy" >
118+
<sizepolicy vsizetype="Expanding" hsizetype="Fixed" >
119+
<horstretch>0</horstretch>
120+
<verstretch>0</verstretch>
121+
</sizepolicy>
122+
</property>
123+
<property name="minimumSize" >
260124
<size>
261-
<width>150</width>
262-
<height>32767</height>
125+
<width>100</width>
126+
<height>0</height>
263127
</size>
264128
</property>
265-
<property name="pixmap" >
266-
<pixmap resource="copyright_plugin.qrc" >:/copyright.png</pixmap>
129+
</widget>
130+
</item>
131+
<item row="3" column="2" colspan="2" >
132+
<widget class="QCheckBox" name="cboxEnabled" >
133+
<property name="text" >
134+
<string>Enable copyright label</string>
267135
</property>
268-
<property name="scaledContents" >
269-
<bool>false</bool>
136+
<property name="checked" >
137+
<bool>true</bool>
270138
</property>
271139
</widget>
272140
</item>
273-
<item row="5" column="0" colspan="3" >
141+
<item row="4" column="0" colspan="4" >
274142
<widget class="QDialogButtonBox" name="buttonBox" >
275143
<property name="orientation" >
276144
<enum>Qt::Horizontal</enum>
@@ -290,6 +158,15 @@ p, li { white-space: pre-wrap; }
290158
<header>qgscolorbutton.h</header>
291159
</customwidget>
292160
</customwidgets>
161+
<tabstops>
162+
<tabstop>textEdit3</tabstop>
163+
<tabstop>txtCopyrightText</tabstop>
164+
<tabstop>cboPlacement</tabstop>
165+
<tabstop>cboOrientation</tabstop>
166+
<tabstop>pbnColorChooser</tabstop>
167+
<tabstop>cboxEnabled</tabstop>
168+
<tabstop>buttonBox</tabstop>
169+
</tabstops>
293170
<resources>
294171
<include location="copyright_plugin.qrc" />
295172
</resources>

‎src/plugins/delimited_text/qgsdelimitedtextpluginguibase.ui

Lines changed: 242 additions & 361 deletions
Original file line numberDiff line numberDiff line change
@@ -5,38 +5,18 @@
55
<rect>
66
<x>0</x>
77
<y>0</y>
8-
<width>701</width>
8+
<width>522</width>
99
<height>547</height>
1010
</rect>
1111
</property>
1212
<property name="windowTitle" >
1313
<string>Create a Layer from a Delimited Text File</string>
1414
</property>
1515
<property name="windowIcon" >
16-
<iconset>
17-
<normaloff/>
18-
</iconset>
16+
<iconset/>
1917
</property>
2018
<layout class="QGridLayout" >
21-
<property name="leftMargin" >
22-
<number>9</number>
23-
</property>
24-
<property name="topMargin" >
25-
<number>9</number>
26-
</property>
27-
<property name="rightMargin" >
28-
<number>9</number>
29-
</property>
30-
<property name="bottomMargin" >
31-
<number>9</number>
32-
</property>
33-
<property name="horizontalSpacing" >
34-
<number>6</number>
35-
</property>
36-
<property name="verticalSpacing" >
37-
<number>6</number>
38-
</property>
39-
<item row="0" column="0" colspan="3" >
19+
<item row="0" column="0" colspan="7" >
4020
<widget class="QLabel" name="txtHeading" >
4121
<property name="font" >
4222
<font>
@@ -57,371 +37,267 @@
5737
</property>
5838
</widget>
5939
</item>
60-
<item row="1" column="2" >
40+
<item row="1" column="0" colspan="7" >
6141
<widget class="QTextEdit" name="teInstructions" >
6242
<property name="readOnly" >
6343
<bool>true</bool>
6444
</property>
6545
<property name="html" >
6646
<string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
6747
p, li { white-space: pre-wrap; }
68-
&lt;/style>&lt;/head>&lt;body style=" font-family:'Verdana'; font-size:10pt; font-weight:400; font-style:normal;">
69-
&lt;p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;/p>&lt;/body>&lt;/html></string>
48+
&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;">
49+
&lt;p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Verdana';">&lt;/p>&lt;/body>&lt;/html></string>
7050
</property>
7151
</widget>
7252
</item>
73-
<item row="5" column="2" >
74-
<layout class="QHBoxLayout" >
75-
<property name="spacing" >
76-
<number>6</number>
77-
</property>
78-
<property name="leftMargin" >
79-
<number>0</number>
80-
</property>
81-
<property name="topMargin" >
82-
<number>0</number>
83-
</property>
84-
<property name="rightMargin" >
85-
<number>0</number>
86-
</property>
87-
<property name="bottomMargin" >
88-
<number>0</number>
89-
</property>
90-
<item>
91-
<widget class="QLabel" name="textLabel2" >
92-
<property name="text" >
93-
<string>&lt;p align="right">X field&lt;/p></string>
94-
</property>
95-
</widget>
96-
</item>
97-
<item>
98-
<widget class="QComboBox" name="cmbXField" >
99-
<property name="sizePolicy" >
100-
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
101-
<horstretch>0</horstretch>
102-
<verstretch>0</verstretch>
103-
</sizepolicy>
104-
</property>
105-
<property name="minimumSize" >
106-
<size>
107-
<width>120</width>
108-
<height>0</height>
109-
</size>
110-
</property>
111-
<property name="toolTip" >
112-
<string>Name of the field containing x values</string>
113-
</property>
114-
<property name="whatsThis" >
115-
<string>Name of the field containing x values. Choose a field from the list. The list is generated by parsing the header row of the delimited text file.</string>
116-
</property>
117-
<property name="editable" >
118-
<bool>true</bool>
119-
</property>
120-
</widget>
121-
</item>
122-
<item>
123-
<widget class="QLabel" name="textLabel2_2" >
124-
<property name="text" >
125-
<string>&lt;p align="right">Y field&lt;/p></string>
126-
</property>
127-
</widget>
128-
</item>
129-
<item>
130-
<widget class="QComboBox" name="cmbYField" >
131-
<property name="sizePolicy" >
132-
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
133-
<horstretch>0</horstretch>
134-
<verstretch>0</verstretch>
135-
</sizepolicy>
136-
</property>
137-
<property name="minimumSize" >
138-
<size>
139-
<width>120</width>
140-
<height>0</height>
141-
</size>
142-
</property>
143-
<property name="toolTip" >
144-
<string>Name of the field containing y values</string>
145-
</property>
146-
<property name="whatsThis" >
147-
<string>Name of the field containing y values. Choose a field from the list. The list is generated by parsing the header row of the delimited text file.</string>
148-
</property>
149-
<property name="editable" >
150-
<bool>true</bool>
151-
</property>
152-
</widget>
153-
</item>
154-
</layout>
53+
<item row="2" column="0" >
54+
<widget class="QLabel" name="textLabel1" >
55+
<property name="sizePolicy" >
56+
<sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
57+
<horstretch>0</horstretch>
58+
<verstretch>0</verstretch>
59+
</sizepolicy>
60+
</property>
61+
<property name="text" >
62+
<string>Delimited text file</string>
63+
</property>
64+
<property name="buddy" >
65+
<cstring>txtFilePath</cstring>
66+
</property>
67+
</widget>
15568
</item>
156-
<item row="2" column="2" >
157-
<layout class="QHBoxLayout" >
158-
<property name="spacing" >
159-
<number>6</number>
160-
</property>
161-
<property name="leftMargin" >
162-
<number>0</number>
163-
</property>
164-
<property name="topMargin" >
165-
<number>0</number>
166-
</property>
167-
<property name="rightMargin" >
168-
<number>0</number>
169-
</property>
170-
<property name="bottomMargin" >
171-
<number>0</number>
172-
</property>
173-
<item>
174-
<widget class="QLabel" name="textLabel1" >
175-
<property name="text" >
176-
<string>Delimited text file</string>
177-
</property>
178-
</widget>
179-
</item>
180-
<item>
181-
<widget class="QgsFileDropEdit" name="txtFilePath" >
182-
<property name="toolTip" >
183-
<string>Full path to the delimited text file</string>
184-
</property>
185-
<property name="whatsThis" >
186-
<string>Full path to the delimited text file. In order to properly parse the fields in the file, the delimiter must be defined prior to entering the file name. Use the Browse button to the right of this field to choose the input file.</string>
187-
</property>
188-
<property name="readOnly" >
189-
<bool>true</bool>
190-
</property>
191-
</widget>
192-
</item>
193-
<item>
194-
<widget class="QPushButton" name="btnBrowseForFile" >
195-
<property name="enabled" >
196-
<bool>true</bool>
197-
</property>
198-
<property name="toolTip" >
199-
<string>Browse to find the delimited text file to be processed</string>
200-
</property>
201-
<property name="whatsThis" >
202-
<string>Use this button to browse to the location of the delimited text file. This button will not be enabled until a delimiter has been entered in the &lt;i>Delimiter&lt;/i> box. Once a file is chosen, the X and Y field drop-down boxes will be populated with the fields from the delimited text file.</string>
203-
</property>
204-
<property name="text" >
205-
<string>Browse...</string>
206-
</property>
207-
</widget>
208-
</item>
209-
</layout>
69+
<item row="2" column="1" colspan="5" >
70+
<widget class="QgsFileDropEdit" name="txtFilePath" >
71+
<property name="toolTip" >
72+
<string>Full path to the delimited text file</string>
73+
</property>
74+
<property name="whatsThis" >
75+
<string>Full path to the delimited text file. In order to properly parse the fields in the file, the delimiter must be defined prior to entering the file name. Use the Browse button to the right of this field to choose the input file.</string>
76+
</property>
77+
<property name="readOnly" >
78+
<bool>true</bool>
79+
</property>
80+
</widget>
21081
</item>
211-
<item row="3" column="2" >
212-
<layout class="QHBoxLayout" >
213-
<property name="spacing" >
214-
<number>6</number>
215-
</property>
216-
<property name="leftMargin" >
217-
<number>0</number>
218-
</property>
219-
<property name="topMargin" >
220-
<number>0</number>
221-
</property>
222-
<property name="rightMargin" >
223-
<number>0</number>
224-
</property>
225-
<property name="bottomMargin" >
226-
<number>0</number>
227-
</property>
228-
<item>
229-
<widget class="QLabel" name="textLabel1_2" >
230-
<property name="text" >
231-
<string>Layer name</string>
232-
</property>
233-
</widget>
234-
</item>
235-
<item>
236-
<widget class="QLineEdit" name="txtLayerName" >
237-
<property name="toolTip" >
238-
<string>Name to display in the map legend</string>
239-
</property>
240-
<property name="whatsThis" >
241-
<string>Name displayed in the map legend</string>
242-
</property>
243-
</widget>
244-
</item>
245-
<item>
246-
<spacer>
247-
<property name="orientation" >
248-
<enum>Qt::Horizontal</enum>
249-
</property>
250-
<property name="sizeType" >
251-
<enum>QSizePolicy::Fixed</enum>
252-
</property>
253-
<property name="sizeHint" >
254-
<size>
255-
<width>20</width>
256-
<height>21</height>
257-
</size>
258-
</property>
259-
</spacer>
260-
</item>
261-
</layout>
82+
<item row="2" column="6" >
83+
<widget class="QPushButton" name="btnBrowseForFile" >
84+
<property name="enabled" >
85+
<bool>true</bool>
86+
</property>
87+
<property name="toolTip" >
88+
<string>Browse to find the delimited text file to be processed</string>
89+
</property>
90+
<property name="whatsThis" >
91+
<string>Use this button to browse to the location of the delimited text file. This button will not be enabled until a delimiter has been entered in the &lt;i>Delimiter&lt;/i> box. Once a file is chosen, the X and Y field drop-down boxes will be populated with the fields from the delimited text file.</string>
92+
</property>
93+
<property name="text" >
94+
<string>...</string>
95+
</property>
96+
</widget>
26297
</item>
263-
<item row="7" column="2" >
264-
<widget class="QDialogButtonBox" name="buttonBox" >
265-
<property name="orientation" >
266-
<enum>Qt::Horizontal</enum>
98+
<item row="3" column="0" >
99+
<widget class="QLabel" name="textLabel1_2" >
100+
<property name="sizePolicy" >
101+
<sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
102+
<horstretch>0</horstretch>
103+
<verstretch>0</verstretch>
104+
</sizepolicy>
267105
</property>
268-
<property name="standardButtons" >
269-
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
106+
<property name="text" >
107+
<string>Layer name</string>
108+
</property>
109+
<property name="buddy" >
110+
<cstring>txtLayerName</cstring>
270111
</property>
271112
</widget>
272113
</item>
273-
<item rowspan="7" row="1" column="0" >
274-
<widget class="QLabel" name="pixmapLabel1" >
275-
<property name="pixmap" >
276-
<pixmap resource="delimited_text.qrc" >:/delimited_text.png</pixmap>
114+
<item row="3" column="1" colspan="6" >
115+
<widget class="QLineEdit" name="txtLayerName" >
116+
<property name="toolTip" >
117+
<string>Name to display in the map legend</string>
277118
</property>
278-
<property name="scaledContents" >
279-
<bool>false</bool>
119+
<property name="whatsThis" >
120+
<string>Name displayed in the map legend</string>
280121
</property>
281122
</widget>
282123
</item>
283-
<item row="6" column="2" >
284-
<widget class="QGroupBox" name="groupBox" >
285-
<property name="title" >
286-
<string>Sample text</string>
124+
<item row="4" column="0" >
125+
<widget class="QLabel" name="textLabel3" >
126+
<property name="sizePolicy" >
127+
<sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
128+
<horstretch>0</horstretch>
129+
<verstretch>0</verstretch>
130+
</sizepolicy>
131+
</property>
132+
<property name="text" >
133+
<string>Delimiter</string>
134+
</property>
135+
<property name="buddy" >
136+
<cstring>txtDelimiter</cstring>
287137
</property>
288-
<layout class="QGridLayout" >
289-
<property name="leftMargin" >
290-
<number>9</number>
291-
</property>
292-
<property name="topMargin" >
293-
<number>9</number>
294-
</property>
295-
<property name="rightMargin" >
296-
<number>9</number>
297-
</property>
298-
<property name="bottomMargin" >
299-
<number>9</number>
300-
</property>
301-
<property name="horizontalSpacing" >
302-
<number>6</number>
303-
</property>
304-
<property name="verticalSpacing" >
305-
<number>6</number>
306-
</property>
307-
<item row="0" column="0" >
308-
<widget class="QTextEdit" name="txtSample" >
309-
<property name="readOnly" >
310-
<bool>true</bool>
311-
</property>
312-
</widget>
313-
</item>
314-
</layout>
315138
</widget>
316139
</item>
317-
<item rowspan="7" row="1" column="1" >
318-
<widget class="Line" name="line1" >
319-
<property name="frameShape" >
320-
<enum>QFrame::VLine</enum>
140+
<item row="4" column="1" colspan="6" >
141+
<widget class="QLineEdit" name="txtDelimiter" >
142+
<property name="sizePolicy" >
143+
<sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
144+
<horstretch>0</horstretch>
145+
<verstretch>0</verstretch>
146+
</sizepolicy>
147+
</property>
148+
<property name="maximumSize" >
149+
<size>
150+
<width>32767</width>
151+
<height>32767</height>
152+
</size>
153+
</property>
154+
<property name="toolTip" >
155+
<string>Delimiter to use when splitting fields in the text file. The delimiter can be more than one character.</string>
156+
</property>
157+
<property name="whatsThis" >
158+
<string>Delimiter to use when splitting fields in the delimited text file. The delimiter can be 1 or more characters in length.</string>
321159
</property>
322-
<property name="frameShadow" >
323-
<enum>QFrame::Sunken</enum>
160+
</widget>
161+
</item>
162+
<item row="5" column="0" colspan="2" >
163+
<widget class="QLabel" name="label_2" >
164+
<property name="text" >
165+
<string>Delimeter type</string>
324166
</property>
325-
<property name="orientation" >
326-
<enum>Qt::Vertical</enum>
167+
<property name="buddy" >
168+
<cstring>delimiterPlain</cstring>
169+
</property>
170+
</widget>
171+
</item>
172+
<item row="5" column="2" colspan="3" >
173+
<widget class="QRadioButton" name="delimiterPlain" >
174+
<property name="toolTip" >
175+
<string>The delimiter is taken as is</string>
176+
</property>
177+
<property name="whatsThis" >
178+
<string>The delimiter is taken as is</string>
179+
</property>
180+
<property name="text" >
181+
<string>Plain characters</string>
182+
</property>
183+
</widget>
184+
</item>
185+
<item row="5" column="5" colspan="2" >
186+
<widget class="QRadioButton" name="delimiterRegexp" >
187+
<property name="toolTip" >
188+
<string>The delimiter is a regular expression</string>
189+
</property>
190+
<property name="whatsThis" >
191+
<string>The delimiter is a regular expression</string>
192+
</property>
193+
<property name="text" >
194+
<string>Regular expression</string>
327195
</property>
328196
</widget>
329197
</item>
330-
<item row="4" column="2" >
331-
<layout class="QHBoxLayout" >
332-
<property name="spacing" >
333-
<number>6</number>
334-
</property>
335-
<property name="leftMargin" >
336-
<number>0</number>
337-
</property>
338-
<property name="topMargin" >
339-
<number>0</number>
340-
</property>
341-
<property name="rightMargin" >
342-
<number>0</number>
343-
</property>
344-
<property name="bottomMargin" >
345-
<number>0</number>
346-
</property>
347-
<item>
348-
<widget class="QLabel" name="textLabel3" >
349-
<property name="sizePolicy" >
350-
<sizepolicy vsizetype="Preferred" hsizetype="Minimum" >
351-
<horstretch>0</horstretch>
352-
<verstretch>0</verstretch>
353-
</sizepolicy>
354-
</property>
355-
<property name="text" >
356-
<string>Delimiter</string>
357-
</property>
358-
</widget>
359-
</item>
360-
<item>
361-
<widget class="QLineEdit" name="txtDelimiter" >
362-
<property name="sizePolicy" >
363-
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
364-
<horstretch>0</horstretch>
365-
<verstretch>0</verstretch>
366-
</sizepolicy>
367-
</property>
368-
<property name="maximumSize" >
369-
<size>
370-
<width>32767</width>
371-
<height>32767</height>
372-
</size>
373-
</property>
374-
<property name="toolTip" >
375-
<string>Delimiter to use when splitting fields in the text file. The delimiter can be more than one character.</string>
376-
</property>
377-
<property name="whatsThis" >
378-
<string>Delimiter to use when splitting fields in the delimited text file. The delimiter can be 1 or more characters in length.</string>
379-
</property>
380-
</widget>
381-
</item>
382-
<item>
383-
<widget class="QRadioButton" name="delimiterPlain" >
384-
<property name="toolTip" >
385-
<string>The delimiter is taken as is</string>
386-
</property>
387-
<property name="whatsThis" >
388-
<string>The delimiter is taken as is</string>
389-
</property>
390-
<property name="text" >
391-
<string>Plain characters</string>
392-
</property>
393-
</widget>
394-
</item>
395-
<item>
396-
<widget class="QRadioButton" name="delimiterRegexp" >
397-
<property name="toolTip" >
398-
<string>The delimiter is a regular expression</string>
399-
</property>
400-
<property name="whatsThis" >
401-
<string>The delimiter is a regular expression</string>
402-
</property>
403-
<property name="text" >
404-
<string>Regular expression</string>
405-
</property>
406-
</widget>
407-
</item>
408-
<item>
409-
<spacer>
410-
<property name="orientation" >
411-
<enum>Qt::Horizontal</enum>
412-
</property>
413-
<property name="sizeType" >
414-
<enum>QSizePolicy::Minimum</enum>
415-
</property>
416-
<property name="sizeHint" >
417-
<size>
418-
<width>61</width>
419-
<height>20</height>
420-
</size>
421-
</property>
422-
</spacer>
423-
</item>
424-
</layout>
198+
<item row="6" column="0" >
199+
<widget class="QLabel" name="label_3" >
200+
<property name="text" >
201+
<string>Geometry</string>
202+
</property>
203+
</widget>
204+
</item>
205+
<item row="6" column="1" colspan="2" >
206+
<widget class="QLabel" name="textLabel2" >
207+
<property name="text" >
208+
<string>&lt;p align="right">X field&lt;/p></string>
209+
</property>
210+
<property name="buddy" >
211+
<cstring>cmbXField</cstring>
212+
</property>
213+
</widget>
214+
</item>
215+
<item row="6" column="3" >
216+
<widget class="QComboBox" name="cmbXField" >
217+
<property name="sizePolicy" >
218+
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
219+
<horstretch>0</horstretch>
220+
<verstretch>0</verstretch>
221+
</sizepolicy>
222+
</property>
223+
<property name="minimumSize" >
224+
<size>
225+
<width>120</width>
226+
<height>0</height>
227+
</size>
228+
</property>
229+
<property name="toolTip" >
230+
<string>Name of the field containing x values</string>
231+
</property>
232+
<property name="whatsThis" >
233+
<string>Name of the field containing x values. Choose a field from the list. The list is generated by parsing the header row of the delimited text file.</string>
234+
</property>
235+
<property name="editable" >
236+
<bool>true</bool>
237+
</property>
238+
</widget>
239+
</item>
240+
<item row="6" column="4" >
241+
<widget class="QLabel" name="textLabel2_2" >
242+
<property name="text" >
243+
<string>&lt;p align="right">Y field&lt;/p></string>
244+
</property>
245+
<property name="buddy" >
246+
<cstring>cmbYField</cstring>
247+
</property>
248+
</widget>
249+
</item>
250+
<item row="6" column="5" colspan="2" >
251+
<widget class="QComboBox" name="cmbYField" >
252+
<property name="sizePolicy" >
253+
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
254+
<horstretch>0</horstretch>
255+
<verstretch>0</verstretch>
256+
</sizepolicy>
257+
</property>
258+
<property name="minimumSize" >
259+
<size>
260+
<width>120</width>
261+
<height>0</height>
262+
</size>
263+
</property>
264+
<property name="toolTip" >
265+
<string>Name of the field containing y values</string>
266+
</property>
267+
<property name="whatsThis" >
268+
<string>Name of the field containing y values. Choose a field from the list. The list is generated by parsing the header row of the delimited text file.</string>
269+
</property>
270+
<property name="editable" >
271+
<bool>true</bool>
272+
</property>
273+
</widget>
274+
</item>
275+
<item row="7" column="0" >
276+
<widget class="QLabel" name="label" >
277+
<property name="text" >
278+
<string>Sample text</string>
279+
</property>
280+
<property name="buddy" >
281+
<cstring>txtSample</cstring>
282+
</property>
283+
</widget>
284+
</item>
285+
<item row="8" column="0" colspan="7" >
286+
<widget class="QTextEdit" name="txtSample" >
287+
<property name="readOnly" >
288+
<bool>true</bool>
289+
</property>
290+
</widget>
291+
</item>
292+
<item row="9" column="0" colspan="7" >
293+
<widget class="QDialogButtonBox" name="buttonBox" >
294+
<property name="orientation" >
295+
<enum>Qt::Horizontal</enum>
296+
</property>
297+
<property name="standardButtons" >
298+
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
299+
</property>
300+
</widget>
425301
</item>
426302
</layout>
427303
</widget>
@@ -434,12 +310,17 @@ p, li { white-space: pre-wrap; }
434310
</customwidget>
435311
</customwidgets>
436312
<tabstops>
437-
<tabstop>txtLayerName</tabstop>
438-
<tabstop>txtDelimiter</tabstop>
313+
<tabstop>teInstructions</tabstop>
439314
<tabstop>txtFilePath</tabstop>
440315
<tabstop>btnBrowseForFile</tabstop>
316+
<tabstop>txtLayerName</tabstop>
317+
<tabstop>txtDelimiter</tabstop>
318+
<tabstop>delimiterPlain</tabstop>
319+
<tabstop>delimiterRegexp</tabstop>
441320
<tabstop>cmbXField</tabstop>
442321
<tabstop>cmbYField</tabstop>
322+
<tabstop>txtSample</tabstop>
323+
<tabstop>buttonBox</tabstop>
443324
</tabstops>
444325
<resources>
445326
<include location="delimited_text.qrc" />

‎src/plugins/north_arrow/plugingui.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ QgsNorthArrowPluginGui::QgsNorthArrowPluginGui( QWidget* parent, Qt::WFlags fl )
2222
: QDialog( parent, fl )
2323
{
2424
setupUi( this );
25-
//temporary hack until this is implemented
26-
tabNorthArrowOptions->removeTab( tabNorthArrowOptions->indexOf( tabIcon ) );
2725
}
2826

2927
QgsNorthArrowPluginGui::~QgsNorthArrowPluginGui()

‎src/plugins/north_arrow/pluginguibase.ui

Lines changed: 127 additions & 219 deletions
Original file line numberDiff line numberDiff line change
@@ -5,219 +5,21 @@
55
<rect>
66
<x>0</x>
77
<y>0</y>
8-
<width>457</width>
9-
<height>424</height>
8+
<width>433</width>
9+
<height>387</height>
1010
</rect>
1111
</property>
1212
<property name="windowTitle" >
1313
<string>North Arrow Plugin</string>
1414
</property>
1515
<property name="windowIcon" >
16-
<iconset>
17-
<normaloff/>
18-
</iconset>
16+
<iconset/>
1917
</property>
2018
<layout class="QGridLayout" >
21-
<property name="margin" >
22-
<number>9</number>
23-
</property>
24-
<property name="spacing" >
25-
<number>6</number>
26-
</property>
27-
<item row="1" column="2" >
28-
<widget class="QTabWidget" name="tabNorthArrowOptions" >
29-
<property name="enabled" >
30-
<bool>true</bool>
31-
</property>
32-
<property name="tabShape" >
33-
<enum>QTabWidget::Rounded</enum>
34-
</property>
35-
<widget class="QWidget" name="tabProperties" >
36-
<attribute name="title" >
37-
<string>Properties</string>
38-
</attribute>
39-
<layout class="QVBoxLayout" >
40-
<property name="margin" >
41-
<number>0</number>
42-
</property>
43-
<property name="spacing" >
44-
<number>6</number>
45-
</property>
46-
<item>
47-
<layout class="QGridLayout" >
48-
<property name="margin" >
49-
<number>0</number>
50-
</property>
51-
<property name="spacing" >
52-
<number>6</number>
53-
</property>
54-
<item row="1" column="0" >
55-
<widget class="QLabel" name="textLabel6" >
56-
<property name="text" >
57-
<string>Angle</string>
58-
</property>
59-
</widget>
60-
</item>
61-
<item row="2" column="0" >
62-
<widget class="QLabel" name="textLabel8" >
63-
<property name="text" >
64-
<string>Placement</string>
65-
</property>
66-
</widget>
67-
</item>
68-
<item row="4" column="1" >
69-
<widget class="QCheckBox" name="cboxAutomatic" >
70-
<property name="toolTip" >
71-
<string/>
72-
</property>
73-
<property name="whatsThis" >
74-
<string/>
75-
</property>
76-
<property name="text" >
77-
<string>Set direction automatically</string>
78-
</property>
79-
<property name="checked" >
80-
<bool>true</bool>
81-
</property>
82-
</widget>
83-
</item>
84-
<item row="3" column="1" >
85-
<widget class="QCheckBox" name="cboxShow" >
86-
<property name="text" >
87-
<string>Enable North Arrow</string>
88-
</property>
89-
<property name="checked" >
90-
<bool>true</bool>
91-
</property>
92-
</widget>
93-
</item>
94-
<item row="1" column="1" >
95-
<layout class="QGridLayout" >
96-
<property name="margin" >
97-
<number>0</number>
98-
</property>
99-
<property name="spacing" >
100-
<number>6</number>
101-
</property>
102-
<item row="0" column="0" >
103-
<widget class="QSlider" name="sliderRotation" >
104-
<property name="toolTip" >
105-
<string/>
106-
</property>
107-
<property name="maximum" >
108-
<number>360</number>
109-
</property>
110-
<property name="singleStep" >
111-
<number>1</number>
112-
</property>
113-
<property name="pageStep" >
114-
<number>10</number>
115-
</property>
116-
<property name="orientation" >
117-
<enum>Qt::Horizontal</enum>
118-
</property>
119-
</widget>
120-
</item>
121-
<item row="0" column="1" >
122-
<widget class="QSpinBox" name="spinAngle" >
123-
<property name="maximum" >
124-
<number>360</number>
125-
</property>
126-
<property name="singleStep" >
127-
<number>1</number>
128-
</property>
129-
<property name="value" >
130-
<number>0</number>
131-
</property>
132-
</widget>
133-
</item>
134-
</layout>
135-
</item>
136-
<item row="2" column="1" >
137-
<widget class="QComboBox" name="cboPlacement" >
138-
<property name="toolTip" >
139-
<string>Placement on screen</string>
140-
</property>
141-
<item>
142-
<property name="text" >
143-
<string>Top Left</string>
144-
</property>
145-
</item>
146-
<item>
147-
<property name="text" >
148-
<string>Top Right</string>
149-
</property>
150-
</item>
151-
<item>
152-
<property name="text" >
153-
<string>Bottom Left</string>
154-
</property>
155-
</item>
156-
<item>
157-
<property name="text" >
158-
<string>Bottom Right</string>
159-
</property>
160-
</item>
161-
</widget>
162-
</item>
163-
<item row="0" column="0" colspan="2" >
164-
<widget class="QLabel" name="pixmapLabel" >
165-
<property name="toolTip" >
166-
<string>Preview of north arrow</string>
167-
</property>
168-
<property name="frameShape" >
169-
<enum>QFrame::Box</enum>
170-
</property>
171-
<property name="scaledContents" >
172-
<bool>false</bool>
173-
</property>
174-
<property name="alignment" >
175-
<set>Qt::AlignCenter</set>
176-
</property>
177-
</widget>
178-
</item>
179-
</layout>
180-
</item>
181-
</layout>
182-
</widget>
183-
<widget class="QWidget" name="tabIcon" >
184-
<attribute name="title" >
185-
<string>Icon</string>
186-
</attribute>
187-
<layout class="QGridLayout" >
188-
<property name="margin" >
189-
<number>0</number>
190-
</property>
191-
<property name="spacing" >
192-
<number>6</number>
193-
</property>
194-
<item row="0" column="0" >
195-
<widget class="QLineEdit" name="txtDirectory" />
196-
</item>
197-
<item row="0" column="1" >
198-
<widget class="QPushButton" name="btnBrowse" >
199-
<property name="text" >
200-
<string>Browse...</string>
201-
</property>
202-
</widget>
203-
</item>
204-
<item row="1" column="0" colspan="2" >
205-
<widget class="QListView" name="iconView" >
206-
<property name="viewMode" >
207-
<enum>QListView::IconMode</enum>
208-
</property>
209-
</widget>
210-
</item>
211-
</layout>
212-
</widget>
213-
</widget>
214-
</item>
215-
<item row="0" column="2" >
19+
<item row="0" column="0" colspan="3" >
21620
<widget class="QLabel" name="txtHeading" >
21721
<property name="sizePolicy" >
218-
<sizepolicy>
219-
<hsizetype>5</hsizetype>
220-
<vsizetype>1</vsizetype>
22+
<sizepolicy vsizetype="Minimum" hsizetype="Preferred" >
22123
<horstretch>0</horstretch>
22224
<verstretch>0</verstretch>
22325
</sizepolicy>
@@ -241,36 +43,134 @@
24143
</property>
24244
</widget>
24345
</item>
244-
<item rowspan="2" row="0" column="1" >
245-
<widget class="Line" name="line1" >
246-
<property name="maximumSize" >
247-
<size>
248-
<width>2</width>
249-
<height>32767</height>
250-
</size>
46+
<item row="1" column="0" colspan="3" >
47+
<widget class="QLabel" name="pixmapLabel" >
48+
<property name="sizePolicy" >
49+
<sizepolicy vsizetype="MinimumExpanding" hsizetype="Preferred" >
50+
<horstretch>0</horstretch>
51+
<verstretch>0</verstretch>
52+
</sizepolicy>
53+
</property>
54+
<property name="toolTip" >
55+
<string>Preview of north arrow</string>
25156
</property>
25257
<property name="frameShape" >
253-
<enum>QFrame::VLine</enum>
58+
<enum>QFrame::Box</enum>
59+
</property>
60+
<property name="scaledContents" >
61+
<bool>false</bool>
62+
</property>
63+
<property name="alignment" >
64+
<set>Qt::AlignCenter</set>
65+
</property>
66+
</widget>
67+
</item>
68+
<item row="2" column="0" >
69+
<widget class="QLabel" name="textLabel6" >
70+
<property name="text" >
71+
<string>Angle</string>
72+
</property>
73+
<property name="buddy" >
74+
<cstring>sliderRotation</cstring>
75+
</property>
76+
</widget>
77+
</item>
78+
<item row="2" column="1" >
79+
<widget class="QSlider" name="sliderRotation" >
80+
<property name="toolTip" >
81+
<string/>
82+
</property>
83+
<property name="maximum" >
84+
<number>360</number>
85+
</property>
86+
<property name="singleStep" >
87+
<number>1</number>
25488
</property>
255-
<property name="frameShadow" >
256-
<enum>QFrame::Sunken</enum>
89+
<property name="pageStep" >
90+
<number>10</number>
25791
</property>
25892
<property name="orientation" >
259-
<enum>Qt::Vertical</enum>
93+
<enum>Qt::Horizontal</enum>
94+
</property>
95+
</widget>
96+
</item>
97+
<item row="2" column="2" >
98+
<widget class="QSpinBox" name="spinAngle" >
99+
<property name="maximum" >
100+
<number>360</number>
101+
</property>
102+
<property name="singleStep" >
103+
<number>1</number>
104+
</property>
105+
<property name="value" >
106+
<number>0</number>
107+
</property>
108+
</widget>
109+
</item>
110+
<item row="3" column="0" >
111+
<widget class="QLabel" name="textLabel8" >
112+
<property name="text" >
113+
<string>Placement</string>
114+
</property>
115+
<property name="buddy" >
116+
<cstring>cboPlacement</cstring>
117+
</property>
118+
</widget>
119+
</item>
120+
<item row="3" column="1" colspan="2" >
121+
<widget class="QComboBox" name="cboPlacement" >
122+
<property name="toolTip" >
123+
<string>Placement on screen</string>
260124
</property>
125+
<item>
126+
<property name="text" >
127+
<string>Top Left</string>
128+
</property>
129+
</item>
130+
<item>
131+
<property name="text" >
132+
<string>Top Right</string>
133+
</property>
134+
</item>
135+
<item>
136+
<property name="text" >
137+
<string>Bottom Left</string>
138+
</property>
139+
</item>
140+
<item>
141+
<property name="text" >
142+
<string>Bottom Right</string>
143+
</property>
144+
</item>
261145
</widget>
262146
</item>
263-
<item rowspan="2" row="0" column="0" >
264-
<widget class="QLabel" name="label" >
147+
<item row="4" column="1" colspan="2" >
148+
<widget class="QCheckBox" name="cboxShow" >
265149
<property name="text" >
150+
<string>Enable North Arrow</string>
151+
</property>
152+
<property name="checked" >
153+
<bool>true</bool>
154+
</property>
155+
</widget>
156+
</item>
157+
<item row="5" column="1" colspan="2" >
158+
<widget class="QCheckBox" name="cboxAutomatic" >
159+
<property name="toolTip" >
160+
<string/>
161+
</property>
162+
<property name="whatsThis" >
266163
<string/>
267164
</property>
268-
<property name="pixmap" >
269-
<pixmap resource="northarrow_plugin.qrc" >:/northarrow.png</pixmap>
165+
<property name="text" >
166+
<string>Set direction automatically</string>
167+
</property>
168+
<property name="checked" >
169+
<bool>true</bool>
270170
</property>
271171
</widget>
272172
</item>
273-
<item row="2" column="0" colspan="3" >
173+
<item row="6" column="0" colspan="3" >
274174
<widget class="QDialogButtonBox" name="buttonBox" >
275175
<property name="orientation" >
276176
<enum>Qt::Horizontal</enum>
@@ -283,6 +183,14 @@
283183
</layout>
284184
</widget>
285185
<layoutdefault spacing="6" margin="11" />
186+
<tabstops>
187+
<tabstop>sliderRotation</tabstop>
188+
<tabstop>spinAngle</tabstop>
189+
<tabstop>cboPlacement</tabstop>
190+
<tabstop>cboxShow</tabstop>
191+
<tabstop>cboxAutomatic</tabstop>
192+
<tabstop>buttonBox</tabstop>
193+
</tabstops>
286194
<resources>
287195
<include location="northarrow_plugin.qrc" />
288196
</resources>

0 commit comments

Comments
 (0)
Please sign in to comment.