Skip to content

Commit 7fc1b87

Browse files
alexbruyalexbruy
committedNov 17, 2014
homogenize icons related to managing project and global scale lists
·
ltr-3_40archive/master_2
1 parent e54a786 commit 7fc1b87

File tree

1 file changed

+53
-152
lines changed

1 file changed

+53
-152
lines changed
 

‎src/ui/qgsprojectpropertiesbase.ui

Lines changed: 53 additions & 152 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,7 @@
4242
<enum>QFrame::Raised</enum>
4343
</property>
4444
<layout class="QVBoxLayout" name="verticalLayout_2">
45-
<property name="leftMargin">
46-
<number>0</number>
47-
</property>
48-
<property name="topMargin">
49-
<number>0</number>
50-
</property>
51-
<property name="rightMargin">
52-
<number>0</number>
53-
</property>
54-
<property name="bottomMargin">
45+
<property name="margin">
5546
<number>0</number>
5647
</property>
5748
<item>
@@ -188,16 +179,7 @@
188179
<enum>QFrame::Raised</enum>
189180
</property>
190181
<layout class="QVBoxLayout" name="verticalLayout_3">
191-
<property name="leftMargin">
192-
<number>0</number>
193-
</property>
194-
<property name="topMargin">
195-
<number>0</number>
196-
</property>
197-
<property name="rightMargin">
198-
<number>0</number>
199-
</property>
200-
<property name="bottomMargin">
182+
<property name="margin">
201183
<number>0</number>
202184
</property>
203185
<item>
@@ -213,16 +195,7 @@
213195
</property>
214196
<widget class="QWidget" name="mProjOpts_01">
215197
<layout class="QVBoxLayout" name="verticalLayout_6">
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">
198+
<property name="margin">
226199
<number>0</number>
227200
</property>
228201
<item>
@@ -238,8 +211,8 @@
238211
<rect>
239212
<x>0</x>
240213
<y>0</y>
241-
<width>637</width>
242-
<height>696</height>
214+
<width>683</width>
215+
<height>780</height>
243216
</rect>
244217
</property>
245218
<layout class="QVBoxLayout" name="verticalLayout_8">
@@ -254,7 +227,7 @@
254227
<property name="title">
255228
<string>General settings</string>
256229
</property>
257-
<property name="syncGroup" stdset="0">
230+
<property name="syncGroup">
258231
<string notr="true">projgeneral</string>
259232
</property>
260233
<layout class="QGridLayout" name="gridLayout_26">
@@ -454,7 +427,7 @@
454427
<property name="title">
455428
<string>Measure tool</string>
456429
</property>
457-
<property name="syncGroup" stdset="0">
430+
<property name="syncGroup">
458431
<string notr="true">projgeneral</string>
459432
</property>
460433
<layout class="QGridLayout" name="gridLayoutMeasureTool">
@@ -506,7 +479,7 @@
506479
<property name="title">
507480
<string>Canvas units</string>
508481
</property>
509-
<property name="syncGroup" stdset="0">
482+
<property name="syncGroup">
510483
<string notr="true">projgeneral</string>
511484
</property>
512485
<layout class="QVBoxLayout" name="verticalLayout_19">
@@ -623,7 +596,7 @@
623596
<property name="title">
624597
<string>Precision</string>
625598
</property>
626-
<property name="syncGroup" stdset="0">
599+
<property name="syncGroup">
627600
<string notr="true">projgeneral</string>
628601
</property>
629602
<layout class="QGridLayout" name="gridLayout_28">
@@ -636,16 +609,7 @@
636609
<enum>QFrame::Raised</enum>
637610
</property>
638611
<layout class="QHBoxLayout" name="horizontalLayout_4">
639-
<property name="leftMargin">
640-
<number>0</number>
641-
</property>
642-
<property name="topMargin">
643-
<number>0</number>
644-
</property>
645-
<property name="rightMargin">
646-
<number>0</number>
647-
</property>
648-
<property name="bottomMargin">
612+
<property name="margin">
649613
<number>0</number>
650614
</property>
651615
<item>
@@ -726,7 +690,7 @@
726690
<property name="checked">
727691
<bool>false</bool>
728692
</property>
729-
<property name="syncGroup" stdset="0">
693+
<property name="syncGroup">
730694
<string notr="true">projgeneral</string>
731695
</property>
732696
<layout class="QGridLayout" name="gridLayout_7">
@@ -742,7 +706,7 @@
742706
</property>
743707
<property name="icon">
744708
<iconset resource="../../images/images.qrc">
745-
<normaloff>:/images/themes/default/mActionNewAttribute.png</normaloff>:/images/themes/default/mActionNewAttribute.png</iconset>
709+
<normaloff>:/images/themes/default/symbologyAdd.png</normaloff>:/images/themes/default/symbologyAdd.png</iconset>
746710
</property>
747711
</widget>
748712
</item>
@@ -753,7 +717,7 @@
753717
</property>
754718
<property name="icon">
755719
<iconset resource="../../images/images.qrc">
756-
<normaloff>:/images/themes/default/mActionDeleteAttribute.png</normaloff>:/images/themes/default/mActionDeleteAttribute.png</iconset>
720+
<normaloff>:/images/themes/default/mActionSignMinus.png</normaloff>:/images/themes/default/mActionSignMinus.png</iconset>
757721
</property>
758722
</widget>
759723
</item>
@@ -764,7 +728,7 @@
764728
</property>
765729
<property name="icon">
766730
<iconset resource="../../images/images.qrc">
767-
<normaloff>:/images/themes/default/mActionFolder.png</normaloff>:/images/themes/default/mActionFolder.png</iconset>
731+
<normaloff>:/images/themes/default/mActionFileOpen.svg</normaloff>:/images/themes/default/mActionFileOpen.svg</iconset>
768732
</property>
769733
</widget>
770734
</item>
@@ -818,16 +782,7 @@
818782
</widget>
819783
<widget class="QWidget" name="mProjOpts_02">
820784
<layout class="QVBoxLayout" name="verticalLayout_5">
821-
<property name="leftMargin">
822-
<number>0</number>
823-
</property>
824-
<property name="topMargin">
825-
<number>0</number>
826-
</property>
827-
<property name="rightMargin">
828-
<number>0</number>
829-
</property>
830-
<property name="bottomMargin">
785+
<property name="margin">
831786
<number>0</number>
832787
</property>
833788
<item>
@@ -843,8 +798,8 @@
843798
<rect>
844799
<x>0</x>
845800
<y>0</y>
846-
<width>328</width>
847-
<height>54</height>
801+
<width>683</width>
802+
<height>780</height>
848803
</rect>
849804
</property>
850805
<layout class="QVBoxLayout" name="verticalLayout_7">
@@ -877,16 +832,7 @@
877832
</widget>
878833
<widget class="QWidget" name="mProjOpts_03">
879834
<layout class="QVBoxLayout" name="verticalLayout_9">
880-
<property name="leftMargin">
881-
<number>0</number>
882-
</property>
883-
<property name="topMargin">
884-
<number>0</number>
885-
</property>
886-
<property name="rightMargin">
887-
<number>0</number>
888-
</property>
889-
<property name="bottomMargin">
835+
<property name="margin">
890836
<number>0</number>
891837
</property>
892838
<item>
@@ -902,8 +848,8 @@
902848
<rect>
903849
<x>0</x>
904850
<y>0</y>
905-
<width>141</width>
906-
<height>100</height>
851+
<width>683</width>
852+
<height>780</height>
907853
</rect>
908854
</property>
909855
<layout class="QVBoxLayout" name="verticalLayout_10">
@@ -958,16 +904,7 @@
958904
</widget>
959905
<widget class="QWidget" name="mProjOpts_04">
960906
<layout class="QVBoxLayout" name="verticalLayout_11">
961-
<property name="leftMargin">
962-
<number>0</number>
963-
</property>
964-
<property name="topMargin">
965-
<number>0</number>
966-
</property>
967-
<property name="rightMargin">
968-
<number>0</number>
969-
</property>
970-
<property name="bottomMargin">
907+
<property name="margin">
971908
<number>0</number>
972909
</property>
973910
<item>
@@ -983,8 +920,8 @@
983920
<rect>
984921
<x>0</x>
985922
<y>0</y>
986-
<width>379</width>
987-
<height>570</height>
923+
<width>683</width>
924+
<height>780</height>
988925
</rect>
989926
</property>
990927
<layout class="QVBoxLayout" name="verticalLayout_12">
@@ -993,7 +930,7 @@
993930
<property name="title">
994931
<string>Default symbols</string>
995932
</property>
996-
<property name="syncGroup" stdset="0">
933+
<property name="syncGroup">
997934
<string notr="true">projstyles</string>
998935
</property>
999936
<layout class="QGridLayout" name="gridLayout_11">
@@ -1208,7 +1145,7 @@
12081145
<property name="title">
12091146
<string>Options</string>
12101147
</property>
1211-
<property name="syncGroup" stdset="0">
1148+
<property name="syncGroup">
12121149
<string notr="true">projstyles</string>
12131150
</property>
12141151
<layout class="QVBoxLayout" name="verticalLayout_18">
@@ -1383,16 +1320,7 @@
13831320
</widget>
13841321
<widget class="QWidget" name="mProjOpts_05">
13851322
<layout class="QVBoxLayout" name="verticalLayout_14">
1386-
<property name="leftMargin">
1387-
<number>0</number>
1388-
</property>
1389-
<property name="topMargin">
1390-
<number>0</number>
1391-
</property>
1392-
<property name="rightMargin">
1393-
<number>0</number>
1394-
</property>
1395-
<property name="bottomMargin">
1323+
<property name="margin">
13961324
<number>0</number>
13971325
</property>
13981326
<item>
@@ -1407,9 +1335,9 @@
14071335
<property name="geometry">
14081336
<rect>
14091337
<x>0</x>
1410-
<y>-330</y>
1411-
<width>671</width>
1412-
<height>1624</height>
1338+
<y>0</y>
1339+
<width>667</width>
1340+
<height>1562</height>
14131341
</rect>
14141342
</property>
14151343
<layout class="QVBoxLayout" name="verticalLayout_13">
@@ -1430,13 +1358,13 @@
14301358
<property name="checked">
14311359
<bool>false</bool>
14321360
</property>
1433-
<property name="collapsed" stdset="0">
1361+
<property name="collapsed">
14341362
<bool>false</bool>
14351363
</property>
1436-
<property name="saveCollapsedState" stdset="0">
1364+
<property name="saveCollapsedState">
14371365
<bool>true</bool>
14381366
</property>
1439-
<property name="syncGroup" stdset="0">
1367+
<property name="syncGroup">
14401368
<string notr="true">projowsserver</string>
14411369
</property>
14421370
<layout class="QGridLayout" name="gridLayout_6">
@@ -1563,7 +1491,7 @@
15631491
<property name="title">
15641492
<string>WMS capabilities</string>
15651493
</property>
1566-
<property name="syncGroup" stdset="0">
1494+
<property name="syncGroup">
15671495
<string notr="true">projowsserver</string>
15681496
</property>
15691497
<layout class="QGridLayout" name="gridLayout_13">
@@ -1578,10 +1506,10 @@
15781506
<property name="checked">
15791507
<bool>false</bool>
15801508
</property>
1581-
<property name="collapsed" stdset="0">
1509+
<property name="collapsed">
15821510
<bool>false</bool>
15831511
</property>
1584-
<property name="saveCollapsedState" stdset="0">
1512+
<property name="saveCollapsedState">
15851513
<bool>true</bool>
15861514
</property>
15871515
<layout class="QGridLayout" name="gridLayout_10">
@@ -1637,10 +1565,10 @@
16371565
<property name="checked">
16381566
<bool>false</bool>
16391567
</property>
1640-
<property name="collapsed" stdset="0">
1568+
<property name="collapsed">
16411569
<bool>false</bool>
16421570
</property>
1643-
<property name="saveCollapsedState" stdset="0">
1571+
<property name="saveCollapsedState">
16441572
<bool>true</bool>
16451573
</property>
16461574
<layout class="QGridLayout" name="gridLayout">
@@ -1696,10 +1624,10 @@
16961624
<property name="checked">
16971625
<bool>false</bool>
16981626
</property>
1699-
<property name="collapsed" stdset="0">
1627+
<property name="collapsed">
17001628
<bool>false</bool>
17011629
</property>
1702-
<property name="saveCollapsedState" stdset="0">
1630+
<property name="saveCollapsedState">
17031631
<bool>true</bool>
17041632
</property>
17051633
<layout class="QGridLayout" name="gridLayout_4">
@@ -1805,10 +1733,10 @@
18051733
<property name="checked">
18061734
<bool>false</bool>
18071735
</property>
1808-
<property name="collapsed" stdset="0">
1736+
<property name="collapsed">
18091737
<bool>false</bool>
18101738
</property>
1811-
<property name="saveCollapsedState" stdset="0">
1739+
<property name="saveCollapsedState">
18121740
<bool>true</bool>
18131741
</property>
18141742
<layout class="QGridLayout" name="gridLayout_5">
@@ -1981,7 +1909,7 @@
19811909
<property name="title">
19821910
<string>WFS capabilities</string>
19831911
</property>
1984-
<property name="syncGroup" stdset="0">
1912+
<property name="syncGroup">
19851913
<string notr="true">projowsserver</string>
19861914
</property>
19871915
<layout class="QGridLayout" name="gridLayout_8">
@@ -2067,7 +1995,7 @@
20671995
<property name="title">
20681996
<string>WCS capabilities</string>
20691997
</property>
2070-
<property name="syncGroup" stdset="0">
1998+
<property name="syncGroup">
20711999
<string notr="true">projowsserver</string>
20722000
</property>
20732001
<layout class="QGridLayout" name="gridLayout_9">
@@ -2143,16 +2071,7 @@
21432071
</widget>
21442072
<widget class="QWidget" name="mProjOpts_06">
21452073
<layout class="QVBoxLayout" name="verticalLayout_15">
2146-
<property name="leftMargin">
2147-
<number>0</number>
2148-
</property>
2149-
<property name="topMargin">
2150-
<number>0</number>
2151-
</property>
2152-
<property name="rightMargin">
2153-
<number>0</number>
2154-
</property>
2155-
<property name="bottomMargin">
2074+
<property name="margin">
21562075
<number>0</number>
21572076
</property>
21582077
<item>
@@ -2168,8 +2087,8 @@
21682087
<rect>
21692088
<x>0</x>
21702089
<y>0</y>
2171-
<width>170</width>
2172-
<height>54</height>
2090+
<width>683</width>
2091+
<height>780</height>
21732092
</rect>
21742093
</property>
21752094
<layout class="QVBoxLayout" name="verticalLayout_17">
@@ -2205,16 +2124,7 @@
22052124
</widget>
22062125
<widget class="QWidget" name="mTabRelations">
22072126
<layout class="QGridLayout" name="gridLayout_16">
2208-
<property name="leftMargin">
2209-
<number>0</number>
2210-
</property>
2211-
<property name="topMargin">
2212-
<number>0</number>
2213-
</property>
2214-
<property name="rightMargin">
2215-
<number>0</number>
2216-
</property>
2217-
<property name="bottomMargin">
2127+
<property name="margin">
22182128
<number>0</number>
22192129
</property>
22202130
</layout>
@@ -2240,16 +2150,7 @@
22402150
<enum>QFrame::Raised</enum>
22412151
</property>
22422152
<layout class="QHBoxLayout" name="horizontalLayout">
2243-
<property name="leftMargin">
2244-
<number>0</number>
2245-
</property>
2246-
<property name="topMargin">
2247-
<number>0</number>
2248-
</property>
2249-
<property name="rightMargin">
2250-
<number>0</number>
2251-
</property>
2252-
<property name="bottomMargin">
2153+
<property name="margin">
22532154
<number>0</number>
22542155
</property>
22552156
<item>
@@ -2268,17 +2169,17 @@
22682169
</layout>
22692170
</widget>
22702171
<customwidgets>
2271-
<customwidget>
2272-
<class>QgsColorButtonV2</class>
2273-
<extends>QToolButton</extends>
2274-
<header>qgscolorbuttonv2.h</header>
2275-
</customwidget>
22762172
<customwidget>
22772173
<class>QgsCollapsibleGroupBox</class>
22782174
<extends>QGroupBox</extends>
22792175
<header>qgscollapsiblegroupbox.h</header>
22802176
<container>1</container>
22812177
</customwidget>
2178+
<customwidget>
2179+
<class>QgsColorButtonV2</class>
2180+
<extends>QToolButton</extends>
2181+
<header>qgscolorbuttonv2.h</header>
2182+
</customwidget>
22822183
<customwidget>
22832184
<class>QgsProjectionSelector</class>
22842185
<extends>QWidget</extends>

0 commit comments

Comments
 (0)
Please sign in to comment.