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

svn_grass at osgeo.org svn_grass at osgeo.org
Wed Jan 18 04:41:06 EST 2012 

Author: martinl
Date: 2012-01-18 01:41:05 -0800 (Wed, 18 Jan 2012)
New Revision: 50267

Added:
   grass/branches/develbranch_6/gui/icons/grass-48x48.png
   grass/branches/develbranch_6/gui/icons/grass_cmd.ico
   grass/branches/develbranch_6/gui/icons/grass_msys.ico
   grass/branches/develbranch_6/gui/icons/grass_web.ico
   grass/branches/develbranch_6/gui/icons/msys.ico
   grass/branches/develbranch_6/gui/icons/symbols.xcf
   grass/branches/develbranch_6/gui/icons/wingrass.ico
Removed:
   grass/branches/develbranch_6/gui/icons/grass-48x48.png
   grass/branches/develbranch_6/gui/icons/grass_error.ico
   grass/branches/develbranch_6/mswindows/Installer-Files/GRASS.ico
   grass/branches/develbranch_6/mswindows/Installer-Files/GRASS_CMD.ico
   grass/branches/develbranch_6/mswindows/Installer-Files/GRASS_MSys.ico
   grass/branches/develbranch_6/mswindows/Installer-Files/GRASS_tcltk.ico
   grass/branches/develbranch_6/mswindows/Installer-Files/MSYS_Custom_Icon.ico
   grass/branches/develbranch_6/mswindows/Installer-Files/WinGRASS.ico
Modified:
   grass/branches/develbranch_6/gui/icons/grass.ico
   grass/branches/develbranch_6/gui/icons/grass_dialog.ico
   grass/branches/develbranch_6/gui/icons/grass_map.ico
   grass/branches/develbranch_6/gui/icons/grass_nviz.ico
   grass/branches/develbranch_6/gui/icons/grass_sql.ico
   grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi
   grass/branches/develbranch_6/mswindows/osgeo4w/postinstall.bat
Log:
prettified grass icons 
	   (merge from trunk)


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

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

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

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

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

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

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

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

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

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

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

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

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

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

Modified: grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi
===================================================================
--- grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi	2012-01-18 09:21:20 UTC (rev 50266)
+++ grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi	2012-01-18 09:41:05 UTC (rev 50267)
@@ -455,14 +455,6 @@
 	CreateDirectory "$GIS_DATABASE"
 
 	;add Installer files
-	SetOutPath "$INSTALL_DIR\icons"
-	File .\Installer-Files\GRASS.ico
-	File .\Installer-Files\GRASS_Web.ico
-	File .\Installer-Files\GRASS_tcltk.ico
-	File .\Installer-Files\GRASS_MSys.ico
-	File .\Installer-Files\GRASS_CMD.ico
-	File .\Installer-Files\MSYS_Custom_Icon.ico
-	File .\Installer-Files\WinGRASS.ico	
 	SetOutPath "$INSTALL_DIR"
 	File .\Installer-Files\GRASS-WebSite.url
 	File .\Installer-Files\WinGRASS-README.url
@@ -563,7 +555,7 @@
 		"DisplayVersion" "${VERSION_NUMBER}-r${SVN_REVISION}-${BINARY_REVISION}"
 	!endif
 	
-	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${GRASS_BASE}" "DisplayIcon" "$INSTALL_DIR\icons\GRASS.ico"
+	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${GRASS_BASE}" "DisplayIcon" "$INSTALL_DIR\etc\gui\icons\grass.ico"
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${GRASS_BASE}" "EstimatedSize" 1
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${GRASS_BASE}" "HelpLink" "${WIKI_PAGE}"
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${GRASS_BASE}" "URLInfoAbout" "${WEB_SITE}"
@@ -573,8 +565,8 @@
 	SetShellVarContext current
 	
 	CreateShortCut "$DESKTOP\GRASS ${VERSION_NUMBER}.lnk" "$INSTALL_DIR\${GRASS_COMMAND}.bat" "-wx"\
-	"$INSTALL_DIR\icons\GRASS.ico" "" SW_SHOWMINIMIZED "" "Launch GRASS ${VERSION_NUMBER} with wxGUI"
-	
+	"$INSTALL_DIR\etc\gui\icons\grass.ico" "" SW_SHOWMINIMIZED "" "Launch GRASS ${VERSION_NUMBER} with wxGUI"
+		
 	;Create the Windows Start Menu Shortcuts
 	SetShellVarContext all
 	
@@ -584,26 +576,27 @@
 	"$INSTALL_DIR\icons\GRASS_tcltk.ico" "" SW_SHOWMINIMIZED "" "Launch GRASS ${VERSION_NUMBER} with the old TclTk GUI"
 
 	CreateShortCut "$SMPROGRAMS\${GRASS_BASE}\GRASS GUI.lnk" "$INSTALL_DIR\${GRASS_COMMAND}.bat" "-wx"\
-	"$INSTALL_DIR\icons\GRASS.ico" "" SW_SHOWMINIMIZED "" "Launch GRASS ${VERSION_NUMBER} with wxGUI"
+	"$INSTALL_DIR\etc\gui\icons\grass.ico" "" SW_SHOWMINIMIZED "" "Launch GRASS ${VERSION_NUMBER} with wxGUI"
 
+	CreateShortCut "$SMPROGRAMS\${GRASS_BASE}\GRASS GUI with MSYS.lnk" "$INSTALL_DIR\msys\msys.bat" "/grass/${GRASS_COMMAND}.sh -wx"\
+	"$INSTALL_DIR\etc\gui\icons\grass_msys.ico" "" SW_SHOWNORMAL "" "Launch GRASS ${VERSION_NUMBER} with wxGUI and a MSYS UNIX terminal"
+
 	CreateShortCut "$SMPROGRAMS\${GRASS_BASE}\GRASS Command Line.lnk" "$INSTALL_DIR\${GRASS_COMMAND}.bat" "-text"\
-	"$INSTALL_DIR\icons\GRASS_CMD.ico" "" SW_SHOWNORMAL "" "Launch GRASS ${VERSION_NUMBER} in text mode"
+	"$INSTALL_DIR\etc\gui\icons\grass_cmd.ico" "" SW_SHOWNORMAL "" "Launch GRASS ${VERSION_NUMBER} in text mode"
 	
 	CreateShortCut "$SMPROGRAMS\${GRASS_BASE}\MSYS UNIX Console.lnk" "$INSTALL_DIR\msys\msys.bat" ""\
-	"$INSTALL_DIR\icons\MSYS_Custom_Icon.ico" "" SW_SHOWNORMAL "" "Open a MSYS UNIX console"
+	"$INSTALL_DIR\etc\gui\icons\msys.ico" "" SW_SHOWNORMAL "" "Open a MSYS UNIX console"
 	
 	CreateShortCut "$SMPROGRAMS\${GRASS_BASE}\GRASS Web Site.lnk" "$INSTALL_DIR\GRASS-WebSite.url" ""\
-	"$INSTALL_DIR\icons\GRASS_Web.ico" "" SW_SHOWNORMAL "" "Visit the GRASS website"
+	"$INSTALL_DIR\etc\gui\icons\grass_web.ico" "" SW_SHOWNORMAL "" "Visit the GRASS website"
 	
-	CreateShortCut "$SMPROGRAMS\${GRASS_BASE}\GRASS GUI with MSYS.lnk" "$INSTALL_DIR\msys\msys.bat" "/grass/${GRASS_COMMAND}.sh -wx"\
-	"$INSTALL_DIR\icons\GRASS_MSys.ico" "" SW_SHOWNORMAL "" "Launch GRASS ${VERSION_NUMBER} with wxGUI and a MSYS UNIX terminal"
 	
 ; FIXME: ship the WinGrass release notes .html file instead of URL
 ; http://trac.osgeo.org/grass/browser/grass-web/trunk/grass65/binary/mswindows/native/README.html?format=raw
 ; probably ship with devel versions too? ie Release Notes, not the Release Announcement press release.
 	!if ${INSTALLER_TYPE} == "Release"
 		CreateShortCut "$SMPROGRAMS\${GRASS_BASE}\Release Notes.lnk" "$INSTALL_DIR\WinGRASS-README.url" ""\
-		"$INSTALL_DIR\icons\WinGRASS.ico" "" SW_SHOWNORMAL "" "Visit the WinGRASS Project Web Page"
+		"$INSTALL_DIR\etc\gui\icons\wingrass.ico" "" SW_SHOWNORMAL "" "Visit the WinGRASS Project Web Page"
 	!endif
 	
 	CreateShortCut "$SMPROGRAMS\${GRASS_BASE}\Uninstall GRASS.lnk" "$INSTALL_DIR\Uninstall-GRASS.exe" ""\

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

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

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

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

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

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

Modified: grass/branches/develbranch_6/mswindows/osgeo4w/postinstall.bat
===================================================================
--- grass/branches/develbranch_6/mswindows/osgeo4w/postinstall.bat	2012-01-18 09:21:20 UTC (rev 50266)
+++ grass/branches/develbranch_6/mswindows/osgeo4w/postinstall.bat	2012-01-18 09:41:05 UTC (rev 50267)
@@ -1,4 +1,6 @@
 set ICON=%OSGEO4W_ROOT%\apps\grass\grass- at VERSION@\etc\gui\icons\grass.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 GUI.lnk" "%BATCH%" "-wx" \ "Launch GRASS GIS @VERSION@ with wxGUI" 1 "%ICON%" 
-xxmklink "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@\GRASS Old TclTk GUI.lnk" "%BATCH%" "-tcltk" \ "Launch GRASS GIS @VERSION@ with the old TclTk GUI" 1 "%ICON%" 
-xxmklink "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@\GRASS Command Line.lnk" "%BATCH%" "-text" \ "Launch GRASS GIS @VERSION@ in text mode" 1 "%ICON%" 
+xxmklink "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@\GRASS 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 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%"

More information about the grass-commit mailing list