Skip to content

Commit c2b76d9

Browse files
author
timlinux
committedNov 23, 2009
Move property icons into default theme rather so that proper icon fallback support is available for non implementing themes. Enable icon for diagram overlay property icon in vector props dialog.
git-svn-id: http://svn.osgeo.org/qgis/trunk@12236 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
ltr-3_40Before-merge-new_vector_api
1 parent 8a66aee commit c2b76d9

23 files changed

+44
-42
lines changed
 

‎images/images.qrc

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -232,24 +232,24 @@
232232
<file>themes/default/symbologyUp.png</file>
233233
<file>themes/default/tracking.png</file>
234234
<file>themes/default/qgis.xpm</file>
235-
<file>themes/newgis/propertyicons/action.png</file>
236-
<file>themes/newgis/propertyicons/attributes.png</file>
237-
<file>themes/newgis/propertyicons/colormap.png</file>
238-
<file>themes/newgis/propertyicons/CRS.png</file>
239-
<file>themes/newgis/propertyicons/diagram.png</file>
240-
<file>themes/newgis/propertyicons/digitising.png</file>
241-
<file>themes/newgis/propertyicons/general.png</file>
242-
<file>themes/newgis/propertyicons/histogram.png</file>
243-
<file>themes/newgis/propertyicons/labels.png</file>
244-
<file>themes/newgis/propertyicons/locale.png</file>
245-
<file>themes/newgis/propertyicons/map_tools.png</file>
246-
<file>themes/newgis/propertyicons/metadata.png</file>
247-
<file>themes/newgis/propertyicons/network_and_proxy.png</file>
248-
<file>themes/newgis/propertyicons/overlay.png</file>
249-
<file>themes/newgis/propertyicons/pyramids.png</file>
250-
<file>themes/newgis/propertyicons/rendering.png</file>
251-
<file>themes/newgis/propertyicons/symbology.png</file>
252-
<file>themes/newgis/propertyicons/transparency.png</file>
235+
<file>themes/default/propertyicons/action.png</file>
236+
<file>themes/default/propertyicons/attributes.png</file>
237+
<file>themes/default/propertyicons/colormap.png</file>
238+
<file>themes/default/propertyicons/CRS.png</file>
239+
<file>themes/default/propertyicons/diagram.png</file>
240+
<file>themes/default/propertyicons/digitising.png</file>
241+
<file>themes/default/propertyicons/general.png</file>
242+
<file>themes/default/propertyicons/histogram.png</file>
243+
<file>themes/default/propertyicons/labels.png</file>
244+
<file>themes/default/propertyicons/locale.png</file>
245+
<file>themes/default/propertyicons/map_tools.png</file>
246+
<file>themes/default/propertyicons/metadata.png</file>
247+
<file>themes/default/propertyicons/network_and_proxy.png</file>
248+
<file>themes/default/propertyicons/overlay.png</file>
249+
<file>themes/default/propertyicons/pyramids.png</file>
250+
<file>themes/default/propertyicons/rendering.png</file>
251+
<file>themes/default/propertyicons/symbology.png</file>
252+
<file>themes/default/propertyicons/transparency.png</file>
253253
<file>icons/qgis-icon-16x16.png</file>
254254
<file>icons/qgis-icon-60x60.png</file>
255255
<file>themes/gis/mActionAddGPSLayer.png</file>

‎src/app/qgsvectorlayerproperties.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,9 @@ QgsVectorLayerProperties::QgsVectorLayerProperties(
147147
position = stackedWidget->insertWidget( stackedWidget->count(), qobject_cast<QDialog*>( d ) );
148148
stackedWidget->setCurrentIndex( position ); //ugly, but otherwise the properties dialog is a mess
149149
mOverlayDialogs.push_back( d );
150-
listWidget->insertItem( stackedWidget->count(), ( *it )->name() );
150+
//shamelessly hard coded - what will we do if other types of layer plugins exist? TS
151+
QListWidgetItem * mypItem = new QListWidgetItem( QgisApp::getThemeIcon( "propertyicons/diagram.png" ), ( *it )->name() );
152+
listWidget->insertItem( stackedWidget->count(), mypItem );
151153
}
152154

153155
stackedWidget->setCurrentIndex( 0 );

‎src/ui/qgsoptionsbase.ui

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1318,7 +1318,7 @@
13181318
</property>
13191319
<property name="icon">
13201320
<iconset resource="../../images/images.qrc">
1321-
<normaloff>:/images/themes/newgis/propertyicons/general.png</normaloff>:/images/themes/newgis/propertyicons/general.png</iconset>
1321+
<normaloff>:/images/themes/default/propertyicons/general.png</normaloff>:/images/themes/default/propertyicons/general.png</iconset>
13221322
</property>
13231323
</item>
13241324
<item>
@@ -1330,7 +1330,7 @@
13301330
</property>
13311331
<property name="icon">
13321332
<iconset resource="../../images/images.qrc">
1333-
<normaloff>:/images/themes/newgis/propertyicons/rendering.png</normaloff>:/images/themes/newgis/propertyicons/rendering.png</iconset>
1333+
<normaloff>:/images/themes/default/propertyicons/rendering.png</normaloff>:/images/themes/default/propertyicons/rendering.png</iconset>
13341334
</property>
13351335
</item>
13361336
<item>
@@ -1339,7 +1339,7 @@
13391339
</property>
13401340
<property name="icon">
13411341
<iconset resource="../../images/images.qrc">
1342-
<normaloff>:/images/themes/newgis/propertyicons/map_tools.png</normaloff>:/images/themes/newgis/propertyicons/map_tools.png</iconset>
1342+
<normaloff>:/images/themes/default/propertyicons/map_tools.png</normaloff>:/images/themes/default/propertyicons/map_tools.png</iconset>
13431343
</property>
13441344
</item>
13451345
<item>
@@ -1348,7 +1348,7 @@
13481348
</property>
13491349
<property name="icon">
13501350
<iconset resource="../../images/images.qrc">
1351-
<normaloff>:/images/themes/newgis/propertyicons/overlay.png</normaloff>:/images/themes/newgis/propertyicons/overlay.png</iconset>
1351+
<normaloff>:/images/themes/default/propertyicons/overlay.png</normaloff>:/images/themes/default/propertyicons/overlay.png</iconset>
13521352
</property>
13531353
</item>
13541354
<item>
@@ -1357,7 +1357,7 @@
13571357
</property>
13581358
<property name="icon">
13591359
<iconset resource="../../images/images.qrc">
1360-
<normaloff>:/images/themes/newgis/propertyicons/digitising.png</normaloff>:/images/themes/newgis/propertyicons/digitising.png</iconset>
1360+
<normaloff>:/images/themes/default/propertyicons/digitising.png</normaloff>:/images/themes/default/propertyicons/digitising.png</iconset>
13611361
</property>
13621362
</item>
13631363
<item>
@@ -1366,7 +1366,7 @@
13661366
</property>
13671367
<property name="icon">
13681368
<iconset resource="../../images/images.qrc">
1369-
<normaloff>:/images/themes/newgis/propertyicons/CRS.png</normaloff>:/images/themes/newgis/propertyicons/CRS.png</iconset>
1369+
<normaloff>:/images/themes/default/propertyicons/CRS.png</normaloff>:/images/themes/default/propertyicons/CRS.png</iconset>
13701370
</property>
13711371
</item>
13721372
<item>
@@ -1375,7 +1375,7 @@
13751375
</property>
13761376
<property name="icon">
13771377
<iconset resource="../../images/images.qrc">
1378-
<normaloff>:/images/themes/newgis/propertyicons/locale.png</normaloff>:/images/themes/newgis/propertyicons/locale.png</iconset>
1378+
<normaloff>:/images/themes/default/propertyicons/locale.png</normaloff>:/images/themes/default/propertyicons/locale.png</iconset>
13791379
</property>
13801380
</item>
13811381
<item>
@@ -1384,7 +1384,7 @@
13841384
</property>
13851385
<property name="icon">
13861386
<iconset resource="../../images/images.qrc">
1387-
<normaloff>:/images/themes/newgis/propertyicons/network_and_proxy.png</normaloff>:/images/themes/newgis/propertyicons/network_and_proxy.png</iconset>
1387+
<normaloff>:/images/themes/default/propertyicons/network_and_proxy.png</normaloff>:/images/themes/default/propertyicons/network_and_proxy.png</iconset>
13881388
</property>
13891389
</item>
13901390
</widget>

‎src/ui/qgsrasterlayerpropertiesbase.ui

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
</property>
9494
<property name="icon">
9595
<iconset resource="../../images/images.qrc">
96-
<normaloff>:/images/themes/newgis/propertyicons/symbology.png</normaloff>:/images/themes/newgis/propertyicons/symbology.png</iconset>
96+
<normaloff>:/images/themes/default/propertyicons/symbology.png</normaloff>:/images/themes/default/propertyicons/symbology.png</iconset>
9797
</property>
9898
</item>
9999
<item>
@@ -102,7 +102,7 @@
102102
</property>
103103
<property name="icon">
104104
<iconset resource="../../images/images.qrc">
105-
<normaloff>:/images/themes/newgis/propertyicons/transparency.png</normaloff>:/images/themes/newgis/propertyicons/transparency.png</iconset>
105+
<normaloff>:/images/themes/default/propertyicons/transparency.png</normaloff>:/images/themes/default/propertyicons/transparency.png</iconset>
106106
</property>
107107
</item>
108108
<item>
@@ -111,7 +111,7 @@
111111
</property>
112112
<property name="icon">
113113
<iconset resource="../../images/images.qrc">
114-
<normaloff>:/images/themes/newgis/propertyicons/colormap.png</normaloff>:/images/themes/newgis/propertyicons/colormap.png</iconset>
114+
<normaloff>:/images/themes/default/propertyicons/colormap.png</normaloff>:/images/themes/default/propertyicons/colormap.png</iconset>
115115
</property>
116116
</item>
117117
<item>
@@ -120,7 +120,7 @@
120120
</property>
121121
<property name="icon">
122122
<iconset resource="../../images/images.qrc">
123-
<normaloff>:/images/themes/newgis/propertyicons/general.png</normaloff>:/images/themes/newgis/propertyicons/general.png</iconset>
123+
<normaloff>:/images/themes/default/propertyicons/general.png</normaloff>:/images/themes/default/propertyicons/general.png</iconset>
124124
</property>
125125
</item>
126126
<item>
@@ -129,7 +129,7 @@
129129
</property>
130130
<property name="icon">
131131
<iconset resource="../../images/images.qrc">
132-
<normaloff>:/images/themes/newgis/propertyicons/metadata.png</normaloff>:/images/themes/newgis/propertyicons/metadata.png</iconset>
132+
<normaloff>:/images/themes/default/propertyicons/metadata.png</normaloff>:/images/themes/default/propertyicons/metadata.png</iconset>
133133
</property>
134134
</item>
135135
<item>
@@ -138,7 +138,7 @@
138138
</property>
139139
<property name="icon">
140140
<iconset resource="../../images/images.qrc">
141-
<normaloff>:/images/themes/newgis/propertyicons/pyramids.png</normaloff>:/images/themes/newgis/propertyicons/pyramids.png</iconset>
141+
<normaloff>:/images/themes/default/propertyicons/pyramids.png</normaloff>:/images/themes/default/propertyicons/pyramids.png</iconset>
142142
</property>
143143
</item>
144144
<item>
@@ -147,7 +147,7 @@
147147
</property>
148148
<property name="icon">
149149
<iconset resource="../../images/images.qrc">
150-
<normaloff>:/images/themes/newgis/propertyicons/histogram.png</normaloff>:/images/themes/newgis/propertyicons/histogram.png</iconset>
150+
<normaloff>:/images/themes/default/propertyicons/histogram.png</normaloff>:/images/themes/default/propertyicons/histogram.png</iconset>
151151
</property>
152152
</item>
153153
</widget>

‎src/ui/qgsvectorlayerpropertiesbase.ui

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>768</width>
10-
<height>498</height>
9+
<width>668</width>
10+
<height>426</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
@@ -89,7 +89,7 @@
8989
</property>
9090
<property name="icon">
9191
<iconset resource="../../images/images.qrc">
92-
<normaloff>:/images/themes/newgis/propertyicons/symbology.png</normaloff>:/images/themes/newgis/propertyicons/symbology.png</iconset>
92+
<normaloff>:/images/themes/default/propertyicons/symbology.png</normaloff>:/images/themes/default/propertyicons/symbology.png</iconset>
9393
</property>
9494
</item>
9595
<item>
@@ -98,7 +98,7 @@
9898
</property>
9999
<property name="icon">
100100
<iconset resource="../../images/images.qrc">
101-
<normaloff>:/images/themes/newgis/propertyicons/labels.png</normaloff>:/images/themes/newgis/propertyicons/labels.png</iconset>
101+
<normaloff>:/images/themes/default/propertyicons/labels.png</normaloff>:/images/themes/default/propertyicons/labels.png</iconset>
102102
</property>
103103
</item>
104104
<item>
@@ -107,7 +107,7 @@
107107
</property>
108108
<property name="icon">
109109
<iconset resource="../../images/images.qrc">
110-
<normaloff>:/images/themes/newgis/propertyicons/attributes.png</normaloff>:/images/themes/newgis/propertyicons/attributes.png</iconset>
110+
<normaloff>:/images/themes/default/propertyicons/attributes.png</normaloff>:/images/themes/default/propertyicons/attributes.png</iconset>
111111
</property>
112112
</item>
113113
<item>
@@ -116,7 +116,7 @@
116116
</property>
117117
<property name="icon">
118118
<iconset resource="../../images/images.qrc">
119-
<normaloff>:/images/themes/newgis/propertyicons/general.png</normaloff>:/images/themes/newgis/propertyicons/general.png</iconset>
119+
<normaloff>:/images/themes/default/propertyicons/general.png</normaloff>:/images/themes/default/propertyicons/general.png</iconset>
120120
</property>
121121
</item>
122122
<item>
@@ -125,7 +125,7 @@
125125
</property>
126126
<property name="icon">
127127
<iconset resource="../../images/images.qrc">
128-
<normaloff>:/images/themes/newgis/propertyicons/metadata.png</normaloff>:/images/themes/newgis/propertyicons/metadata.png</iconset>
128+
<normaloff>:/images/themes/default/propertyicons/metadata.png</normaloff>:/images/themes/default/propertyicons/metadata.png</iconset>
129129
</property>
130130
</item>
131131
<item>
@@ -134,7 +134,7 @@
134134
</property>
135135
<property name="icon">
136136
<iconset resource="../../images/images.qrc">
137-
<normaloff>:/images/themes/newgis/propertyicons/action.png</normaloff>:/images/themes/newgis/propertyicons/action.png</iconset>
137+
<normaloff>:/images/themes/default/propertyicons/action.png</normaloff>:/images/themes/default/propertyicons/action.png</iconset>
138138
</property>
139139
</item>
140140
</widget>

0 commit comments

Comments
 (0)
Please sign in to comment.