Skip to content
Permalink
Browse files

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

  • Loading branch information
wonder-sk committed Jul 20, 2011
1 parent 5431337 commit 5259a5b6194a51807a95cd32cff73ddf0a14fb23
@@ -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
@@ -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>
@@ -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()) );
Binary file not shown.
Binary file not shown.

0 comments on commit 5259a5b

Please sign in to comment.
You can’t perform that action at this time.