Icon updates:

- use png instead of xpm for grass icons - put grass icons in a qt resource file - updated grass cmakelist accordingly - updated other non grass plugins Please note these icons are not final and some changes to them will be checked in over the next 24 hours. git-svn-id: http://svn.osgeo.org/qgis/trunk@8060 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Jan 28, 2008 · f84ae5a · f84ae5a
1 parent 275160f
commit f84ae5a
Show file tree

Hide file tree

Showing 29 changed files with 891 additions and 1,354 deletions.
diff --git a/images/themes/default/mActionAddLayer.png b/images/themes/default/mActionAddLayer.png
diff --git a/images/themes/default/mActionAddNonDbLayer.png b/images/themes/default/mActionAddNonDbLayer.png
diff --git a/images/themes/default/mActionAddRasterLayer.png b/images/themes/default/mActionAddRasterLayer.png
diff --git a/images/themes/default/mActionAddWmsLayer.png b/images/themes/default/mActionAddWmsLayer.png
diff --git a/images/themes/default/mActionNewVectorLayer.png b/images/themes/default/mActionNewVectorLayer.png
diff --git a/images/themes/default/mActionRemoveLayer.png b/images/themes/default/mActionRemoveLayer.png
diff --git a/images/themes/default/overviewMaster.svg b/images/themes/default/overviewMaster.svg
diff --git a/src/plugins/grass/CMakeLists.txt b/src/plugins/grass/CMakeLists.txt
@@ -69,7 +69,7 @@ SET (GRASS_PLUGIN_MOC_HDRS
      qgsgrassutils.h
 )
 
-#SET (GRASS_PLUGIN_RCCS  qgsgps_plugin.qrc)
+SET (GRASS_PLUGIN_RCCS  qgsgrass_plugin.qrc)
 
 
 ########################################################
@@ -79,7 +79,7 @@ QT4_WRAP_UI (GRASS_PLUGIN_UIS_H  ${GRASS_PLUGIN_UIS})
 
 QT4_WRAP_CPP (GRASS_PLUGIN_MOC_SRCS  ${GRASS_PLUGIN_MOC_HDRS})
 
-#QT4_ADD_RESOURCES(GRASS_PLUGIN_RCC_SRCS ${GRASS_PLUGIN_RCCS})
+QT4_ADD_RESOURCES(GRASS_PLUGIN_RCC_SRCS ${GRASS_PLUGIN_RCCS})
 
 ########################################################
 # deal with warnings
@@ -98,7 +98,7 @@ ENDIF (NOT MSVC)
 ########################################################
 # build lib
 
-ADD_LIBRARY (grassplugin MODULE ${GRASS_PLUGIN_SRCS} ${GRASS_PLUGIN_MOC_SRCS} ${GRASS_PLUGIN_UIS_H})
+ADD_LIBRARY (grassplugin MODULE ${GRASS_PLUGIN_SRCS} ${GRASS_PLUGIN_MOC_SRCS} ${GRASS_PLUGIN_UIS_H} ${GRASS_PLUGIN_RCC_SRCS})
 
 INCLUDE_DIRECTORIES(
      .

diff --git a/src/plugins/grass/add_raster.png b/src/plugins/grass/add_raster.png
diff --git a/src/plugins/grass/add_raster.xpm b/src/plugins/grass/add_raster.xpm
diff --git a/src/plugins/grass/add_vector.png b/src/plugins/grass/add_vector.png
diff --git a/src/plugins/grass/add_vector.xpm b/src/plugins/grass/add_vector.xpm
diff --git a/src/plugins/grass/grass_close_mapset.png b/src/plugins/grass/grass_close_mapset.png