Skip to content

Commit 1560c7f

Browse files
DelazJnirvn
DelazJ
authored and
nirvn
committed
Use a standardized size for authentication dialogs icons (#3824)
1 parent 37c43df commit 1560c7f

18 files changed

+45
-595
lines changed

‎src/ui/auth/qgsauthauthoritieseditor.ui

Lines changed: 1 addition & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,7 @@
1414
<string>Certificate Authorities Editor</string>
1515
</property>
1616
<layout class="QVBoxLayout" name="verticalLayout">
17-
<property name="leftMargin">
18-
<number>0</number>
19-
</property>
20-
<property name="topMargin">
21-
<number>0</number>
22-
</property>
23-
<property name="rightMargin">
24-
<number>0</number>
25-
</property>
26-
<property name="bottomMargin">
17+
<property name="margin">
2718
<number>0</number>
2819
</property>
2920
<item>
@@ -82,49 +73,19 @@
8273
</item>
8374
<item>
8475
<widget class="QToolButton" name="btnCaFileClear">
85-
<property name="minimumSize">
86-
<size>
87-
<width>26</width>
88-
<height>22</height>
89-
</size>
90-
</property>
91-
<property name="maximumSize">
92-
<size>
93-
<width>26</width>
94-
<height>22</height>
95-
</size>
96-
</property>
9776
<property name="text">
9877
<string/>
9978
</property>
10079
<property name="icon">
10180
<iconset resource="../../../images/images.qrc">
10281
<normaloff>:/images/themes/default/mIconClose.svg</normaloff>:/images/themes/default/mIconClose.svg</iconset>
10382
</property>
104-
<property name="iconSize">
105-
<size>
106-
<width>14</width>
107-
<height>14</height>
108-
</size>
109-
</property>
11083
</widget>
11184
</item>
11285
</layout>
11386
</item>
11487
<item>
11588
<widget class="QToolButton" name="btnCaFile">
116-
<property name="minimumSize">
117-
<size>
118-
<width>26</width>
119-
<height>22</height>
120-
</size>
121-
</property>
122-
<property name="maximumSize">
123-
<size>
124-
<width>26</width>
125-
<height>22</height>
126-
</size>
127-
</property>
12889
<property name="text">
12990
<string>...</string>
13091
</property>
@@ -145,12 +106,6 @@
145106
</property>
146107
<item>
147108
<widget class="QToolButton" name="btnAddCa">
148-
<property name="minimumSize">
149-
<size>
150-
<width>32</width>
151-
<height>32</height>
152-
</size>
153-
</property>
154109
<property name="toolTip">
155110
<string>Import certificate(s) to authentication database</string>
156111
</property>
@@ -161,22 +116,10 @@
161116
<iconset resource="../../../images/images.qrc">
162117
<normaloff>:/images/themes/default/symbologyAdd.svg</normaloff>:/images/themes/default/symbologyAdd.svg</iconset>
163118
</property>
164-
<property name="iconSize">
165-
<size>
166-
<width>20</width>
167-
<height>20</height>
168-
</size>
169-
</property>
170119
</widget>
171120
</item>
172121
<item>
173122
<widget class="QToolButton" name="btnRemoveCa">
174-
<property name="minimumSize">
175-
<size>
176-
<width>32</width>
177-
<height>32</height>
178-
</size>
179-
</property>
180123
<property name="toolTip">
181124
<string>Remove certificate from authentication database</string>
182125
</property>
@@ -187,22 +130,10 @@
187130
<iconset resource="../../../images/images.qrc">
188131
<normaloff>:/images/themes/default/symbologyRemove.svg</normaloff>:/images/themes/default/symbologyRemove.svg</iconset>
189132
</property>
190-
<property name="iconSize">
191-
<size>
192-
<width>20</width>
193-
<height>20</height>
194-
</size>
195-
</property>
196133
</widget>
197134
</item>
198135
<item>
199136
<widget class="QToolButton" name="btnInfoCa">
200-
<property name="minimumSize">
201-
<size>
202-
<width>32</width>
203-
<height>32</height>
204-
</size>
205-
</property>
206137
<property name="toolTip">
207138
<string>Show information for certificate</string>
208139
</property>
@@ -213,12 +144,6 @@
213144
<iconset resource="../../../images/images.qrc">
214145
<normaloff>:/images/themes/default/propertyicons/metadata.svg</normaloff>:/images/themes/default/propertyicons/metadata.svg</iconset>
215146
</property>
216-
<property name="iconSize">
217-
<size>
218-
<width>20</width>
219-
<height>20</height>
220-
</size>
221-
</property>
222147
</widget>
223148
</item>
224149
<item>
@@ -236,12 +161,6 @@
236161
</item>
237162
<item>
238163
<widget class="QToolButton" name="btnGroupByOrg">
239-
<property name="minimumSize">
240-
<size>
241-
<width>32</width>
242-
<height>32</height>
243-
</size>
244-
</property>
245164
<property name="toolTip">
246165
<string>Group by organization</string>
247166
</property>
@@ -252,12 +171,6 @@
252171
<iconset resource="../../../images/images.qrc">
253172
<normaloff>:/images/themes/default/mActionFilter.svg</normaloff>:/images/themes/default/mActionFilter.svg</iconset>
254173
</property>
255-
<property name="iconSize">
256-
<size>
257-
<width>20</width>
258-
<height>20</height>
259-
</size>
260-
</property>
261174
<property name="checkable">
262175
<bool>true</bool>
263176
</property>
@@ -268,12 +181,6 @@
268181
</item>
269182
<item>
270183
<widget class="QToolButton" name="btnViewRefresh">
271-
<property name="minimumSize">
272-
<size>
273-
<width>32</width>
274-
<height>32</height>
275-
</size>
276-
</property>
277184
<property name="toolTip">
278185
<string>Refresh certificate tree view</string>
279186
</property>
@@ -284,35 +191,17 @@
284191
<iconset resource="../../../images/images.qrc">
285192
<normaloff>:/images/themes/default/mActionRefresh.png</normaloff>:/images/themes/default/mActionRefresh.png</iconset>
286193
</property>
287-
<property name="iconSize">
288-
<size>
289-
<width>20</width>
290-
<height>20</height>
291-
</size>
292-
</property>
293194
</widget>
294195
</item>
295196
<item>
296197
<widget class="QToolButton" name="btnUtilities">
297-
<property name="minimumSize">
298-
<size>
299-
<width>32</width>
300-
<height>32</height>
301-
</size>
302-
</property>
303198
<property name="text">
304199
<string>...</string>
305200
</property>
306201
<property name="icon">
307202
<iconset resource="../../../images/images.qrc">
308203
<normaloff>:/images/themes/default/propertyicons/settings.svg</normaloff>:/images/themes/default/propertyicons/settings.svg</iconset>
309204
</property>
310-
<property name="iconSize">
311-
<size>
312-
<width>20</width>
313-
<height>20</height>
314-
</size>
315-
</property>
316205
<property name="popupMode">
317206
<enum>QToolButton::InstantPopup</enum>
318207
</property>

‎src/ui/auth/qgsauthcertificateinfo.ui

Lines changed: 3 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,7 @@
2323
<property name="spacing">
2424
<number>18</number>
2525
</property>
26-
<property name="leftMargin">
27-
<number>6</number>
28-
</property>
29-
<property name="topMargin">
30-
<number>6</number>
31-
</property>
32-
<property name="rightMargin">
33-
<number>6</number>
34-
</property>
35-
<property name="bottomMargin">
26+
<property name="margin">
3627
<number>6</number>
3728
</property>
3829
<item>
@@ -47,16 +38,7 @@
4738
<string>Certificate Hierarchy</string>
4839
</property>
4940
<layout class="QVBoxLayout" name="verticalLayout_4">
50-
<property name="leftMargin">
51-
<number>3</number>
52-
</property>
53-
<property name="topMargin">
54-
<number>3</number>
55-
</property>
56-
<property name="rightMargin">
57-
<number>3</number>
58-
</property>
59-
<property name="bottomMargin">
41+
<property name="margin">
6042
<number>3</number>
6143
</property>
6244
<item>
@@ -171,16 +153,7 @@
171153
<string/>
172154
</property>
173155
<layout class="QHBoxLayout" name="horizontalLayout">
174-
<property name="leftMargin">
175-
<number>6</number>
176-
</property>
177-
<property name="topMargin">
178-
<number>6</number>
179-
</property>
180-
<property name="rightMargin">
181-
<number>6</number>
182-
</property>
183-
<property name="bottomMargin">
156+
<property name="margin">
184157
<number>6</number>
185158
</property>
186159
<item>

‎src/ui/auth/qgsauthcertificatemanager.ui

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,7 @@
1414
<string>Authentication Certificate Editors</string>
1515
</property>
1616
<layout class="QVBoxLayout" name="verticalLayout">
17-
<property name="leftMargin">
18-
<number>6</number>
19-
</property>
20-
<property name="topMargin">
21-
<number>6</number>
22-
</property>
23-
<property name="rightMargin">
24-
<number>6</number>
25-
</property>
26-
<property name="bottomMargin">
17+
<property name="margin">
2718
<number>6</number>
2819
</property>
2920
<item>

0 commit comments

Comments
 (0)