Fixed broken map sources parsing

Currently translated at 100.0% (323 of 323 strings)

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

.appveyor.yml

@@ -1,14 +1,14 @@
-version: 5.12.{build}
+version: 7.0.{build}
 configuration: Release
 platform: Any CPU
 environment:
   NSISDIR: C:\Program Files (x86)\NSIS
   matrix:
-  - QTDIR: C:\Qt\5.9\msvc2015
+  - QTDIR: C:\Qt\5.11\msvc2015
     PLATFORM: x86
     NSI: gpxsee.nsi
     OPENSSLDIR: C:\OpenSSL-Win32\bin
-  - QTDIR: C:\Qt\5.9\msvc2015_64
+  - QTDIR: C:\Qt\5.11\msvc2015_64
     PLATFORM: x86_amd64
     NSI: gpxsee64.nsi
     OPENSSLDIR: C:\OpenSSL-Win64\bin
@@ -34,6 +34,8 @@ build_script:
 
     copy pkg\%NSI% installer
 
+    copy pkg\macros.nsh installer
+
     xcopy pkg\csv installer\csv /i
 
     xcopy pkg\maps installer\maps /i

README.md

@@ -1,25 +1,31 @@
 # GPXSee
 GPXSee is a Qt-based GPS log file viewer and analyzer that supports GPX, TCX,
-KML, FIT, IGC, NMEA and OziExplorer files.
+KML, FIT, IGC, NMEA, SLF, LOC and OziExplorer files.
 
 ## Features
-* User-definable online maps (OSM/Google tiles, WMTS, WMS).
+* User-definable online maps (OpenStreetMap/Google tiles, WMTS, WMS, TMS).
-* Offline maps (OziExplorer maps, TrekBuddy maps/atlases, GeoTIFF images).
+* Offline maps (MBTiles, OziExplorer maps, TrekBuddy maps/atlases, Garmin JNX maps, GeoTIFF images).
-* Elevation, speed, heart rate, cadence, power and temperature graphs.
+* Elevation, speed, heart rate, cadence, power, temperature and gear ratio/shifts graphs.
 * Support for multiple tracks in one view.
 * Support for POI files.
 * Print/export to PDF.
 * Full-screen mode.
+* HiDPI/Retina displays & maps support.
 * Native GUI for Windows, Mac OS X and Linux.
-* Opens GPX, TCX, FIT, KML, IGC, NMEA, OziExplorer (PLT, RTE, WPT) and Garmin CSV files.
+* Opens GPX, TCX, FIT, KML, IGC, NMEA, SLF, LOC, OziExplorer (PLT, RTE, WPT) and Garmin CSV files.
 
 ![GPXSee - Linux](https://a.fsdn.com/con/app/proj/gpxsee/screenshots/linux2.png)
 
 ## Build
+Build requirements:
+* Qt 4.8 or QT 5.x (Qt >= 5.10.1 recommended for all features)
+* C++03 compiler (tested: msvc2015, gcc >= 4.8, clang/Apple LLVM version 8.1.0)
+
+Build steps:
 ```shell
 lrelease gpxsee.pro
 qmake gpxsee.pro
-make
+make # nmake on windows
 ```
 
 ## Download
@@ -31,3 +37,9 @@ make
 
 ## Homepage
 http://www.gpxsee.org
+
+## Maps
+[GPXSee maps repository](https://github.com/tumic0/GPXSee-maps)
+
+## Translations
+GPXSee uses [Weblate](https://hosted.weblate.org/projects/gpxsee/translations/) for translations.

gpxsee.pro

@@ -1,21 +1,30 @@
 TARGET = GPXSee
-VERSION = 5.12
+VERSION = 7.0
+
 QT += core \
     gui \
-    network
+    network \
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+    sql \
-greaterThan(QT_MAJOR_VERSION, 4): QT += printsupport
+    concurrent
-lessThan(QT_VERSION, 5.4): QT += opengl
+greaterThan(QT_MAJOR_VERSION, 4) {
-macx: QT += opengl
+    QT += widgets
+    QT += printsupport
+}
+lessThan(QT_MAJOR_VERSION, 5) {QT += opengl}
+equals(QT_MAJOR_VERSION, 5) : lessThan(QT_MINOR_VERSION, 4) {QT += opengl}
+
 INCLUDEPATH += ./src
-HEADERS += src/config.h \
+HEADERS += src/common/config.h \
     src/common/staticassert.h \
     src/common/coordinates.h \
     src/common/range.h \
     src/common/rectc.h \
     src/common/wgs84.h \
-    src/common/str2int.h \
+    src/common/util.h \
     src/common/rtree.h \
+    src/common/kv.h \
+    src/common/greatcircle.h \
+    src/common/programpaths.h \
     src/GUI/app.h \
     src/GUI/icons.h \
     src/GUI/gui.h \
@@ -49,6 +58,7 @@ HEADERS += src/config.h \
     src/GUI/format.h \
     src/GUI/cadencegraph.h \
     src/GUI/powergraph.h \
+    src/GUI/gearratiograph.h \
     src/GUI/optionsdialog.h \
     src/GUI/colorbox.h \
     src/GUI/stylecombobox.h \
@@ -61,12 +71,13 @@ HEADERS += src/config.h \
     src/GUI/temperaturegraphitem.h \
     src/GUI/cadencegraphitem.h \
     src/GUI/powergraphitem.h \
+    src/GUI/gearratiographitem.h \
     src/GUI/oddspinbox.h \
     src/GUI/settings.h \
-    src/GUI/nicenum.h \
     src/GUI/cpuarch.h \
     src/GUI/searchpointer.h \
     src/GUI/mapview.h \
+    src/GUI/font.h \
     src/map/projection.h \
     src/map/ellipsoid.h \
     src/map/datum.h \
@@ -83,7 +94,7 @@ HEADERS += src/config.h \
     src/map/downloader.h \
     src/map/tile.h \
     src/map/emptymap.h \
-    src/map/offlinemap.h \
+    src/map/ozimap.h \
     src/map/tar.h \
     src/map/ozf.h \
     src/map/atlas.h \
@@ -107,6 +118,15 @@ HEADERS += src/config.h \
     src/map/crs.h \
     src/map/coordinatesystem.h \
     src/map/pointd.h \
+    src/map/rectd.h \
+    src/map/geocentric.h \
+    src/map/mercator.h \
+    src/map/jnxmap.h \
+    src/map/krovak.h \
+    src/map/geotiffmap.h \
+    src/map/image.h \
+    src/map/mbtilesmap.h \
+    src/map/osm.h \
     src/data/graph.h \
     src/data/poi.h \
     src/data/waypoint.h \
@@ -126,15 +146,15 @@ HEADERS += src/config.h \
     src/data/igcparser.h \
     src/data/nmeaparser.h \
     src/data/oziparsers.h \
-    src/map/rectd.h \
+    src/data/locparser.h \
-    src/map/geocentric.h \
+    src/data/slfparser.h
-    src/map/mercator.h \
-    src/map/jnxmap.h
 SOURCES += src/main.cpp \
     src/common/coordinates.cpp \
     src/common/rectc.cpp \
     src/common/range.cpp \
-    src/common/str2int.cpp \
+    src/common/util.cpp \
+    src/common/greatcircle.cpp \
+    src/common/programpaths.cpp \
     src/GUI/app.cpp \
     src/GUI/gui.cpp \
     src/GUI/axisitem.cpp \
@@ -163,6 +183,7 @@ SOURCES += src/main.cpp \
     src/GUI/format.cpp \
     src/GUI/cadencegraph.cpp \
     src/GUI/powergraph.cpp \
+    src/GUI/gearratiograph.cpp \
     src/GUI/optionsdialog.cpp \
     src/GUI/colorbox.cpp \
     src/GUI/stylecombobox.cpp \
@@ -174,13 +195,13 @@ SOURCES += src/main.cpp \
     src/GUI/temperaturegraphitem.cpp \
     src/GUI/cadencegraphitem.cpp \
     src/GUI/powergraphitem.cpp \
-    src/GUI/nicenum.cpp \
+    src/GUI/gearratiographitem.cpp \
     src/GUI/mapview.cpp \
     src/map/maplist.cpp \
     src/map/onlinemap.cpp \
     src/map/downloader.cpp \
     src/map/emptymap.cpp \
-    src/map/offlinemap.cpp \
+    src/map/ozimap.cpp \
     src/map/tar.cpp \
     src/map/atlas.cpp \
     src/map/ozf.cpp \
@@ -211,6 +232,15 @@ SOURCES += src/main.cpp \
     src/map/wms.cpp \
     src/map/crs.cpp \
     src/map/coordinatesystem.cpp \
+    src/map/geocentric.cpp \
+    src/map/mercator.cpp \
+    src/map/jnxmap.cpp \
+    src/map/krovak.cpp \
+    src/map/map.cpp \
+    src/map/geotiffmap.cpp \
+    src/map/image.cpp \
+    src/map/mbtilesmap.cpp \
+    src/map/osm.cpp \
     src/data/data.cpp \
     src/data/poi.cpp \
     src/data/track.cpp \
@@ -224,28 +254,36 @@ SOURCES += src/main.cpp \
     src/data/igcparser.cpp \
     src/data/nmeaparser.cpp \
     src/data/oziparsers.cpp \
-    src/map/geocentric.cpp \
+    src/data/locparser.cpp \
-    src/map/mercator.cpp \
+    src/data/slfparser.cpp
-    src/map/jnxmap.cpp
 RESOURCES += gpxsee.qrc
-TRANSLATIONS = lang/gpxsee_cs.ts \
+TRANSLATIONS = lang/gpxsee_en.ts \
+    lang/gpxsee_cs.ts \
     lang/gpxsee_sv.ts \
     lang/gpxsee_de.ts \
     lang/gpxsee_ru.ts \
     lang/gpxsee_fi.ts \
     lang/gpxsee_fr.ts \
-    lang/gpxsee_pl.ts
+    lang/gpxsee_pl.ts \
+    lang/gpxsee_nb.ts \
+    lang/gpxsee_da.ts \
+    lang/gpxsee_tr.ts
+
 macx {
     ICON = icons/gpxsee.icns
     QMAKE_INFO_PLIST = pkg/Info.plist
     LOCALE.path = Contents/Resources/translations
-    LOCALE.files = lang/gpxsee_cs.qm \
+    LOCALE.files = lang/gpxsee_en.qm \
+        lang/gpxsee_cs.qm \
         lang/gpxsee_de.qm \
         lang/gpxsee_fi.qm \
         lang/gpxsee_fr.qm \
         lang/gpxsee_ru.qm \
         lang/gpxsee_sv.qm \
-        lang/gpxsee_pl.qm
+        lang/gpxsee_pl.qm \
+        lang/gpxsee_nb.qm \
+        lang/gpxsee_da.qm \
+        lang/gpxsee_tr.qm
     CSV.path = Contents/Resources
     CSV.files = pkg/csv
     MAPS.path = Contents/Resources
@@ -259,7 +297,9 @@ macx {
         icons/nmea.icns \
         icons/plt.icns \
         icons/rte.icns \
-        icons/wpt.icns
+        icons/wpt.icns \
+        icons/loc.icns \
+        icons/slf.icns
     QMAKE_BUNDLE_DATA += LOCALE MAPS ICONS CSV
 }
 win32 {
@@ -272,7 +312,11 @@ win32 {
         icons/nmea.ico \
         icons/plt.ico \
         icons/rte.ico \
-        icons/wpt.ico
+        icons/wpt.ico \
+        icons/loc.ico \
+        icons/slf.ico
     DEFINES += _USE_MATH_DEFINES
 }
+
 DEFINES += APP_VERSION=\\\"$$VERSION\\\"
+DEFINES *= QT_USE_QSTRINGBUILDER

gpxsee.qrc

@@ -1,24 +1,46 @@
 <RCC>
-    <qresource prefix="/">
+	<qresource prefix="/">
-        <file>icons/dialog-close.png</file>
+		<file>icons/dialog-close.png</file>
-        <file>icons/document-open.png</file>
+		<file>icons/dialog-close@2x.png</file>
-        <file>icons/document-print.png</file>
+		<file>icons/document-open.png</file>
-        <file>icons/document-export.png</file>
+		<file>icons/document-open@2x.png</file>
-        <file>icons/flag.png</file>
+		<file>icons/document-print.png</file>
-        <file>icons/gpxsee.png</file>
+		<file>icons/document-print@2x.png</file>
-        <file>icons/application-exit.png</file>
+		<file>icons/document-export.png</file>
-        <file>icons/applications-internet.png</file>
+		<file>icons/document-export@2x.png</file>
-        <file>icons/view-refresh.png</file>
+		<file>icons/flag.png</file>
-        <file>icons/arrow-left.png</file>
+		<file>icons/flag@2x.png</file>
-        <file>icons/arrow-right.png</file>
+		<file>icons/gpxsee.png</file>
-        <file>icons/arrow-left-double.png</file>
+		<file>icons/gpxsee@2x.png</file>
-        <file>icons/arrow-right-double.png</file>
+		<file>icons/application-exit.png</file>
-        <file>icons/view-fullscreen.png</file>
+		<file>icons/application-exit@2x.png</file>
-        <file>icons/office-chart-line.png</file>
+		<file>icons/applications-internet.png</file>
-        <file>icons/preferences-desktop-display.png</file>
+		<file>icons/applications-internet@2x.png</file>
-        <file>icons/flag_48.png</file>
+		<file>icons/view-refresh.png</file>
-        <file>icons/system-run.png</file>
+		<file>icons/view-refresh@2x.png</file>
-        <file>icons/document-print-preview.png</file>
+		<file>icons/arrow-left.png</file>
-        <file>icons/view-filter.png</file>
+		<file>icons/arrow-left@2x.png</file>
-    </qresource>
+		<file>icons/arrow-right.png</file>
+		<file>icons/arrow-right@2x.png</file>
+		<file>icons/arrow-left-double.png</file>
+		<file>icons/arrow-left-double@2x.png</file>
+		<file>icons/arrow-right-double.png</file>
+		<file>icons/arrow-right-double@2x.png</file>
+		<file>icons/view-fullscreen.png</file>
+		<file>icons/view-fullscreen@2x.png</file>
+		<file>icons/office-chart-line.png</file>
+		<file>icons/office-chart-line@2x.png</file>
+		<file>icons/format-stroke-color.png</file>
+		<file>icons/format-stroke-color@2x.png</file>
+		<file>icons/flag_32.png</file>
+		<file>icons/flag_32@2x.png</file>
+		<file>icons/preferences-system.png</file>
+		<file>icons/preferences-system@2x.png</file>
+		<file>icons/document-print_32.png</file>
+		<file>icons/document-print_32@2x.png</file>
+		<file>icons/view-filter.png</file>
+		<file>icons/view-filter@2x.png</file>
+		<file>icons/applications-internet_32.png</file>
+		<file>icons/applications-internet_32@2x.png</file>
+	</qresource>
 </RCC>

icons/scripts/extensions

@@ -0,0 +1,11 @@
+fit:#006600
+gpx:#003399
+igc:#ff3300
+kml:#990000
+nmea:#0083d7
+plt:#66ff00
+rte:#66ff00
+tcx:#ffcc00
+wpt:#66ff00
+loc:#556677
+slf:#881199

icons/scripts/icns.sh

@@ -1,9 +1,6 @@
 #!/bin/bash
 
-EXTENSIONS="fit:#006600 gpx:#003399 igc:#ff3300 kml:#990000 nmea:#0083d7 \
+while read e; do
-  plt:#66ff00 rte:#66ff00 tcx:#ffcc00 wpt:#66ff00"
-
-for e in $EXTENSIONS; do
 	IFS=":"; set $e
 
 	EXT=`echo $1 | tr /a-z/ /A-Z/`
@@ -25,4 +22,4 @@ for e in $EXTENSIONS; do
 
 	iconutil -c icns -o $1.icns "$ICONSET"
 	rm -R "$ICONSET" $1.svg
-done
+done < extensions

icons/scripts/ico.sh

@@ -1,13 +1,10 @@
 #!/bin/bash
 
-EXTENSIONS="fit:#006600 gpx:#003399 igc:#ff3300 kml:#990000 nmea:#0083d7 \
+while read e; do
-  plt:#66ff00 rte:#66ff00 tcx:#ffcc00 wpt:#66ff00"
-
-for e in $EXTENSIONS; do
 	IFS=":"; set $e
 
 	EXT=`echo $1 | tr /a-z/ /A-Z/`
 	sed -e "s/\$EXTENSION/$EXT/" -e "s/\$COLOR/$2/" icon-template.svg > $1.svg
 	convert -density 400 $1.svg -define icon:auto-resize $1.ico
 	rm $1.svg
-done
+done < extensions

icons/scripts/icon-template.svg

@@ -12,6 +12,9 @@
   </g>
   <g transform="translate(16.573463,124.9782)">
     <rect y="0" x="0" id="textrect" height="50" width="120" style="fill:$COLOR;fill-opacity:1;stroke:none;"/>
-    <text y="28" x="60" dominant-baseline="central" text-anchor="middle" style="fill:#FFFFFF;font-size:39px;font-family:sans-serif;font-weight:bold;">$EXTENSION</text>
+<!--
+    <text y="28" x="60" dominant-baseline="central" text-anchor="middle" style="fill:#FFFFFF;font-size:39px;font-family:Helvetica;font-weight:bold;">$EXTENSION</text>
+-->
+    <text y="25" x="60" dy="0.36em" text-anchor="middle" style="fill:#FFFFFF;font-size:39px;font-family:Helvetica;font-weight:bold;">$EXTENSION</text>
   </g>
 </svg>

lang/gpxsee_en.ts

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="en_US">
+</TS>

pkg/Info.plist

@@ -67,6 +67,38 @@
 			<key>CFBundleTypeRole</key>
 			<string>Viewer</string>
 		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>loc</string>
+			</array>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>application/loc+xml</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>icons/loc.icns</string>
+			<key>CFBundleTypeName</key>
+			<string>Geocaching.com Waypoint File</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>slf</string>
+			</array>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>application/slf+xml</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>icons/slf.icns</string>
+			<key>CFBundleTypeName</key>
+			<string>Sigma Log Format</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
 		<dict>
 			<key>CFBundleTypeExtensions</key>
 			<array>
@@ -230,6 +262,48 @@
 				<string>application/vnd.google-earth.kml+xml</string>
 			</dict>
 		</dict>
+		<dict>
+			<key>UTTypeIdentifier</key>
+			<string>com.geocaching.loc</string>
+			<key>UTTypeReferenceURL</key>
+			<string>https://www.geocaching.com</string>
+			<key>UTTypeDescription</key>
+			<string>Geocaching.com Waypoint File</string>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>public.xml</string>
+			</array>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>public.filename-extension</key>
+				<array>
+					<string>loc</string>
+				</array>
+				<key>public.mime-type</key>
+				<string>application/loc+xml</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>UTTypeIdentifier</key>
+			<string>com.sigmasport.slf</string>
+			<key>UTTypeReferenceURL</key>
+			<string>https://www.sigmasport.com</string>
+			<key>UTTypeDescription</key>
+			<string>Sigma Log Format</string>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>public.xml</string>
+			</array>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>public.filename-extension</key>
+				<array>
+					<string>slf</string>
+				</array>
+				<key>public.mime-type</key>
+				<string>application/slf+xml</string>
+			</dict>
+		</dict>
 		<dict>
 			<key>UTTypeIdentifier</key>
 			<string>com.thisisant.fit</string>

pkg/appdata.xml

@@ -8,21 +8,23 @@
 	<summary>GPS log file viewer and analyzer</summary>
 	<description>
 		<p>GPXSee is a GPS log file viewer and analyzer that supports GPX, TCX,
-		KML, FIT, IGC, NMEA and OziExplorer files.</p>
+		KML, FIT, IGC, NMEA, SLF, LOC and OziExplorer files.</p>
 
 		<p>Features:</p>
 		<ul>
-			<li>User-definable online maps (OSM/Google tiles, WMTS, WMS).</li>
+			<li>User-definable online maps (OpenStreetMap/Google tiles, WMTS,
-			<li>Offline maps (OziExplorer maps, TrekBuddy maps/atlases, GeoTIFF
+				WMS, TMS).</li>
-				images).</li>
+			<li>Offline maps (MBTiles, OziExplorer maps, TrekBuddy maps/atlases,
+				GeoTIFF images).</li>
 			<li>Elevation, speed, heart rate, cadence, power and temperature
 				graphs.</li>
 			<li>Support for multiple tracks in one view.</li>
 			<li>Support for POI files.</li>
 			<li>Print/export to PDF.</li>
 			<li>Full-screen mode.</li>
-			<li>Opens GPX, TCX, FIT, KML, IGC, NMEA, OziExplorer (PLT, WPT, RTE)
+			<li>HiDPI/Retina displays &amp; maps support.</li>
-				and Garmin CSV files.</li>
+			<li>Opens GPX, TCX, FIT, KML, IGC, NMEA, SLF, LOC, OziExplorer (PLT,
+				WPT, RTE) and Garmin CSV files.</li>
 		</ul>
 	</description>
 
@@ -38,6 +40,10 @@
 	<categories>
 		<category>Graphics</category>
 		<category>Viewer</category>
+		<category>Maps</category>
+		<category>Geoscience</category>
+		<category>Geography</category>
+		<category>DataVisualization</category>
 	</categories>
 
 	<url type="homepage">http://www.gpxsee.org</url>
@@ -58,5 +64,7 @@
 		<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>
 	</mimetypes>
 </component>

pkg/csv/pcs.csv

@@ -21,6 +21,7 @@ ED50(ED77) / UTM zone 40N,2060,4154,16040,9001,9807,4400,8801,0,9102,8802,57,910
 ED50(ED77) / UTM zone 41N,2061,4154,16041,9001,9807,4400,8801,0,9102,8802,63,9102,8805,0.9996,9201,8806,500000,9001,8807,0,9001,,,,,,
 Dabola 1981 / UTM zone 28N,2063,4315,16028,9001,9807,4400,8801,0,9102,8802,-15,9102,8805,0.9996,9201,8806,500000,9001,8807,0,9001,,,,,,
 Dabola 1981 / UTM zone 29N,2064,4315,16029,9001,9807,4400,8801,0,9102,8802,-9,9102,8805,0.9996,9201,8806,500000,9001,8807,0,9001,,,,,,
+S-JTSK (Ferro) / Krovak,2065,4818,19952,9001,9819,6501,1036,30.1717303,9110,8806,0,9001,8807,0,9001,8811,49.3,9110,8818,78.3,9110,8819,0.9999,9201,8833,42.3,9110
 Naparima 1955 / UTM zone 20N,2067,4158,16020,9001,9807,4400,8801,0,9102,8802,-63,9102,8805,0.9996,9201,8806,500000,9001,8807,0,9001,,,,,,
 ELD79 / Libya zone 5,2068,4159,18240,9001,9807,4499,8801,0,9102,8802,9,9102,8805,0.9999,9201,8806,200000,9001,8807,0,9001,,,,,,
 ELD79 / Libya zone 6,2069,4159,18241,9001,9807,4499,8801,0,9102,8802,11,9102,8805,0.9999,9201,8806,200000,9001,8807,0,9001,,,,,,
@@ -1571,7 +1572,6 @@ SWEREF99 / RT90 5 gon O emulation,3850,4619,17344,9001,9807,4530,8801,0,9110,880
 NZGD2000 / NZCS2000,3851,4167,17964,9001,9802,4500,8821,-41,9110,8822,173,9110,8823,-37.3,9110,8824,-44.3,9110,8826,3000000,9001,8827,7000000,9001,,,
 RSRGD2000 / DGLC2000,3852,4764,17966,9001,9802,4500,8821,-90,9110,8822,157,9110,8823,-76.4,9110,8824,-79.2,9110,8826,500000,9001,8827,0,9001,,,
 County ST74,3854,4619,3853,9001,9807,4531,8801,0,9110,8802,18.0328332,9110,8805,0.99999506,9201,8806,100182.7406,9001,8807,-6500620.1207,9001,,,,,,
-WGS 84 / Pseudo-Mercator,3857,4326,3856,9001,1024,4499,8801,0,9102,8802,0,9102,8806,0,9001,8807,0,9001,,,,,,,,,
 ETRS89 / GK19FIN,3873,4258,3860,9001,9807,4500,8801,0,9102,8802,19,9102,8805,1,9201,8806,19500000,9001,8807,0,9001,,,,,,
 ETRS89 / GK20FIN,3874,4258,3861,9001,9807,4500,8801,0,9102,8802,20,9102,8805,1,9201,8806,20500000,9001,8807,0,9001,,,,,,
 ETRS89 / GK21FIN,3875,4258,3862,9001,9807,4500,8801,0,9102,8802,21,9102,8805,1,9201,8806,21500000,9001,8807,0,9001,,,,,,
@@ -1766,6 +1766,7 @@ Korea 2000 / West Belt 2010,5185,4737,5101,9001,9807,4530,8801,38,9102,8802,125,
 Korea 2000 / Central Belt 2010,5186,4737,5102,9001,9807,4530,8801,38,9102,8802,127,9102,8805,1,9201,8806,200000,9001,8807,600000,9001,,,,,,
 Korea 2000 / East Belt 2010,5187,4737,5103,9001,9807,4530,8801,38,9102,8802,129,9102,8805,1,9201,8806,200000,9001,8807,600000,9001,,,,,,
 Korea 2000 / East Sea Belt 2010,5188,4737,5104,9001,9807,4530,8801,38,9102,8802,131,9102,8805,1,9201,8806,200000,9001,8807,600000,9001,,,,,,
+S-JTSK (Ferro) / Krovak East North,5221,4818,5218,9001,1041,4499,1036,30.1717303,9110,8806,0,9001,8807,0,9001,8811,49.3,9110,8818,78.3,9110,8819,0.9999,9201,8833,42.3,9110
 WGS 84 / Gabon TM,5223,4326,5222,9001,9807,4499,8801,0,9102,8802,12,9102,8805,0.9996,9201,8806,500000,9001,8807,500000,9001,,,,,,
 Kandawala / Sri Lanka Grid,5234,4244,5231,9001,9807,4400,8801,7.0001729,9110,8802,80.461816,9110,8805,0.9999238418,9201,8806,200000,9001,8807,200000,9001,,,,,,
 SLD99 / Sri Lanka Grid 1999,5235,5233,5232,9001,9807,4400,8801,7.00016975,9110,8802,80.46181671,9110,8805,0.9999238418,9201,8806,500000,9001,8807,500000,9001,,,,,,
@@ -1844,6 +1845,9 @@ RSRGD2000 / MSLC2000,5479,4764,5475,9001,9802,4500,8821,-78,9110,8822,163,9110,8
 RSRGD2000 / BCLC2000,5480,4764,5476,9001,9802,4500,8821,-74.3,9110,8822,165,9110,8823,-73.4,9110,8824,-75.2,9110,8826,5000000,9001,8827,3000000,9001,,,
 RSRGD2000 / PCLC2000,5481,4764,5477,9001,9802,4500,8821,-71.3,9110,8822,166,9110,8823,-70.4,9110,8824,-72.2,9110,8826,3000000,9001,8827,1000000,9001,,,
 RGAF09 / UTM zone 20N,5490,5489,16020,9001,9807,4400,8801,0,9102,8802,-63,9102,8805,0.9996,9201,8806,500000,9001,8807,0,9001,,,,,,
+S-JTSK / Krovak,5513,4156,5509,9001,9819,6501,1036,30.1717303,9110,8806,0,9001,8807,0,9001,8811,49.3,9110,8818,78.3,9110,8819,0.9999,9201,8833,24.5,9110
+S-JTSK / Krovak East North,5514,4156,5510,9001,1041,4499,1036,30.1717303,9110,8806,0,9001,8807,0,9001,8811,49.3,9110,8818,78.3,9110,8819,0.9999,9201,8833,24.5,9110
+S-JTSK / Krovak East North,102067,4156,5510,9001,1041,4499,1036,30.1717303,9110,8806,0,9001,8807,0,9001,8811,49.3,9110,8818,78.3,9110,8819,0.9999,9201,8833,24.5,9110
 CI1971 / Chatham Islands Map Grid,5518,4672,5517,9001,9807,4500,8801,-44,9110,8802,-176.3,9110,8805,1,9201,8806,350000,9001,8807,650000,9001,,,,,,
 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,,,,,,

pkg/gpxsee.desktop

@@ -11,4 +11,4 @@ Icon=gpxsee
 Terminal=false
 Type=Application
 Categories=Graphics;Viewer;Maps;Qt;
-MimeType=application/gpx+xml;application/tcx+xml;application/vnd.ant.fit;application/vnd.google-earth.kml+xml;application/vnd.fai.igc;application/vnd.nmea.nmea;application/vnd.oziexplorer.plt;application/vnd.oziexplorer.rte;application/vnd.oziexplorer.wpt;
+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;

pkg/gpxsee.nsi

@@ -1,11 +1,13 @@
 !include "MUI2.nsh"
 !include "x64.nsh"
 !include "WinVer.nsh"
+!include "macros.nsh"
+
 
 ; The name of the installer
 Name "GPXSee"
 ; Program version
-!define VERSION "5.12"
+!define VERSION "7.0"
 
 ; The file to write
 OutFile "GPXSee-${VERSION}.exe"
@@ -32,16 +34,6 @@ InstallDirRegKey HKLM "Software\GPXSee" "Install_Dir"
 
 ; Registry key for uninstaller
 !define REGENTRY "Software\Microsoft\Windows\CurrentVersion\Uninstall\GPXSee"
-; File types registry entries
-!define REGGPX "GPXSee.gpx"
-!define REGTCX "GPXSee.tcx"
-!define REGKML "GPXSee.kml"
-!define REGFIT "GPXSee.fit"
-!define REGIGC "GPXSee.igc"
-!define REGNMEA "GPXSee.nmea"
-!define REGPLT "GPXSee.plt"
-!define REGRTE "GPXSee.rte"
-!define REGWPT "GPXSee.wpt"
 
 ; Start menu page configuration
 !define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKLM"
@@ -114,43 +106,17 @@ Section "GPXSee" SEC_APP
 
   ; Associate file formats
   DetailPrint "Associating file types..."
-  WriteRegStr HKCR ".gpx" "" "${REGGPX}"
+  !insertmacro FILE_ASSOCIATION_ADD "gpx" "GPS Exchange Format" 4
-  WriteRegStr HKCR "${REGGPX}" ""  "GPS Exchange Format"
+  !insertmacro FILE_ASSOCIATION_ADD "tcx" "Training Center XML" 5
-  WriteRegStr HKCR "${REGGPX}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,2"
+  !insertmacro FILE_ASSOCIATION_ADD "kml" "Keyhole Markup Language" 6
-  WriteRegStr HKCR "${REGGPX}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
+  !insertmacro FILE_ASSOCIATION_ADD "fit" "Flexible and Interoperable Data Transfer" 7
-  WriteRegStr HKCR ".tcx" "" "${REGTCX}"
+  !insertmacro FILE_ASSOCIATION_ADD "igc" "Flight Recorder Data Format" 8
-  WriteRegStr HKCR "${REGTCX}" ""  "Training Center XML"
+  !insertmacro FILE_ASSOCIATION_ADD "nmea" "NMEA 0183 data" 9
-  WriteRegStr HKCR "${REGTCX}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,3"
+  !insertmacro FILE_ASSOCIATION_ADD "plt" "OziExplorer Track Point File" 10
-  WriteRegStr HKCR "${REGTCX}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
+  !insertmacro FILE_ASSOCIATION_ADD "rte" "OziExplorer Route File" 11
-  WriteRegStr HKCR ".kml" "" "${REGKML}"
+  !insertmacro FILE_ASSOCIATION_ADD "wpt" "OziExplorer Waypoint File" 1
-  WriteRegStr HKCR "${REGKML}" ""  "Keyhole Markup Language"
+  !insertmacro FILE_ASSOCIATION_ADD "loc" "Geocaching.com Waypoint File" 2
-  WriteRegStr HKCR "${REGKML}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,4"
+  !insertmacro FILE_ASSOCIATION_ADD "slf" "Sigma Log File" 3
-  WriteRegStr HKCR "${REGKML}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
-  WriteRegStr HKCR ".fit" "" "${REGFIT}"
-  WriteRegStr HKCR "${REGFIT}" ""  "Flexible and Interoperable Data Transfer"
-  WriteRegStr HKCR "${REGFIT}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,5"
-  WriteRegStr HKCR "${REGFIT}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
-  WriteRegStr HKCR ".igc" "" "${REGIGC}"
-  WriteRegStr HKCR "${REGIGC}" ""  "Flight Recorder Data Format"
-  WriteRegStr HKCR "${REGIGC}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,6"
-  WriteRegStr HKCR "${REGIGC}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
-  WriteRegStr HKCR ".nmea" "" "${REGNMEA}"
-  WriteRegStr HKCR "${REGNMEA}" ""  "NMEA 0183 data"
-  WriteRegStr HKCR "${REGNMEA}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,7"
-  WriteRegStr HKCR "${REGNMEA}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
-  WriteRegStr HKCR ".plt" "" "${REGPLT}"
-  WriteRegStr HKCR "${REGPLT}" ""  "OziExplorer Track Point File"
-  WriteRegStr HKCR "${REGPLT}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,8"
-  WriteRegStr HKCR "${REGPLT}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
-  WriteRegStr HKCR ".rte" "" "${REGRTE}"
-  WriteRegStr HKCR "${REGRTE}" ""  "OziExplorer Route File"
-  WriteRegStr HKCR "${REGRTE}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,9"
-  WriteRegStr HKCR "${REGRTE}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
-  WriteRegStr HKCR ".wpt" "" "${REGWPT}"
-  WriteRegStr HKCR "${REGWPT}" ""  "OziExplorer Waypoint File"
-  WriteRegStr HKCR "${REGWPT}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,1"
-  WriteRegStr HKCR "${REGWPT}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
-
   System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
 
 SectionEnd
@@ -164,9 +130,13 @@ Section "QT framework" SEC_QT
   File "Qt5Widgets.dll"
   File "Qt5PrintSupport.dll"
   File "Qt5Network.dll"
+  File "Qt5Sql.dll"
+  File "Qt5Concurrent.dll"
   File /r "platforms"
   File /r "imageformats"
   File /r "printsupport"
+  File /r "styles"
+  File /r "sqldrivers"
 
 SectionEnd
 
@@ -210,40 +180,16 @@ Section "ANGLE" SEC_ANGLE
 SectionEnd
 
 SectionGroup "Localization" SEC_LOCALIZATION
-  Section "Czech"
+  !insertmacro LOCALIZATION "Czech" "cs"
-    CreateDirectory "$INSTDIR\translations"
+  !insertmacro LOCALIZATION "Danish" "da"
-    File /oname=translations\gpxsee_cs.qm translations\gpxsee_cs.qm
+  !insertmacro LOCALIZATION "Finnish" "fi"
-    File /oname=translations\qt_cs.qm translations\qt_cs.qm
+  !insertmacro LOCALIZATION "French" "fr"
-  SectionEnd
+  !insertmacro LOCALIZATION "German" "de"
-  Section "Finnish"
+  !insertmacro LOCALIZATION "Norwegian" "nb"
-    CreateDirectory "$INSTDIR\translations"
+  !insertmacro LOCALIZATION "Polish" "pl"
-    File /oname=translations\gpxsee_fi.qm translations\gpxsee_fi.qm
+  !insertmacro LOCALIZATION "Russian" "ru"
-    File /oname=translations\qt_fi.qm translations\qt_fi.qm
+  !insertmacro LOCALIZATION "Swedish" "sv"
-  SectionEnd
+  !insertmacro LOCALIZATION "Turkish" "tr"
-  Section "French"
-    CreateDirectory "$INSTDIR\translations"
-    File /oname=translations\gpxsee_fr.qm translations\gpxsee_fr.qm
-    File /oname=translations\qt_fr.qm translations\qt_fr.qm
-  SectionEnd
-  Section "German"
-    CreateDirectory "$INSTDIR\translations"
-    File /oname=translations\gpxsee_de.qm translations\gpxsee_de.qm
-    File /oname=translations\qt_de.qm translations\qt_de.qm
-  SectionEnd
-  Section "Polish"
-    CreateDirectory "$INSTDIR\translations"
-    File /oname=translations\gpxsee_pl.qm translations\gpxsee_pl.qm
-    File /oname=translations\qt_pl.qm translations\qt_pl.qm
-  SectionEnd
-  Section "Russian"
-    CreateDirectory "$INSTDIR\translations" 
-    File /oname=translations\gpxsee_ru.qm translations\gpxsee_ru.qm
-    File /oname=translations\qt_ru.qm translations\qt_ru.qm
-  SectionEnd
-  Section "Swedish"
-    CreateDirectory "$INSTDIR\translations" 
-    File /oname=translations\gpxsee_sv.qm translations\gpxsee_sv.qm
-  SectionEnd
 SectionGroupEnd
 
 ;--------------------------------
@@ -266,24 +212,17 @@ Section "Uninstall"
   RMDir "$SMPROGRAMS\$StartMenuFolder"
 
   ; Remove GPX file association
-  DeleteRegKey HKCR "${REGGPX}"
+  !insertmacro FILE_ASSOCIATION_REMOVE "gpx"
-  DeleteRegKey HKCR ".gpx"
+  !insertmacro FILE_ASSOCIATION_REMOVE "tcx"
-  DeleteRegKey HKCR "${REGTCX}"
+  !insertmacro FILE_ASSOCIATION_REMOVE "kml"
-  DeleteRegKey HKCR ".tcx"
+  !insertmacro FILE_ASSOCIATION_REMOVE "fit"
-  DeleteRegKey HKCR "${REGKML}"
+  !insertmacro FILE_ASSOCIATION_REMOVE "igc"
-  DeleteRegKey HKCR ".kml"
+  !insertmacro FILE_ASSOCIATION_REMOVE "nmea"
-  DeleteRegKey HKCR "${REGFIT}"
+  !insertmacro FILE_ASSOCIATION_REMOVE "plt"
-  DeleteRegKey HKCR ".fit"
+  !insertmacro FILE_ASSOCIATION_REMOVE "rte"
-  DeleteRegKey HKCR "${REGIGC}"
+  !insertmacro FILE_ASSOCIATION_REMOVE "wpt"
-  DeleteRegKey HKCR ".igc"
+  !insertmacro FILE_ASSOCIATION_REMOVE "loc"
-  DeleteRegKey HKCR "${REGNMEA}"
+  !insertmacro FILE_ASSOCIATION_REMOVE "slf"
-  DeleteRegKey HKCR ".nmea"
-  DeleteRegKey HKCR "${REGPLT}"
-  DeleteRegKey HKCR ".plt"
-  DeleteRegKey HKCR "${REGRTE}"
-  DeleteRegKey HKCR ".rte"
-  DeleteRegKey HKCR "${REGWPT}"
-  DeleteRegKey HKCR ".wpt"
   System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
 
 SectionEnd

pkg/gpxsee.xml

@@ -22,6 +22,20 @@
 		<glob pattern="*.kml"/>
 	</mime-type>
 
+	<mime-type type="application/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">
+		<comment>Sigma Log Format</comment>
+		<sub-class-of type="application/xml"/>
+		<generic-icon name="application-xml"/>
+		<glob pattern="*.slf"/>
+	</mime-type>
+
 	<mime-type type="application/vnd.ant.fit">
 		<comment>Flexible and Interoperable Data Transfer</comment>
 		<sub-class-of type="application/octet-stream"/>

pkg/gpxsee64.nsi

@@ -1,11 +1,13 @@
 !include "MUI2.nsh"
 !include "x64.nsh"
 !include "WinVer.nsh"
+!include "macros.nsh"
+
 
 ; The name of the installer
 Name "GPXSee"
 ; Program version
-!define VERSION "5.12"
+!define VERSION "7.0"
 
 ; The file to write
 OutFile "GPXSee-${VERSION}_x64.exe"
@@ -32,16 +34,6 @@ InstallDirRegKey HKLM "Software\GPXSee" "Install_Dir"
 
 ; Registry key for uninstaller
 !define REGENTRY "Software\Microsoft\Windows\CurrentVersion\Uninstall\GPXSee"
-; File types registry entries
-!define REGGPX "GPXSee.gpx"
-!define REGTCX "GPXSee.tcx"
-!define REGKML "GPXSee.kml"
-!define REGFIT "GPXSee.fit"
-!define REGIGC "GPXSee.igc"
-!define REGNMEA "GPXSee.nmea"
-!define REGPLT "GPXSee.plt"
-!define REGRTE "GPXSee.rte"
-!define REGWPT "GPXSee.wpt"
 
 ; Start menu page configuration
 !define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKLM"
@@ -121,43 +113,17 @@ Section "GPXSee" SEC_APP
 
   ; Associate file formats
   DetailPrint "Associating file types..."
-  WriteRegStr HKCR ".gpx" "" "${REGGPX}"
+  !insertmacro FILE_ASSOCIATION_ADD "gpx" "GPS Exchange Format" 4
-  WriteRegStr HKCR "${REGGPX}" ""  "GPS Exchange Format"
+  !insertmacro FILE_ASSOCIATION_ADD "tcx" "Training Center XML" 5
-  WriteRegStr HKCR "${REGGPX}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,2"
+  !insertmacro FILE_ASSOCIATION_ADD "kml" "Keyhole Markup Language" 6
-  WriteRegStr HKCR "${REGGPX}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
+  !insertmacro FILE_ASSOCIATION_ADD "fit" "Flexible and Interoperable Data Transfer" 7
-  WriteRegStr HKCR ".tcx" "" "${REGTCX}"
+  !insertmacro FILE_ASSOCIATION_ADD "igc" "Flight Recorder Data Format" 8
-  WriteRegStr HKCR "${REGTCX}" ""  "Training Center XML"
+  !insertmacro FILE_ASSOCIATION_ADD "nmea" "NMEA 0183 data" 9
-  WriteRegStr HKCR "${REGTCX}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,3"
+  !insertmacro FILE_ASSOCIATION_ADD "plt" "OziExplorer Track Point File" 10
-  WriteRegStr HKCR "${REGTCX}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
+  !insertmacro FILE_ASSOCIATION_ADD "rte" "OziExplorer Route File" 11
-  WriteRegStr HKCR ".kml" "" "${REGKML}"
+  !insertmacro FILE_ASSOCIATION_ADD "wpt" "OziExplorer Waypoint File" 1
-  WriteRegStr HKCR "${REGKML}" ""  "Keyhole Markup Language"
+  !insertmacro FILE_ASSOCIATION_ADD "loc" "Geocaching.com Waypoint File" 2
-  WriteRegStr HKCR "${REGKML}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,4"
+  !insertmacro FILE_ASSOCIATION_ADD "slf" "Sigma Log File" 3
-  WriteRegStr HKCR "${REGKML}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
-  WriteRegStr HKCR ".fit" "" "${REGFIT}"
-  WriteRegStr HKCR "${REGFIT}" ""  "Flexible and Interoperable Data Transfer"
-  WriteRegStr HKCR "${REGFIT}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,5"
-  WriteRegStr HKCR "${REGFIT}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
-  WriteRegStr HKCR ".igc" "" "${REGIGC}"
-  WriteRegStr HKCR "${REGIGC}" ""  "Flight Recorder Data Format"
-  WriteRegStr HKCR "${REGIGC}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,6"
-  WriteRegStr HKCR "${REGIGC}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
-  WriteRegStr HKCR ".nmea" "" "${REGNMEA}"
-  WriteRegStr HKCR "${REGNMEA}" ""  "NMEA 0183 data"
-  WriteRegStr HKCR "${REGNMEA}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,7"
-  WriteRegStr HKCR "${REGNMEA}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
-  WriteRegStr HKCR ".plt" "" "${REGPLT}"
-  WriteRegStr HKCR "${REGPLT}" ""  "OziExplorer Track Point File"
-  WriteRegStr HKCR "${REGPLT}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,8"
-  WriteRegStr HKCR "${REGPLT}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
-  WriteRegStr HKCR ".rte" "" "${REGRTE}"
-  WriteRegStr HKCR "${REGRTE}" ""  "OziExplorer Route File"
-  WriteRegStr HKCR "${REGRTE}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,9"
-  WriteRegStr HKCR "${REGRTE}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
-  WriteRegStr HKCR ".wpt" "" "${REGWPT}"
-  WriteRegStr HKCR "${REGWPT}" ""  "OziExplorer Waypoint File"
-  WriteRegStr HKCR "${REGWPT}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,1"
-  WriteRegStr HKCR "${REGWPT}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
-
   System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
 
 SectionEnd
@@ -171,9 +137,13 @@ Section "QT framework" SEC_QT
   File "Qt5Widgets.dll"
   File "Qt5PrintSupport.dll"
   File "Qt5Network.dll"
+  File "Qt5Sql.dll"
+  File "Qt5Concurrent.dll"
   File /r "platforms"
   File /r "imageformats"
   File /r "printsupport"
+  File /r "styles"
+  File /r "sqldrivers"
 
 SectionEnd
 
@@ -212,40 +182,16 @@ Section "ANGLE" SEC_ANGLE
 SectionEnd
 
 SectionGroup "Localization" SEC_LOCALIZATION
-  Section "Czech"
+  !insertmacro LOCALIZATION "Czech" "cs"
-    CreateDirectory "$INSTDIR\translations"
+  !insertmacro LOCALIZATION "Danish" "da"
-    File /oname=translations\gpxsee_cs.qm translations\gpxsee_cs.qm
+  !insertmacro LOCALIZATION "Finnish" "fi"
-    File /oname=translations\qt_cs.qm translations\qt_cs.qm
+  !insertmacro LOCALIZATION "French" "fr"
-  SectionEnd
+  !insertmacro LOCALIZATION "German" "de"
-  Section "Finnish"
+  !insertmacro LOCALIZATION "Norwegian" "nb"
-    CreateDirectory "$INSTDIR\translations"
+  !insertmacro LOCALIZATION "Polish" "pl"
-    File /oname=translations\gpxsee_fi.qm translations\gpxsee_fi.qm
+  !insertmacro LOCALIZATION "Russian" "ru"
-    File /oname=translations\qt_fi.qm translations\qt_fi.qm
+  !insertmacro LOCALIZATION "Swedish" "sv"
-  SectionEnd
+  !insertmacro LOCALIZATION "Turkish" "tr"
-  Section "French"
-    CreateDirectory "$INSTDIR\translations"
-    File /oname=translations\gpxsee_fr.qm translations\gpxsee_fr.qm
-    File /oname=translations\qt_fr.qm translations\qt_fr.qm
-  SectionEnd
-  Section "German"
-    CreateDirectory "$INSTDIR\translations"
-    File /oname=translations\gpxsee_de.qm translations\gpxsee_de.qm
-    File /oname=translations\qt_de.qm translations\qt_de.qm
-  SectionEnd
-  Section "Polish"
-    CreateDirectory "$INSTDIR\translations"
-    File /oname=translations\gpxsee_pl.qm translations\gpxsee_pl.qm
-    File /oname=translations\qt_pl.qm translations\qt_pl.qm
-  SectionEnd
-  Section "Russian"
-    CreateDirectory "$INSTDIR\translations" 
-    File /oname=translations\gpxsee_ru.qm translations\gpxsee_ru.qm
-    File /oname=translations\qt_ru.qm translations\qt_ru.qm
-  SectionEnd
-  Section "Swedish"
-    CreateDirectory "$INSTDIR\translations" 
-    File /oname=translations\gpxsee_sv.qm translations\gpxsee_sv.qm
-  SectionEnd
 SectionGroupEnd
 
 ;--------------------------------
@@ -269,24 +215,17 @@ Section "Uninstall"
   RMDir "$SMPROGRAMS\$StartMenuFolder"
 
   ; Remove File associations
-  DeleteRegKey HKCR "${REGGPX}"
+  !insertmacro FILE_ASSOCIATION_REMOVE "gpx"
-  DeleteRegKey HKCR ".gpx"
+  !insertmacro FILE_ASSOCIATION_REMOVE "tcx"
-  DeleteRegKey HKCR "${REGTCX}"
+  !insertmacro FILE_ASSOCIATION_REMOVE "kml"
-  DeleteRegKey HKCR ".tcx"
+  !insertmacro FILE_ASSOCIATION_REMOVE "fit"
-  DeleteRegKey HKCR "${REGKML}"
+  !insertmacro FILE_ASSOCIATION_REMOVE "igc"
-  DeleteRegKey HKCR ".kml"
+  !insertmacro FILE_ASSOCIATION_REMOVE "nmea"
-  DeleteRegKey HKCR "${REGFIT}"
+  !insertmacro FILE_ASSOCIATION_REMOVE "plt"
-  DeleteRegKey HKCR ".fit"
+  !insertmacro FILE_ASSOCIATION_REMOVE "rte"
-  DeleteRegKey HKCR "${REGIGC}"
+  !insertmacro FILE_ASSOCIATION_REMOVE "wpt"
-  DeleteRegKey HKCR ".igc"
+  !insertmacro FILE_ASSOCIATION_REMOVE "loc"
-  DeleteRegKey HKCR "${REGNMEA}"
+  !insertmacro FILE_ASSOCIATION_REMOVE "slf"
-  DeleteRegKey HKCR ".nmea"
-  DeleteRegKey HKCR "${REGPLT}"
-  DeleteRegKey HKCR ".plt"
-  DeleteRegKey HKCR "${REGRTE}"
-  DeleteRegKey HKCR ".rte"
-  DeleteRegKey HKCR "${REGWPT}"
-  DeleteRegKey HKCR ".wpt"
   System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
 
 SectionEnd

pkg/macros.nsh

@@ -0,0 +1,23 @@
+; File association
+!macro FILE_ASSOCIATION_ADD EXT DESC ICON
+  WriteRegStr HKCR ".${EXT}" "" "GPXSee.${EXT}"
+  WriteRegStr HKCR "GPXSee.${EXT}" ""  "${DESC}"
+  WriteRegStr HKCR "GPXSee.${EXT}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,${ICON}"
+  WriteRegStr HKCR "GPXSee.${EXT}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
+!macroend
+
+!macro FILE_ASSOCIATION_REMOVE EXT
+  DeleteRegKey HKCR "GPXSee.${EXT}"
+  DeleteRegKey HKCR ".${EXT}"
+!macroend
+
+; Translations
+!macro LOCALIZATION LANG CODE
+  Section "${LANG}"
+    CreateDirectory "$INSTDIR\translations"
+    File /oname=translations\gpxsee_${CODE}.qm translations\gpxsee_${CODE}.qm
+    !if /FileExists translations\qt_${CODE}.qm
+      File /oname=translations\qt_${CODE}.qm translations\qt_${CODE}.qm
+    !endif
+  SectionEnd
+!macroend

pkg/maps/4UMaps.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map xmlns="http://www.gpxsee.org/map/1">
 	<name>4UMaps</name>
-	<url>http://4umaps.eu/$z/$x/$y.png</url>
+	<url>https://4umaps.com/$z/$x/$y.png</url>
 	<copyright>Map data: © OpenStreetMap contributors (ODbL) | Rendering: © 4UMaps.eu</copyright>
 	<zoom min="2" max="15"/>
 	<bounds bottom="-65"/>

src/GUI/app.cpp

@@ -5,26 +5,37 @@
 #include <QNetworkProxyFactory>
 #include <QNetworkAccessManager>
 #include <QLibraryInfo>
+#include <QSettings>
+#include "common/programpaths.h"
+#include "common/config.h"
 #include "map/downloader.h"
 #include "map/ellipsoid.h"
 #include "map/gcs.h"
 #include "map/pcs.h"
 #include "opengl.h"
 #include "gui.h"
-#include "config.h"
+#include "settings.h"
 #include "app.h"
 
 
 App::App(int &argc, char **argv) : QApplication(argc, argv),
   _argc(argc), _argv(argv)
 {
+#if defined(Q_OS_WIN32) || defined(Q_OS_MAC)
+	setApplicationName(APP_NAME);
+#else
+	setApplicationName(QString(APP_NAME).toLower());
+#endif
+	setApplicationVersion(APP_VERSION);
+
 	QTranslator *gpxsee = new QTranslator(this);
-	gpxsee->load(QLocale::system(), "gpxsee", "_", TRANSLATIONS_DIR);
+	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", "_", TRANSLATIONS_DIR);
+	qt->load(QLocale::system(), "qt", "_", ProgramPaths::translationsDir());
 #else // Q_OS_WIN32 || Q_OS_MAC
 	qt->load(QLocale::system(), "qt", "_", QLibraryInfo::location(
 	  QLibraryInfo::TranslationsPath));
@@ -36,7 +47,21 @@ App::App(int &argc, char **argv) : QApplication(argc, argv),
 #endif // Q_OS_MAC
 
 	QNetworkProxyFactory::setUseSystemConfiguration(true);
-	Downloader::setNetworkAccessManager(new QNetworkAccessManager(this));
+	QSettings settings(APP_NAME, APP_NAME);
+	settings.beginGroup(OPTIONS_SETTINGS_GROUP);
+
+	/* The QNetworkAccessManager must be a child of QApplication, otherwise it
+	   triggers the following warning on exit (and may probably crash):
+	   "QThreadStorage: Thread X exited after QThreadStorage Y destroyed" */
+	Downloader::setNetworkManager(new QNetworkAccessManager(this));
+#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();
+
 	OPENGL_SET_SAMPLES(4);
 	loadDatums();
 	loadPCSs();
@@ -49,14 +74,15 @@ App::~App()
 	delete _gui;
 }
 
-void App::run()
+int App::run()
 {
 	_gui->show();
 
-	for (int i = 1; i < _argc; i++)
+	QStringList args(arguments());
-		_gui->openFile(QString::fromLocal8Bit(_argv[i]));
+	for (int i = 1; i < args.count(); i++)
+		_gui->openFile(args.at(i));
 
-	exec();
+	return exec();
 }
 
 bool App::event(QEvent *event)
@@ -71,41 +97,27 @@ bool App::event(QEvent *event)
 
 void App::loadDatums()
 {
-	QString ef, df;
+	QString ellipsoidsFile(ProgramPaths::ellipsoidsFile());
+	QString gcsFile(ProgramPaths::gcsFile());
 
-	if (QFile::exists(USER_ELLIPSOID_FILE))
+	if (ellipsoidsFile.isNull())
-		ef = USER_ELLIPSOID_FILE;
-	else if (QFile::exists(GLOBAL_ELLIPSOID_FILE))
-		ef = GLOBAL_ELLIPSOID_FILE;
-	else
 		qWarning("No ellipsoids file found.");
+	if (gcsFile.isNull())
+		qWarning("No GCS file found.");
 
-	if (QFile::exists(USER_GCS_FILE))
+	if (!ellipsoidsFile.isNull() && !gcsFile.isNull()) {
-		df = USER_GCS_FILE;
+		Ellipsoid::loadList(ellipsoidsFile);
-	else if (QFile::exists(GLOBAL_GCS_FILE))
+		GCS::loadList(gcsFile);
-		df = GLOBAL_GCS_FILE;
-	else
-		qWarning("No datums file found.");
-
-	if (!ef.isNull() && !df.isNull()) {
-		Ellipsoid::loadList(ef);
-		GCS::loadList(df);
 	} else
 		qWarning("Maps based on a datum different from WGS84 won't work.");
 }
 
 void App::loadPCSs()
 {
-	QString file;
+	QString pcsFile(ProgramPaths::pcsFile());
 
-	if (QFile::exists(USER_PCS_FILE))
+	if (pcsFile.isNull())
-		file = USER_PCS_FILE;
-	else if (QFile::exists(GLOBAL_PCS_FILE))
-		file = GLOBAL_PCS_FILE;
-	else {
 		qWarning("No PCS file found.");
-		return;
+	else
-	}
+		PCS::loadList(pcsFile);
-
-	PCS::loadList(file);
 }

src/GUI/app.h

@@ -12,7 +12,7 @@ class App : QApplication
 public:
 	App(int &argc, char **argv);
 	~App();
-	void run();
+	int run();
 
 protected:
 	bool event(QEvent *event);

src/GUI/axisitem.cpp

@@ -1,7 +1,7 @@
 #include <cmath>
 #include <QPainter>
-#include "config.h"
+#include "common/util.h"
-#include "nicenum.h"
+#include "font.h"
 #include "axisitem.h"
 
 
@@ -36,17 +36,14 @@ Ticks::Ticks(double minValue, double maxValue, int maxCount)
 }
 
 
-AxisItem::AxisItem(Type type, QGraphicsItem *parent) : QGraphicsItem(parent)
+AxisItem::AxisItem(Type type, QGraphicsItem *parent)
+  : QGraphicsItem(parent), _locale(QLocale::system())
 {
 	_type = type;
 	_size = 0;
 
 	_font.setPixelSize(FONT_SIZE);
 	_font.setFamily(FONT_FAMILY);
-
-#ifndef Q_OS_MAC
-	setCacheMode(QGraphicsItem::DeviceCoordinateCache);
-#endif // Q_OS_MAC
 }
 
 void AxisItem::setRange(const RangeF &range)
@@ -60,7 +57,7 @@ void AxisItem::setRange(const RangeF &range)
 	for (int i = 0; i < ticks.count(); i++) {
 		Tick &t = _ticks[i];
 		t.value = ticks.val(i);
-		t.boundingBox = fm.tightBoundingRect(QString::number(t.value));
+		t.boundingBox = fm.tightBoundingRect(_locale.toString(t.value));
 	}
 
 	updateBoundingRect();
@@ -130,7 +127,7 @@ void AxisItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
 			  TICK/2, (_size/_range.size()) * (val - _range.min()), -TICK/2);
 			painter->drawText(((_size/_range.size()) * (val - _range.min()))
 			  - (ts.width()/2), ts.height() + TICK/2 + PADDING,
-			  QString::number(val));
+			  _locale.toString(val));
 		}
 
 		painter->drawText(_size/2 - _labelBB.width()/2, _labelBB.height()
@@ -149,7 +146,7 @@ void AxisItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
 			  * (val - _range.min())));
 			painter->drawText(-(ts.width() + PADDING + TICK/2),
 			  -((_size/_range.size()) * (val - _range.min())) + (ts.height()/2),
-			  QString::number(val));
+			  _locale.toString(val));
 		}
 
 		painter->rotate(-90);

src/GUI/axisitem.h

@@ -3,6 +3,7 @@
 
 #include <QGraphicsItem>
 #include <QVector>
+#include <QLocale>
 #include "common/range.h"
 
 class AxisItem : public QGraphicsItem
@@ -39,6 +40,7 @@ private:
 	QVector<Tick> _ticks;
 	QRectF _boundingRect;
 	QFont _font;
+	QLocale _locale;
 };
 
 #endif // AXISITEM_H

src/GUI/cadencegraph.cpp

@@ -1,3 +1,4 @@
+#include <QLocale>
 #include "data/data.h"
 #include "cadencegraphitem.h"
 #include "cadencegraph.h"
@@ -7,7 +8,7 @@ CadenceGraph::CadenceGraph(QWidget *parent) : GraphTab(parent)
 {
 	_showTracks = true;
 
-	GraphView::setYUnits(tr("1/min"));
+	GraphView::setYUnits(tr("rpm"));
 	setYLabel(tr("Cadence"));
 
 	setSliderPrecision(1);
@@ -16,9 +17,11 @@ CadenceGraph::CadenceGraph(QWidget *parent) : GraphTab(parent)
 void CadenceGraph::setInfo()
 {
 	if (_showTracks) {
-		GraphView::addInfo(tr("Average"), QString::number(avg() * yScale()
+		QLocale l(QLocale::system());
+
+		GraphView::addInfo(tr("Average"), l.toString(avg() * yScale()
 		  + yOffset(), 'f', 1) + UNIT_SPACE + yUnits());
-		GraphView::addInfo(tr("Maximum"), QString::number(max() * yScale()
+		GraphView::addInfo(tr("Maximum"), l.toString(max() * yScale()
 		  + yOffset(),  'f', 1) + UNIT_SPACE + yUnits());
 	} else
 		clearInfo();

src/GUI/cadencegraphitem.cpp

@@ -1,13 +1,20 @@
+#include <QLocale>
 #include "tooltip.h"
 #include "cadencegraphitem.h"
 
+
 CadenceGraphItem::CadenceGraphItem(const Graph &graph, GraphType type,
   QGraphicsItem *parent) : GraphItem(graph, type, parent)
 {
 	qreal sum = 0;
+	_max = graph.first().y();
 
-	for (int j = 1; j < graph.size(); j++)
+	for (int i = 1; i < graph.size(); i++) {
-		sum += graph.at(j).y() * (graph.at(j).s() - graph.at(j-1).s());
+		qreal y = graph.at(i).y();
+		sum += y * (graph.at(i).s() - graph.at(i-1).s());
+		if (y > _max)
+			_max = y;
+	}
 	_avg = sum/graph.last().s();
 
 	setToolTip(toolTip());
@@ -16,11 +23,12 @@ CadenceGraphItem::CadenceGraphItem(const Graph &graph, GraphType type,
 QString CadenceGraphItem::toolTip() const
 {
 	ToolTip tt;
+	QLocale l(QLocale::system());
 
-	tt.insert(tr("Maximum"), QString::number(max(), 'f', 1)
+	tt.insert(tr("Maximum"), l.toString(max(), 'f', 1)
-	  + UNIT_SPACE + tr("1/min"));
+	  + UNIT_SPACE + tr("rpm"));
-	tt.insert(tr("Average"), QString::number(avg(), 'f', 1)
+	tt.insert(tr("Average"), l.toString(avg(), 'f', 1)
-	  + UNIT_SPACE + tr("1/min"));
+	  + UNIT_SPACE + tr("rpm"));
 
 	return tt.toString();
 }

src/GUI/cadencegraphitem.h

@@ -11,13 +11,13 @@ public:
 	CadenceGraphItem(const Graph &graph, GraphType type,
 	  QGraphicsItem *parent = 0);
 
-	qreal max() const {return -bounds().top();}
+	qreal max() const {return _max;}
 	qreal avg() const {return _avg;}
 
 private:
 	QString toolTip() const;
 
-	qreal _avg;
+	qreal _avg, _max;
 };
 
 #endif // CADENCEGRAPHITEM_H

src/GUI/elevationgraph.cpp

@@ -1,6 +1,6 @@
 #include <cmath>
+#include <QLocale>
 #include "data/data.h"
-#include "config.h"
 #include "tooltip.h"
 #include "elevationgraphitem.h"
 #include "elevationgraph.h"
@@ -54,13 +54,15 @@ void ElevationGraph::setInfo()
 	if (std::isnan(max()) || std::isnan(min()))
 		clearInfo();
 	else {
-		GraphView::addInfo(tr("Ascent"), QString::number(ascent() * yScale(),
+		QLocale l(QLocale::system());
+
+		GraphView::addInfo(tr("Ascent"), l.toString(ascent() * yScale(),
 		  'f', 0) + UNIT_SPACE + yUnits());
-		GraphView::addInfo(tr("Descent"), QString::number(descent() * yScale(),
+		GraphView::addInfo(tr("Descent"), l.toString(descent() * yScale(),
 		  'f', 0) + UNIT_SPACE + yUnits());
-		GraphView::addInfo(tr("Maximum"), QString::number(max() * yScale(), 'f',
+		GraphView::addInfo(tr("Maximum"), l.toString(max() * yScale(), 'f',
 		  0) + UNIT_SPACE + yUnits());
-		GraphView::addInfo(tr("Minimum"), QString::number(min() * yScale(), 'f',
+		GraphView::addInfo(tr("Minimum"), l.toString(min() * yScale(), 'f',
 		  0) + UNIT_SPACE + yUnits());
 	}
 }

src/GUI/elevationgraphitem.cpp

@@ -1,10 +1,13 @@
+#include <QLocale>
 #include "tooltip.h"
 #include "elevationgraphitem.h"
 
+
 ElevationGraphItem::ElevationGraphItem(const Graph &graph, GraphType type,
   QGraphicsItem *parent) : GraphItem(graph, type, parent)
 {
 	_ascent = _descent = 0;
+	_min = _max = graph.first().y();
 
 	for (int j = 1; j < graph.size(); j++) {
 		qreal cur = graph.at(j).y();
@@ -14,6 +17,11 @@ ElevationGraphItem::ElevationGraphItem(const Graph &graph, GraphType type,
 			_ascent += cur - prev;
 		if (cur < prev)
 			_descent += prev - cur;
+
+		if (cur < _min)
+			_min = cur;
+		if (cur > _max)
+			_max = cur;
 	}
 
 	setToolTip(toolTip(Metric));
@@ -24,14 +32,15 @@ QString ElevationGraphItem::toolTip(Units units) const
 	ToolTip tt;
 	qreal scale = (units == Metric) ? 1.0 : M2FT;
 	QString su = (units == Metric) ? tr("m") : tr("ft");
+	QLocale l(QLocale::system());
 
-	tt.insert(tr("Ascent"), QString::number(ascent() * scale, 'f', 0)
+	tt.insert(tr("Ascent"), l.toString(ascent() * scale, 'f', 0)
 	  + UNIT_SPACE + su);
-	tt.insert(tr("Descent"), QString::number(descent() * scale, 'f', 0)
+	tt.insert(tr("Descent"), l.toString(descent() * scale, 'f', 0)
 	  + UNIT_SPACE + su);
-	tt.insert(tr("Maximum"), QString::number(max() * scale, 'f', 0)
+	tt.insert(tr("Maximum"), l.toString(max() * scale, 'f', 0)
 	  + UNIT_SPACE + su);
-	tt.insert(tr("Minimum"), QString::number(min() * scale, 'f', 0)
+	tt.insert(tr("Minimum"), l.toString(min() * scale, 'f', 0)
 	  + UNIT_SPACE + su);
 
 	return tt.toString();

src/GUI/elevationgraphitem.h

@@ -13,15 +13,15 @@ public:
 
 	qreal ascent() const {return _ascent;}
 	qreal descent() const {return _descent;}
-	qreal min() const {return -bounds().bottom();}
+	qreal min() const {return _min;}
-	qreal max() const {return -bounds().top();}
+	qreal max() const {return _max;}
 
 	void setUnits(Units units);
 
 private:
 	QString toolTip(Units units) const;
 
-	qreal _ascent, _descent;
+	qreal _ascent, _descent, _min, _max;
 };
 
 #endif // ELEVATIONGRAPHITEM_H

src/GUI/exportdialog.cpp

@@ -22,7 +22,8 @@ ExportDialog::ExportDialog(Export *exp, QWidget *parent)
 	int index;
 
 	_fileSelect = new FileSelectWidget();
-	_fileSelect->setFilter(tr("PDF files (*.pdf);;All files (*)"));
+	_fileSelect->setFilter(tr("PDF files") + " (*.pdf);;" + tr("All files")
+	  + " (*)");
 	_fileSelect->setFile(_export->fileName);
 
 	_paperSize = new QComboBox();

src/GUI/filebrowser.cpp

@@ -13,11 +13,6 @@ FileBrowser::FileBrowser(QObject *parent) : QObject(parent)
 	_index = -1;
 }
 
-FileBrowser::~FileBrowser()
-{
-	delete _watcher;
-}
-
 void FileBrowser::setCurrent(const QString &path)
 {
 	QFileInfo file(path);

src/GUI/filebrowser.h

@@ -13,7 +13,6 @@ class FileBrowser : public QObject
 
 public:
 	FileBrowser(QObject *parent = 0);
-	~FileBrowser();
 
 	void setFilter(const QStringList &filter);
 	void setCurrent(const QString &path);

src/GUI/font.h

@@ -0,0 +1,7 @@
+#ifndef FONT_H
+#define FONT_H
+
+#define FONT_FAMILY     "Arial"
+#define FONT_SIZE       12 // px
+
+#endif // FONT_H

src/GUI/format.cpp

@@ -46,37 +46,41 @@ QString Format::timeSpan(qreal time, bool full)
 
 QString Format::distance(qreal value, Units units)
 {
+	QLocale l(QLocale::system());
+
 	if (units == Imperial) {
 		if (value < MIINM)
-			return QString::number(value * M2FT, 'f', 0) + UNIT_SPACE
+			return l.toString(value * M2FT, 'f', 0) + UNIT_SPACE
 			  + qApp->translate("Format", "ft");
 		else
-			return QString::number(value * M2MI, 'f', 1) + UNIT_SPACE
+			return l.toString(value * M2MI, 'f', 1) + UNIT_SPACE
 			  + qApp->translate("Format", "mi");
 	} else if (units == Nautical) {
 		if (value < NMIINM)
-			return QString::number(value * M2FT, 'f', 0) + UNIT_SPACE
+			return l.toString(value * M2FT, 'f', 0) + UNIT_SPACE
 			  + qApp->translate("Format", "ft");
 		else
-			return QString::number(value * M2NMI, 'f', 1) + UNIT_SPACE
+			return l.toString(value * M2NMI, 'f', 1) + UNIT_SPACE
 			  + qApp->translate("Format", "nmi");
 	} else {
 		if (value < KMINM)
-			return QString::number(value, 'f', 0) + UNIT_SPACE
+			return l.toString(value, 'f', 0) + UNIT_SPACE
 			  + qApp->translate("Format", "m");
 		else
-			return QString::number(value * M2KM, 'f', 1) + UNIT_SPACE
+			return l.toString(value * M2KM, 'f', 1) + UNIT_SPACE
 			  + qApp->translate("Format", "km");
 	}
 }
 
 QString Format::elevation(qreal value, Units units)
 {
+	QLocale l(QLocale::system());
+
 	if (units == Metric)
-		return QString::number(qRound(value)) + UNIT_SPACE
+		return l.toString(qRound(value)) + UNIT_SPACE
 		  + qApp->translate("Format", "m");
 	else
-		return QString::number(qRound(value * M2FT)) + UNIT_SPACE
+		return l.toString(qRound(value * M2FT)) + UNIT_SPACE
 		  + qApp->translate("Format", "ft");
 }
 
@@ -95,7 +99,8 @@ QString Format::coordinates(const Coordinates &value, CoordinatesFormat type)
 			  + deg2DMS(qAbs(value.lon())) + xH;
 			break;
 		default:
-			return QString::number(qAbs(value.lat()), 'f', 5) + yH + ","
+			QLocale l(QLocale::system());
-			  + QChar(0x00A0) + QString::number(qAbs(value.lon()), 'f', 5) + xH;
+			return l.toString(qAbs(value.lat()), 'f', 5) + yH + ","
+			+ QChar(0x00A0) + l.toString(qAbs(value.lon()), 'f', 5) + xH;
 	}
 }

src/GUI/gearratiograph.cpp

@@ -0,0 +1,97 @@
+#include <QLocale>
+#include "data/data.h"
+#include "gearratiographitem.h"
+#include "gearratiograph.h"
+
+
+GearRatioGraph::GearRatioGraph(QWidget *parent) : GraphTab(parent)
+{
+	_showTracks = true;
+
+	GraphView::setYUnits("");
+	setYLabel(tr("Gear ratio"));
+
+	setSliderPrecision(2);
+}
+
+void GearRatioGraph::setInfo()
+{
+	if (_showTracks) {
+		QLocale l(QLocale::system());
+
+		GraphView::addInfo(tr("Most used"), l.toString(top() * yScale(),
+		  'f', 2) + UNIT_SPACE + yUnits());
+		GraphView::addInfo(tr("Minimum"), l.toString(min() * yScale(), 'f',
+		  2) + UNIT_SPACE + yUnits());
+		GraphView::addInfo(tr("Maximum"), l.toString(max() * yScale(), 'f',
+		  2) + UNIT_SPACE + yUnits());
+	} else
+		clearInfo();
+}
+
+QList<GraphItem*> GearRatioGraph::loadData(const Data &data)
+{
+	QList<GraphItem*> graphs;
+
+	for (int i = 0; i < data.tracks().count(); i++) {
+		const Graph &graph = data.tracks().at(i)->ratio();
+
+		if (graph.size() < 2) {
+			skipColor();
+			graphs.append(0);
+		} else {
+			GearRatioGraphItem *gi = new GearRatioGraphItem(graph, _graphType);
+			GraphView::addGraph(gi);
+
+			for (QMap<qreal, qreal>::const_iterator it = gi->map().constBegin();
+			  it != gi->map().constEnd(); ++it)
+				_map.insert(it.key(), _map.value(it.key()) + it.value());
+			graphs.append(gi);
+		}
+	}
+
+	for (int i = 0; i < data.routes().count(); i++) {
+		skipColor();
+		graphs.append(0);
+	}
+
+	setInfo();
+	redraw();
+
+	return graphs;
+}
+
+qreal GearRatioGraph::top() const
+{
+	qreal key = NAN, val = NAN;
+
+	for (QMap<qreal, qreal>::const_iterator it = _map.constBegin();
+	  it != _map.constEnd(); ++it) {
+		if (it == _map.constBegin()) {
+			val = it.value();
+			key = it.key();
+		} else if (it.value() > val) {
+			val = it.value();
+			key = it.key();
+		}
+	}
+
+	return key;
+}
+
+void GearRatioGraph::clear()
+{
+	_map.clear();
+
+	GraphView::clear();
+}
+
+void GearRatioGraph::showTracks(bool show)
+{
+	_showTracks = show;
+
+	showGraph(show);
+	setInfo();
+
+	redraw();
+}

src/GUI/gearratiograph.h

@@ -0,0 +1,30 @@
+#ifndef GEARRATIOGRAPH_H
+#define GEARRATIOGRAPH_H
+
+#include <QMap>
+#include "graphtab.h"
+
+class GearRatioGraph : public GraphTab
+{
+	Q_OBJECT
+
+public:
+	GearRatioGraph(QWidget *parent = 0);
+
+	QString label() const {return tr("Gear ratio");}
+	QList<GraphItem*> loadData(const Data &data);
+	void clear();
+	void showTracks(bool show);
+
+private:
+	qreal top() const;
+	qreal min() const {return bounds().top();}
+	qreal max() const {return bounds().bottom();}
+	void setInfo();
+
+	QMap<qreal, qreal> _map;
+
+	bool _showTracks;
+};
+
+#endif // GEARRATIOGRAPH_H