Code cleanup

Update PL translation (#165 )
Update gpxsee_pl.ts
2025-07-03 14:29:16 +02:00 · 2018-10-11 18:19:35 +02:00 · 2018-10-10 23:24:08 +02:00 · 2018-10-09 22:59:20 +02:00 · 2018-10-09 22:48:21 +02:00 · 2018-10-09 22:46:28 +02:00
181 changed files with 9039 additions and 3770 deletions
--- a/.appveyor.yml
+++ b/.appveyor.yml
@ -1,4 +1,4 @@
-version: 5.16.{build}
+version: 6.3.{build}
 configuration: Release
 platform: Any CPU
 environment:
@ -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
--- a/README.md
+++ b/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).
-* Offline maps (OziExplorer maps, TrekBuddy maps/atlases, Garmin JNX maps, GeoTIFF images).
+* User-definable online maps (OpenStreetMap/Google tiles, WMTS, WMS, TMS).
+* Offline maps (MBTiles, OziExplorer maps, TrekBuddy maps/atlases, Garmin JNX maps, GeoTIFF images).
 * 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.
--- a/gpxsee.pro
+++ b/gpxsee.pro
@ -1,9 +1,10 @@
 TARGET = GPXSee
-VERSION = 5.16
+VERSION = 6.3

 QT += core \
    gui \
-    network
+    network \
+    sql
 greaterThan(QT_MAJOR_VERSION, 4) {
    QT += widgets
    QT += printsupport
@ -18,8 +19,9 @@ HEADERS += src/config.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/GUI/app.h \
    src/GUI/icons.h \
    src/GUI/gui.h \
@ -69,7 +71,6 @@ HEADERS += src/config.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 \
@ -89,7 +90,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 \
@ -137,12 +138,18 @@ HEADERS += src/config.h \
    src/map/mercator.h \
    src/map/jnxmap.h \
    src/map/krovak.h \
-    src/GUI/kv.h
+    src/data/locparser.h \
+    src/data/slfparser.h \
+    src/map/geotiffmap.h \
+    src/map/image.h \
+    src/common/greatcircle.h \
+    src/map/mbtilesmap.h \
+    src/map/osm.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/GUI/app.cpp \
    src/GUI/gui.cpp \
    src/GUI/axisitem.cpp \
@ -184,13 +191,12 @@ SOURCES += src/main.cpp \
    src/GUI/cadencegraphitem.cpp \
    src/GUI/powergraphitem.cpp \
    src/GUI/gearratiographitem.cpp \
-    src/GUI/nicenum.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 \
@ -238,28 +244,41 @@ SOURCES += src/main.cpp \
    src/map/mercator.cpp \
    src/map/jnxmap.cpp \
    src/map/krovak.cpp \
-    src/map/map.cpp
+    src/map/map.cpp \
+    src/data/locparser.cpp \
+    src/data/slfparser.cpp \
+    src/map/geotiffmap.cpp \
+    src/map/image.cpp \
+    src/common/greatcircle.cpp \
+    src/map/mbtilesmap.cpp \
+    src/map/osm.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

 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
    CSV.path = Contents/Resources
    CSV.files = pkg/csv
    MAPS.path = Contents/Resources
@ -273,7 +292,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 {
@ -286,8 +307,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
--- a/gpxsee.qrc
+++ b/gpxsee.qrc
@ -1,24 +1,46 @@
 <RCC>
-    <qresource prefix="/">
-        <file>icons/dialog-close.png</file>
-        <file>icons/document-open.png</file>
-        <file>icons/document-print.png</file>
-        <file>icons/document-export.png</file>
-        <file>icons/flag.png</file>
-        <file>icons/gpxsee.png</file>
-        <file>icons/application-exit.png</file>
-        <file>icons/applications-internet.png</file>
-        <file>icons/view-refresh.png</file>
-        <file>icons/arrow-left.png</file>
-        <file>icons/arrow-right.png</file>
-        <file>icons/arrow-left-double.png</file>
-        <file>icons/arrow-right-double.png</file>
-        <file>icons/view-fullscreen.png</file>
-        <file>icons/office-chart-line.png</file>
-        <file>icons/preferences-desktop-display.png</file>
-        <file>icons/flag_48.png</file>
-        <file>icons/system-run.png</file>
-        <file>icons/document-print-preview.png</file>
-        <file>icons/view-filter.png</file>
-    </qresource>
+	<qresource prefix="/">
+		<file>icons/dialog-close.png</file>
+		<file>icons/dialog-close@2x.png</file>
+		<file>icons/document-open.png</file>
+		<file>icons/document-open@2x.png</file>
+		<file>icons/document-print.png</file>
+		<file>icons/document-print@2x.png</file>
+		<file>icons/document-export.png</file>
+		<file>icons/document-export@2x.png</file>
+		<file>icons/flag.png</file>
+		<file>icons/flag@2x.png</file>
+		<file>icons/gpxsee.png</file>
+		<file>icons/gpxsee@2x.png</file>
+		<file>icons/application-exit.png</file>
+		<file>icons/application-exit@2x.png</file>
+		<file>icons/applications-internet.png</file>
+		<file>icons/applications-internet@2x.png</file>
+		<file>icons/view-refresh.png</file>
+		<file>icons/view-refresh@2x.png</file>
+		<file>icons/arrow-left.png</file>
+		<file>icons/arrow-left@2x.png</file>
+		<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>
--- a/icons/application-exit@2x.png
+++ b/icons/application-exit@2x.png
--- a/icons/applications-internet@2x.png
+++ b/icons/applications-internet@2x.png
--- a/icons/applications-internet_32.png
+++ b/icons/applications-internet_32.png
--- a/icons/applications-internet_32@2x.png
+++ b/icons/applications-internet_32@2x.png
--- a/icons/arrow-left-double@2x.png
+++ b/icons/arrow-left-double@2x.png
--- a/icons/arrow-left@2x.png
+++ b/icons/arrow-left@2x.png
--- a/icons/arrow-right-double@2x.png
+++ b/icons/arrow-right-double@2x.png
--- a/icons/arrow-right@2x.png
+++ b/icons/arrow-right@2x.png
--- a/icons/dialog-close@2x.png
+++ b/icons/dialog-close@2x.png
--- a/icons/document-export@2x.png
+++ b/icons/document-export@2x.png
--- a/icons/document-open.png
+++ b/icons/document-open.png
--- a/icons/document-open@2x.png
+++ b/icons/document-open@2x.png
--- a/icons/document-print-preview.png
+++ b/icons/document-print-preview.png
--- a/icons/document-print@2x.png
+++ b/icons/document-print@2x.png
--- a/icons/document-print_32.png
+++ b/icons/document-print_32.png
--- a/icons/document-print_32@2x.png
+++ b/icons/document-print_32@2x.png
--- a/icons/fit.icns
+++ b/icons/fit.icns
--- a/icons/fit.ico
+++ b/icons/fit.ico
--- a/icons/flag@2x.png
+++ b/icons/flag@2x.png
--- a/icons/flag_32.png
+++ b/icons/flag_32.png
--- a/icons/flag_32@2x.png
+++ b/icons/flag_32@2x.png
--- a/icons/flag_48.png
+++ b/icons/flag_48.png
--- a/icons/format-stroke-color.png
+++ b/icons/format-stroke-color.png
--- a/icons/format-stroke-color@2x.png
+++ b/icons/format-stroke-color@2x.png
--- a/icons/gpx.icns
+++ b/icons/gpx.icns
--- a/icons/gpx.ico
+++ b/icons/gpx.ico
--- a/icons/gpxsee@2x.png
+++ b/icons/gpxsee@2x.png
--- a/icons/igc.icns
+++ b/icons/igc.icns
--- a/icons/igc.ico
+++ b/icons/igc.ico
--- a/icons/kml.icns
+++ b/icons/kml.icns
--- a/icons/kml.ico
+++ b/icons/kml.ico
--- a/icons/loc.icns
+++ b/icons/loc.icns
--- a/icons/loc.ico
+++ b/icons/loc.ico
--- a/icons/nmea.icns
+++ b/icons/nmea.icns
--- a/icons/nmea.ico
+++ b/icons/nmea.ico
--- a/icons/office-chart-line@2x.png
+++ b/icons/office-chart-line@2x.png
--- a/icons/plt.icns
+++ b/icons/plt.icns
--- a/icons/plt.ico
+++ b/icons/plt.ico
--- a/icons/preferences-desktop-display.png
+++ b/icons/preferences-desktop-display.png
--- a/icons/preferences-system.png
+++ b/icons/preferences-system.png
--- a/icons/preferences-system@2x.png
+++ b/icons/preferences-system@2x.png
--- a/icons/rte.icns
+++ b/icons/rte.icns
--- a/icons/rte.ico
+++ b/icons/rte.ico
--- a/icons/scripts/extensions
+++ b/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
--- a/icons/scripts/icns.sh
+++ b/icons/scripts/icns.sh
@ -1,9 +1,6 @@
 #!/bin/bash

-EXTENSIONS="fit:#006600 gpx:#003399 igc:#ff3300 kml:#990000 nmea:#0083d7 \
-  plt:#66ff00 rte:#66ff00 tcx:#ffcc00 wpt:#66ff00"
-
-for e in $EXTENSIONS; do
+while read e; 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
--- a/icons/scripts/ico.sh
+++ b/icons/scripts/ico.sh
@ -1,13 +1,10 @@
 #!/bin/bash

-EXTENSIONS="fit:#006600 gpx:#003399 igc:#ff3300 kml:#990000 nmea:#0083d7 \
-  plt:#66ff00 rte:#66ff00 tcx:#ffcc00 wpt:#66ff00"
-
-for e in $EXTENSIONS; do
+while read e; 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
--- a/icons/scripts/icon-template.svg
+++ b/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>
--- a/icons/slf.icns
+++ b/icons/slf.icns
--- a/icons/slf.ico
+++ b/icons/slf.ico
--- a/icons/system-run.png
+++ b/icons/system-run.png
--- a/icons/tcx.icns
+++ b/icons/tcx.icns
--- a/icons/tcx.ico
+++ b/icons/tcx.ico
--- a/icons/view-filter.png
+++ b/icons/view-filter.png
--- a/icons/view-filter@2x.png
+++ b/icons/view-filter@2x.png
--- a/icons/view-fullscreen@2x.png
+++ b/icons/view-fullscreen@2x.png
--- a/icons/view-refresh@2x.png
+++ b/icons/view-refresh@2x.png
--- a/icons/wpt.icns
+++ b/icons/wpt.icns
--- a/icons/wpt.ico
+++ b/icons/wpt.ico
--- a/lang/gpxsee_cs.ts
+++ b/lang/gpxsee_cs.ts
--- a/lang/gpxsee_da.ts
+++ b/lang/gpxsee_da.ts
--- a/lang/gpxsee_de.ts
+++ b/lang/gpxsee_de.ts
--- a/lang/gpxsee_en.ts
+++ b/lang/gpxsee_en.ts
@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="en_US">
+<context>
+    <name>GUI</name>
+    <message numerus="yes">
+        <source>%n files</source>
+        <translation type="vanished">
+            <numerusform>%n file</numerusform>
+            <numerusform>%n files</numerusform>
+        </translation>
+    </message>
+</context>
+</TS>
--- a/lang/gpxsee_fi.ts
+++ b/lang/gpxsee_fi.ts
--- a/lang/gpxsee_fr.ts
+++ b/lang/gpxsee_fr.ts
--- a/lang/gpxsee_nb.ts
+++ b/lang/gpxsee_nb.ts
--- a/lang/gpxsee_pl.ts
+++ b/lang/gpxsee_pl.ts
--- a/lang/gpxsee_ru.ts
+++ b/lang/gpxsee_ru.ts
--- a/lang/gpxsee_sv.ts
+++ b/lang/gpxsee_sv.ts
--- a/pkg/Info.plist
+++ b/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>
--- a/pkg/appdata.xml
+++ b/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>Offline maps (OziExplorer maps, TrekBuddy maps/atlases, GeoTIFF
-				images).</li>
+			<li>User-definable online maps (OpenStreetMap/Google tiles, WMTS,
+				WMS, TMS).</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)
-				and Garmin CSV files.</li>
+			<li>HiDPI/Retina displays &amp; maps support.</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>
--- a/pkg/csv/pcs.csv
+++ b/pkg/csv/pcs.csv
@ -1847,6 +1847,7 @@ RSRGD2000 / PCLC2000,5481,4764,5477,9001,9802,4500,8821,-71.3,9110,8822,166,9110
 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,,,,,,
--- a/pkg/gpxsee.desktop
+++ b/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;
--- a/pkg/gpxsee.nsi
+++ b/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.16"
+!define VERSION "6.3"

 ; 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}"
-  WriteRegStr HKCR "${REGGPX}" ""  "GPS Exchange Format"
-  WriteRegStr HKCR "${REGGPX}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,2"
-  WriteRegStr HKCR "${REGGPX}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
-  WriteRegStr HKCR ".tcx" "" "${REGTCX}"
-  WriteRegStr HKCR "${REGTCX}" ""  "Training Center XML"
-  WriteRegStr HKCR "${REGTCX}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,3"
-  WriteRegStr HKCR "${REGTCX}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
-  WriteRegStr HKCR ".kml" "" "${REGKML}"
-  WriteRegStr HKCR "${REGKML}" ""  "Keyhole Markup Language"
-  WriteRegStr HKCR "${REGKML}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,4"
-  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$\""
-
+  !insertmacro FILE_ASSOCIATION_ADD "gpx" "GPS Exchange Format" 4
+  !insertmacro FILE_ASSOCIATION_ADD "tcx" "Training Center XML" 5
+  !insertmacro FILE_ASSOCIATION_ADD "kml" "Keyhole Markup Language" 6
+  !insertmacro FILE_ASSOCIATION_ADD "fit" "Flexible and Interoperable Data Transfer" 7
+  !insertmacro FILE_ASSOCIATION_ADD "igc" "Flight Recorder Data Format" 8
+  !insertmacro FILE_ASSOCIATION_ADD "nmea" "NMEA 0183 data" 9
+  !insertmacro FILE_ASSOCIATION_ADD "plt" "OziExplorer Track Point File" 10
+  !insertmacro FILE_ASSOCIATION_ADD "rte" "OziExplorer Route File" 11
+  !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
  System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'

 SectionEnd
@ -164,10 +130,12 @@ Section "QT framework" SEC_QT
  File "Qt5Widgets.dll"
  File "Qt5PrintSupport.dll"
  File "Qt5Network.dll"
+  File "Qt5Sql.dll"
  File /r "platforms"
  File /r "imageformats"
  File /r "printsupport"
  File /r "styles"
+  File /r "sqldrivers"

 SectionEnd

@ -211,40 +179,15 @@ Section "ANGLE" SEC_ANGLE
 SectionEnd

 SectionGroup "Localization" SEC_LOCALIZATION
-  Section "Czech"
-    CreateDirectory "$INSTDIR\translations"
-    File /oname=translations\gpxsee_cs.qm translations\gpxsee_cs.qm
-    File /oname=translations\qt_cs.qm translations\qt_cs.qm
-  SectionEnd
-  Section "Finnish"
-    CreateDirectory "$INSTDIR\translations"
-    File /oname=translations\gpxsee_fi.qm translations\gpxsee_fi.qm
-    File /oname=translations\qt_fi.qm translations\qt_fi.qm
-  SectionEnd
-  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
+  !insertmacro LOCALIZATION "Czech" "cs"
+  !insertmacro LOCALIZATION "Danish" "da"
+  !insertmacro LOCALIZATION "Finnish" "fi"
+  !insertmacro LOCALIZATION "French" "fr"
+  !insertmacro LOCALIZATION "German" "de"
+  !insertmacro LOCALIZATION "Norwegian" "nb"
+  !insertmacro LOCALIZATION "Polish" "pl"
+  !insertmacro LOCALIZATION "Russian" "ru"
+  !insertmacro LOCALIZATION "Swedish" "sv"
 SectionGroupEnd

 ;--------------------------------
@ -267,24 +210,17 @@ Section "Uninstall"
  RMDir "$SMPROGRAMS\$StartMenuFolder"

  ; Remove GPX file association
-  DeleteRegKey HKCR "${REGGPX}"
-  DeleteRegKey HKCR ".gpx"
-  DeleteRegKey HKCR "${REGTCX}"
-  DeleteRegKey HKCR ".tcx"
-  DeleteRegKey HKCR "${REGKML}"
-  DeleteRegKey HKCR ".kml"
-  DeleteRegKey HKCR "${REGFIT}"
-  DeleteRegKey HKCR ".fit"
-  DeleteRegKey HKCR "${REGIGC}"
-  DeleteRegKey HKCR ".igc"
-  DeleteRegKey HKCR "${REGNMEA}"
-  DeleteRegKey HKCR ".nmea"
-  DeleteRegKey HKCR "${REGPLT}"
-  DeleteRegKey HKCR ".plt"
-  DeleteRegKey HKCR "${REGRTE}"
-  DeleteRegKey HKCR ".rte"
-  DeleteRegKey HKCR "${REGWPT}"
-  DeleteRegKey HKCR ".wpt"
+  !insertmacro FILE_ASSOCIATION_REMOVE "gpx"
+  !insertmacro FILE_ASSOCIATION_REMOVE "tcx"
+  !insertmacro FILE_ASSOCIATION_REMOVE "kml"
+  !insertmacro FILE_ASSOCIATION_REMOVE "fit"
+  !insertmacro FILE_ASSOCIATION_REMOVE "igc"
+  !insertmacro FILE_ASSOCIATION_REMOVE "nmea"
+  !insertmacro FILE_ASSOCIATION_REMOVE "plt"
+  !insertmacro FILE_ASSOCIATION_REMOVE "rte"
+  !insertmacro FILE_ASSOCIATION_REMOVE "wpt"
+  !insertmacro FILE_ASSOCIATION_REMOVE "loc"
+  !insertmacro FILE_ASSOCIATION_REMOVE "slf"
  System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'

 SectionEnd
@ -315,4 +251,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
--- a/pkg/gpxsee.xml
+++ b/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"/>
--- a/pkg/gpxsee64.nsi
+++ b/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.16"
+!define VERSION "6.3"

 ; 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}"
-  WriteRegStr HKCR "${REGGPX}" ""  "GPS Exchange Format"
-  WriteRegStr HKCR "${REGGPX}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,2"
-  WriteRegStr HKCR "${REGGPX}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
-  WriteRegStr HKCR ".tcx" "" "${REGTCX}"
-  WriteRegStr HKCR "${REGTCX}" ""  "Training Center XML"
-  WriteRegStr HKCR "${REGTCX}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,3"
-  WriteRegStr HKCR "${REGTCX}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
-  WriteRegStr HKCR ".kml" "" "${REGKML}"
-  WriteRegStr HKCR "${REGKML}" ""  "Keyhole Markup Language"
-  WriteRegStr HKCR "${REGKML}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,4"
-  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$\""
-
+  !insertmacro FILE_ASSOCIATION_ADD "gpx" "GPS Exchange Format" 4
+  !insertmacro FILE_ASSOCIATION_ADD "tcx" "Training Center XML" 5
+  !insertmacro FILE_ASSOCIATION_ADD "kml" "Keyhole Markup Language" 6
+  !insertmacro FILE_ASSOCIATION_ADD "fit" "Flexible and Interoperable Data Transfer" 7
+  !insertmacro FILE_ASSOCIATION_ADD "igc" "Flight Recorder Data Format" 8
+  !insertmacro FILE_ASSOCIATION_ADD "nmea" "NMEA 0183 data" 9
+  !insertmacro FILE_ASSOCIATION_ADD "plt" "OziExplorer Track Point File" 10
+  !insertmacro FILE_ASSOCIATION_ADD "rte" "OziExplorer Route File" 11
+  !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
  System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'

 SectionEnd
@ -171,10 +137,12 @@ Section "QT framework" SEC_QT
  File "Qt5Widgets.dll"
  File "Qt5PrintSupport.dll"
  File "Qt5Network.dll"
+  File "Qt5Sql.dll"
  File /r "platforms"
  File /r "imageformats"
  File /r "printsupport"
  File /r "styles"
+  File /r "sqldrivers"

 SectionEnd

@ -213,40 +181,15 @@ Section "ANGLE" SEC_ANGLE
 SectionEnd

 SectionGroup "Localization" SEC_LOCALIZATION
-  Section "Czech"
-    CreateDirectory "$INSTDIR\translations"
-    File /oname=translations\gpxsee_cs.qm translations\gpxsee_cs.qm
-    File /oname=translations\qt_cs.qm translations\qt_cs.qm
-  SectionEnd
-  Section "Finnish"
-    CreateDirectory "$INSTDIR\translations"
-    File /oname=translations\gpxsee_fi.qm translations\gpxsee_fi.qm
-    File /oname=translations\qt_fi.qm translations\qt_fi.qm
-  SectionEnd
-  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
+  !insertmacro LOCALIZATION "Czech" "cs"
+  !insertmacro LOCALIZATION "Danish" "da"
+  !insertmacro LOCALIZATION "Finnish" "fi"
+  !insertmacro LOCALIZATION "French" "fr"
+  !insertmacro LOCALIZATION "German" "de"
+  !insertmacro LOCALIZATION "Norwegian" "nb"
+  !insertmacro LOCALIZATION "Polish" "pl"
+  !insertmacro LOCALIZATION "Russian" "ru"
+  !insertmacro LOCALIZATION "Swedish" "sv"
 SectionGroupEnd

 ;--------------------------------
@ -270,24 +213,17 @@ Section "Uninstall"
  RMDir "$SMPROGRAMS\$StartMenuFolder"

  ; Remove File associations
-  DeleteRegKey HKCR "${REGGPX}"
-  DeleteRegKey HKCR ".gpx"
-  DeleteRegKey HKCR "${REGTCX}"
-  DeleteRegKey HKCR ".tcx"
-  DeleteRegKey HKCR "${REGKML}"
-  DeleteRegKey HKCR ".kml"
-  DeleteRegKey HKCR "${REGFIT}"
-  DeleteRegKey HKCR ".fit"
-  DeleteRegKey HKCR "${REGIGC}"
-  DeleteRegKey HKCR ".igc"
-  DeleteRegKey HKCR "${REGNMEA}"
-  DeleteRegKey HKCR ".nmea"
-  DeleteRegKey HKCR "${REGPLT}"
-  DeleteRegKey HKCR ".plt"
-  DeleteRegKey HKCR "${REGRTE}"
-  DeleteRegKey HKCR ".rte"
-  DeleteRegKey HKCR "${REGWPT}"
-  DeleteRegKey HKCR ".wpt"
+  !insertmacro FILE_ASSOCIATION_REMOVE "gpx"
+  !insertmacro FILE_ASSOCIATION_REMOVE "tcx"
+  !insertmacro FILE_ASSOCIATION_REMOVE "kml"
+  !insertmacro FILE_ASSOCIATION_REMOVE "fit"
+  !insertmacro FILE_ASSOCIATION_REMOVE "igc"
+  !insertmacro FILE_ASSOCIATION_REMOVE "nmea"
+  !insertmacro FILE_ASSOCIATION_REMOVE "plt"
+  !insertmacro FILE_ASSOCIATION_REMOVE "rte"
+  !insertmacro FILE_ASSOCIATION_REMOVE "wpt"
+  !insertmacro FILE_ASSOCIATION_REMOVE "loc"
+  !insertmacro FILE_ASSOCIATION_REMOVE "slf"
  System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'

 SectionEnd
@ -318,4 +254,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
--- a/pkg/macros.nsh
+++ b/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
--- a/src/GUI/app.cpp
+++ b/src/GUI/app.cpp
@ -5,6 +5,7 @@
 #include <QNetworkProxyFactory>
 #include <QNetworkAccessManager>
 #include <QLibraryInfo>
+#include <QSettings>
 #include "map/downloader.h"
 #include "map/ellipsoid.h"
 #include "map/gcs.h"
@ -12,6 +13,7 @@
 #include "opengl.h"
 #include "gui.h"
 #include "config.h"
+#include "settings.h"
 #include "app.h"


@ -36,7 +38,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();
--- a/src/GUI/axisitem.cpp
+++ b/src/GUI/axisitem.cpp
@ -1,7 +1,7 @@
 #include <cmath>
 #include <QPainter>
+#include "common/util.h"
 #include "config.h"
-#include "nicenum.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);
--- a/src/GUI/axisitem.h
+++ b/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
--- a/src/GUI/cadencegraph.cpp
+++ b/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();
--- a/src/GUI/cadencegraphitem.cpp
+++ b/src/GUI/cadencegraphitem.cpp
@ -1,6 +1,8 @@
+#include <QLocale>
 #include "tooltip.h"
 #include "cadencegraphitem.h"

+
 CadenceGraphItem::CadenceGraphItem(const Graph &graph, GraphType type,
  QGraphicsItem *parent) : GraphItem(graph, type, parent)
 {
@ -16,11 +18,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)
-	  + UNIT_SPACE + tr("1/min"));
-	tt.insert(tr("Average"), QString::number(avg(), 'f', 1)
-	  + UNIT_SPACE + tr("1/min"));
+	tt.insert(tr("Maximum"), l.toString(max(), 'f', 1)
+	  + UNIT_SPACE + tr("rpm"));
+	tt.insert(tr("Average"), l.toString(avg(), 'f', 1)
+	  + UNIT_SPACE + tr("rpm"));

 	return tt.toString();
 }
--- a/src/GUI/elevationgraph.cpp
+++ b/src/GUI/elevationgraph.cpp
@ -1,4 +1,5 @@
 #include <cmath>
+#include <QLocale>
 #include "data/data.h"
 #include "config.h"
 #include "tooltip.h"
@ -54,13 +55,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());
 	}
 }
--- a/src/GUI/elevationgraphitem.cpp
+++ b/src/GUI/elevationgraphitem.cpp
@ -1,6 +1,8 @@
+#include <QLocale>
 #include "tooltip.h"
 #include "elevationgraphitem.h"

+
 ElevationGraphItem::ElevationGraphItem(const Graph &graph, GraphType type,
  QGraphicsItem *parent) : GraphItem(graph, type, parent)
 {
@ -24,14 +26,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();
--- a/src/GUI/exportdialog.cpp
+++ b/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();
--- a/src/GUI/format.cpp
+++ b/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 + ","
-			  + QChar(0x00A0) + QString::number(qAbs(value.lon()), 'f', 5) + xH;
+			QLocale l(QLocale::system());
+			return l.toString(qAbs(value.lat()), 'f', 5) + yH + ","
+			+ QChar(0x00A0) + l.toString(qAbs(value.lon()), 'f', 5) + xH;
 	}
 }
--- a/src/GUI/gearratiograph.cpp
+++ b/src/GUI/gearratiograph.cpp
@ -1,3 +1,4 @@
+#include <QLocale>
 #include "data/data.h"
 #include "gearratiographitem.h"
 #include "gearratiograph.h"
@ -16,11 +17,13 @@ GearRatioGraph::GearRatioGraph(QWidget *parent) : GraphTab(parent)
 void GearRatioGraph::setInfo()
 {
 	if (_showTracks) {
-		GraphView::addInfo(tr("Most used"), QString::number(top() * yScale(),
+		QLocale l(QLocale::system());
+
+		GraphView::addInfo(tr("Most used"), l.toString(top() * yScale(),
 		  'f', 2) + UNIT_SPACE + yUnits());
-		GraphView::addInfo(tr("Minimum"), QString::number(min() * yScale(), 'f',
+		GraphView::addInfo(tr("Minimum"), l.toString(min() * yScale(), 'f',
 		  2) + UNIT_SPACE + yUnits());
-		GraphView::addInfo(tr("Maximum"), QString::number(max() * yScale(), 'f',
+		GraphView::addInfo(tr("Maximum"), l.toString(max() * yScale(), 'f',
 		  2) + UNIT_SPACE + yUnits());
 	} else
 		clearInfo();
--- a/src/GUI/gearratiographitem.cpp
+++ b/src/GUI/gearratiographitem.cpp
@ -1,7 +1,9 @@
 #include <QMap>
+#include <QLocale>
 #include "tooltip.h"
 #include "gearratiographitem.h"

+
 GearRatioGraphItem::GearRatioGraphItem(const Graph &graph, GraphType type,
  QGraphicsItem *parent) : GraphItem(graph, type, parent), _top(NAN)
 {
@ -30,10 +32,11 @@ GearRatioGraphItem::GearRatioGraphItem(const Graph &graph, GraphType type,
 QString GearRatioGraphItem::toolTip() const
 {
 	ToolTip tt;
+	QLocale l(QLocale::system());

-	tt.insert(tr("Minimum"), QString::number(min(), 'f', 2));
-	tt.insert(tr("Maximum"), QString::number(max(), 'f', 2));
-	tt.insert(tr("Most used"), QString::number(top(), 'f', 2));
+	tt.insert(tr("Minimum"), l.toString(min(), 'f', 2));
+	tt.insert(tr("Maximum"), l.toString(max(), 'f', 2));
+	tt.insert(tr("Most used"), l.toString(top(), 'f', 2));

 	return tt.toString();
 }
--- a/src/GUI/graphview.cpp
+++ b/src/GUI/graphview.cpp
@ -5,6 +5,7 @@
 #include <QPaintDevice>
 #include <QGraphicsSimpleTextItem>
 #include <QPalette>
+#include <QLocale>
 #include "data/graph.h"
 #include "opengl.h"
 #include "config.h"
@ -413,8 +414,10 @@ void GraphView::updateSliderPosition()

 void GraphView::updateSliderInfo()
 {
+	QLocale l(QLocale::system());
 	qreal r, y;

+
 	if (_visible.count() > 1) {
 		r = 0;
 		y = 0;
@ -435,9 +438,9 @@ void GraphView::updateSliderInfo()
 	_sliderInfo->setSide(s);
 	_sliderInfo->setPos(QPointF(0, _slider->boundingRect().height() * r));
 	_sliderInfo->setText(_graphType == Time ? Format::timeSpan(_sliderPos,
-	  bounds().width() > 3600) : QString::number(_sliderPos * _xScale, 'f', 1)
+	  bounds().width() > 3600) : l.toString(_sliderPos * _xScale, 'f', 1)
 	  + UNIT_SPACE + _xUnits, (_visible.count() > 1) ? QString()
-	  : QString::number(-y * _yScale + _yOffset, 'f', _precision) + UNIT_SPACE
+	  : l.toString(-y * _yScale + _yOffset, 'f', _precision) + UNIT_SPACE
 	  + _yUnits);
 }

--- a/src/GUI/gui.cpp
+++ b/src/GUI/gui.cpp
@ -1,3 +1,4 @@
+#include "config.h"
 #include <QApplication>
 #include <QSplitter>
 #include <QVBoxLayout>
@ -22,12 +23,16 @@
 #include <QMimeData>
 #include <QUrl>
 #include <QPixmapCache>
+#ifdef ENABLE_HIDPI
+#include <QWindow>
+#include <QScreen>
+#endif // ENABLE_HIDPI
+#include <QStyle>
 #include "data/data.h"
 #include "data/poi.h"
 #include "map/maplist.h"
 #include "map/emptymap.h"
 #include "map/downloader.h"
-#include "config.h"
 #include "icons.h"
 #include "keys.h"
 #include "settings.h"
@ -48,6 +53,8 @@
 #include "gui.h"


+#define TOOLBAR_ICON_SIZE 22
+
 GUI::GUI()
 {
 	loadMaps();
@ -72,7 +79,7 @@ GUI::GUI()
 	_splitter->setStretchFactor(1, 1);
 	setCentralWidget(_splitter);

-	setWindowIcon(QIcon(QPixmap(APP_ICON)));
+	setWindowIcon(QIcon(APP_ICON));
 	setWindowTitle(APP_NAME);
 	setUnifiedTitleAndToolBarOnMac(true);
 	setAcceptDrops(true);
@ -140,44 +147,47 @@ void GUI::createMapActions()
 	_mapsActionGroup = new QActionGroup(this);
 	_mapsActionGroup->setExclusive(true);

-	for (int i = 0; i < _ml->maps().count(); i++) {
-		QAction *a = new QAction(_ml->maps().at(i)->name(), this);
-		a->setMenuRole(QAction::NoRole);
-		a->setCheckable(true);
-		a->setActionGroup(_mapsActionGroup);
-
-		_mapsSignalMapper->setMapping(a, i);
-		connect(a, SIGNAL(triggered()), _mapsSignalMapper, SLOT(map()));
-
-		_mapActions.append(a);
-	}
+	for (int i = 0; i < _ml->maps().count(); i++)
+		createMapAction(_ml->maps().at(i));

 	connect(_mapsSignalMapper, SIGNAL(mapped(int)), this,
 	  SLOT(mapChanged(int)));
 }

+QAction *GUI::createMapAction(const Map *map)
+{
+	QAction *a = new QAction(map->name(), this);
+	a->setMenuRole(QAction::NoRole);
+	a->setCheckable(true);
+	a->setActionGroup(_mapsActionGroup);
+
+	_mapActions.append(a);
+	_mapsSignalMapper->setMapping(a, _mapActions.size() - 1);
+	connect(a, SIGNAL(triggered()), _mapsSignalMapper, SLOT(map()));
+
+	return a;
+}
+
 void GUI::createPOIFilesActions()
 {
 	_poiFilesSignalMapper = new QSignalMapper(this);

 	for (int i = 0; i < _poi->files().count(); i++)
-		createPOIFileAction(i);
+		createPOIFileAction(_poi->files().at(i));

 	connect(_poiFilesSignalMapper, SIGNAL(mapped(int)), this,
 	  SLOT(poiFileChecked(int)));
 }

-QAction *GUI::createPOIFileAction(int index)
+QAction *GUI::createPOIFileAction(const QString &fileName)
 {
-	QAction *a = new QAction(QFileInfo(_poi->files().at(index)).fileName(),
-	  this);
+	QAction *a = new QAction(QFileInfo(fileName).fileName(), this);
 	a->setMenuRole(QAction::NoRole);
 	a->setCheckable(true);

-	_poiFilesSignalMapper->setMapping(a, index);
-	connect(a, SIGNAL(triggered()), _poiFilesSignalMapper, SLOT(map()));
-
 	_poiFilesActions.append(a);
+	_poiFilesSignalMapper->setMapping(a, _poiFilesActions.size() - 1);
+	connect(a, SIGNAL(triggered()), _poiFilesSignalMapper, SLOT(map()));

 	return a;
 }
@ -195,7 +205,7 @@ void GUI::createActions()
 	_navigationActionGroup->setEnabled(false);

 	// General actions
-	_exitAction = new QAction(QIcon(QPixmap(QUIT_ICON)), tr("Quit"), this);
+	_exitAction = new QAction(QIcon(QUIT_ICON), tr("Quit"), this);
 	_exitAction->setShortcut(QUIT_SHORTCUT);
 	_exitAction->setMenuRole(QAction::QuitRole);
 	connect(_exitAction, SIGNAL(triggered()), this, SLOT(close()));
@ -208,40 +218,37 @@ void GUI::createActions()
 	_keysAction = new QAction(tr("Keyboard controls"), this);
 	_keysAction->setMenuRole(QAction::NoRole);
 	connect(_keysAction, SIGNAL(triggered()), this, SLOT(keys()));
-	_aboutAction = new QAction(QIcon(QPixmap(APP_ICON)),
-	  tr("About GPXSee"), this);
+	_aboutAction = new QAction(QIcon(APP_ICON), tr("About GPXSee"), this);
 	_aboutAction->setMenuRole(QAction::AboutRole);
 	connect(_aboutAction, SIGNAL(triggered()), this, SLOT(about()));

 	// File actions
-	_openFileAction = new QAction(QIcon(QPixmap(OPEN_FILE_ICON)),
-	  tr("Open..."), this);
+	_openFileAction = new QAction(QIcon(OPEN_FILE_ICON), tr("Open..."), this);
 	_openFileAction->setMenuRole(QAction::NoRole);
 	_openFileAction->setShortcut(OPEN_SHORTCUT);
 	connect(_openFileAction, SIGNAL(triggered()), this, SLOT(openFile()));
 	addAction(_openFileAction);
-	_printFileAction = new QAction(QIcon(QPixmap(PRINT_FILE_ICON)),
-	  tr("Print..."), this);
+	_printFileAction = new QAction(QIcon(PRINT_FILE_ICON), tr("Print..."),
+	  this);
 	_printFileAction->setMenuRole(QAction::NoRole);
 	_printFileAction->setActionGroup(_fileActionGroup);
 	connect(_printFileAction, SIGNAL(triggered()), this, SLOT(printFile()));
 	addAction(_printFileAction);
-	_exportFileAction = new QAction(QIcon(QPixmap(EXPORT_FILE_ICON)),
+	_exportFileAction = new QAction(QIcon(EXPORT_FILE_ICON),
 	  tr("Export to PDF..."), this);
 	_exportFileAction->setMenuRole(QAction::NoRole);
 	_exportFileAction->setShortcut(EXPORT_SHORTCUT);
 	_exportFileAction->setActionGroup(_fileActionGroup);
 	connect(_exportFileAction, SIGNAL(triggered()), this, SLOT(exportFile()));
 	addAction(_exportFileAction);
-	_closeFileAction = new QAction(QIcon(QPixmap(CLOSE_FILE_ICON)),
-	  tr("Close"), this);
+	_closeFileAction = new QAction(QIcon(CLOSE_FILE_ICON), tr("Close"), this);
 	_closeFileAction->setMenuRole(QAction::NoRole);
 	_closeFileAction->setShortcut(CLOSE_SHORTCUT);
 	_closeFileAction->setActionGroup(_fileActionGroup);
 	connect(_closeFileAction, SIGNAL(triggered()), this, SLOT(closeAll()));
 	addAction(_closeFileAction);
-	_reloadFileAction = new QAction(QIcon(QPixmap(RELOAD_FILE_ICON)),
-	  tr("Reload"), this);
+	_reloadFileAction = new QAction(QIcon(RELOAD_FILE_ICON), tr("Reload"),
+	  this);
 	_reloadFileAction->setMenuRole(QAction::NoRole);
 	_reloadFileAction->setShortcut(RELOAD_SHORTCUT);
 	_reloadFileAction->setActionGroup(_fileActionGroup);
@ -255,12 +262,12 @@ void GUI::createActions()
 	addAction(_statisticsAction);

 	// POI actions
-	_openPOIAction = new QAction(QIcon(QPixmap(OPEN_FILE_ICON)),
-	  tr("Load POI file..."), this);
+	_openPOIAction = new QAction(QIcon(OPEN_FILE_ICON), tr("Load POI file..."),
+	  this);
 	_openPOIAction->setMenuRole(QAction::NoRole);
 	connect(_openPOIAction, SIGNAL(triggered()), this, SLOT(openPOIFile()));
-	_closePOIAction = new QAction(QIcon(QPixmap(CLOSE_FILE_ICON)),
-	  tr("Close POI files"), this);
+	_closePOIAction = new QAction(QIcon(CLOSE_FILE_ICON), tr("Close POI files"),
+	  this);
 	_closePOIAction->setMenuRole(QAction::NoRole);
 	connect(_closePOIAction, SIGNAL(triggered()), this, SLOT(closePOIFiles()));
 	_overlapPOIAction = new QAction(tr("Overlap POIs"), this);
@ -273,8 +280,7 @@ void GUI::createActions()
 	_showPOILabelsAction->setCheckable(true);
 	connect(_showPOILabelsAction, SIGNAL(triggered(bool)), _mapView,
 	  SLOT(showPOILabels(bool)));
-	_showPOIAction = new QAction(QIcon(QPixmap(SHOW_POI_ICON)),
-	  tr("Show POIs"), this);
+	_showPOIAction = new QAction(QIcon(SHOW_POI_ICON), tr("Show POIs"), this);
 	_showPOIAction->setMenuRole(QAction::NoRole);
 	_showPOIAction->setCheckable(true);
 	_showPOIAction->setShortcut(SHOW_POI_SHORTCUT);
@ -284,7 +290,7 @@ void GUI::createActions()
 	createPOIFilesActions();

 	// Map actions
-	_showMapAction = new QAction(QIcon(QPixmap(SHOW_MAP_ICON)), tr("Show map"),
+	_showMapAction = new QAction(QIcon(SHOW_MAP_ICON), tr("Show map"),
 	  this);
 	_showMapAction->setMenuRole(QAction::NoRole);
 	_showMapAction->setCheckable(true);
@ -292,8 +298,8 @@ void GUI::createActions()
 	connect(_showMapAction, SIGNAL(triggered(bool)), _mapView,
 	  SLOT(showMap(bool)));
 	addAction(_showMapAction);
-	_loadMapAction = new QAction(QIcon(QPixmap(OPEN_FILE_ICON)),
-	  tr("Load map..."), this);
+	_loadMapAction = new QAction(QIcon(OPEN_FILE_ICON), tr("Load map..."),
+	  this);
 	_loadMapAction->setMenuRole(QAction::NoRole);
 	connect(_loadMapAction, SIGNAL(triggered()), this, SLOT(loadMap()));
 	_clearMapCacheAction = new QAction(tr("Clear tile cache"), this);
@ -344,8 +350,8 @@ void GUI::createActions()
 	  SLOT(showRouteWaypoints(bool)));

 	// Graph actions
-	_showGraphsAction = new QAction(QIcon(QPixmap(SHOW_GRAPHS_ICON)),
-	  tr("Show graphs"), this);
+	_showGraphsAction = new QAction(QIcon(SHOW_GRAPHS_ICON), tr("Show graphs"),
+	  this);
 	_showGraphsAction->setMenuRole(QAction::NoRole);
 	_showGraphsAction->setCheckable(true);
 	_showGraphsAction->setShortcut(SHOW_GRAPHS_SHORTCUT);
@ -439,7 +445,7 @@ void GUI::createActions()
 	_DMSAction->setCheckable(true);
 	_DMSAction->setActionGroup(ag);
 	connect(_DMSAction, SIGNAL(triggered()), this, SLOT(setDMS()));
-	_fullscreenAction = new QAction(QIcon(QPixmap(FULLSCREEN_ICON)),
+	_fullscreenAction = new QAction(QIcon(FULLSCREEN_ICON),
 	  tr("Fullscreen mode"), this);
 	_fullscreenAction->setMenuRole(QAction::NoRole);
 	_fullscreenAction->setCheckable(true);
@ -453,21 +459,19 @@ void GUI::createActions()
 	  SLOT(openOptions()));

 	// Navigation actions
-	_nextAction = new QAction(QIcon(QPixmap(NEXT_FILE_ICON)), tr("Next"), this);
+	_nextAction = new QAction(QIcon(NEXT_FILE_ICON), tr("Next"), this);
 	_nextAction->setActionGroup(_navigationActionGroup);
 	_nextAction->setMenuRole(QAction::NoRole);
 	connect(_nextAction, SIGNAL(triggered()), this, SLOT(next()));
-	_prevAction = new QAction(QIcon(QPixmap(PREV_FILE_ICON)), tr("Previous"),
-	  this);
+	_prevAction = new QAction(QIcon(PREV_FILE_ICON), tr("Previous"), this);
 	_prevAction->setMenuRole(QAction::NoRole);
 	_prevAction->setActionGroup(_navigationActionGroup);
 	connect(_prevAction, SIGNAL(triggered()), this, SLOT(prev()));
-	_lastAction = new QAction(QIcon(QPixmap(LAST_FILE_ICON)), tr("Last"), this);
+	_lastAction = new QAction(QIcon(LAST_FILE_ICON), tr("Last"), this);
 	_lastAction->setMenuRole(QAction::NoRole);
 	_lastAction->setActionGroup(_navigationActionGroup);
 	connect(_lastAction, SIGNAL(triggered()), this, SLOT(last()));
-	_firstAction = new QAction(QIcon(QPixmap(FIRST_FILE_ICON)), tr("First"),
-	  this);
+	_firstAction = new QAction(QIcon(FIRST_FILE_ICON), tr("First"), this);
 	_firstAction->setMenuRole(QAction::NoRole);
 	_firstAction->setActionGroup(_navigationActionGroup);
 	connect(_firstAction, SIGNAL(triggered()), this, SLOT(first()));
@ -555,22 +559,28 @@ void GUI::createMenus()

 void GUI::createToolBars()
 {
+	int is = style()->pixelMetric(QStyle::PM_ToolBarIconSize);
+	QSize iconSize(qMin(is, TOOLBAR_ICON_SIZE), qMin(is, TOOLBAR_ICON_SIZE));
+
 #ifdef Q_OS_MAC
 	setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
 #endif // Q_OS_MAC

 	_fileToolBar = addToolBar(tr("File"));
+	_fileToolBar->setIconSize(iconSize);
 	_fileToolBar->addAction(_openFileAction);
 	_fileToolBar->addAction(_reloadFileAction);
 	_fileToolBar->addAction(_closeFileAction);
 	_fileToolBar->addAction(_printFileAction);

 	_showToolBar = addToolBar(tr("Show"));
+	_showToolBar->setIconSize(iconSize);
 	_showToolBar->addAction(_showPOIAction);
 	_showToolBar->addAction(_showMapAction);
 	_showToolBar->addAction(_showGraphsAction);

 	_navigationToolBar = addToolBar(tr("Navigation"));
+	_navigationToolBar->setIconSize(iconSize);
 	_navigationToolBar->addAction(_firstAction);
 	_navigationToolBar->addAction(_prevAction);
 	_navigationToolBar->addAction(_nextAction);
@ -634,14 +644,15 @@ void GUI::about()
 	QUrl homepage(APP_HOMEPAGE);

 	msgBox.setWindowTitle(tr("About GPXSee"));
-	msgBox.setText("<h2>" + QString(APP_NAME) + "</h2><p><p>" + tr("Version ")
-	  + APP_VERSION + " (" + CPU_ARCH + ", Qt " + QT_VERSION_STR + ")</p>");
+	msgBox.setText("<h2>" + QString(APP_NAME) + "</h2><p><p>" + tr("Version %1")
+	  .arg(QString(APP_VERSION) + " (" + CPU_ARCH + ", Qt " + QT_VERSION_STR
+	  + ")") + "</p>");
 	msgBox.setInformativeText("<table width=\"300\"><tr><td>"
 	  + tr("GPXSee is distributed under the terms of the GNU General Public "
 	  "License version 3. For more info about GPXSee visit the project "
-	  "homepage at ") + "<a href=\"" + homepage.toString() + "\">"
-	  + homepage.toString(QUrl::RemoveScheme).mid(2)
-	  + "</a>.</td></tr></table>");
+	  "homepage at %1.").arg("<a href=\"" + homepage.toString() + "\">"
+	  + homepage.toString(QUrl::RemoveScheme).mid(2) + "</a>")
+	  + "</td></tr></table>");

 	QIcon icon = msgBox.windowIcon();
 	QSize size = icon.actualSize(QSize(64, 64));
@ -831,7 +842,15 @@ bool GUI::openPOIFile(const QString &fileName)
 	if (fileName.isEmpty() || _poi->files().contains(fileName))
 		return false;

-	if (!_poi->loadFile(fileName)) {
+	if (_poi->loadFile(fileName)) {
+		_mapView->showPOI(true);
+		_showPOIAction->setChecked(true);
+		QAction *action = createPOIFileAction(fileName);
+		action->setChecked(true);
+		_poiFilesMenu->addAction(action);
+
+		return true;
+	} else {
 		QString error = tr("Error loading POI file:") + "\n\n"
 		  + fileName + "\n\n" + _poi->errorString();
 		if (_poi->errorLine())
@ -839,14 +858,6 @@ bool GUI::openPOIFile(const QString &fileName)
 		QMessageBox::critical(this, APP_NAME, error);

 		return false;
-	} else {
-		_mapView->showPOI(true);
-		_showPOIAction->setChecked(true);
-		QAction *action = createPOIFileAction(_poi->files().indexOf(fileName));
-		action->setChecked(true);
-		_poiFilesMenu->addAction(action);
-
-		return true;
 	}
 }

@ -924,6 +935,11 @@ void GUI::openOptions()
 	if (options.enableHTTP2 != _options.enableHTTP2)
 		Downloader::enableHTTP2(options.enableHTTP2);
 #endif // ENABLE_HTTP2
+#ifdef ENABLE_HIDPI
+	if (options.hidpiMap != _options.hidpiMap)
+		_mapView->setDevicePixelRatio(options.hidpiMap ? devicePixelRatioF()
+		  : 1.0);
+#endif // ENABLE_HIDPI

 	if (reload)
 		reloadFile();
@ -964,6 +980,8 @@ void GUI::exportFile()

 void GUI::statistics()
 {
+	QLocale l(QLocale::system());
+
 #ifdef Q_OS_WIN32
 	QString text = "<style>td {white-space: pre; padding-right: 4em;}"
 	  "th {text-align: left; padding-top: 0.5em;}</style><table>";
@ -974,21 +992,21 @@ void GUI::statistics()

 	if (_showTracksAction->isChecked() && _trackCount > 1)
 		text.append("<tr><td>" + tr("Tracks") + ":</td><td>"
-		  + QString::number(_trackCount) + "</td></tr>");
+		  + l.toString(_trackCount) + "</td></tr>");
 	if (_showRoutesAction->isChecked() && _routeCount > 1)
 		text.append("<tr><td>" + tr("Routes") + ":</td><td>"
-		  + QString::number(_routeCount) + "</td></tr>");
+		  + l.toString(_routeCount) + "</td></tr>");
 	if (_showWaypointsAction->isChecked() && _waypointCount > 1)
 		text.append("<tr><td>" + tr("Waypoints") + ":</td><td>"
-		  + QString::number(_waypointCount) + "</td></tr>");
+		  + l.toString(_waypointCount) + "</td></tr>");

 	if (_dateRange.first.isValid()) {
 		if (_dateRange.first == _dateRange.second) {
-			QString format = QLocale::system().dateFormat(QLocale::LongFormat);
+			QString format = l.dateFormat(QLocale::LongFormat);
 			text.append("<tr><td>" + tr("Date") + ":</td><td>"
 			  + _dateRange.first.toString(format) + "</td></tr>");
 		} else {
-			QString format = QLocale::system().dateFormat(QLocale::ShortFormat);
+			QString format = l.dateFormat(QLocale::ShortFormat);
 			text.append("<tr><td>" + tr("Date") + ":</td><td>"
 			  + QString("%1 - %2").arg(_dateRange.first.toString(format),
 			  _dateRange.second.toString(format)) + "</td></tr>");
@ -1030,6 +1048,7 @@ void GUI::statistics()

 void GUI::plot(QPrinter *printer)
 {
+	QLocale l(QLocale::system());
 	QPainter p(printer);
 	TrackInfo info;
 	qreal ih, gh, mh, ratio;
@ -1040,19 +1059,19 @@ void GUI::plot(QPrinter *printer)

 	if (_options.printItemCount) {
 		if (_showTracksAction->isChecked() && _trackCount > 1)
-			info.insert(tr("Tracks"), QString::number(_trackCount));
+			info.insert(tr("Tracks"), l.toString(_trackCount));
 		if (_showRoutesAction->isChecked() && _routeCount > 1)
-			info.insert(tr("Routes"), QString::number(_routeCount));
+			info.insert(tr("Routes"), l.toString(_routeCount));
 		if (_showWaypointsAction->isChecked() && _waypointCount > 1)
-			info.insert(tr("Waypoints"), QString::number(_waypointCount));
+			info.insert(tr("Waypoints"), l.toString(_waypointCount));
 	}

 	if (_dateRange.first.isValid() && _options.printDate) {
 		if (_dateRange.first == _dateRange.second) {
-			QString format = QLocale::system().dateFormat(QLocale::LongFormat);
+			QString format = l.dateFormat(QLocale::LongFormat);
 			info.insert(tr("Date"), _dateRange.first.toString(format));
 		} else {
-			QString format = QLocale::system().dateFormat(QLocale::ShortFormat);
+			QString format = l.dateFormat(QLocale::ShortFormat);
 			info.insert(tr("Date"), QString("%1 - %2")
 			  .arg(_dateRange.first.toString(format),
 			  _dateRange.second.toString(format)));
@ -1279,18 +1298,11 @@ bool GUI::loadMap(const QString &fileName)
 		return false;

 	if (_ml->loadFile(fileName)) {
-		QAction *a = new QAction(_ml->maps().last()->name(), this);
-		a->setMenuRole(QAction::NoRole);
-		a->setCheckable(true);
-		a->setActionGroup(_mapsActionGroup);
-		_mapsSignalMapper->setMapping(a, _ml->maps().size() - 1);
-		connect(a, SIGNAL(triggered()), _mapsSignalMapper, SLOT(map()));
-		_mapActions.append(a);
+		QAction *a = createMapAction(_ml->maps().last());
 		_mapMenu->insertAction(_mapsEnd, a);
 		_showMapAction->setEnabled(true);
 		_clearMapCacheAction->setEnabled(true);
-		_mapActions.last()->trigger();
-
+		a->trigger();
 		return true;
 	} else {
 		QString error = tr("Error loading map:") + "\n\n"
@ -1788,6 +1800,10 @@ void GUI::writeSettings()
 		settings.setValue(SLIDER_COLOR_SETTING, _options.sliderColor);
 	if (_options.alwaysShowMap != ALWAYS_SHOW_MAP_DEFAULT)
 		settings.setValue(ALWAYS_SHOW_MAP_SETTING, _options.alwaysShowMap);
+#ifdef ENABLE_HIDPI
+	if (_options.hidpiMap != HIDPI_MAP_DEFAULT)
+		settings.setValue(HIDPI_MAP_SETTING, _options.hidpiMap);
+#endif // ENABLE_HIDPI
 	settings.endGroup();
 }

@ -2023,6 +2039,10 @@ void GUI::readSettings()
 	  SLIDER_COLOR_DEFAULT).value<QColor>();
 	_options.alwaysShowMap = settings.value(ALWAYS_SHOW_MAP_SETTING,
 	  ALWAYS_SHOW_MAP_DEFAULT).toBool();
+#ifdef ENABLE_HIDPI
+	_options.hidpiMap = settings.value(HIDPI_MAP_SETTING, HIDPI_MAP_SETTING)
+	  .toBool();
+#endif // ENABLE_HIDPI

 	_mapView->setPalette(_options.palette);
 	_mapView->setMapOpacity(_options.mapOpacity);
@ -2039,6 +2059,9 @@ void GUI::readSettings()
 	_mapView->setMarkerColor(_options.sliderColor);
 	if (_options.useOpenGL)
 		_mapView->useOpenGL(true);
+#ifdef ENABLE_HIDPI
+	_mapView->setDevicePixelRatio(_options.hidpiMap ? devicePixelRatioF() : 1.0);
+#endif // ENABLE_HIDPI

 	for (int i = 0; i < _tabs.count(); i++) {
 		_tabs.at(i)->setPalette(_options.palette);
@ -2063,10 +2086,6 @@ void GUI::readSettings()
 	_poi->setRadius(_options.poiRadius);

 	QPixmapCache::setCacheLimit(_options.pixmapCache * 1024);
-	Downloader::setTimeout(_options.connectionTimeout);
-#ifdef ENABLE_HTTP2
-	Downloader::enableHTTP2(_options.enableHTTP2);
-#endif // ENABLE_HTTP2

 	settings.endGroup();
 }
@ -2107,3 +2126,39 @@ qreal GUI::movingTime() const
 {
 	return (_showTracksAction->isChecked()) ? _movingTime : 0;
 }
+
+void GUI::show()
+{
+	QMainWindow::show();
+
+#ifdef ENABLE_HIDPI
+	QWindow *w = windowHandle();
+	connect(w->screen(), SIGNAL(logicalDotsPerInchChanged(qreal)), this,
+	  SLOT(logicalDotsPerInchChanged(qreal)));
+	connect(w, SIGNAL(screenChanged(QScreen*)), this,
+	  SLOT(screenChanged(QScreen*)));
+#endif // ENABLE_HIDPI
+}
+
+void GUI::screenChanged(QScreen *screen)
+{
+#ifdef ENABLE_HIDPI
+	_mapView->setDevicePixelRatio(_options.hidpiMap ? devicePixelRatioF() : 1.0);
+
+	disconnect(SIGNAL(logicalDotsPerInchChanged(qreal)), this,
+	  SLOT(logicalDotsPerInchChanged(qreal)));
+	connect(screen, SIGNAL(logicalDotsPerInchChanged(qreal)), this,
+	  SLOT(logicalDotsPerInchChanged(qreal)));
+#else // ENABLE_HIDPI
+	Q_UNUSED(screen);
+#endif // ENABLE_HIDPI
+}
+
+void GUI::logicalDotsPerInchChanged(qreal dpi)
+{
+	Q_UNUSED(dpi)
+
+#ifdef ENABLE_HIDPI
+	_mapView->setDevicePixelRatio(_options.hidpiMap ? devicePixelRatioF() : 1.0);
+#endif // ENBLE_HIDPI
+}
--- a/src/GUI/gui.h
+++ b/src/GUI/gui.h
@ -28,6 +28,7 @@ class MapView;
 class Map;
 class MapList;
 class POI;
+class QScreen;

 class GUI : public QMainWindow
 {
@ -37,6 +38,7 @@ public:
 	GUI();

 	bool openFile(const QString &fileName);
+	void show();

 private slots:
 	void about();
@ -83,6 +85,8 @@ private slots:
 	void setDMS() {setCoordinatesFormat(DMS);}

 	void sliderPositionChanged(qreal pos);
+	void screenChanged(QScreen *screen);
+	void logicalDotsPerInchChanged(qreal dpi);

 private:
 	typedef QPair<QDate, QDate> DateRange;
@ -92,7 +96,8 @@ private:
 	void closeFiles();
 	void plot(QPrinter *printer);

-	QAction *createPOIFileAction(int index);
+	QAction *createPOIFileAction(const QString &fileName);
+	QAction *createMapAction(const Map *map);
 	void createPOIFilesActions();
 	void createMapActions();
 	void createActions();
--- a/src/GUI/heartrategraph.cpp
+++ b/src/GUI/heartrategraph.cpp
@ -1,3 +1,4 @@
+#include <QLocale>
 #include "data/data.h"
 #include "heartrategraphitem.h"
 #include "heartrategraph.h"
@ -7,7 +8,7 @@ HeartRateGraph::HeartRateGraph(QWidget *parent) : GraphTab(parent)
 {
 	_showTracks = true;

-	GraphView::setYUnits(tr("1/min"));
+	GraphView::setYUnits(tr("bpm"));
 	setYLabel(tr("Heart rate"));

 	setSliderPrecision(0);
@ -16,9 +17,11 @@ HeartRateGraph::HeartRateGraph(QWidget *parent) : GraphTab(parent)
 void HeartRateGraph::setInfo()
 {
 	if (_showTracks) {
-		GraphView::addInfo(tr("Average"), QString::number(avg() * yScale(), 'f',
+		QLocale l(QLocale::system());
+
+		GraphView::addInfo(tr("Average"), l.toString(avg() * 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());
 	} else
 		clearInfo();
--- a/src/GUI/heartrategraphitem.cpp
+++ b/src/GUI/heartrategraphitem.cpp
@ -1,6 +1,8 @@
+#include <QLocale>
 #include "tooltip.h"
 #include "heartrategraphitem.h"

+
 HeartRateGraphItem::HeartRateGraphItem(const Graph &graph, GraphType type,
  QGraphicsItem *parent) : GraphItem(graph, type, parent)
 {
@ -16,11 +18,12 @@ HeartRateGraphItem::HeartRateGraphItem(const Graph &graph, GraphType type,
 QString HeartRateGraphItem::toolTip() const
 {
 	ToolTip tt;
+	QLocale l(QLocale::system());

-	tt.insert(tr("Maximum"), QString::number(max(), 'f', 0)
-	  + UNIT_SPACE + tr("1/min"));
-	tt.insert(tr("Average"), QString::number(avg(), 'f', 0)
-	  + UNIT_SPACE + tr("1/min"));
+	tt.insert(tr("Maximum"), l.toString(max(), 'f', 0)
+	  + UNIT_SPACE + tr("bpm"));
+	tt.insert(tr("Average"), l.toString(avg(), 'f', 0)
+	  + UNIT_SPACE + tr("bpm"));

 	return tt.toString();
 }
--- a/src/GUI/icons.h
+++ b/src/GUI/icons.h
@ -20,10 +20,11 @@
 #define FULLSCREEN_ICON   ":/icons/view-fullscreen.png"

 // Options dialog icons
-#define APPEARANCE_ICON   ":/icons/preferences-desktop-display.png"
-#define POI_ICON          ":/icons/flag_48.png"
-#define SYSTEM_ICON       ":/icons/system-run.png"
-#define PRINT_EXPORT_ICON ":/icons/document-print-preview.png"
+#define APPEARANCE_ICON   ":/icons/format-stroke-color.png"
+#define POI_ICON          ":/icons/flag_32.png"
+#define SYSTEM_ICON       ":/icons/preferences-system.png"
+#define PRINT_EXPORT_ICON ":/icons/document-print_32.png"
 #define DATA_ICON         ":/icons/view-filter.png"
+#define MAPS_ICON         ":/icons/applications-internet_32.png"

 #endif /* ICONS_H */
--- a/src/GUI/infoitem.cpp
+++ b/src/GUI/infoitem.cpp
@ -9,10 +9,6 @@ InfoItem::InfoItem(QGraphicsItem *parent) : QGraphicsItem(parent)
 {
 	_font.setPixelSize(FONT_SIZE);
 	_font.setFamily(FONT_FAMILY);
-
-#ifndef Q_OS_MAC
-	setCacheMode(QGraphicsItem::DeviceCoordinateCache);
-#endif // Q_OS_MAC
 }

 void InfoItem::updateBoundingRect()
--- a/src/GUI/infoitem.h
+++ b/src/GUI/infoitem.h
@ -3,7 +3,7 @@

 #include <QGraphicsItem>
 #include <QList>
-#include "kv.h"
+#include "common/kv.h"

 class InfoItem : public QGraphicsItem
 {
--- a/src/GUI/mapview.cpp
+++ b/src/GUI/mapview.cpp
@ -18,7 +18,7 @@

 #define MAX_DIGITAL_ZOOM 2
 #define MIN_DIGITAL_ZOOM -3
-#define MARGIN           10.0
+#define MARGIN           10
 #define SCALE_OFFSET     7

 MapView::MapView(Map *map, POI *poi, QWidget *parent)
@ -29,7 +29,6 @@ MapView::MapView(Map *map, POI *poi, QWidget *parent)

 	_scene = new QGraphicsScene(this);
 	setScene(_scene);
-	setCacheMode(QGraphicsView::CacheBackground);
 	setDragMode(QGraphicsView::ScrollHandDrag);
 	setViewportUpdateMode(QGraphicsView::FullViewportUpdate);
 	setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
@ -72,6 +71,10 @@ MapView::MapView(Map *map, POI *poi, QWidget *parent)
 	_poiSize = 8;
 	_poiColor = Qt::black;

+#ifdef ENABLE_HIDPI
+	_ratio = 1.0;
+#endif // ENABLE_HIDPI
+	_opengl = false;
 	_plot = false;
 	_digitalZoom = 0;

@ -228,7 +231,7 @@ void MapView::updatePOIVisibility()
 void MapView::rescale()
 {
 	_scene->setSceneRect(_map->bounds());
-	resetCachedContent();
+	reloadMap();

 	for (int i = 0; i < _tracks.size(); i++)
 		_tracks.at(i)->setMap(_map);
@ -266,6 +269,9 @@ void MapView::setMap(Map *map)

 	_map = map;
 	_map->load();
+#ifdef ENABLE_HIDPI
+	_map->setDevicePixelRatio(_ratio);
+#endif // ENABLE_HIDPI
 	connect(_map, SIGNAL(loaded()), this, SLOT(reloadMap()));

 	digitalZoom(0);
@ -289,7 +295,7 @@ void MapView::setMap(Map *map)
 	  _map->ll2xy(cr.bottomRight())).center();
 	centerOn(nc);

-	resetCachedContent();
+	reloadMap();
 	QPixmapCache::clear();
 }

@ -498,6 +504,9 @@ void MapView::plot(QPainter *painter, const QRectF &target, qreal scale,
 	// Enter plot mode
 	setUpdatesEnabled(false);
 	_plot = true;
+#ifdef ENABLE_HIDPI
+	_map->setDevicePixelRatio(1.0);
+#endif // ENABLE_HIDPI

 	// Compute sizes & ratios
 	orig = viewport()->rect();
@ -556,6 +565,9 @@ void MapView::plot(QPainter *painter, const QRectF &target, qreal scale,
 	_mapScale->setPos(origPos);

 	// Exit plot mode
+#ifdef ENABLE_HIDPI
+	_map->setDevicePixelRatio(_ratio);
+#endif // ENABLE_HIDPI
 	_plot = false;
 	setUpdatesEnabled(true);
 }
@ -635,7 +647,7 @@ void MapView::showRouteWaypoints(bool show)
 void MapView::showMap(bool show)
 {
 	_showMap = show;
-	resetCachedContent();
+	reloadMap();
 }

 void MapView::showPOI(bool show)
@ -738,13 +750,13 @@ void MapView::setPOIColor(const QColor &color)
 void MapView::setMapOpacity(int opacity)
 {
 	_opacity = opacity / 100.0;
-	resetCachedContent();
+	reloadMap();
 }

 void MapView::setBackgroundColor(const QColor &color)
 {
 	_backgroundColor = color;
-	resetCachedContent();
+	reloadMap();
 }

 void MapView::drawBackground(QPainter *painter, const QRectF &rect)
@ -753,9 +765,17 @@ void MapView::drawBackground(QPainter *painter, const QRectF &rect)

 	if (_showMap) {
 		QRectF ir = rect.intersected(_map->bounds());
+		Map::Flags flags = Map::NoFlags;
+
 		if (_opacity < 1.0)
 			painter->setOpacity(_opacity);
-		_map->draw(painter, ir, _plot);
+
+		if (_plot)
+			flags = Map::Block;
+		else if (_opengl)
+			flags = Map::OpenGL;
+
+		_map->draw(painter, ir, flags);
 	}
 }

@ -796,6 +816,8 @@ void MapView::scrollContentsBy(int dx, int dy)

 void MapView::useOpenGL(bool use)
 {
+	_opengl = use;
+
 	if (use)
 		setViewport(new OPENGL_WIDGET);
 	else
@ -819,5 +841,42 @@ void MapView::setMarkerColor(const QColor &color)

 void MapView::reloadMap()
 {
-	resetCachedContent();
+	_scene->invalidate();
+}
+
+void MapView::setDevicePixelRatio(qreal ratio)
+{
+#ifdef ENABLE_HIDPI
+	if (_ratio == ratio)
+		return;
+
+	_ratio = ratio;
+
+	QRectF vr(mapToScene(viewport()->rect()).boundingRect()
+	  .intersected(_map->bounds()));
+	RectC cr(_map->xy2ll(vr.topLeft()), _map->xy2ll(vr.bottomRight()));
+
+	_map->setDevicePixelRatio(_ratio);
+	_scene->setSceneRect(_map->bounds());
+
+	for (int i = 0; i < _tracks.size(); i++)
+		_tracks.at(i)->setMap(_map);
+	for (int i = 0; i < _routes.size(); i++)
+		_routes.at(i)->setMap(_map);
+	for (int i = 0; i < _waypoints.size(); i++)
+		_waypoints.at(i)->setMap(_map);
+
+	QHash<SearchPointer<Waypoint>, WaypointItem*>::const_iterator it;
+	for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
+		it.value()->setMap(_map);
+	updatePOIVisibility();
+
+	QPointF nc = QRectF(_map->ll2xy(cr.topLeft()),
+	  _map->ll2xy(cr.bottomRight())).center();
+	centerOn(nc);
+
+	reloadMap();
+#else // ENABLE_HIDPI
+	Q_UNUSED(ratio);
+#endif // ENABLE_HIDPI
 }
--- a/Show More
+++ b/Show More