[GRASS-SVN] r50875 - in grass/branches/releasebranch_6_4: gui/icons mswindows/Installer-Files mswindows/osgeo4w

[svn_grass at osgeo.org]

Author: martinl
Date: 2012-02-19 08:13:52 -0800 (Sun, 19 Feb 2012)
New Revision: 50875

Added:
   grass/branches/releasebranch_6_4/gui/icons/grass-48x48.png
   grass/branches/releasebranch_6_4/gui/icons/grass_cmd.ico
   grass/branches/releasebranch_6_4/gui/icons/grass_msys.ico
   grass/branches/releasebranch_6_4/gui/icons/grass_osgeo.ico
   grass/branches/releasebranch_6_4/gui/icons/grass_web.ico
   grass/branches/releasebranch_6_4/gui/icons/msys.ico
   grass/branches/releasebranch_6_4/gui/icons/symbols.xcf.bz2
   grass/branches/releasebranch_6_4/gui/icons/wingrass.ico
Removed:
   grass/branches/releasebranch_6_4/gui/icons/grass-48x48.png
   grass/branches/releasebranch_6_4/gui/icons/grass_error.ico
   grass/branches/releasebranch_6_4/mswindows/Installer-Files/GRASS.ico
   grass/branches/releasebranch_6_4/mswindows/Installer-Files/GRASS_CMD.ico
   grass/branches/releasebranch_6_4/mswindows/Installer-Files/GRASS_MSys.ico
   grass/branches/releasebranch_6_4/mswindows/Installer-Files/GRASS_Web.ico
   grass/branches/releasebranch_6_4/mswindows/Installer-Files/GRASS_tcltk.ico
   grass/branches/releasebranch_6_4/mswindows/Installer-Files/MSYS_Custom_Icon.ico
   grass/branches/releasebranch_6_4/mswindows/Installer-Files/WinGRASS.ico
Modified:
   grass/branches/releasebranch_6_4/gui/icons/grass.ico
   grass/branches/releasebranch_6_4/gui/icons/grass_dialog.ico
   grass/branches/releasebranch_6_4/gui/icons/grass_map.ico
   grass/branches/releasebranch_6_4/gui/icons/grass_nviz.ico
   grass/branches/releasebranch_6_4/gui/icons/grass_sql.ico
   grass/branches/releasebranch_6_4/mswindows/osgeo4w/postinstall.bat
Log:
backport icons from devbr6 (see wiki:Grass6Planning#GRASS6.4.3)


Deleted: grass/branches/releasebranch_6_4/gui/icons/grass-48x48.png
===================================================================
(Binary files differ)

Copied: grass/branches/releasebranch_6_4/gui/icons/grass-48x48.png (from rev 50267, grass/branches/develbranch_6/gui/icons/grass-48x48.png)
===================================================================
(Binary files differ)

Modified: grass/branches/releasebranch_6_4/gui/icons/grass.ico
===================================================================
(Binary files differ)

Copied: grass/branches/releasebranch_6_4/gui/icons/grass_cmd.ico (from rev 50267, grass/branches/develbranch_6/gui/icons/grass_cmd.ico)
===================================================================
(Binary files differ)

Modified: grass/branches/releasebranch_6_4/gui/icons/grass_dialog.ico
===================================================================
(Binary files differ)

Deleted: grass/branches/releasebranch_6_4/gui/icons/grass_error.ico
===================================================================
(Binary files differ)

Modified: grass/branches/releasebranch_6_4/gui/icons/grass_map.ico
===================================================================
(Binary files differ)

Copied: grass/branches/releasebranch_6_4/gui/icons/grass_msys.ico (from rev 50267, grass/branches/develbranch_6/gui/icons/grass_msys.ico)
===================================================================
(Binary files differ)

Modified: grass/branches/releasebranch_6_4/gui/icons/grass_nviz.ico
===================================================================
(Binary files differ)

Copied: grass/branches/releasebranch_6_4/gui/icons/grass_osgeo.ico (from rev 50278, grass/branches/develbranch_6/gui/icons/grass_osgeo.ico)
===================================================================
(Binary files differ)

Modified: grass/branches/releasebranch_6_4/gui/icons/grass_sql.ico
===================================================================
(Binary files differ)

Copied: grass/branches/releasebranch_6_4/gui/icons/grass_web.ico (from rev 50267, grass/branches/develbranch_6/gui/icons/grass_web.ico)
===================================================================
(Binary files differ)

Copied: grass/branches/releasebranch_6_4/gui/icons/msys.ico (from rev 50267, grass/branches/develbranch_6/gui/icons/msys.ico)
===================================================================
(Binary files differ)

Copied: grass/branches/releasebranch_6_4/gui/icons/symbols.xcf.bz2 (from rev 50276, grass/branches/develbranch_6/gui/icons/symbols.xcf.bz2)
===================================================================
(Binary files differ)

Copied: grass/branches/releasebranch_6_4/gui/icons/wingrass.ico (from rev 50267, grass/branches/develbranch_6/gui/icons/wingrass.ico)
===================================================================
(Binary files differ)

Deleted: grass/branches/releasebranch_6_4/mswindows/Installer-Files/GRASS.ico
===================================================================
(Binary files differ)

Deleted: grass/branches/releasebranch_6_4/mswindows/Installer-Files/GRASS_CMD.ico
===================================================================
(Binary files differ)

Deleted: grass/branches/releasebranch_6_4/mswindows/Installer-Files/GRASS_MSys.ico
===================================================================
(Binary files differ)

Deleted: grass/branches/releasebranch_6_4/mswindows/Installer-Files/GRASS_Web.ico
===================================================================
(Binary files differ)

Deleted: grass/branches/releasebranch_6_4/mswindows/Installer-Files/GRASS_tcltk.ico
===================================================================
(Binary files differ)

Deleted: grass/branches/releasebranch_6_4/mswindows/Installer-Files/MSYS_Custom_Icon.ico
===================================================================
(Binary files differ)

Deleted: grass/branches/releasebranch_6_4/mswindows/Installer-Files/WinGRASS.ico
===================================================================
(Binary files differ)

Modified: grass/branches/releasebranch_6_4/mswindows/osgeo4w/postinstall.bat
===================================================================
--- grass/branches/releasebranch_6_4/mswindows/osgeo4w/postinstall.bat	2012-02-19 14:53:42 UTC (rev 50874)
+++ grass/branches/releasebranch_6_4/mswindows/osgeo4w/postinstall.bat	2012-02-19 16:13:52 UTC (rev 50875)
@@ -1,4 +1,6 @@
-set ICON=%OSGEO4W_ROOT%\apps\grass\grass- at VERSION@\etc\gui\icons\grass.ico
+set ICON=%OSGEO4W_ROOT%\apps\grass\grass- at VERSION@\etc\gui\icons\grass_osgeo.ico
+set ICON_CMD=%OSGEO4W_ROOT%\apps\grass\grass- at VERSION@\etc\gui\icons\grass_cmd.ico
+set ICON_TCLTK=%OSGEO4W_ROOT%\apps\grass\grass- at VERSION@\etc\gui\icons\grass_tcltk.ico
 set BATCH=%OSGEO4W_ROOT%\bin\@GRASS_EXECUTABLE at .bat
 textreplace -std -t "%OSGEO4W_ROOT%"\bin\@GRASS_EXECUTABLE at .bat
 textreplace -std -t "%OSGEO4W_ROOT%"\bin\@GRASS_EXECUTABLE@
@@ -6,8 +8,8 @@
 
 mkdir "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@" 
 xxmklink "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@\GRASS @VERSION@ GUI.lnk" "%BATCH%" "-wx" \ "Launch GRASS GIS @VERSION@ with wxGUI" 1 "%ICON%" 
-xxmklink "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@\GRASS @VERSION@ Old TclTk GUI.lnk" "%BATCH%" "-tcltk" \ "Launch GRASS GIS @VERSION@ with the old TclTk GUI" 1 "%ICON%" 
-xxmklink "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@\GRASS @VERSION@ Command Line.lnk" "%BATCH%" "-text" \ "Launch GRASS GIS @VERSION@ in text mode" 1 "%ICON%" 
+xxmklink "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@\GRASS @VERSION@ Old TclTk GUI.lnk" "%BATCH%" "-tcltk" \ "Launch GRASS GIS @VERSION@ with the old TclTk GUI" 1 "%ICON_TCLTK%" 
+xxmklink "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@\GRASS @VERSION@ Command Line.lnk" "%BATCH%" "-text" \ "Launch GRASS GIS @VERSION@ in text mode" 1 "%ICON_CMD%" 
 
 xxmklink "%ALLUSERSPROFILE%\Desktop\GRASS GIS @VERSION at .lnk" "%BATCH%" "-wx" \ "Launch GRASS GIS @VERSION@ with wxGUI" 1 "%ICON%"