[QGIS Commit] r12236 - in trunk/qgis: images images/themes/default
images/themes/default/propertyicons images/themes/newgis
src/app src/ui
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Mon Nov 23 16:22:32 EST 2009
Author: timlinux
Date: 2009-11-23 16:22:31 -0500 (Mon, 23 Nov 2009)
New Revision: 12236
Added:
trunk/qgis/images/themes/default/propertyicons/
trunk/qgis/images/themes/default/propertyicons/action.png
trunk/qgis/images/themes/default/propertyicons/locale.png
trunk/qgis/images/themes/default/propertyicons/map_tools.png
trunk/qgis/images/themes/default/propertyicons/rendering.png
Removed:
trunk/qgis/images/themes/default/propertyicons/action.png
trunk/qgis/images/themes/default/propertyicons/locale.png
trunk/qgis/images/themes/default/propertyicons/map_tools.png
trunk/qgis/images/themes/default/propertyicons/rendering.png
trunk/qgis/images/themes/newgis/propertyicons/
Modified:
trunk/qgis/images/images.qrc
trunk/qgis/src/app/qgsvectorlayerproperties.cpp
trunk/qgis/src/ui/qgsoptionsbase.ui
trunk/qgis/src/ui/qgsrasterlayerpropertiesbase.ui
trunk/qgis/src/ui/qgsvectorlayerpropertiesbase.ui
Log:
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.
Modified: trunk/qgis/images/images.qrc
===================================================================
--- trunk/qgis/images/images.qrc 2009-11-23 21:16:44 UTC (rev 12235)
+++ trunk/qgis/images/images.qrc 2009-11-23 21:22:31 UTC (rev 12236)
@@ -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>
Deleted: trunk/qgis/images/themes/default/propertyicons/action.png
===================================================================
(Binary files differ)
Copied: trunk/qgis/images/themes/default/propertyicons/action.png (from rev 12234, trunk/qgis/images/themes/newgis/propertyicons/action.png)
===================================================================
(Binary files differ)
Deleted: trunk/qgis/images/themes/default/propertyicons/locale.png
===================================================================
(Binary files differ)
Copied: trunk/qgis/images/themes/default/propertyicons/locale.png (from rev 12234, trunk/qgis/images/themes/newgis/propertyicons/locale.png)
===================================================================
(Binary files differ)
Deleted: trunk/qgis/images/themes/default/propertyicons/map_tools.png
===================================================================
(Binary files differ)
Copied: trunk/qgis/images/themes/default/propertyicons/map_tools.png (from rev 12234, trunk/qgis/images/themes/newgis/propertyicons/map_tools.png)
===================================================================
(Binary files differ)
Deleted: trunk/qgis/images/themes/default/propertyicons/rendering.png
===================================================================
(Binary files differ)
Copied: trunk/qgis/images/themes/default/propertyicons/rendering.png (from rev 12234, trunk/qgis/images/themes/newgis/propertyicons/rendering.png)
===================================================================
(Binary files differ)
Modified: trunk/qgis/src/app/qgsvectorlayerproperties.cpp
===================================================================
--- trunk/qgis/src/app/qgsvectorlayerproperties.cpp 2009-11-23 21:16:44 UTC (rev 12235)
+++ trunk/qgis/src/app/qgsvectorlayerproperties.cpp 2009-11-23 21:22:31 UTC (rev 12236)
@@ -147,7 +147,9 @@
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 );
Modified: trunk/qgis/src/ui/qgsoptionsbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsoptionsbase.ui 2009-11-23 21:16:44 UTC (rev 12235)
+++ trunk/qgis/src/ui/qgsoptionsbase.ui 2009-11-23 21:22:31 UTC (rev 12236)
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
Modified: trunk/qgis/src/ui/qgsrasterlayerpropertiesbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsrasterlayerpropertiesbase.ui 2009-11-23 21:16:44 UTC (rev 12235)
+++ trunk/qgis/src/ui/qgsrasterlayerpropertiesbase.ui 2009-11-23 21:22:31 UTC (rev 12236)
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
Modified: trunk/qgis/src/ui/qgsvectorlayerpropertiesbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsvectorlayerpropertiesbase.ui 2009-11-23 21:16:44 UTC (rev 12235)
+++ trunk/qgis/src/ui/qgsvectorlayerpropertiesbase.ui 2009-11-23 21:22:31 UTC (rev 12236)
@@ -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">
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
More information about the QGIS-commit
mailing list