[GRASS-SVN] r50241 - in grass/trunk: gui/icons mswindows
mswindows/Installer-Files mswindows/osgeo4w
svn_grass at osgeo.org
svn_grass at osgeo.org
Tue Jan 17 14:26:55 EST 2012
Author: martinl
Date: 2012-01-17 11:26:55 -0800 (Tue, 17 Jan 2012)
New Revision: 50241
Added:
grass/trunk/gui/icons/grass.png
grass/trunk/gui/icons/grass_cmd.ico
grass/trunk/gui/icons/grass_msys.ico
grass/trunk/gui/icons/msys.ico
grass/trunk/gui/icons/wingrass.ico
Removed:
grass/trunk/gui/icons/grass-48x48.png
grass/trunk/mswindows/Installer-Files/GRASS.ico
grass/trunk/mswindows/Installer-Files/GRASS_CMD.ico
grass/trunk/mswindows/Installer-Files/GRASS_MSys.ico
grass/trunk/mswindows/Installer-Files/GRASS_tcltk.ico
grass/trunk/mswindows/Installer-Files/MSYS_Custom_Icon.ico
grass/trunk/mswindows/Installer-Files/WinGRASS.ico
Modified:
grass/trunk/gui/icons/grass.desktop
grass/trunk/gui/icons/grass.ico
grass/trunk/mswindows/GRASS-Installer.nsi
grass/trunk/mswindows/osgeo4w/postinstall.bat
Log:
move `mswindows` icons to `gui/icons`
Deleted: grass/trunk/gui/icons/grass-48x48.png
===================================================================
(Binary files differ)
Modified: grass/trunk/gui/icons/grass.desktop
===================================================================
--- grass/trunk/gui/icons/grass.desktop 2012-01-17 15:51:54 UTC (rev 50240)
+++ grass/trunk/gui/icons/grass.desktop 2012-01-17 19:26:55 UTC (rev 50241)
@@ -5,5 +5,5 @@
Comment=Geographic Information System
Categories=Education;Science;Geoscience;Geography;
Exec=grass7
-Icon=/usr/share/icons/grass-48x48.png
+Icon=/usr/share/icons/grass.png
Terminal=true
Modified: grass/trunk/gui/icons/grass.ico
===================================================================
(Binary files differ)
Copied: grass/trunk/gui/icons/grass.png (from rev 50240, grass/trunk/gui/icons/grass-48x48.png)
===================================================================
(Binary files differ)
Copied: grass/trunk/gui/icons/grass_cmd.ico (from rev 50240, grass/trunk/mswindows/Installer-Files/GRASS_CMD.ico)
===================================================================
(Binary files differ)
Copied: grass/trunk/gui/icons/grass_msys.ico (from rev 50240, grass/trunk/mswindows/Installer-Files/GRASS_MSys.ico)
===================================================================
(Binary files differ)
Copied: grass/trunk/gui/icons/msys.ico (from rev 50240, grass/trunk/mswindows/Installer-Files/MSYS_Custom_Icon.ico)
===================================================================
(Binary files differ)
Copied: grass/trunk/gui/icons/wingrass.ico (from rev 50240, grass/trunk/mswindows/Installer-Files/WinGRASS.ico)
===================================================================
(Binary files differ)
Modified: grass/trunk/mswindows/GRASS-Installer.nsi
===================================================================
--- grass/trunk/mswindows/GRASS-Installer.nsi 2012-01-17 15:51:54 UTC (rev 50240)
+++ grass/trunk/mswindows/GRASS-Installer.nsi 2012-01-17 19:26:55 UTC (rev 50241)
@@ -518,14 +518,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
@@ -626,7 +618,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}"
@@ -636,7 +628,7 @@
SetShellVarContext current
CreateShortCut "$DESKTOP\GRASS ${VERSION_NUMBER}.lnk" "$INSTALL_DIR\${GRASS_COMMAND}.bat" "-wx"\
- "$INSTALL_DIR\icons\GRASS.ico" "" SW_SHOWNORMAL "" "Launch GRASS ${VERSION_NUMBER} with wxGUI and CMD terminal"
+ "$INSTALL_DIR\etc\gui\icons\grass.ico" "" SW_SHOWNORMAL "" "Launch GRASS ${VERSION_NUMBER} with wxGUI and CMD terminal"
;Create the Windows Start Menu Shortcuts
SetShellVarContext all
@@ -644,26 +636,26 @@
CreateDirectory "$SMPROGRAMS\${GRASS_BASE}"
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 and CMD console"
+ "$INSTALL_DIR\etc\gui\icons\grass.ico" "" SW_SHOWMINIMIZED "" "Launch GRASS ${VERSION_NUMBER} with wxGUI and CMD console"
CreateShortCut "$SMPROGRAMS\${GRASS_BASE}\GRASS GUI with MSYS.lnk" "$INSTALL_DIR\${GRASS_COMMAND}_msys.bat" "-wx"\
- "$INSTALL_DIR\icons\GRASS_MSys.ico" "" SW_SHOWNORMAL "" "Launch GRASS ${VERSION_NUMBER} with wxGUI and MSYS UNIX console"
+ "$INSTALL_DIR\etc\gui\icons\grass_msys.ico" "" SW_SHOWNORMAL "" "Launch GRASS ${VERSION_NUMBER} with wxGUI and MSYS UNIX console"
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"
; FIXME: ship the WinGrass release notes .html file instead of URL
; http://trac.osgeo.org/grass/browser/grass-web/trunk/grass70/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/trunk/mswindows/Installer-Files/GRASS.ico
===================================================================
(Binary files differ)
Deleted: grass/trunk/mswindows/Installer-Files/GRASS_CMD.ico
===================================================================
(Binary files differ)
Deleted: grass/trunk/mswindows/Installer-Files/GRASS_MSys.ico
===================================================================
(Binary files differ)
Deleted: grass/trunk/mswindows/Installer-Files/GRASS_tcltk.ico
===================================================================
(Binary files differ)
Deleted: grass/trunk/mswindows/Installer-Files/MSYS_Custom_Icon.ico
===================================================================
(Binary files differ)
Deleted: grass/trunk/mswindows/Installer-Files/WinGRASS.ico
===================================================================
(Binary files differ)
Modified: grass/trunk/mswindows/osgeo4w/postinstall.bat
===================================================================
--- grass/trunk/mswindows/osgeo4w/postinstall.bat 2012-01-17 15:51:54 UTC (rev 50240)
+++ grass/trunk/mswindows/osgeo4w/postinstall.bat 2012-01-17 19:26:55 UTC (rev 50241)
@@ -1,4 +1,5 @@
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 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,7 +7,7 @@
mkdir "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@"
xxmklink "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@\GRASS GUI.lnk" "%BATCH%" "-gui" \ "Launch GRASS GIS @VERSION@ with wxGUI" 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 Command Line.lnk" "%BATCH%" "-text" \ "Launch GRASS GIS @VERSION@ in text mode" 1 "%ICON_CMD%"
xxmklink "%ALLUSERSPROFILE%\Desktop\GRASS GIS @VERSION at .lnk" "%BATCH%" "-gui" \ "Launch GRASS GIS @VERSION@ with wxGUI" 1 "%ICON%"
More information about the grass-commit
mailing list