Skip to content

Commit

Permalink
Move property icons into default theme rather so that proper icon fal…
Browse files Browse the repository at this point in the history 
…lback 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/qgis@12236 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
timlinux committed Nov 23, 2009
1 parent 6024c32 commit b1d5445
Show file tree
Hide file tree
Showing 23 changed files with 44 additions and 42 deletions.
36 changes: 18 additions & 18 deletions images/images.qrc
View file
Expand Up @@ -232,24 +232,24 @@
<file>themes/default/symbologyUp.png</file>
<file>themes/default/tracking.png</file>
<file>themes/default/qgis.xpm</file>
<file>themes/newgis/propertyicons/action.png</file>
<file>themes/newgis/propertyicons/attributes.png</file>
<file>themes/newgis/propertyicons/colormap.png</file>
<file>themes/newgis/propertyicons/CRS.png</file>
<file>themes/newgis/propertyicons/diagram.png</file>
<file>themes/newgis/propertyicons/digitising.png</file>
<file>themes/newgis/propertyicons/general.png</file>
<file>themes/newgis/propertyicons/histogram.png</file>
<file>themes/newgis/propertyicons/labels.png</file>
<file>themes/newgis/propertyicons/locale.png</file>
<file>themes/newgis/propertyicons/map_tools.png</file>
<file>themes/newgis/propertyicons/metadata.png</file>
<file>themes/newgis/propertyicons/network_and_proxy.png</file>
<file>themes/newgis/propertyicons/overlay.png</file>
<file>themes/newgis/propertyicons/pyramids.png</file>
<file>themes/newgis/propertyicons/rendering.png</file>
<file>themes/newgis/propertyicons/symbology.png</file>
<file>themes/newgis/propertyicons/transparency.png</file>
<file>themes/default/propertyicons/action.png</file>
<file>themes/default/propertyicons/attributes.png</file>
<file>themes/default/propertyicons/colormap.png</file>
<file>themes/default/propertyicons/CRS.png</file>
<file>themes/default/propertyicons/diagram.png</file>
<file>themes/default/propertyicons/digitising.png</file>
<file>themes/default/propertyicons/general.png</file>
<file>themes/default/propertyicons/histogram.png</file>
<file>themes/default/propertyicons/labels.png</file>
<file>themes/default/propertyicons/locale.png</file>
<file>themes/default/propertyicons/map_tools.png</file>
<file>themes/default/propertyicons/metadata.png</file>
<file>themes/default/propertyicons/network_and_proxy.png</file>
<file>themes/default/propertyicons/overlay.png</file>
<file>themes/default/propertyicons/pyramids.png</file>
<file>themes/default/propertyicons/rendering.png</file>
<file>themes/default/propertyicons/symbology.png</file>
<file>themes/default/propertyicons/transparency.png</file>
<file>icons/qgis-icon-16x16.png</file>
<file>icons/qgis-icon-60x60.png</file>
<file>themes/gis/mActionAddGPSLayer.png</file>
Expand Down
0 images/themes/newgis/propertyicons/CRS.png → images/themes/default/propertyicons/CRS.png
View file
File renamed without changes
0 ...es/themes/newgis/propertyicons/action.png → ...s/themes/default/propertyicons/action.png
View file
File renamed without changes
0 ...hemes/newgis/propertyicons/attributes.png → ...emes/default/propertyicons/attributes.png
View file
File renamed without changes
0 .../themes/newgis/propertyicons/colormap.png → ...themes/default/propertyicons/colormap.png
View file
File renamed without changes
0 ...s/themes/newgis/propertyicons/diagram.png → .../themes/default/propertyicons/diagram.png
View file
File renamed without changes
0 ...hemes/newgis/propertyicons/digitising.png → ...emes/default/propertyicons/digitising.png
View file
File renamed without changes
0 ...s/themes/newgis/propertyicons/general.png → .../themes/default/propertyicons/general.png
View file
File renamed without changes
0 ...themes/newgis/propertyicons/histogram.png → ...hemes/default/propertyicons/histogram.png
View file
File renamed without changes
0 ...es/themes/newgis/propertyicons/labels.png → ...s/themes/default/propertyicons/labels.png
View file
File renamed without changes
0 ...es/themes/newgis/propertyicons/locale.png → ...s/themes/default/propertyicons/locale.png
View file
File renamed without changes
0 ...themes/newgis/propertyicons/map_tools.png → ...hemes/default/propertyicons/map_tools.png
View file
File renamed without changes
0 .../themes/newgis/propertyicons/metadata.png → ...themes/default/propertyicons/metadata.png
View file
File renamed without changes
0 ...ewgis/propertyicons/network_and_proxy.png → ...fault/propertyicons/network_and_proxy.png
View file
File renamed without changes
0 ...s/themes/newgis/propertyicons/overlay.png → .../themes/default/propertyicons/overlay.png
View file
File renamed without changes
0 .../themes/newgis/propertyicons/pyramids.png → ...themes/default/propertyicons/pyramids.png
View file
File renamed without changes
0 ...themes/newgis/propertyicons/rendering.png → ...hemes/default/propertyicons/rendering.png
View file
File renamed without changes
0 ...themes/newgis/propertyicons/symbology.png → ...hemes/default/propertyicons/symbology.png
View file
File renamed without changes
0 ...mes/newgis/propertyicons/transparency.png → ...es/default/propertyicons/transparency.png
View file
File renamed without changes
4 changes: 3 additions & 1 deletion src/app/qgsvectorlayerproperties.cpp
View file
Expand Up @@ -147,7 +147,9 @@ QgsVectorLayerProperties::QgsVectorLayerProperties(
position = stackedWidget->insertWidget( stackedWidget->count(), qobject_cast<QDialog*>( d ) );
stackedWidget->setCurrentIndex( position ); //ugly, but otherwise the properties dialog is a mess
mOverlayDialogs.push_back( d );
listWidget->insertItem( stackedWidget->count(), ( *it )->name() );
//shamelessly hard coded - what will we do if other types of layer plugins exist? TS
QListWidgetItem * mypItem = new QListWidgetItem( QgisApp::getThemeIcon( "propertyicons/diagram.png" ), ( *it )->name() );
listWidget->insertItem( stackedWidget->count(), mypItem );
}

stackedWidget->setCurrentIndex( 0 );
Expand Down
16 changes: 8 additions & 8 deletions src/ui/qgsoptionsbase.ui
View file
Expand Up @@ -1318,7 +1318,7 @@
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/newgis/propertyicons/general.png</normaloff>:/images/themes/newgis/propertyicons/general.png</iconset>
<normaloff>:/images/themes/default/propertyicons/general.png</normaloff>:/images/themes/default/propertyicons/general.png</iconset>
</property>
</item>
<item>
Expand All @@ -1330,7 +1330,7 @@
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/newgis/propertyicons/rendering.png</normaloff>:/images/themes/newgis/propertyicons/rendering.png</iconset>
<normaloff>:/images/themes/default/propertyicons/rendering.png</normaloff>:/images/themes/default/propertyicons/rendering.png</iconset>
</property>
</item>
<item>
Expand All @@ -1339,7 +1339,7 @@
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/newgis/propertyicons/map_tools.png</normaloff>:/images/themes/newgis/propertyicons/map_tools.png</iconset>
<normaloff>:/images/themes/default/propertyicons/map_tools.png</normaloff>:/images/themes/default/propertyicons/map_tools.png</iconset>
</property>
</item>
<item>
Expand All @@ -1348,7 +1348,7 @@
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/newgis/propertyicons/overlay.png</normaloff>:/images/themes/newgis/propertyicons/overlay.png</iconset>
<normaloff>:/images/themes/default/propertyicons/overlay.png</normaloff>:/images/themes/default/propertyicons/overlay.png</iconset>
</property>
</item>
<item>
Expand All @@ -1357,7 +1357,7 @@
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/newgis/propertyicons/digitising.png</normaloff>:/images/themes/newgis/propertyicons/digitising.png</iconset>
<normaloff>:/images/themes/default/propertyicons/digitising.png</normaloff>:/images/themes/default/propertyicons/digitising.png</iconset>
</property>
</item>
<item>
Expand All @@ -1366,7 +1366,7 @@
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/newgis/propertyicons/CRS.png</normaloff>:/images/themes/newgis/propertyicons/CRS.png</iconset>
<normaloff>:/images/themes/default/propertyicons/CRS.png</normaloff>:/images/themes/default/propertyicons/CRS.png</iconset>
</property>
</item>
<item>
Expand All @@ -1375,7 +1375,7 @@
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/newgis/propertyicons/locale.png</normaloff>:/images/themes/newgis/propertyicons/locale.png</iconset>
<normaloff>:/images/themes/default/propertyicons/locale.png</normaloff>:/images/themes/default/propertyicons/locale.png</iconset>
</property>
</item>
<item>
Expand All @@ -1384,7 +1384,7 @@
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/newgis/propertyicons/network_and_proxy.png</normaloff>:/images/themes/newgis/propertyicons/network_and_proxy.png</iconset>
<normaloff>:/images/themes/default/propertyicons/network_and_proxy.png</normaloff>:/images/themes/default/propertyicons/network_and_proxy.png</iconset>
</property>
</item>
</widget>
Expand Down
14 changes: 7 additions & 7 deletions src/ui/qgsrasterlayerpropertiesbase.ui
View file
Expand Up @@ -93,7 +93,7 @@
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/newgis/propertyicons/symbology.png</normaloff>:/images/themes/newgis/propertyicons/symbology.png</iconset>
<normaloff>:/images/themes/default/propertyicons/symbology.png</normaloff>:/images/themes/default/propertyicons/symbology.png</iconset>
</property>
</item>
<item>
Expand All @@ -102,7 +102,7 @@
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/newgis/propertyicons/transparency.png</normaloff>:/images/themes/newgis/propertyicons/transparency.png</iconset>
<normaloff>:/images/themes/default/propertyicons/transparency.png</normaloff>:/images/themes/default/propertyicons/transparency.png</iconset>
</property>
</item>
<item>
Expand All @@ -111,7 +111,7 @@
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/newgis/propertyicons/colormap.png</normaloff>:/images/themes/newgis/propertyicons/colormap.png</iconset>
<normaloff>:/images/themes/default/propertyicons/colormap.png</normaloff>:/images/themes/default/propertyicons/colormap.png</iconset>
</property>
</item>
<item>
Expand All @@ -120,7 +120,7 @@
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/newgis/propertyicons/general.png</normaloff>:/images/themes/newgis/propertyicons/general.png</iconset>
<normaloff>:/images/themes/default/propertyicons/general.png</normaloff>:/images/themes/default/propertyicons/general.png</iconset>
</property>
</item>
<item>
Expand All @@ -129,7 +129,7 @@
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/newgis/propertyicons/metadata.png</normaloff>:/images/themes/newgis/propertyicons/metadata.png</iconset>
<normaloff>:/images/themes/default/propertyicons/metadata.png</normaloff>:/images/themes/default/propertyicons/metadata.png</iconset>
</property>
</item>
<item>
Expand All @@ -138,7 +138,7 @@
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/newgis/propertyicons/pyramids.png</normaloff>:/images/themes/newgis/propertyicons/pyramids.png</iconset>
<normaloff>:/images/themes/default/propertyicons/pyramids.png</normaloff>:/images/themes/default/propertyicons/pyramids.png</iconset>
</property>
</item>
<item>
Expand All @@ -147,7 +147,7 @@
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/newgis/propertyicons/histogram.png</normaloff>:/images/themes/newgis/propertyicons/histogram.png</iconset>
<normaloff>:/images/themes/default/propertyicons/histogram.png</normaloff>:/images/themes/default/propertyicons/histogram.png</iconset>
</property>
</item>
</widget>
Expand Down
16 changes: 8 additions & 8 deletions src/ui/qgsvectorlayerpropertiesbase.ui
View file
Expand Up @@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>768</width>
<height>498</height>
<width>668</width>
<height>426</height>
</rect>
</property>
<property name="windowTitle">
Expand Down Expand Up @@ -89,7 +89,7 @@
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/newgis/propertyicons/symbology.png</normaloff>:/images/themes/newgis/propertyicons/symbology.png</iconset>
<normaloff>:/images/themes/default/propertyicons/symbology.png</normaloff>:/images/themes/default/propertyicons/symbology.png</iconset>
</property>
</item>
<item>
Expand All @@ -98,7 +98,7 @@
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/newgis/propertyicons/labels.png</normaloff>:/images/themes/newgis/propertyicons/labels.png</iconset>
<normaloff>:/images/themes/default/propertyicons/labels.png</normaloff>:/images/themes/default/propertyicons/labels.png</iconset>
</property>
</item>
<item>
Expand All @@ -107,7 +107,7 @@
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/newgis/propertyicons/attributes.png</normaloff>:/images/themes/newgis/propertyicons/attributes.png</iconset>
<normaloff>:/images/themes/default/propertyicons/attributes.png</normaloff>:/images/themes/default/propertyicons/attributes.png</iconset>
</property>
</item>
<item>
Expand All @@ -116,7 +116,7 @@
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/newgis/propertyicons/general.png</normaloff>:/images/themes/newgis/propertyicons/general.png</iconset>
<normaloff>:/images/themes/default/propertyicons/general.png</normaloff>:/images/themes/default/propertyicons/general.png</iconset>
</property>
</item>
<item>
Expand All @@ -125,7 +125,7 @@
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/newgis/propertyicons/metadata.png</normaloff>:/images/themes/newgis/propertyicons/metadata.png</iconset>
<normaloff>:/images/themes/default/propertyicons/metadata.png</normaloff>:/images/themes/default/propertyicons/metadata.png</iconset>
</property>
</item>
<item>
Expand All @@ -134,7 +134,7 @@
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/newgis/propertyicons/action.png</normaloff>:/images/themes/newgis/propertyicons/action.png</iconset>
<normaloff>:/images/themes/default/propertyicons/action.png</normaloff>:/images/themes/default/propertyicons/action.png</iconset>
</property>
</item>
</widget>
Expand Down

0 comments on commit b1d5445

Please sign in to comment.