images/images.qrc

@@ -113,6 +113,7 @@
         <file>themes/default/mActionOptions.png</file>
         <file>themes/default/mActionPan.png</file>
         <file>themes/default/mActionPanToSelected.png</file>
+        <file>themes/default/mActionShowRasterCalculator.png</file>
         <file>themes/default/mAction.png</file>
         <file>themes/default/mActionProjectProperties.png</file>
         <file>themes/default/mActionPropertyItem.png</file>
@@ -307,6 +308,7 @@
         <file>themes/gis/mActionOpenTable.png</file>
         <file>themes/gis/mActionPan.png</file>
         <file>themes/gis/mActionPanToSelected.png</file>
+        <file>themes/gis/mActionShowRasterCalculator.png</file>
         <file>themes/gis/mActionRaiseItems.png</file>
         <file>themes/gis/mActionRedo.png</file>
         <file>themes/gis/mActionRemoveLayer.png</file>

python/plugins/GdalTools/GdalTools.py

@@ -36,7 +36,7 @@
 except ImportError, e:
   valid = False
 
-  # if the plugin is shipped with QGis catch the exception and 
+  # if the plugin is shipped with QGis catch the exception and
   # display an error message
   import os.path
   qgisUserPluginPath = os.path.abspath( os.path.join( str( QgsApplication.qgisSettingsDirPath() ), "python") )
@@ -244,7 +244,7 @@ def initGui( self ):
     self.overview.setStatusTip( QCoreApplication.translate( "GdalTools", "Builds or rebuilds overview images" ) )
     QObject.connect( self.overview, SIGNAL( "triggered()" ), self.doOverview )
 
-    self.tileindex = QAction( QIcon( ":icons/tileindex.png" ), QCoreApplication.translate( "GdalTools", "Tile index" ), self.iface.mainWindow() )
+    self.tileindex = QAction( QIcon( ":icons/tiles.png" ), QCoreApplication.translate( "GdalTools", "Tile index" ), self.iface.mainWindow() )
     self.tileindex.setStatusTip( QCoreApplication.translate( "GdalTools", "Build a shapefile as a raster tileindex" ) )
     QObject.connect( self.tileindex, SIGNAL( "triggered()" ), self.doTileIndex )
 

python/plugins/GdalTools/resources.qrc

@@ -16,7 +16,7 @@
         <file>icons/raster-overview.png</file>
         <file>icons/raster-clip.png</file>
         <file>icons/raster-rgb.png</file>
-        <file>icons/tileindex.png</file>
+        <file>icons/tiles.png</file>
         <file>icons/about.png</file>
         <file>icons/dem.png</file>
         <file>icons/projection-export.png</file>

src/app/qgisapp.cpp

@@ -1560,6 +1560,7 @@ void QgisApp::setTheme( QString theThemeName )
   mActionZoomOut->setIcon( getThemeIcon( "/mActionZoomOut.png" ) );
   mActionZoomFullExtent->setIcon( getThemeIcon( "/mActionZoomFullExtent.png" ) );
   mActionZoomToSelected->setIcon( getThemeIcon( "/mActionZoomToSelected.png" ) );
+  mActionShowRasterCalculator->setIcon( getThemeIcon( "/mActionShowRasterCalculator.png" ) );
 #ifdef HAVE_TOUCH
   mActionTouch->setIcon( getThemeIcon( "/mActionTouch.png" ) );
 #endif

src/plugins/interpolation/interpolator.qrc

@@ -1,6 +1,6 @@
 <RCC>
     <qresource prefix="/" >
         <file>options.png</file>
-        <file>interpolation.png</file>
+        <file>raster-interpolate.png</file>
     </qresource>
 </RCC>

src/plugins/interpolation/qgsinterpolationplugin.cpp

@@ -26,7 +26,7 @@ static const QString name_ = QObject::tr( "Interpolation plugin" );
 static const QString description_ = QObject::tr( "A plugin for interpolation based on vertices of a vector layer" );
 static const QString category_ = QObject::tr( "Raster" );
 static const QString version_ = QObject::tr( "Version 0.001" );
-static const QString icon_ = ":/interpolation.png";
+static const QString icon_ = ":/raster-interpolate.png";
 
 QgsInterpolationPlugin::QgsInterpolationPlugin( QgisInterface* iface ): mIface( iface ), mInterpolationAction( 0 )
 {
@@ -42,8 +42,8 @@ void QgsInterpolationPlugin::initGui()
 {
   if ( mIface )
   {
-    mInterpolationAction = new QAction( QIcon(), tr( "&Interpolation" ), 0 );
-    setCurrentTheme( "" );
+    mInterpolationAction = new QAction( QIcon( ":/raster-interpolate.png" ), tr( "&Interpolation" ), 0 );
+    //~ setCurrentTheme( "" );
     QObject::connect( mInterpolationAction, SIGNAL( triggered() ), this, SLOT( showInterpolationDialog() ) );
     mIface->addRasterToolBarIcon( mInterpolationAction );
     mIface->addPluginToRasterMenu( tr( "&Interpolation" ), mInterpolationAction );
@@ -65,30 +65,30 @@ void QgsInterpolationPlugin::showInterpolationDialog()
   dialog.exec();
 }
 
-//! Set icons to the current theme
-void QgsInterpolationPlugin::setCurrentTheme( QString theThemeName )
-{
-  Q_UNUSED( theThemeName );
-  QString myCurThemePath = QgsApplication::activeThemePath() + "/plugins/interpolation.png";
-  QString myDefThemePath = QgsApplication::defaultThemePath() + "/plugins/interpolation.png";
-  QString myQrcPath = ":/interpolation.png";
-  if ( QFile::exists( myCurThemePath ) )
-  {
-    mInterpolationAction->setIcon( QIcon( myCurThemePath ) );
-  }
-  else if ( QFile::exists( myDefThemePath ) )
-  {
-    mInterpolationAction->setIcon( QIcon( myDefThemePath ) );
-  }
-  else if ( QFile::exists( myQrcPath ) )
-  {
-    mInterpolationAction->setIcon( QIcon( myQrcPath ) );
-  }
-  else
-  {
-    mInterpolationAction->setIcon( QIcon() );
-  }
-}
+//~ //! Set icons to the current theme
+//~ void QgsInterpolationPlugin::setCurrentTheme( QString theThemeName )
+//~ {
+  //~ Q_UNUSED( theThemeName );
+  //~ QString myCurThemePath = QgsApplication::activeThemePath() + "/plugins/interpolation.png";
+  //~ QString myDefThemePath = QgsApplication::defaultThemePath() + "/plugins/interpolation.png";
+  //~ QString myQrcPath = ":/interpolation.png";
+  //~ if ( QFile::exists( myCurThemePath ) )
+  //~ {
+    //~ mInterpolationAction->setIcon( QIcon( myCurThemePath ) );
+  //~ }
+  //~ else if ( QFile::exists( myDefThemePath ) )
+  //~ {
+    //~ mInterpolationAction->setIcon( QIcon( myDefThemePath ) );
+  //~ }
+  //~ else if ( QFile::exists( myQrcPath ) )
+  //~ {
+    //~ mInterpolationAction->setIcon( QIcon( myQrcPath ) );
+  //~ }
+  //~ else
+  //~ {
+    //~ mInterpolationAction->setIcon( QIcon() );
+  //~ }
+//~ }
 
 QGISEXTERN QgisPlugin * classFactory( QgisInterface * theQgisInterfacePointer )
 {

src/plugins/interpolation/qgsinterpolationplugin.h

@@ -39,8 +39,8 @@ class QgsInterpolationPlugin: public QObject, public QgisPlugin
     void unload();
 
   public slots:
-    //! update the plugins theme when the app tells us its theme is changed
-    void setCurrentTheme( QString theThemeName );
+    //~ //! update the plugins theme when the app tells us its theme is changed
+    //~ void setCurrentTheme( QString theThemeName );
 
   private slots:
     void showInterpolationDialog();

src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisplugin.cpp

@@ -37,7 +37,7 @@
 static const QString name_ = QObject::tr( "Raster Terrain Analysis plugin" );
 static const QString description_ = QObject::tr( "A plugin for raster based terrain analysis" );
 static const QString version_ = QObject::tr( "Version 0.1" );
-static const QString icon_ = ":/raster/raster_terrain_icon.png";
+static const QString icon_ = ":/raster/dem.png";
 static const QString category_ = QObject::tr( "Raster" );
 
 QgsRasterTerrainAnalysisPlugin::QgsRasterTerrainAnalysisPlugin( QgisInterface* iface ): mIface( iface ), mTerrainAnalysisMenu( 0 )
@@ -88,6 +88,7 @@ void QgsRasterTerrainAnalysisPlugin::initGui()
     }
 
     mTerrainAnalysisMenu = new QMenu( tr( "Terrain analysis" ), rasterMenu );
+    mTerrainAnalysisMenu->setIcon( QIcon( ":/raster/dem.png" ) );
     mTerrainAnalysisMenu->addAction( tr( "Slope" ), this, SLOT( slope() ) );
     mTerrainAnalysisMenu->addAction( tr( "Aspect" ), this, SLOT( aspect() ) );
     mTerrainAnalysisMenu->addAction( tr( "Hillshade" ), this, SLOT( hillshade() ) );

src/plugins/raster_terrain_analysis/resources.qrc

@@ -1,5 +1,5 @@
  <!DOCTYPE RCC><RCC version="1.0">
  <qresource prefix="/raster">
-     <file>raster_terrain_icon.png</file>
+     <file>dem.png</file>
  </qresource>
- </RCC>
+ </RCC>

src/plugins/zonal_statistics/CMakeLists.txt

@@ -6,7 +6,7 @@ SET (ZONAL_STATISTICS_SRCS
      qgszonalstatisticsdialog.cpp
 )
 
-SET (ZONAL_STATISTICS_UIS 
+SET (ZONAL_STATISTICS_UIS
     qgszonalstatisticsdialogbase.ui
     )
 
@@ -15,6 +15,8 @@ qgszonalstatisticsdialog.h
 qgszonalstatisticsplugin.h
 )
 
+SET (ZONAL_STATISTICS_RCCS  zonal_statistics.qrc)
+
 ########################################################
 # Build
 
@@ -24,17 +26,17 @@ QT4_WRAP_CPP (ZONAL_STATISTICS_MOC_SRCS  ${ZONAL_STATISTICS_MOC_HDRS})
 
 QT4_ADD_RESOURCES(ZONAL_STATISTICS_RCC_SRCS ${ZONAL_STATISTICS_RCCS})
 
-ADD_LIBRARY (zonalstatisticsplugin MODULE 
+ADD_LIBRARY (zonalstatisticsplugin MODULE
   ${ZONAL_STATISTICS_SRCS}
-  ${ZONAL_STATISTICS_MOC_SRCS} 
-  ${ZONAL_STATISTICS_RCC_SRCS} 
+  ${ZONAL_STATISTICS_MOC_SRCS}
+  ${ZONAL_STATISTICS_RCC_SRCS}
   ${ZONAL_STATISTICS_UIS_H})
 
 INCLUDE_DIRECTORIES(
      ${CMAKE_CURRENT_BINARY_DIR}
      ${GDAL_INCLUDE_DIR}
-     ../../core 
-     ../../core/raster 
+     ../../core
+     ../../core/raster
      ../../gui
      ../../analysis/vector
      ..

src/plugins/zonal_statistics/qgszonalstatisticsplugin.cpp

@@ -27,6 +27,7 @@ static const QString name_ = QObject::tr( "Zonal statistics plugin" );
 static const QString description_ = QObject::tr( "A plugin to calculate count, sum, mean of rasters for each polygon of a vector layer" );
 static const QString category_ = QObject::tr( "Raster" );
 static const QString version_ = QObject::tr( "Version 0.1" );
+static const QString pluginIcon_ = ":/zonal_statistics/raster-stats.png";
 
 QgsZonalStatisticsPlugin::QgsZonalStatisticsPlugin( QgisInterface* iface ): mIface( iface ), mAction( 0 )
 {
@@ -40,7 +41,7 @@ QgsZonalStatisticsPlugin::~QgsZonalStatisticsPlugin()
 
 void QgsZonalStatisticsPlugin::initGui()
 {
-  mAction = new QAction( tr( "&Zonal statistics" ), 0 );
+  mAction = new QAction( QIcon( ":/zonal_statistics/raster-stats.png" ), tr( "&Zonal statistics" ), 0 );
   QObject::connect( mAction, SIGNAL( triggered() ), this, SLOT( run() ) );
   mIface->addRasterToolBarIcon( mAction );
   mIface->addPluginToRasterMenu( tr( "&Zonal statistics" ), mAction );
@@ -100,6 +101,11 @@ QGISEXTERN QString version()
   return version_;
 }
 
+QGISEXTERN QString icon()
+{
+  return pluginIcon_;
+}
+
 QGISEXTERN int type()
 {
   return QgisPlugin::UI;

src/plugins/zonal_statistics/zonal_statistics.qrc

@@ -0,0 +1,6 @@
+<RCC>
+    <qresource prefix="/zonal_statistics/" >
+        <file>raster-stats.png</file>
+    </qresource>
+</RCC>
+

src/ui/qgisapp.ui

@@ -17,7 +17,7 @@
      <x>0</x>
      <y>0</y>
      <width>1052</width>
-     <height>25</height>
+     <height>28</height>
     </rect>
    </property>
    <widget class="QMenu" name="mEditMenu">
@@ -1100,6 +1100,10 @@
    </property>
   </action>
   <action name="mActionShowRasterCalculator">
+   <property name="icon">
+    <iconset resource="../../images/images.qrc">
+     <normaloff>:/images/themes/default/mActionShowRasterCalculator.png</normaloff>:/images/themes/default/mActionShowRasterCalculator.png</iconset>
+   </property>
    <property name="text">
     <string>Raster calculator ...</string>
    </property>