Skip to content

Commit 5e67e3d

Browse files
author
timlinux
committedNov 21, 2009
Property list updates so they work nicely when icons are ready
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@12217 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
final-1_7_1final-1_7_0
1 parent 9e2aa62 commit 5e67e3d

File tree

3 files changed

+382
-125
lines changed

3 files changed

+382
-125
lines changed
 

‎src/ui/qgsoptionsbase.ui

Lines changed: 145 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -20,52 +20,11 @@
2020
<bool>true</bool>
2121
</property>
2222
<layout class="QGridLayout" name="gridLayout_3">
23-
<item row="0" column="0">
24-
<widget class="QListWidget" name="listWidget">
25-
<item>
26-
<property name="text">
27-
<string>General</string>
28-
</property>
29-
</item>
30-
<item>
31-
<property name="text">
32-
<string>Rendering &amp; SVG</string>
33-
</property>
34-
</item>
35-
<item>
36-
<property name="text">
37-
<string>Map tools</string>
38-
</property>
39-
</item>
40-
<item>
41-
<property name="text">
42-
<string>Overlay</string>
43-
</property>
44-
</item>
45-
<item>
46-
<property name="text">
47-
<string>Digitising</string>
48-
</property>
49-
</item>
50-
<item>
51-
<property name="text">
52-
<string>CRS</string>
53-
</property>
54-
</item>
55-
<item>
56-
<property name="text">
57-
<string>Locale</string>
58-
</property>
59-
</item>
60-
<item>
61-
<property name="text">
62-
<string>Network &amp; Proxy</string>
63-
</property>
64-
</item>
65-
</widget>
66-
</item>
6723
<item row="0" column="1">
6824
<widget class="QStackedWidget" name="stackedWidget">
25+
<property name="currentIndex">
26+
<number>0</number>
27+
</property>
6928
<widget class="QWidget" name="stackedWidgetPage1">
7029
<layout class="QGridLayout">
7130
<property name="margin">
@@ -1288,6 +1247,148 @@
12881247
</property>
12891248
</widget>
12901249
</item>
1250+
<item row="0" column="0">
1251+
<widget class="QListWidget" name="listWidget">
1252+
<property name="minimumSize">
1253+
<size>
1254+
<width>110</width>
1255+
<height>0</height>
1256+
</size>
1257+
</property>
1258+
<property name="maximumSize">
1259+
<size>
1260+
<width>110</width>
1261+
<height>16777215</height>
1262+
</size>
1263+
</property>
1264+
<property name="frameShape">
1265+
<enum>QFrame::NoFrame</enum>
1266+
</property>
1267+
<property name="frameShadow">
1268+
<enum>QFrame::Plain</enum>
1269+
</property>
1270+
<property name="horizontalScrollBarPolicy">
1271+
<enum>Qt::ScrollBarAlwaysOff</enum>
1272+
</property>
1273+
<property name="editTriggers">
1274+
<set>QAbstractItemView::NoEditTriggers</set>
1275+
</property>
1276+
<property name="showDropIndicator" stdset="0">
1277+
<bool>false</bool>
1278+
</property>
1279+
<property name="alternatingRowColors">
1280+
<bool>false</bool>
1281+
</property>
1282+
<property name="iconSize">
1283+
<size>
1284+
<width>64</width>
1285+
<height>64</height>
1286+
</size>
1287+
</property>
1288+
<property name="textElideMode">
1289+
<enum>Qt::ElideNone</enum>
1290+
</property>
1291+
<property name="flow">
1292+
<enum>QListView::TopToBottom</enum>
1293+
</property>
1294+
<property name="isWrapping" stdset="0">
1295+
<bool>false</bool>
1296+
</property>
1297+
<property name="resizeMode">
1298+
<enum>QListView::Adjust</enum>
1299+
</property>
1300+
<property name="spacing">
1301+
<number>9</number>
1302+
</property>
1303+
<property name="viewMode">
1304+
<enum>QListView::IconMode</enum>
1305+
</property>
1306+
<property name="uniformItemSizes">
1307+
<bool>false</bool>
1308+
</property>
1309+
<property name="wordWrap">
1310+
<bool>true</bool>
1311+
</property>
1312+
<item>
1313+
<property name="text">
1314+
<string>General</string>
1315+
</property>
1316+
<property name="textAlignment">
1317+
<set>AlignHCenter|AlignVCenter|AlignCenter</set>
1318+
</property>
1319+
<property name="icon">
1320+
<iconset>
1321+
<normaloff>../../../../../../../tmp/info.png</normaloff>../../../../../../../tmp/info.png</iconset>
1322+
</property>
1323+
</item>
1324+
<item>
1325+
<property name="text">
1326+
<string>Rendering &amp; SVG</string>
1327+
</property>
1328+
<property name="textAlignment">
1329+
<set>AlignHCenter|AlignVCenter|AlignCenter</set>
1330+
</property>
1331+
<property name="icon">
1332+
<iconset>
1333+
<normaloff>../../../../../../../tmp/info.png</normaloff>../../../../../../../tmp/info.png</iconset>
1334+
</property>
1335+
</item>
1336+
<item>
1337+
<property name="text">
1338+
<string>Map tools</string>
1339+
</property>
1340+
<property name="icon">
1341+
<iconset>
1342+
<normaloff>../../../../../../../tmp/info.png</normaloff>../../../../../../../tmp/info.png</iconset>
1343+
</property>
1344+
</item>
1345+
<item>
1346+
<property name="text">
1347+
<string>Overlay</string>
1348+
</property>
1349+
<property name="icon">
1350+
<iconset>
1351+
<normaloff>../../../../../../../tmp/info.png</normaloff>../../../../../../../tmp/info.png</iconset>
1352+
</property>
1353+
</item>
1354+
<item>
1355+
<property name="text">
1356+
<string>Digitising</string>
1357+
</property>
1358+
<property name="icon">
1359+
<iconset>
1360+
<normaloff>../../../../../../../tmp/info.png</normaloff>../../../../../../../tmp/info.png</iconset>
1361+
</property>
1362+
</item>
1363+
<item>
1364+
<property name="text">
1365+
<string>CRS</string>
1366+
</property>
1367+
<property name="icon">
1368+
<iconset>
1369+
<normaloff>../../../../../../../tmp/info.png</normaloff>../../../../../../../tmp/info.png</iconset>
1370+
</property>
1371+
</item>
1372+
<item>
1373+
<property name="text">
1374+
<string>Locale</string>
1375+
</property>
1376+
<property name="icon">
1377+
<iconset>
1378+
<normaloff>../../../../../../../tmp/info.png</normaloff>../../../../../../../tmp/info.png</iconset>
1379+
</property>
1380+
</item>
1381+
<item>
1382+
<property name="text">
1383+
<string>Network &amp; Proxy</string>
1384+
</property>
1385+
<property name="icon">
1386+
<iconset>
1387+
<normaloff>../../../../../../../tmp/info.png</normaloff>../../../../../../../tmp/info.png</iconset>
1388+
</property>
1389+
</item>
1390+
</widget>
1391+
</item>
12911392
</layout>
12921393
</widget>
12931394
<layoutdefault spacing="6" margin="11"/>

‎src/ui/qgsrasterlayerpropertiesbase.ui

Lines changed: 112 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<x>0</x>
88
<y>0</y>
99
<width>757</width>
10-
<height>648</height>
10+
<height>608</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
@@ -27,49 +27,137 @@
2727
<layout class="QGridLayout" name="gridLayout">
2828
<item row="0" column="0">
2929
<widget class="QListWidget" name="listWidget">
30+
<property name="minimumSize">
31+
<size>
32+
<width>110</width>
33+
<height>0</height>
34+
</size>
35+
</property>
36+
<property name="maximumSize">
37+
<size>
38+
<width>110</width>
39+
<height>16777215</height>
40+
</size>
41+
</property>
42+
<property name="frameShape">
43+
<enum>QFrame::NoFrame</enum>
44+
</property>
45+
<property name="frameShadow">
46+
<enum>QFrame::Plain</enum>
47+
</property>
48+
<property name="horizontalScrollBarPolicy">
49+
<enum>Qt::ScrollBarAlwaysOff</enum>
50+
</property>
51+
<property name="editTriggers">
52+
<set>QAbstractItemView::NoEditTriggers</set>
53+
</property>
54+
<property name="showDropIndicator" stdset="0">
55+
<bool>false</bool>
56+
</property>
57+
<property name="alternatingRowColors">
58+
<bool>false</bool>
59+
</property>
60+
<property name="iconSize">
61+
<size>
62+
<width>64</width>
63+
<height>64</height>
64+
</size>
65+
</property>
66+
<property name="textElideMode">
67+
<enum>Qt::ElideNone</enum>
68+
</property>
69+
<property name="flow">
70+
<enum>QListView::TopToBottom</enum>
71+
</property>
72+
<property name="isWrapping" stdset="0">
73+
<bool>false</bool>
74+
</property>
75+
<property name="resizeMode">
76+
<enum>QListView::Adjust</enum>
77+
</property>
78+
<property name="spacing">
79+
<number>9</number>
80+
</property>
81+
<property name="viewMode">
82+
<enum>QListView::IconMode</enum>
83+
</property>
84+
<property name="uniformItemSizes">
85+
<bool>false</bool>
86+
</property>
87+
<property name="wordWrap">
88+
<bool>true</bool>
89+
</property>
3090
<item>
3191
<property name="text">
3292
<string>Symbology</string>
3393
</property>
94+
<property name="icon">
95+
<iconset>
96+
<normaloff>../../../../../../../tmp/info.png</normaloff>../../../../../../../tmp/info.png</iconset>
97+
</property>
3498
</item>
3599
<item>
36100
<property name="text">
37101
<string>Transparency</string>
38102
</property>
103+
<property name="icon">
104+
<iconset>
105+
<normaloff>../../../../../../../tmp/info.png</normaloff>../../../../../../../tmp/info.png</iconset>
106+
</property>
39107
</item>
40108
<item>
41109
<property name="text">
42110
<string>Colormap</string>
43111
</property>
112+
<property name="icon">
113+
<iconset>
114+
<normaloff>../../../../../../../tmp/info.png</normaloff>../../../../../../../tmp/info.png</iconset>
115+
</property>
44116
</item>
45117
<item>
46118
<property name="text">
47119
<string>General</string>
48120
</property>
121+
<property name="icon">
122+
<iconset>
123+
<normaloff>../../../../../../../tmp/info.png</normaloff>../../../../../../../tmp/info.png</iconset>
124+
</property>
49125
</item>
50126
<item>
51127
<property name="text">
52128
<string>Metadata</string>
53129
</property>
130+
<property name="icon">
131+
<iconset>
132+
<normaloff>../../../../../../../tmp/info.png</normaloff>../../../../../../../tmp/info.png</iconset>
133+
</property>
54134
</item>
55135
<item>
56136
<property name="text">
57137
<string>Pyramids</string>
58138
</property>
139+
<property name="icon">
140+
<iconset>
141+
<normaloff>../../../../../../../tmp/info.png</normaloff>../../../../../../../tmp/info.png</iconset>
142+
</property>
59143
</item>
60144
<item>
61145
<property name="text">
62146
<string>Histogram</string>
63147
</property>
148+
<property name="icon">
149+
<iconset>
150+
<normaloff>../../../../../../../tmp/info.png</normaloff>../../../../../../../tmp/info.png</iconset>
151+
</property>
64152
</item>
65153
</widget>
66154
</item>
67-
<item row="0" column="1" rowspan="2" colspan="4">
155+
<item row="0" column="1" colspan="4">
68156
<widget class="QStackedWidget" name="tabBar">
69157
<property name="currentIndex">
70158
<number>2</number>
71159
</property>
72-
<widget class="QWidget" name="tabPageSymbology" native="true">
160+
<widget class="QWidget" name="tabPageSymbology">
73161
<layout class="QGridLayout">
74162
<property name="margin">
75163
<number>0</number>
@@ -914,7 +1002,7 @@
9141002
</item>
9151003
</layout>
9161004
</widget>
917-
<widget class="QWidget" name="tabPageTransparency" native="true">
1005+
<widget class="QWidget" name="tabPageTransparency">
9181006
<layout class="QGridLayout">
9191007
<property name="margin">
9201008
<number>0</number>
@@ -1195,7 +1283,7 @@
11951283
</item>
11961284
</layout>
11971285
</widget>
1198-
<widget class="QWidget" name="tabPageColormap" native="true">
1286+
<widget class="QWidget" name="tabPageColormap">
11991287
<layout class="QGridLayout">
12001288
<property name="margin">
12011289
<number>0</number>
@@ -1397,7 +1485,7 @@
13971485
</item>
13981486
</layout>
13991487
</widget>
1400-
<widget class="QWidget" name="tabPageGeneral" native="true">
1488+
<widget class="QWidget" name="tabPageGeneral">
14011489
<layout class="QGridLayout">
14021490
<property name="margin">
14031491
<number>0</number>
@@ -1695,7 +1783,7 @@
16951783
</item>
16961784
</layout>
16971785
</widget>
1698-
<widget class="QWidget" name="tabPageMetadata" native="true">
1786+
<widget class="QWidget" name="tabPageMetadata">
16991787
<layout class="QGridLayout">
17001788
<property name="margin">
17011789
<number>0</number>
@@ -1705,7 +1793,7 @@
17051793
</item>
17061794
</layout>
17071795
</widget>
1708-
<widget class="QWidget" name="tabPagePyramids" native="true">
1796+
<widget class="QWidget" name="tabPagePyramids">
17091797
<layout class="QGridLayout">
17101798
<property name="margin">
17111799
<number>0</number>
@@ -1804,7 +1892,7 @@ p, li { white-space: pre-wrap; }
18041892
</item>
18051893
</layout>
18061894
</widget>
1807-
<widget class="QWidget" name="tabPageHistogram" native="true">
1895+
<widget class="QWidget" name="tabPageHistogram">
18081896
<layout class="QGridLayout">
18091897
<property name="margin">
18101898
<number>0</number>
@@ -1968,35 +2056,35 @@ p, li { white-space: pre-wrap; }
19682056
</widget>
19692057
</widget>
19702058
</item>
1971-
<item row="1" column="2" rowspan="2">
1972-
<widget class="QPushButton" name="pbnSaveDefaultStyle">
2059+
<item row="1" column="0" colspan="2">
2060+
<widget class="QPushButton" name="pbnLoadDefaultStyle">
19732061
<property name="text">
1974-
<string>Save As Default</string>
2062+
<string>Restore Default Style</string>
19752063
</property>
19762064
</widget>
19772065
</item>
1978-
<item row="2" column="0">
1979-
<widget class="QPushButton" name="pbnLoadDefaultStyle">
2066+
<item row="1" column="2">
2067+
<widget class="QPushButton" name="pbnSaveDefaultStyle">
19802068
<property name="text">
1981-
<string>Restore Default Style</string>
2069+
<string>Save As Default</string>
19822070
</property>
19832071
</widget>
19842072
</item>
1985-
<item row="2" column="3">
2073+
<item row="1" column="3">
19862074
<widget class="QPushButton" name="pbnLoadStyle">
19872075
<property name="text">
19882076
<string>Load Style ...</string>
19892077
</property>
19902078
</widget>
19912079
</item>
1992-
<item row="2" column="4">
2080+
<item row="1" column="4">
19932081
<widget class="QPushButton" name="pbnSaveStyleAs">
19942082
<property name="text">
19952083
<string>Save Style ...</string>
19962084
</property>
19972085
</widget>
19982086
</item>
1999-
<item row="3" column="0" colspan="5">
2087+
<item row="2" column="0" colspan="5">
20002088
<widget class="QDialogButtonBox" name="buttonBox">
20012089
<property name="orientation">
20022090
<enum>Qt::Horizontal</enum>
@@ -2056,8 +2144,8 @@ p, li { white-space: pre-wrap; }
20562144
<slot>reject()</slot>
20572145
<hints>
20582146
<hint type="sourcelabel">
2059-
<x>467</x>
2060-
<y>638</y>
2147+
<x>476</x>
2148+
<y>620</y>
20612149
</hint>
20622150
<hint type="destinationlabel">
20632151
<x>3</x>
@@ -2072,12 +2160,12 @@ p, li { white-space: pre-wrap; }
20722160
<slot>setCurrentIndex(int)</slot>
20732161
<hints>
20742162
<hint type="sourcelabel">
2075-
<x>110</x>
2076-
<y>52</y>
2163+
<x>59</x>
2164+
<y>12</y>
20772165
</hint>
20782166
<hint type="destinationlabel">
2079-
<x>736</x>
2080-
<y>11</y>
2167+
<x>722</x>
2168+
<y>14</y>
20812169
</hint>
20822170
</hints>
20832171
</connection>

‎src/ui/qgsvectorlayerpropertiesbase.ui

Lines changed: 125 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -21,60 +21,10 @@
2121
<bool>true</bool>
2222
</property>
2323
<layout class="QGridLayout" name="gridLayout">
24-
<item row="0" column="0">
25-
<widget class="QListWidget" name="listWidget">
26-
<property name="iconSize">
27-
<size>
28-
<width>64</width>
29-
<height>64</height>
30-
</size>
31-
</property>
32-
<item>
33-
<property name="text">
34-
<string>Symbology</string>
35-
</property>
36-
</item>
37-
<item>
38-
<property name="text">
39-
<string>Labels</string>
40-
</property>
41-
</item>
42-
<item>
43-
<property name="text">
44-
<string>Attributes</string>
45-
</property>
46-
</item>
47-
<item>
48-
<property name="text">
49-
<string>General</string>
50-
</property>
51-
</item>
52-
<item>
53-
<property name="text">
54-
<string>Metadata</string>
55-
</property>
56-
</item>
57-
<item>
58-
<property name="text">
59-
<string>Actions</string>
60-
</property>
61-
</item>
62-
</widget>
63-
</item>
64-
<item row="0" column="1">
65-
<layout class="QHBoxLayout">
66-
<property name="spacing">
67-
<number>3</number>
68-
</property>
69-
<property name="margin">
70-
<number>1</number>
71-
</property>
72-
</layout>
73-
</item>
7424
<item row="0" column="2" colspan="3">
7525
<widget class="QStackedWidget" name="stackedWidget">
7626
<property name="currentIndex">
77-
<number>3</number>
27+
<number>0</number>
7828
</property>
7929
<widget class="QWidget" name="page_3">
8030
<layout class="QGridLayout" name="gridLayout_4">
@@ -355,8 +305,8 @@
355305
<rect>
356306
<x>0</x>
357307
<y>0</y>
358-
<width>554</width>
359-
<height>397</height>
308+
<width>605</width>
309+
<height>425</height>
360310
</rect>
361311
</property>
362312
<layout class="QGridLayout" name="gridLayout_3">
@@ -652,6 +602,124 @@
652602
</property>
653603
</widget>
654604
</item>
605+
<item row="0" column="0">
606+
<widget class="QListWidget" name="listWidget">
607+
<property name="minimumSize">
608+
<size>
609+
<width>110</width>
610+
<height>0</height>
611+
</size>
612+
</property>
613+
<property name="maximumSize">
614+
<size>
615+
<width>110</width>
616+
<height>16777215</height>
617+
</size>
618+
</property>
619+
<property name="frameShape">
620+
<enum>QFrame::NoFrame</enum>
621+
</property>
622+
<property name="frameShadow">
623+
<enum>QFrame::Plain</enum>
624+
</property>
625+
<property name="horizontalScrollBarPolicy">
626+
<enum>Qt::ScrollBarAlwaysOff</enum>
627+
</property>
628+
<property name="editTriggers">
629+
<set>QAbstractItemView::NoEditTriggers</set>
630+
</property>
631+
<property name="showDropIndicator" stdset="0">
632+
<bool>false</bool>
633+
</property>
634+
<property name="alternatingRowColors">
635+
<bool>false</bool>
636+
</property>
637+
<property name="iconSize">
638+
<size>
639+
<width>64</width>
640+
<height>64</height>
641+
</size>
642+
</property>
643+
<property name="textElideMode">
644+
<enum>Qt::ElideNone</enum>
645+
</property>
646+
<property name="flow">
647+
<enum>QListView::TopToBottom</enum>
648+
</property>
649+
<property name="isWrapping" stdset="0">
650+
<bool>false</bool>
651+
</property>
652+
<property name="resizeMode">
653+
<enum>QListView::Adjust</enum>
654+
</property>
655+
<property name="spacing">
656+
<number>9</number>
657+
</property>
658+
<property name="viewMode">
659+
<enum>QListView::IconMode</enum>
660+
</property>
661+
<property name="uniformItemSizes">
662+
<bool>false</bool>
663+
</property>
664+
<property name="wordWrap">
665+
<bool>true</bool>
666+
</property>
667+
<item>
668+
<property name="text">
669+
<string>Symbology</string>
670+
</property>
671+
<property name="icon">
672+
<iconset>
673+
<normaloff>../../../../../../../tmp/info.png</normaloff>../../../../../../../tmp/info.png</iconset>
674+
</property>
675+
</item>
676+
<item>
677+
<property name="text">
678+
<string>Labels</string>
679+
</property>
680+
<property name="icon">
681+
<iconset>
682+
<normaloff>../../../../../../../tmp/info.png</normaloff>../../../../../../../tmp/info.png</iconset>
683+
</property>
684+
</item>
685+
<item>
686+
<property name="text">
687+
<string>Attributes</string>
688+
</property>
689+
<property name="icon">
690+
<iconset>
691+
<normaloff>../../../../../../../tmp/info.png</normaloff>../../../../../../../tmp/info.png</iconset>
692+
</property>
693+
</item>
694+
<item>
695+
<property name="text">
696+
<string>General</string>
697+
</property>
698+
<property name="icon">
699+
<iconset>
700+
<normaloff>../../../../../../../tmp/info.png</normaloff>../../../../../../../tmp/info.png</iconset>
701+
</property>
702+
</item>
703+
<item>
704+
<property name="text">
705+
<string>Metadata</string>
706+
</property>
707+
<property name="icon">
708+
<iconset>
709+
<normaloff>../../../../../../../tmp/info.png</normaloff>../../../../../../../tmp/info.png</iconset>
710+
</property>
711+
</item>
712+
<item>
713+
<property name="text">
714+
<string>Actions</string>
715+
</property>
716+
<property name="icon">
717+
<iconset>
718+
<normaloff>../../../../../../../tmp/info.png</normaloff>../../../../../../../tmp/info.png</iconset>
719+
</property>
720+
</item>
721+
</widget>
722+
</item>
655723
</layout>
656724
</widget>
657725
<layoutdefault spacing="6" margin="11"/>
@@ -691,12 +759,12 @@
691759
<slot>setCurrentIndex(int)</slot>
692760
<hints>
693761
<hint type="sourcelabel">
694-
<x>93</x>
695-
<y>19</y>
762+
<x>99</x>
763+
<y>10</y>
696764
</hint>
697765
<hint type="destinationlabel">
698-
<x>119</x>
699-
<y>16</y>
766+
<x>754</x>
767+
<y>12</y>
700768
</hint>
701769
</hints>
702770
</connection>

0 commit comments

Comments
 (0)
Please sign in to comment.