Skip to content

Commit 03a7125

Browse files
3nids3nids
committedJan 16, 2014
UI: remove top labels, use collapsible groupboxes, and other small improvements
·
ltr-3_40archive/master_2
1 parent 0ca7316 commit 03a7125

9 files changed

+497
-997
lines changed
 

‎src/app/pluginmanager/qgspluginmanager.cpp

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -538,8 +538,6 @@ void QgsPluginManager::reloadModelData()
538538
if ( hasAvailablePlugins() ) mModelPlugins->appendRow( createSpacerItem( tr( "Installable", "category: plugins that are available for installation" ), "not installedZ" ) );
539539
}
540540

541-
updateTabTitle();
542-
543541
buttonUpgradeAll->setEnabled( hasUpgradeablePlugins() );
544542

545543
// Disable tabs that are empty because of no suitable plugins in the model.
@@ -990,8 +988,6 @@ void QgsPluginManager::setCurrentTab( int idx )
990988
}
991989
mModelProxy->setAcceptedStatuses( acceptedStatuses );
992990

993-
updateTabTitle();
994-
995991
// load tab description HTML to the detail browser
996992
QString tabInfoHTML = "";
997993
QMap<QString, QString>::iterator it = mTabDescriptions.find( tabTitle );
@@ -1340,13 +1336,3 @@ bool QgsPluginManager::hasInvalidPlugins( )
13401336

13411337
return false;
13421338
}
1343-
1344-
1345-
1346-
void QgsPluginManager::updateTabTitle()
1347-
{
1348-
lbStatusFilter->setText( QString( " %1 > %2 (%3)" ).arg( tr( "Plugins" ) )
1349-
.arg( mOptionsListWidget->currentItem()->text() )
1350-
.arg( mModelProxy->countWithCurrentStatus() ) );
1351-
}
1352-

‎src/app/pluginmanager/qgspluginmanager.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,6 @@ class QgsPluginManager : public QgsOptionsDialogBase, private Ui::QgsPluginManag
100100
//! Set tab of the stacked widget (called from the vertical list item)
101101
void setCurrentTab( int idx );
102102

103-
//! Update title of the current tab according to current filters
104-
void updateTabTitle();
105-
106103
//! Handle plugin selection
107104
void currentPluginChanged( const QModelIndex & theIndex );
108105

‎src/ui/qgsabout.ui

Lines changed: 8 additions & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -150,23 +150,13 @@
150150
</sizepolicy>
151151
</property>
152152
<property name="currentIndex">
153-
<number>5</number>
153+
<number>0</number>
154154
</property>
155155
<widget class="QWidget" name="mOptsPage_01">
156156
<layout class="QVBoxLayout" name="verticalLayout_4">
157157
<property name="margin">
158158
<number>0</number>
159159
</property>
160-
<item>
161-
<widget class="QLabel" name="label">
162-
<property name="styleSheet">
163-
<string notr="true">font-weight:bold;</string>
164-
</property>
165-
<property name="text">
166-
<string>About</string>
167-
</property>
168-
</widget>
169-
</item>
170160
<item>
171161
<layout class="QHBoxLayout">
172162
<item>
@@ -201,8 +191,8 @@ p, li { white-space: pre-wrap; }
201191
</layout>
202192
</item>
203193
<item>
204-
<widget class="QWebView" name="txtVersion">
205-
<property name="url">
194+
<widget class="QWebView" name="txtVersion" native="true">
195+
<property name="url" stdset="0">
206196
<url>
207197
<string>about:blank</string>
208198
</url>
@@ -286,16 +276,6 @@ p, li { white-space: pre-wrap; }
286276
<property name="margin">
287277
<number>0</number>
288278
</property>
289-
<item>
290-
<widget class="QLabel" name="label_4">
291-
<property name="styleSheet">
292-
<string notr="true">font-weight:bold;</string>
293-
</property>
294-
<property name="text">
295-
<string>What's New</string>
296-
</property>
297-
</widget>
298-
</item>
299279
<item>
300280
<widget class="QTextBrowser" name="txtWhatsNew"/>
301281
</item>
@@ -306,16 +286,6 @@ p, li { white-space: pre-wrap; }
306286
<property name="margin">
307287
<number>0</number>
308288
</property>
309-
<item>
310-
<widget class="QLabel" name="label_5">
311-
<property name="styleSheet">
312-
<string notr="true">font-weight:bold;</string>
313-
</property>
314-
<property name="text">
315-
<string>Providers</string>
316-
</property>
317-
</widget>
318-
</item>
319289
<item>
320290
<widget class="QTextBrowser" name="txtProviders"/>
321291
</item>
@@ -326,23 +296,7 @@ p, li { white-space: pre-wrap; }
326296
<property name="margin">
327297
<number>0</number>
328298
</property>
329-
<item row="0" column="0" colspan="2">
330-
<widget class="QLabel" name="label_6">
331-
<property name="sizePolicy">
332-
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
333-
<horstretch>0</horstretch>
334-
<verstretch>0</verstretch>
335-
</sizepolicy>
336-
</property>
337-
<property name="styleSheet">
338-
<string notr="true">font-weight:bold;</string>
339-
</property>
340-
<property name="text">
341-
<string>Developers</string>
342-
</property>
343-
</widget>
344-
</item>
345-
<item row="1" column="0" rowspan="2">
299+
<item row="0" column="0" rowspan="2">
346300
<widget class="QListWidget" name="lstDevelopers">
347301
<property name="sizePolicy">
348302
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
@@ -358,7 +312,7 @@ p, li { white-space: pre-wrap; }
358312
</property>
359313
</widget>
360314
</item>
361-
<item row="1" column="1">
315+
<item row="0" column="1">
362316
<widget class="QLabel" name="label_7">
363317
<property name="text">
364318
<string/>
@@ -374,7 +328,7 @@ p, li { white-space: pre-wrap; }
374328
</property>
375329
</widget>
376330
</item>
377-
<item row="2" column="1">
331+
<item row="1" column="1">
378332
<widget class="QLabel" name="label_8">
379333
<property name="font">
380334
<font>
@@ -396,22 +350,6 @@ p, li { white-space: pre-wrap; }
396350
<property name="margin">
397351
<number>0</number>
398352
</property>
399-
<item>
400-
<widget class="QLabel" name="label_9">
401-
<property name="sizePolicy">
402-
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
403-
<horstretch>0</horstretch>
404-
<verstretch>0</verstretch>
405-
</sizepolicy>
406-
</property>
407-
<property name="styleSheet">
408-
<string notr="true">font-weight:bold;</string>
409-
</property>
410-
<property name="text">
411-
<string>Contributors</string>
412-
</property>
413-
</widget>
414-
</item>
415353
<item>
416354
<widget class="QListWidget" name="lstContributors">
417355
<property name="alternatingRowColors">
@@ -427,24 +365,8 @@ p, li { white-space: pre-wrap; }
427365
<number>0</number>
428366
</property>
429367
<item>
430-
<widget class="QLabel" name="label_10">
431-
<property name="sizePolicy">
432-
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
433-
<horstretch>0</horstretch>
434-
<verstretch>0</verstretch>
435-
</sizepolicy>
436-
</property>
437-
<property name="styleSheet">
438-
<string notr="true">font-weight:bold;</string>
439-
</property>
440-
<property name="text">
441-
<string>Translators</string>
442-
</property>
443-
</widget>
444-
</item>
445-
<item>
446-
<widget class="QWebView" name="txtTranslators">
447-
<property name="url">
368+
<widget class="QWebView" name="txtTranslators" native="true">
369+
<property name="url" stdset="0">
448370
<url>
449371
<string>about:blank</string>
450372
</url>
@@ -458,22 +380,6 @@ p, li { white-space: pre-wrap; }
458380
<property name="margin">
459381
<number>0</number>
460382
</property>
461-
<item>
462-
<widget class="QLabel" name="label_12">
463-
<property name="sizePolicy">
464-
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
465-
<horstretch>0</horstretch>
466-
<verstretch>0</verstretch>
467-
</sizepolicy>
468-
</property>
469-
<property name="styleSheet">
470-
<string notr="true">font-weight:bold;</string>
471-
</property>
472-
<property name="text">
473-
<string>Donors</string>
474-
</property>
475-
</widget>
476-
</item>
477383
<item>
478384
<widget class="QTextBrowser" name="txtDonors">
479385
<property name="openExternalLinks">
@@ -491,22 +397,6 @@ p, li { white-space: pre-wrap; }
491397
<property name="margin">
492398
<number>0</number>
493399
</property>
494-
<item>
495-
<widget class="QLabel" name="label_13">
496-
<property name="sizePolicy">
497-
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
498-
<horstretch>0</horstretch>
499-
<verstretch>0</verstretch>
500-
</sizepolicy>
501-
</property>
502-
<property name="styleSheet">
503-
<string notr="true">font-weight:bold;</string>
504-
</property>
505-
<property name="text">
506-
<string>License</string>
507-
</property>
508-
</widget>
509-
</item>
510400
<item>
511401
<widget class="QTextBrowser" name="txtLicense"/>
512402
</item>

‎src/ui/qgsfieldspropertiesbase.ui

Lines changed: 198 additions & 157 deletions
Original file line numberDiff line numberDiff line change
@@ -11,80 +11,109 @@
1111
</rect>
1212
</property>
1313
<layout class="QGridLayout" name="gridLayout_6">
14-
<item row="0" column="4">
15-
<spacer>
16-
<property name="orientation">
17-
<enum>Qt::Horizontal</enum>
18-
</property>
19-
<property name="sizeHint" stdset="0">
20-
<size>
21-
<width>100</width>
22-
<height>19</height>
23-
</size>
24-
</property>
25-
</spacer>
26-
</item>
27-
<item row="0" column="5">
28-
<widget class="QLabel" name="label_2">
29-
<property name="text">
30-
<string>Attribute editor layout:</string>
31-
</property>
32-
</widget>
33-
</item>
34-
<item row="0" column="0">
35-
<widget class="QToolButton" name="mAddAttributeButton">
36-
<property name="sizePolicy">
37-
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
38-
<horstretch>0</horstretch>
39-
<verstretch>0</verstretch>
40-
</sizepolicy>
41-
</property>
42-
<property name="toolTip">
43-
<string>New column</string>
44-
</property>
45-
<property name="text">
46-
<string/>
47-
</property>
48-
<property name="icon">
49-
<iconset>
50-
<normaloff>.designer/xpm/new_attribute.png</normaloff>.designer/xpm/new_attribute.png</iconset>
51-
</property>
52-
<property name="shortcut">
53-
<string>Ctrl+N</string>
54-
</property>
55-
</widget>
56-
</item>
57-
<item row="0" column="3">
58-
<widget class="QToolButton" name="mCalculateFieldButton">
59-
<property name="toolTip">
60-
<string>Field calculator</string>
61-
</property>
62-
<property name="whatsThis">
63-
<string>Click to toggle table editing</string>
64-
</property>
65-
<property name="text">
66-
<string/>
67-
</property>
68-
<property name="checkable">
69-
<bool>false</bool>
70-
</property>
71-
</widget>
72-
</item>
73-
<item row="0" column="2">
74-
<widget class="QToolButton" name="mToggleEditingButton">
75-
<property name="toolTip">
76-
<string>Toggle editing mode</string>
77-
</property>
78-
<property name="whatsThis">
79-
<string>Click to toggle table editing</string>
80-
</property>
81-
<property name="text">
82-
<string/>
83-
</property>
84-
<property name="checkable">
85-
<bool>true</bool>
86-
</property>
87-
</widget>
14+
<item row="1" column="0" colspan="7">
15+
<layout class="QHBoxLayout" name="horizontalLayout_3">
16+
<item>
17+
<widget class="QLabel" name="label_2">
18+
<property name="text">
19+
<string>Attribute editor layout:</string>
20+
</property>
21+
</widget>
22+
</item>
23+
<item>
24+
<widget class="QComboBox" name="mEditorLayoutComboBox">
25+
<property name="sizePolicy">
26+
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
27+
<horstretch>0</horstretch>
28+
<verstretch>0</verstretch>
29+
</sizepolicy>
30+
</property>
31+
<item>
32+
<property name="text">
33+
<string>Autogenerate</string>
34+
</property>
35+
</item>
36+
<item>
37+
<property name="text">
38+
<string>Drag and drop designer</string>
39+
</property>
40+
</item>
41+
<item>
42+
<property name="text">
43+
<string>Provide ui-file</string>
44+
</property>
45+
</item>
46+
</widget>
47+
</item>
48+
<item>
49+
<spacer name="horizontalSpacer">
50+
<property name="orientation">
51+
<enum>Qt::Horizontal</enum>
52+
</property>
53+
<property name="sizeType">
54+
<enum>QSizePolicy::Minimum</enum>
55+
</property>
56+
<property name="sizeHint" stdset="0">
57+
<size>
58+
<width>25</width>
59+
<height>20</height>
60+
</size>
61+
</property>
62+
</spacer>
63+
</item>
64+
<item>
65+
<widget class="QLabel" name="label_3">
66+
<property name="toolTip">
67+
<string>QGIS forms can have a Python function that is called when the form is opened.
68+
Use this function to add extra logic to your forms.
69+
70+
An example is (in module MyForms.py):
71+
72+
def open(dialog, layer, feature):
73+
geom = feature.geometry()
74+
control = dialog.findChild(QWidget,&quot;MyLineEdit&quot;)
75+
76+
Reference in Python Init Function like so: MyForms.open
77+
78+
MyForms.py must live on PYTHONPATH, .qgis/python, or inside the project folder.</string>
79+
</property>
80+
<property name="text">
81+
<string>Python Init function</string>
82+
</property>
83+
</widget>
84+
</item>
85+
<item>
86+
<widget class="QLineEdit" name="leEditFormInit">
87+
<property name="toolTip">
88+
<string>QGIS forms can have a Python function that is called when the form is opened.
89+
Use this function to add extra logic to your forms.
90+
91+
An example is (in module MyForms.py):
92+
93+
def open(dialog, layer, feature):
94+
geom = feature.geometry()
95+
control = dialog.findChild(QWidget,&quot;MyLineEdit&quot;)
96+
97+
Reference in Python Init Function like so: MyForms.open
98+
99+
MyForms.py must live on PYTHONPATH, .qgis/python, or inside the project folder.</string>
100+
</property>
101+
</widget>
102+
</item>
103+
<item>
104+
<spacer name="horizontalSpacer_3">
105+
<property name="orientation">
106+
<enum>Qt::Horizontal</enum>
107+
</property>
108+
<property name="sizeHint" stdset="0">
109+
<size>
110+
<width>40</width>
111+
<height>20</height>
112+
</size>
113+
</property>
114+
</spacer>
115+
</item>
116+
</layout>
88117
</item>
89118
<item row="2" column="0" colspan="7">
90119
<widget class="QSplitter" name="mSplitter">
@@ -107,11 +136,104 @@
107136
<property name="orientation">
108137
<enum>Qt::Vertical</enum>
109138
</property>
110-
<widget class="QgsCollapsibleGroupBox" name="mAttributesListFrame">
139+
<widget class="QgsCollapsibleGroupBox" name="mFieldsGroupBox">
111140
<property name="title">
112141
<string>Fields</string>
113142
</property>
114-
<layout class="QGridLayout" name="mAttributesListLayout"/>
143+
<layout class="QGridLayout" name="mAttributesListLayout">
144+
<item row="0" column="0">
145+
<layout class="QGridLayout" name="gridLayout_3">
146+
<item row="0" column="1">
147+
<widget class="QToolButton" name="mDeleteAttributeButton">
148+
<property name="toolTip">
149+
<string>Delete column</string>
150+
</property>
151+
<property name="text">
152+
<string/>
153+
</property>
154+
<property name="icon">
155+
<iconset>
156+
<normaloff>.designer/xpm/delete_attribute.png</normaloff>.designer/xpm/delete_attribute.png</iconset>
157+
</property>
158+
<property name="shortcut">
159+
<string>Ctrl+X</string>
160+
</property>
161+
</widget>
162+
</item>
163+
<item row="0" column="3">
164+
<widget class="QToolButton" name="mCalculateFieldButton">
165+
<property name="toolTip">
166+
<string>Field calculator</string>
167+
</property>
168+
<property name="whatsThis">
169+
<string>Click to toggle table editing</string>
170+
</property>
171+
<property name="text">
172+
<string/>
173+
</property>
174+
<property name="checkable">
175+
<bool>false</bool>
176+
</property>
177+
</widget>
178+
</item>
179+
<item row="0" column="2">
180+
<widget class="QToolButton" name="mToggleEditingButton">
181+
<property name="toolTip">
182+
<string>Toggle editing mode</string>
183+
</property>
184+
<property name="whatsThis">
185+
<string>Click to toggle table editing</string>
186+
</property>
187+
<property name="text">
188+
<string/>
189+
</property>
190+
<property name="checkable">
191+
<bool>true</bool>
192+
</property>
193+
</widget>
194+
</item>
195+
<item row="0" column="0">
196+
<widget class="QToolButton" name="mAddAttributeButton">
197+
<property name="sizePolicy">
198+
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
199+
<horstretch>0</horstretch>
200+
<verstretch>0</verstretch>
201+
</sizepolicy>
202+
</property>
203+
<property name="toolTip">
204+
<string>New column</string>
205+
</property>
206+
<property name="text">
207+
<string/>
208+
</property>
209+
<property name="icon">
210+
<iconset>
211+
<normaloff>.designer/xpm/new_attribute.png</normaloff>.designer/xpm/new_attribute.png</iconset>
212+
</property>
213+
<property name="shortcut">
214+
<string>Ctrl+N</string>
215+
</property>
216+
</widget>
217+
</item>
218+
<item row="0" column="4">
219+
<spacer name="horizontalSpacer_2">
220+
<property name="orientation">
221+
<enum>Qt::Horizontal</enum>
222+
</property>
223+
<property name="sizeHint" stdset="0">
224+
<size>
225+
<width>40</width>
226+
<height>20</height>
227+
</size>
228+
</property>
229+
</spacer>
230+
</item>
231+
<item row="1" column="0" colspan="5">
232+
<widget class="QWidget" name="mAttributesListFrame" native="true"/>
233+
</item>
234+
</layout>
235+
</item>
236+
</layout>
115237
</widget>
116238
<widget class="QgsCollapsibleGroupBox" name="mRelationsFrame">
117239
<property name="title">
@@ -304,69 +426,6 @@
304426
</widget>
305427
</widget>
306428
</item>
307-
<item row="0" column="6">
308-
<widget class="QComboBox" name="mEditorLayoutComboBox">
309-
<property name="sizePolicy">
310-
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
311-
<horstretch>0</horstretch>
312-
<verstretch>0</verstretch>
313-
</sizepolicy>
314-
</property>
315-
<item>
316-
<property name="text">
317-
<string>Autogenerate</string>
318-
</property>
319-
</item>
320-
<item>
321-
<property name="text">
322-
<string>Drag and drop designer</string>
323-
</property>
324-
</item>
325-
<item>
326-
<property name="text">
327-
<string>Provide ui-file</string>
328-
</property>
329-
</item>
330-
</widget>
331-
</item>
332-
<item row="1" column="5">
333-
<widget class="QLabel" name="label_3">
334-
<property name="toolTip">
335-
<string>QGIS forms can have a Python function that is called when the form is opened.
336-
Use this function to add extra logic to your forms.
337-
338-
An example is (in module MyForms.py):
339-
340-
def open(dialog, layer, feature):
341-
geom = feature.geometry()
342-
control = dialog.findChild(QWidget,&quot;MyLineEdit&quot;)
343-
344-
Reference in Python Init Function like so: MyForms.open
345-
346-
MyForms.py must live on PYTHONPATH, .qgis/python, or inside the project folder.</string>
347-
</property>
348-
<property name="text">
349-
<string>Python Init function</string>
350-
</property>
351-
</widget>
352-
</item>
353-
<item row="0" column="1">
354-
<widget class="QToolButton" name="mDeleteAttributeButton">
355-
<property name="toolTip">
356-
<string>Delete column</string>
357-
</property>
358-
<property name="text">
359-
<string/>
360-
</property>
361-
<property name="icon">
362-
<iconset>
363-
<normaloff>.designer/xpm/delete_attribute.png</normaloff>.designer/xpm/delete_attribute.png</iconset>
364-
</property>
365-
<property name="shortcut">
366-
<string>Ctrl+X</string>
367-
</property>
368-
</widget>
369-
</item>
370429
<item row="3" column="0" colspan="7">
371430
<layout class="QHBoxLayout" name="horizontalLayout">
372431
<item>
@@ -421,24 +480,6 @@ MyForms.py must live on PYTHONPATH, .qgis/python, or inside the project folder.<
421480
</item>
422481
</layout>
423482
</item>
424-
<item row="1" column="6">
425-
<widget class="QLineEdit" name="leEditFormInit">
426-
<property name="toolTip">
427-
<string>QGIS forms can have a Python function that is called when the form is opened.
428-
Use this function to add extra logic to your forms.
429-
430-
An example is (in module MyForms.py):
431-
432-
def open(dialog, layer, feature):
433-
geom = feature.geometry()
434-
control = dialog.findChild(QWidget,&quot;MyLineEdit&quot;)
435-
436-
Reference in Python Init Function like so: MyForms.open
437-
438-
MyForms.py must live on PYTHONPATH, .qgis/python, or inside the project folder.</string>
439-
</property>
440-
</widget>
441-
</item>
442483
</layout>
443484
</widget>
444485
<customwidgets>

‎src/ui/qgsoptionsbase.ui

Lines changed: 102 additions & 232 deletions
Large diffs are not rendered by default.

‎src/ui/qgspluginmanagerbase.ui

Lines changed: 9 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@
242242
<number>0</number>
243243
</property>
244244
<property name="currentIndex">
245-
<number>0</number>
245+
<number>1</number>
246246
</property>
247247
<widget class="QWidget" name="pagePlugins">
248248
<layout class="QVBoxLayout" name="verticalLayout_8">
@@ -258,25 +258,6 @@
258258
<property name="bottomMargin">
259259
<number>0</number>
260260
</property>
261-
<item>
262-
<widget class="QLabel" name="lbStatusFilter">
263-
<property name="sizePolicy">
264-
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
265-
<horstretch>0</horstretch>
266-
<verstretch>0</verstretch>
267-
</sizepolicy>
268-
</property>
269-
<property name="font">
270-
<font>
271-
<weight>75</weight>
272-
<bold>true</bold>
273-
</font>
274-
</property>
275-
<property name="text">
276-
<string>Plugins</string>
277-
</property>
278-
</widget>
279-
</item>
280261
<item>
281262
<layout class="QHBoxLayout" name="horizontalLayout_4">
282263
<item>
@@ -486,19 +467,6 @@
486467
<property name="bottomMargin">
487468
<number>0</number>
488469
</property>
489-
<item>
490-
<widget class="QLabel" name="lblSettingsTab">
491-
<property name="font">
492-
<font>
493-
<weight>75</weight>
494-
<bold>true</bold>
495-
</font>
496-
</property>
497-
<property name="text">
498-
<string>Settings</string>
499-
</property>
500-
</widget>
501-
</item>
502470
<item>
503471
<widget class="QFrame" name="frameSettings">
504472
<property name="sizePolicy">
@@ -524,15 +492,15 @@
524492
<rect>
525493
<x>0</x>
526494
<y>0</y>
527-
<width>360</width>
528-
<height>731</height>
495+
<width>573</width>
496+
<height>734</height>
529497
</rect>
530498
</property>
531499
<layout class="QVBoxLayout" name="verticalLayout_10">
532500
<item>
533501
<widget class="QLabel" name="labelNoPython">
534502
<property name="sizePolicy">
535-
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
503+
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
536504
<horstretch>0</horstretch>
537505
<verstretch>0</verstretch>
538506
</sizepolicy>
@@ -970,17 +938,17 @@ p, li { white-space: pre-wrap; }
970938
</widget>
971939
<layoutdefault spacing="6" margin="11"/>
972940
<customwidgets>
973-
<customwidget>
974-
<class>QgsFilterLineEdit</class>
975-
<extends>QLineEdit</extends>
976-
<header>qgsfilterlineedit.h</header>
977-
</customwidget>
978941
<customwidget>
979942
<class>QgsCollapsibleGroupBox</class>
980943
<extends>QGroupBox</extends>
981944
<header>qgscollapsiblegroupbox.h</header>
982945
<container>1</container>
983946
</customwidget>
947+
<customwidget>
948+
<class>QgsFilterLineEdit</class>
949+
<extends>QLineEdit</extends>
950+
<header>qgsfilterlineedit.h</header>
951+
</customwidget>
984952
</customwidgets>
985953
<tabstops>
986954
<tabstop>mOptionsListWidget</tabstop>

‎src/ui/qgsprojectpropertiesbase.ui

Lines changed: 17 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -198,22 +198,6 @@
198198
<property name="margin">
199199
<number>0</number>
200200
</property>
201-
<item>
202-
<widget class="QLabel" name="label_4">
203-
<property name="sizePolicy">
204-
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
205-
<horstretch>0</horstretch>
206-
<verstretch>0</verstretch>
207-
</sizepolicy>
208-
</property>
209-
<property name="styleSheet">
210-
<string notr="true">font-weight:bold;</string>
211-
</property>
212-
<property name="text">
213-
<string>General</string>
214-
</property>
215-
</widget>
216-
</item>
217201
<item>
218202
<widget class="QScrollArea" name="scrollArea_2">
219203
<property name="frameShape">
@@ -227,8 +211,8 @@
227211
<rect>
228212
<x>0</x>
229213
<y>0</y>
230-
<width>640</width>
231-
<height>712</height>
214+
<width>653</width>
215+
<height>708</height>
232216
</rect>
233217
</property>
234218
<layout class="QVBoxLayout" name="verticalLayout_8">
@@ -769,22 +753,6 @@
769753
<property name="margin">
770754
<number>0</number>
771755
</property>
772-
<item>
773-
<widget class="QLabel" name="label_5">
774-
<property name="sizePolicy">
775-
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
776-
<horstretch>0</horstretch>
777-
<verstretch>0</verstretch>
778-
</sizepolicy>
779-
</property>
780-
<property name="styleSheet">
781-
<string notr="true">font-weight:bold;</string>
782-
</property>
783-
<property name="text">
784-
<string>Coordinate Reference System (CRS)</string>
785-
</property>
786-
</widget>
787-
</item>
788756
<item>
789757
<widget class="QScrollArea" name="scrollArea">
790758
<property name="frameShape">
@@ -798,8 +766,8 @@
798766
<rect>
799767
<x>0</x>
800768
<y>0</y>
801-
<width>323</width>
802-
<height>46</height>
769+
<width>653</width>
770+
<height>708</height>
803771
</rect>
804772
</property>
805773
<layout class="QVBoxLayout" name="verticalLayout_7">
@@ -835,16 +803,6 @@
835803
<property name="margin">
836804
<number>0</number>
837805
</property>
838-
<item>
839-
<widget class="QLabel" name="label_6">
840-
<property name="styleSheet">
841-
<string notr="true">font-weight:bold;</string>
842-
</property>
843-
<property name="text">
844-
<string>Identifiable layers</string>
845-
</property>
846-
</widget>
847-
</item>
848806
<item>
849807
<widget class="QScrollArea" name="scrollArea_3">
850808
<property name="frameShape">
@@ -858,8 +816,8 @@
858816
<rect>
859817
<x>0</x>
860818
<y>0</y>
861-
<width>133</width>
862-
<height>100</height>
819+
<width>653</width>
820+
<height>708</height>
863821
</rect>
864822
</property>
865823
<layout class="QVBoxLayout" name="verticalLayout_10">
@@ -917,16 +875,6 @@
917875
<property name="margin">
918876
<number>0</number>
919877
</property>
920-
<item>
921-
<widget class="QLabel" name="label_7">
922-
<property name="styleSheet">
923-
<string notr="true">font-weight:bold;</string>
924-
</property>
925-
<property name="text">
926-
<string>Default styles</string>
927-
</property>
928-
</widget>
929-
</item>
930878
<item>
931879
<widget class="QScrollArea" name="scrollArea_4">
932880
<property name="frameShape">
@@ -940,8 +888,8 @@
940888
<rect>
941889
<x>0</x>
942890
<y>0</y>
943-
<width>371</width>
944-
<height>336</height>
891+
<width>653</width>
892+
<height>708</height>
945893
</rect>
946894
</property>
947895
<layout class="QVBoxLayout" name="verticalLayout_12">
@@ -1295,16 +1243,6 @@
12951243
<property name="margin">
12961244
<number>0</number>
12971245
</property>
1298-
<item>
1299-
<widget class="QLabel" name="label_8">
1300-
<property name="styleSheet">
1301-
<string notr="true">font-weight:bold;</string>
1302-
</property>
1303-
<property name="text">
1304-
<string>OWS server</string>
1305-
</property>
1306-
</widget>
1307-
</item>
13081246
<item>
13091247
<widget class="QScrollArea" name="scrollArea_5">
13101248
<property name="frameShape">
@@ -1318,8 +1256,8 @@
13181256
<rect>
13191257
<x>0</x>
13201258
<y>0</y>
1321-
<width>491</width>
1322-
<height>1347</height>
1259+
<width>637</width>
1260+
<height>1535</height>
13231261
</rect>
13241262
</property>
13251263
<layout class="QVBoxLayout" name="verticalLayout_13">
@@ -1993,16 +1931,6 @@
19931931
<property name="margin">
19941932
<number>0</number>
19951933
</property>
1996-
<item>
1997-
<widget class="QLabel" name="label_20">
1998-
<property name="styleSheet">
1999-
<string notr="true">font-weight:bold;</string>
2000-
</property>
2001-
<property name="text">
2002-
<string>Macros</string>
2003-
</property>
2004-
</widget>
2005-
</item>
20061934
<item>
20071935
<widget class="QScrollArea" name="scrollArea_6">
20081936
<property name="frameShape">
@@ -2016,8 +1944,8 @@
20161944
<rect>
20171945
<x>0</x>
20181946
<y>0</y>
2019-
<width>163</width>
2020-
<height>111</height>
1947+
<width>653</width>
1948+
<height>708</height>
20211949
</rect>
20221950
</property>
20231951
<layout class="QVBoxLayout" name="verticalLayout_17">
@@ -2105,17 +2033,17 @@
21052033
</layout>
21062034
</widget>
21072035
<customwidgets>
2108-
<customwidget>
2109-
<class>QgsColorButton</class>
2110-
<extends>QPushButton</extends>
2111-
<header>qgscolorbutton.h</header>
2112-
</customwidget>
21132036
<customwidget>
21142037
<class>QgsCollapsibleGroupBox</class>
21152038
<extends>QGroupBox</extends>
21162039
<header>qgscollapsiblegroupbox.h</header>
21172040
<container>1</container>
21182041
</customwidget>
2042+
<customwidget>
2043+
<class>QgsColorButton</class>
2044+
<extends>QPushButton</extends>
2045+
<header>qgscolorbutton.h</header>
2046+
</customwidget>
21192047
<customwidget>
21202048
<class>QgsProjectionSelector</class>
21212049
<extends>QWidget</extends>

‎src/ui/qgsrasterlayerpropertiesbase.ui

Lines changed: 72 additions & 132 deletions
Original file line numberDiff line numberDiff line change
@@ -189,16 +189,6 @@
189189
<property name="margin">
190190
<number>0</number>
191191
</property>
192-
<item>
193-
<widget class="QLabel" name="label_7">
194-
<property name="styleSheet">
195-
<string notr="true">font-weight:bold;</string>
196-
</property>
197-
<property name="text">
198-
<string>General</string>
199-
</property>
200-
</widget>
201-
</item>
202192
<item>
203193
<widget class="QScrollArea" name="scrollArea_3">
204194
<property name="frameShape">
@@ -212,8 +202,8 @@
212202
<rect>
213203
<x>0</x>
214204
<y>0</y>
215-
<width>693</width>
216-
<height>646</height>
205+
<width>700</width>
206+
<height>686</height>
217207
</rect>
218208
</property>
219209
<layout class="QVBoxLayout" name="verticalLayout_7">
@@ -379,12 +369,12 @@
379369
<string notr="true">rastergeneral</string>
380370
</property>
381371
<layout class="QGridLayout" name="_5">
382-
<property name="verticalSpacing">
383-
<number>6</number>
384-
</property>
385372
<property name="margin">
386373
<number>11</number>
387374
</property>
375+
<property name="verticalSpacing">
376+
<number>6</number>
377+
</property>
388378
<item row="0" column="4">
389379
<widget class="QLabel" name="textLabel1_2_2_2">
390380
<property name="toolTip">
@@ -660,16 +650,6 @@
660650
<property name="margin">
661651
<number>0</number>
662652
</property>
663-
<item>
664-
<widget class="QLabel" name="label">
665-
<property name="styleSheet">
666-
<string notr="true">font-weight:bold;</string>
667-
</property>
668-
<property name="text">
669-
<string>Style</string>
670-
</property>
671-
</widget>
672-
</item>
673653
<item>
674654
<widget class="QScrollArea" name="scrollArea">
675655
<property name="frameShape">
@@ -683,8 +663,8 @@
683663
<rect>
684664
<x>0</x>
685665
<y>0</y>
686-
<width>610</width>
687-
<height>360</height>
666+
<width>700</width>
667+
<height>686</height>
688668
</rect>
689669
</property>
690670
<layout class="QVBoxLayout" name="verticalLayout_13">
@@ -1175,16 +1155,6 @@
11751155
<property name="margin">
11761156
<number>0</number>
11771157
</property>
1178-
<item>
1179-
<widget class="QLabel" name="label_4">
1180-
<property name="styleSheet">
1181-
<string notr="true">font-weight:bold;</string>
1182-
</property>
1183-
<property name="text">
1184-
<string>Transparency</string>
1185-
</property>
1186-
</widget>
1187-
</item>
11881158
<item>
11891159
<widget class="QScrollArea" name="scrollArea_2">
11901160
<property name="frameShape">
@@ -1198,8 +1168,8 @@
11981168
<rect>
11991169
<x>0</x>
12001170
<y>0</y>
1201-
<width>472</width>
1202-
<height>439</height>
1171+
<width>700</width>
1172+
<height>686</height>
12031173
</rect>
12041174
</property>
12051175
<layout class="QVBoxLayout" name="verticalLayout_5">
@@ -1592,16 +1562,6 @@
15921562
<property name="margin">
15931563
<number>0</number>
15941564
</property>
1595-
<item>
1596-
<widget class="QLabel" name="label_10">
1597-
<property name="styleSheet">
1598-
<string notr="true">font-weight:bold;</string>
1599-
</property>
1600-
<property name="text">
1601-
<string>Pyramids</string>
1602-
</property>
1603-
</widget>
1604-
</item>
16051565
<item>
16061566
<widget class="QScrollArea" name="scrollArea_5">
16071567
<property name="frameShape">
@@ -1615,8 +1575,8 @@
16151575
<rect>
16161576
<x>0</x>
16171577
<y>0</y>
1618-
<width>632</width>
1619-
<height>199</height>
1578+
<width>700</width>
1579+
<height>686</height>
16201580
</rect>
16211581
</property>
16221582
<layout class="QVBoxLayout" name="verticalLayout_12">
@@ -1679,8 +1639,8 @@
16791639
<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;
16801640
&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;
16811641
p, li { white-space: pre-wrap; }
1682-
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
1683-
&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:'Cantarell'; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
1642+
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
1643+
&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:'Cantarell';&quot;&gt;&lt;br /&gt;&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
16841644
</property>
16851645
</widget>
16861646
</item>
@@ -1763,16 +1723,6 @@ p, li { white-space: pre-wrap; }
17631723
<property name="margin">
17641724
<number>0</number>
17651725
</property>
1766-
<item>
1767-
<widget class="QLabel" name="label_13">
1768-
<property name="styleSheet">
1769-
<string notr="true">font-weight:bold;</string>
1770-
</property>
1771-
<property name="text">
1772-
<string>Histogram</string>
1773-
</property>
1774-
</widget>
1775-
</item>
17761726
<item>
17771727
<widget class="QScrollArea" name="scrollArea_6">
17781728
<property name="frameShape">
@@ -1786,8 +1736,8 @@ p, li { white-space: pre-wrap; }
17861736
<rect>
17871737
<x>0</x>
17881738
<y>0</y>
1789-
<width>98</width>
1790-
<height>31</height>
1739+
<width>700</width>
1740+
<height>686</height>
17911741
</rect>
17921742
</property>
17931743
<layout class="QVBoxLayout" name="verticalLayout_16">
@@ -1823,16 +1773,6 @@ p, li { white-space: pre-wrap; }
18231773
<property name="margin">
18241774
<number>0</number>
18251775
</property>
1826-
<item>
1827-
<widget class="QLabel" name="label_9">
1828-
<property name="styleSheet">
1829-
<string notr="true">font-weight:bold;</string>
1830-
</property>
1831-
<property name="text">
1832-
<string>Metadata</string>
1833-
</property>
1834-
</widget>
1835-
</item>
18361776
<item>
18371777
<widget class="QScrollArea" name="scrollArea_4">
18381778
<property name="frameShape">
@@ -1846,8 +1786,8 @@ p, li { white-space: pre-wrap; }
18461786
<rect>
18471787
<x>0</x>
18481788
<y>0</y>
1849-
<width>195</width>
1850-
<height>267</height>
1789+
<width>700</width>
1790+
<height>686</height>
18511791
</rect>
18521792
</property>
18531793
<layout class="QVBoxLayout" name="verticalLayout_10">
@@ -1954,52 +1894,52 @@ p, li { white-space: pre-wrap; }
19541894
<string notr="true">vectormeta</string>
19551895
</property>
19561896
<layout class="QGridLayout" name="gridLayout_7">
1957-
<item row="0" column="0">
1958-
<widget class="QLabel" name="mLayerAttributionLabel">
1959-
<property name="text">
1960-
<string>Title</string>
1961-
</property>
1962-
</widget>
1963-
</item>
1964-
<item row="0" column="1">
1965-
<widget class="QLineEdit" name="mLayerAttributionLineEdit"/>
1966-
</item>
1967-
<item row="2" column="0">
1968-
<widget class="QLabel" name="mLayerAttributionUrlLabel">
1969-
<property name="text">
1970-
<string>Url</string>
1971-
</property>
1972-
</widget>
1973-
</item>
1974-
<item row="2" column="1">
1975-
<widget class="QLineEdit" name="mLayerAttributionUrlLineEdit"/>
1976-
</item>
1977-
</layout>
1978-
</widget>
1979-
</item>
1980-
<item>
1981-
<widget class="QgsCollapsibleGroupBox" name="mMetaMetaUrlGrpBx">
1982-
<property name="title">
1983-
<string>MetadataUrl</string>
1984-
</property>
1985-
<property name="syncGroup" stdset="0">
1986-
<string notr="true">vectormeta</string>
1987-
</property>
1988-
<layout class="QGridLayout" name="gridLayout_9">
1989-
<item row="0" column="0">
1990-
<widget class="QLabel" name="mLayerMetadataUrlLabel">
1991-
<property name="text">
1992-
<string>Url</string>
1993-
</property>
1994-
</widget>
1995-
</item>
1996-
<item row="0" column="1">
1997-
<widget class="QLineEdit" name="mLayerMetadataUrlLineEdit"/>
1998-
</item>
1999-
<item row="1" column="1">
2000-
<layout class="QHBoxLayout" name="horizontalLayout_8">
2001-
<item>
2002-
<widget class="QLabel" name="mLayerMetadataUrlTypeLabel">
1897+
<item row="0" column="0">
1898+
<widget class="QLabel" name="mLayerAttributionLabel">
1899+
<property name="text">
1900+
<string>Title</string>
1901+
</property>
1902+
</widget>
1903+
</item>
1904+
<item row="0" column="1">
1905+
<widget class="QLineEdit" name="mLayerAttributionLineEdit"/>
1906+
</item>
1907+
<item row="2" column="0">
1908+
<widget class="QLabel" name="mLayerAttributionUrlLabel">
1909+
<property name="text">
1910+
<string>Url</string>
1911+
</property>
1912+
</widget>
1913+
</item>
1914+
<item row="2" column="1">
1915+
<widget class="QLineEdit" name="mLayerAttributionUrlLineEdit"/>
1916+
</item>
1917+
</layout>
1918+
</widget>
1919+
</item>
1920+
<item>
1921+
<widget class="QgsCollapsibleGroupBox" name="mMetaMetaUrlGrpBx">
1922+
<property name="title">
1923+
<string>MetadataUrl</string>
1924+
</property>
1925+
<property name="syncGroup" stdset="0">
1926+
<string notr="true">vectormeta</string>
1927+
</property>
1928+
<layout class="QGridLayout" name="gridLayout_9">
1929+
<item row="0" column="0">
1930+
<widget class="QLabel" name="mLayerMetadataUrlLabel">
1931+
<property name="text">
1932+
<string>Url</string>
1933+
</property>
1934+
</widget>
1935+
</item>
1936+
<item row="0" column="1">
1937+
<widget class="QLineEdit" name="mLayerMetadataUrlLineEdit"/>
1938+
</item>
1939+
<item row="1" column="1">
1940+
<layout class="QHBoxLayout" name="horizontalLayout_8">
1941+
<item>
1942+
<widget class="QLabel" name="mLayerMetadataUrlTypeLabel">
20031943
<property name="text">
20041944
<string>Type</string>
20051945
</property>
@@ -2009,7 +1949,7 @@ p, li { white-space: pre-wrap; }
20091949
<widget class="QComboBox" name="mLayerMetadataUrlTypeComboBox">
20101950
<item>
20111951
<property name="text">
2012-
<string notr="true"></string>
1952+
<string notr="true"/>
20131953
</property>
20141954
</item>
20151955
<item>
@@ -2035,7 +1975,7 @@ p, li { white-space: pre-wrap; }
20351975
<widget class="QComboBox" name="mLayerMetadataUrlFormatComboBox">
20361976
<item>
20371977
<property name="text">
2038-
<string notr="true"></string>
1978+
<string notr="true"/>
20391979
</property>
20401980
</item>
20411981
<item>
@@ -2176,26 +2116,26 @@ p, li { white-space: pre-wrap; }
21762116
</layout>
21772117
</widget>
21782118
<customwidgets>
2179-
<customwidget>
2180-
<class>QgsScaleComboBox</class>
2181-
<extends>QComboBox</extends>
2182-
<header>qgsscalecombobox.h</header>
2183-
</customwidget>
21842119
<customwidget>
21852120
<class>QgsCollapsibleGroupBox</class>
21862121
<extends>QGroupBox</extends>
21872122
<header>qgscollapsiblegroupbox.h</header>
21882123
<container>1</container>
21892124
</customwidget>
2125+
<customwidget>
2126+
<class>QgsBlendModeComboBox</class>
2127+
<extends>QComboBox</extends>
2128+
<header>qgsblendmodecombobox.h</header>
2129+
</customwidget>
21902130
<customwidget>
21912131
<class>QgsColorButton</class>
21922132
<extends>QPushButton</extends>
21932133
<header>qgscolorbutton.h</header>
21942134
</customwidget>
21952135
<customwidget>
2196-
<class>QgsBlendModeComboBox</class>
2136+
<class>QgsScaleComboBox</class>
21972137
<extends>QComboBox</extends>
2198-
<header>qgsblendmodecombobox.h</header>
2138+
<header>qgsscalecombobox.h</header>
21992139
</customwidget>
22002140
</customwidgets>
22012141
<resources>

‎src/ui/qgsvectorlayerpropertiesbase.ui

Lines changed: 91 additions & 211 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)
Please sign in to comment.