grass: install just one world map (included in resource file)

qgis · Jul 20, 2011 · 5259a5b · 5259a5b
1 parent 5431337
commit 5259a5b
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/src/plugins/grass/CMakeLists.txt b/src/plugins/grass/CMakeLists.txt
@@ -174,7 +174,7 @@ INSTALL(TARGETS grassplugin
 
 
 FILE (GLOB GMLS *.gml)
-INSTALL (FILES ${GMLS} images/world.png
+INSTALL (FILES ${GMLS}
          DESTINATION ${QGIS_DATA_DIR}/grass)
 
 INSTALL (FILES themes/gis/grass_arrow.svg themes/gis/grass_plus.svg themes/gis/grass_arrow.png themes/gis/grass_plus.png

diff --git a/src/plugins/grass/qgsgrass_plugin.qrc b/src/plugins/grass/qgsgrass_plugin.qrc
@@ -43,7 +43,6 @@
         <file alias="mapcalc_save_as.png">themes/default/mapcalc_save_as.png</file>
         <file alias="mapcalc_save.png">themes/default/mapcalc_save.png</file>
         <file alias="mapcalc_select.png">themes/default/mapcalc_select.png</file>
-        <file alias="world.png">themes/default/world.png</file>
     </qresource>
     <qresource prefix="/images/themes/classic/grass">
         <file alias="grass_add_map.png">themes/classic/grass_add_map.png</file>
@@ -89,7 +88,6 @@
         <file alias="mapcalc_save_as.png">themes/classic/mapcalc_save_as.png</file>
         <file alias="mapcalc_save.png">themes/classic/mapcalc_save.png</file>
         <file alias="mapcalc_select.png">themes/classic/mapcalc_select.png</file>
-        <file alias="world.png">themes/classic/world.png</file>
     </qresource>
     <qresource prefix="/images/themes/gis/grass">
         <file alias="grass_add_raster.png">themes/gis/grass_add_raster.png</file>
@@ -115,4 +113,7 @@
         <file alias="grass_new_point.png">themes/gis/grass_new_point.png</file>
         <file alias="grass_split_line.png">themes/gis/grass_split_line.png</file>
     </qresource>
+    <qresource prefix="/images/grass">
+        <file alias="world.png">images/world.png</file>
+    </qresource>
 </RCC>
diff --git a/src/plugins/grass/qgsgrassnewmapset.cpp b/src/plugins/grass/qgsgrassnewmapset.cpp
@@ -70,7 +70,7 @@ QgsGrassNewMapset::QgsGrassNewMapset( QgisInterface *iface,
   mPreviousPage = -1;
   mRegionModified = false;
 
-  QString mapPath = QgsApplication::pkgDataPath() + "/grass/world.png";
+  QString mapPath = ":/images/grass/world.png";
   QgsDebugMsg( QString( "mapPath = %1" ).arg( mapPath ) );
 
   //mPixmap = QPixmap( *(mRegionMap->pixmap()) );

diff --git a/src/plugins/grass/themes/classic/world.png b/src/plugins/grass/themes/classic/world.png
diff --git a/src/plugins/grass/themes/default/world.png b/src/plugins/grass/themes/default/world.png