diff --git a/gpxsee.pro b/gpxsee.pro index 326b8dad..8b9609d7 100644 --- a/gpxsee.pro +++ b/gpxsee.pro @@ -250,7 +250,10 @@ macx { icons/kml.icns \ icons/fit.icns \ icons/igc.icns \ - icons/nmea.icns + icons/nmea.icns \ + icons/plt.icns \ + icons/rte.icns \ + icons/wpt.icns QMAKE_BUNDLE_DATA += LOCALE MAPS ICONS CSV } win32 { @@ -260,6 +263,9 @@ win32 { icons/kml.ico \ icons/fit.ico \ icons/igc.ico \ - icons/nmea.ico + icons/nmea.ico \ + icons/plt.ico \ + icons/rte.ico \ + icons/wpt.ico } DEFINES += APP_VERSION=\\\"$$VERSION\\\" diff --git a/icons/fit.ico b/icons/fit.ico index 1d2f5385..8c4fcfd0 100644 Binary files a/icons/fit.ico and b/icons/fit.ico differ diff --git a/icons/fit.svg b/icons/fit.svg deleted file mode 100644 index ab293a36..00000000 --- a/icons/fit.svg +++ /dev/null @@ -1,171 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - FIT - diff --git a/icons/gpx.ico b/icons/gpx.ico index a5280f6f..a4b7337a 100644 Binary files a/icons/gpx.ico and b/icons/gpx.ico differ diff --git a/icons/gpx.svg b/icons/gpx.svg deleted file mode 100644 index 32c3c9c0..00000000 --- a/icons/gpx.svg +++ /dev/null @@ -1,146 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - GPX - diff --git a/icons/icon-template.svg b/icons/icon-template.svg new file mode 100644 index 00000000..45172fd8 --- /dev/null +++ b/icons/icon-template.svg @@ -0,0 +1,17 @@ + + + + + + + $EXTENSION + + diff --git a/icons/icons.sh b/icons/icons.sh new file mode 100755 index 00000000..50a7499f --- /dev/null +++ b/icons/icons.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +EXTENSIONS="fit:#006600 gpx:#003399 igc:#ff3300 kml:#990000 nmea:#0083d7 \ + plt:#66ff00 rte:#66ff00 tcx:#ffcc00 wpt:#66ff00" + +for e in $EXTENSIONS; do + IFS=":"; set $e + + EXT=`echo $1 | tr /a-z/ /A-Z/` + sed -e "s/\$EXTENSION/$EXT/" -e "s/\$COLOR/$2/" icon-template.svg > $1.svg + convert -density 384 $1.svg -define icon:auto-resize $1.ico +done diff --git a/icons/igc.ico b/icons/igc.ico index 6f9b98a5..9d169f06 100644 Binary files a/icons/igc.ico and b/icons/igc.ico differ diff --git a/icons/igc.svg b/icons/igc.svg deleted file mode 100644 index d3b1beb0..00000000 --- a/icons/igc.svg +++ /dev/null @@ -1,145 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IGC - diff --git a/icons/kml.ico b/icons/kml.ico index f3593b88..1405d81f 100644 Binary files a/icons/kml.ico and b/icons/kml.ico differ diff --git a/icons/kml.svg b/icons/kml.svg deleted file mode 100644 index ad4c7787..00000000 --- a/icons/kml.svg +++ /dev/null @@ -1,143 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KML - diff --git a/icons/nmea.ico b/icons/nmea.ico index 3ca117a5..f422ec74 100644 Binary files a/icons/nmea.ico and b/icons/nmea.ico differ diff --git a/icons/nmea.svg b/icons/nmea.svg deleted file mode 100644 index 8d32b475..00000000 --- a/icons/nmea.svg +++ /dev/null @@ -1,145 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - NMEA - diff --git a/icons/plt.ico b/icons/plt.ico new file mode 100644 index 00000000..c1b68472 Binary files /dev/null and b/icons/plt.ico differ diff --git a/icons/rte.ico b/icons/rte.ico new file mode 100644 index 00000000..eb2b2074 Binary files /dev/null and b/icons/rte.ico differ diff --git a/icons/tcx.ico b/icons/tcx.ico index 51ba52e1..a80d9725 100644 Binary files a/icons/tcx.ico and b/icons/tcx.ico differ diff --git a/icons/tcx.svg b/icons/tcx.svg deleted file mode 100644 index ed8737b4..00000000 --- a/icons/tcx.svg +++ /dev/null @@ -1,145 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - TCX - diff --git a/icons/wpt.ico b/icons/wpt.ico new file mode 100644 index 00000000..4dae94fe Binary files /dev/null and b/icons/wpt.ico differ diff --git a/pkg/Info.plist b/pkg/Info.plist index 549b2671..f9416c94 100644 --- a/pkg/Info.plist +++ b/pkg/Info.plist @@ -115,6 +115,54 @@ CFBundleTypeRole Viewer + + CFBundleTypeExtensions + + plt + + CFBundleTypeMIMETypes + + application/vnd.oziexplorer.plt + + CFBundleTypeIconFile + icons/plt.icns + CFBundleTypeName + OziExplorer Track Point File + CFBundleTypeRole + Viewer + + + CFBundleTypeExtensions + + rte + + CFBundleTypeMIMETypes + + application/vnd.oziexplorer.rte + + CFBundleTypeIconFile + icons/rte.icns + CFBundleTypeName + OziExplorer Route File + CFBundleTypeRole + Viewer + + + CFBundleTypeExtensions + + wpt + + CFBundleTypeMIMETypes + + application/vnd.oziexplorer.wpt + + CFBundleTypeIconFile + icons/wpt.icns + CFBundleTypeName + OziExplorer Waypoint File + CFBundleTypeRole + Viewer + UTImportedTypeDeclarations @@ -245,6 +293,69 @@ application/vnd.nmea.nmea + + UTTypeIdentifier + com.oziexplorer3.plt + UTTypeReferenceURL + http://www.oziexplorer3.com/eng/help/fileformats.html + UTTypeDescription + OziExplorer Track Point File + UTTypeConformsTo + + public.data + + UTTypeTagSpecification + + public.filename-extension + + plt + + public.mime-type + application/vnd.oziexplorer.plt + + + + UTTypeIdentifier + com.oziexplorer3.plt + UTTypeReferenceURL + http://www.oziexplorer3.com/eng/help/fileformats.html + UTTypeDescription + OziExplorer Route File + UTTypeConformsTo + + public.data + + UTTypeTagSpecification + + public.filename-extension + + rte + + public.mime-type + application/vnd.oziexplorer.rte + + + + UTTypeIdentifier + com.oziexplorer3.plt + UTTypeReferenceURL + http://www.oziexplorer3.com/eng/help/fileformats.html + UTTypeDescription + OziExplorer Waypoint File + UTTypeConformsTo + + public.data + + UTTypeTagSpecification + + public.filename-extension + + wpt + + public.mime-type + application/vnd.oziexplorer.wpt + + diff --git a/pkg/appdata.xml b/pkg/appdata.xml index 91898cbe..fb628ffe 100644 --- a/pkg/appdata.xml +++ b/pkg/appdata.xml @@ -12,7 +12,7 @@

Features:

@@ -54,5 +55,8 @@ application/vnd.google-earth.kml+xml application/vnd.fai.igc application/vnd.nmea.nmea + application/vnd.oziexplorer.plt + application/vnd.oziexplorer.rte + application/vnd.oziexplorer.wpt diff --git a/pkg/gpxsee.desktop b/pkg/gpxsee.desktop index 5d59a0cc..96e717b6 100644 --- a/pkg/gpxsee.desktop +++ b/pkg/gpxsee.desktop @@ -10,4 +10,4 @@ Icon=gpxsee Terminal=false Type=Application Categories=Graphics;Viewer;Maps;Qt; -MimeType=application/gpx+xml;application/tcx+xml;application/vnd.ant.fit;application/vnd.google-earth.kml+xml;application/vnd.fai.igc;application/vnd.nmea.nmea; +MimeType=application/gpx+xml;application/tcx+xml;application/vnd.ant.fit;application/vnd.google-earth.kml+xml;application/vnd.fai.igc;application/vnd.nmea.nmea;application/vnd.oziexplorer.plt;application/vnd.oziexplorer.rte;application/vnd.oziexplorer.wpt; diff --git a/pkg/gpxsee.nsi b/pkg/gpxsee.nsi index d2704574..051bb105 100644 --- a/pkg/gpxsee.nsi +++ b/pkg/gpxsee.nsi @@ -12,7 +12,7 @@ OutFile "GPXSee-${VERSION}.exe" ; Compression method SetCompressor /SOLID lzma -; Required execution level +; Required execution level RequestExecutionLevel admin ; The default installation directory @@ -26,7 +26,7 @@ VIAddVersionKey "ProductName" "GPXSee" VIAddVersionKey "LegalCopyright" "GPXSee project" VIAddVersionKey "FileDescription" "GPXSee installer" -; Registry key to check for directory (so if you install again, it will +; Registry key to check for directory (so if you install again, it will ; overwrite the old one automatically) InstallDirRegKey HKLM "Software\GPXSee" "Install_Dir" @@ -39,11 +39,14 @@ InstallDirRegKey HKLM "Software\GPXSee" "Install_Dir" !define REGFIT "GPXSee.fit" !define REGIGC "GPXSee.igc" !define REGNMEA "GPXSee.nmea" +!define REGPLT "GPXSee.plt" +!define REGRTE "GPXSee.rte" +!define REGWPT "GPXSee.wpt" ; Start menu page configuration -!define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKLM" -!define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\GPXSee" -!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "GPXSee" +!define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKLM" +!define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\GPXSee" +!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "GPXSee" Var StartMenuFolder @@ -77,10 +80,10 @@ FunctionEnd Section "GPXSee" SEC_APP SectionIn RO - - ; Set output path to the installation directory. + + ; Set output path to the installation directory SetOutPath $INSTDIR - + ; Put the files there File "gpxsee.exe" File /r "maps" @@ -88,14 +91,14 @@ Section "GPXSee" SEC_APP ; Create start menu entry and add links SetShellVarContext all - !insertmacro MUI_STARTMENU_WRITE_BEGIN Application + !insertmacro MUI_STARTMENU_WRITE_BEGIN Application CreateDirectory "$SMPROGRAMS\$StartMenuFolder" CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\Uninstall.exe" CreateShortCut "$SMPROGRAMS\$StartMenuFolder\GPXSee.lnk" "$INSTDIR\gpxsee.exe" !insertmacro MUI_STARTMENU_WRITE_END ; Create the uninstaller - WriteUninstaller "$INSTDIR\uninstall.exe" + WriteUninstaller "$INSTDIR\uninstall.exe" ; Write the installation path into the registry DetailPrint "Registering application..." @@ -135,6 +138,18 @@ Section "GPXSee" SEC_APP WriteRegStr HKCR "${REGNMEA}" "" "NMEA 0183 data" WriteRegStr HKCR "${REGNMEA}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,6" WriteRegStr HKCR "${REGNMEA}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\"" + WriteRegStr HKCR ".plt" "" "${REGPLT}" + WriteRegStr HKCR "${REGPLT}" "" "OziExplorer Track Point File" + WriteRegStr HKCR "${REGPLT}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,7" + WriteRegStr HKCR "${REGPLT}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\"" + WriteRegStr HKCR ".rte" "" "${REGRTE}" + WriteRegStr HKCR "${REGRTE}" "" "OziExplorer Route File" + WriteRegStr HKCR "${REGRTE}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,8" + WriteRegStr HKCR "${REGRTE}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\"" + WriteRegStr HKCR ".wpt" "" "${REGWPT}" + WriteRegStr HKCR "${REGWPT}" "" "OziExplorer Waypoint File" + WriteRegStr HKCR "${REGWPT}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,9" + WriteRegStr HKCR "${REGWPT}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\"" System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)' @@ -152,7 +167,7 @@ Section "QT framework" SEC_QT File /r "platforms" File /r "imageformats" File /r "printsupport" - + SectionEnd Section "MSVC runtime" SEC_MSVC @@ -231,7 +246,7 @@ SectionGroupEnd ; Uninstaller Section "Uninstall" - + ; Remove registry keys DeleteRegKey HKLM "${REGENTRY}" DeleteRegKey HKLM SOFTWARE\GPXSee @@ -258,7 +273,13 @@ Section "Uninstall" DeleteRegKey HKCR ".igc" DeleteRegKey HKCR "${REGNMEA}" DeleteRegKey HKCR ".nmea" - System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)' + DeleteRegKey HKCR "${REGPLT}" + DeleteRegKey HKCR ".plt" + DeleteRegKey HKCR "${REGRTE}" + DeleteRegKey HKCR ".rte" + DeleteRegKey HKCR "${REGWPT}" + DeleteRegKey HKCR ".wpt" + System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)' SectionEnd diff --git a/pkg/gpxsee.xml b/pkg/gpxsee.xml index ca8b249e..ad8d2dbb 100644 --- a/pkg/gpxsee.xml +++ b/pkg/gpxsee.xml @@ -43,4 +43,24 @@ + + OziExplorer Track Point File + + + + + + + OziExplorer Route File + + + + + + + OziExplorer Waypoint File + + + + diff --git a/pkg/gpxsee64.nsi b/pkg/gpxsee64.nsi index 45a2c09e..da69127c 100644 --- a/pkg/gpxsee64.nsi +++ b/pkg/gpxsee64.nsi @@ -12,7 +12,7 @@ OutFile "GPXSee-${VERSION}_x64.exe" ; Compression method SetCompressor /SOLID lzma -; Required execution level +; Required execution level RequestExecutionLevel admin ; The default installation directory @@ -26,7 +26,7 @@ VIAddVersionKey "ProductName" "GPXSee" VIAddVersionKey "LegalCopyright" "GPXSee project" VIAddVersionKey "FileDescription" "GPXSee installer (x64)" -; Registry key to check for directory (so if you install again, it will +; Registry key to check for directory (so if you install again, it will ; overwrite the old one automatically) InstallDirRegKey HKLM "Software\GPXSee" "Install_Dir" @@ -39,11 +39,14 @@ InstallDirRegKey HKLM "Software\GPXSee" "Install_Dir" !define REGFIT "GPXSee.fit" !define REGIGC "GPXSee.igc" !define REGNMEA "GPXSee.nmea" +!define REGPLT "GPXSee.plt" +!define REGRTE "GPXSee.rte" +!define REGWPT "GPXSee.wpt" ; Start menu page configuration -!define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKLM" -!define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\GPXSee" -!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "GPXSee" +!define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKLM" +!define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\GPXSee" +!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "GPXSee" Var StartMenuFolder @@ -71,31 +74,31 @@ Function .onInit MessageBox MB_OK "GPXSee can only be installed on Windows 7 or later." Abort ${EndIf} - + ${If} ${RunningX64} SetRegView 64 - ${Else} - MessageBox MB_OK "The 64b version of GPXSee can not be run on 32b systems." - Abort + ${Else} + MessageBox MB_OK "The 64b version of GPXSee can not be run on 32b systems." + Abort ${EndIf} -FunctionEnd +FunctionEnd ; The stuff to install Section "GPXSee" SEC_APP SectionIn RO - - ; Set output path to the installation directory. + + ; Set output path to the installation directory SetOutPath $INSTDIR - + ; Put the files there File "gpxsee.exe" File /r "maps" File /r "csv" - + ; Create start menu entry and add links SetShellVarContext all - !insertmacro MUI_STARTMENU_WRITE_BEGIN Application + !insertmacro MUI_STARTMENU_WRITE_BEGIN Application CreateDirectory "$SMPROGRAMS\$StartMenuFolder" CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\Uninstall.exe" CreateShortCut "$SMPROGRAMS\$StartMenuFolder\GPXSee.lnk" "$INSTDIR\gpxsee.exe" @@ -103,7 +106,7 @@ Section "GPXSee" SEC_APP ; Create the uninstaller WriteUninstaller "$INSTDIR\uninstall.exe" - + ; Write the installation path into the registry DetailPrint "Registering application..." WriteRegStr HKLM SOFTWARE\GPXSee "Install_Dir" "$INSTDIR" @@ -142,7 +145,19 @@ Section "GPXSee" SEC_APP WriteRegStr HKCR "${REGNMEA}" "" "NMEA 0183 data" WriteRegStr HKCR "${REGNMEA}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,6" WriteRegStr HKCR "${REGNMEA}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\"" - + WriteRegStr HKCR ".plt" "" "${REGPLT}" + WriteRegStr HKCR "${REGPLT}" "" "OziExplorer Track Point File" + WriteRegStr HKCR "${REGPLT}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,7" + WriteRegStr HKCR "${REGPLT}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\"" + WriteRegStr HKCR ".rte" "" "${REGRTE}" + WriteRegStr HKCR "${REGRTE}" "" "OziExplorer Route File" + WriteRegStr HKCR "${REGRTE}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,8" + WriteRegStr HKCR "${REGRTE}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\"" + WriteRegStr HKCR ".wpt" "" "${REGWPT}" + WriteRegStr HKCR "${REGWPT}" "" "OziExplorer Waypoint File" + WriteRegStr HKCR "${REGWPT}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,9" + WriteRegStr HKCR "${REGWPT}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\"" + System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)' SectionEnd @@ -159,7 +174,7 @@ Section "QT framework" SEC_QT File /r "platforms" File /r "imageformats" File /r "printsupport" - + SectionEnd Section "MSVC runtime" SEC_MSVC @@ -233,7 +248,7 @@ SectionGroupEnd ; Uninstaller Section "Uninstall" - + ; Remove registry keys SetRegView 64 DeleteRegKey HKLM "${REGENTRY}" @@ -247,7 +262,7 @@ Section "Uninstall" !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder Delete "$SMPROGRAMS\$StartMenuFolder\*.*" RMDir "$SMPROGRAMS\$StartMenuFolder" - + ; Remove File associations DeleteRegKey HKCR "${REGGPX}" DeleteRegKey HKCR ".gpx" @@ -261,6 +276,12 @@ Section "Uninstall" DeleteRegKey HKCR ".igc" DeleteRegKey HKCR "${REGNMEA}" DeleteRegKey HKCR ".nmea" + DeleteRegKey HKCR "${REGPLT}" + DeleteRegKey HKCR ".plt" + DeleteRegKey HKCR "${REGRTE}" + DeleteRegKey HKCR ".rte" + DeleteRegKey HKCR "${REGWPT}" + DeleteRegKey HKCR ".wpt" System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)' SectionEnd