Skip to content

Commit 813a21d

Browse files
NathanW2NathanW2
committedJun 5, 2016
[effects] relayout widget for better dock usage
1 parent dd0ddd5 commit 813a21d

File tree

2 files changed

+93
-96
lines changed

2 files changed

+93
-96
lines changed
 

‎src/ui/effects/qgseffectstackpropertieswidgetbase.ui

Lines changed: 92 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,35 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>566</width>
10-
<height>476</height>
9+
<width>347</width>
10+
<height>402</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
1414
<string>Effects</string>
1515
</property>
16-
<layout class="QGridLayout" name="gridLayout">
17-
<item row="0" column="0">
18-
<layout class="QVBoxLayout" name="verticalLayout">
16+
<layout class="QVBoxLayout" name="verticalLayout_3">
17+
<item>
18+
<layout class="QHBoxLayout" name="horizontalLayout">
19+
<item>
20+
<widget class="QListView" name="mEffectsList">
21+
<property name="sizePolicy">
22+
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
23+
<horstretch>0</horstretch>
24+
<verstretch>0</verstretch>
25+
</sizepolicy>
26+
</property>
27+
<property name="maximumSize">
28+
<size>
29+
<width>16777215</width>
30+
<height>150</height>
31+
</size>
32+
</property>
33+
<property name="editTriggers">
34+
<set>QAbstractItemView::NoEditTriggers</set>
35+
</property>
36+
</widget>
37+
</item>
1938
<item>
2039
<widget class="QLabel" name="lblPreview">
2140
<property name="sizePolicy">
@@ -37,7 +56,7 @@
3756
</size>
3857
</property>
3958
<property name="frameShape">
40-
<enum>QFrame::StyledPanel</enum>
59+
<enum>QFrame::NoFrame</enum>
4160
</property>
4261
<property name="frameShadow">
4362
<enum>QFrame::Sunken</enum>
@@ -56,94 +75,81 @@
5675
</property>
5776
</widget>
5877
</item>
78+
</layout>
79+
</item>
80+
<item>
81+
<layout class="QHBoxLayout" name="pushBtnBox">
82+
<property name="spacing">
83+
<number>6</number>
84+
</property>
5985
<item>
60-
<widget class="QListView" name="mEffectsList">
61-
<property name="sizePolicy">
62-
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
63-
<horstretch>0</horstretch>
64-
<verstretch>0</verstretch>
65-
</sizepolicy>
86+
<widget class="QPushButton" name="mAddButton">
87+
<property name="maximumSize">
88+
<size>
89+
<width>50</width>
90+
<height>16777215</height>
91+
</size>
6692
</property>
67-
<property name="editTriggers">
68-
<set>QAbstractItemView::NoEditTriggers</set>
93+
<property name="toolTip">
94+
<string>Add new effect</string>
95+
</property>
96+
</widget>
97+
</item>
98+
<item>
99+
<widget class="QPushButton" name="mRemoveButton">
100+
<property name="maximumSize">
101+
<size>
102+
<width>50</width>
103+
<height>16777215</height>
104+
</size>
105+
</property>
106+
<property name="toolTip">
107+
<string>Remove effect</string>
69108
</property>
70109
</widget>
71110
</item>
72111
<item>
73-
<layout class="QHBoxLayout" name="pushBtnBox">
74-
<property name="spacing">
75-
<number>6</number>
76-
</property>
77-
<item>
78-
<widget class="QPushButton" name="mAddButton">
79-
<property name="maximumSize">
80-
<size>
81-
<width>50</width>
82-
<height>16777215</height>
83-
</size>
84-
</property>
85-
<property name="toolTip">
86-
<string>Add new effect</string>
87-
</property>
88-
</widget>
89-
</item>
90-
<item>
91-
<widget class="QPushButton" name="mRemoveButton">
92-
<property name="maximumSize">
93-
<size>
94-
<width>50</width>
95-
<height>16777215</height>
96-
</size>
97-
</property>
98-
<property name="toolTip">
99-
<string>Remove effect</string>
100-
</property>
101-
</widget>
102-
</item>
103-
<item>
104-
<widget class="QPushButton" name="mUpButton">
105-
<property name="maximumSize">
106-
<size>
107-
<width>50</width>
108-
<height>16777215</height>
109-
</size>
110-
</property>
111-
<property name="toolTip">
112-
<string>Move up</string>
113-
</property>
114-
</widget>
115-
</item>
116-
<item>
117-
<widget class="QPushButton" name="mDownButton">
118-
<property name="maximumSize">
119-
<size>
120-
<width>50</width>
121-
<height>16777215</height>
122-
</size>
123-
</property>
124-
<property name="toolTip">
125-
<string>Move down</string>
126-
</property>
127-
</widget>
128-
</item>
129-
<item>
130-
<spacer name="horizontalSpacer">
131-
<property name="orientation">
132-
<enum>Qt::Horizontal</enum>
133-
</property>
134-
<property name="sizeHint" stdset="0">
135-
<size>
136-
<width>20</width>
137-
<height>20</height>
138-
</size>
139-
</property>
140-
</spacer>
141-
</item>
142-
</layout>
112+
<widget class="QPushButton" name="mUpButton">
113+
<property name="maximumSize">
114+
<size>
115+
<width>50</width>
116+
<height>16777215</height>
117+
</size>
118+
</property>
119+
<property name="toolTip">
120+
<string>Move up</string>
121+
</property>
122+
</widget>
123+
</item>
124+
<item>
125+
<widget class="QPushButton" name="mDownButton">
126+
<property name="maximumSize">
127+
<size>
128+
<width>50</width>
129+
<height>16777215</height>
130+
</size>
131+
</property>
132+
<property name="toolTip">
133+
<string>Move down</string>
134+
</property>
135+
</widget>
136+
</item>
137+
<item>
138+
<spacer name="horizontalSpacer">
139+
<property name="orientation">
140+
<enum>Qt::Horizontal</enum>
141+
</property>
142+
<property name="sizeHint" stdset="0">
143+
<size>
144+
<width>20</width>
145+
<height>20</height>
146+
</size>
147+
</property>
148+
</spacer>
143149
</item>
144150
</layout>
145151
</item>
146-
<item row="0" column="1" colspan="2">
152+
<item>
147153
<widget class="QFrame" name="frame">
148154
<property name="sizePolicy">
149155
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
@@ -161,16 +167,7 @@
161167
<property name="spacing">
162168
<number>0</number>
163169
</property>
164-
<property name="leftMargin">
165-
<number>0</number>
166-
</property>
167-
<property name="topMargin">
168-
<number>0</number>
169-
</property>
170-
<property name="rightMargin">
171-
<number>0</number>
172-
</property>
173-
<property name="bottomMargin">
170+
<property name="margin">
174171
<number>0</number>
175172
</property>
176173
<item>

‎src/ui/qgssymbolv2selectordialogbase.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<x>0</x>
3838
<y>0</y>
3939
<width>364</width>
40-
<height>556</height>
40+
<height>552</height>
4141
</rect>
4242
</property>
4343
<layout class="QGridLayout" name="gridLayout">

0 commit comments

Comments
 (0)
Please sign in to comment.