Merge branch 'origin/master' into Weblate.

Currently translated at 100.0% (394 of 394 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/hu/

.appveyor.yml

@@ -1,32 +1,39 @@
-version: 7.24.{build}
+version: 8.6.{build}
 
 configuration:
   - Release
 
 image:
-  - Visual Studio 2017
+  - Visual Studio 2019
 
 environment:
   NSISDIR: C:\Program Files (x86)\NSIS
   matrix:
-  - QTDIR: C:\Qt\5.13\msvc2017
+  - QTDIR: C:\Qt\5.15\msvc2019
     NSI: gpxsee.nsi
     VCVARS: vcvars32.bat
     OPENSSLDIR: C:\OpenSSL-v111-Win32\bin
     LIBCRYPTO: libssl-1_1.dll
     LIBSSL: libcrypto-1_1.dll
-  - QTDIR: C:\Qt\5.13\msvc2017_64
+  - QTDIR: C:\Qt\5.15\msvc2019_64
     NSI: gpxsee64.nsi
     VCVARS: vcvars64.bat
     OPENSSLDIR: C:\OpenSSL-v111-Win64\bin
     LIBCRYPTO: libssl-1_1-x64.dll
-    LIBSSL: libcrypto-1_1-x64.dll    
+    LIBSSL: libcrypto-1_1-x64.dll
+  - QTDIR: C:\Qt\6.0\msvc2019_64
+    NSI: gpxsee64.nsi
+    VCVARS: vcvars64.bat
+    OPENSSLDIR: C:\OpenSSL-v111-Win64\bin
+    LIBCRYPTO: libssl-1_1-x64.dll
+    LIBSSL: libcrypto-1_1-x64.dll
+    NSISDEF: /DQT6
 
 install:
 - cmd: >-
     set PATH=%QTDIR%\bin;%NSISDIR%;%PATH%
 
-    call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\"%VCVARS%
+    call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\"%VCVARS%
 
 build_script:
 - cmd: >-
@@ -60,6 +67,6 @@ build_script:
     copy %OPENSSLDIR%\%LIBSSL% installer
 
 
-    makensis.exe installer\%NSI%
+    makensis.exe %NSISDEF% installer\%NSI%
 artifacts:
 - path: installer\GPXSee-*.exe

.github/FUNDING.yml

@@ -0,0 +1 @@
+github: tumic0

.travis.yml

@@ -4,13 +4,15 @@ os:
   - linux
   - osx
 
+dist: focal
+
 before_install:
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get -qq update; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
 
 install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install qt; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install libqt4-dev libqt4-opengl-dev; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install qtbase5-dev qtbase5-private-dev libqt5opengl5-dev qttools5-dev-tools; fi
 
 script:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then PATH=/usr/local/opt/qt/bin/:${PATH}; fi

README.md

@@ -4,12 +4,12 @@ GPXSee is a Qt-based GPS log file viewer and analyzer that supports all common G
 ## Features
 * Opens GPX, TCX, FIT, KML, NMEA, IGC, CUP, SIGMA SLF, Suunto SML, LOC, GeoJSON, OziExplorer (PLT, RTE, WPT), Garmin GPI&CSV and geotagged JPEG files.
 * User-definable online maps (OpenStreetMap/Google tiles, WMTS, WMS, TMS, QuadTiles).
-* Offline maps (MBTiles, OziExplorer maps, TrekBuddy maps/atlases, Garmin IMG/GMAP & JNX maps, TwoNav RMaps, GeoTIFF images).
+* Offline maps (MBTiles, OziExplorer maps, TrekBuddy maps/atlases, Garmin IMG/GMAP & JNX maps, TwoNav RMaps, GeoTIFF images, BSB charts, KMZ maps, AlpineQuest maps).
 * Elevation, speed, heart rate, cadence, power, temperature and gear ratio/shifts graphs.
 * Support for DEM files (SRTM HGT).
 * Support for multiple tracks in one view.
 * Support for POI files.
-* Print/export to PDF.
+* Print/export to PDF/PNG.
 * Full-screen mode.
 * HiDPI/Retina displays & maps support.
 * Native GUI for Windows, Mac OS X and Linux.
@@ -18,8 +18,8 @@ GPXSee is a Qt-based GPS log file viewer and analyzer that supports all common G
 
 ## Build
 Build requirements:
-* Qt 4.8 or QT 5.x (Qt >= 5.10.1 recommended for all features)
-* C++03 or newer compiler (tested: msvc2015, gcc >= 4.8, clang/Apple LLVM version 8.1.0)
+* Qt5 >= 5.11 or Qt 6.x
+* C++11 or newer compiler (tested: msvc2017, gcc 7.5.0, clang/Apple LLVM version 10.0.0)
 
 Build steps:
 ```shell
@@ -43,3 +43,15 @@ make # nmake on windows
 
 ## Translations
 GPXSee uses [Weblate](https://hosted.weblate.org/projects/gpxsee/translations/) for translations.
+
+## License
+GPXSee is licensed under GPL-3.0 (only). However, some 3rd party parts are using different, GPL compatible,
+licenses:
+* [Oxygen icons](icons/GUI) - LGPLv3
+* [Mapbox Maki icons](icons/POI) - CC0
+* [RTree implementation](src/common/rtree.h) - Public domain
+* [Albers](src/map/albersequal.cpp), [Geocentric](src/map/geocentric.cpp), [LCC](src/map/lambertconic.cpp),
+  [Mercator](src/map/mercator.cpp), [Polar Stereographic](src/map/polarstereographic.cpp),
+  [Polyconic](src/map/polyconic.cpp) and [Transverse Mercator](src/map/transversemercator.cpp)
+  projections - NIMA Source Code Disclaimer
+* [Projection parameters CSV files](pkg/csv) - BSD/EPSG/Public domain

gpxsee.pro

@@ -3,29 +3,33 @@ unix:!macx {
 } else {
     TARGET = GPXSee
 }
-VERSION = 7.24
+VERSION = 8.6
 
 QT += core \
     gui \
+    gui-private \
     network \
     sql \
-    concurrent
-greaterThan(QT_MAJOR_VERSION, 4) {
-    QT += widgets
-    QT += printsupport
-}
-lessThan(QT_MAJOR_VERSION, 5) {QT += opengl}
-equals(QT_MAJOR_VERSION, 5) : lessThan(QT_MINOR_VERSION, 4) {QT += opengl}
+    concurrent \
+    widgets \
+    printsupport
+greaterThan(QT_MAJOR_VERSION, 5) {QT += openglwidgets}
 
 INCLUDEPATH += ./src
 HEADERS += src/common/config.h \
+    src/GUI/axislabelitem.h \
     src/GUI/graphicsscene.h \
+    src/GUI/mapaction.h \
+    src/GUI/mapitem.h \
+    src/GUI/marginswidget.h \
+    src/GUI/markerinfoitem.h \
+    src/GUI/planeitem.h \
     src/GUI/popup.h \
     src/common/garmin.h \
-    src/common/staticassert.h \
     src/common/coordinates.h \
     src/common/range.h \
     src/common/rectc.h \
+    src/common/textcodec.h \
     src/common/wgs84.h \
     src/common/util.h \
     src/common/rtree.h \
@@ -52,9 +56,7 @@ HEADERS += src/common/config.h \
     src/GUI/palette.h \
     src/GUI/heartrategraph.h \
     src/GUI/trackinfo.h \
-    src/GUI/exportdialog.h \
     src/GUI/fileselectwidget.h \
-    src/GUI/margins.h \
     src/GUI/temperaturegraph.h \
     src/GUI/graphtab.h \
     src/GUI/trackitem.h \
@@ -70,7 +72,6 @@ HEADERS += src/common/config.h \
     src/GUI/optionsdialog.h \
     src/GUI/colorbox.h \
     src/GUI/stylecombobox.h \
-    src/GUI/opengl.h \
     src/GUI/timetype.h \
     src/GUI/percentslider.h \
     src/GUI/elevationgraphitem.h \
@@ -82,7 +83,6 @@ HEADERS += src/common/config.h \
     src/GUI/gearratiographitem.h \
     src/GUI/oddspinbox.h \
     src/GUI/settings.h \
-    src/GUI/cpuarch.h \
     src/GUI/searchpointer.h \
     src/GUI/mapview.h \
     src/GUI/font.h \
@@ -92,14 +92,24 @@ HEADERS += src/common/config.h \
     src/map/IMG/bitstream.h \
     src/map/IMG/deltastream.h \
     src/map/IMG/gmap.h \
+    src/map/IMG/huffmanbuffer.h \
     src/map/IMG/huffmanstream.h \
     src/map/IMG/huffmantable.h \
+    src/map/IMG/huffmantext.h \
+    src/map/IMG/nodfile.h \
     src/map/IMG/mapdata.h \
+    src/map/IMG/raster.h \
+    src/map/IMG/rastertile.h \
     src/map/IMG/textpathitem.h \
     src/map/IMG/textpointitem.h \
+    src/map/bsbmap.h \
+    src/map/invalidmap.h \
+    src/map/kmzmap.h \
+    src/map/polyconic.h \
     src/map/projection.h \
     src/map/ellipsoid.h \
     src/map/datum.h \
+    src/map/sqlitemap.h \
     src/map/webmercator.h \
     src/map/transversemercator.h \
     src/map/latlon.h \
@@ -195,12 +205,23 @@ HEADERS += src/common/config.h \
     src/data/cupparser.h \
     src/data/gpiparser.h \
     src/data/address.h \
-    src/data/smlparser.h
+    src/data/smlparser.h \
+    src/GUI/pdfexportdialog.h \
+    src/GUI/pngexportdialog.h \
+    src/data/geojsonparser.h \
+    src/GUI/timezoneinfo.h \
+    src/map/aqmmap.h
+
 SOURCES += src/main.cpp \
+    src/GUI/axislabelitem.cpp \
+    src/GUI/mapitem.cpp \
+    src/GUI/marginswidget.cpp \
+    src/GUI/markerinfoitem.cpp \
     src/GUI/popup.cpp \
     src/common/coordinates.cpp \
     src/common/rectc.cpp \
     src/common/range.cpp \
+    src/common/textcodec.cpp \
     src/common/util.cpp \
     src/common/greatcircle.cpp \
     src/common/programpaths.cpp \
@@ -221,7 +242,6 @@ SOURCES += src/main.cpp \
     src/GUI/palette.cpp \
     src/GUI/heartrategraph.cpp \
     src/GUI/trackinfo.cpp \
-    src/GUI/exportdialog.cpp \
     src/GUI/fileselectwidget.cpp \
     src/GUI/temperaturegraph.cpp \
     src/GUI/trackitem.cpp \
@@ -248,20 +268,29 @@ SOURCES += src/main.cpp \
     src/GUI/gearratiographitem.cpp \
     src/GUI/mapview.cpp \
     src/GUI/areaitem.cpp \
+    src/data/waypoint.cpp \
     src/map/IMG/bitmapline.cpp \
     src/map/IMG/bitstream.cpp \
     src/map/IMG/deltastream.cpp \
     src/map/IMG/gmap.cpp \
+    src/map/IMG/huffmanbuffer.cpp \
     src/map/IMG/huffmanstream.cpp \
     src/map/IMG/huffmantable.cpp \
+    src/map/IMG/huffmantext.cpp \
+    src/map/IMG/nodfile.cpp \
     src/map/IMG/mapdata.cpp \
+    src/map/IMG/rastertile.cpp \
     src/map/IMG/textpathitem.cpp \
     src/map/IMG/textpointitem.cpp \
+    src/map/bsbmap.cpp \
+    src/map/kmzmap.cpp \
     src/map/maplist.cpp \
     src/map/onlinemap.cpp \
     src/map/downloader.cpp \
     src/map/emptymap.cpp \
     src/map/ozimap.cpp \
+    src/map/polyconic.cpp \
+    src/map/sqlitemap.cpp \
     src/map/tar.cpp \
     src/map/atlas.cpp \
     src/map/ozf.cpp \
@@ -338,16 +367,14 @@ SOURCES += src/main.cpp \
     src/data/cupparser.cpp \
     src/GUI/graphicsscene.cpp \
     src/data/gpiparser.cpp \
-    src/data/smlparser.cpp
-
-greaterThan(QT_MAJOR_VERSION, 4) {
-    HEADERS += src/data/geojsonparser.h
-    SOURCES += src/data/geojsonparser.cpp
-}
+    src/data/smlparser.cpp \
+    src/GUI/pdfexportdialog.cpp \
+    src/GUI/pngexportdialog.cpp \
+    src/data/geojsonparser.cpp \
+    src/map/aqmmap.cpp
 
 DEFINES += APP_VERSION=\\\"$$VERSION\\\" \
     QT_NO_DEPRECATED_WARNINGS
-DEFINES *= QT_USE_QSTRINGBUILDER
 
 RESOURCES += gpxsee.qrc
 TRANSLATIONS = lang/gpxsee_en.ts \
@@ -364,10 +391,12 @@ TRANSLATIONS = lang/gpxsee_en.ts \
     lang/gpxsee_es.ts \
     lang/gpxsee_pt_BR.ts \
     lang/gpxsee_uk.ts \
-    lang/gpxsee_hu.ts
+    lang/gpxsee_hu.ts \
+    lang/gpxsee_it.ts \
+    lang/gpxsee_eo.ts
 
 macx {
-    ICON = icons/gpxsee.icns
+    ICON = icons/app/gpxsee.icns
     QMAKE_INFO_PLIST = pkg/Info.plist
     locale.path = Contents/Resources/translations
     locale.files = lang/gpxsee_en.qm \
@@ -384,7 +413,9 @@ macx {
         lang/gpxsee_es.qm \
         lang/gpxsee_pt_BR.qm \
         lang/gpxsee_uk.qm \
-        lang/gpxsee_hu.qm
+        lang/gpxsee_hu.qm \
+        lang/gpxsee_it.qm \
+        lang/gpxsee_eo.qm
     csv.path = Contents/Resources
     csv.files = pkg/csv
     maps.path = Contents/Resources
@@ -404,12 +435,20 @@ macx {
         icons/formats/json.icns \
         icons/formats/cup.icns \
         icons/formats/gpi.icns \
-        icons/formats/sml.icns
+        icons/formats/sml.icns \
+        icons/formats/img.icns \
+        icons/formats/jnx.icns \
+        icons/formats/kap.icns \
+        icons/formats/mbts.icns \
+        icons/formats/rmap.icns \
+        icons/formats/tba.icns \
+        icons/formats/aqm.icns \
+        icons/formats/sqlt.icns
     QMAKE_BUNDLE_DATA += locale maps icons csv
 }
 
 win32 {
-    RC_ICONS = icons/gpxsee.ico \
+    RC_ICONS = icons/app/gpxsee.ico \
         icons/formats/gpx.ico \
         icons/formats/tcx.ico \
         icons/formats/kml.ico \
@@ -424,14 +463,22 @@ win32 {
         icons/formats/json.ico \
         icons/formats/cup.ico \
         icons/formats/gpi.ico \
-        icons/formats/sml.ico
+        icons/formats/sml.ico \
+        icons/formats/img.ico \
+        icons/formats/jnx.ico \
+        icons/formats/kap.ico \
+        icons/formats/map.ico \
+        icons/formats/mbts.ico \
+        icons/formats/rmap.ico \
+        icons/formats/tba.ico \
+        icons/formats/aqm.ico \
+        icons/formats/sqlt.ico
     DEFINES += _USE_MATH_DEFINES \
         NOGDI
 }
 
 unix:!macx {
     isEmpty(PREFIX):PREFIX = /usr/local
-    DEFINES += PREFIX=\\\"$$PREFIX\\\"
 
     maps.files = pkg/maps/*
     maps.path = $$PREFIX/share/gpxsee/maps
@@ -439,8 +486,8 @@ unix:!macx {
     csv.path = $$PREFIX/share/gpxsee/csv
     locale.files = lang/*.qm
     locale.path = $$PREFIX/share/gpxsee/translations
-    icon.files = icons/gpxsee.png
-    icon.path = $$PREFIX/share/pixmaps
+    icon.files = icons/app/hicolor/*
+    icon.path = $$PREFIX/share/icons/hicolor
     desktop.files = pkg/gpxsee.desktop
     desktop.path = $$PREFIX/share/applications
     mime.files = pkg/gpxsee.xml

gpxsee.qrc

@@ -1,8 +1,8 @@
 <RCC>
 	<qresource prefix="/">
 		<!-- GUI -->
-		<file alias="gpxsee.png">icons/gpxsee.png</file>
-		<file alias="gpxsee@2x.png">icons/gpxsee@2x.png</file>
+		<file alias="gpxsee.png">icons/app/gpxsee.png</file>
+		<file alias="gpxsee@2x.png">icons/app/gpxsee@2x.png</file>
 		<file alias="dialog-close.png">icons/GUI/dialog-close.png</file>
 		<file alias="dialog-close@2x.png">icons/GUI/dialog-close@2x.png</file>
 		<file alias="document-open.png">icons/GUI/document-open.png</file>
@@ -67,10 +67,12 @@
 		<file alias="cinema-11.png">icons/POI/cinema-11.png</file>
 		<file alias="clothing-store-11.png">icons/POI/clothing-store-11.png</file>
 		<file alias="communications-tower-11.png">icons/POI/communications-tower-11.png</file>
+		<file alias="convenience-11.png">icons/POI/convenience-11.png</file>
 		<file alias="dam-11.png">icons/POI/dam-11.png</file>
 		<file alias="danger-11.png">icons/POI/danger-11.png</file>
 		<file alias="drinking-water-11.png">icons/POI/drinking-water-11.png</file>
 		<file alias="fast-food-11.png">icons/POI/fast-food-11.png</file>
+		<file alias="entrance-alt1-11.png">icons/POI/entrance-alt1-11.png</file>
 		<file alias="fire-station-11.png">icons/POI/fire-station-11.png</file>
 		<file alias="fitness-centre-11.png">icons/POI/fitness-centre-11.png</file>
 		<file alias="fuel-11.png">icons/POI/fuel-11.png</file>
@@ -97,7 +99,6 @@
 		<file alias="place-of-worship-11.png">icons/POI/place-of-worship-11.png</file>
 		<file alias="police-11.png">icons/POI/police-11.png</file>
 		<file alias="post-11.png">icons/POI/post-11.png</file>
-		<file alias="prison-11.png">icons/POI/prison-11.png</file>
 		<file alias="religious-christian-11.png">icons/POI/religious-christian-11.png</file>
 		<file alias="religious-jewish-11.png">icons/POI/religious-jewish-11.png</file>
 		<file alias="religious-muslim-11.png">icons/POI/religious-muslim-11.png</file>

icons/app/hicolor/scalable/apps/gpxsee.svg

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/PR-SVG-20010719/DTD/svg10.dtd">
+<svg width="6cm" height="6cm" viewBox="47 79 119 119" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <g>
+    <rect style="fill: #ffffff" x="47.729" y="79.875" width="118.071" height="118.071" rx="10" ry="10"/>
+    <rect style="fill: none; fill-opacity:0; stroke-width: 2.35099e-37; stroke-linejoin: round; stroke: #ffffff" x="47.729" y="79.875" width="118.071" height="118.071" rx="10" ry="10"/>
+  </g>
+  <g>
+    <ellipse style="fill: #000000" cx="113" cy="90.875" rx="7.021" ry="7.021"/>
+    <ellipse style="fill: none; fill-opacity:0; stroke-width: 2; stroke-linejoin: round; stroke: #000000" cx="113" cy="90.875" rx="7.021" ry="7.021"/>
+  </g>
+  <polyline style="fill: none; fill-opacity:0; stroke-width: 4; stroke: #000000" points="61.5289,182.479 73.5,125.854 96,151.875 113,90.875 136.5,172.375 151.658,157.199 "/>
+  <g>
+    <ellipse style="fill: #000000" cx="73.5" cy="125.854" rx="7.021" ry="7.021"/>
+    <ellipse style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #000000" cx="73.5" cy="125.854" rx="7.021" ry="7.021"/>
+  </g>
+  <g>
+    <ellipse style="fill: #000000" cx="136.5" cy="172.375" rx="7.021" ry="7.021"/>
+    <ellipse style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #000000" cx="136.5" cy="172.375" rx="7.021" ry="7.021"/>
+  </g>
+  <g>
+    <ellipse style="fill: #000000" cx="60.7" cy="186.4" rx="7.021" ry="7.021"/>
+    <ellipse style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #000000" cx="60.7" cy="186.4" rx="7.021" ry="7.021"/>
+  </g>
+  <g>
+    <ellipse style="fill: #000000" cx="154.5" cy="154.354" rx="7.021" ry="7.021"/>
+    <ellipse style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #000000" cx="154.5" cy="154.354" rx="7.021" ry="7.021"/>
+  </g>
+  <g>
+    <ellipse style="fill: #000000" cx="96" cy="151.875" rx="7.021" ry="7.021"/>
+    <ellipse style="fill: none; fill-opacity:0; stroke-width: 2; stroke: #000000" cx="96" cy="151.875" rx="7.021" ry="7.021"/>
+  </g>
+</svg>

icons/formats/scripts/extensions

@@ -13,3 +13,12 @@ slf:#881199
 cup:#20a810
 gpi:#fca314
 sml:#6434eb
+img:#cf0a0a
+jnx:#aeff00
+kap:#080045
+map:#f6ff00
+mbts:#ff0062
+rmap:#145cba
+tba:#367050
+aqm:#32a89e
+sqlt:#303030

icons/formats/scripts/ico.sh

@@ -5,6 +5,6 @@ while read e; do
 
 	EXT=`echo $1 | tr /a-z/ /A-Z/`
 	sed -e "s/\$EXTENSION/$EXT/" -e "s/\$COLOR/$2/" icon-template.svg > $1.svg
-	convert -density 400 $1.svg -define icon:auto-resize $1.ico
+	convert -density 400 -background none $1.svg -define icon:auto-resize $1.ico
 	rm $1.svg
 done < extensions

lang/gpxsee_en.ts

@@ -1,4 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
 <TS version="2.1" language="en_US">
+<context>
+    <name>GUI</name>
+    <message numerus="yes">
+        <location filename="../src/GUI/gui.cpp" line="1637"/>
+        <source>%n files</source>
+        <translation>
+            <numerusform>%n file</numerusform>
+            <numerusform>%n files</numerusform>
+        </translation>
+    </message>
+</context>
 </TS>

pkg/Info.plist

@@ -42,7 +42,7 @@
 			</array>
 			<key>CFBundleTypeMIMETypes</key>
 			<array>
-				<string>application/tcx+xml</string>
+				<string>application/vnd.garmin.tcx+xml</string>
 			</array>
 			<key>CFBundleTypeIconFile</key>
 			<string>icons/tcx.icns</string>
@@ -67,6 +67,22 @@
 			<key>CFBundleTypeRole</key>
 			<string>Viewer</string>
 		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>kmz</string>
+			</array>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>application/vnd.google-earth.kmz</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>icons/kml.icns</string>
+			<key>CFBundleTypeName</key>
+			<string>KML geographic compressed data</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
 		<dict>
 			<key>CFBundleTypeExtensions</key>
 			<array>
@@ -74,7 +90,7 @@
 			</array>
 			<key>CFBundleTypeMIMETypes</key>
 			<array>
-				<string>application/loc+xml</string>
+				<string>application/vnd.groundspeak.loc+xml</string>
 			</array>
 			<key>CFBundleTypeIconFile</key>
 			<string>icons/loc.icns</string>
@@ -90,7 +106,7 @@
 			</array>
 			<key>CFBundleTypeMIMETypes</key>
 			<array>
-				<string>application/slf+xml</string>
+				<string>application/vnd.sigma.slf+xml</string>
 			</array>
 			<key>CFBundleTypeIconFile</key>
 			<string>icons/slf.icns</string>
@@ -250,7 +266,7 @@
 			</array>
 			<key>CFBundleTypeMIMETypes</key>
 			<array>
-				<string>application/sml+xml</string>
+				<string>application/vnd.suunto.sml+xml</string>
 			</array>
 			<key>CFBundleTypeIconFile</key>
 			<string>icons/sml.icns</string>
@@ -259,6 +275,225 @@
 			<key>CFBundleTypeRole</key>
 			<string>Viewer</string>
 		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>jpeg</string>
+				<string>jpg</string>
+			</array>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>image/jpeg</string>
+			</array>
+			<key>CFBundleTypeName</key>
+			<string>JPEG Image</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>csv</string>
+			</array>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>text/csv</string>
+			</array>
+			<key>CFBundleTypeName</key>
+			<string>Comma-Separated Values (CSV) Files</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>img</string>
+			</array>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>application/vnd.garmin.img</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>icons/img.icns</string>
+			<key>CFBundleTypeName</key>
+			<string>Garmin IMG Map</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>gmap</string>
+				<string>gmapi</string>
+			</array>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>application/vnd.garmin.gmap</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>icons/img.icns</string>
+			<key>CFBundleTypeName</key>
+			<string>Garmin Map Product File</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>jnx</string>
+			</array>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>application/vnd.garmin.jnx</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>icons/jnx.icns</string>
+			<key>CFBundleTypeName</key>
+			<string>Garmin JNX Map</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>kap</string>
+			</array>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>application/vnd.maptech.kap</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>icons/kap.icns</string>
+			<key>CFBundleTypeName</key>
+			<string>BSB Nautical Charts</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>map</string>
+			</array>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>application/vnd.oziexplorer.map</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>icons/map.icns</string>
+			<key>CFBundleTypeName</key>
+			<string>OziExplorer Map File</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>rmap</string>
+				<string>rtmap</string>
+			</array>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>application/vnd.twonav.rmap</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>icons/rmap.icns</string>
+			<key>CFBundleTypeName</key>
+			<string>TwoNav Raster Map File</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>tba</string>
+			</array>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>application/vnd.trekbuddy.tba</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>icons/tba.icns</string>
+			<key>CFBundleTypeName</key>
+			<string>TrekBuddy Atlas</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>mbtiles</string>
+			</array>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>application/vnd.mapbox.mbtiles</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>icons/mbts.icns</string>
+			<key>CFBundleTypeName</key>
+			<string>MBTiles Map File</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>tiff</string>
+			</array>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>image/tiff</string>
+			</array>
+			<key>CFBundleTypeName</key>
+			<string>GeoTIFF Image</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>xml</string>
+			</array>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>application/vnd.gpxsee.map+xml</string>
+			</array>
+			<key>CFBundleTypeName</key>
+			<string>GPXSee Map Definition File</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>aqm</string>
+			</array>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>application/vnd.alpinequest.aqm</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>icons/aqm.icns</string>
+			<key>CFBundleTypeName</key>
+			<string>AlpineQuest Map File</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>sqlitedb</string>
+			</array>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>application/vnd.rmaps.sqlite</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>icons/sqlt.icns</string>
+			<key>CFBundleTypeName</key>
+			<string>RMaps SQLite Map File</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
 	</array>
 
 	<key>UTImportedTypeDeclarations</key>
@@ -302,7 +537,7 @@
 					<string>tcx</string>
 				</array>
 				<key>public.mime-type</key>
-				<string>application/tcx+xml</string>
+				<string>application/vnd.garmin.tcx+xml</string>
 			</dict>
 		</dict>
 		<dict>
@@ -326,6 +561,27 @@
 				<string>application/vnd.google-earth.kml+xml</string>
 			</dict>
 		</dict>
+		<dict>
+			<key>UTTypeIdentifier</key>
+			<string>com.google.kmz</string>
+			<key>UTTypeReferenceURL</key>
+			<string>https://developers.google.com/kml/documentation/kmlreference</string>
+			<key>UTTypeDescription</key>
+			<string>KML geographic compressed data</string>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>public.archive</string>
+			</array>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>public.filename-extension</key>
+				<array>
+					<string>kmz</string>
+				</array>
+				<key>public.mime-type</key>
+				<string>application/vnd.google-earth.kmz</string>
+			</dict>
+		</dict>
 		<dict>
 			<key>UTTypeIdentifier</key>
 			<string>com.geocaching.loc</string>
@@ -344,7 +600,7 @@
 					<string>loc</string>
 				</array>
 				<key>public.mime-type</key>
-				<string>application/loc+xml</string>
+				<string>application/vnd.groundspeak.loc+xml</string>
 			</dict>
 		</dict>
 		<dict>
@@ -365,7 +621,7 @@
 					<string>slf</string>
 				</array>
 				<key>public.mime-type</key>
-				<string>application/slf+xml</string>
+				<string>application/vnd.sigma.slf+xml</string>
 			</dict>
 		</dict>
 		<dict>
@@ -575,7 +831,311 @@
 					<string>sml</string>
 				</array>
 				<key>public.mime-type</key>
-				<string>application/sml+xml</string>
+				<string>application/vnd.suunto.sml+xml</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>UTTypeIdentifier</key>
+			<string>public.jpeg</string>
+			<key>UTTypeReferenceURL</key>
+			<string>http://www.w3.org/Graphics/JPEG/</string>
+			<key>UTTypeDescription</key>
+			<string>JPEG Image</string>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>public.image</string>
+				<string>public.data</string>
+			</array>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>public.filename-extension</key>
+				<array>
+					<string>jpeg</string>
+					<string>jpg</string>
+				</array>
+				<key>public.mime-type</key>
+				<string>image/jpeg</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>UTTypeIdentifier</key>
+			<string>public.csv</string>
+			<key>UTTypeReferenceURL</key>
+			<string>https://tools.ietf.org/html/rfc4180</string>
+			<key>UTTypeDescription</key>
+			<string>Comma-Separated Values (CSV) Files</string>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>public.data</string>
+			</array>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>public.filename-extension</key>
+				<array>
+					<string>csv</string>
+				</array>
+				<key>public.mime-type</key>
+				<string>text/csv</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>UTTypeIdentifier</key>
+			<string>com.garmin.img</string>
+			<key>UTTypeReferenceURL</key>
+			<string>https://sourceforge.net/projects/garmin-img/</string>
+			<key>UTTypeDescription</key>
+			<string>Garmin IMG map</string>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>public.data</string>
+			</array>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>public.filename-extension</key>
+				<array>
+					<string>img</string>
+				</array>
+				<key>public.mime-type</key>
+				<string>application/vnd.garmin.img</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>UTTypeIdentifier</key>
+			<string>com.garmin.jnx</string>
+			<key>UTTypeReferenceURL</key>
+			<string>http://whiter.brinkster.net/en/JNX.shtml</string>
+			<key>UTTypeDescription</key>
+			<string>Garmin JNX Map</string>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>public.data</string>
+			</array>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>public.filename-extension</key>
+				<array>
+					<string>jnx</string>
+				</array>
+				<key>public.mime-type</key>
+				<string>application/vnd.garmin.jnx</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>UTTypeIdentifier</key>
+			<string>com.garmin.gmap</string>
+			<key>UTTypeReferenceURL</key>
+			<string>https://sourceforge.net/projects/garmin-img/</string>
+			<key>UTTypeDescription</key>
+			<string>Garmin Map Product File</string>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>public.xml</string>
+			</array>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>public.filename-extension</key>
+				<array>
+					<string>xml</string>
+				</array>
+				<key>public.mime-type</key>
+				<string>application/vnd.garmin.gmap</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>UTTypeIdentifier</key>
+			<string>com.maptech.kap</string>
+			<key>UTTypeReferenceURL</key>
+			<string>http://libbsb.sourceforge.net/bsb_file_format.html</string>
+			<key>UTTypeDescription</key>
+			<string>BSB Nautical Charts</string>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>public.image</string>
+				<string>public.data</string>
+			</array>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>public.filename-extension</key>
+				<array>
+					<string>kap</string>
+				</array>
+				<key>public.mime-type</key>
+				<string>image/vnd.maptech.kap</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>UTTypeIdentifier</key>
+			<string>com.oziexplorer3.map</string>
+			<key>UTTypeReferenceURL</key>
+			<string>https://www.oziexplorer3.com/eng/help/map_file_format.html</string>
+			<key>UTTypeDescription</key>
+			<string>OziExplorer Map File</string>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>public.data</string>
+			</array>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>public.filename-extension</key>
+				<array>
+					<string>map</string>
+				</array>
+				<key>public.mime-type</key>
+				<string>application/vnd.oziexplorer.map</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>UTTypeIdentifier</key>
+			<string>com.mapbox.mbtiles</string>
+			<key>UTTypeReferenceURL</key>
+			<string>https://github.com/mapbox/mbtiles-spec</string>
+			<key>UTTypeDescription</key>
+			<string>MBTiles Map File</string>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>public.data</string>
+			</array>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>public.filename-extension</key>
+				<array>
+					<string>mbtiles</string>
+				</array>
+				<key>public.mime-type</key>
+				<string>application/vnd.mapbox.mbtiles</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>UTTypeIdentifier</key>
+			<string>com.twonav.rmap</string>
+			<key>UTTypeReferenceURL</key>
+			<string>https://wiki.openstreetmap.org/wiki/TwoNav_RMAP</string>
+			<key>UTTypeDescription</key>
+			<string>TwoNav Raster Map File</string>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>public.data</string>
+			</array>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>public.filename-extension</key>
+				<array>
+					<string>rmap</string>
+					<string>rtmap</string>
+				</array>
+				<key>public.mime-type</key>
+				<string>application/vnd.twonav.rmap</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>UTTypeIdentifier</key>
+			<string>net.trekbuddy.tba</string>
+			<key>UTTypeReferenceURL</key>
+			<string>https://github.com/kruhc/trekbuddy</string>
+			<key>UTTypeDescription</key>
+			<string>TrekBuddy Atlas</string>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>public.data</string>
+			</array>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>public.filename-extension</key>
+				<array>
+					<string>tba</string>
+				</array>
+				<key>public.mime-type</key>
+				<string>application/vnd.trekbuddy.tba</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>UTTypeIdentifier</key>
+			<string>net.alpinequest.aqm</string>
+			<key>UTTypeReferenceURL</key>
+			<string>https://svn.code.sf.net/p/mobac/code/trunk/MOBAC</string>
+			<key>UTTypeDescription</key>
+			<string>AlpineQuest Map File</string>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>public.data</string>
+			</array>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>public.filename-extension</key>
+				<array>
+					<string>aqm</string>
+				</array>
+				<key>public.mime-type</key>
+				<string>application/vnd.alpinequest.aqm</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>UTTypeIdentifier</key>
+			<string>com.robert.maps</string>
+			<key>UTTypeReferenceURL</key>
+			<string>https://svn.code.sf.net/p/mobac/code/trunk/MOBAC</string>
+			<key>UTTypeDescription</key>
+			<string>RMaps SQLite Map File</string>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>public.data</string>
+			</array>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>public.filename-extension</key>
+				<array>
+					<string>sqlitedb</string>
+				</array>
+				<key>public.mime-type</key>
+				<string>application/vnd.rmaps.sqlite</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>UTTypeIdentifier</key>
+			<string>public.tiff</string>
+			<key>UTTypeReferenceURL</key>
+			<string>https://www.adobe.io/open/standards/TIFF.html</string>
+			<key>UTTypeDescription</key>
+			<string>TIFF Image</string>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>public.image</string>
+				<string>public.data</string>
+			</array>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>public.filename-extension</key>
+				<array>
+					<string>tiff</string>
+					<string>tif</string>
+				</array>
+				<key>public.mime-type</key>
+				<string>image/tiff</string>
+			</dict>
+		</dict>
+	</array>
+
+	<key>UTExportedTypeDeclarations</key>
+	<array>
+		<dict>
+			<key>UTTypeIdentifier</key>
+			<string>org.gpxsee.map</string>
+			<key>UTTypeReferenceURL</key>
+			<string>http://www.gpxsee.org/map/1.4/</string>
+			<key>UTTypeDescription</key>
+			<string>GPXSee Map Definition File</string>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>public.xml</string>
+			</array>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>public.filename-extension</key>
+				<array>
+					<string>xml</string>
+				</array>
+				<key>public.mime-type</key>
+				<string>application/vnd.gpxsee.map+xml</string>
 			</dict>
 		</dict>
 	</array>

pkg/appdata.xml

@@ -18,13 +18,14 @@
 			<li>User-definable online maps (OpenStreetMap/Google tiles, WMTS,
 				WMS, TMS, QuadTiles).</li>
 			<li>Offline maps (MBTiles, OziExplorer maps, TrekBuddy maps/atlases,
-				TwoNav RMaps, Garmin IMG &amp; JNX, GeoTIFF images).</li>
+				TwoNav RMaps, Garmin IMG &amp; JNX maps, GeoTIFF images,
+				BSB nautical charts, KMZ maps, AlpineQuest maps).</li>
 			<li>Elevation, speed, heart rate, cadence, power, temperature and
 				gear ratio graphs.</li>
 			<li>Support for multiple tracks in one view.</li>
 			<li>Support for POI files.</li>
 			<li>Support for DEM files (SRTM HGT).</li>
-			<li>Print/export to PDF.</li>
+			<li>Print/export to PDF &amp; PNG.</li>
 			<li>Full-screen mode.</li>
 			<li>HiDPI/Retina displays &amp; maps support.</li>
 		</ul>
@@ -32,10 +33,10 @@
 
 	<screenshots>
 		<screenshot type="default">
-			<image>http://www.gpxsee.org/gallery/lin1.png</image>
+			<image>https://www.gpxsee.org/gallery/linux.png</image>
 		</screenshot>
 		<screenshot>
-			<image>http://www.gpxsee.org/gallery/lin2.png</image>
+			<image>https://www.gpxsee.org/gallery/poi2.png</image>
 		</screenshot>
 	</screenshots>
 
@@ -48,7 +49,7 @@
 		<category>DataVisualization</category>
 	</categories>
 
-	<url type="homepage">http://www.gpxsee.org</url>
+	<url type="homepage">https://www.gpxsee.org</url>
 
 	<launchable type="desktop-id">gpxsee.desktop</launchable>
 
@@ -58,7 +59,7 @@
 
 	<mimetypes>
 		<mimetype>application/gpx+xml</mimetype>
-		<mimetype>application/tcx+xml</mimetype>
+		<mimetype>application/vnd.garmin.tcx+xml</mimetype>
 		<mimetype>application/vnd.ant.fit</mimetype>
 		<mimetype>application/vnd.google-earth.kml+xml</mimetype>
 		<mimetype>application/vnd.fai.igc</mimetype>
@@ -66,11 +67,27 @@
 		<mimetype>application/vnd.oziexplorer.plt</mimetype>
 		<mimetype>application/vnd.oziexplorer.rte</mimetype>
 		<mimetype>application/vnd.oziexplorer.wpt</mimetype>
-		<mimetype>application/loc+xml</mimetype>
-		<mimetype>application/slf+xml</mimetype>
+		<mimetype>application/vnd.groundspeak.loc+xml</mimetype>
+		<mimetype>application/vnd.sigma.slf+xml</mimetype>
 		<mimetype>application/geo+json</mimetype>
 		<mimetype>application/vnd.naviter.seeyou.cup</mimetype>
 		<mimetype>application/vnd.garmin.gpi</mimetype>
-		<mimetype>application/sml+xml</mimetype>
+		<mimetype>application/vnd.suunto.sml+xml</mimetype>
+		<mimetype>image/jpeg</mimetype>
+		<mimetype>text/csv</mimetype>
+		<mimetype>application/vnd.garmin.img</mimetype>
+		<mimetype>application/vnd.garmin.jnx</mimetype>
+		<mimetype>application/vnd.garmin.gmap+xml</mimetype>
+		<mimetype>image/vnd.maptech.kap</mimetype>
+		<mimetype>application/vnd.oziexplorer.map</mimetype>
+		<mimetype>application/vnd.mapbox.mbtiles</mimetype>
+		<mimetype>application/vnd.twonav.rmap</mimetype>
+		<mimetype>application/vnd.trekbuddy.tba</mimetype>
+		<mimetype>application/vnd.gpxsee.map+xml</mimetype>
+		<mimetype>application/x-tar</mimetype>
+		<mimetype>image/tiff</mimetype>
+		<mimetype>application/vnd.google-earth.kmz</mimetype>
+		<mimetype>application/vnd.alpinequest.aqm</mimetype>
+		<mimetype>application/vnd.rmaps.sqlite</mimetype>
 	</mimetypes>
 </component>

pkg/csv/pcs.csv

@@ -1887,6 +1887,7 @@ CI1971 / Chatham Islands Map Grid,5518,4672,5517,9001,9807,4500,8801,-44,9110,88
 CI1979 / Chatham Islands Map Grid,5519,4673,5517,9001,9807,4500,8801,-44,9110,8802,-176.3,9110,8805,1,9201,8806,350000,9001,8807,650000,9001,,,,,,
 DHDN / 3-degree Gauss-Kruger zone 1,5520,4314,16261,9001,9807,4530,8801,0,9102,8802,3,9102,8805,1,9201,8806,1500000,9001,8807,0,9001,,,,,,
 WGS 84 / Gabon TM 2011,5523,4326,5522,9001,9807,4499,8801,0,9102,8802,11.3,9110,8805,0.9996,9201,8806,1500000,9001,8807,5500000,9001,,,,,,
+SAD69(96) / Brazil Polyconic,5530,5527,19941,9001,9818,4499,8801,0,9102,8802,-54,9102,8806,5000000,9001,8807,10000000,9001,,,,,,,,,
 SAD69(96) / UTM zone 21S,5531,5527,16121,9001,9807,4400,8801,0,9102,8802,-57,9102,8805,0.9996,9201,8806,500000,9001,8807,10000000,9001,,,,,,
 SAD69(96) / UTM zone 22S,5532,4618,16122,9001,9807,4400,8801,0,9102,8802,-51,9102,8805,0.9996,9201,8806,500000,9001,8807,10000000,9001,,,,,,
 SAD69(96) / UTM zone 23S,5533,5527,16123,9001,9807,4400,8801,0,9102,8802,-45,9102,8805,0.9996,9201,8806,500000,9001,8807,10000000,9001,,,,,,
@@ -1970,6 +1971,7 @@ SAD69(96) / UTM zone 18S,5875,5527,16118,9001,9807,4400,8801,0,9102,8802,-75,910
 SAD69(96) / UTM zone 19S,5876,5527,16119,9001,9807,4400,8801,0,9102,8802,-69,9102,8805,0.9996,9201,8806,500000,9001,8807,10000000,9001,,,,,,
 SAD69(96) / UTM zone 20S,5877,5527,16120,9001,9807,4400,8801,0,9102,8802,-63,9102,8805,0.9996,9201,8806,500000,9001,8807,10000000,9001,,,,,,
 Cadastre 1997 / UTM zone 38S,5879,4475,16138,9001,9807,4400,8801,0,9102,8802,45,9102,8805,0.9996,9201,8806,500000,9001,8807,10000000,9001,,,,,,
+SIRGAS 2000 / Brazil Polyconic,5880,4674,19941,9001,9818,4499,8801,0,9102,8802,-54,9102,8806,5000000,9001,8807,10000000,9001,,,,,,,,,
 WGS 84 / EPSG Arctic Regional zone A1,5921,4326,5906,9001,9802,4400,8821,81.19020136,9110,8822,-111,9102,8823,85,9102,8824,77,9102,8826,0,9001,8827,0,9001,,,
 WGS 84 / EPSG Arctic Regional zone A2,5922,4326,5907,9001,9802,4400,8821,81.19020136,9110,8822,-39,9102,8823,85,9102,8824,77,9102,8826,0,9001,8827,0,9001,,,
 WGS 84 / EPSG Arctic Regional zone A3,5923,4326,5908,9001,9802,4400,8821,81.19020136,9110,8822,33,9102,8823,85,9102,8824,77,9102,8826,0,9001,8827,0,9001,,,
@@ -3046,6 +3048,8 @@ Pulkovo 1942 / Gauss-Kruger 32N,28492,4284,16332,9001,9807,4530,8801,0,9102,8802
 Qatar 1974 / Qatar National Grid,28600,4285,19919,9001,9807,4400,8801,24.27,9110,8802,51.13,9110,8805,0.99999,9201,8806,200000,9001,8807,300000,9001,,,,,,
 Amersfoort / RD Old,28991,4289,19913,9001,9809,4499,8801,52.0922178,9110,8802,5.23155,9110,8805,0.9999079,9201,8806,0,9001,8807,0,9001,,,,,,
 Amersfoort / RD New,28992,4289,19914,9001,9809,4499,8801,52.0922178,9110,8802,5.23155,9110,8805,0.9999079,9201,8806,155000,9001,8807,463000,9001,,,,,,
+SAD69 / Brazil Polyconic,29100,4291,19941,9001,9818,4499,8801,0,9102,8802,-54,9102,8806,5000000,9001,8807,10000000,9001,,,,,,,,,
+SAD69 / Brazil Polyconic,29101,4618,19941,9001,9818,4499,8801,0,9102,8802,-54,9102,8806,5000000,9001,8807,10000000,9001,,,,,,,,,
 SAD69 / UTM zone 18N,29118,4291,16018,9001,9807,4400,8801,0,9102,8802,-75,9102,8805,0.9996,9201,8806,500000,9001,8807,0,9001,,,,,,
 SAD69 / UTM zone 19N,29119,4291,16019,9001,9807,4400,8801,0,9102,8802,-69,9102,8805,0.9996,9201,8806,500000,9001,8807,0,9001,,,,,,
 SAD69 / UTM zone 20N,29120,4291,16020,9001,9807,4400,8801,0,9102,8802,-63,9102,8805,0.9996,9201,8806,500000,9001,8807,0,9001,,,,,,

pkg/gpxsee.desktop

@@ -14,5 +14,5 @@ Exec=gpxsee %F
 Icon=gpxsee
 Terminal=false
 Type=Application
-Categories=Graphics;Viewer;Education;Geography;Maps;Sports;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;application/vnd.oziexplorer.plt;application/vnd.oziexplorer.rte;application/vnd.oziexplorer.wpt;application/loc+xml;application/slf+xml;application/geo+json;application/vnd.naviter.seeyou.cup;application/vnd.garmin.gpi;application/sml+xml;
+Categories=Graphics;Viewer;Education;Geography;Maps;Sports;Qt
+MimeType=application/gpx+xml;application/vnd.garmin.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;application/vnd.groundspeak.loc+xml;application/vnd.sigma.slf+xml;application/geo+json;application/vnd.naviter.seeyou.cup;application/vnd.garmin.gpi;application/vnd.suunto.sml+xml;image/jpeg;text/csv;application/vnd.garmin.img;application/vnd.garmin.jnx;application/vnd.garmin.gmap+xml;image/vnd.maptech.kap;application/vnd.oziexplorer.map;application/vnd.mapbox.mbtiles;application/vnd.twonav.rmap;application/vnd.trekbuddy.tba;application/vnd.gpxsee.map+xml;application/x-tar;image/tiff;application/vnd.google-earth.kmz;application/vnd.alpinequest.aqm;application/vnd.rmaps.sqlite

pkg/gpxsee.nsi

@@ -1,13 +1,15 @@
-!include "MUI2.nsh"
+!include "MUI2.nsh"
 !include "x64.nsh"
 !include "WinVer.nsh"
 !include "macros.nsh"
 
 
+Unicode true
+
 ; The name of the installer
 Name "GPXSee"
 ; Program version
-!define VERSION "7.24"
+!define VERSION "8.6"
 
 ; The file to write
 OutFile "GPXSee-${VERSION}.exe"
@@ -17,6 +19,9 @@ SetCompressor /SOLID lzma
 ; Required execution level
 RequestExecutionLevel admin
 
+; Don't let the OS scale(blur) the installer GUI
+ManifestDPIAware true
+
 ; The default installation directory
 InstallDir "$PROGRAMFILES\GPXSee"
 
@@ -81,6 +86,9 @@ Section "GPXSee" SEC_APP
   File /r "maps"
   File /r "csv"
 
+  ; Create the uninstaller
+  WriteUninstaller "$INSTDIR\uninstall.exe"  
+  
   ; Create start menu entry and add links
   SetShellVarContext all
   !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
@@ -89,31 +97,23 @@ Section "GPXSee" SEC_APP
     CreateShortCut "$SMPROGRAMS\$StartMenuFolder\GPXSee.lnk" "$INSTDIR\gpxsee.exe"
   !insertmacro MUI_STARTMENU_WRITE_END
 
-  ; Create the uninstaller
-  WriteUninstaller "$INSTDIR\uninstall.exe"
-
   ; Write the installation path into the registry
   DetailPrint "Registering application..."
   WriteRegStr HKLM SOFTWARE\GPXSee "Install_Dir" "$INSTDIR"
 
   ; Write the uninstall keys for Windows
   WriteRegStr HKLM "${REGENTRY}" "DisplayName" "GPXSee"
-  WriteRegStr HKLM "${REGENTRY}" "Publisher" "Martin Tuma"
+  WriteRegStr HKLM "${REGENTRY}" "Publisher" "Martin Tůma"
   WriteRegStr HKLM "${REGENTRY}" "DisplayVersion" "${VERSION}"
   WriteRegStr HKLM "${REGENTRY}" "UninstallString" '"$INSTDIR\uninstall.exe"'
+  WriteRegStr HKLM "${REGENTRY}" "DisplayIcon" '"$INSTDIR\gpxsee.exe"'
+  WriteRegStr HKLM "${REGENTRY}" "InstallLocation" '"$INSTDIR"'
+  WriteRegStr HKLM "${REGENTRY}" "URLInfoAbout" "https://www.gpxsee.org"
   WriteRegDWORD HKLM "${REGENTRY}" "NoModify" 1
   WriteRegDWORD HKLM "${REGENTRY}" "NoRepair" 1
 
   ; Associate file formats
   DetailPrint "Associating file types..."
-  !insertmacro FILE_ASSOCIATION_ADD "gpx" "GPS Exchange Format" 8
-  !insertmacro FILE_ASSOCIATION_ADD "tcx" "Training Center XML" 9
-  !insertmacro FILE_ASSOCIATION_ADD "kml" "Keyhole Markup Language" 10
-  !insertmacro FILE_ASSOCIATION_ADD "fit" "Flexible and Interoperable Data Transfer" 11
-  !insertmacro FILE_ASSOCIATION_ADD "igc" "Flight Recorder Data Format" 12
-  !insertmacro FILE_ASSOCIATION_ADD "nmea" "NMEA 0183 Data" 13
-  !insertmacro FILE_ASSOCIATION_ADD "plt" "OziExplorer Track Point File" 14
-  !insertmacro FILE_ASSOCIATION_ADD "rte" "OziExplorer Route File" 15
   !insertmacro FILE_ASSOCIATION_ADD "wpt" "OziExplorer Waypoint File" 1
   !insertmacro FILE_ASSOCIATION_ADD "loc" "Geocaching.com Waypoint File" 2
   !insertmacro FILE_ASSOCIATION_ADD "slf" "Sigma Log File" 3
@@ -121,6 +121,61 @@ Section "GPXSee" SEC_APP
   !insertmacro FILE_ASSOCIATION_ADD "cup" "SeeYou CUP File" 5
   !insertmacro FILE_ASSOCIATION_ADD "gpi" "Garmin POI File" 6
   !insertmacro FILE_ASSOCIATION_ADD "sml" "Suunto Markup Language" 7
+  !insertmacro FILE_ASSOCIATION_ADD "img" "Garmin IMG Map" 8
+  !insertmacro FILE_ASSOCIATION_ADD "jnx" "Garmin JNX Map" 9
+  !insertmacro FILE_ASSOCIATION_ADD "kap" "BSB Nautical Chart" 10
+  !insertmacro FILE_ASSOCIATION_ADD "gpx" "GPS Exchange Format" 11
+  !insertmacro FILE_ASSOCIATION_ADD "map" "OziExplorer Map File" 12
+  !insertmacro FILE_ASSOCIATION_ADD "mbtiles" "MBTiles Map File" 13
+  !insertmacro FILE_ASSOCIATION_ADD "rmap" "TwoNav Raster Map File" 14
+  !insertmacro FILE_ASSOCIATION_ADD "tba" "TrekBuddy Atlas" 15
+  !insertmacro FILE_ASSOCIATION_ADD "aqm" "AlpineQuest Map File" 16
+  !insertmacro FILE_ASSOCIATION_ADD "sqlitedb" "RMAps SQLite Map File" 17
+  !insertmacro FILE_ASSOCIATION_ADD "tcx" "Training Center XML" 18
+  !insertmacro FILE_ASSOCIATION_ADD "kml" "Keyhole Markup Language" 19
+  !insertmacro FILE_ASSOCIATION_ADD "kmz" "KML geographic compressed data" 19
+  !insertmacro FILE_ASSOCIATION_ADD "fit" "Flexible and Interoperable Data Transfer" 20
+  !insertmacro FILE_ASSOCIATION_ADD "igc" "Flight Recorder Data Format" 21
+  !insertmacro FILE_ASSOCIATION_ADD "nmea" "NMEA 0183 Data" 22
+  !insertmacro FILE_ASSOCIATION_ADD "plt" "OziExplorer Track File" 23
+  !insertmacro FILE_ASSOCIATION_ADD "rte" "OziExplorer Route File" 24
+
+  WriteRegStr HKCR "Applications\GPXSee.exe\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
+  WriteRegStr HKCR ".gpx\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".tcx\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".kml\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".fit\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".igc\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".nmea\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".plt\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".rte\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".wpt\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".loc\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".slf\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".geojson\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".cup\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".gpi\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".sml\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".csv\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".json\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".jpg\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".jpeg\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".img\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".jnx\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".kap\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".map\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".mbtiles\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".rmap\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".rtmap\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".tar\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".tba\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".tif\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".tiff\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".xml\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".kmz\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".aqm\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".sqlitedb\OpenWithList" "GPXSee.exe" ""
+  
   System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
 
 SectionEnd
@@ -157,6 +212,8 @@ SectionEnd
 
 Section "OpenSSL" SEC_OPENSSL
 
+  SectionIn RO
+
   File "libcrypto-1_1.dll"
   File "libssl-1_1.dll"
 
@@ -173,10 +230,12 @@ SectionEnd
 SectionGroup "Localization" SEC_LOCALIZATION
   !insertmacro LOCALIZATION "Czech" "cs"
   !insertmacro LOCALIZATION "Danish" "da"
+  !insertmacro LOCALIZATION "Esperanto" "eo"
   !insertmacro LOCALIZATION "Finnish" "fi"
   !insertmacro LOCALIZATION "French" "fr"
   !insertmacro LOCALIZATION "German" "de"
   !insertmacro LOCALIZATION "Hungarian" "hu"
+  !insertmacro LOCALIZATION "Italian" "it"
   !insertmacro LOCALIZATION "Norwegian" "nb"
   !insertmacro LOCALIZATION "Polish" "pl"
   !insertmacro LOCALIZATION "Portuguese (Brazil)" "pt_BR"
@@ -206,7 +265,7 @@ Section "Uninstall"
   Delete "$SMPROGRAMS\$StartMenuFolder\*.*"
   RMDir "$SMPROGRAMS\$StartMenuFolder"
 
-  ; Remove GPX file association
+  ; Remove file associations
   !insertmacro FILE_ASSOCIATION_REMOVE "gpx"
   !insertmacro FILE_ASSOCIATION_REMOVE "tcx"
   !insertmacro FILE_ASSOCIATION_REMOVE "kml"
@@ -222,6 +281,53 @@ Section "Uninstall"
   !insertmacro FILE_ASSOCIATION_REMOVE "cup"
   !insertmacro FILE_ASSOCIATION_REMOVE "gpi"
   !insertmacro FILE_ASSOCIATION_REMOVE "sml"
+  !insertmacro FILE_ASSOCIATION_REMOVE "img"
+  !insertmacro FILE_ASSOCIATION_REMOVE "jnx"
+  !insertmacro FILE_ASSOCIATION_REMOVE "kap"
+  !insertmacro FILE_ASSOCIATION_REMOVE "map"
+  !insertmacro FILE_ASSOCIATION_REMOVE "mbtiles"
+  !insertmacro FILE_ASSOCIATION_REMOVE "rmap"
+  !insertmacro FILE_ASSOCIATION_REMOVE "tba"
+  !insertmacro FILE_ASSOCIATION_REMOVE "kmz"
+  !insertmacro FILE_ASSOCIATION_REMOVE "aqm"
+  !insertmacro FILE_ASSOCIATION_REMOVE "sqlitedb"
+
+  DeleteRegValue HKCR ".gpx\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".tcx\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".kml\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".fit\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".igc\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".nmea\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".plt\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".rte\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".wpt\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".loc\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".slf\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".geojson\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".cup\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".gpi\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".sml\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".csv\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".json\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".jpg\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".jpeg\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".img\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".jnx\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".kap\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".map\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".mbtiles\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".rmap\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".rtmap\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".tar\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".tba\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".tif\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".tiff\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".xml\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".kmz\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".aqm\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".sqlitedb\OpenWithList" "GPXSee.exe"
+  DeleteRegKey HKCR "Applications\GPXSee.exe"
+  
   System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
 
 SectionEnd

pkg/gpxsee.xml

@@ -1,35 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
 
+	<!-- Data files -->
+
 	<mime-type type="application/gpx+xml">
 		<comment>GPS Exchange Format</comment>
 		<sub-class-of type="application/xml"/>
 		<generic-icon name="application-xml"/>
+		<root-XML namespaceURI="http://www.topografix.com/GPX/1/0" localName="gpx"/>
+		<root-XML namespaceURI="http://www.topografix.com/GPX/1/1" localName="gpx"/>
 		<glob pattern="*.gpx"/>
 	</mime-type>
 
-	<mime-type type="application/tcx+xml">
+	<mime-type type="application/vnd.garmin.tcx+xml">
 		<comment>Training Center XML</comment>
 		<sub-class-of type="application/xml"/>
 		<generic-icon name="application-xml"/>
+		<root-XML namespaceURI="http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2" localName="TrainingCenterDatabase"/>
 		<glob pattern="*.tcx"/>
 	</mime-type>
 
-	<mime-type type="application/kml+xml">
+	<mime-type type="application/vnd.google-earth.kml+xml">
 		<comment>Keyhole Markup Language</comment>
 		<sub-class-of type="application/xml"/>
 		<generic-icon name="application-xml"/>
+		<root-XML namespaceURI="http://www.opengis.net/kml/2.2" localName="kml"/>
 		<glob pattern="*.kml"/>
 	</mime-type>
 
-	<mime-type type="application/loc+xml">
+	<mime-type type="application/vnd.groundspeak.loc+xml">
 		<comment>Geocaching.com Waypoint File</comment>
 		<sub-class-of type="application/xml"/>
 		<generic-icon name="application-xml"/>
 		<glob pattern="*.loc"/>
 	</mime-type>
 
-	<mime-type type="application/slf+xml">
+	<mime-type type="application/vnd.sigma.slf+xml">
 		<comment>Sigma Log Format</comment>
 		<sub-class-of type="application/xml"/>
 		<generic-icon name="application-xml"/>
@@ -40,6 +46,9 @@
 		<comment>Flexible and Interoperable Data Transfer</comment>
 		<sub-class-of type="application/octet-stream"/>
 		<generic-icon name="application-octet-stream"/>
+		<magic>
+			<match type="string" offset="8" value=".FIT"/>
+		</magic>
 		<glob pattern="*.fit"/>
 	</mime-type>
 
@@ -61,6 +70,9 @@
 		<comment>OziExplorer Track Point File</comment>
 		<sub-class-of type="text/plain"/>
 		<generic-icon name="text-plain"/>
+		<magic>
+			<match type="string" offset="0" value="OziExplorer Track Point File"/>
+		</magic>
 		<glob pattern="*.plt"/>
 	</mime-type>
 
@@ -68,6 +80,9 @@
 		<comment>OziExplorer Route File</comment>
 		<sub-class-of type="text/plain"/>
 		<generic-icon name="text-plain"/>
+		<magic>
+			<match type="string" offset="0" value="OziExplorer Route File"/>
+		</magic>
 		<glob pattern="*.rte"/>
 	</mime-type>
 
@@ -75,6 +90,9 @@
 		<comment>OziExplorer Waypoint File</comment>
 		<sub-class-of type="text/plain"/>
 		<generic-icon name="text-plain"/>
+		<magic>
+			<match type="string" offset="0" value="OziExplorer Waypoint File"/>
+		</magic>
 		<glob pattern="*.wpt"/>
 	</mime-type>
 
@@ -96,13 +114,127 @@
 		<comment>Garmin POI File</comment>
 		<sub-class-of type="application/octet-stream"/>
 		<generic-icon name="application/octet-stream"/>
+		<magic>
+			<match type="string" offset="8" value="GRMREC"/>
+		</magic>
 		<glob pattern="*.gpi"/>
 	</mime-type>
 
-	<mime-type type="application/sml+xml">
+	<mime-type type="application/vnd.suunto.sml+xml">
 		<comment>Suunto Markup Language</comment>
 		<sub-class-of type="application/xml"/>
 		<generic-icon name="application-xml"/>
+		<root-XML namespaceURI="http://www.suunto.com/schemas/sml" localName="sml"/>
 		<glob pattern="*.sml"/>
 	</mime-type>
+
+
+	<!-- Maps -->
+
+	<mime-type type="application/vnd.garmin.img">
+		<comment>Garmin IMG Map</comment>
+		<sub-class-of type="application/octet-stream"/>
+		<generic-icon name="application-octet-stream"/>
+		<magic>
+			<match type="string" offset="16" value="DSKIMG"/>
+		</magic>
+		<glob pattern="*.img"/>
+	</mime-type>
+
+	<mime-type type="application/vnd.garmin.jnx">
+		<comment>Garmin JNX Map</comment>
+		<sub-class-of type="application/octet-stream"/>
+		<generic-icon name="application-octet-stream"/>
+		<glob pattern="*.jnx"/>
+	</mime-type>
+
+	<mime-type type="application/vnd.garmin.gmap+xml">
+		<comment>Garmin Map Product File</comment>
+		<sub-class-of type="application/xml"/>
+		<generic-icon name="application-xml"/>
+		<root-XML namespaceURI="http://www.garmin.com/xmlschemas/MapProduct/v1" localName="MapProduct"/>
+		<root-XML namespaceURI="http://www.garmin.com/xmlschemas/MapProduct/v2" localName="MapProduct"/>
+		<glob pattern="*.xml"/>
+	</mime-type>
+
+	<mime-type type="image/vnd.maptech.kap">
+		<comment>BSB Nautical Chart</comment>
+		<generic-icon name="image-x-generic"/>
+		<glob pattern="*.kap"/>
+	</mime-type>
+
+	<mime-type type="application/vnd.oziexplorer.map">
+		<comment>OziExplorer Map File</comment>
+		<sub-class-of type="text/plain"/>
+		<generic-icon name="text-plain"/>
+		<magic>
+			<match type="string" offset="0" value="OziExplorer Map Data File"/>
+		</magic>
+		<glob pattern="*.map"/>
+	</mime-type>
+
+	<mime-type type="application/vnd.mapbox.mbtiles">
+		<comment>MBTiles Map File</comment>
+		<sub-class-of type="application/vnd.sqlite3"/>
+		<generic-icon name="application/octet-stream"/>
+		<glob pattern="*.mbtiles"/>
+	</mime-type>
+
+	<mime-type type="application/vnd.twonav.rmap">
+		<comment>TwoNav Raster Map File</comment>
+		<sub-class-of type="application/octet-stream"/>
+		<generic-icon name="application/octet-stream"/>
+		<magic>
+			<match type="string" offset="0" value="CompeGPSRasterImage"/>
+		</magic>
+		<glob pattern="*.rmap"/>
+		<glob pattern="*.rtmap"/>
+	</mime-type>
+
+	<mime-type type="application/vnd.trekbuddy.tba">
+		<comment>TrekBuddy Atlas</comment>
+		<sub-class-of type="text/plain"/>
+		<generic-icon name="text-plain"/>
+		<magic>
+			<match type="string" offset="0" value="Atlas 1.0"/>
+		</magic>
+		<glob pattern="*.tba"/>
+	</mime-type>
+
+	<mime-type type="application/vnd.gpxsee.map+xml">
+		<comment>GPXSee Map Definition File</comment>
+		<sub-class-of type="application/xml"/>
+		<generic-icon name="application-xml"/>
+		<root-XML namespaceURI="http://www.gpxsee.org/map/1.0" localName="map"/>
+		<root-XML namespaceURI="http://www.gpxsee.org/map/1.1" localName="map"/>
+		<root-XML namespaceURI="http://www.gpxsee.org/map/1.2" localName="map"/>
+		<root-XML namespaceURI="http://www.gpxsee.org/map/1.3" localName="map"/>
+		<root-XML namespaceURI="http://www.gpxsee.org/map/1.4" localName="map"/>
+		<glob pattern="*.xml"/>
+	</mime-type>
+
+	<mime-type type="application/vnd.google-earth.kmz">
+		<comment>KML geographic compressed data</comment>
+		<sub-class-of type="application/zip"/>
+		<generic-icon name="application/zip"/>
+		<glob pattern="*.kmz"/>
+	</mime-type>
+
+	<mime-type type="application/vnd.alpinequest.aqm">
+		<comment>AlpineQuest Map File</comment>
+		<sub-class-of type="application/octet-stream"/>
+		<generic-icon name="application/octet-stream"/>
+		<magic>
+			<match type="string" offset="0" value="FLATPACK1"/>
+		</magic>
+		<glob pattern="*.aqm"/>
+	</mime-type>
+
+	<mime-type type="application/vnd.rmaps.sqlite">
+		<comment>RMaps SQLite Map File</comment>
+		<sub-class-of type="application/vnd.sqlite3"/>
+		<generic-icon name="application/octet-stream"/>
+		<glob pattern="*.sqlitedb"/>
+	</mime-type>
+
 </mime-info>

pkg/gpxsee64.nsi

@@ -1,13 +1,15 @@
-!include "MUI2.nsh"
+!include "MUI2.nsh"
 !include "x64.nsh"
 !include "WinVer.nsh"
 !include "macros.nsh"
 
 
+Unicode true
+
 ; The name of the installer
 Name "GPXSee"
 ; Program version
-!define VERSION "7.24"
+!define VERSION "8.6"
 
 ; The file to write
 OutFile "GPXSee-${VERSION}_x64.exe"
@@ -17,6 +19,9 @@ SetCompressor /SOLID lzma
 ; Required execution level
 RequestExecutionLevel admin
 
+; Don't let the OS scale(blur) the installer GUI
+ManifestDPIAware true
+
 ; The default installation directory
 InstallDir "$PROGRAMFILES64\GPXSee"
 
@@ -88,6 +93,9 @@ Section "GPXSee" SEC_APP
   File /r "maps"
   File /r "csv"
 
+  ; Create the uninstaller
+  WriteUninstaller "$INSTDIR\uninstall.exe"
+  
   ; Create start menu entry and add links
   SetShellVarContext all
   !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
@@ -96,31 +104,23 @@ Section "GPXSee" SEC_APP
     CreateShortCut "$SMPROGRAMS\$StartMenuFolder\GPXSee.lnk" "$INSTDIR\gpxsee.exe"
   !insertmacro MUI_STARTMENU_WRITE_END
 
-  ; Create the uninstaller
-  WriteUninstaller "$INSTDIR\uninstall.exe"
-
   ; Write the installation path into the registry
   DetailPrint "Registering application..."
   WriteRegStr HKLM SOFTWARE\GPXSee "Install_Dir" "$INSTDIR"
 
   ; Write the uninstall keys for Windows
   WriteRegStr HKLM "${REGENTRY}" "DisplayName" "GPXSee (x64)"
-  WriteRegStr HKLM "${REGENTRY}" "Publisher" "Martin Tuma"
+  WriteRegStr HKLM "${REGENTRY}" "Publisher" "Martin Tůma"
   WriteRegStr HKLM "${REGENTRY}" "DisplayVersion" "${VERSION}"
   WriteRegStr HKLM "${REGENTRY}" "UninstallString" '"$INSTDIR\uninstall.exe"'
+  WriteRegStr HKLM "${REGENTRY}" "DisplayIcon" '"$INSTDIR\gpxsee.exe"'
+  WriteRegStr HKLM "${REGENTRY}" "InstallLocation" '"$INSTDIR"'
+  WriteRegStr HKLM "${REGENTRY}" "URLInfoAbout" "https://www.gpxsee.org"
   WriteRegDWORD HKLM "${REGENTRY}" "NoModify" 1
   WriteRegDWORD HKLM "${REGENTRY}" "NoRepair" 1
 
   ; Associate file formats
   DetailPrint "Associating file types..."
-  !insertmacro FILE_ASSOCIATION_ADD "gpx" "GPS Exchange Format" 8
-  !insertmacro FILE_ASSOCIATION_ADD "tcx" "Training Center XML" 9
-  !insertmacro FILE_ASSOCIATION_ADD "kml" "Keyhole Markup Language" 10
-  !insertmacro FILE_ASSOCIATION_ADD "fit" "Flexible and Interoperable Data Transfer" 11
-  !insertmacro FILE_ASSOCIATION_ADD "igc" "Flight Recorder Data Format" 12
-  !insertmacro FILE_ASSOCIATION_ADD "nmea" "NMEA 0183 Data" 13
-  !insertmacro FILE_ASSOCIATION_ADD "plt" "OziExplorer Track Point File" 14
-  !insertmacro FILE_ASSOCIATION_ADD "rte" "OziExplorer Route File" 15
   !insertmacro FILE_ASSOCIATION_ADD "wpt" "OziExplorer Waypoint File" 1
   !insertmacro FILE_ASSOCIATION_ADD "loc" "Geocaching.com Waypoint File" 2
   !insertmacro FILE_ASSOCIATION_ADD "slf" "Sigma Log File" 3
@@ -128,6 +128,61 @@ Section "GPXSee" SEC_APP
   !insertmacro FILE_ASSOCIATION_ADD "cup" "SeeYou CUP File" 5
   !insertmacro FILE_ASSOCIATION_ADD "gpi" "Garmin POI File" 6
   !insertmacro FILE_ASSOCIATION_ADD "sml" "Suunto Markup Language" 7
+  !insertmacro FILE_ASSOCIATION_ADD "img" "Garmin IMG Map" 8
+  !insertmacro FILE_ASSOCIATION_ADD "jnx" "Garmin JNX Map" 9
+  !insertmacro FILE_ASSOCIATION_ADD "kap" "BSB Nautical Chart" 10
+  !insertmacro FILE_ASSOCIATION_ADD "gpx" "GPS Exchange Format" 11
+  !insertmacro FILE_ASSOCIATION_ADD "map" "OziExplorer Map File" 12
+  !insertmacro FILE_ASSOCIATION_ADD "mbtiles" "MBTiles Map File" 13
+  !insertmacro FILE_ASSOCIATION_ADD "rmap" "TwoNav Raster Map File" 14
+  !insertmacro FILE_ASSOCIATION_ADD "tba" "TrekBuddy Atlas" 15
+  !insertmacro FILE_ASSOCIATION_ADD "aqm" "AlpineQuest Map File" 16
+  !insertmacro FILE_ASSOCIATION_ADD "sqlitedb" "RMaps SQLite Map File" 17
+  !insertmacro FILE_ASSOCIATION_ADD "tcx" "Training Center XML" 18
+  !insertmacro FILE_ASSOCIATION_ADD "kml" "Keyhole Markup Language" 19
+  !insertmacro FILE_ASSOCIATION_ADD "kmz" "KML geographic compressed data" 19
+  !insertmacro FILE_ASSOCIATION_ADD "fit" "Flexible and Interoperable Data Transfer" 20
+  !insertmacro FILE_ASSOCIATION_ADD "igc" "Flight Recorder Data Format" 21
+  !insertmacro FILE_ASSOCIATION_ADD "nmea" "NMEA 0183 Data" 22
+  !insertmacro FILE_ASSOCIATION_ADD "plt" "OziExplorer Track File" 23
+  !insertmacro FILE_ASSOCIATION_ADD "rte" "OziExplorer Route File" 24
+
+  WriteRegStr HKCR "Applications\GPXSee.exe\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
+  WriteRegStr HKCR ".gpx\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".tcx\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".kml\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".fit\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".igc\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".nmea\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".plt\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".rte\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".wpt\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".loc\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".slf\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".geojson\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".cup\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".gpi\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".sml\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".csv\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".json\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".jpg\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".jpeg\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".img\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".jnx\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".kap\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".map\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".mbtiles\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".rmap\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".rtmap\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".tar\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".tba\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".tif\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".tiff\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".xml\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".kmz\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".aqm\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".sqlitedb\OpenWithList" "GPXSee.exe" ""
+
   System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
 
 SectionEnd
@@ -136,6 +191,17 @@ Section "QT framework" SEC_QT
 
   SectionIn RO
 
+!ifdef QT6
+  File "Qt6Concurrent.dll"
+  File "Qt6Core.dll"
+  File "Qt6Gui.dll"
+  File "Qt6Network.dll"
+  File "Qt6OpenGL.dll"
+  File "Qt6OpenGLWidgets.dll"
+  File "Qt6PrintSupport.dll"
+  File "Qt6Sql.dll"
+  File "Qt6Widgets.dll"
+!else
   File "Qt5Core.dll"
   File "Qt5Gui.dll"
   File "Qt5Widgets.dll"
@@ -143,9 +209,10 @@ Section "QT framework" SEC_QT
   File "Qt5Network.dll"
   File "Qt5Sql.dll"
   File "Qt5Concurrent.dll"
+  File /r "printsupport"
+!endif
   File /r "platforms"
   File /r "imageformats"
-  File /r "printsupport"
   File /r "styles"
   File /r "sqldrivers"
 
@@ -164,11 +231,14 @@ SectionEnd
 
 Section "OpenSSL" SEC_OPENSSL
 
+  SectionIn RO
+
   File "libcrypto-1_1-x64.dll"
   File "libssl-1_1-x64.dll"
 
 SectionEnd
 
+!ifndef QT6
 Section "ANGLE" SEC_ANGLE
 
   File "libGLESv2.dll"
@@ -176,14 +246,17 @@ Section "ANGLE" SEC_ANGLE
   File "D3DCompiler_47.dll"
 
 SectionEnd
+!endif
 
 SectionGroup "Localization" SEC_LOCALIZATION
   !insertmacro LOCALIZATION "Czech" "cs"
   !insertmacro LOCALIZATION "Danish" "da"
+  !insertmacro LOCALIZATION "Esperanto" "eo"
   !insertmacro LOCALIZATION "Finnish" "fi"
   !insertmacro LOCALIZATION "French" "fr"
   !insertmacro LOCALIZATION "German" "de"
   !insertmacro LOCALIZATION "Hungarian" "hu"
+  !insertmacro LOCALIZATION "Italian" "it"
   !insertmacro LOCALIZATION "Norwegian" "nb"
   !insertmacro LOCALIZATION "Polish" "pl"
   !insertmacro LOCALIZATION "Portuguese (Brazil)" "pt_BR"
@@ -214,7 +287,7 @@ Section "Uninstall"
   Delete "$SMPROGRAMS\$StartMenuFolder\*.*"
   RMDir "$SMPROGRAMS\$StartMenuFolder"
 
-  ; Remove File associations
+  ; Remove file associations
   !insertmacro FILE_ASSOCIATION_REMOVE "gpx"
   !insertmacro FILE_ASSOCIATION_REMOVE "tcx"
   !insertmacro FILE_ASSOCIATION_REMOVE "kml"
@@ -230,6 +303,53 @@ Section "Uninstall"
   !insertmacro FILE_ASSOCIATION_REMOVE "cup"
   !insertmacro FILE_ASSOCIATION_REMOVE "gpi"
   !insertmacro FILE_ASSOCIATION_REMOVE "sml"
+  !insertmacro FILE_ASSOCIATION_REMOVE "img"
+  !insertmacro FILE_ASSOCIATION_REMOVE "jnx"
+  !insertmacro FILE_ASSOCIATION_REMOVE "kap"
+  !insertmacro FILE_ASSOCIATION_REMOVE "map"
+  !insertmacro FILE_ASSOCIATION_REMOVE "mbtiles"
+  !insertmacro FILE_ASSOCIATION_REMOVE "rmap"
+  !insertmacro FILE_ASSOCIATION_REMOVE "tba"
+  !insertmacro FILE_ASSOCIATION_REMOVE "kmz"
+  !insertmacro FILE_ASSOCIATION_REMOVE "aqm"
+  !insertmacro FILE_ASSOCIATION_REMOVE "sqlitedb"
+
+  DeleteRegValue HKCR ".gpx\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".tcx\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".kml\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".fit\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".igc\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".nmea\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".plt\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".rte\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".wpt\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".loc\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".slf\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".geojson\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".cup\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".gpi\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".sml\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".csv\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".json\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".jpg\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".jpeg\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".img\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".jnx\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".kap\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".map\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".mbtiles\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".rmap\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".rtmap\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".tar\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".tba\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".tif\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".tiff\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".xml\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".kmz\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".aqm\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".sqlitedb\OpenWithList" "GPXSee.exe"
+  DeleteRegKey HKCR "Applications\GPXSee.exe"   
+  
   System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
 
 SectionEnd
@@ -260,4 +380,4 @@ LangString DESC_LOCALIZATION ${LANG_ENGLISH} \
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC_MSVC} $(DESC_MSVC) 
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC_APP} $(DESC_APP)
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC_LOCALIZATION} $(DESC_LOCALIZATION)
-!insertmacro MUI_FUNCTION_DESCRIPTION_END
+!insertmacro MUI_FUNCTION_DESCRIPTION_END

pkg/maps/Antarctica.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map xmlns="http://www.gpxsee.org/map/1.4" type="WMTS">
 	<name>Antarctica</name>
-	<url type="REST">https://gis.ngdc.noaa.gov/arcgis/rest/services/antarctic/antarctic_basemap/MapServer/WMTS/1.0.0/WMTSCapabilities.xml</url>
+	<url type="REST">https://tiles.arcgis.com/tiles/C8EMgrsFcRFL6LrL/arcgis/rest/services/Antarctic_Basemap/MapServer/WMTS/1.0.0/WMTSCapabilities.xml</url>
 	<copyright>NOAA National Centers for Environmental Information (NCEI); International Bathymetric Chart of the Southern Ocean (IBCSO); General Bathymetric Chart of the Oceans (GEBCO); Natural Earth</copyright>
-	<layer>antarctic_antarctic_basemap</layer>
+	<layer>Antarctic_Basemap</layer>
 	<set>default028mm</set>
 </map>

src/GUI/app.cpp

@@ -6,6 +6,7 @@
 #include <QNetworkAccessManager>
 #include <QLibraryInfo>
 #include <QSettings>
+#include <QSurfaceFormat>
 #include "common/programpaths.h"
 #include "common/config.h"
 #include "map/downloader.h"
@@ -13,9 +14,9 @@
 #include "map/gcs.h"
 #include "map/pcs.h"
 #include "data/dem.h"
-#include "opengl.h"
 #include "gui.h"
 #include "settings.h"
+#include "mapaction.h"
 #include "app.h"
 
 
@@ -29,18 +30,18 @@ App::App(int &argc, char **argv) : QApplication(argc, argv)
 	setApplicationVersion(APP_VERSION);
 
 	QTranslator *gpxsee = new QTranslator(this);
-	gpxsee->load(QLocale::system(), "gpxsee", "_",
-	  ProgramPaths::translationsDir());
-	installTranslator(gpxsee);
+	if (gpxsee->load(QLocale::system(), "gpxsee", "_",
+	  ProgramPaths::translationsDir()))
+		installTranslator(gpxsee);
 
 	QTranslator *qt = new QTranslator(this);
 #if defined(Q_OS_WIN32) || defined(Q_OS_MAC)
-	qt->load(QLocale::system(), "qt", "_", ProgramPaths::translationsDir());
+	if (qt->load(QLocale::system(), "qt", "_", ProgramPaths::translationsDir()))
 #else // Q_OS_WIN32 || Q_OS_MAC
-	qt->load(QLocale::system(), "qt", "_", QLibraryInfo::location(
-	  QLibraryInfo::TranslationsPath));
+	if (qt->load(QLocale::system(), "qt", "_", QLibraryInfo::location(
+	  QLibraryInfo::TranslationsPath)))
 #endif // Q_OS_WIN32 || Q_OS_MAC
-	installTranslator(qt);
+		installTranslator(qt);
 
 #ifdef Q_OS_MAC
 	setAttribute(Qt::AA_DontShowIconsInMenus);
@@ -51,17 +52,18 @@ App::App(int &argc, char **argv) : QApplication(argc, argv)
 	   "QThreadStorage: Thread X exited after QThreadStorage Y destroyed" */
 	Downloader::setNetworkManager(new QNetworkAccessManager(this));
 	DEM::setDir(ProgramPaths::demDir());
-	OPENGL_SET_FORMAT(4, 8);
+	QSurfaceFormat fmt;
+	fmt.setStencilBufferSize(8);
+	fmt.setSamples(4);
+	QSurfaceFormat::setDefaultFormat(fmt);
 
 	loadDatums();
 	loadPCSs();
 
 	QSettings settings(qApp->applicationName(), qApp->applicationName());
 	settings.beginGroup(OPTIONS_SETTINGS_GROUP);
-#ifdef ENABLE_HTTP2
 	Downloader::enableHTTP2(settings.value(ENABLE_HTTP2_SETTING,
 	  ENABLE_HTTP2_DEFAULT).toBool());
-#endif // ENABLE_HTTP2
 	Downloader::setTimeout(settings.value(CONNECTION_TIMEOUT_SETTING,
 	  CONNECTION_TIMEOUT_DEFAULT).toInt());
 	settings.endGroup();
@@ -76,11 +78,25 @@ App::~App()
 
 int App::run()
 {
+	MapAction *lastReady = 0;
+	QStringList args(arguments());
+
 	_gui->show();
 
-	QStringList args(arguments());
-	for (int i = 1; i < args.count(); i++)
-		_gui->openFile(args.at(i));
+	for (int i = 1; i < args.count(); i++) {
+		if (!_gui->openFile(args.at(i), true)) {
+			MapAction *a;
+			if (!_gui->loadMap(args.at(i), a, true))
+				_gui->openFile(args.at(i), false);
+			else {
+				if (a)
+					lastReady = a;
+			}
+		}
+	}
+
+	if (lastReady)
+		lastReady->trigger();
 
 	return exec();
 }
@@ -89,7 +105,18 @@ bool App::event(QEvent *event)
 {
 	if (event->type() == QEvent::FileOpen) {
 		QFileOpenEvent *e = static_cast<QFileOpenEvent *>(event);
-		return _gui->openFile(e->file());
+
+		if (!_gui->openFile(e->file(), true)) {
+			MapAction *a;
+			if (!_gui->loadMap(e->file(), a, true))
+				return _gui->openFile(e->file(), false);
+			else {
+				if (a)
+					a->trigger();
+				return true;
+			}
+		} else
+			return true;
 	}
 
 	return QApplication::event(event);

src/GUI/areaitem.cpp

@@ -5,6 +5,7 @@
 #include <QGraphicsSceneMouseEvent>
 #include "map/map.h"
 #include "popup.h"
+#include "tooltip.h"
 #include "areaitem.h"
 
 
@@ -22,7 +23,7 @@ QString AreaItem::info() const
 }
 
 AreaItem::AreaItem(const Area &area, Map *map, GraphicsItem *parent)
-  : GraphicsItem(parent), _area(area)
+  : PlaneItem(parent), _area(area)
 {
 	_map = map;
 	_digitalZoom = 0;
@@ -158,7 +159,6 @@ void AreaItem::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
 	Q_UNUSED(event);
 
 	_pen.setWidthF((_width + 1) * pow(2, -_digitalZoom));
-	setZValue(zValue() + 1.0);
 	update();
 }
 
@@ -167,12 +167,5 @@ void AreaItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
 	Q_UNUSED(event);
 
 	_pen.setWidthF(_width * pow(2, -_digitalZoom));
-	setZValue(zValue() - 1.0);
 	update();
 }
-
-void AreaItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
-{
-	Popup::show(event->screenPos(), info(), event->widget());
-	QGraphicsItem::mousePressEvent(event);
-}

src/GUI/areaitem.h

@@ -2,12 +2,9 @@
 #define AREAITEM_H
 
 #include "data/area.h"
-#include "graphicsscene.h"
-#include "tooltip.h"
+#include "planeitem.h"
 
-class Map;
-
-class AreaItem : public GraphicsItem
+class AreaItem : public PlaneItem
 {
 public:
 	AreaItem(const Area &area, Map *map, GraphicsItem *parent = 0);
@@ -19,6 +16,7 @@ public:
 
 	const Area &area() const {return _area;}
 
+	RectC bounds() const {return _area.boundingRect();}
 	void setMap(Map *map);
 
 	void setColor(const QColor &color);
@@ -27,17 +25,15 @@ public:
 	void setStyle(Qt::PenStyle style);
 	void setDigitalZoom(int zoom);
 
-	virtual QString info() const;
+	QString info() const;
 
 protected:
 	void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
 	void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
-	void mousePressEvent(QGraphicsSceneMouseEvent *event);
 
 private:
 	QPainterPath painterPath(const Polygon &polygon);
 	void updatePainterPath();
-	ToolTip toolTip() const;
 
 	Area _area;
 	Map *_map;

src/GUI/axisitem.cpp

@@ -29,8 +29,8 @@ private:
 
 Ticks::Ticks(double minValue, double maxValue, int maxCount)
 {
-	double range = niceNum(maxValue - minValue, false);
-	_d = niceNum(range / maxCount, false);
+	double range = Util::niceNum(maxValue - minValue, false);
+	_d = Util::niceNum(range / maxCount, false);
 	_min = ceil(minValue / _d) * _d;
 	_max = floor(maxValue / _d) * _d;
 }
@@ -41,6 +41,7 @@ AxisItem::AxisItem(Type type, QGraphicsItem *parent)
 {
 	_type = type;
 	_size = 0;
+	_zoom = 1.0;
 
 	_font.setPixelSize(FONT_SIZE);
 	_font.setFamily(FONT_FAMILY);
@@ -52,8 +53,10 @@ void AxisItem::setRange(const RangeF &range)
 	_range = range;
 
 	QFontMetrics fm(_font);
-	Ticks ticks(_range.min(), _range.max(), (_type == X) ? XTICKS : YTICKS);
+	Ticks ticks(_range.min(), _range.max(),
+	  (_type == X) ? XTICKS * _zoom : YTICKS * _zoom);
 	_ticks = QVector<Tick>(ticks.count());
+
 	for (int i = 0; i < ticks.count(); i++) {
 		Tick &t = _ticks[i];
 		t.value = ticks.val(i);
@@ -72,34 +75,23 @@ void AxisItem::setSize(qreal size)
 	update();
 }
 
-void AxisItem::setLabel(const QString& label)
-{
-	prepareGeometryChange();
-	QFontMetrics fm(_font);
-	_label = label;
-	_labelBB = fm.tightBoundingRect(label);
-	updateBoundingRect();
-	update();
-}
-
 void AxisItem::updateBoundingRect()
 {
 	QFontMetrics fm(_font);
 	QRect es = _ticks.isEmpty() ? QRect() : _ticks.last().boundingBox;
 	QRect ss = _ticks.isEmpty() ? QRect() : _ticks.first().boundingBox;
-	QRect ls(_labelBB);
 
 	if (_type == X) {
 		_boundingRect = QRectF(-ss.width()/2, -TICK/2, _size + es.width()/2
-		  + ss.width()/2, ls.height() + es.height() - fm.descent() + TICK
-		  + 2*PADDING + 1);
+		  + ss.width()/2, es.height() - 2*fm.descent() + TICK + 2*PADDING);
 	} else {
 		int mtw = 0;
 		for (int i = 0; i < _ticks.count(); i++)
 			mtw = qMax(_ticks.at(i).boundingBox.width(), mtw);
-		_boundingRect = QRectF(-(ls.height() + mtw + 2*PADDING + TICK/2),
-		  -(_size + es.height()/2 + fm.descent()), ls.height() + mtw + 2*PADDING
-		  + TICK, _size + es.height()/2 + fm.descent() + ss.height()/2);
+		_boundingRect = QRectF(-(mtw + 2*PADDING + TICK/2 - fm.descent()),
+		  -(_size + es.height()/2 + fm.descent()), mtw + 2*PADDING
+		  + TICK - fm.descent(), _size + es.height()/2 + fm.descent()
+		  + ss.height()/2);
 	}
 }
 
@@ -108,7 +100,6 @@ void AxisItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
 {
 	Q_UNUSED(option);
 	Q_UNUSED(widget);
-	QFontMetrics fm(_font);
 	QRect ts;
 
 	painter->setRenderHint(QPainter::Antialiasing, false);
@@ -130,9 +121,6 @@ void AxisItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
 			  - (ts.width()/2), ts.height() + TICK/2 + PADDING,
 			  _locale.toString(val));
 		}
-
-		painter->drawText(_size/2 - _labelBB.width()/2, _labelBB.height()
-		  + ts.height() - 2*fm.descent() + TICK/2 + 2*PADDING, _label);
 	} else {
 		painter->drawLine(0, 0, 0, -_size);
 
@@ -149,17 +137,10 @@ void AxisItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
 			  -((_size/_range.size()) * (val - _range.min())) + (ts.height()/2),
 			  _locale.toString(val));
 		}
-
-		painter->rotate(-90);
-		painter->drawText(_size/2 - _labelBB.width()/2, -(mtw + 2*PADDING
-		  + TICK/2), _label);
-		painter->rotate(90);
 	}
 
-/*
-	painter->setPen(Qt::red);
-	painter->drawRect(boundingRect());
-*/
+	//painter->setPen(Qt::red);
+	//painter->drawRect(boundingRect());
 }
 
 QSizeF AxisItem::margin() const
@@ -168,15 +149,15 @@ QSizeF AxisItem::margin() const
 	QRect es = _ticks.isEmpty() ? QRect() : _ticks.last().boundingBox;
 
 	if (_type == X) {
-		return QSizeF(es.width()/2, _labelBB.height() + es.height()
-		  - fm.descent() + TICK/2 + 2*PADDING);
+		return QSizeF(es.width()/2, es.height() - 2*fm.descent() + TICK/2
+		  + 2*PADDING);
 	} else {
 		int mtw = 0;
 		for (int i = 0; i < _ticks.count(); i++)
 			mtw = qMax(_ticks.at(i).boundingBox.width(), mtw);
 
-		return QSizeF(_labelBB.height() -fm.descent() + mtw + 2*PADDING
-		  + TICK/2, es.height()/2 + fm.descent());
+		return QSizeF(mtw + 2*PADDING + TICK/2 - fm.descent(),
+		  es.height()/2 + fm.descent());
 	}
 }
 

src/GUI/axisitem.h

@@ -13,13 +13,15 @@ public:
 
 	AxisItem(Type type, QGraphicsItem *parent = 0);
 
+	/* Note: The items position is at the 0 point of the axis line, not at the
+	   top-left point of the bounding rect as usual */
 	QRectF boundingRect() const {return _boundingRect;}
 	void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
 	  QWidget *widget);
 
 	void setRange(const RangeF &range);
 	void setSize(qreal size);
-	void setLabel(const QString& label);
+	void setZoom(qreal zoom) {_zoom = zoom;}
 
 	QSizeF margin() const;
 	QList<qreal> ticks() const;
@@ -35,12 +37,11 @@ private:
 	Type _type;
 	RangeF _range;
 	qreal _size;
-	QString _label;
-	QRect _labelBB;
 	QVector<Tick> _ticks;
 	QRectF _boundingRect;
 	QFont _font;
 	QLocale _locale;
+	qreal _zoom;
 };
 
 #endif // AXISITEM_H

src/GUI/axislabelitem.cpp

@@ -0,0 +1,54 @@
+#include <QPainter>
+#include <QFontMetrics>
+#include "font.h"
+#include "axislabelitem.h"
+
+
+AxisLabelItem::AxisLabelItem(Type type, QGraphicsItem *parent)
+  : QGraphicsItem(parent), _type(type)
+{
+	_font.setPixelSize(FONT_SIZE);
+	_font.setFamily(FONT_FAMILY);
+}
+
+void AxisLabelItem::setLabel(const QString& label, const QString &units)
+{
+	prepareGeometryChange();
+	QFontMetrics fm(_font);
+	_label = QString("%1 [%2]").arg(label, units.isEmpty() ? "-" : units);
+	_labelBB = fm.tightBoundingRect(_label);
+	updateBoundingRect();
+	update();
+}
+
+void AxisLabelItem::updateBoundingRect()
+{
+	QFontMetrics fm(_font);
+
+	if (_type == X)
+		_boundingRect = QRectF(0, 0, _labelBB.width(), fm.height());
+	else
+		_boundingRect = QRectF(0, 0, fm.height(), _labelBB.width());
+}
+
+void AxisLabelItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
+  QWidget *widget)
+{
+	Q_UNUSED(option);
+	Q_UNUSED(widget);
+	QFontMetrics fm(_font);
+
+	painter->setFont(_font);
+
+	if (_type == X) {
+		painter->drawText(0, fm.height() - fm.descent(), _label);
+	} else {
+		painter->rotate(-90);
+		painter->drawText(-_labelBB.width(), fm.height() - fm.descent(), _label);
+		painter->rotate(90);
+	}
+
+	//painter->setRenderHint(QPainter::Antialiasing, false);
+	//painter->setPen(Qt::red);
+	//painter->drawRect(boundingRect());
+}

src/GUI/axislabelitem.h

@@ -0,0 +1,30 @@
+#ifndef AXISLABELITEM_H
+#define AXISLABELITEM_H
+
+#include <QGraphicsItem>
+#include <QFont>
+
+class AxisLabelItem : public QGraphicsItem
+{
+public:
+	enum Type {X, Y};
+
+	AxisLabelItem(Type type, QGraphicsItem *parent = 0);
+
+	QRectF boundingRect() const {return _boundingRect;}
+	void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
+	  QWidget *widget);
+
+	void setLabel(const QString& label, const QString &units);
+
+private:
+	void updateBoundingRect();
+
+	Type _type;
+	QString _label;
+	QFont _font;
+	QRect _labelBB;
+	QRectF _boundingRect;
+};
+
+#endif // AXISLABELITEM_H

src/GUI/cadencegraphitem.cpp

@@ -5,7 +5,7 @@
 
 CadenceGraphItem::CadenceGraphItem(const Graph &graph, GraphType type,
   int width, const QColor &color, QGraphicsItem *parent)
-  : GraphItem(graph, type, width, color, parent)
+  : GraphItem(graph, type, width, color, Qt::SolidLine, parent)
 {
 }
 

src/GUI/colorbox.cpp

@@ -55,7 +55,8 @@ void ColorBox::mousePressEvent(QMouseEvent *event)
 	if (event->button() != Qt::LeftButton)
 		return;
 	QColorDialog::ColorDialogOptions options = _alpha
-	  ? QColorDialog::ShowAlphaChannel : (QColorDialog::ColorDialogOptions)0;
+	  ? QColorDialog::ColorDialogOptions(QColorDialog::ShowAlphaChannel)
+	  : QColorDialog::ColorDialogOptions();
 	QColor color = QColorDialog::getColor(_color, this, QString(), options);
 	if (color.isValid()) {
 		_color = color;

src/GUI/coordinatesitem.h

@@ -15,6 +15,8 @@ public:
 	void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
 	  QWidget *widget);
 
+	CoordinatesFormat format() const {return _format;}
+
 	void setCoordinates(const Coordinates &c);
 	void setFormat(const CoordinatesFormat &format);
 	void setDigitalZoom(qreal zoom);

src/GUI/cpuarch.h

@@ -1,42 +0,0 @@
-#ifndef CPUARCH_H
-#define CPUARCH_H
-
-#include <QtGlobal>
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0)
-
-#if defined(__arm64__)
-	#define CPU_ARCH_STR "arm64"
-#elif defined(__arm__) || defined(__TARGET_ARCH_ARM) || defined(_M_ARM)
-	#define CPU_ARCH_STR "arm"
-#elif defined(__x86_64) || defined(__x86_64__) || defined(__amd64) \
- || defined(_M_X64)
-	#define CPU_ARCH_STR "x86_64"
-#elif defined(__i386) || defined(__i386__) || defined(_M_IX86)
-	#define CPU_ARCH_STR "i386"
-#elif defined(__ia64) || defined(__ia64__) || defined(_M_IA64)
-	#define CPU_ARCH_STR "ia64"
-#elif defined(_MIPS_ARCH_MIPS64) || defined(__mips64)
-	#define CPU_ARCH_STR "mips64"
-#elif defined(__mips) || defined(__mips__) || defined(_M_MRX000)
-	#define CPU_ARCH_STR "mips"
-#elif defined(__ppc64__) || defined(__powerpc64__) || defined(__64BIT__)
-	#define CPU_ARCH_STR "power64"
-#elif defined(__ppc__) || defined(__ppc) || defined(__powerpc__) \
-  || defined(_ARCH_COM) || defined(_ARCH_PWR) || defined(_ARCH_PPC)  \
-  || defined(_M_MPPC) || defined(_M_PPC)
-	#define CPU_ARCH_STR "power"
-#else
-	#define CPU_ARCH_STR "unknown"
-#endif
-
-#define CPU_ARCH QString(CPU_ARCH_STR)
-
-#else // QT_VERSION < 5.4
-
-#include <QSysInfo>
-#define CPU_ARCH QSysInfo::buildCpuArchitecture()
-
-#endif // QT_VERSION < 5.4
-
-#endif // CPUARCH_H

src/GUI/elevationgraph.cpp

@@ -65,35 +65,38 @@ void ElevationGraph::setInfo()
 	}
 }
 
-GraphItem *ElevationGraph::loadGraph(const Graph &graph, Type type)
+GraphItem *ElevationGraph::loadGraph(const Graph &graph, PathType type,
+  const QColor &color, bool primary)
 {
-	if (!graph.isValid()) {
-		_palette.nextColor();
+	if (!graph.isValid())
 		return 0;
-	}
 
 	ElevationGraphItem *gi = new ElevationGraphItem(graph, _graphType, _width,
-	  _palette.nextColor());
+	  color, primary ? Qt::SolidLine : Qt::DashLine);
 	gi->setUnits(_units);
 
-	if (type == Track) {
+	if (type == TrackPath) {
 		_tracks.append(gi);
 		if (_showTracks)
 			addGraph(gi);
 
-		_trackAscent += gi->ascent();
-		_trackDescent += gi->descent();
-		_trackMax = nMax(_trackMax, gi->max());
-		_trackMin = nMin(_trackMin, gi->min());
+		if (primary) {
+			_trackAscent += gi->ascent();
+			_trackDescent += gi->descent();
+			_trackMax = nMax(_trackMax, gi->max());
+			_trackMin = nMin(_trackMin, gi->min());
+		}
 	} else {
 		_routes.append(gi);
 		if (_showRoutes)
 			addGraph(gi);
 
-		_routeAscent += gi->ascent();
-		_routeDescent += gi->descent();
-		_routeMax = nMax(_routeMax, gi->max());
-		_routeMin = nMin(_routeMin, gi->min());
+		if (primary) {
+			_routeAscent += gi->ascent();
+			_routeDescent += gi->descent();
+			_routeMax = nMax(_routeMax, gi->max());
+			_routeMin = nMin(_routeMin, gi->min());
+		}
 	}
 
 	return gi;
@@ -102,11 +105,32 @@ GraphItem *ElevationGraph::loadGraph(const Graph &graph, Type type)
 QList<GraphItem*> ElevationGraph::loadData(const Data &data)
 {
 	QList<GraphItem*> graphs;
+	GraphItem *primary, *secondary;
 
-	for (int i = 0; i < data.tracks().count(); i++)
-		graphs.append(loadGraph(data.tracks().at(i).elevation(), Track));
-	for (int i = 0; i < data.routes().count(); i++)
-		graphs.append(loadGraph(data.routes().at(i).elevation(), Route));
+	for (int i = 0; i < data.tracks().count(); i++) {
+		QColor color(_palette.nextColor());
+		const GraphPair &gp = data.tracks().at(i).elevation();
+
+		primary = loadGraph(gp.primary(), TrackPath, color, true);
+		secondary = primary
+		  ? loadGraph(gp.secondary(), TrackPath, color, false) : 0;
+		if (primary && secondary)
+			primary->setSecondaryGraph(secondary);
+
+		graphs.append(primary);
+	}
+	for (int i = 0; i < data.routes().count(); i++) {
+		QColor color(_palette.nextColor());
+		const GraphPair &gp = data.routes().at(i).elevation();
+
+		primary = loadGraph(gp.primary(), RoutePath, color, true);
+		secondary = primary
+		  ? loadGraph(gp.secondary(), RoutePath, color, false) : 0;
+		if (primary && secondary)
+			primary->setSecondaryGraph(secondary);
+
+		graphs.append(primary);
+	}
 	for (int i = 0; i < data.areas().count(); i++)
 		_palette.nextColor();
 

src/GUI/elevationgraph.h

@@ -21,7 +21,7 @@ public:
 	void showRoutes(bool show);
 
 private:
-	enum Type {Track, Route};
+	enum PathType {TrackPath, RoutePath};
 
 	qreal max() const;
 	qreal min() const;
@@ -31,7 +31,8 @@ private:
 	void setYUnits(Units units);
 	void setInfo();
 
-	GraphItem *loadGraph(const Graph &graph, Type type);
+	GraphItem *loadGraph(const Graph &graph, PathType type, const QColor &color,
+	  bool primary);
 	void showItems(const QList<ElevationGraphItem *> &list, bool show);
 
 	qreal _trackAscent, _trackDescent;

src/GUI/elevationgraphitem.cpp

@@ -4,8 +4,8 @@
 
 
 ElevationGraphItem::ElevationGraphItem(const Graph &graph, GraphType type,
-  int width, const QColor &color, QGraphicsItem *parent)
-  : GraphItem(graph, type, width, color, parent)
+  int width, const QColor &color, Qt::PenStyle style, QGraphicsItem *parent)
+  : GraphItem(graph, type, width, color, style, parent)
 {
 	_min = GraphItem::min();
 	_max = GraphItem::max();
@@ -42,5 +42,6 @@ QString ElevationGraphItem::info() const
 	tt.insert(tr("Minimum"), l.toString(min() * scale, 'f', 0)
 	  + UNIT_SPACE + su);
 
+
 	return tt.toString();
 }

src/GUI/elevationgraphitem.h

@@ -8,8 +8,10 @@ class ElevationGraphItem : public GraphItem
 	Q_OBJECT
 
 public:
+	enum DataType {GPS, DEM};
+
 	ElevationGraphItem(const Graph &graph, GraphType type, int width,
-	  const QColor &color, QGraphicsItem *parent = 0);
+	  const QColor &color, Qt::PenStyle style, QGraphicsItem *parent = 0);
 
 	qreal ascent() const {return _ascent;}
 	qreal descent() const {return _descent;}

src/GUI/exportdialog.cpp

@@ -1,194 +0,0 @@
-#include <QVBoxLayout>
-#include <QHBoxLayout>
-#include <QFormLayout>
-#include <QGridLayout>
-#include <QDialogButtonBox>
-#include <QGroupBox>
-#include <QComboBox>
-#include <QRadioButton>
-#include <QPushButton>
-#include <QFileInfo>
-#include <QMessageBox>
-#include <QTabWidget>
-#include <QDoubleSpinBox>
-#include "fileselectwidget.h"
-#include "units.h"
-#include "exportdialog.h"
-
-
-ExportDialog::ExportDialog(Export *exp, QWidget *parent)
-  : QDialog(parent), _export(exp)
-{
-	int index;
-
-	_fileSelect = new FileSelectWidget();
-	_fileSelect->setFilter(tr("PDF files") + " (*.pdf);;" + tr("All files")
-	  + " (*)");
-	_fileSelect->setFile(_export->fileName);
-
-	_paperSize = new QComboBox();
-	_paperSize->addItem("A2", QPrinter::A2);
-	_paperSize->addItem("A3", QPrinter::A3);
-	_paperSize->addItem("A4", QPrinter::A4);
-	_paperSize->addItem("A5", QPrinter::A5);
-	_paperSize->addItem("A6", QPrinter::A6);
-	_paperSize->addItem("B3", QPrinter::B3);
-	_paperSize->addItem("B4", QPrinter::B4);
-	_paperSize->addItem("B5", QPrinter::B5);
-	_paperSize->addItem("B6", QPrinter::B6);
-	_paperSize->addItem("Tabloid", QPrinter::Tabloid);
-	_paperSize->addItem("Legal", QPrinter::Legal);
-	_paperSize->addItem("Letter", QPrinter::Letter);
-	if ((index = _paperSize->findData(_export->paperSize)) >= 0)
-		_paperSize->setCurrentIndex(index);
-
-	_resolution = new QComboBox();
-	_resolution->addItem("150 DPI", 150);
-	_resolution->addItem("300 DPI", 300);
-	_resolution->addItem("600 DPI", 600);
-	if ((index = _resolution->findData(_export->resolution)) >= 0)
-		_resolution->setCurrentIndex(index);
-
-	_portrait = new QRadioButton(tr("Portrait"));
-	_landscape = new QRadioButton(tr("Landscape"));
-	QHBoxLayout *orientationLayout = new QHBoxLayout();
-	orientationLayout->addWidget(_portrait);
-	orientationLayout->addWidget(_landscape);
-	if (_export->orientation == QPrinter::Portrait)
-		_portrait->setChecked(true);
-	else
-		_landscape->setChecked(true);
-
-	_topMargin = new QDoubleSpinBox();
-	_bottomMargin = new QDoubleSpinBox();
-	_leftMargin = new QDoubleSpinBox();
-	_rightMargin = new QDoubleSpinBox();
-	QString us = (_export->units == Metric) ? tr("mm") : tr("in");
-	_topMargin->setSuffix(UNIT_SPACE + us);
-	_bottomMargin->setSuffix(UNIT_SPACE + us);
-	_leftMargin->setSuffix(UNIT_SPACE + us);
-	_rightMargin->setSuffix(UNIT_SPACE + us);
-	if (_export->units == Metric) {
-		_topMargin->setValue(_export->margins.top());
-		_bottomMargin->setValue(_export->margins.bottom());
-		_leftMargin->setValue(_export->margins.left());
-		_rightMargin->setValue(_export->margins.right());
-	} else {
-		_topMargin->setValue(_export->margins.top() * MM2IN);
-		_bottomMargin->setValue(_export->margins.bottom() * MM2IN);
-		_leftMargin->setValue(_export->margins.left() * MM2IN);
-		_rightMargin->setValue(_export->margins.right() * MM2IN);
-		_topMargin->setSingleStep(0.1);
-		_bottomMargin->setSingleStep(0.1);
-		_leftMargin->setSingleStep(0.1);
-		_rightMargin->setSingleStep(0.1);
-	}
-
-	QGridLayout *marginsLayout = new QGridLayout();
-	marginsLayout->addWidget(_topMargin, 0, 0, 1, 2, Qt::AlignCenter);
-	marginsLayout->addWidget(_leftMargin, 1, 0, 1, 1, Qt::AlignRight);
-	marginsLayout->addWidget(_rightMargin, 1, 1, 1, 1, Qt::AlignLeft);
-	marginsLayout->addWidget(_bottomMargin, 2, 0, 1, 2, Qt::AlignCenter);
-
-#ifndef Q_OS_MAC
-	QGroupBox *pageSetupBox = new QGroupBox(tr("Page Setup"));
-#endif // Q_OS_MAC
-	QFormLayout *pageSetupLayout = new QFormLayout;
-	pageSetupLayout->addRow(tr("Page size:"), _paperSize);
-	pageSetupLayout->addRow(tr("Resolution:"), _resolution);
-	pageSetupLayout->addRow(tr("Orientation:"), orientationLayout);
-	pageSetupLayout->addRow(tr("Margins:"), marginsLayout);
-#ifdef Q_OS_MAC
-	QFrame *line = new QFrame();
-	line->setFrameShape(QFrame::HLine);
-	line->setFrameShadow(QFrame::Sunken);
-	pageSetupLayout->addRow(line);
-	pageSetupLayout->addRow(tr("File:"), _fileSelect);
-	pageSetupLayout->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow);
-#else // Q_OS_MAC
-	pageSetupBox->setLayout(pageSetupLayout);
-#endif // Q_OS_MAC
-
-#ifndef Q_OS_MAC
-	QGroupBox *outputFileBox = new QGroupBox(tr("Output file"));
-	QHBoxLayout *outputFileLayout = new QHBoxLayout();
-	outputFileLayout->addWidget(_fileSelect);
-	outputFileBox->setLayout(outputFileLayout);
-#endif // Q_OS_MAC
-
-	QDialogButtonBox *buttonBox = new QDialogButtonBox();
-	buttonBox->addButton(tr("Export"), QDialogButtonBox::AcceptRole);
-	buttonBox->addButton(QDialogButtonBox::Cancel);
-	connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
-	connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
-
-	QVBoxLayout *layout = new QVBoxLayout;
-#ifdef Q_OS_MAC
-	layout->addLayout(pageSetupLayout);
-#else // Q_OS_MAC
-	layout->addWidget(pageSetupBox);
-	layout->addWidget(outputFileBox);
-#endif // Q_OS_MAC
-	layout->addWidget(buttonBox);
-	setLayout(layout);
-
-	setWindowTitle(tr("Export to PDF"));
-	setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
-}
-
-bool ExportDialog::checkFile()
-{
-	if (_fileSelect->file().isEmpty()) {
-		QMessageBox::warning(this, tr("Error"), tr("No output file selected."));
-		return false;
-	}
-
-	QFile file(_fileSelect->file());
-	QFileInfo fi(file);
-	bool exists = fi.exists();
-	bool opened = false;
-
-	if (exists && fi.isDir()) {
-		QMessageBox::warning(this, tr("Error"), tr("%1 is a directory.")
-		  .arg(file.fileName()));
-		return false;
-	} else if ((exists && !fi.isWritable())
-	  || !(opened = file.open(QFile::Append))) {
-		QMessageBox::warning(this, tr("Error"), tr("%1 is not writable.")
-		  .arg(file.fileName()));
-		return false;
-	}
-	if (opened) {
-		file.close();
-		if (!exists)
-			file.remove();
-	}
-
-	return true;
-}
-
-void ExportDialog::accept()
-{
-	if (!checkFile())
-		return;
-
-	QPrinter::Orientation orientation = _portrait->isChecked()
-	  ? QPrinter::Portrait : QPrinter::Landscape;
-	QPrinter::PaperSize paperSize = static_cast<QPrinter::PaperSize>
-	  (_paperSize->itemData(_paperSize->currentIndex()).toInt());
-	int resolution = _resolution->itemData(_resolution->currentIndex()).toInt();
-
-	_export->fileName = _fileSelect->file();
-	_export->paperSize = paperSize;
-	_export->resolution = resolution;
-	_export->orientation = orientation;
-	if (_export->units == Imperial)
-		_export->margins = MarginsF(_leftMargin->value() / MM2IN,
-		_topMargin->value() / MM2IN, _rightMargin->value() / MM2IN,
-		_bottomMargin->value() / MM2IN);
-	else
-		_export->margins = MarginsF(_leftMargin->value(), _topMargin->value(),
-		  _rightMargin->value(), _bottomMargin->value());
-
-	QDialog::accept();
-}

src/GUI/exportdialog.h

@@ -1,50 +0,0 @@
-#ifndef EXPORTDIALOG_H
-#define EXPORTDIALOG_H
-
-#include <QDialog>
-#include <QPrinter>
-#include "margins.h"
-#include "units.h"
-
-class QComboBox;
-class QRadioButton;
-class FileSelectWidget;
-class QDoubleSpinBox;
-
-struct Export {
-	QString fileName;
-	QPrinter::PaperSize paperSize;
-	QPrinter::Orientation orientation;
-	MarginsF margins;
-	int resolution;
-
-	Units units;
-};
-
-class ExportDialog : public QDialog
-{
-	Q_OBJECT
-
-public:
-	ExportDialog(Export *exp, QWidget *parent = 0);
-
-public slots:
-	void accept();
-
-private:
-	bool checkFile();
-
-	Export *_export;
-
-	FileSelectWidget *_fileSelect;
-	QComboBox *_paperSize;
-	QComboBox *_resolution;
-	QRadioButton *_portrait;
-	QRadioButton *_landscape;
-	QDoubleSpinBox *_topMargin;
-	QDoubleSpinBox *_bottomMargin;
-	QDoubleSpinBox *_leftMargin;
-	QDoubleSpinBox *_rightMargin;
-};
-
-#endif // EXPORTDIALOG_H