Fixed TimeZoneInfo QVariant loading/saving in QT6

Currently translated at 100.0% (388 of 388 strings)

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

.appveyor.yml

@@ -1,23 +1,23 @@
-version: 7.20.{build}
+version: 8.0.{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"
+    VCVARS: vcvars64.bat
     OPENSSLDIR: C:\OpenSSL-v111-Win64\bin
     LIBCRYPTO: libssl-1_1-x64.dll
     LIBSSL: libcrypto-1_1-x64.dll    
@@ -26,7 +26,7 @@ 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: >-

.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

@@ -2,14 +2,14 @@
 GPXSee is a Qt-based GPS log file viewer and analyzer that supports all common GPS log file formats.
 
 ## Features
-* Opens GPX, TCX, FIT, KML, NMEA, IGC, CUP, SLF, LOC, GeoJSON, OziExplorer (PLT, RTE, WPT), Garmin GPI&CSV and geotagged JPEG files.
+* 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 & 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).
 * 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.12 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,32 @@ unix:!macx {
 } else {
     TARGET = GPXSee
 }
-VERSION = 7.20
+VERSION = 8.0
 
 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/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 +55,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 +71,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 +82,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 \
@@ -91,10 +90,20 @@ HEADERS += src/common/config.h \
     src/map/IMG/bitmapline.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/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 \
@@ -193,12 +202,21 @@ 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
+
 SOURCES += src/main.cpp \
+    src/GUI/axislabelitem.cpp \
+    src/GUI/mapitem.cpp \
+    src/GUI/marginswidget.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 \
@@ -219,7 +237,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 \
@@ -246,18 +263,28 @@ 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/tar.cpp \
     src/map/atlas.cpp \
     src/map/ozf.cpp \
@@ -334,16 +361,13 @@ 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
 
 DEFINES += APP_VERSION=\\\"$$VERSION\\\" \
     QT_NO_DEPRECATED_WARNINGS
-DEFINES *= QT_USE_QSTRINGBUILDER
 
 RESOURCES += gpxsee.qrc
 TRANSLATIONS = lang/gpxsee_en.ts \
@@ -359,10 +383,13 @@ TRANSLATIONS = lang/gpxsee_en.ts \
     lang/gpxsee_tr.ts \
     lang/gpxsee_es.ts \
     lang/gpxsee_pt_BR.ts \
-    lang/gpxsee_uk.ts
+    lang/gpxsee_uk.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 \
@@ -378,7 +405,9 @@ macx {
         lang/gpxsee_tr.qm \
         lang/gpxsee_es.qm \
         lang/gpxsee_pt_BR.qm \
-        lang/gpxsee_uk.qm
+        lang/gpxsee_uk.qm \
+        lang/gpxsee_hu.qm \
+        lang/gpxsee_it.qm
     csv.path = Contents/Resources
     csv.files = pkg/csv
     maps.path = Contents/Resources
@@ -398,12 +427,18 @@ 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
     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 \
@@ -418,7 +453,14 @@ 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
     DEFINES += _USE_MATH_DEFINES \
         NOGDI
 }
@@ -433,8 +475,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,10 @@ slf:#881199
 cup:#20a810
 gpi:#fca314
 sml:#6434eb
+img:#cf0a0a
+jnx:#aeff00
+kap:#080045
+map:#f6ff00
+mbts:#ff0062
+rmap:#145cba
+tba:#367050

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="1392"/>
+        <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,193 @@
 			<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>
 	</array>
 
 	<key>UTImportedTypeDeclarations</key>
@@ -302,7 +505,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 +529,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 +568,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 +589,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 +799,269 @@
 					<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>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).</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,25 @@
 		<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>
 	</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

@@ -4,6 +4,7 @@ Comment=GPS log file viewer and analyzer
 Comment[cz]=Prohlížeč a analyzátor GPS logů
 Comment[fi]=Ohjelma GPS-lokien katseluun ja analysointiin
 Comment[fr]=Visualisation et analyse de fichier GPS
+Comment[nb]=GPS-loggfilleser og analysator
 Comment[pl]=Przeglądarka i analizator plików dziennika GPS
 Comment[ru]=Программа для просмотра и анализа GPS логов
 Comment[sv]=GPS-loggfilsläsare och analysator
@@ -14,4 +15,4 @@ 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;
+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;

pkg/gpxsee.nsi

@@ -7,7 +7,7 @@
 ; The name of the installer
 Name "GPXSee"
 ; Program version
-!define VERSION "7.20"
+!define VERSION "8.0"
 
 ; The file to write
 OutFile "GPXSee-${VERSION}.exe"
@@ -17,6 +17,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"
 
@@ -106,14 +109,6 @@ Section "GPXSee" SEC_APP
 
   ; 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 +116,57 @@ 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 "tcx" "Training Center XML" 16
+  !insertmacro FILE_ASSOCIATION_ADD "kml" "Keyhole Markup Language" 17
+  !insertmacro FILE_ASSOCIATION_ADD "kmz" "KML geographic compressed data" 17
+  !insertmacro FILE_ASSOCIATION_ADD "fit" "Flexible and Interoperable Data Transfer" 18
+  !insertmacro FILE_ASSOCIATION_ADD "igc" "Flight Recorder Data Format" 19
+  !insertmacro FILE_ASSOCIATION_ADD "nmea" "NMEA 0183 Data" 20
+  !insertmacro FILE_ASSOCIATION_ADD "plt" "OziExplorer Track Point File" 21
+  !insertmacro FILE_ASSOCIATION_ADD "rte" "OziExplorer Route File" 22
+
+  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" ""
+  
   System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
 
 SectionEnd
@@ -173,9 +219,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"
@@ -205,7 +254,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"
@@ -221,6 +270,49 @@ 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"
+
+  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"
+  DeleteRegKey HKCR "Applications\GPXSee.exe"
+  
   System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
 
 SectionEnd
@@ -251,4 +343,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/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,110 @@
 		<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-info>

pkg/gpxsee64.nsi

@@ -7,7 +7,7 @@
 ; The name of the installer
 Name "GPXSee"
 ; Program version
-!define VERSION "7.20"
+!define VERSION "8.0"
 
 ; The file to write
 OutFile "GPXSee-${VERSION}_x64.exe"
@@ -17,6 +17,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"
 
@@ -113,14 +116,6 @@ Section "GPXSee" SEC_APP
 
   ; 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 +123,57 @@ 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 "tcx" "Training Center XML" 16
+  !insertmacro FILE_ASSOCIATION_ADD "kml" "Keyhole Markup Language" 17
+  !insertmacro FILE_ASSOCIATION_ADD "kmz" "KML geographic compressed data" 17
+  !insertmacro FILE_ASSOCIATION_ADD "fit" "Flexible and Interoperable Data Transfer" 18
+  !insertmacro FILE_ASSOCIATION_ADD "igc" "Flight Recorder Data Format" 19
+  !insertmacro FILE_ASSOCIATION_ADD "nmea" "NMEA 0183 Data" 20
+  !insertmacro FILE_ASSOCIATION_ADD "plt" "OziExplorer Track Point File" 21
+  !insertmacro FILE_ASSOCIATION_ADD "rte" "OziExplorer Route File" 22
+
+  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" ""
+
   System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
 
 SectionEnd
@@ -180,9 +226,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"
@@ -213,7 +262,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"
@@ -229,6 +278,49 @@ 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"
+
+  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"
+  DeleteRegKey HKCR "Applications\GPXSee.exe"   
+  
   System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
 
 SectionEnd
@@ -259,4 +351,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/4UMaps.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map xmlns="http://www.gpxsee.org/map/1.3">
+<map xmlns="http://www.gpxsee.org/map/1.4">
 	<name>4UMaps</name>
 	<url>https://tileserver.4umaps.com/$z/$x/$y.png</url>
 	<zoom min="2" max="15"/>

pkg/maps/Antarctica.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map xmlns="http://www.gpxsee.org/map/1.3" type="WMTS">
+<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>

pkg/maps/OpenStreetMap.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map xmlns="http://www.gpxsee.org/map/1.3">
+<map xmlns="http://www.gpxsee.org/map/1.4">
 	<name>Open Street Map</name>
 	<url>https://tile.openstreetmap.org/$z/$x/$y.png</url>
 	<copyright>Map data: © OpenStreetMap contributors (ODbL) | Rendering: © OpenStreetMap (CC-BY-SA)</copyright>

pkg/maps/OpenTopoMap.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map xmlns="http://www.gpxsee.org/map/1.3">
+<map xmlns="http://www.gpxsee.org/map/1.4">
 	<name>Open Topo Map</name>
 	<url>https://a.tile.opentopomap.org/$z/$x/$y.png</url>
 	<zoom max="17"/>

pkg/maps/USGS-imagery.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map xmlns="http://www.gpxsee.org/map/1.3">
+<map xmlns="http://www.gpxsee.org/map/1.4">
 	<name>USGS Imagery</name>
 	<url>https://basemap.nationalmap.gov/ArcGIS/rest/services/USGSImageryOnly/MapServer/tile/$z/$y/$x</url>
 	<zoom min="2" max="15"/>

pkg/maps/USGS-topo.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map xmlns="http://www.gpxsee.org/map/1.3">
+<map xmlns="http://www.gpxsee.org/map/1.4">
 	<name>USGS Topo</name>
 	<url>https://basemap.nationalmap.gov/arcgis/rest/services/USGSTopo/MapServer/tile/$z/$y/$x</url>
 	<zoom min="2" max="15"/>

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

@@ -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

src/GUI/fileselectwidget.cpp

@@ -12,7 +12,8 @@ FileSelectWidget::FileSelectWidget(QWidget *parent) : QWidget(parent)
 {
 	QFontMetrics fm(QApplication::font());
 	_edit = new QLineEdit();
-	_edit->setMinimumWidth(fm.boundingRect(QDir::homePath()).width());
+	_edit->setMinimumWidth(fm.averageCharWidth() * (QDir::homePath().length()
+	  + 12));
 #ifdef Q_OS_WIN32
 	_button = new QPushButton("...");
 	_button->setMaximumWidth(_button->sizeHint().width() / 2);
@@ -23,7 +24,7 @@ FileSelectWidget::FileSelectWidget(QWidget *parent) : QWidget(parent)
 	connect(_button, SIGNAL(clicked()), this, SLOT(browse()));
 
 	QHBoxLayout *layout = new QHBoxLayout();
-	layout->setMargin(0);
+	layout->setContentsMargins(QMargins());
 	layout->addWidget(_edit);
 	layout->addWidget(_button);
 	setLayout(layout);
@@ -41,3 +42,33 @@ void FileSelectWidget::browse()
 	if (!fileName.isEmpty())
 		_edit->setText(fileName);
 }
+
+bool FileSelectWidget::checkFile(QString &error) const
+{
+	if (_edit->text().isEmpty()) {
+		error = tr("No output file selected.");
+		return false;
+	}
+
+	QFile file(_edit->text());
+	QFileInfo fi(file);
+	bool exists = fi.exists();
+	bool opened = false;
+
+	if (exists && fi.isDir()) {
+		error = tr("%1 is a directory.").arg(file.fileName());
+		return false;
+	} else if ((exists && !fi.isWritable())
+	  || !(opened = file.open(QFile::Append))) {
+		error = tr("%1 is not writable.").arg(file.fileName());
+		return false;
+	}
+
+	if (opened) {
+		file.close();
+		if (!exists)
+			file.remove();
+	}
+
+	return true;
+}

src/GUI/fileselectwidget.h

@@ -14,9 +14,10 @@ class FileSelectWidget : public QWidget
 public:
 	FileSelectWidget(QWidget *parent = 0);
 
-	QString file() {return _edit->text();}
+	QString file() const {return _edit->text();}
 	void setFile(const QString &file) {_edit->setText(file);}
 	void setFilter(const QString &filter) {_filter = filter;}
+	bool checkFile(QString &error) const;
 
 private slots:
 	void browse();

src/GUI/gearratiographitem.cpp

@@ -6,7 +6,7 @@
 
 GearRatioGraphItem::GearRatioGraphItem(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)
 {
 	for (int i = 0; i < graph.size(); i++) {
 		const GraphSegment &segment = graph.at(i);

src/GUI/graphitem.cpp

@@ -5,13 +5,13 @@
 
 
 GraphItem::GraphItem(const Graph &graph, GraphType type, int width,
-  const QColor &color, QGraphicsItem *parent)
-  : GraphicsItem(parent), _graph(graph), _type(type)
+  const QColor &color, Qt::PenStyle style, QGraphicsItem *parent)
+  : GraphicsItem(parent), _graph(graph), _type(type), _secondaryGraph(0)
 {
 	Q_ASSERT(_graph.isValid());
 
 	_units = Metric;
-	_pen = QPen(color, width);
+	_pen = QPen(color, width, style, Qt::FlatCap);
 	_sx = 0; _sy = 0;
 	_time = _graph.hasTime();
 	setZValue(2.0);

src/GUI/graphitem.h

@@ -12,8 +12,8 @@ class GraphItem : public QObject, public GraphicsItem
 	Q_OBJECT
 
 public:
-	GraphItem(const Graph &graph, GraphType type, int width, const QColor &color,
-	  QGraphicsItem *parent = 0);
+	GraphItem(const Graph &graph, GraphType type, int width,
+	  const QColor &color, Qt::PenStyle style, QGraphicsItem *parent = 0);
 	virtual ~GraphItem() {}
 
 	virtual QString info() const = 0;
@@ -35,6 +35,9 @@ public:
 	void setWidth(int width);
 	void setUnits(Units units) {_units = units;}
 
+	GraphItem *secondaryGraph() const {return _secondaryGraph;}
+	void setSecondaryGraph(GraphItem *graph) {_secondaryGraph = graph;}
+
 	qreal yAtX(qreal x);
 	qreal distanceAtTime(qreal time);
 
@@ -69,6 +72,8 @@ private:
 	qreal _sx, _sy;
 	QPen _pen;
 	bool _time;
+
+	GraphItem *_secondaryGraph;
 };
 
 #endif // GRAPHITEM_H

src/GUI/graphtab.h

@@ -14,8 +14,7 @@ class GraphTab : public GraphView
 	Q_OBJECT
 
 public:
-	GraphTab(QWidget *parent = 0) : GraphView(parent)
-	  {setFrameShape(QFrame::NoFrame);}
+	GraphTab(QWidget *parent = 0) : GraphView(parent) {}
 	virtual ~GraphTab() {}
 
 	virtual QString label() const = 0;

src/GUI/graphview.cpp

@@ -1,3 +1,4 @@
+#include <QSet>
 #include <QGraphicsScene>
 #include <QEvent>
 #include <QMouseEvent>
@@ -5,9 +6,10 @@
 #include <QGraphicsSimpleTextItem>
 #include <QPalette>
 #include <QLocale>
+#include <QOpenGLWidget>
 #include "data/graph.h"
-#include "opengl.h"
 #include "axisitem.h"
+#include "axislabelitem.h"
 #include "slideritem.h"
 #include "sliderinfoitem.h"
 #include "infoitem.h"
@@ -21,6 +23,9 @@
 
 #define MARGIN 10.0
 
+#define IW(item) ((item)->boundingRect().width())
+#define IH(item) ((item)->boundingRect().height())
+
 GraphView::GraphView(QWidget *parent)
 	: QGraphicsView(parent)
 {
@@ -37,6 +42,10 @@ GraphView::GraphView(QWidget *parent)
 	_xAxis->setZValue(1.0);
 	_yAxis = new AxisItem(AxisItem::Y);
 	_yAxis->setZValue(1.0);
+	_xAxisLabel = new AxisLabelItem(AxisLabelItem::X);
+	_xAxisLabel->setZValue(1.0);
+	_yAxisLabel = new AxisLabelItem(AxisLabelItem::Y);
+	_yAxisLabel->setZValue(1.0);
 	_slider = new SliderItem();
 	_slider->setZValue(4.0);
 	_sliderInfo = new SliderInfoItem(_slider);
@@ -72,34 +81,24 @@ GraphView::~GraphView()
 {
 	delete _xAxis;
 	delete _yAxis;
+	delete _xAxisLabel;
+	delete _yAxisLabel;
 	delete _slider;
 	delete _info;
 	delete _grid;
 	delete _message;
 }
 
-void GraphView::createXLabel()
-{
-	_xAxis->setLabel(QString("%1 [%2]").arg(_xLabel,
-	  _xUnits.isEmpty() ? "-" : _xUnits));
-}
-
-void GraphView::createYLabel()
-{
-	_yAxis->setLabel(QString("%1 [%2]").arg(_yLabel,
-	  _yUnits.isEmpty() ? "-" : _yUnits));
-}
-
 void GraphView::setYLabel(const QString &label)
 {
 	_yLabel = label;
-	createYLabel();
+	_yAxisLabel->setLabel(_yLabel, _yUnits);
 }
 
 void GraphView::setYUnits(const QString &units)
 {
 	_yUnits = units;
-	createYLabel();
+	_yAxisLabel->setLabel(_yLabel, _yUnits);
 }
 
 void GraphView::setXUnits()
@@ -143,7 +142,7 @@ void GraphView::setXUnits()
 			}
 	}
 
-	createXLabel();
+	_xAxisLabel->setLabel(_xLabel, _xUnits);
 }
 
 void GraphView::setUnits(Units units)
@@ -162,6 +161,7 @@ void GraphView::setGraphType(GraphType type)
 {
 	_graphType = type;
 	_bounds = QRectF();
+	_zoom = 1.0;
 
 	for (int i = 0; i < _graphs.count(); i++) {
 		GraphItem *gi = _graphs.at(i);
@@ -256,6 +256,8 @@ void GraphView::redraw(const QSizeF &size)
 	if (_bounds.isNull()) {
 		removeItem(_xAxis);
 		removeItem(_yAxis);
+		removeItem(_xAxisLabel);
+		removeItem(_yAxisLabel);
 		removeItem(_slider);
 		removeItem(_info);
 		removeItem(_grid);
@@ -267,6 +269,8 @@ void GraphView::redraw(const QSizeF &size)
 	removeItem(_message);
 	addItem(_xAxis);
 	addItem(_yAxis);
+	addItem(_xAxisLabel);
+	addItem(_yAxisLabel);
 	addItem(_slider);
 	addItem(_info);
 	addItem(_grid);
@@ -274,10 +278,12 @@ void GraphView::redraw(const QSizeF &size)
 	rx = RangeF(bounds().left() * _xScale, bounds().right() * _xScale);
 	ry = RangeF(bounds().top() * _yScale + _yOffset, bounds().bottom() * _yScale
 	  + _yOffset);
-	if (ry.size() < _minYRange)
-		ry.resize(_minYRange);
+	if (ry.size() < _minYRange * _yScale)
+		ry.resize(_minYRange * _yScale);
 
+	_xAxis->setZoom(_zoom);
 	_xAxis->setRange(rx);
+	_xAxis->setZoom(_zoom);
 	_yAxis->setRange(ry);
 	mx = _xAxis->margin();
 	my = _yAxis->margin();
@@ -287,9 +293,10 @@ void GraphView::redraw(const QSizeF &size)
 		r.adjust(0, -(_minYRange/2 - r.height()/2), 0,
 		  _minYRange/2 - r.height()/2);
 
-	sx = (size.width() - (my.width() + mx.width())) / r.width();
+	sx = (size.width() - (my.width() + mx.width()) - IW(_yAxisLabel))
+	  / r.width();
 	sy = (size.height() - (mx.height() + my.height())
-	  - _info->boundingRect().height()) / r.height();
+	  - IH(_info) - IH(_xAxisLabel)) / r.height();
 	sx *= _zoom;
 
 	for (int i = 0; i < _graphs.size(); i++)
@@ -315,10 +322,12 @@ void GraphView::redraw(const QSizeF &size)
 	_slider->setArea(r);
 	updateSliderPosition();
 
-	r |= _xAxis->sceneBoundingRect();
-	r |= _yAxis->sceneBoundingRect();
-	_info->setPos(r.topLeft() + QPointF(r.width()/2
-	  - _info->boundingRect().width()/2, -_info->boundingRect().height()));
+	_info->setPos(QPointF(r.width()/2 - IW(_info)/2 - (IW(_yAxisLabel)
+	  + IW(_yAxis))/2, r.top() - IH(_info) - my.height()));
+	_xAxisLabel->setPos(QPointF(r.width()/2 - IW(_xAxisLabel)/2,
+	  r.bottom() + mx.height()));
+	_yAxisLabel->setPos(QPointF(r.left() - my.width() - IW(_yAxisLabel),
+	  r.bottom() - (r.height()/2 + IH(_yAxisLabel)/2)));
 
 	_scene->setSceneRect(_scene->itemsBoundingRect());
 }
@@ -342,23 +351,31 @@ void GraphView::wheelEvent(QWheelEvent *e)
 {
 	static int deg = 0;
 
-	deg += e->delta() / 8;
+	deg += e->angleDelta().y() / 8;
 	if (qAbs(deg) < 15)
 		return;
 	deg = 0;
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
 	QPointF pos = mapToScene(e->pos());
+#else // QT 5.15
+	QPointF pos = mapToScene(e->position().toPoint());
+#endif // QT 5.15
 	QRectF gr(_grid->boundingRect());
 	QPointF r(pos.x() / gr.width(), pos.y() / gr.height());
 
-	_zoom = (e->delta() > 0) ? _zoom * 1.25 : qMax(_zoom / 1.25, 1.0);
+	_zoom = (e->angleDelta().y() > 0) ? _zoom * 1.25 : qMax(_zoom / 1.25, 1.0);
 	redraw();
 
 	QRectF ngr(_grid->boundingRect());
 	QPointF npos(mapFromScene(QPointF(r.x() * ngr.width(),
 	  r.y() * ngr.height())));
 	QScrollBar *sb = horizontalScrollBar();
+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
 	sb->setSliderPosition(sb->sliderPosition() + npos.x() - e->pos().x());
+#else // QT 5.15
+	sb->setSliderPosition(sb->sliderPosition() + npos.x() - e->position().x());
+#endif // QT 5.15
 
 	QGraphicsView::wheelEvent(e);
 }
@@ -366,8 +383,10 @@ void GraphView::wheelEvent(QWheelEvent *e)
 void GraphView::paintEvent(QPaintEvent *e)
 {
 	QRectF viewRect(mapToScene(rect()).boundingRect());
-	_info->setPos(QPointF(viewRect.left() + (viewRect.width()
-	  - _info->boundingRect().width())/2.0, _info->pos().y()));
+	_info->setPos(QPointF(viewRect.left() + (viewRect.width() - IW(_info))/2.0,
+	  _info->pos().y()));
+	_xAxisLabel->setPos(QPointF(viewRect.left() + (viewRect.width()
+	  - IW(_xAxisLabel))/2.0, _xAxisLabel->pos().y()));
 
 	QGraphicsView::paintEvent(e);
 }
@@ -419,14 +438,16 @@ void GraphView::updateSliderInfo()
 {
 	QLocale l(QLocale::system());
 	qreal r = 0, y = 0;
+	GraphItem *cardinal = (_graphs.count() == 1 || (_graphs.count() == 2
+	  && _graphs.first()->secondaryGraph())) ? _graphs.first() : 0;
 
-	if (_graphs.count() == 1) {
-		QRectF br(_graphs.first()->bounds());
+	if (cardinal) {
+		QRectF br(_bounds);
 		if (br.height() < _minYRange)
 			br.adjust(0, -(_minYRange/2 - br.height()/2), 0,
 			  _minYRange/2 - br.height()/2);
 
-		y = _graphs.first()->yAtX(_sliderPos);
+		y = cardinal->yAtX(_sliderPos);
 		r = (y - br.bottom()) / br.height();
 	}
 
@@ -436,11 +457,17 @@ void GraphView::updateSliderInfo()
 
 	_sliderInfo->setSide(s);
 	_sliderInfo->setPos(QPointF(0, _slider->boundingRect().height() * r));
-	_sliderInfo->setText(_graphType == Time ? Format::timeSpan(_sliderPos,
+	QString xText(_graphType == Time ? Format::timeSpan(_sliderPos,
 	  bounds().width() > 3600) : l.toString(_sliderPos * _xScale, 'f', 1)
-	  + UNIT_SPACE + _xUnits, (_graphs.count() > 1) ? QString()
-	  : l.toString(-y * _yScale + _yOffset, 'f', _precision) + UNIT_SPACE
-	  + _yUnits);
+	  + UNIT_SPACE + _xUnits);
+	QString yText((!cardinal) ? QString() : l.toString(-y * _yScale + _yOffset,
+	  'f', _precision) + UNIT_SPACE + _yUnits);
+	if (cardinal && cardinal->secondaryGraph()) {
+		qreal delta = y - cardinal->secondaryGraph()->yAtX(_sliderPos);
+		yText += QString(" ") + QChar(0x0394) + l.toString(-delta * _yScale
+		  + _yOffset, 'f', _precision) + UNIT_SPACE + _yUnits;
+	}
+	_sliderInfo->setText(xText, yText);
 }
 
 void GraphView::emitSliderPositionChanged(const QPointF &pos)
@@ -486,8 +513,23 @@ void GraphView::setPalette(const Palette &palette)
 	_palette = palette;
 	_palette.reset();
 
-	for (int i = 0; i < _graphs.count(); i++)
-		_graphs.at(i)->setColor(_palette.nextColor());
+	QSet<GraphItem*> secondary;
+	for (int i = 0; i < _graphs.count(); i++) {
+		GraphItem *g = _graphs[i];
+		if (g->secondaryGraph())
+			secondary.insert(g->secondaryGraph());
+	}
+
+	for (int i = 0; i < _graphs.count(); i++) {
+		GraphItem *g = _graphs[i];
+		if (secondary.contains(g))
+			continue;
+
+		QColor color(_palette.nextColor());
+		g->setColor(color);
+		if (g->secondaryGraph())
+			g->secondaryGraph()->setColor(color);
+	}
 }
 
 void GraphView::setGraphWidth(int width)
@@ -503,7 +545,7 @@ void GraphView::setGraphWidth(int width)
 void GraphView::useOpenGL(bool use)
 {
 	if (use)
-		setViewport(new OPENGL_WIDGET);
+		setViewport(new QOpenGLWidget);
 	else
 		setViewport(new QWidget);
 }

src/GUI/graphview.h

@@ -3,7 +3,6 @@
 
 #include <QGraphicsView>
 #include <QList>
-#include <QSet>
 #include "data/graph.h"
 #include "palette.h"
 #include "units.h"
@@ -11,6 +10,7 @@
 
 
 class AxisItem;
+class AxisLabelItem;
 class SliderItem;
 class SliderInfoItem;
 class GraphItem;
@@ -87,8 +87,6 @@ private slots:
 private:
 	void redraw(const QSizeF &size);
 	void setXUnits();
-	void createXLabel();
-	void createYLabel();
 	void updateSliderPosition();
 	void updateSliderInfo();
 	void removeItem(QGraphicsItem *item);
@@ -97,6 +95,7 @@ private:
 	GraphicsScene *_scene;
 
 	AxisItem *_xAxis, *_yAxis;
+	AxisLabelItem *_xAxisLabel, *_yAxisLabel;
 	SliderItem *_slider;
 	SliderInfoItem *_sliderInfo;
 	InfoItem *_info;

src/GUI/griditem.cpp

@@ -23,10 +23,8 @@ void GridItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
 		painter->drawLine(0, -_yTicks.at(i), boundingRect().width(),
 		  -_yTicks.at(i));
 
-/*
-	painter->setPen(Qt::red);
-	painter->drawRect(boundingRect());
-*/
+	//painter->setPen(Qt::red);
+	//painter->drawRect(boundingRect());
 }
 
 void GridItem::setTicks(const QList<qreal> &x, const QList<qreal> &y)

src/GUI/gui.h

@@ -10,7 +10,8 @@
 #include "units.h"
 #include "timetype.h"
 #include "format.h"
-#include "exportdialog.h"
+#include "pdfexportdialog.h"
+#include "pngexportdialog.h"
 #include "optionsdialog.h"
 
 class QMenu;
@@ -26,9 +27,10 @@ class FileBrowser;
 class GraphTab;
 class MapView;
 class Map;
-class MapList;
 class POI;
 class QScreen;
+class MapAction;
+class Data;
 
 class GUI : public QMainWindow
 {
@@ -37,7 +39,9 @@ class GUI : public QMainWindow
 public:
 	GUI();
 
-	bool openFile(const QString &fileName);
+	bool openFile(const QString &fileName, bool silent = false);
+	bool loadMap(const QString &fileName, MapAction *&action,
+	  bool silent = false);
 	void show();
 
 private slots:
@@ -45,10 +49,11 @@ private slots:
 	void keys();
 	void paths();
 	void printFile();
-	void exportFile();
+	void exportPDFFile();
+	void exportPNGFile();
 	void openFile();
 	void closeAll();
-	void reloadFile();
+	void reloadFiles();
 	void statistics();
 	void openPOIFile();
 	void closePOIFiles();
@@ -60,11 +65,13 @@ private slots:
 	void showTracks(bool show);
 	void showRoutes(bool show);
 	void loadMap();
+	void loadMapDir();
 	void nextMap();
 	void prevMap();
 	void openOptions();
+	void clearMapCache();
 
-	void mapChanged(int);
+	void mapChanged();
 	void graphChanged(int);
 	void poiFileChecked(int);
 
@@ -88,16 +95,23 @@ private slots:
 	void screenChanged(QScreen *screen);
 	void logicalDotsPerInchChanged(qreal dpi);
 
-private:
-	typedef QPair<QDate, QDate> DateRange;
+	void mapLoaded();
+	void mapLoadedDir();
+	void mapInitialized();
+
+private:
+	typedef QPair<QDateTime, QDateTime> DateTimeRange;
 
-	void loadMaps();
 	void loadPOIs();
 	void closeFiles();
 	void plot(QPrinter *printer);
+	void plotMainPage(QPainter *painter, const QRectF &rect, qreal ratio,
+	  bool expand = false);
+	void plotGraphsPage(QPainter *painter, const QRectF &rect, qreal ratio);
+	qreal graphPlotHeight(const QRectF &rect, qreal ratio);
 
 	QAction *createPOIFileAction(const QString &fileName);
-	QAction *createMapAction(const Map *map);
+	MapAction *createMapAction(Map *map);
 	void createPOIFilesActions();
 	void createMapActions();
 	void createActions();
@@ -109,9 +123,8 @@ private:
 	void createBrowser();
 
 	bool openPOIFile(const QString &fileName);
-	bool loadFile(const QString &fileName);
-	bool loadMap(const QString &fileName);
-	void exportFile(const QString &fileName);
+	bool loadFile(const QString &fileName, bool silent = false);
+	void loadData(const Data &data);
 	void updateStatusBarInfo();
 	void updateWindowTitle();
 	void updateNavigationActions();
@@ -127,7 +140,7 @@ private:
 	qreal distance() const;
 	qreal time() const;
 	qreal movingTime() const;
-	int mapIndex(const QString &name);
+	QAction *mapAction(const QString &name);
 	void readSettings();
 	void writeSettings();
 
@@ -151,7 +164,8 @@ private:
 	QAction *_aboutAction;
 	QAction *_aboutQtAction;
 	QAction *_printFileAction;
-	QAction *_exportFileAction;
+	QAction *_exportPDFFileAction;
+	QAction *_exportPNGFileAction;
 	QAction *_openFileAction;
 	QAction *_closeFileAction;
 	QAction *_reloadFileAction;
@@ -164,6 +178,7 @@ private:
 	QAction *_showMapAction;
 	QAction *_fullscreenAction;
 	QAction *_loadMapAction;
+	QAction *_loadMapDirAction;
 	QAction *_clearMapCacheAction;
 	QAction *_showGraphsAction;
 	QAction *_showGraphGridAction;
@@ -196,11 +211,9 @@ private:
 	QAction *_showCoordinatesAction;
 	QAction *_openOptionsAction;
 	QAction *_mapsEnd;
-	QList<QAction*> _mapActions;
-	QList<QAction*> _poiFilesActions;
 
+	QList<QAction*> _poiFilesActions;
 	QSignalMapper *_poiFilesSignalMapper;
-	QSignalMapper *_mapsSignalMapper;
 
 	QLabel *_fileNameLabel;
 	QLabel *_distanceLabel;
@@ -212,7 +225,6 @@ private:
 	QList<GraphTab*> _tabs;
 
 	POI *_poi;
-	MapList *_ml;
 	Map *_map;
 
 	FileBrowser *_browser;
@@ -221,7 +233,7 @@ private:
 	int _trackCount, _routeCount, _areaCount, _waypointCount;
 	qreal _trackDistance, _routeDistance;
 	qreal _time, _movingTime;
-	DateRange _dateRange;
+	DateTimeRange _dateRange;
 	QString _pathName;
 
 	qreal _sliderPos;
@@ -229,10 +241,13 @@ private:
 	QList<QByteArray> _windowStates;
 	int _frameStyle;
 
-	Export _export;
+	PDFExport _pdfExport;
+	PNGExport _pngExport;
 	Options _options;
 
 	QString _dataDir, _mapDir, _poiDir;
+
+	Units _units;
 };
 
 #endif // GUI_H

src/GUI/heartrategraphitem.cpp

@@ -5,7 +5,7 @@
 
 HeartRateGraphItem::HeartRateGraphItem(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/infoitem.cpp

@@ -18,9 +18,9 @@ void InfoItem::updateBoundingRect()
 
 	for (QList<KV<QString, QString> >::const_iterator i = _list.constBegin();
 	  i != _list.constEnd(); i++) {
-		width += fm.width(i->key() + ": ");
-		width += fm.width(i->value()) + ((i == _list.constEnd() - 1)
-		  ? 0 : PADDING);
+		width += fm.boundingRect(i->key() + ": ").width();
+		width += fm.boundingRect(i->value()).width()
+		  + ((i == _list.constEnd() - 1) ? 0 : PADDING);
 	}
 
 	_boundingRect = QRectF(0, 0, width, _list.isEmpty() ? 0 : fm.height());
@@ -40,10 +40,10 @@ void InfoItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
 	for (QList<KV<QString, QString> >::const_iterator i = _list.constBegin();
 	  i != _list.constEnd(); i++) {
 		painter->drawText(width, fm.height() - fm.descent(), i->key() + ": ");
-		width += fm.width(i->key() + ": ");
+		width += fm.boundingRect(i->key() + ": ").width();
 		painter->drawText(width, fm.height() - fm.descent(), i->value());
-		width += fm.width(i->value()) + ((i == _list.constEnd() - 1)
-		  ? 0 : PADDING);
+		width += fm.boundingRect(i->value()).width()
+		  + ((i == _list.constEnd() - 1) ? 0 : PADDING);
 		if (i != _list.constEnd() - 1) {
 			painter->save();
 			painter->setPen(Qt::gray);
@@ -53,10 +53,8 @@ void InfoItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
 		}
 	}
 
-/*
-	painter->setPen(Qt::red);
-	painter->drawRect(boundingRect());
-*/
+	//painter->setPen(Qt::red);
+	//painter->drawRect(boundingRect());
 }
 
 void InfoItem::insert(const QString &key, const QString &value)

src/GUI/keys.h

@@ -8,6 +8,7 @@
 #define PREV_KEY                Qt::Key_Backspace
 #define FIRST_KEY               Qt::Key_Home
 #define LAST_KEY                Qt::Key_End
+#define MODIFIER_KEY            Qt::Key_Shift
 #define MODIFIER                Qt::ShiftModifier
 #define ZOOM_IN                 Qt::Key_Plus
 #define ZOOM_OUT                Qt::Key_Minus
@@ -18,7 +19,8 @@
 #define OPEN_SHORTCUT           QKeySequence(QKeySequence::Open)
 #define CLOSE_SHORTCUT          QKeySequence(QKeySequence::Close)
 #define RELOAD_SHORTCUT         QKeySequence(QKeySequence::Refresh)
-#define EXPORT_SHORTCUT         QKeySequence(Qt::CTRL + Qt::Key_E)
+#define PDF_EXPORT_SHORTCUT     QKeySequence(Qt::CTRL + Qt::Key_E)
+#define PNG_EXPORT_SHORTCUT     QKeySequence(Qt::CTRL + Qt::Key_X)
 #define SHOW_POI_SHORTCUT       QKeySequence(Qt::CTRL + Qt::Key_P)
 #define SHOW_MAP_SHORTCUT       QKeySequence(Qt::CTRL + Qt::Key_M)
 #define NEXT_MAP_SHORTCUT       QKeySequence(QKeySequence::Forward)