Skip to content

Commit 1f88bf2

Browse files
author
timlinux
committed
[FEATURE] UI cleanups in prep of using property lists. Main visual difference is that labels dont have property lists no in vec props
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@12095 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent a19708c commit 1f88bf2

8 files changed

+717
-852
lines changed

‎src/app/qgslabeldialog.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,6 @@ void QgsLabelDialog::init( )
264264
spinBufferSize->setValue( myLabelAttributes->bufferSize() );
265265
//TODO - transparency attributes for buffers
266266

267-
listWidget->setItemSelected( listWidget->item( 0 ), true );
268267
}
269268

270269

‎src/plugins/diagram_overlay/qgslinearlyscalingdialogbase.ui

+6
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,17 @@
1414
<string>Form</string>
1515
</property>
1616
<layout class="QGridLayout">
17+
<property name="margin">
18+
<number>0</number>
19+
</property>
1720
<item row="0" column="0">
1821
<widget class="QLabel" name="mTitleLabel">
1922
<property name="text">
2023
<string>Scale linearly between 0 and the following attribute value/ diagram size:</string>
2124
</property>
25+
<property name="wordWrap">
26+
<bool>true</bool>
27+
</property>
2228
</widget>
2329
</item>
2430
<item row="1" column="0">

‎src/plugins/diagram_overlay/qgssvgdiagramfactorywidgetbase.ui

+50-67
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,65 @@
1-
<ui version="4.0" >
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<ui version="4.0">
23
<class>QgsSVGDiagramFactoryWidgetBase</class>
3-
<widget class="QWidget" name="QgsSVGDiagramFactoryWidgetBase" >
4-
<property name="geometry" >
4+
<widget class="QWidget" name="QgsSVGDiagramFactoryWidgetBase">
5+
<property name="geometry">
56
<rect>
67
<x>0</x>
78
<y>0</y>
89
<width>351</width>
910
<height>342</height>
1011
</rect>
1112
</property>
12-
<property name="windowTitle" >
13+
<property name="windowTitle">
1314
<string>Form</string>
1415
</property>
15-
<layout class="QGridLayout" >
16-
<item row="0" column="0" >
17-
<widget class="QGroupBox" name="mSearchDirectoriesGroupBox" >
18-
<property name="sizePolicy" >
19-
<sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
16+
<layout class="QGridLayout">
17+
<property name="margin">
18+
<number>0</number>
19+
</property>
20+
<item row="0" column="0">
21+
<widget class="QGroupBox" name="mSearchDirectoriesGroupBox">
22+
<property name="sizePolicy">
23+
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
2024
<horstretch>0</horstretch>
2125
<verstretch>0</verstretch>
2226
</sizepolicy>
2327
</property>
24-
<property name="title" >
28+
<property name="title">
2529
<string>Search directories</string>
2630
</property>
27-
<layout class="QGridLayout" >
28-
<item row="0" column="0" >
31+
<layout class="QGridLayout">
32+
<item row="0" column="0">
2933
<spacer>
30-
<property name="orientation" >
34+
<property name="orientation">
3135
<enum>Qt::Horizontal</enum>
3236
</property>
33-
<property name="sizeHint" >
37+
<property name="sizeHint" stdset="0">
3438
<size>
3539
<width>101</width>
3640
<height>20</height>
3741
</size>
3842
</property>
3943
</spacer>
4044
</item>
41-
<item row="0" column="1" >
42-
<widget class="QPushButton" name="mAddDirectoryButton" >
43-
<property name="text" >
45+
<item row="0" column="1">
46+
<widget class="QPushButton" name="mAddDirectoryButton">
47+
<property name="text">
4448
<string>Add...</string>
4549
</property>
4650
</widget>
4751
</item>
48-
<item row="0" column="2" >
49-
<widget class="QPushButton" name="mRemoveDirectoryButton" >
50-
<property name="text" >
52+
<item row="0" column="2">
53+
<widget class="QPushButton" name="mRemoveDirectoryButton">
54+
<property name="text">
5155
<string>Remove</string>
5256
</property>
5357
</widget>
5458
</item>
55-
<item row="1" column="0" colspan="3" >
56-
<widget class="QComboBox" name="mSearchDirectoriesComboBox" >
57-
<property name="sizePolicy" >
58-
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
59+
<item row="1" column="0" colspan="3">
60+
<widget class="QComboBox" name="mSearchDirectoriesComboBox">
61+
<property name="sizePolicy">
62+
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
5963
<horstretch>0</horstretch>
6064
<verstretch>0</verstretch>
6165
</sizepolicy>
@@ -65,82 +69,61 @@
6569
</layout>
6670
</widget>
6771
</item>
68-
<item row="1" column="0" >
69-
<widget class="QGroupBox" name="mPreviewGroupBox" >
70-
<property name="sizePolicy" >
71-
<sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
72+
<item row="1" column="0">
73+
<widget class="QGroupBox" name="mPreviewGroupBox">
74+
<property name="sizePolicy">
75+
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
7276
<horstretch>0</horstretch>
7377
<verstretch>0</verstretch>
7478
</sizepolicy>
7579
</property>
76-
<property name="title" >
80+
<property name="title">
7781
<string>SVG Preview</string>
7882
</property>
79-
<layout class="QGridLayout" >
80-
<item row="0" column="0" >
81-
<widget class="QListWidget" name="mPreviewListWidget" >
82-
<property name="movement" >
83+
<layout class="QGridLayout">
84+
<item row="0" column="0">
85+
<widget class="QListWidget" name="mPreviewListWidget">
86+
<property name="movement">
8387
<enum>QListView::Free</enum>
8488
</property>
85-
<property name="flow" >
89+
<property name="flow">
8690
<enum>QListView::LeftToRight</enum>
8791
</property>
88-
<property name="isWrapping" stdset="0" >
92+
<property name="isWrapping" stdset="0">
8993
<bool>true</bool>
9094
</property>
91-
<property name="gridSize" >
95+
<property name="gridSize">
9296
<size>
9397
<width>30</width>
9498
<height>30</height>
9599
</size>
96100
</property>
97-
<property name="viewMode" >
101+
<property name="viewMode">
98102
<enum>QListView::IconMode</enum>
99103
</property>
100-
<property name="wordWrap" >
104+
<property name="wordWrap">
101105
<bool>true</bool>
102106
</property>
103107
</widget>
104108
</item>
105109
</layout>
106110
</widget>
107111
</item>
108-
<item row="2" column="0" >
109-
<layout class="QHBoxLayout" >
110-
<property name="spacing" >
112+
<item row="2" column="0">
113+
<layout class="QHBoxLayout">
114+
<property name="spacing">
111115
<number>6</number>
112116
</property>
113-
<property name="leftMargin" >
114-
<number>0</number>
115-
</property>
116-
<property name="topMargin" >
117-
<number>0</number>
118-
</property>
119-
<property name="rightMargin" >
120-
<number>0</number>
121-
</property>
122-
<property name="bottomMargin" >
117+
<property name="margin">
123118
<number>0</number>
124119
</property>
125120
<item>
126-
<widget class="QLineEdit" name="mPictureLineEdit" />
121+
<widget class="QLineEdit" name="mPictureLineEdit"/>
127122
</item>
128123
<item>
129-
<widget class="QPushButton" name="mPictureBrowseButton" >
130-
<property name="sizePolicy" >
131-
<sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
132-
<horstretch>0</horstretch>
133-
<verstretch>0</verstretch>
134-
</sizepolicy>
135-
</property>
136-
<property name="maximumSize" >
137-
<size>
138-
<width>150</width>
139-
<height>32767</height>
140-
</size>
141-
</property>
142-
<property name="text" >
143-
<string>Browse...</string>
124+
<widget class="QToolButton" name="mPictureBrowseButton">
125+
<property name="text">
126+
<string>...</string>
144127
</property>
145128
</widget>
146129
</item>

‎src/plugins/diagram_overlay/qgswkndiagramfactorywidgetbase.ui

+41-41
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,17 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>342</width>
9+
<width>412</width>
1010
<height>277</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
1414
<string>Form</string>
1515
</property>
16-
<layout class="QGridLayout">
16+
<layout class="QGridLayout" name="gridLayout">
17+
<property name="margin">
18+
<number>0</number>
19+
</property>
1720
<item row="0" column="0">
1821
<layout class="QHBoxLayout">
1922
<property name="spacing">
@@ -30,50 +33,47 @@
3033
</widget>
3134
</item>
3235
<item>
33-
<widget class="QComboBox" name="mAttributesComboBox"/>
36+
<widget class="QComboBox" name="mAttributesComboBox">
37+
<property name="sizePolicy">
38+
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
39+
<horstretch>0</horstretch>
40+
<verstretch>0</verstretch>
41+
</sizepolicy>
42+
</property>
43+
</widget>
3444
</item>
3545
</layout>
3646
</item>
37-
<item row="1" column="0">
38-
<layout class="QGridLayout">
39-
<property name="margin">
40-
<number>0</number>
47+
<item row="0" column="1">
48+
<widget class="QPushButton" name="mAddPushButton">
49+
<property name="text">
50+
<string>Add</string>
4151
</property>
42-
<property name="spacing">
43-
<number>6</number>
52+
</widget>
53+
</item>
54+
<item row="0" column="2">
55+
<widget class="QPushButton" name="mRemovePushButton">
56+
<property name="text">
57+
<string>Remove</string>
4458
</property>
45-
<item row="1" column="0" colspan="2">
46-
<widget class="QTreeWidget" name="mAttributesTreeWidget">
47-
<property name="columnCount">
48-
<number>2</number>
49-
</property>
50-
<column>
51-
<property name="text">
52-
<string>1</string>
53-
</property>
54-
</column>
55-
<column>
56-
<property name="text">
57-
<string>1</string>
58-
</property>
59-
</column>
60-
</widget>
61-
</item>
62-
<item row="0" column="1">
63-
<widget class="QPushButton" name="mRemovePushButton">
64-
<property name="text">
65-
<string>Remove attribute</string>
66-
</property>
67-
</widget>
68-
</item>
69-
<item row="0" column="0">
70-
<widget class="QPushButton" name="mAddPushButton">
71-
<property name="text">
72-
<string>Add attribute</string>
73-
</property>
74-
</widget>
75-
</item>
76-
</layout>
59+
</widget>
60+
</item>
61+
<item row="1" column="0" colspan="3">
62+
<widget class="QTreeWidget" name="mAttributesTreeWidget">
63+
<property name="columnCount">
64+
<number>2</number>
65+
</property>
66+
<column>
67+
<property name="text">
68+
<string>1</string>
69+
</property>
70+
</column>
71+
<column>
72+
<property name="text">
73+
<string>1</string>
74+
</property>
75+
</column>
76+
</widget>
7777
</item>
7878
</layout>
7979
</widget>

0 commit comments

Comments
 (0)