Version++

Indicate moving time in status bar
Made the moving time switch affect all related values
2025-07-01 13:29:16 +02:00 · 2017-02-12 20:13:04 +01:00 · 2017-02-12 20:11:36 +01:00 · 2017-02-12 19:57:55 +01:00 · 2017-02-12 17:49:54 +01:00 · 2017-02-12 17:38:20 +01:00
84 changed files with 4184 additions and 743 deletions
--- a/Info.plist
+++ b/Info.plist
@ -99,6 +99,22 @@
 			<key>CFBundleTypeRole</key>
 			<string>Viewer</string>
 		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>nmea</string>
+			</array>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>application/vnd.nmea.nmea</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>nmea.icns</string>
+			<key>CFBundleTypeName</key>
+			<string>NMEA 0183 data</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
 	</array>

 	<key>UTImportedTypeDeclarations</key>
@ -208,6 +224,27 @@
 				<string>application/vnd.fai.igc</string>
 			</dict>
 		</dict>
+		<dict>
+			<key>UTTypeIdentifier</key>
+			<string>org.nmea.nmea</string>
+			<key>UTTypeReferenceURL</key>
+			<string>http://www.nmea.org/content/nmea_standards/nmea_0183_v_410.asp</string>
+			<key>UTTypeDescription</key>
+			<string>NMEA 0183 data</string>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>public.data</string>
+			</array>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>public.filename-extension</key>
+				<array>
+					<string>nmea</string>
+				</array>
+				<key>public.mime-type</key>
+				<string>application/vnd.nmea.nmea</string>
+			</dict>
+		</dict>
 	</array>

 </dict>
--- a/README.md
+++ b/README.md
@ -1,15 +1,16 @@
 # GPXSee
-GPXSee is a Qt-based application for visualizing and analyzing GPX, TCX, FIT,
-IGC and KML files.
+GPXSee is a Qt-based GPS log file viewer and analyzer that supports GPX, TCX,
+KML, FIT, IGC and NMEA files.

+## Features
 * User-definable map sources.
 * Elevation, speed, heart rate, cadence, power and temperature graphs.
 * Support for multiple tracks in one view.
 * Support for POI files.
 * Print/export to PDF.
-* Full-screen mode
+* Full-screen mode.
 * Native GUI for Windows, Mac OS X and Linux.
-* Opens GPX, TCX, FIT, KML, IGC and Garmin CSV files.
+* Opens GPX, TCX, FIT, KML, IGC, NMEA and Garmin CSV files.

 ![GPXSee - Linux](https://a.fsdn.com/con/app/proj/gpxsee/screenshots/linux.png)

--- a/build/env.bat
+++ b/build/env.bat
@ -1,6 +0,0 @@
-CALL "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" 
-set PATH=C:\qt\qtbase\bin;%PATH%
-set PATH=C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin;%PATH%
-set INCLUDE=C:\Program Files\Microsoft SDKs\Windows\v7.1\Include;%INCLUDE%
-set LIB=C:\Program Files\Microsoft SDKs\Windows\v7.1\Lib;%LIB%
-set CL=/D_USING_V110_SDK71_
--- a/build/env64.bat
+++ b/build/env64.bat
@ -1,6 +0,0 @@
-CALL "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 
-set PATH=C:\qt64\qtbase\bin;%PATH% 
-set PATH=C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin;%PATH%
-set INCLUDE=C:\Program Files\Microsoft SDKs\Windows\v7.1\Include;%INCLUDE%
-set LIB=C:\Program Files\Microsoft SDKs\Windows\v7.1\Lib\x64;%LIB%
-set CL=/D_USING_V110_SDK71_
--- a/gpxsee.pro
+++ b/gpxsee.pro
@ -1,10 +1,12 @@
 TARGET = GPXSee
-VERSION = 3.1
+VERSION = 3.9
 QT += core \
    gui \
    network
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 greaterThan(QT_MAJOR_VERSION, 4): QT += printsupport
+lessThan(QT_VERSION, 5.4): QT += opengl
+macx: QT += opengl
 HEADERS += src/config.h \
    src/icons.h \
    src/gui.h \
@ -69,7 +71,13 @@ HEADERS += src/config.h \
    src/assert.h \
    src/cadencegraph.h \
    src/powergraph.h \
-    src/igcparser.h
+    src/igcparser.h \
+    src/nmeaparser.h \
+    src/optionsdialog.h \
+    src/colorbox.h \
+    src/stylecombobox.h \
+    src/opengl.h \
+    src/timetype.h
 SOURCES += src/main.cpp \
    src/gui.cpp \
    src/poi.cpp \
@ -118,9 +126,15 @@ SOURCES += src/main.cpp \
    src/graph.cpp \
    src/cadencegraph.cpp \
    src/powergraph.cpp \
-    src/igcparser.cpp
+    src/igcparser.cpp \
+    src/path.cpp \
+    src/nmeaparser.cpp \
+    src/optionsdialog.cpp \
+    src/colorbox.cpp \
+    src/stylecombobox.cpp
 RESOURCES += gpxsee.qrc
-TRANSLATIONS = lang/gpxsee_cs.ts
+TRANSLATIONS = lang/gpxsee_cs.ts \
+    lang/gpxsee_sv.ts
 macx {
    ICON = icons/gpxsee.icns
    QMAKE_INFO_PLIST = Info.plist
@ -129,6 +143,7 @@ macx {
        icons/kml.icns \
        icons/fit.icns \
        icons/igc.icns \
+        icons/nmea.icns \
        pkg/maps.txt
    APP_RESOURCES.path = Contents/Resources
    QMAKE_BUNDLE_DATA += APP_RESOURCES
@ -139,6 +154,7 @@ win32 {
        icons/tcx.ico \
        icons/kml.ico \
        icons/fit.ico \
-        icons/igc.ico
+        icons/igc.ico \
+        icons/nmea.ico
 }
 DEFINES += APP_VERSION=\\\"$$VERSION\\\"
--- a/gpxsee.qrc
+++ b/gpxsee.qrc
@ -15,6 +15,11 @@
        <file>icons/arrow-right-double.png</file>
        <file>icons/view-fullscreen.png</file>
        <file>icons/office-chart-line-stacked.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>lang/gpxsee_cs.qm</file>
+        <file>lang/gpxsee_sv.qm</file>
    </qresource>
 </RCC>
--- a/icons/document-print-preview.png
+++ b/icons/document-print-preview.png
--- a/icons/flag_48.png
+++ b/icons/flag_48.png
--- a/icons/nmea.icns
+++ b/icons/nmea.icns
--- a/icons/nmea.ico
+++ b/icons/nmea.ico
--- a/icons/nmea.svg
+++ b/icons/nmea.svg
@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   id="svg3390"
+   height="185"
+   width="185">
+  <metadata
+     id="metadata3404">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs3402" />
+  <path
+     style="fill:#ffffff;stroke:#999999;stroke-width:2.18774867"
+     id="path3392"
+     d="m 128.23996,2.2548915 -95.377018,0 0,181.0580085 134.394868,0 0,-141.313567 z m 0,0 0,39.7444415 39.01785,0" />
+  <rect
+     y="124.9782"
+     x="16.573463"
+     height="49.84631"
+     width="131.6837"
+     id="rect3426"
+     style="fill:#0083d7;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <g
+     id="g3828"
+     transform="matrix(0.89093793,0,0,0.84489692,3.5017807,-51.565424)">
+    <g
+       id="g3715">
+      <circle
+         style="fill:#000000"
+         cx="113"
+         cy="90.875"
+         id="ellipse3717"
+         r="7.0209999" />
+      <circle
+         style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2;stroke-linejoin:round"
+         cx="113"
+         cy="90.875"
+         id="ellipse3719"
+         r="7.0209999" />
+    </g>
+    <polyline
+       style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:4"
+       points="62.3563,178.566 73.5,125.854 96,151.875 113,90.875 136.5,172.375 148.831,160.03 "
+       id="polyline3721" />
+    <g
+       id="g3723">
+      <circle
+         style="fill:#000000"
+         cx="73.5"
+         cy="125.854"
+         id="ellipse3725"
+         r="7.0209999" />
+      <circle
+         style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"
+         cx="73.5"
+         cy="125.854"
+         id="ellipse3727"
+         r="7.0209999" />
+    </g>
+    <g
+       id="g3729">
+      <circle
+         style="fill:#000000"
+         cx="136.5"
+         cy="172.375"
+         id="ellipse3731"
+         r="7.0209999" />
+      <circle
+         style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"
+         cx="136.5"
+         cy="172.375"
+         id="ellipse3733"
+         r="7.0209999" />
+    </g>
+    <g
+       id="g3735">
+      <circle
+         style="fill:#000000"
+         cx="60.700001"
+         cy="186.39999"
+         id="ellipse3737"
+         r="7.0209999" />
+      <circle
+         style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"
+         cx="60.700001"
+         cy="186.39999"
+         id="ellipse3739"
+         r="7.0209999" />
+    </g>
+    <g
+       id="g3741">
+      <circle
+         style="fill:#000000"
+         cx="154.5"
+         cy="154.354"
+         id="ellipse3743"
+         r="7.0209999" />
+      <circle
+         style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"
+         cx="154.5"
+         cy="154.354"
+         id="ellipse3745"
+         r="7.0209999" />
+    </g>
+    <g
+       id="g3747">
+      <circle
+         style="fill:#000000"
+         cx="96"
+         cy="151.875"
+         id="ellipse3749"
+         r="7.0209999" />
+      <circle
+         style="fill:none;fill-opacity:0;stroke:#000000;stroke-width:2"
+         cx="96"
+         cy="151.875"
+         id="ellipse3751"
+         r="7.0209999" />
+    </g>
+  </g>
+  <text
+     transform="scale(0.9437456,1.0596076)"
+     id="text3921"
+     y="155.86783"
+     x="21.076782"
+     style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:40px;line-height:100%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     xml:space="preserve"><tspan
+       y="155.86783"
+       x="21.076782"
+       id="tspan3429">NMEA</tspan></text>
+</svg>
--- a/icons/preferences-desktop-display.png
+++ b/icons/preferences-desktop-display.png
--- a/icons/system-run.png
+++ b/icons/system-run.png
--- a/lang/gpxsee_cs.ts
+++ b/lang/gpxsee_cs.ts
@ -67,89 +67,89 @@
 <context>
    <name>ExportDialog</name>
    <message>
-        <location filename="../src/exportdialog.cpp" line="122"/>
+        <location filename="../src/exportdialog.cpp" line="120"/>
        <source>Export to PDF</source>
        <translation>Exportovat do PDF</translation>
    </message>
    <message>
-        <location filename="../src/exportdialog.cpp" line="29"/>
+        <location filename="../src/exportdialog.cpp" line="25"/>
        <source>PDF files (*.pdf);;All files (*)</source>
        <translation>Soubory PDF (*.pdf);;Všechny soubory (*)</translation>
    </message>
    <message>
-        <location filename="../src/exportdialog.cpp" line="42"/>
+        <location filename="../src/exportdialog.cpp" line="38"/>
        <source>Portrait</source>
        <translation>Na výšku</translation>
    </message>
    <message>
-        <location filename="../src/exportdialog.cpp" line="43"/>
+        <location filename="../src/exportdialog.cpp" line="39"/>
        <source>Landscape</source>
        <translation>Na šířku</translation>
    </message>
    <message>
-        <location filename="../src/exportdialog.cpp" line="85"/>
+        <location filename="../src/exportdialog.cpp" line="83"/>
        <source>Page size:</source>
        <translation>Velikost stránky:</translation>
    </message>
    <message>
-        <location filename="../src/exportdialog.cpp" line="86"/>
+        <location filename="../src/exportdialog.cpp" line="84"/>
        <source>Orientation:</source>
        <translation>Orientace:</translation>
    </message>
    <message>
-        <location filename="../src/exportdialog.cpp" line="82"/>
+        <location filename="../src/exportdialog.cpp" line="80"/>
        <source>Page Setup</source>
        <translation>Nastavení stránky</translation>
    </message>
    <message>
-        <location filename="../src/exportdialog.cpp" line="55"/>
+        <location filename="../src/exportdialog.cpp" line="52"/>
        <source>in</source>
        <translation>in</translation>
    </message>
    <message>
-        <location filename="../src/exportdialog.cpp" line="55"/>
+        <location filename="../src/exportdialog.cpp" line="52"/>
        <source>mm</source>
        <translation>mm</translation>
    </message>
    <message>
-        <location filename="../src/exportdialog.cpp" line="87"/>
+        <location filename="../src/exportdialog.cpp" line="85"/>
        <source>Margins:</source>
        <translation>Okraje:</translation>
    </message>
    <message>
-        <location filename="../src/exportdialog.cpp" line="93"/>
+        <location filename="../src/exportdialog.cpp" line="91"/>
        <source>File:</source>
        <translation>Soubor:</translation>
    </message>
    <message>
-        <location filename="../src/exportdialog.cpp" line="100"/>
+        <location filename="../src/exportdialog.cpp" line="98"/>
        <source>Output file</source>
        <translation>Výstupní soubor</translation>
    </message>
    <message>
-        <location filename="../src/exportdialog.cpp" line="107"/>
+        <location filename="../src/exportdialog.cpp" line="105"/>
        <source>Export</source>
        <translation>Exportovat</translation>
    </message>
    <message>
-        <location filename="../src/exportdialog.cpp" line="129"/>
-        <location filename="../src/exportdialog.cpp" line="139"/>
-        <location filename="../src/exportdialog.cpp" line="144"/>
+        <location filename="../src/exportdialog.cpp" line="127"/>
+        <location filename="../src/exportdialog.cpp" line="137"/>
+        <location filename="../src/exportdialog.cpp" line="142"/>
        <source>Error</source>
        <translation>Chyba</translation>
    </message>
    <message>
-        <location filename="../src/exportdialog.cpp" line="129"/>
+        <location filename="../src/exportdialog.cpp" line="127"/>
        <source>No output file selected.</source>
        <translation>Nebyl zvolen žádný výstupní soubor.</translation>
    </message>
    <message>
-        <location filename="../src/exportdialog.cpp" line="139"/>
+        <location filename="../src/exportdialog.cpp" line="137"/>
        <source>%1 is a directory.</source>
        <translation>%1 je adresář.</translation>
    </message>
    <message>
-        <location filename="../src/exportdialog.cpp" line="144"/>
+        <location filename="../src/exportdialog.cpp" line="142"/>
        <source>%1 is not writable.</source>
        <translation>%1 nelze zapsat.</translation>
    </message>
@ -190,280 +190,301 @@
 <context>
    <name>GUI</name>
    <message>
-        <location filename="../src/gui.cpp" line="550"/>
+        <location filename="../src/gui.cpp" line="569"/>
        <source>GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at </source>
        <translation>Program GPXSee je distribuován pod podmínkami licence GNU General Public License verze 3. Pro více informací navštivte stránky programu na adrese </translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="614"/>
+        <location filename="../src/gui.cpp" line="633"/>
        <source>Open file</source>
        <translation>Otevřít soubor</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="695"/>
+        <location filename="../src/gui.cpp" line="723"/>
        <source>Open POI file</source>
        <translation>Otevřít POI soubor</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="225"/>
+        <location filename="../src/gui.cpp" line="227"/>
        <source>Open</source>
        <translation>Otevřít</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="209"/>
+        <location filename="../src/gui.cpp" line="211"/>
        <source>Quit</source>
        <translation>Ukončit</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="217"/>
-        <location filename="../src/gui.cpp" line="566"/>
-        <location filename="../src/gui.cpp" line="567"/>
+        <location filename="../src/gui.cpp" line="219"/>
+        <location filename="../src/gui.cpp" line="585"/>
+        <location filename="../src/gui.cpp" line="586"/>
        <source>Keyboard controls</source>
        <translation>Ovládací klávesy</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="241"/>
+        <location filename="../src/gui.cpp" line="243"/>
        <source>Close</source>
        <translation>Zavřít</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="247"/>
+        <location filename="../src/gui.cpp" line="249"/>
        <source>Reload</source>
        <translation>Znovu načíst</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="476"/>
+        <location filename="../src/gui.cpp" line="497"/>
        <source>Show</source>
        <translation>Zobrazit</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="398"/>
-        <location filename="../src/gui.cpp" line="470"/>
+        <location filename="../src/gui.cpp" line="415"/>
+        <location filename="../src/gui.cpp" line="491"/>
        <source>File</source>
        <translation>Soubor</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="111"/>
-        <source>Supported files (*.csv *.fit *.gpx *.kml *.tcx)</source>
-        <translation>Podporované soubory (*.csv *.fit *.gpx *.kml *.tcx)</translation>
-    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="112"/>
+        <location filename="../src/gui.cpp" line="104"/>
        <source>FIT files (*.fit)</source>
        <translation>Soubory FIT (*.fit)</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="215"/>
-        <location filename="../src/gui.cpp" line="589"/>
-        <location filename="../src/gui.cpp" line="590"/>
+        <location filename="../src/gui.cpp" line="105"/>
+        <source>IGC files (*.igc)</source>
+        <translation>Soubory IGC (*.igc)</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="106"/>
+        <source>NMEA files (*.nmea)</source>
+        <translation>Soubory NMEA (*.nmea)</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="217"/>
+        <location filename="../src/gui.cpp" line="608"/>
+        <location filename="../src/gui.cpp" line="609"/>
        <source>Data sources</source>
        <translation>Zdroje dat</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="255"/>
+        <location filename="../src/gui.cpp" line="257"/>
        <source>Load POI file</source>
        <translation>Nahrát POI soubor</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="258"/>
+        <location filename="../src/gui.cpp" line="260"/>
        <source>Close POI files</source>
        <translation>Zavřit POI soubory</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="260"/>
+        <location filename="../src/gui.cpp" line="262"/>
        <source>Overlap POIs</source>
        <translation>Překrývat POI</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="264"/>
+        <location filename="../src/gui.cpp" line="266"/>
        <source>Show POI labels</source>
-        <translation>Zobrazovat názvy POI</translation>
+        <translation>Zobrazit názvy POI</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="269"/>
+        <location filename="../src/gui.cpp" line="271"/>
        <source>Show POIs</source>
        <translation>Zobrazit POI</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="278"/>
+        <location filename="../src/gui.cpp" line="280"/>
        <source>Show map</source>
        <translation>Zobrazit mapu</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="284"/>
+        <location filename="../src/gui.cpp" line="286"/>
        <source>Clear tile cache</source>
        <translation>Vymazat mezipaměť dlaždic</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="293"/>
-        <location filename="../src/gui.cpp" line="297"/>
-        <location filename="../src/gui.cpp" line="576"/>
+        <location filename="../src/gui.cpp" line="295"/>
+        <location filename="../src/gui.cpp" line="299"/>
+        <location filename="../src/gui.cpp" line="597"/>
        <source>Next map</source>
        <translation>Následující mapa</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="304"/>
+        <location filename="../src/gui.cpp" line="306"/>
        <source>Show tracks</source>
        <translation>Zobrazit cesty</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="308"/>
+        <location filename="../src/gui.cpp" line="310"/>
        <source>Show routes</source>
        <translation>Zobrazit trasy</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="312"/>
+        <location filename="../src/gui.cpp" line="314"/>
        <source>Show waypoints</source>
        <translation>Zobrazit navigační body</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="316"/>
+        <location filename="../src/gui.cpp" line="318"/>
        <source>Waypoint labels</source>
        <translation>Názvy navigačních bodů</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="327"/>
+        <location filename="../src/gui.cpp" line="329"/>
        <source>Show graphs</source>
-        <translation>Zobrazovat grafy</translation>
+        <translation>Zobrazit grafy</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="349"/>
+        <location filename="../src/gui.cpp" line="351"/>
        <source>Show grid</source>
        <translation>Zobrazit mřížku</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="355"/>
+        <location filename="../src/gui.cpp" line="357"/>
        <source>Show toolbars</source>
        <translation>Zobrazovat nástrojové lišty</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="361"/>
+        <location filename="../src/gui.cpp" line="363"/>
+        <source>Total time</source>
+        <translation>Celkový čas</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="368"/>
+        <location filename="../src/gui.cpp" line="876"/>
+        <source>Moving time</source>
+        <translation>Čistý čas</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="375"/>
        <source>Metric</source>
        <translation>Metrické</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="366"/>
+        <location filename="../src/gui.cpp" line="380"/>
        <source>Imperial</source>
        <translation>Imperiální</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="372"/>
+        <location filename="../src/gui.cpp" line="386"/>
        <source>Fullscreen mode</source>
        <translation>Celoobrazovkový režim</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="380"/>
+        <location filename="../src/gui.cpp" line="392"/>
+        <source>Options...</source>
+        <translation>Nastavení...</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="397"/>
        <source>Next</source>
        <translation>Následující</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="383"/>
+        <location filename="../src/gui.cpp" line="400"/>
        <source>Previous</source>
        <translation>Předchozí</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="387"/>
+        <location filename="../src/gui.cpp" line="404"/>
        <source>Last</source>
        <translation>Poslední</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="390"/>
+        <location filename="../src/gui.cpp" line="407"/>
        <source>First</source>
        <translation>První</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="412"/>
+        <location filename="../src/gui.cpp" line="429"/>
        <source>Map</source>
        <translation>Mapa</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="419"/>
+        <location filename="../src/gui.cpp" line="436"/>
        <source>Graph</source>
        <translation>Graf</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="427"/>
+        <location filename="../src/gui.cpp" line="444"/>
        <source>POI</source>
        <translation>POI</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="428"/>
+        <location filename="../src/gui.cpp" line="445"/>
        <source>POI files</source>
        <translation>POI soubory</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="439"/>
+        <location filename="../src/gui.cpp" line="456"/>
        <source>Data</source>
        <translation>Data</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="440"/>
+        <location filename="../src/gui.cpp" line="457"/>
        <source>Display</source>
        <translation>Zobrazit</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="448"/>
+        <location filename="../src/gui.cpp" line="465"/>
        <source>Settings</source>
        <translation>Nastavení</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="449"/>
+        <location filename="../src/gui.cpp" line="469"/>
        <source>Units</source>
        <translation>Jednotky</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="457"/>
+        <location filename="../src/gui.cpp" line="478"/>
        <source>Help</source>
        <translation>Nápověda</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="578"/>
+        <location filename="../src/gui.cpp" line="598"/>
        <source>Previous map</source>
        <translation>Předchozí mapa</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="113"/>
+        <location filename="../src/gui.cpp" line="1082"/>
+        <source>No files loaded</source>
+        <translation>Nejsou načteny žádné soubory</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="105"/>
        <source>GPX files (*.gpx)</source>
        <translation>Soubory GPX (*.gpx)</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="114"/>
+        <location filename="../src/gui.cpp" line="107"/>
        <source>TCX files (*.tcx)</source>
        <translation>Soubory TCX (*.tcx)</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="113"/>
+        <location filename="../src/gui.cpp" line="106"/>
        <source>KML files (*.kml)</source>
        <translation>Soubory KML (*.kml)</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="112"/>
+        <location filename="../src/gui.cpp" line="104"/>
        <source>CSV files (*.csv)</source>
        <translation>Soubory CSV (*.csv)</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="114"/>
+        <location filename="../src/gui.cpp" line="107"/>
        <source>All files (*)</source>
        <translation>Všechny soubory (*)</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="781"/>
-        <location filename="../src/gui.cpp" line="784"/>
+        <location filename="../src/gui.cpp" line="862"/>
+        <location filename="../src/gui.cpp" line="865"/>
        <source>Date</source>
        <translation>Datum</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="793"/>
+        <location filename="../src/gui.cpp" line="854"/>
        <source>Routes</source>
        <translation>Trasy</translation>
    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="981"/>
-        <source>No GPX files loaded</source>
-        <translation>Nejsou načteny žádné GPX soubory</translation>
-    </message>
    <message numerus="yes">
-        <location filename="../src/gui.cpp" line="985"/>
+        <location filename="../src/gui.cpp" line="1086"/>
        <source>%n files</source>
        <translation>
            <numerusform>%n soubor</numerusform>
@ -472,121 +493,132 @@
        </translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="569"/>
+        <location filename="../src/gui.cpp" line="588"/>
        <source>Next file</source>
        <translation>Následující soubor</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="546"/>
+        <location filename="../src/gui.cpp" line="566"/>
        <source>Version </source>
        <translation>Verze </translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="230"/>
+        <location filename="../src/gui.cpp" line="232"/>
        <source>Print...</source>
        <translation>Tisknout...</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="235"/>
+        <location filename="../src/gui.cpp" line="237"/>
        <source>Export to PDF...</source>
        <translation>Exportovat do PDF...</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="795"/>
+        <location filename="../src/gui.cpp" line="856"/>
        <source>Waypoints</source>
        <translation>Navigační body</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="570"/>
+        <location filename="../src/gui.cpp" line="590"/>
        <source>Previous file</source>
        <translation>Předchozí soubor</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="320"/>
+        <location filename="../src/gui.cpp" line="103"/>
+        <source>Supported files (*.csv *.fit *.gpx *.igc *.kml *.nmea *.tcx)</source>
+        <translation>Podporované soubory (*.csv *.fit *.gpx *.igc *.kml *.nmea *.tcx)</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="322"/>
        <source>Route waypoints</source>
        <translation>Body tras</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="572"/>
+        <location filename="../src/gui.cpp" line="592"/>
        <source>First file</source>
        <translation>První soubor</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="573"/>
+        <location filename="../src/gui.cpp" line="594"/>
        <source>Last file</source>
        <translation>Poslední soubor</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="574"/>
+        <location filename="../src/gui.cpp" line="595"/>
        <source>Append modifier</source>
        <translation>Modifikátor nahradit/přidat</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="593"/>
+        <location filename="../src/gui.cpp" line="612"/>
        <source>Map (tiles) source URLs are read on program startup from the following file:</source>
        <translation>URL mapových zdrojů (dlaždic) jsou načteny při startu programu z následujícího souboru:</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="596"/>
+        <location filename="../src/gui.cpp" line="615"/>
        <source>The file format is one map entry per line, consisting of the map name and tiles URL delimited by a TAB character. The tile X and Y coordinates are replaced with $x and $y in the URL and the zoom level is replaced with $z. An example map file could look like:</source>
        <translation>Formát souboru je jeden mapový záznam na řádku, kde mapový záznam sestává ze jména mapy a URL dlaždic navzájem oddělených tabulátorem. Souřadnice dlaždice jsou v URL nahrazeny řetězci $x a $y, úroven přiblížení (zoom) pak řetězcem $z. Příklad:</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="604"/>
+        <location filename="../src/gui.cpp" line="623"/>
        <source>To make GPXSee load a POI file automatically on startup, add the file to the following directory:</source>
        <translation>POI soubory, které se mají automaticky nahrát při startu programu jsou načítány z následujícího adresáře:</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="684"/>
+        <location filename="../src/gui.cpp" line="712"/>
        <source>Error loading data file:</source>
        <translation>Datový soubor nelze načíst:</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="687"/>
-        <location filename="../src/gui.cpp" line="712"/>
+        <location filename="../src/gui.cpp" line="715"/>
+        <location filename="../src/gui.cpp" line="740"/>
        <source>Line: %1</source>
        <translation>Řádka: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="709"/>
+        <location filename="../src/gui.cpp" line="737"/>
        <source>Error loading POI file:</source>
        <translation>Soubor POI nelze načíst:</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="791"/>
+        <location filename="../src/gui.cpp" line="848"/>
+        <source>Name</source>
+        <translation>Název</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="852"/>
        <source>Tracks</source>
        <translation>Cesty</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="220"/>
-        <location filename="../src/gui.cpp" line="544"/>
+        <location filename="../src/gui.cpp" line="222"/>
+        <location filename="../src/gui.cpp" line="565"/>
        <source>About GPXSee</source>
        <translation>O aplikaci GPXSee</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="481"/>
+        <location filename="../src/gui.cpp" line="502"/>
        <source>Navigation</source>
        <translation>Navigace</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="592"/>
+        <location filename="../src/gui.cpp" line="611"/>
        <source>Map sources</source>
        <translation>Mapové zdroje</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="603"/>
+        <location filename="../src/gui.cpp" line="622"/>
        <source>POIs</source>
        <translation>POI body</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="335"/>
-        <location filename="../src/gui.cpp" line="798"/>
+        <location filename="../src/gui.cpp" line="337"/>
+        <location filename="../src/gui.cpp" line="872"/>
        <source>Distance</source>
        <translation>Vzdálenost</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="342"/>
-        <location filename="../src/gui.cpp" line="800"/>
+        <location filename="../src/gui.cpp" line="344"/>
+        <location filename="../src/gui.cpp" line="466"/>
+        <location filename="../src/gui.cpp" line="874"/>
        <source>Time</source>
        <translation>Čas</translation>
    </message>
@ -594,48 +626,48 @@
 <context>
    <name>GraphView</name>
    <message>
-        <location filename="../src/graphview.cpp" line="102"/>
+        <location filename="../src/graphview.cpp" line="108"/>
        <source>m</source>
        <translation>m</translation>
    </message>
    <message>
-        <location filename="../src/graphview.cpp" line="105"/>
+        <location filename="../src/graphview.cpp" line="111"/>
        <source>km</source>
        <translation>km</translation>
    </message>
    <message>
-        <location filename="../src/graphview.cpp" line="110"/>
+        <location filename="../src/graphview.cpp" line="116"/>
        <source>ft</source>
        <translation>ft</translation>
    </message>
    <message>
-        <location filename="../src/graphview.cpp" line="113"/>
+        <location filename="../src/graphview.cpp" line="119"/>
        <source>mi</source>
        <translation>mi</translation>
    </message>
    <message>
-        <location filename="../src/graphview.cpp" line="119"/>
+        <location filename="../src/graphview.cpp" line="125"/>
        <source>s</source>
        <translation>s</translation>
    </message>
    <message>
-        <location filename="../src/graphview.cpp" line="122"/>
+        <location filename="../src/graphview.cpp" line="128"/>
        <source>min</source>
        <translation>min</translation>
    </message>
    <message>
-        <location filename="../src/graphview.cpp" line="125"/>
+        <location filename="../src/graphview.cpp" line="131"/>
        <source>h</source>
        <translation>h</translation>
    </message>
    <message>
-        <location filename="../src/graphview.cpp" line="54"/>
-        <location filename="../src/graphview.cpp" line="151"/>
+        <location filename="../src/graphview.cpp" line="60"/>
+        <location filename="../src/graphview.cpp" line="157"/>
        <source>Distance</source>
        <translation>Vzdálenost</translation>
    </message>
    <message>
-        <location filename="../src/graphview.cpp" line="153"/>
+        <location filename="../src/graphview.cpp" line="159"/>
        <source>Time</source>
        <translation>Čas</translation>
    </message>
@ -664,6 +696,163 @@
        <translation>Maximum</translation>
    </message>
 </context>
+<context>
+    <name>OptionsDialog</name>
+    <message>
+        <location filename="../src/optionsdialog.cpp" line="34"/>
+        <source>Base color:</source>
+        <translation>Základní barva:</translation>
+    </message>
+    <message>
+        <location filename="../src/optionsdialog.cpp" line="35"/>
+        <source>Palette shift:</source>
+        <translation>Posun palety:</translation>
+    </message>
+    <message>
+        <location filename="../src/optionsdialog.cpp" line="47"/>
+        <source>Track width:</source>
+        <translation>Šířka cest:</translation>
+    </message>
+    <message>
+        <location filename="../src/optionsdialog.cpp" line="48"/>
+        <source>Track style:</source>
+        <translation>Styl cest:</translation>
+    </message>
+    <message>
+        <location filename="../src/optionsdialog.cpp" line="50"/>
+        <source>Tracks</source>
+        <translation>Cesty</translation>
+    </message>
+    <message>
+        <location filename="../src/optionsdialog.cpp" line="60"/>
+        <source>Route width:</source>
+        <translation>Šířka tras:</translation>
+    </message>
+    <message>
+        <location filename="../src/optionsdialog.cpp" line="61"/>
+        <source>Route style:</source>
+        <translation>Styl tras:</translation>
+    </message>
+    <message>
+        <location filename="../src/optionsdialog.cpp" line="63"/>
+        <source>Routes</source>
+        <translation>Trasy</translation>
+    </message>
+    <message>
+        <location filename="../src/optionsdialog.cpp" line="67"/>
+        <location filename="../src/optionsdialog.cpp" line="99"/>
+        <source>Use anti-aliasing</source>
+        <translation>Vyhlazovat hrany</translation>
+    </message>
+    <message>
+        <location filename="../src/optionsdialog.cpp" line="97"/>
+        <source>Line width:</source>
+        <translation>Šířka čar:</translation>
+    </message>
+    <message>
+        <location filename="../src/optionsdialog.cpp" line="113"/>
+        <source>Colors</source>
+        <translation>Barvy</translation>
+    </message>
+    <message>
+        <location filename="../src/optionsdialog.cpp" line="114"/>
+        <source>Paths</source>
+        <translation>Trasy</translation>
+    </message>
+    <message>
+        <location filename="../src/optionsdialog.cpp" line="115"/>
+        <location filename="../src/optionsdialog.cpp" line="183"/>
+        <source>Graphs</source>
+        <translation>Grafy</translation>
+    </message>
+    <message>
+        <location filename="../src/optionsdialog.cpp" line="127"/>
+        <source>mi</source>
+        <translation>mi</translation>
+    </message>
+    <message>
+        <location filename="../src/optionsdialog.cpp" line="130"/>
+        <source>km</source>
+        <translation>km</translation>
+    </message>
+    <message>
+        <location filename="../src/optionsdialog.cpp" line="134"/>
+        <source>POI radius:</source>
+        <translation>POI radius:</translation>
+    </message>
+    <message>
+        <location filename="../src/optionsdialog.cpp" line="140"/>
+        <location filename="../src/optionsdialog.cpp" line="224"/>
+        <source>POI</source>
+        <translation>POI</translation>
+    </message>
+    <message>
+        <location filename="../src/optionsdialog.cpp" line="147"/>
+        <source>Name</source>
+        <translation>Název</translation>
+    </message>
+    <message>
+        <location filename="../src/optionsdialog.cpp" line="149"/>
+        <source>Date</source>
+        <translation>Datum</translation>
+    </message>
+    <message>
+        <location filename="../src/optionsdialog.cpp" line="151"/>
+        <source>Distance</source>
+        <translation>Vzdálenost</translation>
+    </message>
+    <message>
+        <location filename="../src/optionsdialog.cpp" line="153"/>
+        <source>Time</source>
+        <translation>Čas</translation>
+    </message>
+    <message>
+        <location filename="../src/optionsdialog.cpp" line="155"/>
+        <source>Moving time</source>
+        <translation>Čistý čas</translation>
+    </message>
+    <message>
+        <location filename="../src/optionsdialog.cpp" line="157"/>
+        <source>Item count (&gt;1)</source>
+        <translation>Počet objektů (&gt;1)</translation>
+    </message>
+    <message>
+        <location filename="../src/optionsdialog.cpp" line="172"/>
+        <source>Separate graph page</source>
+        <translation>Samostatná stránka s grafy</translation>
+    </message>
+    <message>
+        <location filename="../src/optionsdialog.cpp" line="182"/>
+        <source>Header</source>
+        <translation>Záhlaví</translation>
+    </message>
+    <message>
+        <location filename="../src/optionsdialog.cpp" line="190"/>
+        <source>Use OpenGL</source>
+        <translation>Používat OpenGL</translation>
+    </message>
+    <message>
+        <location filename="../src/optionsdialog.cpp" line="206"/>
+        <location filename="../src/optionsdialog.cpp" line="227"/>
+        <source>System</source>
+        <translation>Systém</translation>
+    </message>
+    <message>
+        <location filename="../src/optionsdialog.cpp" line="222"/>
+        <source>Appearance</source>
+        <translation>Vzhled</translation>
+    </message>
+    <message>
+        <location filename="../src/optionsdialog.cpp" line="225"/>
+        <source>Print &amp; Export</source>
+        <translation>Tisk a export</translation>
+    </message>
+    <message>
+        <location filename="../src/optionsdialog.cpp" line="254"/>
+        <source>Options</source>
+        <translation>Nastavení</translation>
+    </message>
+</context>
 <context>
    <name>PowerGraph</name>
    <message>
@ -691,17 +880,17 @@
 <context>
    <name>RouteItem</name>
    <message>
-        <location filename="../src/routeitem.cpp" line="15"/>
+        <location filename="../src/routeitem.cpp" line="14"/>
        <source>Name</source>
        <translation>Název</translation>
    </message>
    <message>
-        <location filename="../src/routeitem.cpp" line="17"/>
+        <location filename="../src/routeitem.cpp" line="16"/>
        <source>Description</source>
        <translation>Popis</translation>
    </message>
    <message>
-        <location filename="../src/routeitem.cpp" line="18"/>
+        <location filename="../src/routeitem.cpp" line="17"/>
        <source>Distance</source>
        <translation>Vzdálenost</translation>
    </message>
@ -709,22 +898,22 @@
 <context>
    <name>ScaleItem</name>
    <message>
-        <location filename="../src/scaleitem.cpp" line="90"/>
+        <location filename="../src/scaleitem.cpp" line="81"/>
        <source>mi</source>
        <translation>mi</translation>
    </message>
    <message>
-        <location filename="../src/scaleitem.cpp" line="91"/>
+        <location filename="../src/scaleitem.cpp" line="82"/>
        <source>ft</source>
        <translation>ft</translation>
    </message>
    <message>
-        <location filename="../src/scaleitem.cpp" line="93"/>
+        <location filename="../src/scaleitem.cpp" line="84"/>
        <source>km</source>
        <translation>km</translation>
    </message>
    <message>
-        <location filename="../src/scaleitem.cpp" line="94"/>
+        <location filename="../src/scaleitem.cpp" line="85"/>
        <source>m</source>
        <translation>m</translation>
    </message>
@ -738,7 +927,7 @@
        <translation>Rychlost</translation>
    </message>
    <message>
-        <location filename="../src/speedgraph.cpp" line="74"/>
+        <location filename="../src/speedgraph.cpp" line="78"/>
        <source>km/h</source>
        <translation>km/h</translation>
    </message>
@ -753,7 +942,7 @@
        <translation>Maximum</translation>
    </message>
    <message>
-        <location filename="../src/speedgraph.cpp" line="77"/>
+        <location filename="../src/speedgraph.cpp" line="81"/>
        <source>mi/h</source>
        <translation>mi/h</translation>
    </message>
@ -795,27 +984,32 @@
 <context>
    <name>TrackItem</name>
    <message>
-        <location filename="../src/trackitem.cpp" line="14"/>
+        <location filename="../src/trackitem.cpp" line="12"/>
        <source>Name</source>
        <translation>Název</translation>
    </message>
    <message>
-        <location filename="../src/trackitem.cpp" line="16"/>
+        <location filename="../src/trackitem.cpp" line="14"/>
        <source>Description</source>
        <translation>Popis</translation>
    </message>
    <message>
-        <location filename="../src/trackitem.cpp" line="17"/>
+        <location filename="../src/trackitem.cpp" line="15"/>
        <source>Distance</source>
        <translation>Vzdálenost</translation>
    </message>
    <message>
-        <location filename="../src/trackitem.cpp" line="20"/>
-        <source>Time</source>
-        <translation>Čas</translation>
+        <location filename="../src/trackitem.cpp" line="17"/>
+        <source>Total time</source>
+        <translation>Celkový čas</translation>
    </message>
    <message>
-        <location filename="../src/trackitem.cpp" line="23"/>
+        <location filename="../src/trackitem.cpp" line="19"/>
+        <source>Moving time</source>
+        <translation>Čistý čas</translation>
+    </message>
+    <message>
+        <location filename="../src/trackitem.cpp" line="21"/>
        <source>Date</source>
        <translation>Datum</translation>
    </message>
--- a/lang/gpxsee_sv.ts
+++ b/lang/gpxsee_sv.ts
--- a/pkg/gpxsee.nsi
+++ b/pkg/gpxsee.nsi
@ -1,10 +1,11 @@
 !include "MUI2.nsh"
 !include "x64.nsh"
+!include "WinVer.nsh"

 ; The name of the installer
 Name "GPXSee"
 ; Program version
-!define VERSION "3.1"
+!define VERSION "3.9"

 ; The file to write
 OutFile "GPXSee-${VERSION}.exe"
@ -27,6 +28,7 @@ InstallDirRegKey HKLM "Software\GPXSee" "Install_Dir"
 !define REGKML "GPXSee.kml"
 !define REGFIT "GPXSee.fit"
 !define REGIGC "GPXSee.igc"
+!define REGNMEA "GPXSee.nmea"

 ; Start menu page configuration
 !define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKLM" 
@ -54,9 +56,15 @@ Var StartMenuFolder
 ; Languages
 !insertmacro MUI_LANGUAGE "English"

+Function .onInit
+  ${IfNot} ${AtLeastWin7}
+    MessageBox MB_OK "GPXSee can only be installed on Windows 7 or later."
+    Abort
+  ${EndIf}
+FunctionEnd 

 ; The stuff to install
-Section "GPXSee (required)" SEC_APP
+Section "GPXSee" SEC_APP

  SectionIn RO
  
@ -112,19 +120,24 @@ Section "GPXSee (required)" SEC_APP
  WriteRegStr HKCR "${REGIGC}" ""  "Flight Recorder Data Format"
  WriteRegStr HKCR "${REGIGC}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,5"
  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,6"
+  WriteRegStr HKCR "${REGNMEA}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
+
  System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'

 SectionEnd

-Section "QT libs" SEC_QT
+Section "QT framework" SEC_QT
+
+  SectionIn RO

  File "Qt5Core.dll"
  File "Qt5Gui.dll"
  File "Qt5Widgets.dll"
  File "Qt5PrintSupport.dll"
  File "Qt5Network.dll"
-  File "libGLESv2.dll"
  File /r "platforms"
  File /r "imageformats"
  File /r "printsupport"
@ -133,6 +146,8 @@ SectionEnd

 Section "MSVC runtime" SEC_MSVC

+  SectionIn RO
+
  DetailPrint "Checking whether Visual C++ 2015 Redistributable is already installed..."
  ${If} ${RunningX64}
    ReadRegDword $R0 HKLM "SOFTWARE\Wow6432Node\Microsoft\VisualStudio\14.0\VC\Runtimes\x86" "Installed"
@ -152,6 +167,21 @@ Section "MSVC runtime" SEC_MSVC
  done:
 SectionEnd

+Section "OpenSSL" SEC_OPENSSL
+
+  File "libeay32.dll"
+  File "ssleay32.dll"
+
+SectionEnd
+
+Section "ANGLE" SEC_ANGLE
+
+  File "libGLESv2.dll"
+  File "libEGL.dll"
+  File "D3DCompiler_47.dll"
+
+SectionEnd
+
 ;--------------------------------

 ; Uninstaller
@ -182,6 +212,8 @@ Section "Uninstall"
  DeleteRegKey HKCR ".fit"
  DeleteRegKey HKCR "${REGIGC}"
  DeleteRegKey HKCR ".igc"
+  DeleteRegKey HKCR "${REGNMEA}"
+  DeleteRegKey HKCR ".nmea"
  System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'  

 SectionEnd
@ -192,15 +224,21 @@ SectionEnd

 ;Language strings
 LangString DESC_QT ${LANG_ENGLISH} \
-  "QT Library. Unselct only if you have QT already installed!"
+  "QT cross-platform application framework."
 LangString DESC_MSVC ${LANG_ENGLISH} \
-  "Visual C++ 2015 runtime components. Unselct only if you have the runtime already installed!"
+  "Visual C++ 2015 runtime components. If already installed, will be skipped."
+LangString DESC_OPENSSL ${LANG_ENGLISH} \
+  "OpenSSL library. Required for HTTPS to work."
+LangString DESC_ANGLE ${LANG_ENGLISH} \
+  "ANGLE (OpenGL via Direct3D). Enables OpenGL on systems without native OpenGL drivers."
 LangString DESC_APP ${LANG_ENGLISH} \
  "GPXSee application"

 ;Assign language strings to sections
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
  !insertmacro MUI_DESCRIPTION_TEXT ${SEC_QT} $(DESC_QT)
+  !insertmacro MUI_DESCRIPTION_TEXT ${SEC_OPENSSL} $(DESC_OPENSSL)
+  !insertmacro MUI_DESCRIPTION_TEXT ${SEC_ANGLE} $(DESC_ANGLE)
  !insertmacro MUI_DESCRIPTION_TEXT ${SEC_MSVC} $(DESC_MSVC) 
  !insertmacro MUI_DESCRIPTION_TEXT ${SEC_APP} $(DESC_APP)
 !insertmacro MUI_FUNCTION_DESCRIPTION_END
--- a/pkg/gpxsee64.nsi
+++ b/pkg/gpxsee64.nsi
@ -1,10 +1,11 @@
 !include "MUI2.nsh"
 !include "x64.nsh"
+!include "WinVer.nsh"

 ; The name of the installer
 Name "GPXSee"
 ; Program version
-!define VERSION "3.1"
+!define VERSION "3.9"

 ; The file to write
 OutFile "GPXSee-${VERSION}_x64.exe"
@ -27,6 +28,7 @@ InstallDirRegKey HKLM "Software\GPXSee" "Install_Dir"
 !define REGKML "GPXSee.kml"
 !define REGFIT "GPXSee.fit"
 !define REGIGC "GPXSee.igc"
+!define REGNMEA "GPXSee.nmea"

 ; Start menu page configuration
 !define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKLM" 
@ -54,7 +56,12 @@ Var StartMenuFolder
 ; Languages
 !insertmacro MUI_LANGUAGE "English"

-Function .onInit  
+Function .onInit
+  ${IfNot} ${AtLeastWin7}
+    MessageBox MB_OK "GPXSee can only be installed on Windows 7 or later."
+    Abort
+  ${EndIf}
+  
  ${If} ${RunningX64}
    SetRegView 64
  ${Else}  
@ -64,7 +71,7 @@ Function .onInit
 FunctionEnd 

 ; The stuff to install
-Section "GPXSee (required)" SEC_APP
+Section "GPXSee" SEC_APP

  SectionIn RO
  
@ -120,19 +127,24 @@ Section "GPXSee (required)" SEC_APP
  WriteRegStr HKCR "${REGIGC}" ""  "Flight Recorder Data Format"
  WriteRegStr HKCR "${REGIGC}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,5"
  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,6"
+  WriteRegStr HKCR "${REGNMEA}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
  
  System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'

 SectionEnd

-Section "QT libs" SEC_QT
+Section "QT framework" SEC_QT
+
+  SectionIn RO

  File "Qt5Core.dll"
  File "Qt5Gui.dll"
  File "Qt5Widgets.dll"
  File "Qt5PrintSupport.dll"
  File "Qt5Network.dll"
-  File "libGLESv2.dll"
  File /r "platforms"
  File /r "imageformats"
  File /r "printsupport"
@ -141,6 +153,8 @@ SectionEnd

 Section "MSVC runtime" SEC_MSVC

+  SectionIn RO
+
  DetailPrint "Checking whether Visual C++ 2015 Redistributable is already installed..."
  ReadRegDword $R0 HKLM "SOFTWARE\Wow6432Node\Microsoft\VisualStudio\14.0\VC\Runtimes\x64" "Installed"
  StrCmp $R0 "1" 0 +3
@ -155,6 +169,21 @@ Section "MSVC runtime" SEC_MSVC
  done:
 SectionEnd

+Section "OpenSSL" SEC_OPENSSL
+
+  File "libeay32.dll"
+  File "ssleay32.dll"
+
+SectionEnd
+
+Section "ANGLE" SEC_ANGLE
+
+  File "libGLESv2.dll"
+  File "libEGL.dll"
+  File "D3DCompiler_47.dll"
+
+SectionEnd
+
 ;--------------------------------

 ; Uninstaller
@ -186,6 +215,8 @@ Section "Uninstall"
  DeleteRegKey HKCR ".fit"
  DeleteRegKey HKCR "${REGIGC}"
  DeleteRegKey HKCR ".igc"
+  DeleteRegKey HKCR "${REGNMEA}"
+  DeleteRegKey HKCR ".nmea"
  System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'

 SectionEnd
@ -196,15 +227,21 @@ SectionEnd

 ;Language strings
 LangString DESC_QT ${LANG_ENGLISH} \
-  "QT Library. Unselct only if you have QT already installed!"
+  "QT cross-platform application framework."
 LangString DESC_MSVC ${LANG_ENGLISH} \
-  "Visual C++ 2015 runtime components. Unselct only if you have the runtime already installed!"
+  "Visual C++ 2015 runtime components. If already installed, will be skipped."
+LangString DESC_OPENSSL ${LANG_ENGLISH} \
+  "OpenSSL library. Required for HTTPS to work."
+LangString DESC_ANGLE ${LANG_ENGLISH} \
+  "ANGLE (OpenGL via Direct3D). Enables OpenGL on systems without native OpenGL drivers."
 LangString DESC_APP ${LANG_ENGLISH} \
  "GPXSee application"

 ;Assign language strings to sections
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
  !insertmacro MUI_DESCRIPTION_TEXT ${SEC_QT} $(DESC_QT)
+  !insertmacro MUI_DESCRIPTION_TEXT ${SEC_OPENSSL} $(DESC_OPENSSL)
+  !insertmacro MUI_DESCRIPTION_TEXT ${SEC_ANGLE} $(DESC_ANGLE)
  !insertmacro MUI_DESCRIPTION_TEXT ${SEC_MSVC} $(DESC_MSVC) 
  !insertmacro MUI_DESCRIPTION_TEXT ${SEC_APP} $(DESC_APP)
 !insertmacro MUI_FUNCTION_DESCRIPTION_END
--- a/pkg/maps.txt
+++ b/pkg/maps.txt
@ -1,2 +1,3 @@
+Open Topo Map	https://a.tile.opentopomap.org/$z/$x/$y.png
 Thunderforest	http://tile.thunderforest.com/outdoors/$z/$x/$y.png
 Open Street Map	http://tile.openstreetmap.org/$z/$x/$y.png
--- a/src/app.cpp
+++ b/src/app.cpp
@ -3,6 +3,8 @@
 #include <QLocale>
 #include <QFileOpenEvent>
 #include <QNetworkProxyFactory>
+#include <QPixmapCache>
+#include "opengl.h"
 #include "gui.h"
 #include "app.h"

@ -20,6 +22,8 @@ App::App(int &argc, char **argv) : QApplication(argc, argv),
 #endif // Q_OS_MAC

 	QNetworkProxyFactory::setUseSystemConfiguration(true);
+	QPixmapCache::setCacheLimit(65536);
+	OPENGL_SET_SAMPLES(4);

 	_gui = new GUI();
 }
--- a/src/colorbox.cpp
+++ b/src/colorbox.cpp
@ -0,0 +1,68 @@
+#include <QStylePainter>
+#include <QStyleOptionComboBox>
+#include <QMouseEvent>
+#include <QColorDialog>
+#include <QComboBox>
+#include "colorbox.h"
+
+
+ColorBox::ColorBox(QWidget *parent) : QWidget(parent)
+{
+	_color = Qt::red;
+	setSizePolicy(QSizePolicy::QSizePolicy::Minimum, QSizePolicy::Fixed);
+}
+
+QSize ColorBox::sizeHint() const
+{
+	static QSize size;
+	if (size.isValid())
+		return size;
+
+	QComboBox cb;
+	size = cb.sizeHint();
+	return size;
+}
+
+void ColorBox::paintEvent(QPaintEvent *event)
+{
+	Q_UNUSED(event);
+
+    QStylePainter painter(this);
+
+    QStyleOptionComboBox option;
+	option.initFrom(this);
+
+#if defined(Q_OS_MAC) || defined(Q_OS_WIN32)
+	painter.setBrush(_color);
+	painter.drawPrimitive(QStyle::PE_Frame, option);
+#else // Q_OS_MAC || Q_OS_WIN32
+	// Fallback for some broken QT4 styles that do not draw the background
+	painter.setBrush(_color);
+	painter.setPen(Qt::NoPen);
+	painter.drawRect(event->rect().adjusted(2, 2, -2, -2));
+	// If works (QT5 and most QT4 styles) overpaints the previous rectangle
+	option.palette.setBrush(QPalette::Base, _color);
+	painter.drawPrimitive(QStyle::PE_PanelLineEdit, option);
+	painter.drawPrimitive(QStyle::PE_FrameLineEdit, option);
+#endif // Q_OS_MAC || Q_OS_WIN32
+}
+
+void ColorBox::mousePressEvent(QMouseEvent *event)
+{
+	if (event->button() != Qt::LeftButton)
+		return;
+
+	QColor color = QColorDialog::getColor(_color, this, QString(),
+	  QColorDialog::ShowAlphaChannel);
+	if (color.isValid()) {
+		_color = color;
+		update();
+		emit colorChanged(_color);
+	}
+}
+
+void ColorBox::setColor(const QColor &color)
+{
+	_color = color;
+	update();
+}
--- a/src/colorbox.h
+++ b/src/colorbox.h
@ -0,0 +1,29 @@
+#ifndef COLORBOX_H
+#define COLORBOX_H
+
+#include <QWidget>
+
+class ColorBox : public QWidget
+{
+	Q_OBJECT
+
+public:
+	ColorBox(QWidget *parent = 0);
+
+	const QColor &color() const {return _color;}
+	void setColor(const QColor &color);
+
+	QSize sizeHint() const;
+
+signals:
+	void colorChanged(const QColor &color);
+
+protected:
+	void mousePressEvent(QMouseEvent *event);
+	void paintEvent(QPaintEvent *event);
+
+private:
+	QColor _color;
+};
+
+#endif // COLORBOX_H
--- a/src/coordinates.cpp
+++ b/src/coordinates.cpp
@ -2,6 +2,10 @@
 #include "wgs84.h"
 #include "coordinates.h"

+#define MIN_LAT deg2rad(-90.0)
+#define MAX_LAT deg2rad(90.0)
+#define MIN_LON deg2rad(-180.0)
+#define MAX_LON deg2rad(180.0)

 qreal Coordinates::distanceTo(const Coordinates &c) const
 {
@ -35,3 +39,32 @@ QDebug operator<<(QDebug dbg, const Coordinates &coordinates)

 	return dbg.maybeSpace();
 }
+
+QPair<Coordinates, Coordinates> Coordinates::boundingRect(qreal distance) const
+{
+	qreal radDist = distance / WGS84_RADIUS;
+
+	qreal minLat = deg2rad(_lat) - radDist;
+	qreal maxLat = deg2rad(_lat) + radDist;
+
+	qreal minLon, maxLon;
+	if (minLat > MIN_LAT && maxLat < MAX_LAT) {
+		qreal deltaLon = asin(sin(radDist) / cos(_lat));
+		minLon = deg2rad(_lon) - deltaLon;
+		if (minLon < MIN_LON)
+			minLon += 2.0 * M_PI;
+		maxLon = deg2rad(_lon) + deltaLon;
+		if (maxLon > MAX_LON)
+			maxLon -= 2.0 * M_PI;
+	} else {
+		// a pole is within the distance
+		minLat = qMax(minLat, MIN_LAT);
+		maxLat = qMin(maxLat, MAX_LAT);
+		minLon = MIN_LON;
+		maxLon = MAX_LON;
+	}
+
+	return QPair<Coordinates, Coordinates>(Coordinates(rad2deg(qMin(minLon,
+	  maxLon)), rad2deg(qMin(minLat, maxLat))), Coordinates(rad2deg(qMax(minLon,
+	  maxLon)), rad2deg(qMax(minLat, maxLat))));
+}
--- a/src/coordinates.h
+++ b/src/coordinates.h
@ -26,6 +26,7 @@ public:
 		&& _lat <= 90.0) ? true : false;}

 	qreal distanceTo(const Coordinates &c) const;
+	QPair<Coordinates, Coordinates> boundingRect(qreal distance) const;

 	QPointF toMercator() const;
 	static Coordinates fromMercator(const QPointF &m);
--- a/src/data.cpp
+++ b/src/data.cpp
@ -7,6 +7,7 @@
 #include "kmlparser.h"
 #include "fitparser.h"
 #include "igcparser.h"
+#include "nmeaparser.h"
 #include "data.h"


@ -24,6 +25,8 @@ Data::Data() : _errorLine(0)
 	  _waypointData));
 	_parsers.insert("igc", new IGCParser(_trackData, _routeData,
 	  _waypointData));
+	_parsers.insert("nmea", new NMEAParser(_trackData, _routeData,
+	  _waypointData));
 }

 Data::~Data()
--- a/src/downloader.cpp
+++ b/src/downloader.cpp
@ -1,5 +1,7 @@
 #include <QFile>
 #include <QFileInfo>
+#include <QNetworkRequest>
+#include <QNetworkReply>
 #include "config.h"
 #include "downloader.h"

@ -17,25 +19,39 @@
 #define USER_AGENT \
 	APP_NAME "/" APP_VERSION " (" PLATFORM_STR "; Qt " QT_VERSION_STR ")"

-Downloader::Downloader()
+#define ATTR_REDIRECT QNetworkRequest::RedirectionTargetAttribute
+#define ATTR_FILE     QNetworkRequest::User
+#define ATTR_ORIGIN   (QNetworkRequest::Attribute)(QNetworkRequest::User + 1)
+#define ATTR_LEVEL    (QNetworkRequest::Attribute)(QNetworkRequest::User + 2)
+
+#define MAX_REDIRECT_LEVEL 5
+
+
+Downloader::Downloader(QObject *parent) : QObject(parent)
 {
 	connect(&_manager, SIGNAL(finished(QNetworkReply*)),
 			SLOT(downloadFinished(QNetworkReply*)));
 }

-bool Downloader::doDownload(const Download &dl)
+bool Downloader::doDownload(const Download &dl, const Redirect &redirect)
 {
 	QUrl url(dl.url());

 	if (_errorDownloads.contains(url))
 		return false;
+	if (_currentDownloads.contains(url))
+		return false;

 	QNetworkRequest request(url);
-	request.setAttribute(QNetworkRequest::User, QVariant(dl.file()));
+	request.setAttribute(ATTR_FILE, QVariant(dl.file()));
+	if (!redirect.isNull()) {
+		request.setAttribute(ATTR_ORIGIN, QVariant(redirect.origin()));
+		request.setAttribute(ATTR_LEVEL, QVariant(redirect.level()));
+	}
 	request.setRawHeader("User-Agent", USER_AGENT);
 	QNetworkReply *reply = _manager.get(request);

-	_currentDownloads.append(reply);
+	_currentDownloads.insert(url, reply);

 	return true;
 }
@ -58,26 +74,49 @@ bool Downloader::saveToDisk(const QString &filename, QIODevice *data)

 void Downloader::downloadFinished(QNetworkReply *reply)
 {
-	QUrl url = reply->url();
+	QUrl url = reply->request().url();
+
 	if (reply->error()) {
-		_errorDownloads.insert(url);
-		fprintf(stderr, "Error downloading map tile: %s: %s\n",
-		  url.toEncoded().constData(), qPrintable(reply->errorString()));
+		QUrl origin = reply->request().attribute(ATTR_ORIGIN).toUrl();
+		if (origin.isEmpty()) {
+			_errorDownloads.insert(url);
+			fprintf(stderr, "Error downloading map tile: %s: %s\n",
+			  url.toEncoded().constData(), qPrintable(reply->errorString()));
+		} else {
+			_errorDownloads.insert(origin);
+			fprintf(stderr, "Error downloading map tile: %s -> %s: %s\n",
+			  origin.toEncoded().constData(), url.toEncoded().constData(),
+			  qPrintable(reply->errorString()));
+		}
 	} else {
-		QUrl redirect = reply->attribute(
-		  QNetworkRequest::RedirectionTargetAttribute).toUrl();
-		QString filename = reply->request().attribute(QNetworkRequest::User)
+		QUrl location = reply->attribute(ATTR_REDIRECT).toUrl();
+		QString filename = reply->request().attribute(ATTR_FILE)
 		  .toString();

-		if (!redirect.isEmpty()) {
-			Download dl(redirect, filename);
-			doDownload(dl);
+		if (!location.isEmpty()) {
+			QUrl origin = reply->request().attribute(ATTR_ORIGIN).toUrl();
+			int level = reply->request().attribute(ATTR_LEVEL).toInt();
+
+			if (location == url) {
+				_errorDownloads.insert(url);
+				fprintf(stderr, "Error downloading map tile: %s: "
+				  "redirect loop\n", url.toEncoded().constData());
+			} else if (level >= MAX_REDIRECT_LEVEL) {
+				_errorDownloads.insert(origin);
+				fprintf(stderr, "Error downloading map tile: %s: "
+				  "redirect level limit reached\n",
+				  origin.toEncoded().constData());
+			} else {
+				Redirect redirect(origin.isEmpty() ? url : origin, level + 1);
+				Download dl(location, filename);
+				doDownload(dl, redirect);
+			}
 		} else
 			if (!saveToDisk(filename, reply))
 				_errorDownloads.insert(url);
 	}

-	_currentDownloads.removeAll(reply);
+	_currentDownloads.remove(url);
 	reply->deleteLater();

 	if (_currentDownloads.isEmpty())
--- a/src/downloader.h
+++ b/src/downloader.h
@ -2,13 +2,14 @@
 #define DOWNLOADER_H

 #include <QNetworkAccessManager>
-#include <QNetworkRequest>
-#include <QNetworkReply>
 #include <QUrl>
 #include <QList>
+#include <QMap>
 #include <QSet>


+class QNetworkReply;
+
 class Download
 {
 public:
@ -28,8 +29,8 @@ class Downloader : public QObject
 	Q_OBJECT

 public:
-	static Downloader& instance()
-		{static Downloader i; return i;}
+	Downloader(QObject *parent = 0);
+
 	bool get(const QList<Download> &list);

 signals:
@ -39,15 +40,28 @@ private slots:
 	void downloadFinished(QNetworkReply *reply);

 private:
-	Downloader();
-	Downloader(Downloader const&);
-	void operator=(Downloader const&);
+	class Redirect
+	{
+	public:
+		Redirect() : _level(0) {}
+		Redirect(const QUrl &origin, int level) :
+		  _origin(origin), _level(level) {}

-	bool doDownload(const Download &dl);
+		const QUrl &origin() const {return _origin;}
+		int level() const {return _level;}
+
+		bool isNull() const {return (_level == 0);}
+
+	private:
+		QUrl _origin;
+		int _level;
+	};
+
+	bool doDownload(const Download &dl, const Redirect &redirect = Redirect());
 	bool saveToDisk(const QString &filename, QIODevice *data);

 	QNetworkAccessManager _manager;
-	QList<QNetworkReply *> _currentDownloads;
+	QMap<QUrl, QNetworkReply *> _currentDownloads;
 	QSet<QUrl> _errorDownloads;
 };

--- a/src/exportdialog.cpp
+++ b/src/exportdialog.cpp
@ -11,23 +11,19 @@
 #include <QMessageBox>
 #include <QTabWidget>
 #include <QDoubleSpinBox>
-#include <QLocale>
 #include "fileselectwidget.h"
 #include "units.h"
 #include "exportdialog.h"


-ExportDialog::ExportDialog(QPrinter *printer, QWidget *parent)
-  : QDialog(parent), _printer(printer)
+ExportDialog::ExportDialog(Export *exp, QWidget *parent)
+  : QDialog(parent), _export(exp)
 {
 	int index;

-	_units = (QLocale::system().measurementSystem()
-	  == QLocale::ImperialSystem) ? QPrinter::Inch : QPrinter::Millimeter;
-
 	_fileSelect = new FileSelectWidget();
 	_fileSelect->setFilter(tr("PDF files (*.pdf);;All files (*)"));
-	_fileSelect->setFile(_printer->outputFileName());
+	_fileSelect->setFile(_export->fileName);

 	_paperSize = new QComboBox();
 	_paperSize->addItem("A3", QPrinter::A3);
@ -36,7 +32,7 @@ ExportDialog::ExportDialog(QPrinter *printer, QWidget *parent)
 	_paperSize->addItem("Tabloid", QPrinter::Tabloid);
 	_paperSize->addItem("Legal", QPrinter::Legal);
 	_paperSize->addItem("Letter", QPrinter::Letter);
-	if ((index = _paperSize->findData(_printer->paperSize())) >= 0)
+	if ((index = _paperSize->findData(_export->paperSize)) >= 0)
 		_paperSize->setCurrentIndex(index);

 	_portrait = new QRadioButton(tr("Portrait"));
@ -44,32 +40,34 @@ ExportDialog::ExportDialog(QPrinter *printer, QWidget *parent)
 	QHBoxLayout *orientationLayout = new QHBoxLayout();
 	orientationLayout->addWidget(_portrait);
 	orientationLayout->addWidget(_landscape);
-	if (_printer->orientation() == QPrinter::Portrait)
+	if (_export->orientation == QPrinter::Portrait)
 		_portrait->setChecked(true);
 	else
 		_landscape->setChecked(true);

-	qreal top, bottom, left, right;
-
-	_printer->getPageMargins(&left, &top, &right, &bottom, _units);
-	QString us = _units == QPrinter::Inch ? tr("in") : tr("mm");
 	_topMargin = new QDoubleSpinBox();
 	_bottomMargin = new QDoubleSpinBox();
 	_leftMargin = new QDoubleSpinBox();
 	_rightMargin = new QDoubleSpinBox();
-	_topMargin->setValue(top);
+	QString us = (_export->units == Imperial) ? tr("in") : tr("mm");
 	_topMargin->setSuffix(UNIT_SPACE + us);
-	_bottomMargin->setValue(bottom);
 	_bottomMargin->setSuffix(UNIT_SPACE + us);
-	_leftMargin->setValue(left);
 	_leftMargin->setSuffix(UNIT_SPACE + us);
-	_rightMargin->setValue(right);
 	_rightMargin->setSuffix(UNIT_SPACE + us);
-	if (_units == QPrinter::Inch) {
+	if (_export->units == Imperial) {
+		_topMargin->setValue(_export->margins.top() * MM2IN);
+		_bottomMargin->setValue(_export->margins.bottom() * MM2IN);
+		_leftMargin->setValue(_export->margins.left() * MM2IN);
+		_rightMargin->setValue(_export->margins.right() * MM2IN);
 		_topMargin->setSingleStep(0.1);
 		_bottomMargin->setSingleStep(0.1);
 		_leftMargin->setSingleStep(0.1);
 		_rightMargin->setSingleStep(0.1);
+	} else {
+		_topMargin->setValue(_export->margins.top());
+		_bottomMargin->setValue(_export->margins.bottom());
+		_leftMargin->setValue(_export->margins.left());
+		_rightMargin->setValue(_export->margins.right());
 	}

 	QGridLayout *marginsLayout = new QGridLayout();
@ -164,12 +162,16 @@ void ExportDialog::accept()
 	QPrinter::PaperSize paperSize = static_cast<QPrinter::PaperSize>
 	  (_paperSize->itemData(_paperSize->currentIndex()).toInt());

-	_printer->setOutputFormat(QPrinter::PdfFormat);
-	_printer->setOutputFileName(_fileSelect->file());
-	_printer->setPaperSize(paperSize);
-	_printer->setOrientation(orientation);
-	_printer->setPageMargins(_leftMargin->value(), _topMargin->value(),
-	  _rightMargin->value(), _bottomMargin->value(), _units);
+	_export->fileName = _fileSelect->file();
+	_export->paperSize = paperSize;
+	_export->orientation = orientation;
+	if (_export->units == Imperial)
+		_export->margins = MarginsF(_leftMargin->value() / MM2IN,
+		_topMargin->value() / MM2IN, _rightMargin->value() / MM2IN,
+		_bottomMargin->value() / MM2IN);
+	else
+		_export->margins = MarginsF(_leftMargin->value(), _topMargin->value(),
+		  _rightMargin->value(), _bottomMargin->value());

 	QDialog::accept();
 }
--- a/src/exportdialog.h
+++ b/src/exportdialog.h
@ -3,18 +3,29 @@

 #include <QDialog>
 #include <QPrinter>
+#include "margins.h"
+#include "units.h"

 class QComboBox;
 class QRadioButton;
 class FileSelectWidget;
 class QDoubleSpinBox;

+struct Export {
+	QString fileName;
+	QPrinter::PaperSize paperSize;
+	QPrinter::Orientation orientation;
+	MarginsF margins;
+
+	Units units;
+};
+
 class ExportDialog : public QDialog
 {
 	Q_OBJECT

 public:
-	ExportDialog(QPrinter *printer, QWidget *parent = 0);
+	ExportDialog(Export *exp, QWidget *parent = 0);

 public slots:
 	void accept();
@ -22,9 +33,7 @@ public slots:
 private:
 	bool checkFile();

-	QPrinter *_printer;
-
-	QPrinter::Unit _units;
+	Export *_export;

 	FileSelectWidget *_fileSelect;
 	QComboBox *_paperSize;
--- a/src/graph.cpp
+++ b/src/graph.cpp
@ -1,9 +1,9 @@
 #include "graph.h"

-QDebug operator<<(QDebug dbg, const GraphPoint &graphpoint)
+QDebug operator<<(QDebug dbg, const GraphPoint &point)
 {
-	dbg.nospace() << "GraphPoint(" << graphpoint.s() << ", "
-	  << graphpoint.t() << ", " << graphpoint.y() << ")";
+	dbg.nospace() << "GraphPoint(" << point.s() << ", " << point.t() << ", "
+	  << point.y() << ")";

 	return dbg.maybeSpace();
 }
--- a/src/graph.h
+++ b/src/graph.h
@ -29,7 +29,7 @@ private:
 };

 Q_DECLARE_TYPEINFO(GraphPoint, Q_PRIMITIVE_TYPE);
-QDebug operator<<(QDebug dbg, const GraphPoint &graphpoint);
+QDebug operator<<(QDebug dbg, const GraphPoint &point);


 class Graph : public QVector<GraphPoint>
--- a/src/graphitem.cpp
+++ b/src/graphitem.cpp
@ -2,20 +2,20 @@
 #include "graphitem.h"


-#define GRAPH_WIDTH 1
-#define HOVER_WIDTH 2
-
 GraphItem::GraphItem(const Graph &graph, QGraphicsItem *parent)
  : QGraphicsObject(parent)
 {
 	_id = 0;
+	_width = 1;

-	_pen = QPen(Qt::black, GRAPH_WIDTH);
+	_pen = QPen(Qt::black, _width);

 	_type = Distance;
 	_graph = graph;
 	_sx = 1.0; _sy = 1.0;

+	setZValue(1.0);
+
 	updatePath();
 	updateBounds();
 }
@ -51,6 +51,14 @@ void GraphItem::setColor(const QColor &color)
 	update();
 }

+void GraphItem::setWidth(int width)
+{
+	prepareGeometryChange();
+
+	_width = width;
+	_pen.setWidth(width);
+}
+
 qreal GraphItem::yAtX(qreal x)
 {
 	int low = 0;
@ -117,12 +125,12 @@ void GraphItem::emitSliderPositionChanged(qreal pos)
 {
 	if (_type == Time) {
 		if (_graph.hasTime()) {
-			if (pos <= _graph.last().t())
+			if (pos >= _graph.first().t() && pos <= _graph.last().t())
 				emit sliderPositionChanged(distanceAtTime(pos));
 			else
-				emit sliderPositionChanged(_graph.last().s() + 1);
+				emit sliderPositionChanged(NAN);
 		} else
-			emit sliderPositionChanged(_graph.last().s() + 1);
+			emit sliderPositionChanged(NAN);
 	} else
 		emit sliderPositionChanged(pos);
 }
@ -130,10 +138,10 @@ void GraphItem::emitSliderPositionChanged(qreal pos)
 void GraphItem::selected(bool selected)
 {
 	if (selected) {
-		_pen.setWidth(HOVER_WIDTH);
+		_pen.setWidth(_width + 1);
 		setZValue(zValue() + 1.0);
 	} else {
-		_pen.setWidth(GRAPH_WIDTH);
+		_pen.setWidth(_width);
 		setZValue(zValue() - 1.0);
 	}

--- a/src/graphitem.h
+++ b/src/graphitem.h
@ -24,6 +24,7 @@ public:
 	int id() const {return _id;}
 	void setId(int id) {_id = id;}
 	void setColor(const QColor &color);
+	void setWidth(int width);

 	qreal yAtX(qreal x);
 	qreal distanceAtTime(qreal time);
@ -41,6 +42,7 @@ private:

 	int _id;
 	QPen _pen;
+	int _width;

 	Graph _graph;
 	GraphType _type;
--- a/src/graphtab.h
+++ b/src/graphtab.h
@ -4,6 +4,7 @@
 #include <QList>
 #include "graphview.h"
 #include "units.h"
+#include "timetype.h"

 class Data;
 class PathItem;
@ -18,10 +19,11 @@ public:

 	virtual QString label() const = 0;
 	virtual void loadData(const Data &data, const QList<PathItem *> &paths) = 0;
-	virtual void clear() = 0;
-	virtual void setUnits(enum Units units) = 0;
-	virtual void showTracks(bool show) = 0;
-	virtual void showRoutes(bool show) = 0;
+	virtual void clear() {}
+	virtual void setUnits(enum Units units) {Q_UNUSED(units)}
+	virtual void setTimeType(enum TimeType type) {Q_UNUSED(type)}
+	virtual void showTracks(bool show) {Q_UNUSED(show)}
+	virtual void showRoutes(bool show) {Q_UNUSED(show)}
 };

 #endif // GRAPHTAB_H
--- a/src/graphview.cpp
+++ b/src/graphview.cpp
@ -3,6 +3,7 @@
 #include <QMouseEvent>
 #include <QPaintEngine>
 #include <QPaintDevice>
+#include "opengl.h"
 #include "config.h"
 #include "axisitem.h"
 #include "slideritem.h"
@ -20,26 +21,31 @@
 GraphView::GraphView(QWidget *parent)
 	: QGraphicsView(parent)
 {
-	_scene = new QGraphicsScene();
+	_scene = new QGraphicsScene(this);
 	setScene(_scene);

+	setBackgroundBrush(QBrush(Qt::white));
+	setViewportUpdateMode(QGraphicsView::FullViewportUpdate);
+	setRenderHint(QPainter::Antialiasing, true);
 	setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
 	setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);

 	_xAxis = new AxisItem(AxisItem::X);
-	_xAxis->setZValue(1.0);
+	_xAxis->setZValue(2.0);
 	_yAxis = new AxisItem(AxisItem::Y);
-	_yAxis->setZValue(1.0);
+	_yAxis->setZValue(2.0);
 	_slider = new SliderItem();
-	_slider->setZValue(2.0);
+	_slider->setZValue(3.0);
 	_sliderInfo = new SliderInfoItem(_slider);
-	_sliderInfo->setZValue(2.0);
+	_sliderInfo->setZValue(3.0);
 	_info = new InfoItem();
 	_grid = new GridItem();

 	connect(_slider, SIGNAL(positionChanged(const QPointF&)), this,
 	  SLOT(emitSliderPositionChanged(const QPointF&)));

+	_width = 1;
+
 	_xScale = 1;
 	_yScale = 1;
 	_yOffset = 0;
@ -169,7 +175,8 @@ void GraphView::loadGraph(const Graph &graph, PathItem *path, int id)
 	GraphItem *gi = new GraphItem(graph);
 	gi->setGraphType(_graphType);
 	gi->setId(id);
-	gi->setColor(_palette.color());
+	gi->setColor(_palette.nextColor());
+	gi->setWidth(_width);

 	connect(this, SIGNAL(sliderPositionChanged(qreal)), gi,
 	  SLOT(emitSliderPositionChanged(qreal)));
@ -400,6 +407,8 @@ void GraphView::emitSliderPositionChanged(const QPointF &pos)
 		return;

 	_sliderPos = (pos.x() / _slider->area().width()) * bounds().width();
+	_sliderPos = qMax(_sliderPos, bounds().left());
+	_sliderPos = qMin(_sliderPos, bounds().right());
 	updateSliderPosition();

 	emit sliderPositionChanged(_sliderPos);
@ -429,3 +438,28 @@ void GraphView::clearInfo()
 {
 	_info->clear();
 }
+
+void GraphView::setPalette(const Palette &palette)
+{
+	_palette = palette;
+	_palette.reset();
+
+	for (int i = 0; i < _graphs.count(); i++)
+		_graphs.at(i)->setColor(_palette.nextColor());
+}
+
+void GraphView::setGraphWidth(int width)
+{
+	_width = width;
+
+	for (int i = 0; i < _graphs.count(); i++)
+		_graphs.at(i)->setWidth(width);
+}
+
+void GraphView::useOpenGL(bool use)
+{
+	if (use)
+		setViewport(new OPENGL_WIDGET);
+	else
+		setViewport(new QWidget);
+}
--- a/src/graphview.h
+++ b/src/graphview.h
@ -35,6 +35,9 @@ public:
 	void setUnits(Units units);
 	void showGrid(bool show);

+	void setPalette(const Palette &palette);
+	void setGraphWidth(int width);
+
 	const QString &yLabel() const {return _yLabel;}
 	const QString &yUnits() const {return _yUnits;}
 	qreal yScale() const {return _yScale;}
@ -52,6 +55,8 @@ public:

 	void plot(QPainter *painter, const QRectF &target);

+	void useOpenGL(bool use);
+
 signals:
 	void sliderPositionChanged(qreal);

@ -60,7 +65,7 @@ protected:
 	void redraw(const QSizeF &size);
 	void addInfo(const QString &key, const QString &value);
 	void clearInfo();
-	void skipColor() {_palette.color();}
+	void skipColor() {_palette.nextColor();}

 private slots:
 	void emitSliderPositionChanged(const QPointF &pos);
@ -99,6 +104,7 @@ private:
 	QSet<int> _hide;
 	QRectF _bounds;
 	Palette _palette;
+	int _width;

 	Units _units;
 	GraphType _graphType;
--- a/src/griditem.cpp
+++ b/src/griditem.cpp
@ -6,7 +6,9 @@

 GridItem::GridItem(QGraphicsItem *parent) : QGraphicsItem(parent)
 {
-
+#ifndef Q_OS_MAC
+	setCacheMode(QGraphicsItem::DeviceCoordinateCache);
+#endif // Q_OS_MAC
 }

 void GridItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
--- a/src/gui.cpp
+++ b/src/gui.cpp
@ -21,7 +21,6 @@
 #include <QLocale>
 #include <QMimeData>
 #include <QUrl>
-#include <QPixmapCache>
 #include "config.h"
 #include "icons.h"
 #include "keys.h"
@ -37,9 +36,9 @@
 #include "powergraph.h"
 #include "pathview.h"
 #include "trackinfo.h"
+#include "downloader.h"
 #include "filebrowser.h"
 #include "cpuarch.h"
-#include "exportdialog.h"
 #include "graphtab.h"
 #include "format.h"
 #include "gui.h"
@ -72,6 +71,7 @@ GUI::GUI(QWidget *parent) : QMainWindow(parent)
 	setWindowIcon(QIcon(QPixmap(APP_ICON)));
 	setWindowTitle(APP_NAME);
 	setUnifiedTitleAndToolBarOnMac(true);
+	setAcceptDrops(true);

 	_trackCount = 0;
 	_routeCount = 0;
@ -79,6 +79,7 @@ GUI::GUI(QWidget *parent) : QMainWindow(parent)
 	_trackDistance = 0;
 	_routeDistance = 0;
 	_time = 0;
+	_movingTime = 0;

 	_sliderPos = 0;

@ -87,15 +88,6 @@ GUI::GUI(QWidget *parent) : QMainWindow(parent)
 	updateStatusBarInfo();

 	readSettings();
-
-	_exportPaperSize = (QLocale::system().measurementSystem()
-	  == QLocale::ImperialSystem) ? QPrinter::Letter : QPrinter::A4;
-	_exportOrientation = QPrinter::Portrait;
-	_exportFileName = QString("%1/export.pdf").arg(QDir::currentPath());
-	_exportMargins = MarginsF(5.0, 5.0, 5.0, 5.0);
-
-	setAcceptDrops(true);
-	QPixmapCache::setCacheLimit(65536);
 }

 GUI::~GUI()
@ -108,27 +100,30 @@ GUI::~GUI()

 const QString GUI::fileFormats() const
 {
-	return tr("Supported files (*.csv *.fit *.gpx *.igc *.kml *.tcx)") + ";;"
-	  + tr("CSV files (*.csv)") + ";;" + tr("FIT files (*.fit)") + ";;"
+	return tr("Supported files (*.csv *.fit *.gpx *.igc *.kml *.nmea *.tcx)")
+	  + ";;" + tr("CSV files (*.csv)") + ";;" + tr("FIT files (*.fit)") + ";;"
 	  + tr("GPX files (*.gpx)") + ";;" + tr("IGC files (*.igc)") + ";;"
-	  + tr("KML files (*.kml)") + ";;" + tr("TCX files (*.tcx)") + ";;"
-	  + tr("All files (*)");
+	  + tr("KML files (*.kml)") + ";;" + tr("NMEA files (*.nmea)") + ";;"
+	  + tr("TCX files (*.tcx)") + ";;" + tr("All files (*)");
 }

 void GUI::createBrowser()
 {
 	QStringList filter;
-	filter << "*.gpx" << "*.tcx" << "*.kml" << "*.fit" << "*.csv" << "*.igc";
+	filter << "*.gpx" << "*.tcx" << "*.kml" << "*.fit" << "*.csv" << "*.igc"
+	  << "*.nmea";
 	_browser = new FileBrowser(this);
 	_browser->setFilter(filter);
 }

 void GUI::loadMaps()
 {
+	MapList ml(new Downloader(this));
+
 	if (QFile::exists(USER_MAP_FILE))
-		_maps = MapList::load(this, USER_MAP_FILE);
+		_maps = ml.load(USER_MAP_FILE, this);
 	else
-		_maps = MapList::load(this, GLOBAL_MAP_FILE);
+		_maps = ml.load(GLOBAL_MAP_FILE, this);
 }

 void GUI::loadPOIs()
@ -144,8 +139,15 @@ void GUI::loadPOIs()
 	else
 		list = globalDir.entryInfoList(QStringList(), QDir::Files);

-	for (int i = 0; i < list.size(); ++i)
-		_poi->loadFile(list.at(i).absoluteFilePath());
+	for (int i = 0; i < list.size(); ++i) {
+		if (!_poi->loadFile(list.at(i).absoluteFilePath())) {
+			fprintf(stderr, "Error loading POI file: %s: %s\n",
+			  qPrintable(list.at(i).fileName()),
+			  qPrintable(_poi->errorString()));
+			if (_poi->errorLine())
+				fprintf(stderr, "Line: %d\n", _poi->errorLine());
+		}
+	}
 }

 void GUI::createMapActions()
@ -197,7 +199,6 @@ void GUI::createActions()
 {
 	QActionGroup *ag;

-
 	// Action Groups
 	_fileActionGroup = new QActionGroup(this);
 	_fileActionGroup->setExclusive(false);
@ -359,6 +360,18 @@ void GUI::createActions()
 	  SLOT(showToolbars(bool)));
 	ag = new QActionGroup(this);
 	ag->setExclusive(true);
+	_totalTimeAction = new QAction(tr("Total time"), this);
+	_totalTimeAction->setCheckable(true);
+	_totalTimeAction->setActionGroup(ag);
+	connect(_totalTimeAction, SIGNAL(triggered()), this,
+	  SLOT(setTotalTime()));
+	_movingTimeAction = new QAction(tr("Moving time"), this);
+	_movingTimeAction->setCheckable(true);
+	_movingTimeAction->setActionGroup(ag);
+	connect(_movingTimeAction, SIGNAL(triggered()), this,
+	  SLOT(setMovingTime()));
+	ag = new QActionGroup(this);
+	ag->setExclusive(true);
 	_metricUnitsAction = new QAction(tr("Metric"), this);
 	_metricUnitsAction->setCheckable(true);
 	_metricUnitsAction->setActionGroup(ag);
@ -376,6 +389,9 @@ void GUI::createActions()
 	connect(_fullscreenAction, SIGNAL(triggered(bool)), this,
 	  SLOT(showFullscreen(bool)));
 	addAction(_fullscreenAction);
+	_openOptionsAction = new QAction(tr("Options..."), this);
+	connect(_openOptionsAction, SIGNAL(triggered()), this,
+	  SLOT(openOptions()));

 	// Navigation actions
 	_nextAction = new QAction(QIcon(QPixmap(NEXT_FILE_ICON)), tr("Next"), this);
@ -447,13 +463,17 @@ void GUI::createMenus()
 	dataMenu->addAction(_showWaypointsAction);

 	QMenu *settingsMenu = menuBar()->addMenu(tr("Settings"));
+	QMenu *timeMenu = settingsMenu->addMenu(tr("Time"));
+	timeMenu->addAction(_totalTimeAction);
+	timeMenu->addAction(_movingTimeAction);
 	QMenu *unitsMenu = settingsMenu->addMenu(tr("Units"));
 	unitsMenu->addAction(_metricUnitsAction);
 	unitsMenu->addAction(_imperialUnitsAction);
 	settingsMenu->addSeparator();
 	settingsMenu->addAction(_showToolbarsAction);
-	settingsMenu->addSeparator();
 	settingsMenu->addAction(_fullscreenAction);
+	settingsMenu->addSeparator();
+	settingsMenu->addAction(_openOptionsAction);

 	QMenu *helpMenu = menuBar()->addMenu(tr("Help"));
 	helpMenu->addAction(_dataSourcesAction);
@ -543,15 +563,13 @@ void GUI::about()
 	QMessageBox msgBox(this);

 	msgBox.setWindowTitle(tr("About GPXSee"));
-	msgBox.setText(QString("<h2>") + QString(APP_NAME) + QString("</h2><p>")
-	  + QString("<p>") + tr("Version ") + APP_VERSION + QString(" (")
-	  + CPU_ARCH + QString(", Qt ") + QString(QT_VERSION_STR)
-	  + QString(")</p>"));
-	msgBox.setInformativeText(QString("<table width=\"300\"><tr><td>")
+	msgBox.setText("<h2>" + QString(APP_NAME) + "</h2><p><p>" + tr("Version ")
+	  + 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 ") + QString("<a href=\"" APP_HOMEPAGE "\">" APP_HOMEPAGE
-	  "</a>.</td></tr></table>"));
+	  "homepage at ") + "<a href=\"" + APP_HOMEPAGE + "\">" + APP_HOMEPAGE
+	  + "</a>.</td></tr></table>");

 	QIcon icon = msgBox.windowIcon();
 	QSize size = icon.actualSize(QSize(64, 64));
@ -565,20 +583,20 @@ void GUI::keys()
 	QMessageBox msgBox(this);

 	msgBox.setWindowTitle(tr("Keyboard controls"));
-	msgBox.setText(QString("<h3>") + tr("Keyboard controls") + QString("</h3>"));
+	msgBox.setText("<h3>" + tr("Keyboard controls") + "</h3>");
 	msgBox.setInformativeText(
-	  QString("<div><table width=\"300\"><tr><td>") + tr("Next file")
-	  + QString("</td><td><i>SPACE</i></td></tr><tr><td>") + tr("Previous file")
-	  + QString("</td><td><i>BACKSPACE</i></td></tr><tr><td>")
-	  + tr("First file") + QString("</td><td><i>HOME</i></td></tr><tr><td>")
-	  + tr("Last file") + QString("</td><td><i>END</i></td></tr><tr><td>")
-	  + tr("Append modifier") + QString("</td><td><i>SHIFT</i></td></tr>"
-	  "<tr><td></td><td></td></tr><tr><td>")
-	  + tr("Next map") + QString("</td><td><i>")
-	  + _nextMapAction->shortcut().toString() + QString("</i></td></tr><tr><td>")
-	  + tr("Previous map") + QString("</td><td><i>")
-	  + _prevMapAction->shortcut().toString() + QString("</i></td></tr>"
-	  "</table></div>"));
+	  "<div><table width=\"300\"><tr><td>" + tr("Next file")
+	  + "</td><td><i>" + QKeySequence(NEXT_KEY).toString()
+	  + "</i></td></tr><tr><td>" + tr("Previous file")
+	  + "</td><td><i>" + QKeySequence(PREV_KEY).toString()
+	  + "</i></td></tr><tr><td>" + tr("First file") + "</td><td><i>"
+	  + QKeySequence(FIRST_KEY).toString() + "</i></td></tr><tr><td>"
+	  + tr("Last file") + "</td><td><i>" + QKeySequence(LAST_KEY).toString()
+	  + "</i></td></tr><tr><td>" + tr("Append modifier")
+	  + "</td><td><i>SHIFT</i></td></tr><tr><td></td><td></td></tr><tr><td>"
+	  + tr("Next map") + "</td><td><i>" + NEXT_MAP_SHORTCUT.toString()
+	  + "</i></td></tr><tr><td>" + tr("Previous map") + "</td><td><i>"
+	  + PREV_MAP_SHORTCUT.toString() + "</i></td></tr></table></div>");

 	msgBox.exec();
 }
@ -588,23 +606,23 @@ void GUI::dataSources()
 	QMessageBox msgBox(this);

 	msgBox.setWindowTitle(tr("Data sources"));
-	msgBox.setText(QString("<h3>") + tr("Data sources") + QString("</h3>"));
+	msgBox.setText("<h3>" + tr("Data sources") + "</h3>");
 	msgBox.setInformativeText(
-	  QString("<h4>") + tr("Map sources") + QString("</h4><p>")
+	  "<h4>" + tr("Map sources") + "</h4><p>"
 	  + tr("Map (tiles) source URLs are read on program startup from the "
 		"following file:")
-		+ QString("</p><p><code>") + USER_MAP_FILE + QString("</code></p><p>")
+		+ "</p><p><code>" + USER_MAP_FILE + "</code></p><p>"
 		+ tr("The file format is one map entry per line, consisting of the map "
 		  "name and tiles URL delimited by a TAB character. The tile X and Y "
 		  "coordinates are replaced with $x and $y in the URL and the zoom "
 		  "level is replaced with $z. An example map file could look like:")
-		+ QString("</p><p><code>Map1	http://tile.server.com/map/$z/$x/$y.png"
-		  "<br/>Map2	http://mapserver.org/map/$z-$x-$y</code></p>")
+		+ "</p><p><code>Map1	http://tile.server.com/map/$z/$x/$y.png"
+		  "<br/>Map2	http://mapserver.org/map/$z-$x-$y</code></p>"

-	  + QString("<h4>") + tr("POIs") + QString("</h4><p>")
+	  + "<h4>" + tr("POIs") + "</h4><p>"
 	  + tr("To make GPXSee load a POI file automatically on startup, add "
 		"the file to the following directory:")
-		+ QString("</p><p><code>") + USER_POI_DIR + QString("</code></p>")
+		+ "</p><p><code>" + USER_POI_DIR + "</code></p>"
 	);

 	msgBox.exec();
@ -660,6 +678,7 @@ bool GUI::loadFile(const QString &fileName)
 		for (int i = 0; i < data.tracks().count(); i++) {
 			_trackDistance += data.tracks().at(i)->distance();
 			_time += data.tracks().at(i)->time();
+			_movingTime += data.tracks().at(i)->movingTime();
 			const QDate &date = data.tracks().at(i)->date().date();
 			if (_dateRange.first.isNull() || _dateRange.first > date)
 				_dateRange.first = date;
@ -674,6 +693,14 @@ bool GUI::loadFile(const QString &fileName)

 		_waypointCount += data.waypoints().count();

+		if (_pathName.isNull()) {
+			if (data.tracks().count() == 1 && !data.routes().count())
+				_pathName = data.tracks().first()->name();
+			else if (data.routes().count() == 1 && !data.tracks().count())
+				_pathName = data.routes().first()->routeData().name();
+		} else
+			_pathName = QString();
+
 		return true;
 	} else {
 		updateNavigationActions();
@ -745,26 +772,67 @@ void GUI::printFile()
 		plot(&printer);
 }

+void GUI::openOptions()
+{
+	Options options(_options);
+
+	OptionsDialog dialog(&options, this);
+	if (dialog.exec() != QDialog::Accepted)
+		return;
+
+	if (options.palette != _options.palette) {
+		_pathView->setPalette(options.palette);
+		for (int i = 0; i < _tabs.count(); i++)
+			_tabs.at(i)->setPalette(options.palette);
+	}
+	if (options.trackWidth != _options.trackWidth)
+		_pathView->setTrackWidth(options.trackWidth);
+	if (options.routeWidth != _options.routeWidth)
+		_pathView->setRouteWidth(options.routeWidth);
+	if (options.trackStyle != _options.trackStyle)
+		_pathView->setTrackStyle(options.trackStyle);
+	if (options.routeStyle != _options.routeStyle)
+		_pathView->setRouteStyle(options.routeStyle);
+	if (options.pathAntiAliasing != _options.pathAntiAliasing)
+		_pathView->setRenderHint(QPainter::Antialiasing,
+		  options.pathAntiAliasing);
+	if (options.graphWidth != _options.graphWidth)
+		for (int i = 0; i < _tabs.count(); i++)
+			_tabs.at(i)->setGraphWidth(options.graphWidth);
+	if (options.graphAntiAliasing != _options.graphAntiAliasing)
+		for (int i = 0; i < _tabs.count(); i++)
+			_tabs.at(i)->setRenderHint(QPainter::Antialiasing,
+			  options.graphAntiAliasing);
+
+	if (options.poiRadius != _options.poiRadius)
+		_poi->setRadius(options.poiRadius);
+
+	if (options.useOpenGL != _options.useOpenGL) {
+		_pathView->useOpenGL(options.useOpenGL);
+		for (int i = 0; i < _tabs.count(); i++)
+			_tabs.at(i)->useOpenGL(options.useOpenGL);
+	}
+
+	_options = options;
+}
+
 void GUI::exportFile()
 {
-	QPrinter printer(QPrinter::HighResolution);
-	printer.setCreator(QString(APP_NAME) + QString(" ") + QString(APP_VERSION));
-	printer.setOrientation(_exportOrientation);
-	printer.setOutputFileName(_exportFileName);
-	printer.setPaperSize(_exportPaperSize);
-	printer.setPageMargins(_exportMargins.left(), _exportMargins.top(),
-	  _exportMargins.right(), _exportMargins.bottom(), QPrinter::Millimeter);
-	ExportDialog dialog(&printer, this);
+	ExportDialog dialog(&_export, this);
+	if (dialog.exec() != QDialog::Accepted)
+		return;

-	if (dialog.exec() == QDialog::Accepted) {
-		_exportFileName = printer.outputFileName();
-		_exportPaperSize = printer.paperSize();
-		_exportOrientation = printer.orientation();
-		printer.getPageMargins(&(_exportMargins.rleft()),
-		  &(_exportMargins.rtop()), &(_exportMargins.rright()),
-		  &(_exportMargins.rbottom()), QPrinter::Millimeter);
-		plot(&printer);
-	}
+	QPrinter printer(QPrinter::HighResolution);
+	printer.setOutputFormat(QPrinter::PdfFormat);
+	printer.setCreator(QString(APP_NAME) + QString(" ")
+	  + QString(APP_VERSION));
+	printer.setOrientation(_export.orientation);
+	printer.setOutputFileName(_export.fileName);
+	printer.setPaperSize(_export.paperSize);
+	printer.setPageMargins(_export.margins.left(), _export.margins.top(),
+	  _export.margins.right(), _export.margins.bottom(), QPrinter::Millimeter);
+
+	plot(&printer);
 }

 void GUI::plot(QPrinter *printer)
@ -772,11 +840,23 @@ void GUI::plot(QPrinter *printer)
 	QPainter p(printer);
 	TrackInfo info;
 	qreal ih, gh, mh, ratio;
-	Units units = _imperialUnitsAction->isChecked() ? Imperial : Metric;
 	qreal d = distance();
 	qreal t = time();
+	qreal tm = movingTime();

-	if (_dateRange.first.isValid()) {
+	if (!_pathName.isNull() && _options.printName)
+		info.insert(tr("Name"), _pathName);
+
+	if (_options.printItemCount) {
+		if (_trackCount > 1)
+			info.insert(tr("Tracks"), QString::number(_trackCount));
+		if (_routeCount > 1)
+			info.insert(tr("Routes"), QString::number(_routeCount));
+		if (_waypointCount > 2)
+			info.insert(tr("Waypoints"), QString::number(_waypointCount));
+	}
+
+	if (_dateRange.first.isValid() && _options.printDate) {
 		if (_dateRange.first == _dateRange.second) {
 			QString format = QLocale::system().dateFormat(QLocale::LongFormat);
 			info.insert(tr("Date"), _dateRange.first.toString(format));
@ -788,17 +868,12 @@ void GUI::plot(QPrinter *printer)
 		}
 	}

-	if (_trackCount > 1)
-		info.insert(tr("Tracks"), QString::number(_trackCount));
-	if (_routeCount > 1)
-		info.insert(tr("Routes"), QString::number(_routeCount));
-	if (_waypointCount > 2)
-		info.insert(tr("Waypoints"), QString::number(_waypointCount));
-
-	if (d > 0)
-		info.insert(tr("Distance"), Format::distance(d, units));
-	if (t > 0)
+	if (d > 0 && _options.printDistance)
+		info.insert(tr("Distance"), Format::distance(d, units()));
+	if (t > 0 && _options.printTime)
 		info.insert(tr("Time"), Format::timeSpan(t));
+	if (tm > 0 && _options.printMovingTime)
+		info.insert(tr("Moving time"), Format::timeSpan(tm));


 	ratio = p.paintEngine()->paintDevice()->logicalDpiX() / SCREEN_DPI;
@ -810,7 +885,7 @@ void GUI::plot(QPrinter *printer)
 		mh = ih / 2;
 		info.plot(&p, QRectF(0, 0, printer->width(), ih));
 	}
-	if (_graphTabWidget->isVisible()) {
+	if (_graphTabWidget->isVisible() && !_options.separateGraphPage) {
 		qreal r = (((qreal)(printer)->width()) / (qreal)(printer->height()));
 		gh = (printer->width() > printer->height())
 		  ? 0.15 * r * (printer->height() - ih - 2*mh)
@ -822,6 +897,27 @@ void GUI::plot(QPrinter *printer)
 		gh = 0;
 	_pathView->plot(&p, QRectF(0, ih + mh, printer->width(), printer->height()
 	  - (ih + 2*mh + gh)));
+
+	if (_graphTabWidget->isVisible() && _options.separateGraphPage) {
+		printer->newPage();
+
+		int cnt = 0;
+		for (int i = 0; i < _tabs.size(); i++)
+			if (_tabs.at(i)->count())
+				cnt++;
+
+		qreal sp = ratio * 20;
+		gh = qMin((printer->height() - ((cnt - 1) * sp))/(qreal)cnt,
+		  0.20 * printer->height());
+
+		qreal y = 0;
+		for (int i = 0; i < _tabs.size(); i++) {
+			if (_tabs.at(i)->count()) {
+				_tabs.at(i)->plot(&p,  QRectF(0, y, printer->width(), gh));
+				y += gh + sp;
+			}
+		}
+	}
 }

 void GUI::reloadFile()
@ -832,7 +928,9 @@ void GUI::reloadFile()
 	_trackDistance = 0;
 	_routeDistance = 0;
 	_time = 0;
+	_movingTime = 0;
 	_dateRange = DateRange(QDate(), QDate());
+	_pathName = QString();

 	for (int i = 0; i < _tabs.count(); i++)
 		_tabs.at(i)->clear();
@ -865,7 +963,9 @@ void GUI::closeFiles()
 	_trackDistance = 0;
 	_routeDistance = 0;
 	_time = 0;
+	_movingTime = 0;
 	_dateRange = DateRange(QDate(), QDate());
+	_pathName = QString();

 	_sliderPos = 0;

@ -979,31 +1079,36 @@ void GUI::clearMapCache()
 void GUI::updateStatusBarInfo()
 {
 	if (_files.count() == 0)
-		_fileNameLabel->setText(tr("No GPX files loaded"));
+		_fileNameLabel->setText(tr("No files loaded"));
 	else if (_files.count() == 1)
 		_fileNameLabel->setText(_files.at(0));
 	else
 		_fileNameLabel->setText(tr("%n files", "", _files.count()));

-	qreal d = distance();
-	Units units = _imperialUnitsAction->isChecked() ? Imperial : Metric;
-	if (d > 0)
-		_distanceLabel->setText(Format::distance(distance(), units));
+	if (distance() > 0)
+		_distanceLabel->setText(Format::distance(distance(), units()));
 	else
 		_distanceLabel->clear();

-	qreal t = time();
-	if (t > 0)
-		_timeLabel->setText(Format::timeSpan(time()));
-	else
+	if (time() > 0) {
+		if (_movingTimeAction->isChecked()) {
+			_timeLabel->setText(Format::timeSpan(movingTime())
+			  + "<sub>M</sub>");
+			_timeLabel->setToolTip(Format::timeSpan(time()));
+		} else {
+			_timeLabel->setText(Format::timeSpan(time()));
+			_timeLabel->setToolTip(Format::timeSpan(movingTime()));
+		}
+	} else {
 		_timeLabel->clear();
+		_timeLabel->setToolTip(QString());
+	}
 }

 void GUI::updateWindowTitle()
 {
 	if (_files.count() == 1)
-		setWindowTitle(QFileInfo(_files.at(0)).fileName()
-		  + QString(" - " APP_NAME));
+		setWindowTitle(QFileInfo(_files.at(0)).fileName() + " - " + APP_NAME);
 	else
 		setWindowTitle(APP_NAME);
 }
@ -1106,8 +1211,19 @@ void GUI::updatePathView()
 	  + _pathView->waypointCount()));
 }

+void GUI::setTimeType(TimeType type)
+{
+	for (int i = 0; i <_tabs.count(); i++)
+		_tabs.at(i)->setTimeType(type);
+
+	updateStatusBarInfo();
+}
+
 void GUI::setUnits(Units units)
 {
+	_export.units = units;
+	_options.units = units;
+
 	_pathView->setUnits(units);
 	for (int i = 0; i <_tabs.count(); i++)
 		_tabs.at(i)->setUnits(units);
@ -1228,57 +1344,137 @@ void GUI::dropEvent(QDropEvent *event)
 void GUI::writeSettings()
 {
 	QSettings settings(APP_NAME, APP_NAME);
+	settings.clear();

 	settings.beginGroup(WINDOW_SETTINGS_GROUP);
-	settings.setValue(WINDOW_SIZE_SETTING, size());
-	settings.setValue(WINDOW_POS_SETTING, pos());
+	if (size() != WINDOW_SIZE_DEFAULT)
+		settings.setValue(WINDOW_SIZE_SETTING, size());
+	if (pos() != WINDOW_POS_DEFAULT)
+		settings.setValue(WINDOW_POS_SETTING, pos());
 	settings.endGroup();

 	settings.beginGroup(SETTINGS_SETTINGS_GROUP);
-	settings.setValue(UNITS_SETTING, _imperialUnitsAction->isChecked()
+	if ((_movingTimeAction->isChecked() ? Moving : Total) !=
+	  TIME_TYPE_DEFAULT)
+		settings.setValue(TIME_TYPE_SETTING, _movingTimeAction->isChecked()
+	  ? Moving : Total);
+	if ((_imperialUnitsAction->isChecked() ? Imperial : Metric) !=
+	  UNITS_DEFAULT)
+		settings.setValue(UNITS_SETTING, _imperialUnitsAction->isChecked()
 	  ? Imperial : Metric);
-	settings.setValue(SHOW_TOOLBARS_SETTING, _showToolbarsAction->isChecked());
+	if (_showToolbarsAction->isChecked() != SHOW_TOOLBARS_DEFAULT)
+		settings.setValue(SHOW_TOOLBARS_SETTING,
+		  _showToolbarsAction->isChecked());
 	settings.endGroup();

 	settings.beginGroup(MAP_SETTINGS_GROUP);
 	if (_currentMap)
 		settings.setValue(CURRENT_MAP_SETTING, _currentMap->name());
-	settings.setValue(SHOW_MAP_SETTING, _showMapAction->isChecked());
+	if (_showMapAction->isChecked() != SHOW_MAP_DEFAULT)
+		settings.setValue(SHOW_MAP_SETTING, _showMapAction->isChecked());
 	settings.endGroup();

 	settings.beginGroup(GRAPH_SETTINGS_GROUP);
-	settings.setValue(SHOW_GRAPHS_SETTING, _showGraphsAction->isChecked());
-	settings.setValue(GRAPH_TYPE_SETTING, _timeGraphAction->isChecked()
-	  ? Time : Distance);
-	settings.setValue(SHOW_GRAPH_GRIDS_SETTING,
-	  _showGraphGridAction->isChecked());
+	if (_showGraphsAction->isChecked() != SHOW_GRAPHS_DEFAULT)
+		settings.setValue(SHOW_GRAPHS_SETTING, _showGraphsAction->isChecked());
+	if ((_timeGraphAction->isChecked() ? Time : Distance) != GRAPH_TYPE_DEFAULT)
+		settings.setValue(GRAPH_TYPE_SETTING, _timeGraphAction->isChecked()
+		  ? Time : Distance);
+	if (_showGraphGridAction->isChecked() != SHOW_GRAPH_GRIDS_DEFAULT)
+		settings.setValue(SHOW_GRAPH_GRIDS_SETTING,
+		  _showGraphGridAction->isChecked());
 	settings.endGroup();

 	settings.beginGroup(POI_SETTINGS_GROUP);
-	settings.setValue(SHOW_POI_SETTING, _showPOIAction->isChecked());
-	settings.setValue(OVERLAP_POI_SETTING, _overlapPOIAction->isChecked());
+	if (_showPOIAction->isChecked() != SHOW_POI_DEFAULT)
+		settings.setValue(SHOW_POI_SETTING, _showPOIAction->isChecked());
+	if (_overlapPOIAction->isChecked() != OVERLAP_POI_DEFAULT)
+		settings.setValue(OVERLAP_POI_SETTING, _overlapPOIAction->isChecked());

-	settings.remove(DISABLED_POI_FILE_SETTINGS_PREFIX);
-	settings.beginWriteArray(DISABLED_POI_FILE_SETTINGS_PREFIX);
-	for (int i = 0, j = 0; i < _poiFilesActions.count(); i++) {
+	int j = 0;
+	for (int i = 0; i < _poiFilesActions.count(); i++) {
 		if (!_poiFilesActions.at(i)->isChecked()) {
+			if (j == 0)
+				settings.beginWriteArray(DISABLED_POI_FILE_SETTINGS_PREFIX);
 			settings.setArrayIndex(j++);
 			settings.setValue(DISABLED_POI_FILE_SETTING, _poi->files().at(i));
 		}
 	}
-	settings.endArray();
+	if (j != 0)
+		settings.endArray();
 	settings.endGroup();

 	settings.beginGroup(DATA_SETTINGS_GROUP);
-	settings.setValue(SHOW_TRACKS_SETTING, _showTracksAction->isChecked());
-	settings.setValue(SHOW_ROUTES_SETTING, _showRoutesAction->isChecked());
-	settings.setValue(SHOW_WAYPOINTS_SETTING,
-	  _showWaypointsAction->isChecked());
-	settings.setValue(SHOW_WAYPOINT_LABELS_SETTING,
-	  _showWaypointLabelsAction->isChecked());
-	settings.setValue(SHOW_ROUTE_WAYPOINTS_SETTING,
-	  _showRouteWaypointsAction->isChecked());
+	if (_showTracksAction->isChecked() != SHOW_TRACKS_DEFAULT)
+		settings.setValue(SHOW_TRACKS_SETTING, _showTracksAction->isChecked());
+	if (_showRoutesAction->isChecked() != SHOW_ROUTES_DEFAULT)
+		settings.setValue(SHOW_ROUTES_SETTING, _showRoutesAction->isChecked());
+	if (_showWaypointsAction->isChecked() != SHOW_WAYPOINTS_DEFAULT)
+		settings.setValue(SHOW_WAYPOINTS_SETTING,
+		  _showWaypointsAction->isChecked());
+	if (_showWaypointLabelsAction->isChecked() != SHOW_WAYPOINT_LABELS_DEFAULT)
+		settings.setValue(SHOW_WAYPOINT_LABELS_SETTING,
+		  _showWaypointLabelsAction->isChecked());
+	if (_showRouteWaypointsAction->isChecked() != SHOW_ROUTE_WAYPOINTS_DEFAULT)
+		settings.setValue(SHOW_ROUTE_WAYPOINTS_SETTING,
+		  _showRouteWaypointsAction->isChecked());
+	settings.endGroup();

+	settings.beginGroup(EXPORT_SETTINGS_GROUP);
+	if (_export.orientation != PAPER_ORIENTATION_DEFAULT)
+		settings.setValue(PAPER_ORIENTATION_SETTING, _export.orientation);
+	if (_export.paperSize != PAPER_SIZE_DEFAULT)
+		settings.setValue(PAPER_SIZE_SETTING, _export.paperSize);
+	if (_export.margins.left() != MARGIN_LEFT_DEFAULT)
+		settings.setValue(MARGIN_LEFT_SETTING, _export.margins.left());
+	if (_export.margins.top() != MARGIN_TOP_DEFAULT)
+		settings.setValue(MARGIN_TOP_SETTING, _export.margins.top());
+	if (_export.margins.right() != MARGIN_RIGHT_DEFAULT)
+		settings.setValue(MARGIN_RIGHT_SETTING, _export.margins.right());
+	if (_export.margins.bottom() != MARGIN_BOTTOM_DEFAULT)
+		settings.setValue(MARGIN_BOTTOM_SETTING, _export.margins.bottom());
+	if (_export.fileName != EXPORT_FILENAME_DEFAULT)
+		settings.setValue(EXPORT_FILENAME_SETTING, _export.fileName);
+	settings.endGroup();
+
+	settings.beginGroup(OPTIONS_SETTINGS_GROUP);
+	if (_options.palette.color() != PALETTE_COLOR_DEFAULT)
+		settings.setValue(PALETTE_COLOR_SETTING, _options.palette.color());
+	if (_options.palette.shift() != PALETTE_SHIFT_DEFAULT)
+		settings.setValue(PALETTE_SHIFT_SETTING, _options.palette.shift());
+	if (_options.trackWidth != TRACK_WIDTH_DEFAULT)
+		settings.setValue(TRACK_WIDTH_SETTING, _options.trackWidth);
+	if (_options.routeWidth != ROUTE_WIDTH_DEFAULT)
+		settings.setValue(ROUTE_WIDTH_SETTING, _options.routeWidth);
+	if (_options.trackStyle != TRACK_STYLE_DEFAULT)
+		settings.setValue(TRACK_STYLE_SETTING, (int)_options.trackStyle);
+	if (_options.routeStyle != ROUTE_STYLE_DEFAULT)
+		settings.setValue(ROUTE_STYLE_SETTING, (int)_options.routeStyle);
+	if (_options.graphWidth != GRAPH_WIDTH_DEFAULT)
+		settings.setValue(GRAPH_WIDTH_SETTING, _options.graphWidth);
+	if (_options.pathAntiAliasing != PATH_AA_DEFAULT)
+		settings.setValue(PATH_AA_SETTING, _options.pathAntiAliasing);
+	if (_options.graphAntiAliasing != GRAPH_AA_DEFAULT)
+		settings.setValue(GRAPH_AA_SETTING, _options.graphAntiAliasing);
+	if (_options.poiRadius != POI_RADIUS_DEFAULT)
+		settings.setValue(POI_RADIUS_SETTING, _options.poiRadius);
+	if (_options.useOpenGL != USE_OPENGL_DEFAULT)
+		settings.setValue(USE_OPENGL_SETTING, _options.useOpenGL);
+	if (_options.printName != PRINT_NAME_DEFAULT)
+		settings.setValue(PRINT_NAME_SETTING, _options.printName);
+	if (_options.printDate != PRINT_DATE_DEFAULT)
+		settings.setValue(PRINT_DATE_SETTING, _options.printDate);
+	if (_options.printDistance != PRINT_DISTANCE_DEFAULT)
+		settings.setValue(PRINT_DISTANCE_SETTING, _options.printDistance);
+	if (_options.printTime != PRINT_TIME_DEFAULT)
+		settings.setValue(PRINT_TIME_SETTING, _options.printTime);
+	if (_options.printMovingTime != PRINT_MOVING_TIME_DEFAULT)
+		settings.setValue(PRINT_MOVING_TIME_SETTING, _options.printMovingTime);
+	if (_options.printItemCount != PRINT_ITEM_COUNT_DEFAULT)
+		settings.setValue(PRINT_ITEM_COUNT_SETTING, _options.printItemCount);
+	if (_options.separateGraphPage != SEPARATE_GRAPH_PAGE_DEFAULT)
+		settings.setValue(SEPARATE_GRAPH_PAGE_SETTING,
+		  _options.separateGraphPage);
 	settings.endGroup();
 }

@ -1287,26 +1483,34 @@ void GUI::readSettings()
 	QSettings settings(APP_NAME, APP_NAME);

 	settings.beginGroup(WINDOW_SETTINGS_GROUP);
-	resize(settings.value(WINDOW_SIZE_SETTING, QSize(600, 800)).toSize());
-	move(settings.value(WINDOW_POS_SETTING, QPoint(10, 10)).toPoint());
+	resize(settings.value(WINDOW_SIZE_SETTING, WINDOW_SIZE_DEFAULT).toSize());
+	move(settings.value(WINDOW_POS_SETTING, WINDOW_POS_DEFAULT).toPoint());
 	settings.endGroup();

 	settings.beginGroup(SETTINGS_SETTINGS_GROUP);
-	Units u = QLocale::system().measurementSystem() == QLocale::ImperialSystem
-	  ? Imperial : Metric;
-	if (settings.value(UNITS_SETTING, u).toInt() == Imperial) {
-		setImperialUnits();
+	if (settings.value(TIME_TYPE_SETTING, TIME_TYPE_DEFAULT).toInt()
+	  == Moving) {
+		setTimeType(Moving);
+		_movingTimeAction->setChecked(true);
+	} else {
+		setTimeType(Total);
+		_totalTimeAction->setChecked(true);
+	}
+	if (settings.value(UNITS_SETTING, UNITS_DEFAULT).toInt() == Imperial) {
+		setUnits(Imperial);
 		_imperialUnitsAction->setChecked(true);
-	} else
+	} else {
+		setUnits(Metric);
 		_metricUnitsAction->setChecked(true);
-	if (settings.value(SHOW_TOOLBARS_SETTING, true).toBool() == false)
+	}
+	if (!settings.value(SHOW_TOOLBARS_SETTING, SHOW_TOOLBARS_DEFAULT).toBool())
 		showToolbars(false);
 	else
 		_showToolbarsAction->setChecked(true);
 	settings.endGroup();

 	settings.beginGroup(MAP_SETTINGS_GROUP);
-	if (settings.value(SHOW_MAP_SETTING, true).toBool() == true)
+	if (settings.value(SHOW_MAP_SETTING, SHOW_MAP_DEFAULT).toBool())
 		_showMapAction->setChecked(true);
 	if (_maps.count()) {
 		int index = mapIndex(settings.value(CURRENT_MAP_SETTING).toString());
@ -1319,31 +1523,33 @@ void GUI::readSettings()
 	settings.endGroup();

 	settings.beginGroup(GRAPH_SETTINGS_GROUP);
-	if (settings.value(SHOW_GRAPHS_SETTING, true).toBool() == false)
+	if (!settings.value(SHOW_GRAPHS_SETTING, SHOW_GRAPHS_DEFAULT).toBool())
 		showGraphs(false);
 	else
 		_showGraphsAction->setChecked(true);
-	if (settings.value(GRAPH_TYPE_SETTING, Distance).toInt() == Time) {
+	if (settings.value(GRAPH_TYPE_SETTING, GRAPH_TYPE_DEFAULT).toInt()
+	  == Time) {
 		setTimeGraph();
 		_timeGraphAction->setChecked(true);
 	} else
 		_distanceGraphAction->setChecked(true);
-	if (settings.value(SHOW_GRAPH_GRIDS_SETTING, true).toBool() == false)
+	if (!settings.value(SHOW_GRAPH_GRIDS_SETTING, SHOW_GRAPH_GRIDS_DEFAULT)
+	  .toBool())
 		showGraphGrids(false);
 	else
 		_showGraphGridAction->setChecked(true);
 	settings.endGroup();

 	settings.beginGroup(POI_SETTINGS_GROUP);
-	if (settings.value(OVERLAP_POI_SETTING, true).toBool() == false)
+	if (!settings.value(OVERLAP_POI_SETTING, OVERLAP_POI_DEFAULT).toBool())
 		_pathView->setPOIOverlap(false);
 	else
 		_overlapPOIAction->setChecked(true);
-	if (settings.value(LABELS_POI_SETTING, true).toBool() == false)
+	if (!settings.value(LABELS_POI_SETTING, LABELS_POI_DEFAULT).toBool())
 		_pathView->showPOILabels(false);
 	else
 		_showPOILabelsAction->setChecked(true);
-	if (settings.value(SHOW_POI_SETTING, false).toBool() == true)
+	if (settings.value(SHOW_POI_SETTING, SHOW_POI_DEFAULT).toBool())
 		_showPOIAction->setChecked(true);
 	else
 		_pathView->showPOI(false);
@ -1363,31 +1569,112 @@ void GUI::readSettings()
 	settings.endGroup();

 	settings.beginGroup(DATA_SETTINGS_GROUP);
-	if (settings.value(SHOW_TRACKS_SETTING, true).toBool() == false) {
+	if (!settings.value(SHOW_TRACKS_SETTING, SHOW_TRACKS_DEFAULT).toBool()) {
 		_pathView->showTracks(false);
 		for (int i = 0; i < _tabs.count(); i++)
 			_tabs.at(i)->showTracks(false);
 	} else
 		_showTracksAction->setChecked(true);
-	if (settings.value(SHOW_ROUTES_SETTING, true).toBool() == false) {
+	if (!settings.value(SHOW_ROUTES_SETTING, SHOW_ROUTES_DEFAULT).toBool()) {
 		_pathView->showRoutes(false);
 		for (int i = 0; i < _tabs.count(); i++)
 			_tabs.at(i)->showRoutes(false);
 	} else
 		_showRoutesAction->setChecked(true);
-	if (settings.value(SHOW_WAYPOINTS_SETTING, true).toBool() == false)
+	if (!settings.value(SHOW_WAYPOINTS_SETTING, SHOW_WAYPOINTS_DEFAULT)
+	  .toBool())
 		_pathView->showWaypoints(false);
 	else
 		_showWaypointsAction->setChecked(true);
-	if (settings.value(SHOW_WAYPOINT_LABELS_SETTING, true).toBool() == false)
+	if (!settings.value(SHOW_WAYPOINT_LABELS_SETTING,
+	  SHOW_WAYPOINT_LABELS_DEFAULT).toBool())
 		_pathView->showWaypointLabels(false);
 	else
 		_showWaypointLabelsAction->setChecked(true);
-	if (settings.value(SHOW_ROUTE_WAYPOINTS_SETTING, true).toBool() == false)
+	if (!settings.value(SHOW_ROUTE_WAYPOINTS_SETTING,
+	  SHOW_ROUTE_WAYPOINTS_SETTING).toBool())
 		_pathView->showRouteWaypoints(false);
 	else
 		_showRouteWaypointsAction->setChecked(true);
 	settings.endGroup();
+
+	settings.beginGroup(EXPORT_SETTINGS_GROUP);
+	_export.orientation = (QPrinter::Orientation) settings.value(
+	  PAPER_ORIENTATION_SETTING, PAPER_ORIENTATION_DEFAULT).toInt();
+	_export.paperSize = (QPrinter::PaperSize) settings.value(PAPER_SIZE_SETTING,
+	  PAPER_SIZE_DEFAULT).toInt();
+	qreal ml = settings.value(MARGIN_LEFT_SETTING, MARGIN_LEFT_DEFAULT)
+	  .toReal();
+	qreal mt = settings.value(MARGIN_TOP_SETTING, MARGIN_TOP_DEFAULT).toReal();
+	qreal mr = settings.value(MARGIN_RIGHT_SETTING, MARGIN_RIGHT_DEFAULT)
+	  .toReal();
+	qreal mb = settings.value(MARGIN_BOTTOM_SETTING, MARGIN_BOTTOM_DEFAULT)
+	  .toReal();
+	_export.margins = MarginsF(ml, mt, mr, mb);
+	_export.fileName = settings.value(EXPORT_FILENAME_SETTING,
+	 EXPORT_FILENAME_DEFAULT).toString();
+	settings.endGroup();
+
+	settings.beginGroup(OPTIONS_SETTINGS_GROUP);
+	QColor pc = settings.value(PALETTE_COLOR_SETTING, PALETTE_COLOR_DEFAULT)
+	  .value<QColor>();
+	qreal ps = settings.value(PALETTE_SHIFT_SETTING, PALETTE_SHIFT_DEFAULT)
+	  .toDouble();
+	_options.palette = Palette(pc, ps);
+	_options.trackWidth = settings.value(TRACK_WIDTH_SETTING,
+	  TRACK_WIDTH_DEFAULT).toInt();
+	_options.routeWidth = settings.value(ROUTE_WIDTH_SETTING,
+	  ROUTE_WIDTH_DEFAULT).toInt();
+	_options.trackStyle = (Qt::PenStyle) settings.value(TRACK_STYLE_SETTING,
+	  (int)TRACK_STYLE_DEFAULT).toInt();
+	_options.routeStyle = (Qt::PenStyle) settings.value(ROUTE_STYLE_SETTING,
+	  (int)ROUTE_STYLE_DEFAULT).toInt();
+	_options.pathAntiAliasing = settings.value(PATH_AA_SETTING, PATH_AA_DEFAULT)
+	  .toBool();
+	_options.graphWidth = settings.value(GRAPH_WIDTH_SETTING,
+	  GRAPH_WIDTH_DEFAULT).toInt();
+	_options.graphAntiAliasing = settings.value(GRAPH_AA_SETTING,
+	  GRAPH_AA_DEFAULT).toBool();
+	_options.poiRadius = settings.value(POI_RADIUS_SETTING, POI_RADIUS_DEFAULT)
+	  .toInt();
+	_options.useOpenGL = settings.value(USE_OPENGL_SETTING, USE_OPENGL_DEFAULT)
+	  .toBool();
+	_options.printName = settings.value(PRINT_NAME_SETTING, PRINT_NAME_DEFAULT)
+	  .toBool();
+	_options.printDate = settings.value(PRINT_DATE_SETTING, PRINT_DATE_DEFAULT)
+	  .toBool();
+	_options.printDistance = settings.value(PRINT_DISTANCE_SETTING,
+	  PRINT_DISTANCE_DEFAULT).toBool();
+	_options.printTime = settings.value(PRINT_TIME_SETTING, PRINT_TIME_DEFAULT)
+	  .toBool();
+	_options.printMovingTime = settings.value(PRINT_MOVING_TIME_SETTING,
+	  PRINT_MOVING_TIME_DEFAULT).toBool();
+	_options.printItemCount = settings.value(PRINT_ITEM_COUNT_SETTING,
+	  PRINT_ITEM_COUNT_DEFAULT).toBool();
+	_options.separateGraphPage = settings.value(SEPARATE_GRAPH_PAGE_SETTING,
+	  SEPARATE_GRAPH_PAGE_DEFAULT).toBool();
+
+	_pathView->setPalette(_options.palette);
+	_pathView->setTrackWidth(_options.trackWidth);
+	_pathView->setRouteWidth(_options.routeWidth);
+	_pathView->setTrackStyle(_options.trackStyle);
+	_pathView->setRouteStyle(_options.routeStyle);
+	_pathView->setRenderHint(QPainter::Antialiasing, _options.pathAntiAliasing);
+	if (_options.useOpenGL)
+		_pathView->useOpenGL(true);
+
+	for (int i = 0; i < _tabs.count(); i++) {
+		_tabs.at(i)->setPalette(_options.palette);
+		_tabs.at(i)->setGraphWidth(_options.graphWidth);
+		_tabs.at(i)->setRenderHint(QPainter::Antialiasing,
+		  _options.graphAntiAliasing);
+		if (_options.useOpenGL)
+			_tabs.at(i)->useOpenGL(true);
+	}
+
+	_poi->setRadius(_options.poiRadius);
+
+	settings.endGroup();
 }

 int GUI::mapIndex(const QString &name)
@ -1399,6 +1686,11 @@ int GUI::mapIndex(const QString &name)
 	return 0;
 }

+Units GUI::units() const
+{
+	return _imperialUnitsAction->isChecked() ? Imperial : Metric;
+}
+
 qreal GUI::distance() const
 {
 	qreal dist = 0;
@ -1415,3 +1707,8 @@ qreal GUI::time() const
 {
 	return (_showTracksAction->isChecked()) ? _time : 0;
 }
+
+qreal GUI::movingTime() const
+{
+	return (_showTracksAction->isChecked()) ? _movingTime : 0;
+}
--- a/src/gui.h
+++ b/src/gui.h
@ -7,9 +7,11 @@
 #include <QDate>
 #include <QPrinter>
 #include "units.h"
+#include "timetype.h"
 #include "graph.h"
 #include "poi.h"
-#include "margins.h"
+#include "exportdialog.h"
+#include "optionsdialog.h"

 class QMenu;
 class QToolBar;
@ -55,6 +57,7 @@ private slots:
 	void clearMapCache();
 	void nextMap();
 	void prevMap();
+	void openOptions();

 	void mapChanged(int);
 	void graphChanged(int);
@ -65,6 +68,8 @@ private slots:
 	void last();
 	void first();

+	void setTotalTime() {setTimeType(Total);}
+	void setMovingTime() {setTimeType(Moving);}
 	void setMetricUnits() {setUnits(Metric);}
 	void setImperialUnits() {setUnits(Imperial);}
 	void setDistanceGraph() {setGraphType(Distance);}
@ -100,11 +105,15 @@ private:
 	void updateGraphTabs();
 	void updatePathView();

+	TimeType timeType() const;
+	Units units() const;
+	void setTimeType(TimeType type);
 	void setUnits(Units units);
 	void setGraphType(GraphType type);

 	qreal distance() const;
 	qreal time() const;
+	qreal movingTime() const;
 	int mapIndex(const QString &name);
 	void readSettings();
 	void writeSettings();
@ -152,6 +161,8 @@ private:
 	QAction *_firstAction;
 	QAction *_metricUnitsAction;
 	QAction *_imperialUnitsAction;
+	QAction *_totalTimeAction;
+	QAction *_movingTimeAction;
 	QAction *_nextMapAction;
 	QAction *_prevMapAction;
 	QAction *_showTracksAction;
@ -159,6 +170,7 @@ private:
 	QAction *_showWaypointsAction;
 	QAction *_showWaypointLabelsAction;
 	QAction *_showRouteWaypointsAction;
+	QAction *_openOptionsAction;
 	QList<QAction*> _mapActions;
 	QList<QAction*> _poiFilesActions;

@ -185,17 +197,17 @@ private:
 	qreal _trackDistance;
 	qreal _routeDistance;
 	qreal _time;
+	qreal _movingTime;
 	DateRange _dateRange;
+	QString _pathName;

 	qreal _sliderPos;

 	int _frameStyle;
 	bool _showGraphs;

-	QString _exportFileName;
-	QPrinter::PaperSize _exportPaperSize;
-	QPrinter::Orientation _exportOrientation;
-	MarginsF _exportMargins;
+	Export _export;
+	Options _options;
 };

 #endif // GUI_H
--- a/src/heartrategraph.h
+++ b/src/heartrategraph.h
@ -13,9 +13,7 @@ public:
 	QString label() const {return tr("Heart rate");}
 	void loadData(const Data &data, const QList<PathItem *> &paths);
 	void clear();
-	void setUnits(enum Units) {}
 	void showTracks(bool show);
-	void showRoutes(bool show) {Q_UNUSED(show);}

 private:
 	qreal avg() const;
--- a/src/icons.h
+++ b/src/icons.h
@ -1,20 +1,28 @@
 #ifndef ICONS_H
 #define ICONS_H

-#define APP_ICON         ":/icons/gpxsee.png"
-#define OPEN_FILE_ICON   ":/icons/document-open.png"
-#define EXPORT_FILE_ICON ":/icons/document-export.png"
-#define PRINT_FILE_ICON  ":/icons/document-print.png"
-#define CLOSE_FILE_ICON  ":/icons/dialog-close.png"
-#define SHOW_POI_ICON    ":/icons/flag.png"
-#define SHOW_MAP_ICON    ":/icons/applications-internet.png"
-#define SHOW_GRAPHS_ICON ":/icons/office-chart-line-stacked.png"
-#define QUIT_ICON        ":/icons/application-exit.png"
-#define RELOAD_FILE_ICON ":/icons/view-refresh.png"
-#define NEXT_FILE_ICON   ":/icons/arrow-right.png"
-#define PREV_FILE_ICON   ":/icons/arrow-left.png"
-#define LAST_FILE_ICON   ":/icons/arrow-right-double.png"
-#define FIRST_FILE_ICON  ":/icons/arrow-left-double.png"
-#define FULLSCREEN_ICON  ":/icons/view-fullscreen.png"
+#define APP_ICON          ":/icons/gpxsee.png"
+
+// Toolbar/menu icons
+#define OPEN_FILE_ICON    ":/icons/document-open.png"
+#define EXPORT_FILE_ICON  ":/icons/document-export.png"
+#define PRINT_FILE_ICON   ":/icons/document-print.png"
+#define CLOSE_FILE_ICON   ":/icons/dialog-close.png"
+#define SHOW_POI_ICON     ":/icons/flag.png"
+#define SHOW_MAP_ICON     ":/icons/applications-internet.png"
+#define SHOW_GRAPHS_ICON  ":/icons/office-chart-line-stacked.png"
+#define QUIT_ICON         ":/icons/application-exit.png"
+#define RELOAD_FILE_ICON  ":/icons/view-refresh.png"
+#define NEXT_FILE_ICON    ":/icons/arrow-right.png"
+#define PREV_FILE_ICON    ":/icons/arrow-left.png"
+#define LAST_FILE_ICON    ":/icons/arrow-right-double.png"
+#define FIRST_FILE_ICON   ":/icons/arrow-left-double.png"
+#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"

 #endif /* ICONS_H */
--- a/src/igcparser.cpp
+++ b/src/igcparser.cpp
@ -1,22 +1,8 @@
-#include <cctype>
 #include <cstring>
+#include "misc.h"
 #include "igcparser.h"


-static int str2int(const char *str, size_t len)
-{
-	int res = 0;
-
-	for (const char *sp = str; sp < str + len; sp++) {
-		if (::isdigit(*sp))
-			res = res * 10 + *sp - '0';
-		else
-			return -1;
-	}
-
-	return res;
-}
-
 static bool readLat(const char *data, qreal &lat)
 {
 	int d = str2int(data, 2);
@ -93,6 +79,8 @@ static bool readTimestamp(const char *data, QTime &time)
 		return false;

 	time = QTime(h, m, s);
+	if (!time.isValid())
+		return false;

 	return true;
 }
@ -108,7 +96,7 @@ static bool readARecord(const char *line, qint64 len)
 	return true;
 }

-bool IGCParser::readHRecord(const char *line, qint64 len)
+bool IGCParser::readHRecord(const char *line, int len)
 {
 	if (len < 10 || ::strncmp(line, "HFDTE", 5))
 		return true;
@ -122,7 +110,8 @@ bool IGCParser::readHRecord(const char *line, qint64 len)
 		return false;
 	}

-	_date = QDate(2000 + y, m, d);
+	_date = QDate(y + 2000 < QDate::currentDate().year() ? 2000 + y : 1900 + y,
+	  m, d);
 	if (!_date.isValid()) {
 		_errorString = "Invalid date";
 		return false;
@ -131,7 +120,7 @@ bool IGCParser::readHRecord(const char *line, qint64 len)
 	return true;
 }

-bool IGCParser::readBRecord(const char *line, qint64 len)
+bool IGCParser::readBRecord(const char *line, int len)
 {
 	qreal lat, lon, ele;
 	QTime time;
@ -161,7 +150,7 @@ bool IGCParser::readBRecord(const char *line, qint64 len)


 	if (time < _time)
-		_date.addDays(1);
+		_date = _date.addDays(1);
 	_time = time;

 	Trackpoint t(Coordinates(lon, lat));
@ -172,7 +161,7 @@ bool IGCParser::readBRecord(const char *line, qint64 len)
 	return true;
 }

-bool IGCParser::readCRecord(const char *line, qint64 len)
+bool IGCParser::readCRecord(const char *line, int len)
 {
 	qreal lat, lon;

--- a/src/igcparser.h
+++ b/src/igcparser.h
@ -19,9 +19,9 @@ public:
 	int errorLine() const {return _errorLine;}

 private:
-	bool readHRecord(const char *line, qint64 len);
-	bool readBRecord(const char *line, qint64 len);
-	bool readCRecord(const char *line, qint64 len);
+	bool readHRecord(const char *line, int len);
+	bool readBRecord(const char *line, int len);
+	bool readCRecord(const char *line, int len);

 	int _errorLine;
 	QString _errorString;
--- a/src/infoitem.cpp
+++ b/src/infoitem.cpp
@ -7,7 +7,9 @@

 InfoItem::InfoItem(QGraphicsItem *parent) : QGraphicsItem(parent)
 {
-
+#ifndef Q_OS_MAC
+	setCacheMode(QGraphicsItem::DeviceCoordinateCache);
+#endif // Q_OS_MAC
 }

 void InfoItem::updateBoundingRect()
@ -76,6 +78,7 @@ void InfoItem::insert(const QString &key, const QString &value)
 		_list[i] = kv;

 	updateBoundingRect();
+	update();
 }

 void InfoItem::clear()
--- a/src/keys.h
+++ b/src/keys.h
@ -10,15 +10,15 @@
 #define LAST_KEY                Qt::Key_End
 #define MODIFIER                Qt::ShiftModifier

-#define QUIT_SHORTCUT           QKeySequence::Quit
-#define OPEN_SHORTCUT           QKeySequence::Open
-#define CLOSE_SHORTCUT          QKeySequence::Close
-#define RELOAD_SHORTCUT         QKeySequence::Refresh
+#define QUIT_SHORTCUT           QKeySequence(QKeySequence::Quit)
+#define OPEN_SHORTCUT           QKeySequence(QKeySequence::Open)
+#define CLOSE_SHORTCUT          QKeySequence(QKeySequence::Close)
+#define RELOAD_SHORTCUT         QKeySequence(QKeySequence::Refresh)
 #define EXPORT_SHORTCUT         QKeySequence(Qt::CTRL + Qt::Key_E)
 #define SHOW_POI_SHORTCUT       QKeySequence(Qt::CTRL + Qt::Key_P)
 #define SHOW_MAP_SHORTCUT       QKeySequence(Qt::CTRL + Qt::Key_M)
-#define NEXT_MAP_SHORTCUT       QKeySequence::Forward
-#define PREV_MAP_SHORTCUT       QKeySequence::Back
+#define NEXT_MAP_SHORTCUT       QKeySequence(QKeySequence::Forward)
+#define PREV_MAP_SHORTCUT       QKeySequence(QKeySequence::Back)
 #define SHOW_GRAPHS_SHORTCUT    QKeySequence(Qt::CTRL + Qt::Key_G)
 #define DISTANCE_GRAPH_SHORTCUT QKeySequence(Qt::CTRL + Qt::Key_D)
 #define TIME_GRAPH_SHORTCUT     QKeySequence(Qt::CTRL + Qt::Key_T)
--- a/src/map.cpp
+++ b/src/map.cpp
@ -5,14 +5,16 @@
 #include "map.h"


-Map::Map(QObject *parent, const QString &name, const QString &url)
-  : QObject(parent)
+Map::Map(const QString &name, const QString &url, Downloader *downloader,
+  QObject *parent) : QObject(parent)
 {
 	_name = name;
 	_url = url;

-	connect(&Downloader::instance(), SIGNAL(finished()), this,
-	  SLOT(emitLoaded()));
+	_downloader = downloader;
+
+
+	connect(_downloader, SIGNAL(finished()), this, SLOT(emitLoaded()));

 	QString path = TILES_DIR + QString("/") + _name;
 	if (!QDir().mkpath(path))
@ -49,7 +51,7 @@ void Map::loadTilesAsync(QList<Tile> &list)
 	}

 	if (!dl.empty())
-		Downloader::instance().get(dl);
+		_downloader->get(dl);
 }

 void Map::loadTilesSync(QList<Tile> &list)
@ -71,8 +73,8 @@ void Map::loadTilesSync(QList<Tile> &list)
 		return;

 	QEventLoop wait;
-	connect(&Downloader::instance(), SIGNAL(finished()), &wait, SLOT(quit()));
-	if (Downloader::instance().get(dl))
+	connect(_downloader, SIGNAL(finished()), &wait, SLOT(quit()));
+	if (_downloader->get(dl))
 		wait.exec();

 	for (int i = 0; i < list.size(); i++) {
--- a/src/map.h
+++ b/src/map.h
@ -3,13 +3,15 @@

 #include "tile.h"

+class Downloader;
+
 class Map : public QObject
 {
 	Q_OBJECT

 public:
-	Map(QObject *parent = 0, const QString &name = QString(),
-	  const QString &url = QString());
+	Map(const QString &name, const QString &url, Downloader *downloader,
+	  QObject *parent = 0);

 	const QString &name() const {return _name;}
 	void loadTiles(QList<Tile> &list, bool block);
@ -30,6 +32,8 @@ private:
 	void loadTilesAsync(QList<Tile> &list);
 	void loadTilesSync(QList<Tile> &list);

+	Downloader *_downloader;
+
 	QString _name;
 	QString _url;
 };
--- a/src/maplist.cpp
+++ b/src/maplist.cpp
@ -4,7 +4,7 @@
 #include "maplist.h"


-QList<Map*> MapList::load(QObject *parent, const QString &fileName)
+QList<Map*> MapList::load(const QString &fileName, QObject *parent)
 {
 	QList<Map*> mapList;
 	QFileInfo fi(fileName);
@ -33,8 +33,8 @@ QList<Map*> MapList::load(QObject *parent, const QString &fileName)
 		QByteArray ba1 = list[0].trimmed();
 		QByteArray ba2 = list[1].trimmed();

-		mapList.append(new Map(parent, QString::fromUtf8(ba1.data(), ba1.size()),
-		  QString::fromLatin1(ba2.data(), ba2.size())));
+		mapList.append(new Map(QString::fromUtf8(ba1.data(), ba1.size()),
+		  QString::fromLatin1(ba2.data(), ba2.size()), _downloader, parent));
 	}

 	return mapList;
--- a/src/maplist.h
+++ b/src/maplist.h
@ -6,12 +6,16 @@
 #include <QObject>

 class Map;
+class Downloader;

 class MapList
 {
 public:
-	static QList<Map*> load(QObject *parent = 0,
-	  const QString &fileName = QString());
+	MapList(Downloader *downloader) : _downloader(downloader) {}
+	QList<Map*> load(const QString &fileName, QObject *parent = 0);
+
+private:
+	Downloader *_downloader;
 };

 #endif // MAPLIST_H
--- a/src/misc.cpp
+++ b/src/misc.cpp
@ -1,4 +1,5 @@
 #include <cmath>
+#include <cctype>
 #include "misc.h"


@ -33,3 +34,17 @@ double niceNum(double x, int round)

 	return nf * pow(10.0, expv);
 }
+
+int str2int(const char *str, int len)
+{
+	int res = 0;
+
+	for (const char *sp = str; sp < str + len; sp++) {
+		if (::isdigit(*sp))
+			res = res * 10 + *sp - '0';
+		else
+			return -1;
+	}
+
+	return res;
+}
--- a/src/misc.h
+++ b/src/misc.h
@ -2,5 +2,6 @@
 #define MISC_H

 double niceNum(double x, int round);
+int str2int(const char *str, int len);

 #endif // MISC_H
--- a/src/nmeaparser.cpp
+++ b/src/nmeaparser.cpp
@ -0,0 +1,527 @@
+#include <cstring>
+#include "misc.h"
+#include "nmeaparser.h"
+
+
+static bool validSentence(const char  *line, int len)
+{
+	const char *lp;
+
+	if (len < 12 || line[0] != '$')
+		return false;
+
+	for (lp = line + len - 1; lp > line + 3; lp--)
+		if (!::isspace(*lp))
+			break;
+	if (*(lp-2) != '*' || !::isalnum(*(lp-1)) || !::isalnum(*(lp)))
+		return false;
+
+	return true;
+}
+
+static bool readFloat(const char *data, int len, qreal &f)
+{
+	bool ok;
+
+	f = QString(QByteArray::fromRawData(data, len)).toFloat(&ok);
+
+	return ok;
+}
+
+bool NMEAParser::readAltitude(const char *data, int len, qreal &ele)
+{
+	if (!len) {
+		ele = NAN;
+		return true;
+	}
+
+	if (!readFloat(data, len, ele)) {
+		_errorString = "Invalid altitude";
+		return false;
+	}
+
+	return true;
+}
+
+bool NMEAParser::readGeoidHeight(const char *data, int len, qreal &gh)
+{
+	if (!len) {
+		gh = 0;
+		return true;
+	}
+
+	if (!readFloat(data, len, gh)) {
+		_errorString = "Invalid geoid height";
+		return false;
+	}
+
+	return true;
+}
+
+bool NMEAParser::readTime(const char *data, int len, QTime &time)
+{
+	int h, m, s, ms = 0;
+
+
+	if (!len) {
+		time = QTime();
+		return true;
+	}
+
+	if (len < 6)
+		goto error;
+
+	h = str2int(data, 2);
+	m = str2int(data + 2, 2);
+	s = str2int(data + 4, 2);
+	if (h < 0 || m < 0 || s < 0)
+		goto error;
+
+	if (len > 7 && data[6] == '.') {
+		if ((ms = str2int(data + 7, len - 7)) < 0)
+			goto error;
+	}
+
+	time = QTime(h, m, s, ms);
+	if (!time.isValid())
+		goto error;
+
+	return true;
+
+error:
+	_errorString = "Invalid time";
+	return false;
+}
+
+bool NMEAParser::readDate(const char *data, int len, QDate &date)
+{
+	int y, m, d;
+
+
+	if (!len) {
+		date = QDate();
+		return true;
+	}
+
+	if (len < 6)
+		goto error;
+
+	d = str2int(data, 2);
+	m = str2int(data + 2, 2);
+	y = str2int(data + 4, len - 4);
+	if (d < 0 || m < 0 || y < 0)
+		goto error;
+
+	if (len - 4 == 2)
+		date = QDate(y + 2000 < QDate::currentDate().year()
+		  ? 2000 + y : 1900 + y, m, d);
+	else
+		date = QDate(y, m, d);
+	if (!date.isValid())
+		goto error;
+
+	return true;
+
+error:
+	_errorString = "Invalid date";
+	return false;
+}
+
+bool NMEAParser::readLat(const char *data, int len, qreal &lat)
+{
+	int d, mi;
+	qreal mf;
+	bool ok;
+
+
+	if (!len) {
+		lat = NAN;
+		return true;
+	}
+
+	if (len < 7 || data[4] != '.')
+		goto error;
+
+	d = str2int(data, 2);
+	mi = str2int(data + 2, 2);
+	mf = QString(QByteArray::fromRawData(data + 4, len - 4)).toFloat(&ok);
+	if (d < 0 || mi < 0 || !ok)
+		goto error;
+
+	lat = d + (((qreal)mi + mf) / 60.0);
+	if (lat > 90)
+		goto error;
+
+	return true;
+
+error:
+	_errorString = "Invalid ltitude";
+	return false;
+}
+
+bool NMEAParser::readNS(const char *data, int len, qreal &lat)
+{
+	if (!len) {
+		lat = NAN;
+		return true;
+	}
+
+	if (len != 1 || !(*data == 'N' || *data == 'S')) {
+		_errorString = "Invalid N/S value";
+		return false;
+	}
+
+	if (*data == 'S')
+		lat = -lat;
+
+	return true;
+}
+
+bool NMEAParser::readLon(const char *data, int len, qreal &lon)
+{
+	int d, mi;
+	qreal mf;
+	bool ok;
+
+
+	if (!len) {
+		lon = NAN;
+		return true;
+	}
+
+	if (len < 8 || data[5] != '.')
+		goto error;
+
+	d = str2int(data, 3);
+	mi = str2int(data + 3, 2);
+	mf = QString(QByteArray::fromRawData(data + 5, len - 5)).toFloat(&ok);
+	if (d < 0 || mi < 0 || !ok)
+		goto error;
+
+	lon = d + (((qreal)mi + mf) / 60.0);
+	if (lon > 180)
+		goto error;
+
+	return true;
+
+error:
+	_errorString = "Invalid longitude";
+	return false;
+}
+
+bool NMEAParser::readEW(const char *data, int len, qreal &lon)
+{
+	if (!len) {
+		lon = NAN;
+		return true;
+	}
+
+	if (len != 1 || !(*data == 'E' || *data == 'W')) {
+		_errorString = "Invalid E/W value";
+		return false;
+	}
+
+	if (*data == 'W')
+		lon = -lon;
+
+	return true;
+}
+
+bool NMEAParser::readRMC(const char *line, int len)
+{
+	int col = 1;
+	const char *vp = line;
+	qreal lat, lon;
+	QTime time;
+	QDate date;
+	bool valid = true;
+
+	for (const char *lp = line; lp < line + len; lp++) {
+		if (*lp == ',' || *lp == '*') {
+			switch (col) {
+				case 1:
+					if (!readTime(vp, lp - vp, time))
+						return false;
+					break;
+				case 2:
+					if (*vp != 'A')
+						valid = false;
+					break;
+				case 3:
+					if (!readLat(vp, lp - vp, lat))
+						return false;
+					break;
+				case 4:
+					if (!readNS(vp, lp - vp, lat))
+						return false;
+					break;
+				case 5:
+					if (!readLon(vp, lp - vp, lon))
+						return false;
+					break;
+				case 6:
+					if (!readEW(vp, lp - vp, lon))
+						return false;
+					break;
+				case 9:
+					if (!readDate(vp, lp - vp, date))
+						return false;
+					break;
+			}
+
+			col++;
+			vp = lp + 1;
+		}
+	}
+
+	if (col < 9) {
+		_errorString = "Invalid RMC sentence";
+		return false;
+	}
+
+	if (!date.isNull()) {
+		if (_date.isNull() && !_time.isNull() && !_tracks.last().isEmpty())
+			_tracks.last().last().setTimestamp(QDateTime(date, _time, Qt::UTC));
+		_date = date;
+	}
+
+	if (valid && !_GGA && !std::isnan(lat) && !std::isnan(lon)) {
+		Trackpoint t(Coordinates(lon, lat));
+		if (!_date.isNull() && !time.isNull())
+			t.setTimestamp(QDateTime(_date, time, Qt::UTC));
+		_tracks.last().append(t);
+	}
+
+	return true;
+}
+
+bool NMEAParser::readGGA(const char *line, int len)
+{
+	int col = 1;
+	const char *vp = line;
+	qreal lat, lon, ele, gh;
+
+	for (const char *lp = line; lp < line + len; lp++) {
+		if (*lp == ',' || *lp == '*') {
+			switch (col) {
+				case 1:
+					if (!readTime(vp, lp - vp, _time))
+						return false;
+					break;
+				case 2:
+					if (!readLat(vp, lp - vp, lat))
+						return false;
+					break;
+				case 3:
+					if (!readNS(vp, lp - vp, lat))
+						return false;
+					break;
+				case 4:
+					if (!readLon(vp, lp - vp, lon))
+						return false;
+					break;
+				case 5:
+					if (!readEW(vp, lp - vp, lon))
+						return false;
+					break;
+				case 9:
+					if (!readAltitude(vp, lp - vp, ele))
+						return false;
+					break;
+				case 10:
+					if ((lp - vp) && !((lp - vp) == 1 && *vp == 'M')) {
+						_errorString = "Invalid altitude units";
+						return false;
+					}
+					break;
+				case 11:
+					if (!readGeoidHeight(vp, lp - vp, gh))
+						return false;
+					break;
+				case 12:
+					if ((lp - vp) && !((lp - vp) == 1 && *vp == 'M')) {
+						_errorString = "Invalid geoid height units";
+						return false;
+					}
+					break;
+			}
+
+			col++;
+			vp = lp + 1;
+		}
+	}
+
+	if (col < 12) {
+		_errorString = "Invalid GGA sentence";
+		return false;
+	}
+
+	if (!std::isnan(lat) && !std::isnan(lon)) {
+		Trackpoint t(Coordinates(lon, lat));
+		if (!(_time.isNull() || _date.isNull()))
+			t.setTimestamp(QDateTime(_date, _time, Qt::UTC));
+		if (!std::isnan(ele))
+			t.setElevation(ele - gh);
+		_tracks.last().append(t);
+
+		_GGA = true;
+	}
+
+	return true;
+}
+
+bool NMEAParser::readWPL(const char *line, int len)
+{
+	int col = 1;
+	const char *vp = line;
+	qreal lat, lon;
+	QString name;
+
+	for (const char *lp = line; lp < line + len; lp++) {
+		if (*lp == ',' || *lp == '*') {
+			switch (col) {
+				case 1:
+					if (!readLat(vp, lp - vp, lat))
+						return false;
+					break;
+				case 2:
+					if (!readNS(vp, lp - vp, lat))
+						return false;
+					break;
+				case 3:
+					if (!readLon(vp, lp - vp, lon))
+						return false;
+					break;
+				case 4:
+					if (!readEW(vp, lp - vp, lon))
+						return false;
+					break;
+				case 5:
+					name = QString(QByteArray(vp, lp - vp));
+					break;
+			}
+
+			col++;
+			vp = lp + 1;
+		}
+	}
+
+	if (col < 4) {
+		_errorString = "Invalid WPL sentence";
+		return false;
+	}
+
+	if (!std::isnan(lat) && !std::isnan(lon)) {
+		Waypoint w(Coordinates(lon, lat));
+		w.setName(name);
+		_waypoints.append(w);
+	}
+
+	return true;
+}
+
+bool NMEAParser::readZDA(const char *line, int len)
+{
+	int col = 1;
+	const char *vp = line;
+	int d, m, y;
+
+	for (const char *lp = line; lp < line + len; lp++) {
+		if (*lp == ',' || *lp == '*') {
+			switch (col) {
+				case 2:
+					if (!(lp - vp))
+						return true;
+					if ((d = str2int(vp, lp - vp)) < 0) {
+						_errorString = "Invalid day";
+						return false;
+					}
+					break;
+				case 3:
+					if (!(lp - vp))
+						return true;
+					if ((m = str2int(vp, lp - vp)) < 0) {
+						_errorString = "Invalid month";
+						return false;
+					}
+					break;
+				case 4:
+					if (!(lp - vp))
+						return true;
+					if ((y = str2int(vp, lp - vp)) < 0) {
+						_errorString = "Invalid year";
+						return false;
+					}
+					break;
+			}
+
+			col++;
+			vp = lp + 1;
+		}
+	}
+
+	if (col < 4) {
+		_errorString = "Invalid ZDA sentence";
+		return false;
+	}
+
+	_date = QDate(y, m, d);
+	if (!_date.isValid()) {
+		_errorString = "Invalid date";
+		return false;
+	}
+
+	return true;
+}
+
+bool NMEAParser::loadFile(QFile *file)
+{
+	qint64 len;
+	char line[80 + 2 + 1 + 1];
+
+
+	_errorLine = 1;
+	_errorString.clear();
+	_date = QDate();
+	_time = QTime();
+	_GGA = false;
+
+	_tracks.append(TrackData());
+
+	while (!file->atEnd()) {
+		len = file->readLine(line, sizeof(line));
+
+		if (len < 0) {
+			_errorString = "I/O error";
+			return false;
+		} else if (len > (qint64)sizeof(line) - 1) {
+			_errorString = "Line limit exceeded";
+			return false;
+		}
+
+		if (validSentence(line, len)) {
+			if (!memcmp(line + 3, "RMC,", 4)) {
+				if (!readRMC(line + 7, len))
+					return false;
+			} else if (!memcmp(line + 3, "GGA,", 4)) {
+				if (!readGGA(line + 7, len))
+					return false;
+			} else if (!memcmp(line + 3, "WPL,", 4)) {
+				if (!readWPL(line + 7, len))
+					return false;
+			} else if (!memcmp(line + 3, "ZDA,", 4)) {
+				if (!readZDA(line + 7, len))
+					return false;
+			}
+		}
+
+		_errorLine++;
+	}
+
+	if (!_tracks.last().size() && !_waypoints.size()) {
+		_errorString = "No usable NMEA sentence found";
+		return false;
+	}
+
+	return true;
+}
--- a/src/nmeaparser.h
+++ b/src/nmeaparser.h
@ -0,0 +1,43 @@
+#ifndef NMEAPARSER_H
+#define NMEAPARSER_H
+
+#include <QDate>
+#include "parser.h"
+
+
+class NMEAParser : public Parser
+{
+public:
+	NMEAParser(QList<TrackData> &tracks, QList<RouteData> &routes,
+	  QList<Waypoint> &waypoints) : Parser(tracks, routes, waypoints)
+	  {_errorLine = 0; _GGA = false;}
+	~NMEAParser() {}
+
+	bool loadFile(QFile *file);
+	QString errorString() const {return _errorString;}
+	int errorLine() const {return _errorLine;}
+
+private:
+	bool readEW(const char *data, int len, qreal &lon);
+	bool readLon(const char *data, int len, qreal &lon);
+	bool readNS(const char *data, int len, qreal &lat);
+	bool readLat(const char *data, int len, qreal &lat);
+	bool readDate(const char *data, int len, QDate &date);
+	bool readTime(const char *data, int len, QTime &time);
+	bool readAltitude(const char *data, int len, qreal &ele);
+	bool readGeoidHeight(const char *data, int len, qreal &gh);
+
+	bool readRMC(const char *line, int len);
+	bool readGGA(const char *line, int len);
+	bool readWPL(const char *line, int len);
+	bool readZDA(const char *line, int len);
+
+	int _errorLine;
+	QString _errorString;
+
+	QDate _date;
+	QTime _time;
+	bool _GGA;
+};
+
+#endif // NMEAPARSER_H
--- a/src/opengl.h
+++ b/src/opengl.h
@ -0,0 +1,26 @@
+#include <QtGlobal>
+#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0) || defined(Q_OS_MAC)
+#include <QGLWidget>
+#include <QGLFormat>
+#else
+#include <QOpenGLWidget>
+#include <QSurfaceFormat>
+#endif
+
+#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0) || defined(Q_OS_MAC)
+#define OPENGL_WIDGET QGLWidget
+#else
+#define OPENGL_WIDGET QOpenGLWidget
+#endif
+
+#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0) || defined(Q_OS_MAC)
+#define OPENGL_SET_SAMPLES(samples) \
+	{QGLFormat fmt; \
+	fmt.setSamples(samples); \
+	QGLFormat::setDefaultFormat(fmt);}
+#else
+#define OPENGL_SET_SAMPLES(samples) \
+	{QSurfaceFormat fmt; \
+	fmt.setSamples(samples);\
+	QSurfaceFormat::setDefaultFormat(fmt);}
+#endif
--- a/src/optionsdialog.cpp
+++ b/src/optionsdialog.cpp
@ -0,0 +1,288 @@
+#include <QVBoxLayout>
+#include <QFormLayout>
+#include <QDialogButtonBox>
+#include <QListWidget>
+#include <QListWidgetItem>
+#include <QStackedWidget>
+#include <QTabWidget>
+#include <QSpinBox>
+#include <QGroupBox>
+#include <QCheckBox>
+#include <QComboBox>
+#include <QSysInfo>
+#include "config.h"
+#include "icons.h"
+#include "colorbox.h"
+#include "stylecombobox.h"
+#include "optionsdialog.h"
+
+#define MENU_MARGIN 20
+#define MENU_ICON_SIZE 32
+
+
+QWidget *OptionsDialog::createAppearancePage()
+{
+	_baseColor = new ColorBox();
+	_baseColor->setColor(_options->palette.color());
+	_colorOffset = new QDoubleSpinBox();
+	_colorOffset->setMinimum(0);
+	_colorOffset->setMaximum(1.0);
+	_colorOffset->setSingleStep(0.01);
+	_colorOffset->setValue(_options->palette.shift());
+
+	QFormLayout *paletteLayout = new QFormLayout();
+	paletteLayout->addRow(tr("Base color:"), _baseColor);
+	paletteLayout->addRow(tr("Palette shift:"), _colorOffset);
+
+	QWidget *colorTab = new QWidget();
+	colorTab->setLayout(paletteLayout);
+
+
+	_trackWidth = new QSpinBox();
+	_trackWidth->setValue(_options->trackWidth);
+	_trackWidth->setMinimum(1);
+	_trackStyle = new StyleComboBox();
+	_trackStyle->setValue(_options->trackStyle);
+	QFormLayout *trackLayout = new QFormLayout();
+	trackLayout->addRow(tr("Track width:"), _trackWidth);
+	trackLayout->addRow(tr("Track style:"), _trackStyle);
+#ifndef Q_OS_MAC
+	QGroupBox *trackBox = new QGroupBox(tr("Tracks"));
+	trackBox->setLayout(trackLayout);
+#endif
+
+	_routeWidth = new QSpinBox();
+	_routeWidth->setValue(_options->routeWidth);
+	_routeWidth->setMinimum(1);
+	_routeStyle = new StyleComboBox();
+	_routeStyle->setValue(_options->routeStyle);
+	QFormLayout *routeLayout = new QFormLayout();
+	routeLayout->addRow(tr("Route width:"), _routeWidth);
+	routeLayout->addRow(tr("Route style:"), _routeStyle);
+#ifndef Q_OS_MAC
+	QGroupBox *routeBox = new QGroupBox(tr("Routes"));
+	routeBox->setLayout(routeLayout);
+#endif // Q_OS_MAC
+
+	_pathAA = new QCheckBox(tr("Use anti-aliasing"));
+	_pathAA->setChecked(_options->pathAntiAliasing);
+	QFormLayout *pathAALayout = new QFormLayout();
+	pathAALayout->addWidget(_pathAA);
+
+	QWidget *pathTab = new QWidget();
+	QVBoxLayout *pathTabLayout = new QVBoxLayout();
+#ifdef Q_OS_MAC
+	QFrame *l1 = new QFrame();
+	l1->setFrameShape(QFrame::HLine);
+	l1->setFrameShadow(QFrame::Sunken);
+	QFrame *l2 = new QFrame();
+	l2->setFrameShape(QFrame::HLine);
+	l2->setFrameShadow(QFrame::Sunken);
+
+	pathTabLayout->addLayout(trackLayout);
+	pathTabLayout->addWidget(l1);
+	pathTabLayout->addLayout(routeLayout);
+	pathTabLayout->addWidget(l2);
+#else
+	pathTabLayout->addWidget(trackBox);
+	pathTabLayout->addWidget(routeBox);
+#endif
+	pathTabLayout->addLayout(pathAALayout);
+	pathTab->setLayout(pathTabLayout);
+
+	_graphWidth = new QSpinBox();
+	_graphWidth->setValue(_options->graphWidth);
+	_graphWidth->setMinimum(1);
+	QFormLayout *graphLayout = new QFormLayout();
+	graphLayout->addRow(tr("Line width:"), _graphWidth);
+
+	_graphAA = new QCheckBox(tr("Use anti-aliasing"));
+	_graphAA->setChecked(_options->graphAntiAliasing);
+	QFormLayout *graphAALayout = new QFormLayout();
+	graphAALayout->addWidget(_graphAA);
+
+
+	QWidget *graphTab = new QWidget();
+	QVBoxLayout *graphTabLayout = new QVBoxLayout();
+	graphTabLayout->addLayout(graphLayout);
+	graphTabLayout->addLayout(graphAALayout);
+	graphTabLayout->addStretch();
+	graphTab->setLayout(graphTabLayout);
+
+	QTabWidget *appearancePage = new QTabWidget();
+	appearancePage->addTab(colorTab, tr("Colors"));
+	appearancePage->addTab(pathTab, tr("Paths"));
+	appearancePage->addTab(graphTab, tr("Graphs"));
+
+	return appearancePage;
+}
+
+QWidget *OptionsDialog::createPOIPage()
+{
+	_poiRadius = new QDoubleSpinBox();
+	_poiRadius->setSingleStep(1);
+	_poiRadius->setDecimals(1);
+	if (_options->units == Imperial) {
+		_poiRadius->setValue(_options->poiRadius / MIINM);
+		_poiRadius->setSuffix(UNIT_SPACE + tr("mi"));
+	} else {
+		_poiRadius->setValue(_options->poiRadius / KMINM);
+		_poiRadius->setSuffix(UNIT_SPACE + tr("km"));
+	}
+
+	QFormLayout *poiLayout = new QFormLayout();
+	poiLayout->addRow(tr("POI radius:"), _poiRadius);
+
+	QWidget *poiTab = new QWidget();
+	poiTab->setLayout(poiLayout);
+
+	QTabWidget *poiPage = new QTabWidget();
+	poiPage->addTab(poiTab, tr("POI"));
+
+	return poiPage;
+}
+
+QWidget *OptionsDialog::createExportPage()
+{
+	_name = new QCheckBox(tr("Name"));
+	_name->setChecked(_options->printName);
+	_date = new QCheckBox(tr("Date"));
+	_date->setChecked(_options->printDate);
+	_distance = new QCheckBox(tr("Distance"));
+	_distance->setChecked(_options->printDistance);
+	_time = new QCheckBox(tr("Time"));
+	_time->setChecked(_options->printTime);
+	_movingTime = new QCheckBox(tr("Moving time"));
+	_movingTime->setChecked(_options->printMovingTime);
+	_itemCount = new QCheckBox(tr("Item count (>1)"));
+	_itemCount->setChecked(_options->printItemCount);
+
+	QFormLayout *headerTabLayout = new QFormLayout();
+	headerTabLayout->addWidget(_name);
+	headerTabLayout->addWidget(_date);
+	headerTabLayout->addWidget(_distance);
+	headerTabLayout->addWidget(_time);
+	headerTabLayout->addWidget(_movingTime);
+	headerTabLayout->addItem(new QSpacerItem(10, 10));
+	headerTabLayout->addWidget(_itemCount);
+	QWidget *headerTab = new QWidget();
+	headerTab->setLayout(headerTabLayout);
+
+
+	_separateGraphPage = new QCheckBox(tr("Separate graph page"));
+	_separateGraphPage->setChecked(_options->separateGraphPage);
+
+	QFormLayout *graphTabLayout = new QFormLayout();
+	graphTabLayout->addWidget(_separateGraphPage);
+	QWidget *graphTab = new QWidget();
+	graphTab->setLayout(graphTabLayout);
+
+
+	QTabWidget *exportPage = new QTabWidget();
+	exportPage->addTab(headerTab, tr("Header"));
+	exportPage->addTab(graphTab, tr("Graphs"));
+
+	return exportPage;
+}
+
+QWidget *OptionsDialog::createSystemPage()
+{
+	_useOpenGL = new QCheckBox(tr("Use OpenGL"));
+#ifdef Q_OS_WIN32
+	if (QSysInfo::WindowsVersion < QSysInfo::WV_VISTA) {
+		_useOpenGL->setChecked(false);
+		_useOpenGL->setEnabled(false);
+	} else
+#endif // Q_OS_WIN32
+	_useOpenGL->setChecked(_options->useOpenGL);
+
+	QFormLayout *systemLayout = new QFormLayout();
+	systemLayout->addWidget(_useOpenGL);
+
+	QWidget *systemTab = new QWidget();
+	systemTab->setLayout(systemLayout);
+
+	QTabWidget *systemPage = new QTabWidget();
+	systemPage->addTab(systemTab, tr("System"));
+
+	return systemPage;
+}
+
+OptionsDialog::OptionsDialog(Options *options, QWidget *parent)
+  : QDialog(parent), _options(options)
+{
+	QStackedWidget *pages = new QStackedWidget();
+	pages->addWidget(createAppearancePage());
+	pages->addWidget(createPOIPage());
+	pages->addWidget(createExportPage());
+	pages->addWidget(createSystemPage());
+
+	QListWidget *menu = new QListWidget();
+	menu->setIconSize(QSize(MENU_ICON_SIZE, MENU_ICON_SIZE));
+	new QListWidgetItem(QIcon(QPixmap(APPEARANCE_ICON)), tr("Appearance"),
+	  menu);
+	new QListWidgetItem(QIcon(QPixmap(POI_ICON)), tr("POI"), menu);
+	new QListWidgetItem(QIcon(QPixmap(PRINT_EXPORT_ICON)), tr("Print & Export"),
+	  menu);
+	new QListWidgetItem(QIcon(QPixmap(SYSTEM_ICON)), tr("System"), menu);
+
+	QHBoxLayout *contentLayout = new QHBoxLayout();
+	contentLayout->addWidget(menu);
+	contentLayout->addWidget(pages);
+
+	menu->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Preferred);
+	menu->setMaximumWidth(menu->sizeHintForColumn(0) + 2 * menu->frameWidth()
+	  + MENU_MARGIN);
+	pages->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred);
+	pages->setMinimumWidth(2 * menu->size().width());
+
+	connect(menu, SIGNAL(currentRowChanged(int)), pages,
+	  SLOT(setCurrentIndex(int)));
+	menu->item(0)->setSelected(true);
+
+
+	QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok
+	  | QDialogButtonBox::Cancel);
+	connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
+	connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
+
+	QVBoxLayout *layout = new QVBoxLayout;
+	layout->addLayout(contentLayout);
+	layout->addWidget(buttonBox);
+	setLayout(layout);
+
+	setWindowTitle(tr("Options"));
+	setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
+}
+
+void OptionsDialog::accept()
+{
+	_options->palette.setColor(_baseColor->color());
+	_options->palette.setShift(_colorOffset->value());
+	_options->trackWidth = _trackWidth->value();
+	_options->trackStyle = (Qt::PenStyle) _trackStyle->itemData(
+	  _trackStyle->currentIndex()).toInt();
+	_options->routeWidth = _routeWidth->value();
+	_options->routeStyle = (Qt::PenStyle) _routeStyle->itemData(
+	  _routeStyle->currentIndex()).toInt();
+	_options->pathAntiAliasing = _pathAA->isChecked();
+	_options->graphWidth = _graphWidth->value();
+	_options->graphAntiAliasing = _graphAA->isChecked();
+
+	if (_options->units == Imperial)
+		_options->poiRadius = _poiRadius->value() * MIINM;
+	else
+		_options->poiRadius = _poiRadius->value() * KMINM;
+
+	_options->useOpenGL = _useOpenGL->isChecked();
+
+	_options->printName = _name->isChecked();
+	_options->printDate = _date->isChecked();
+	_options->printDistance = _distance->isChecked();
+	_options->printTime = _time->isChecked();
+	_options->printMovingTime = _movingTime->isChecked();
+	_options->printItemCount = _itemCount->isChecked();
+	_options->separateGraphPage = _separateGraphPage->isChecked();
+
+	QDialog::accept();
+}
--- a/src/optionsdialog.h
+++ b/src/optionsdialog.h
@ -0,0 +1,79 @@
+#ifndef OPTIONSDIALOG_H
+#define OPTIONSDIALOG_H
+
+#include <QDialog>
+#include "palette.h"
+#include "units.h"
+
+class ColorBox;
+class StyleComboBox;
+class QSpinBox;
+class QDoubleSpinBox;
+class QComboBox;
+class QCheckBox;
+
+struct Options {
+	// Appearance
+	Palette palette;
+	int trackWidth;
+	int routeWidth;
+	Qt::PenStyle trackStyle;
+	Qt::PenStyle routeStyle;
+	int graphWidth;
+	bool pathAntiAliasing;
+	bool graphAntiAliasing;
+	// POI
+	int poiRadius;
+	// System
+	bool useOpenGL;
+	// Print/Export
+	bool printName;
+	bool printDate;
+	bool printDistance;
+	bool printTime;
+	bool printMovingTime;
+	bool printItemCount;
+	bool separateGraphPage;
+
+	Units units;
+};
+
+class OptionsDialog : public QDialog
+{
+	Q_OBJECT
+
+public:
+	OptionsDialog(Options *options, QWidget *parent = 0);
+
+public slots:
+	void accept();
+
+private:
+	QWidget *createAppearancePage();
+	QWidget *createPOIPage();
+	QWidget *createSystemPage();
+	QWidget *createExportPage();
+
+	Options *_options;
+
+	ColorBox *_baseColor;
+	QDoubleSpinBox *_colorOffset;
+	QSpinBox *_trackWidth;
+	StyleComboBox *_trackStyle;
+	QSpinBox *_routeWidth;
+	StyleComboBox *_routeStyle;
+	QCheckBox *_pathAA;
+	QSpinBox *_graphWidth;
+	QCheckBox *_graphAA;
+	QDoubleSpinBox *_poiRadius;
+	QCheckBox *_useOpenGL;
+	QCheckBox *_name;
+	QCheckBox *_date;
+	QCheckBox *_distance;
+	QCheckBox *_time;
+	QCheckBox *_movingTime;
+	QCheckBox *_itemCount;
+	QCheckBox *_separateGraphPage;
+};
+
+#endif // OPTIONSDIALOG_H
--- a/src/palette.cpp
+++ b/src/palette.cpp
@ -1,62 +1,46 @@
 #include "palette.h"

-
-#define HUE_INIT		0.1f
-#define HUE_INCREMENT	0.62f
-#define SATURATION		0.99f
-#define VALUE			0.99f
-
-static unsigned hsv2rgb(float h, float s, float v)
+Palette::Palette(const QColor &color, qreal shift)
 {
-	unsigned hi;
-	float r = 0, g = 0, b = 0, p, q, t, f;
+	_h = 0; _s = 0; _v = 0; _a = 1.0;

-	hi = (unsigned)(h * 6.0f);
-	f = h * 6.0f - hi;
-	p = v * (1.0f - s);
-	q = v * (1.0f - f * s);
-	t = v * (1.0f - (1.0f - f) * s);
+	setColor(color);
+	setShift(shift);

-	switch (hi) {
-		case 0:
-			r = v; g = t; b = p;
-			break;
-		case 1:
-			r = q; g = v; b = p;
-			break;
-		case 2:
-			r = p; g = v; b = t;
-			break;
-		case 3:
-			r = p; g = q; b = v;
-			break;
-		case 4:
-			r = t; g = p; b = v;
-			break;
-		case 5:
-			r = v; g = p; b = q;
-			break;
-	}
-
-	return ((unsigned)(r * 256) << 16)
-	  + ((unsigned)(g * 256) << 8)
-	  + (unsigned)(b * 256);
+	_state = _h;
 }

-Palette::Palette()
+void Palette::setColor(const QColor &color)
 {
-	_hueState = HUE_INIT;
+	if (color.isValid())
+		color.getHsvF(&_h, &_s, &_v, &_a);
 }

-QColor Palette::color()
+void Palette::setShift(qreal shift)
 {
-	_hueState += HUE_INCREMENT;
-	_hueState -= (int) _hueState;
+	if (shift >= 0 && shift <= 1.0)
+		_shift = shift;
+}

-	return QColor(hsv2rgb(_hueState, SATURATION, VALUE));
+QColor Palette::nextColor()
+{
+	QColor ret = QColor::fromHsvF(_state, _s, _v, _a);
+
+	_state += _shift;
+	_state -= (int) _state;
+
+	return ret;
 }

 void Palette::reset()
 {
-	_hueState = HUE_INIT;
+	_state = _h;
+}
+
+QDebug operator<<(QDebug dbg, const Palette &palette)
+{
+	dbg.nospace() << "Palette(" << palette.color() << ", " << palette.shift()
+	  << ")";
+
+	return dbg.maybeSpace();
 }
--- a/src/palette.h
+++ b/src/palette.h
@ -2,16 +2,32 @@
 #define PALETTE_H

 #include <QColor>
+#include <QDebug>

 class Palette
 {
 public:
-	Palette();
-	QColor color();
+	Palette(const QColor &color = Qt::blue, qreal shift = 0.62);
+
+	QColor color() const {return QColor::fromHsvF(_h, _s, _v, _a).toRgb();}
+	qreal shift() const {return _shift;}
+	void setColor(const QColor &color);
+	void setShift(qreal shift);
+
+	QColor nextColor();
 	void reset();

+	bool operator==(const Palette &other) const
+	  {return (_h == other._h && _s == other._s && _v == other._v
+	  && _a == other._a && _shift == other._shift);}
+	bool operator!=(const Palette &other) const
+	  {return !(*this == other);}
+
 private:
-	float _hueState;
+	qreal _h, _s, _v, _a, _shift;
+	qreal _state;
 };

+QDebug operator<<(QDebug dbg, const Palette &palette);
+
 #endif // PALLETE_H
--- a/src/path.cpp
+++ b/src/path.cpp
@ -0,0 +1,9 @@
+#include "path.h"
+
+QDebug operator<<(QDebug dbg, const PathPoint &point)
+{
+	dbg.nospace() << "PathPoint(" << point.distance() << ", "
+	  << point.coordinates() << ")";
+
+	return dbg.maybeSpace();
+}
--- a/src/path.h
+++ b/src/path.h
@ -4,6 +4,25 @@
 #include <QVector>
 #include "coordinates.h"

-typedef QVector<Coordinates> Path;
+class PathPoint
+{
+public:
+	PathPoint() :
+	  _coordinates(Coordinates()), _distance(NAN) {}
+	PathPoint(const Coordinates &coordinates, qreal distance)
+	  : _coordinates(coordinates), _distance(distance) {}
+
+	const Coordinates &coordinates() const {return _coordinates;}
+	qreal distance() const {return _distance;}
+
+private:
+	Coordinates _coordinates;
+	qreal _distance;
+};
+
+Q_DECLARE_TYPEINFO(PathPoint, Q_PRIMITIVE_TYPE);
+QDebug operator<<(QDebug dbg, const PathPoint &point);
+
+typedef QVector<PathPoint> Path;

 #endif // PATH_H
--- a/src/pathitem.cpp
+++ b/src/pathitem.cpp
@ -1,3 +1,4 @@
+#include <cmath>
 #include <QApplication>
 #include <QCursor>
 #include <QPainter>
@ -5,28 +6,21 @@
 #include "pathitem.h"


-#define PATH_WIDTH  3
-#define HOVER_WIDTH 4
-
 void PathItem::updateShape()
 {
 	QPainterPathStroker s;
-	s.setWidth(HOVER_WIDTH * 1.0/scale());
+	s.setWidth((_width + 1) * 1.0/scale());
 	_shape = s.createStroke(_path);
-
-	if (qMax(boundingRect().width(), boundingRect().height()) * scale() <= 768)
-		setCacheMode(QGraphicsItem::DeviceCoordinateCache);
-	else
-		setCacheMode(QGraphicsItem::NoCache);
 }

 PathItem::PathItem(QGraphicsItem *parent) : QGraphicsObject(parent)
 {
+	_width = 3;
+
 	QBrush brush(Qt::SolidPattern);
-	_pen = QPen(brush, PATH_WIDTH);
+	_pen = QPen(brush, _width);

 	_units = Metric;
-	_distance = 0;

 	_marker = new MarkerItem(this);

@ -54,7 +48,7 @@ void PathItem::setScale(qreal scale)
 {
 	prepareGeometryChange();

-	_pen.setWidthF(PATH_WIDTH * 1.0/scale);
+	_pen.setWidthF(_width * 1.0/scale);
 	QGraphicsItem::setScale(scale);
 	_marker->setScale(1.0/scale);

@ -67,26 +61,76 @@ void PathItem::setColor(const QColor &color)
 	update();
 }

+void PathItem::setWidth(int width)
+{
+	prepareGeometryChange();
+
+	_width = width;
+	_pen.setWidthF(_width * 1.0/scale());
+
+	updateShape();
+}
+
+void PathItem::setStyle(Qt::PenStyle style)
+{
+	_pen.setStyle(style);
+	update();
+}
+
 void PathItem::setUnits(enum Units units)
 {
 	_units = units;
 }

+QPointF PathItem::position(qreal x) const
+{
+	int low = 0;
+	int high = _distance.count() - 1;
+	int mid = 0;
+
+
+	Q_ASSERT(_distance.count() == _path.elementCount());
+	Q_ASSERT(high > low);
+	Q_ASSERT(x >= _distance.at(low) && x <= _distance.at(high));
+
+	while (low <= high) {
+		mid = low + ((high - low) / 2);
+		qreal val = _distance.at(mid);
+		if (val > x)
+			high = mid - 1;
+		else if (val < x)
+			low = mid + 1;
+		else
+			return _path.elementAt(mid);
+	}
+
+	QLineF l;
+	qreal p1, p2;
+	if (_distance.at(mid) < x) {
+		l = QLineF(_path.elementAt(mid), _path.elementAt(mid+1));
+		p1 = _distance.at(mid); p2 = _distance.at(mid+1);
+	} else {
+		l = QLineF(_path.elementAt(mid-1), _path.elementAt(mid));
+		p1 = _distance.at(mid-1); p2 = _distance.at(mid);
+	}
+
+	return l.pointAt((x - p1) / (p2 - p1));
+}
+
 void PathItem::moveMarker(qreal distance)
 {
-	if (distance > _distance)
-		_marker->setVisible(false);
-	else {
+	if (distance >= _distance.first() && distance <= _distance.last()) {
 		_marker->setVisible(true);
-		_marker->setPos(_path.pointAtPercent(distance / _distance));
-	}
+		_marker->setPos(position(distance));
+	} else
+		_marker->setVisible(false);
 }

 void PathItem::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
 {
 	Q_UNUSED(event);

-	_pen.setWidthF(HOVER_WIDTH * 1.0/scale());
+	_pen.setWidthF((_width + 1) * 1.0/scale());
 	setZValue(zValue() + 1.0);
 	update();

@ -97,7 +141,7 @@ void PathItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
 {
 	Q_UNUSED(event);

-	_pen.setWidthF(PATH_WIDTH * 1.0/scale());
+	_pen.setWidthF(_width * 1.0/scale());
 	setZValue(zValue() - 1.0);
 	update();

--- a/src/pathitem.h
+++ b/src/pathitem.h
@ -24,6 +24,8 @@ public:
 	void setScale(qreal scale);
 	void setUnits(enum Units units);
 	void setColor(const QColor &color);
+	void setWidth(int width);
+	void setStyle(Qt::PenStyle style);

 public slots:
 	void moveMarker(qreal distance);
@ -34,18 +36,20 @@ signals:
 protected:
 	void updateShape();

+	QVector<qreal> _distance;
 	QPainterPath _path;
-	QPainterPath _shape;
-	QPen _pen;
-
 	MarkerItem *_marker;
-
 	Units _units;
-	qreal _distance;

 private:
+	QPointF position(qreal distance) const;
+
 	void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
 	void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
+
+	int _width;
+	QPen _pen;
+	QPainterPath _shape;
 };

 #endif // PATHITEM_H
--- a/src/pathview.cpp
+++ b/src/pathview.cpp
@ -1,7 +1,9 @@
 #include <QGraphicsView>
 #include <QGraphicsScene>
 #include <QWheelEvent>
+#include "opengl.h"
 #include "rd.h"
+#include "wgs84.h"
 #include "poi.h"
 #include "data.h"
 #include "map.h"
@ -21,21 +23,20 @@ static QPoint mercator2tile(const QPointF &m, int z)
 {
 	QPoint tile;

-	tile.setX((int)(floor((m.x() + 180.0) / 360.0 * pow(2.0, z))));
-	tile.setY((int)(floor((1.0 - (m.y() / 180.0)) / 2.0 * pow(2.0, z))));
+	tile.setX((int)(floor((m.x() + 180.0) / 360.0 * (1<<z))));
+	tile.setY((int)(floor((1.0 - (m.y() / 180.0)) / 2.0 * (1<<z))));

 	return tile;
 }

 static QPointF tile2mercator(const QPoint &tile, int z)
 {
-	Coordinates m;
+	QPointF m;

-	m.setLon(tile.x() / pow(2.0, z) * 360.0 - 180);
-	qreal n = M_PI - 2.0 * M_PI * tile.y() / pow(2.0, z);
-	m.setLat(rad2deg(atan(0.5 * (exp(n) - exp(-n)))));
+	m.setX(((360.0 * tile.x()) / (qreal)(1<<z)) - 180.0);
+	m.setY((1.0 - (2.0 * tile.y()) / (qreal)(1<<z)) * 180.0);

-	return m.toMercator();
+	return m;
 }

 static int scale2zoom(qreal scale)
@ -55,10 +56,15 @@ qreal mapScale(int zoom)
 	return ((360.0/(qreal)(1<<zoom))/(qreal)Tile::size());
 }

-static QRectF qrectf(const QPointF &p1, const QPointF &p2)
+static QRectF mapBounds()
 {
-	return QRectF(QPointF(qMin(p1.x(), p2.x()), qMin(p1.y(), p2.y())),
-	  QPointF(qMax(p1.x(), p2.x()), qMax(p1.y(), p2.y())));
+	return QRectF(QPointF(-180, -180), QSizeF(360, 360));
+}
+
+static qreal zoom2resolution(int zoom, qreal y)
+{
+	return (WGS84_RADIUS * 2 * M_PI / Tile::size()
+	  * cos(2.0 * atan(exp(deg2rad(y))) - M_PI/2)) / (qreal)(1<<zoom);
 }

 static void unite(QRectF &rect, const QPointF &p)
@ -90,13 +96,14 @@ PathView::PathView(QWidget *parent)
 	setViewportUpdateMode(QGraphicsView::FullViewportUpdate);
 	setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
 	setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-	setRenderHints(QPainter::Antialiasing);
+	setRenderHint(QPainter::Antialiasing, true);
 	setAcceptDrops(false);

 	_mapScale = new ScaleItem();
 	_mapScale->setZValue(2.0);

 	_zoom = ZOOM_MAX;
+	_res = 1.0;
 	_map = 0;
 	_poi = 0;

@ -110,8 +117,14 @@ PathView::PathView(QWidget *parent)
 	_showPOILabels = true;
 	_overlapPOIs = true;
 	_showRouteWaypoints = true;
+	_trackWidth = 3;
+	_routeWidth = 3;
+	_trackStyle = Qt::SolidLine;
+	_routeStyle = Qt::DashLine;

 	_plot = false;
+
+	_scene->setSceneRect(scaled(mapBounds(), 1.0 / mapScale(_zoom)));
 }

 PathView::~PathView()
@ -123,7 +136,7 @@ PathView::~PathView()
 PathItem *PathView::addTrack(const Track &track)
 {
 	if (track.isNull()) {
-		_palette.color();
+		_palette.nextColor();
 		return 0;
 	}

@ -132,7 +145,9 @@ PathItem *PathView::addTrack(const Track &track)
 	_tr |= ti->path().boundingRect();
 	_zoom = scale2zoom(contentsScale());
 	ti->setScale(1.0/mapScale(_zoom));
-	ti->setColor(_palette.color());
+	ti->setColor(_palette.nextColor());
+	ti->setWidth(_trackWidth);
+	ti->setStyle(_trackStyle);
 	ti->setVisible(_showTracks);
 	_scene->addItem(ti);

@ -145,7 +160,7 @@ PathItem *PathView::addTrack(const Track &track)
 PathItem *PathView::addRoute(const Route &route)
 {
 	if (route.isNull()) {
-		_palette.color();
+		_palette.nextColor();
 		return 0;
 	}

@ -154,7 +169,9 @@ PathItem *PathView::addRoute(const Route &route)
 	_rr |= ri->path().boundingRect();
 	_zoom = scale2zoom(contentsScale());
 	ri->setScale(1.0/mapScale(_zoom));
-	ri->setColor(_palette.color());
+	ri->setColor(_palette.nextColor());
+	ri->setWidth(_routeWidth);
+	ri->setStyle(_routeStyle);
 	ri->setVisible(_showRoutes);
 	ri->showWaypoints(_showRouteWaypoints);
 	ri->showWaypointLabels(_showWaypointLabels);
@ -174,21 +191,13 @@ void PathView::addWaypoints(const QList<Waypoint> &waypoints)
 		const Waypoint &w = waypoints.at(i);

 		WaypointItem *wi = new WaypointItem(w);
+		_waypoints.append(wi);
+		updateWaypointsBoundingRect(wi->coordinates());
 		wi->setScale(1.0/scale);
 		wi->setZValue(1);
 		wi->showLabel(_showWaypointLabels);
 		wi->setVisible(_showWaypoints);
 		_scene->addItem(wi);
-
-		if (_wr.isNull()) {
-			if (_wp.isNull())
-				_wp = wi->coordinates();
-			else
-				_wr = qrectf(_wp, wi->coordinates());
-		} else
-			unite(_wr, wi->coordinates());
-
-		_waypoints.append(wi);
 	}

 	if (_poi)
@ -205,33 +214,49 @@ QList<PathItem *> PathView::loadData(const Data &data)

 	for (int i = 0; i < data.tracks().count(); i++)
 		paths.append(addTrack(*(data.tracks().at(i))));
+
 	for (int i = 0; i < data.routes().count(); i++)
 		paths.append(addRoute(*(data.routes().at(i))));
+
 	addWaypoints(data.waypoints());

 	if (_tracks.empty() && _routes.empty() && _waypoints.empty())
 		return paths;

-	if ((_tracks.size() + _routes.size() > 1 && _zoom < zoom)
-	  || (_waypoints.size() && _zoom < zoom))
+	if (_zoom < zoom)
 		rescale(_zoom);
 	else
 		updatePOIVisibility();

-	QRectF sr = contentsSceneRect();
-	_scene->setSceneRect(sr);
-	centerOn(sr.center());
+	QPointF center = contentsCenter();
+	centerOn(center);

-	_mapScale->setZoom(_zoom, -(sr.center().ry() * mapScale(_zoom)));
+	_res = zoom2resolution(_zoom, -(center.y() * mapScale(_zoom)));
+	_mapScale->setResolution(_res);
 	if (_mapScale->scene() != _scene)
 		_scene->addItem(_mapScale);

 	return paths;
 }

+void PathView::updateWaypointsBoundingRect(const QPointF &wp)
+{
+	if (_wr.isNull()) {
+		if (_wp.isNull())
+			_wp = wp;
+		else {
+			_wr = QRectF(_wp, wp).normalized();
+			_wp = QPointF();
+		}
+	} else
+		unite(_wr, wp);
+}
+
 qreal PathView::contentsScale() const
 {
 	QRectF br = _tr | _rr | _wr;
+	if (!br.isNull() && !_wp.isNull())
+		unite(br, _wp);

 	if (br.isNull())
 		return mapScale(ZOOM_MAX);
@ -242,17 +267,18 @@ qreal PathView::contentsScale() const
 	return qMax(sc.x(), sc.y());
 }

-QRectF PathView::contentsSceneRect() const
+QPointF PathView::contentsCenter() const
 {
+	QRectF br = _tr | _rr | _wr;
+	if (!br.isNull() && !_wp.isNull())
+		unite(br, _wp);
+
 	qreal scale = mapScale(_zoom);
-	QRectF br = scaled(_tr | _rr | _wr, 1.0/scale);

 	if (br.isNull())
-		return QRectF(QPointF(_wp.x() / scale - Tile::size()/2,
-		  _wp.y() /scale - Tile::size()/2), QSizeF(Tile::size(), Tile::size()));
+		return _wp / scale;
 	else
-		return br.adjusted(-Tile::size(), -Tile::size(), Tile::size(),
-		  Tile::size());
+		return scaled(br, 1.0/scale).center();
 }

 void PathView::updatePOIVisibility()
@ -281,6 +307,8 @@ void PathView::rescale(int zoom)
 	_zoom = zoom;
 	qreal scale = mapScale(zoom);

+	_scene->setSceneRect(scaled(mapBounds(), 1.0 / scale));
+
 	for (int i = 0; i < _tracks.size(); i++)
 		_tracks.at(i)->setScale(1.0/scale);

@ -297,6 +325,17 @@ void PathView::rescale(int zoom)
 	updatePOIVisibility();
 }

+void PathView::setPalette(const Palette &palette)
+{
+	_palette = palette;
+	_palette.reset();
+
+	for (int i = 0; i < _tracks.count(); i++)
+		_tracks.at(i)->setColor(_palette.nextColor());
+	for (int i = 0; i < _routes.count(); i++)
+		_routes.at(i)->setColor(_palette.nextColor());
+}
+
 void PathView::setPOI(POI *poi)
 {
 	if (_poi)
@ -389,16 +428,6 @@ void PathView::redraw()
 	resetCachedContent();
 }

-void PathView::rescale()
-{
-	int zoom = scale2zoom(contentsScale());
-
-	if (zoom != _zoom) {
-		rescale(zoom);
-		_mapScale->setZoom(zoom);
-	}
-}
-
 void PathView::zoom(int z, const QPoint &pos)
 {
 	if (_tracks.isEmpty() && _routes.isEmpty() && _waypoints.isEmpty())
@ -412,16 +441,11 @@ void PathView::zoom(int z, const QPoint &pos)

 	rescale(_zoom);

-	QRectF sr = contentsSceneRect();
-	_scene->setSceneRect(sr);
+	QPointF center = (spos * (os/mapScale(_zoom))) - offset;
+	centerOn(center);

-	if (sr.width() < viewport()->size().width()
-	  && sr.height() < viewport()->size().height())
-		centerOn(sr.center());
-	else
-		centerOn((spos * (os/mapScale(_zoom))) - offset);
-
-	_mapScale->setZoom(_zoom);
+	_res = zoom2resolution(_zoom, -(center.y() * mapScale(_zoom)));
+	_mapScale->setResolution(_res);

 	resetCachedContent();
 }
@ -507,10 +531,11 @@ void PathView::clear()
 	_palette.reset();

 	_zoom = ZOOM_MAX;
+	_res = 1.0;
 	_tr = QRectF(); _rr = QRectF(); _wr = QRectF();
 	_wp = QPointF();

-	_scene->setSceneRect(QRectF());
+	_scene->setSceneRect(scaled(mapBounds(), 1.0 / mapScale(_zoom)));
 }

 void PathView::showTracks(bool show)
@ -585,6 +610,38 @@ void PathView::setPOIOverlap(bool overlap)
 	updatePOIVisibility();
 }

+void PathView::setTrackWidth(int width)
+{
+	_trackWidth = width;
+
+	for (int i = 0; i < _tracks.count(); i++)
+		_tracks.at(i)->setWidth(width);
+}
+
+void PathView::setRouteWidth(int width)
+{
+	_routeWidth = width;
+
+	for (int i = 0; i < _routes.count(); i++)
+		_routes.at(i)->setWidth(width);
+}
+
+void PathView::setTrackStyle(Qt::PenStyle style)
+{
+	_trackStyle = style;
+
+	for (int i = 0; i < _tracks.count(); i++)
+		_tracks.at(i)->setStyle(style);
+}
+
+void PathView::setRouteStyle(Qt::PenStyle style)
+{
+	_routeStyle = style;
+
+	for (int i = 0; i < _routes.count(); i++)
+		_routes.at(i)->setStyle(style);
+}
+
 void PathView::drawBackground(QPainter *painter, const QRectF &rect)
 {
 	if ((_tracks.isEmpty() && _routes.isEmpty() && _waypoints.isEmpty())
@ -598,15 +655,14 @@ void PathView::drawBackground(QPainter *painter, const QRectF &rect)
 	QPoint tile = mercator2tile(QPointF(rr.topLeft().x(), -rr.topLeft().y()),
 	  _zoom);
 	QPointF tm = tile2mercator(tile, _zoom);
-	QPoint tl = mapToScene(mapFromScene(QPointF(tm.x() / scale,
-	  -tm.y() / scale))).toPoint();
+	QPoint tl = QPoint((int)(tm.x() / scale), (int)(-tm.y() / scale));
+

 	QList<Tile> tiles;
-	for (int i = 0; i <= rr.size().width() / Tile::size() + 1; i++) {
-		for (int j = 0; j <= rr.size().height() / Tile::size() + 1; j++) {
+	QSizeF s(rect.right() - tl.x(), rect.bottom() - tl.y());
+	for (int i = 0; i < ceil(s.width() / Tile::size()); i++)
+		for (int j = 0; j < ceil(s.height() / Tile::size()); j++)
 			tiles.append(Tile(QPoint(tile.x() + i, tile.y() + j), _zoom));
-		}
-	}

 	_map->loadTiles(tiles, _plot);

@ -620,24 +676,20 @@ void PathView::drawBackground(QPainter *painter, const QRectF &rect)

 void PathView::resizeEvent(QResizeEvent *event)
 {
+	Q_UNUSED(event);
+
 	if (_tracks.isEmpty() && _routes.isEmpty() && _waypoints.isEmpty())
 		return;

-	rescale();
+	int zoom = scale2zoom(contentsScale());
+	if (zoom != _zoom)
+		rescale(zoom);

-	QRectF sr = contentsSceneRect();
+	QPointF center = contentsCenter();
+	centerOn(center);

-	if (sr.width() < event->size().width()) {
-		qreal diff = event->size().width() - sr.width();
-		sr.adjust(-diff/2, 0, diff/2, 0);
-	}
-	if (sr.height() < event->size().height()) {
-		qreal diff = event->size().height() - sr.height();
-		sr.adjust(0, -diff/2, 0, diff/2);
-	}
-
-	_scene->setSceneRect(sr);
-	centerOn(sr.center());
+	_res = zoom2resolution(_zoom, -(center.y() * mapScale(_zoom)));
+	_mapScale->setResolution(_res);

 	resetCachedContent();
 }
@ -652,3 +704,24 @@ void PathView::paintEvent(QPaintEvent *event)

 	QGraphicsView::paintEvent(event);
 }
+
+void PathView::scrollContentsBy(int dx, int dy)
+{
+	QGraphicsView::scrollContentsBy(dx, dy);
+
+	QPointF center = mapToScene(viewport()->rect().center());
+	qreal res = zoom2resolution(_zoom, -(center.y() * mapScale(_zoom)));
+
+	if (qMax(res, _res) / qMin(res, _res) > 1.1) {
+		_mapScale->setResolution(res);
+		_res = res;
+	}
+}
+
+void PathView::useOpenGL(bool use)
+{
+	if (use)
+		setViewport(new OPENGL_WIDGET);
+	else
+		setViewport(new QWidget);
+}
--- a/src/pathview.h
+++ b/src/pathview.h
@ -30,6 +30,7 @@ public:

 	QList<PathItem*> loadData(const Data &data);

+	void setPalette(const Palette &palette);
 	void setPOI(POI *poi);
 	void setMap(Map *map);
 	void setUnits(enum Units units);
@ -42,6 +43,8 @@ public:

 	void clear();

+	void useOpenGL(bool use);
+
 public slots:
 	void redraw();

@ -53,6 +56,10 @@ public slots:
 	void showRoutes(bool show);
 	void showWaypoints(bool show);
 	void showRouteWaypoints(bool show);
+	void setTrackWidth(int width);
+	void setRouteWidth(int width);
+	void setTrackStyle(Qt::PenStyle style);
+	void setRouteStyle(Qt::PenStyle style);

 private slots:
 	void updatePOI();
@ -66,11 +73,11 @@ private:
 	void clearPOI();

 	qreal contentsScale() const;
-	QRectF contentsSceneRect() const;
+	QPointF contentsCenter() const;
 	void rescale(int zoom);
-	void rescale();
 	void zoom(int z, const QPoint &pos);
 	void updatePOIVisibility();
+	void updateWaypointsBoundingRect(const QPointF &wp);

 	void mouseDoubleClickEvent(QMouseEvent *event);
 	void wheelEvent(QWheelEvent *event);
@ -78,6 +85,7 @@ private:
 	void drawBackground(QPainter *painter, const QRectF &rect);
 	void resizeEvent(QResizeEvent *event);
 	void paintEvent(QPaintEvent *event);
+	void scrollContentsBy(int dx, int dy);

 	QGraphicsScene *_scene;
 	ScaleItem *_mapScale;
@ -89,6 +97,7 @@ private:
 	int _zoom;
 	QRectF _tr, _rr, _wr;
 	QPointF _wp;
+	qreal _res;

 	Map *_map;
 	POI *_poi;
@ -103,6 +112,10 @@ private:
 	bool _showPOILabels;
 	bool _overlapPOIs;
 	bool _showRouteWaypoints;
+	int _trackWidth;
+	int _routeWidth;
+	Qt::PenStyle _trackStyle;
+	Qt::PenStyle _routeStyle;

 	bool _plot;
 };
--- a/src/poi.cpp
+++ b/src/poi.cpp
@ -10,7 +10,7 @@
 POI::POI(QObject *parent) : QObject(parent)
 {
 	_errorLine = 0;
-	_radius = 0.01;
+	_radius = 1000;
 }

 bool POI::loadFile(const QString &fileName)
@ -66,11 +66,15 @@ QVector<Waypoint> POI::points(const PathItem *path) const
 	const QPainterPath &pp = path->path();

 	for (int i = 0; i < pp.elementCount(); i++) {
-		Coordinates p = Coordinates::fromMercator(pp.elementAt(i));
-		min[0] = p.lon() - _radius;
-		min[1] = -p.lat() - _radius;
-		max[0] = p.lon() + _radius;
-		max[1] = -p.lat() + _radius;
+		const QPainterPath::Element &pe = pp.elementAt(i);
+		Coordinates p = Coordinates::fromMercator(QPointF(pe.x, -pe.y));
+
+		QPair<Coordinates, Coordinates> br = p.boundingRect(_radius);
+		min[0] = br.first.lon();
+		min[1] = br.first.lat();
+		max[0] = br.second.lon();
+		max[1] = br.second.lat();
+
 		_tree.Search(min, max, cb, &set);
 	}

@ -92,10 +96,13 @@ QVector<Waypoint> POI::points(const QList<WaypointItem*> &list)

 	for (int i = 0; i < list.count(); i++) {
 		const Coordinates &p = list.at(i)->waypoint().coordinates();
-		min[0] = p.lon() - _radius;
-		min[1] = p.lat() - _radius;
-		max[0] = p.lon() + _radius;
-		max[1] = p.lat() + _radius;
+
+		QPair<Coordinates, Coordinates> br = p.boundingRect(_radius);
+		min[0] = br.first.lon();
+		min[1] = br.first.lat();
+		max[0] = br.second.lon();
+		max[1] = br.second.lat();
+
 		_tree.Search(min, max, cb, &set);
 	}

@ -116,10 +123,13 @@ QVector<Waypoint> POI::points(const QList<Waypoint> &list) const

 	for (int i = 0; i < list.count(); i++) {
 		const Coordinates &p = list.at(i).coordinates();
-		min[0] = p.lon() - _radius;
-		min[1] = p.lat() - _radius;
-		max[0] = p.lon() + _radius;
-		max[1] = p.lat() + _radius;
+
+		QPair<Coordinates, Coordinates> br = p.boundingRect(_radius);
+		min[0] = br.first.lon();
+		min[1] = br.first.lat();
+		max[0] = br.second.lon();
+		max[1] = br.second.lat();
+
 		_tree.Search(min, max, cb, &set);
 	}

@ -168,7 +178,7 @@ void POI::clear()
 	emit pointsChanged();
 }

-void POI::setRadius(qreal radius)
+void POI::setRadius(unsigned radius)
 {
 	_radius = radius;

--- a/src/poi.h
+++ b/src/poi.h
@ -22,8 +22,8 @@ public:
 	const QString &errorString() const {return _errorString;}
 	int errorLine() const {return _errorLine;}

-	qreal radius() const {return _radius;}
-	void setRadius(qreal radius);
+	unsigned radius() const {return _radius;}
+	void setRadius(unsigned radius);

 	QVector<Waypoint> points(const PathItem *path) const;
 	QVector<Waypoint> points(const QList<WaypointItem*> &list) const;
@ -49,7 +49,7 @@ private:
 	QStringList _files;
 	QList<FileIndex> _indexes;

-	qreal _radius;
+	unsigned _radius;

 	QString _errorString;
 	int _errorLine;
--- a/src/powergraph.h
+++ b/src/powergraph.h
@ -13,9 +13,7 @@ public:
 	QString label() const {return tr("Power");}
 	void loadData(const Data &data, const QList<PathItem *> &paths);
 	void clear();
-	void setUnits(enum Units) {}
 	void showTracks(bool show);
-	void showRoutes(bool show) {Q_UNUSED(show);}

 private:
 	qreal avg() const;
--- a/src/route.h
+++ b/src/route.h
@ -4,13 +4,16 @@
 #include <QVector>
 #include "routedata.h"
 #include "graph.h"
+#include "path.h"

 class Route
 {
 public:
 	Route(const RouteData &data);

-	const RouteData &route() const {return _data;}
+	const RouteData &routeData() const {return _data;}
+	const QVector<qreal> &distanceData() const {return _distance;}
+
 	Graph elevation() const;

 	qreal distance() const;
--- a/src/routeitem.cpp
+++ b/src/routeitem.cpp
@ -1,4 +1,3 @@
-#include <QApplication>
 #include <QPainter>
 #include "format.h"
 #include "waypoint.h"
@ -12,11 +11,10 @@ QString RouteItem::toolTip()
 	ToolTip tt;

 	if (!_name.isEmpty())
-		tt.insert(qApp->translate("RouteItem", "Name"), _name);
+		tt.insert(tr("Name"), _name);
 	if (!_desc.isEmpty())
-		tt.insert(qApp->translate("RouteItem", "Description"), _desc);
-	tt.insert(qApp->translate("RouteItem", "Distance"),
-	  Format::distance(_distance, _units));
+		tt.insert(tr("Description"), _desc);
+	tt.insert(tr("Distance"), Format::distance(_distance.last(), _units));

 	return tt.toString();
 }
@ -24,29 +22,33 @@ QString RouteItem::toolTip()
 RouteItem::RouteItem(const Route &route, QGraphicsItem *parent)
  : PathItem(parent)
 {
-	const RouteData &r = route.route();
-	Q_ASSERT(r.count() >= 2);
+	const RouteData &r = route.routeData();
+	const QVector<qreal> &d = route.distanceData();
 	QPointF p;

+
+	Q_ASSERT(r.count() >= 2);
+	Q_ASSERT(r.size() == d.size());
+
 	_name = r.name();
 	_desc = r.description();

-	new WaypointItem(r.at(0), this);
-	p = r.at(0).coordinates().toMercator();
+	new WaypointItem(r.first(), this);
+	p = r.first().coordinates().toMercator();
 	_path.moveTo(QPointF(p.x(), -p.y()));
+	_distance.append(d.first());
 	for (int i = 1; i < r.size(); i++) {
+		if (r.at(i).coordinates() == r.at(i-1).coordinates())
+			continue;
 		p = r.at(i).coordinates().toMercator();
 		_path.lineTo(QPointF(p.x(), -p.y()));
+		_distance.append(d.at(i));
 		new WaypointItem(r.at(i), this);
 	}

 	updateShape();

-	_distance = route.distance();
-
-	_marker->setPos(_path.pointAtPercent(0));
-
-	_pen.setStyle(Qt::DotLine);
+	_marker->setPos(_path.elementAt(0));

 	setToolTip(toolTip());
 }
--- a/src/scaleitem.cpp
+++ b/src/scaleitem.cpp
@ -1,8 +1,5 @@
 #include <QPainter>
 #include "config.h"
-#include "rd.h"
-#include "wgs84.h"
-#include "tile.h"
 #include "misc.h"
 #include "scaleitem.h"

@ -13,17 +10,11 @@
 #define SEGMENTS       3
 #define PADDING        4

-static qreal zoom2resolution(int zoom, qreal y)
-{
-	return (WGS84_RADIUS * 2 * M_PI / Tile::size()
-	  * cos(2 * atan(exp(deg2rad(y))) - M_PI/2)) / pow(2.0, zoom);
-}

 ScaleItem::ScaleItem(QGraphicsItem *parent) : QGraphicsItem(parent)
 {
 	_units = Metric;
-	_zoom = 0;
-	_lat = 0;
+	_res = 1.0;

 #ifndef Q_OS_MAC
 	setCacheMode(QGraphicsItem::DeviceCoordinateCache);
@ -96,45 +87,33 @@ QString ScaleItem::units() const

 void ScaleItem::computeScale()
 {
-	qreal res = zoom2resolution(_zoom, _lat);
-
 	if (_units == Imperial) {
-		_length = niceNum((res * M2FT * SCALE_WIDTH) / SEGMENTS, 1);
+		_length = niceNum((_res * M2FT * SCALE_WIDTH) / SEGMENTS, 1);
 		if (_length >= MIINFT) {
-			_length = niceNum((res * M2FT * FT2MI * SCALE_WIDTH) / SEGMENTS, 1);
-			_width = (_length / (res * M2FT * FT2MI));
+			_length = niceNum((_res * M2FT * FT2MI * SCALE_WIDTH) / SEGMENTS, 1);
+			_width = (_length / (_res * M2FT * FT2MI));
 			_scale = true;
 		} else {
-			_width = (_length / (res * M2FT));
+			_width = (_length / (_res * M2FT));
 			_scale = false;
 		}
 	} else {
-		_length = niceNum((res * SCALE_WIDTH) / SEGMENTS, 1);
+		_length = niceNum((_res * SCALE_WIDTH) / SEGMENTS, 1);
 		if (_length >= KMINM) {
 			_length *= M2KM;
-			_width = (_length / (res * M2KM));
+			_width = (_length / (_res * M2KM));
 			_scale = true;
 		} else {
-			_width = (_length / res);
+			_width = (_length / _res);
 			_scale = false;
 		}
 	}
 }

-void ScaleItem::setZoom(int z, qreal lat)
+void ScaleItem::setResolution(qreal res)
 {
 	prepareGeometryChange();
-	_zoom = z;
-	_lat = lat;
-	computeScale();
-	updateBoundingRect();
-	update();
-}
-
-void ScaleItem::setZoom(int z)
-{
-	prepareGeometryChange();
-	_zoom = z;
+	_res = res;
 	computeScale();
 	updateBoundingRect();
 	update();
--- a/src/scaleitem.h
+++ b/src/scaleitem.h
@ -13,8 +13,7 @@ public:
 	void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
 	  QWidget *widget);

-	void setZoom(int z);
-	void setZoom(int z, qreal lat);
+	void setResolution(qreal res);
 	void setUnits(enum Units units);

 private:
@ -22,8 +21,7 @@ private:
 	void computeScale();
 	QString units() const;

-	int _zoom;
-	qreal _lat;
+	qreal _res;
 	qreal _width;
 	qreal _length;
 	Units _units;
--- a/src/settings.h
+++ b/src/settings.h
@ -1,35 +1,112 @@
 #ifndef SETTINGS_H
 #define SETTINGS_H

+#define IMPERIAL_UNITS() \
+	(QLocale::system().measurementSystem() == QLocale::ImperialSystem)
+
 #define WINDOW_SETTINGS_GROUP             "Window"
 #define WINDOW_SIZE_SETTING               "size"
+#define WINDOW_SIZE_DEFAULT               QSize(600, 800)
 #define WINDOW_POS_SETTING                "pos"
+#define WINDOW_POS_DEFAULT                QPoint(10, 10)

 #define SETTINGS_SETTINGS_GROUP           "Settings"
+#define TIME_TYPE_SETTING                 "timeType"
+#define TIME_TYPE_DEFAULT                 Total
 #define UNITS_SETTING                     "units"
+#define UNITS_DEFAULT                     (IMPERIAL_UNITS() ? Imperial : Metric)
 #define SHOW_TOOLBARS_SETTING             "toolbar"
+#define SHOW_TOOLBARS_DEFAULT             true

 #define GRAPH_SETTINGS_GROUP              "Graph"
 #define SHOW_GRAPHS_SETTING               "show"
+#define SHOW_GRAPHS_DEFAULT               true
 #define GRAPH_TYPE_SETTING                "type"
+#define GRAPH_TYPE_DEFAULT                Distance
 #define SHOW_GRAPH_GRIDS_SETTING          "grid"
+#define SHOW_GRAPH_GRIDS_DEFAULT          true

 #define MAP_SETTINGS_GROUP                "Map"
 #define CURRENT_MAP_SETTING               "map"
 #define SHOW_MAP_SETTING                  "show"
+#define SHOW_MAP_DEFAULT                  true

 #define POI_SETTINGS_GROUP                "POI"
 #define OVERLAP_POI_SETTING               "overlap"
+#define OVERLAP_POI_DEFAULT               false
 #define LABELS_POI_SETTING                "labels"
+#define LABELS_POI_DEFAULT                true
 #define SHOW_POI_SETTING                  "show"
+#define SHOW_POI_DEFAULT                  false
 #define DISABLED_POI_FILE_SETTINGS_PREFIX "disabled"
 #define DISABLED_POI_FILE_SETTING         "file"

 #define DATA_SETTINGS_GROUP               "Data"
 #define SHOW_TRACKS_SETTING               "tracks"
+#define SHOW_TRACKS_DEFAULT               true
 #define SHOW_ROUTES_SETTING               "routes"
+#define SHOW_ROUTES_DEFAULT               true
 #define SHOW_WAYPOINTS_SETTING            "waypoints"
+#define SHOW_WAYPOINTS_DEFAULT            true
 #define SHOW_ROUTE_WAYPOINTS_SETTING      "routeWaypoints"
+#define SHOW_ROUTE_WAYPOINTS_DEFAULT      true
 #define SHOW_WAYPOINT_LABELS_SETTING      "waypointLabels"
+#define SHOW_WAYPOINT_LABELS_DEFAULT      true
+
+#define EXPORT_SETTINGS_GROUP             "Export"
+#define PAPER_ORIENTATION_SETTING         "orientation"
+#define PAPER_ORIENTATION_DEFAULT         QPrinter::Portrait
+#define PAPER_SIZE_SETTING                "size"
+#define PAPER_SIZE_DEFAULT                (IMPERIAL_UNITS() ? QPrinter::Letter \
+                                            : QPrinter::A4)
+#define MARGIN_LEFT_SETTING               "marginLeft"
+#define MARGIN_LEFT_DEFAULT               5 /* mm */
+#define MARGIN_TOP_SETTING                "marginTop"
+#define MARGIN_TOP_DEFAULT                5 /* mm */
+#define MARGIN_RIGHT_SETTING              "marginRight"
+#define MARGIN_RIGHT_DEFAULT              5 /* mm */
+#define MARGIN_BOTTOM_SETTING             "marginBottom"
+#define MARGIN_BOTTOM_DEFAULT             5 /* mm */
+#define EXPORT_FILENAME_SETTING           "fileName"
+#define EXPORT_FILENAME_DEFAULT           QString("%1/export.pdf"). \
+                                            arg(QDir::currentPath())
+
+#define OPTIONS_SETTINGS_GROUP            "Options"
+#define PALETTE_COLOR_SETTING             "paletteColor"
+#define PALETTE_COLOR_DEFAULT             QColor(Qt::blue)
+#define PALETTE_SHIFT_SETTING             "paletteShift"
+#define PALETTE_SHIFT_DEFAULT             0.62
+#define TRACK_WIDTH_SETTING               "trackWidth"
+#define TRACK_WIDTH_DEFAULT               3
+#define ROUTE_WIDTH_SETTING               "routeWidth"
+#define ROUTE_WIDTH_DEFAULT               3
+#define TRACK_STYLE_SETTING               "trackStyle"
+#define TRACK_STYLE_DEFAULT               Qt::SolidLine
+#define ROUTE_STYLE_SETTING               "routeStyle"
+#define ROUTE_STYLE_DEFAULT               Qt::DotLine
+#define GRAPH_WIDTH_SETTING               "graphWidth"
+#define GRAPH_WIDTH_DEFAULT               1
+#define PATH_AA_SETTING                   "pathAntiAliasing"
+#define PATH_AA_DEFAULT                   true
+#define GRAPH_AA_SETTING                  "graphAntiAliasing"
+#define GRAPH_AA_DEFAULT                  false
+#define POI_RADIUS_SETTING                "poiRadius"
+#define POI_RADIUS_DEFAULT                (IMPERIAL_UNITS() ? MIINM : KMINM)
+#define USE_OPENGL_SETTING                "useOpenGL"
+#define USE_OPENGL_DEFAULT                false
+#define PRINT_NAME_SETTING                "printName"
+#define PRINT_NAME_DEFAULT                true
+#define PRINT_DATE_SETTING                "printDate"
+#define PRINT_DATE_DEFAULT                true
+#define PRINT_DISTANCE_SETTING            "printDistance"
+#define PRINT_DISTANCE_DEFAULT            true
+#define PRINT_TIME_SETTING                "printTime"
+#define PRINT_TIME_DEFAULT                true
+#define PRINT_MOVING_TIME_SETTING         "printMovingTime"
+#define PRINT_MOVING_TIME_DEFAULT         false
+#define PRINT_ITEM_COUNT_SETTING          "printItemCount"
+#define PRINT_ITEM_COUNT_DEFAULT          true
+#define SEPARATE_GRAPH_PAGE_SETTING       "separateGraphPage"
+#define SEPARATE_GRAPH_PAGE_DEFAULT       false

 #endif // SETTINGS_H
--- a/src/sliderinfoitem.cpp
+++ b/src/sliderinfoitem.cpp
@ -32,9 +32,11 @@ void SliderInfoItem::paint(QPainter *painter, const QStyleOptionGraphicsItem
 	font.setPixelSize(FONT_SIZE);
 	font.setFamily(FONT_FAMILY);
 	QFontMetrics fm(font);
-	painter->setFont(font);

+	painter->setFont(font);
+	painter->setRenderHint(QPainter::Antialiasing, false);
 	painter->setPen(Qt::red);
+
 	if (_side == Right)
 		painter->drawText(SIZE, fm.height() - fm.descent(), _text);
 	else
--- a/src/speedgraph.cpp
+++ b/src/speedgraph.cpp
@ -36,6 +36,8 @@ void SpeedGraph::loadData(const Data &data, const QList<PathItem *> &paths)

 		_avg.append(QPointF(data.tracks().at(i)->distance(),
 		  data.tracks().at(i)->distance() / data.tracks().at(i)->time()));
+		_avgM.append(QPointF(data.tracks().at(i)->distance(),
+		  data.tracks().at(i)->distance() / data.tracks().at(i)->movingTime()));

 		GraphView::loadGraph(graph, paths.at(i));
 	}
@ -52,8 +54,9 @@ qreal SpeedGraph::avg() const
 {
 	qreal sum = 0, w = 0;
 	QList<QPointF>::const_iterator it;
+	const QList<QPointF> &list = (_timeType == Moving) ? _avgM : _avg;

-	for (it = _avg.begin(); it != _avg.end(); it++) {
+	for (it = list.begin(); it != list.end(); it++) {
 		sum += it->y() * it->x();
 		w += it->x();
 	}
@ -64,6 +67,7 @@ qreal SpeedGraph::avg() const
 void SpeedGraph::clear()
 {
 	_avg.clear();
+	_avgM.clear();

 	GraphView::clear();
 }
@ -90,6 +94,14 @@ void SpeedGraph::setUnits(enum Units units)
 	redraw();
 }

+void SpeedGraph::setTimeType(enum TimeType type)
+{
+	_timeType = type;
+
+	setInfo();
+	redraw();
+}
+
 void SpeedGraph::showTracks(bool show)
 {
 	_showTracks = show;
--- a/src/speedgraph.h
+++ b/src/speedgraph.h
@ -15,8 +15,8 @@ public:
 	void loadData(const Data &data, const QList<PathItem *> &paths);
 	void clear();
 	void setUnits(enum Units units);
+	void setTimeType(enum TimeType type);
 	void showTracks(bool show);
-	void showRoutes(bool show) {Q_UNUSED(show);}

 private:
 	qreal avg() const;
@ -25,8 +25,10 @@ private:
 	void setInfo();

 	QList<QPointF> _avg;
+	QList<QPointF> _avgM;

 	enum Units _units;
+	enum TimeType _timeType;
 	bool _showTracks;
 };

--- a/src/stylecombobox.cpp
+++ b/src/stylecombobox.cpp
@ -0,0 +1,44 @@
+#include <QPen>
+#include <QPainter>
+#include <QResizeEvent>
+#include "stylecombobox.h"
+
+
+#define MIN_LINE_LENGTH  60
+#define LINE_WIDTH_RATIO 7
+
+#define ARRAY_SIZE(a) (sizeof(a) / sizeof(*a))
+
+StyleComboBox::StyleComboBox(QWidget *parent) : QComboBox(parent)
+{
+	Qt::PenStyle styles[] = {Qt::SolidLine, Qt::DashLine, Qt::DotLine,
+	  Qt::DashDotLine, Qt::DashDotDotLine};
+
+	QSize is = iconSize();
+	setIconSize(QSize(MIN_LINE_LENGTH, is.height()));
+	is = iconSize();
+
+	for (size_t i = 0; i < ARRAY_SIZE(styles); i++) {
+		QPixmap pm(is);
+		pm.fill(Qt::transparent);
+
+		QBrush brush(Qt::black);
+		QPen pen(brush, is.height() / LINE_WIDTH_RATIO, styles[i]);
+
+		QPainter painter(&pm);
+		painter.setPen(pen);
+		painter.drawLine(0, is.height() / 2, is.width(), is.height() / 2);
+
+		addItem(QIcon(pm), QString(), QVariant((int)styles[i]));
+	}
+}
+
+void StyleComboBox::setValue(Qt::PenStyle value)
+{
+	for (int i = 0; i < count(); i++) {
+		if ((Qt::PenStyle) itemData(i).toInt() == value) {
+			setCurrentIndex(i);
+			return;
+		}
+	}
+}
--- a/src/stylecombobox.h
+++ b/src/stylecombobox.h
@ -0,0 +1,16 @@
+#ifndef STYLECOMBOBOX_H
+#define STYLECOMBOBOX_H
+
+#include <QComboBox>
+
+class StyleComboBox : public QComboBox
+{
+	Q_OBJECT
+
+public:
+	StyleComboBox(QWidget *parent = 0);
+
+	void setValue(Qt::PenStyle value);
+};
+
+#endif // STYLECOMBOBOX_H
--- a/src/temperaturegraph.h
+++ b/src/temperaturegraph.h
@ -15,7 +15,6 @@ public:
 	void clear();
 	void setUnits(enum Units units);
 	void showTracks(bool show);
-	void showRoutes(bool show) {Q_UNUSED(show);}

 private:
 	qreal avg() const;
--- a/src/timetype.h
+++ b/src/timetype.h
@ -0,0 +1,9 @@
+#ifndef TIMETYPE_H
+#define TIMETYPE_H
+
+enum TimeType {
+	Total,
+	Moving
+};
+
+#endif // TIMETYPE_H
--- a/src/track.cpp
+++ b/src/track.cpp
@ -9,6 +9,9 @@
 #define WINDOW_CF 3
 #define WINDOW_PF 3

+#define PAUSE_SPEED     0.5
+#define PAUSE_TIME_DIFF 10
+

 static qreal median(QVector<qreal> v)
 {
@ -43,30 +46,31 @@ static QSet<int> eliminate(const QVector<qreal> &v, int window)
 	return rm;
 }

-static Graph filter(const Graph &v, int window)
+static Graph filter(const Graph &g, int window)
 {
 	qreal acc = 0;
 	Graph ret;

-	if (v.size() < window)
+	if (g.size() < window)
 		return ret;

 	for (int i = 0; i < window; i++)
-		acc += v.at(i).y();
+		acc += g.at(i).y();
 	for (int i = 0; i <= window/2; i++)
-		ret.append(GraphPoint(v.at(i).s(), v.at(i).t(), acc/window));
+		ret.append(GraphPoint(g.at(i).s(), g.at(i).t(), acc/window));

-	for (int i = window/2 + 1; i < v.size() - window/2; i++) {
-		acc += v.at(i + window/2).y() - v.at(i - (window/2 + 1)).y();
-		ret.append(GraphPoint(v.at(i).s(), v.at(i).t(), acc/window));
+	for (int i = window/2 + 1; i < g.size() - window/2; i++) {
+		acc += g.at(i + window/2).y() - g.at(i - (window/2 + 1)).y();
+		ret.append(GraphPoint(g.at(i).s(), g.at(i).t(), acc/window));
 	}

-	for (int i = v.size() - window/2; i < v.size(); i++)
-		ret.append(GraphPoint(v.at(i).s(), v.at(i).t(), acc/window));
+	for (int i = g.size() - window/2; i < g.size(); i++)
+		ret.append(GraphPoint(g.at(i).s(), g.at(i).t(), acc/window));

 	return ret;
 }

+
 Track::Track(const TrackData &data) : _data(data)
 {
 	qreal dt, ds, total;
@ -98,13 +102,28 @@ Track::Track(const TrackData &data) : _data(data)
 		}
 	}

+	_pause = 0;
+	for (int i = 1; i < data.count(); i++) {
+		if (_time.at(i) > _time.at(i-1) + PAUSE_TIME_DIFF
+		  && _speed.at(i) < PAUSE_SPEED) {
+			_pause += _time.at(i) - _time.at(i-1);
+			_stop.insert(i-1);
+			_stop.insert(i);
+		}
+	}
+
 	_outliers = eliminate(_speed, WINDOW_OE);

+	QSet<int>::const_iterator it;
+	for (it = _stop.constBegin(); it != _stop.constEnd(); ++it)
+		_outliers.remove(*it);
+
 	total = 0;
 	for (int i = 0; i < _data.size(); i++) {
 		if (_outliers.contains(i))
 			continue;
-		total += _distance.at(i);
+		if (!discardStopPoint(i))
+			total += _distance.at(i);
 		_distance[i] = total;
 	}
 }
@ -113,9 +132,6 @@ Graph Track::elevation() const
 {
 	Graph raw;

-	if (!_data.size())
-		return raw;
-
 	for (int i = 0; i < _data.size(); i++)
 		if (_data.at(i).hasElevation() && !_outliers.contains(i))
 			raw.append(GraphPoint(_distance.at(i), _time.at(i),
@ -126,14 +142,16 @@ Graph Track::elevation() const

 Graph Track::speed() const
 {
-	Graph raw;
+	Graph raw, filtered;
 	qreal v;
-
-	if (!_data.size())
-		return raw;
+	QSet<int> stop;

 	for (int i = 0; i < _data.size(); i++) {
-		if (_data.at(i).hasSpeed() && !_outliers.contains(i))
+		if (_stop.contains(i) && (!std::isnan(_speed.at(i))
+		  || _data.at(i).hasSpeed())) {
+			v = 0;
+			stop.insert(raw.size());
+		} else if (_data.at(i).hasSpeed() && !_outliers.contains(i))
 			v = _data.at(i).speed();
 		else if (!std::isnan(_speed.at(i)) && !_outliers.contains(i))
 			v = _speed.at(i);
@ -143,16 +161,19 @@ Graph Track::speed() const
 		raw.append(GraphPoint(_distance.at(i), _time.at(i), v));
 	}

-	return filter(raw, WINDOW_SF);
+	filtered = filter(raw, WINDOW_SF);
+
+	QSet<int>::const_iterator it;
+	for (it = stop.constBegin(); it != stop.constEnd(); ++it)
+		filtered[*it].setY(0);
+
+	return filtered;
 }

 Graph Track::heartRate() const
 {
 	Graph raw;

-	if (!_data.size())
-		return raw;
-
 	for (int i = 0; i < _data.count(); i++)
 		if (_data.at(i).hasHeartRate() && !_outliers.contains(i))
 			raw.append(GraphPoint(_distance.at(i), _time.at(i),
@ -175,26 +196,56 @@ Graph Track::temperature() const

 Graph Track::cadence() const
 {
-	Graph raw;
+	Graph raw, filtered;
+	QSet<int> stop;
+	qreal c;

-	for (int i = 0; i < _data.size(); i++)
-		if (_data.at(i).hasCadence() && !_outliers.contains(i))
-			raw.append(GraphPoint(_distance.at(i), _time.at(i),
-			  _data.at(i).cadence()));
+	for (int i = 0; i < _data.size(); i++) {
+		if (_data.at(i).hasCadence() && _stop.contains(i)) {
+			c = 0;
+			stop.insert(raw.size());
+		} else if (_data.at(i).hasCadence() && !_outliers.contains(i))
+			c = _data.at(i).cadence();
+		else
+			continue;

-	return filter(raw, WINDOW_CF);
+		raw.append(GraphPoint(_distance.at(i), _time.at(i), c));
+	}
+
+	filtered = filter(raw, WINDOW_CF);
+
+	QSet<int>::const_iterator it;
+	for (it = stop.constBegin(); it != stop.constEnd(); ++it)
+		filtered[*it].setY(0);
+
+	return filtered;
 }

 Graph Track::power() const
 {
-	Graph raw;
+	Graph raw, filtered;
+	QSet<int> stop;
+	qreal p;

-	for (int i = 0; i < _data.size(); i++)
-		if (_data.at(i).hasPower() && !_outliers.contains(i))
-			raw.append(GraphPoint(_distance.at(i), _time.at(i),
-			  _data.at(i).power()));
+	for (int i = 0; i < _data.size(); i++) {
+		if (_data.at(i).hasPower() && _stop.contains(i)) {
+			p = 0;
+			stop.insert(raw.size());
+		} else if (_data.at(i).hasPower() && !_outliers.contains(i))
+			p = _data.at(i).power();
+		else
+			continue;

-	return filter(raw, WINDOW_PF);
+		raw.append(GraphPoint(_distance.at(i), _time.at(i), p));
+	}
+
+	filtered = filter(raw, WINDOW_PF);
+
+	QSet<int>::const_iterator it;
+	for (it = stop.constBegin(); it != stop.constEnd(); ++it)
+		filtered[*it].setY(0);
+
+	return filtered;
 }

 qreal Track::distance() const
@ -208,18 +259,29 @@ qreal Track::time() const
 	  (_data.first().timestamp().msecsTo(_data.last().timestamp()) / 1000.0);
 }

+qreal Track::movingTime() const
+{
+	return (time() - _pause);
+}
+
 QDateTime Track::date() const
 {
 	return (_data.size()) ? _data.first().timestamp() : QDateTime();
 }

-Path Track::track() const
+Path Track::path() const
 {
 	Path ret;

 	for (int i = 0; i < _data.size(); i++)
-		if (!_outliers.contains(i))
-			ret.append(_data.at(i).coordinates());
+		if (!_outliers.contains(i) && !discardStopPoint(i))
+			ret.append(PathPoint(_data.at(i).coordinates(), _distance.at(i)));

 	return ret;
 }
+
+bool Track::discardStopPoint(int i) const
+{
+	return (_stop.contains(i) && i > 0 && _stop.contains(i-1)
+	  && i < _data.size() - 1 && _stop.contains(i+1));
+}
--- a/src/track.h
+++ b/src/track.h
@ -14,7 +14,7 @@ class Track
 public:
 	Track(const TrackData &data);

-	Path track() const;
+	Path path() const;
 	Graph elevation() const;
 	Graph speed() const;
 	Graph heartRate() const;
@ -24,6 +24,7 @@ public:

 	qreal distance() const;
 	qreal time() const;
+	qreal movingTime() const;
 	QDateTime date() const;

 	const QString &name() const {return _data.name();}
@ -32,6 +33,8 @@ public:
 	bool isNull() const {return (_data.size() < 2);}

 private:
+	bool discardStopPoint(int i) const;
+
 	const TrackData &_data;

 	QVector<qreal> _distance;
@ -39,6 +42,9 @@ private:
 	QVector<qreal> _speed;

 	QSet<int> _outliers;
+	QSet<int> _stop;
+
+	qreal _pause;
 };

 #endif // TRACK_H
--- a/src/trackitem.cpp
+++ b/src/trackitem.cpp
@ -1,5 +1,3 @@
-#include <QApplication>
-#include <QCursor>
 #include <QPainter>
 #include "format.h"
 #include "tooltip.h"
@ -11,17 +9,16 @@ QString TrackItem::toolTip()
 	ToolTip tt;

 	if (!_name.isEmpty())
-		tt.insert(qApp->translate("TrackItem", "Name"), _name);
+		tt.insert(tr("Name"), _name);
 	if (!_desc.isEmpty())
-		tt.insert(qApp->translate("TrackItem", "Description"), _desc);
-	tt.insert(qApp->translate("TrackItem", "Distance"),
-	  Format::distance(_distance, _units));
+		tt.insert(tr("Description"), _desc);
+	tt.insert(tr("Distance"), Format::distance(_distance.last(), _units));
 	if  (_time > 0)
-		tt.insert(qApp->translate("TrackItem", "Time"),
-		  Format::timeSpan(_time));
+		tt.insert(tr("Total time"), Format::timeSpan(_time));
+	if  (_movingTime > 0)
+		tt.insert(tr("Moving time"), Format::timeSpan(_movingTime));
 	if (!_date.isNull())
-		tt.insert(qApp->translate("TrackItem", "Date"),
-		  _date.toString(Qt::SystemLocaleShortDate));
+		tt.insert(tr("Date"), _date.toString(Qt::SystemLocaleShortDate));

 	return tt.toString();
 }
@ -30,14 +27,18 @@ TrackItem::TrackItem(const Track &track, QGraphicsItem *parent)
  : PathItem(parent)
 {
 	QPointF p;
-	QVector<Coordinates> t = track.track();
-	Q_ASSERT(t.count() >= 2);
+	const Path &path = track.path();
+	Q_ASSERT(path.count() >= 2);

-	p = t.first().toMercator();
+	p = path.first().coordinates().toMercator();
 	_path.moveTo(QPointF(p.x(), -p.y()));
-	for (int i = 1; i < t.size(); i++) {
-		p = t.at(i).toMercator();
+	_distance.append(path.first().distance());
+	for (int i = 1; i < path.size(); i++) {
+		if (path.at(i).coordinates() == path.at(i-1).coordinates())
+			continue;
+		p = path.at(i).coordinates().toMercator();
 		_path.lineTo(QPointF(p.x(), -p.y()));
+		_distance.append(path.at(i).distance());
 	}

 	updateShape();
@ -45,10 +46,10 @@ TrackItem::TrackItem(const Track &track, QGraphicsItem *parent)
 	_name = track.name();
 	_desc = track.description();
 	_date = track.date();
-	_distance = track.distance();
 	_time = track.time();
+	_movingTime = track.movingTime();

-	_marker->setPos(_path.pointAtPercent(0));
+	_marker->setPos(_path.elementAt(0));

 	setToolTip(toolTip());
 }
--- a/src/trackitem.h
+++ b/src/trackitem.h
@ -23,6 +23,7 @@ private:
 	QString _desc;
 	QDateTime _date;
 	qreal _time;
+	qreal _movingTime;
 };

 #endif // TRACKITEM_H
--- a/src/units.h
+++ b/src/units.h
@ -16,14 +16,14 @@ enum Units {
 #define H2S     0.000277777778  // h -> s
 #define MIN2S   0.016666666667  // min -> s

-#define KMINM   1000     // 1 km in m
-#define MIINFT  5280     // 1 mi in ft
+#define KMINM   1000.0   // 1 km in m
+#define MIINFT  5280.0   // 1 mi in ft
 #define MIINM   1609.344 // 1 mi in m
-#define MININS  60       // 1 min in s
-#define HINS    3600     // 1 hins
+#define MININS  60.0     // 1 min in s
+#define HINS    3600.0   // 1 hins

-#define C2FS    1.8 // Celsius to Farenheit - scale
-#define C2FO    32  // Celsius to Farenheit - offset
+#define C2FS    1.8  // Celsius to Farenheit - scale
+#define C2FO    32.0 // Celsius to Farenheit - offset

 #ifdef Q_OS_WIN32
 #define UNIT_SPACE     QString(" ")
--- a/src/waypoint.h
+++ b/src/waypoint.h
@ -48,7 +48,7 @@ inline uint qHash(const Waypoint &key)
 	return ::qHash(key.name());
 }

-QDebug operator<<(QDebug dbg, const Waypoint &Waypoint);
+QDebug operator<<(QDebug dbg, const Waypoint &waypoint);

 Q_DECLARE_TYPEINFO(Waypoint, Q_MOVABLE_TYPE);
Author	SHA1	Message	Date
Martin Tůma	1ec732c78d	Version++	2017-02-12 20:13:04 +01:00
Martin Tůma	ff733b2705	Indicate moving time in status bar	2017-02-12 20:11:36 +01:00
Martin Tůma	99e32b1a15	Made the moving time switch affect all related values More standardized time type switching (menu)	2017-02-12 19:57:55 +01:00
Martin Tůma	f4a992a66f	Added missing background color definition (OpenGL issue fix)	2017-02-12 17:49:54 +01:00
Martin Tůma	f52fa9a9ef	Removed obsolete stuff	2017-02-12 17:38:20 +01:00
Martin Tůma	61f3a1c932	Added OpenSSL to Windows builds Skipped Windows XP support in Windows builds	2017-02-12 17:34:13 +01:00
Martin Tůma	93313da01d	Fixed QNetworkManager related crashes on program termination.	2017-02-07 23:36:06 +01:00
Martin Tůma	a253ac1796	Localization update	2017-02-05 16:10:42 +01:00
Martin Tůma	e6a0eeefcc	Better Time/Moving Time display approach.	2017-02-05 16:01:54 +01:00
Martin Tůma	214d7c40dc	Added missing coordinates bounding rectangle normalization (Fixes issue #19)	2017-02-03 00:54:57 +01:00
Martin Tůma	cd89706d74	Do not use hardcoded control keys info	2017-02-02 20:06:17 +01:00
Martin Tůma	961eac9324	Added moving time info. Added special track data processing for "pause states".	2017-01-31 09:37:01 +01:00
Martin Tůma	ddacac8d2e	Added Open Topo Map to default map sources	2017-01-26 09:46:36 +01:00
Martin Tůma	bd9b5dbc6a	Merge pull request #17 from eson57/patch-2 Update gpxsee_sv.ts	2017-01-24 23:57:29 +01:00
Åke Engelbrektson	8b813b5879	Update gpxsee_sv.ts	2017-01-24 21:32:49 +01:00
Martin Tůma	b79de29464	Added missing swedish string	2017-01-24 18:30:00 +01:00
Martin Tůma	ae2765528d	Updated obsolete strings	2017-01-24 18:23:56 +01:00
Martin Tůma	0356917790	Version++	2017-01-24 18:12:08 +01:00
Martin Tůma	7352b24473	Added missing item update on content change	2017-01-24 18:11:08 +01:00
Martin Tůma	3a9ec6247c	Removed Czech strings from Swedish translation	2017-01-23 10:01:27 +01:00
Martin Tůma	e74ac78138	Added missing swedish translation resource	2017-01-23 00:08:10 +01:00
Martin Tůma	5fa91be4ac	Localization update	2017-01-23 00:03:48 +01:00
Martin Tůma	536b4fd121	Added swedish translation	2017-01-23 00:02:16 +01:00
Martin Tůma	0556ae0f58	Merge pull request #16 from eson57/patch-1 Swedish translation	2017-01-22 23:51:41 +01:00
Martin Tůma	e38fdb26d7	Version 3.7	2017-01-22 22:54:42 +01:00
Martin Tůma	e420602c69	Fixed scene bounding rect reset	2017-01-22 22:53:38 +01:00
Martin Tůma	b2a49eaa23	Version++	2017-01-22 22:14:59 +01:00
Åke Engelbrektson	211a4e4cef	Create gpxsee_sv.ts	2017-01-21 09:49:51 +01:00
Martin Tůma	8ff8d4bf16	Code cleanup	2017-01-20 01:17:22 +01:00
Martin Tůma	46598a85fc	Fixed redirect loop handling logic	2017-01-17 10:37:02 +01:00
Martin Tůma	32cbd33c91	Fixed tile area computation	2017-01-16 21:45:50 +01:00
Martin Tůma	0e356d0222	Added redirect loop check	2017-01-16 21:45:27 +01:00
Martin Tůma	1a29ab6304	Enabled free map scroll.	2017-01-16 09:54:12 +01:00
Martin Tůma	5581cff55b	Fixed download error handling in case of redirects Do not download tiles multiple times.	2017-01-16 09:53:01 +01:00
Martin Tůma	a458b82e37	Code cleanup	2017-01-11 22:14:01 +01:00
Martin Tůma	bd946fb477	Fixed bounding rect computation in special case (rect + 1 waypoint)	2017-01-09 00:20:06 +01:00
Martin Tůma	7e6ed0933c	Code cleanup	2017-01-08 20:02:51 +01:00
Martin Tůma	1586a5e912	Optimization	2017-01-07 22:20:04 +01:00
Martin Tůma	3e340ab941	Improved error reporting. Cosmetics.	2017-01-02 23:01:50 +01:00
Martin Tůma	ea178d1acb	Fixed benign memory leak	2017-01-02 09:42:34 +01:00
Martin Tůma	f61488fcfa	Version++	2016-12-20 08:39:40 +01:00
Martin Tůma	b68ca92add	OpenGL code cleanup	2016-12-20 00:11:30 +01:00
Martin Tůma	0448ae5eea	Added basic print/export formating options	2016-12-16 02:30:58 +01:00
Martin Tůma	2bc112c7b4	Fixed broken latitude handling	2016-12-13 18:54:58 +01:00
Martin Tůma	ccd92edb8d	More code cleanup	2016-12-10 11:52:18 +01:00
Martin Tůma	0cbf79870b	Code cleanup	2016-12-10 11:50:53 +01:00
Martin Tůma	7e8530555d	Unified AA samples count for QGLFormat and QSurfaceFormat.	2016-12-10 11:45:16 +01:00
Martin Tůma	2fd16e5e31	Version++	2016-12-10 01:20:17 +01:00
Martin Tůma	a5033c8b19	Fixed QOpenGLWidget usage (wrong minimal QT version)	2016-12-10 01:18:31 +01:00
Martin Tůma	b0c6176ddd	Fixed switched default values	2016-12-08 00:28:44 +01:00
Martin Tůma	6edd7a8c61	Code cleanup	2016-12-07 22:01:45 +01:00
Martin Tůma	8a299be65b	Translations	2016-12-07 22:01:33 +01:00
Martin Tůma	cde4c65c53	GUI polishing	2016-12-07 21:38:36 +01:00
Martin Tůma	b24136a580	Use OpenGL also for graph views when selected	2016-12-07 02:02:39 +01:00
Martin Tůma	da1b2bb90a	Use a reasonable number of samples per pixel	2016-12-07 00:54:14 +01:00
Martin Tůma	30e198cf46	Cache the graph grid	2016-12-07 00:44:32 +01:00
Martin Tůma	0f2deca4fa	Fixed broken graph width setting	2016-12-07 00:03:36 +01:00
Martin Tůma	1055c4fd98	Added missing OpenGL related libs to Windows package. Version++.	2016-12-06 22:05:26 +01:00
Martin Tůma	18c501b610	Removed path item caching (made obsolete by OpenGL rendering)	2016-12-06 21:28:45 +01:00
Martin Tůma	71310116e3	Cosmetics	2016-12-06 21:03:19 +01:00
Martin Tůma	34e48199b2	Fixed options/settings handling isses.	2016-12-06 21:02:44 +01:00
Martin Tůma	4cf027df58	Fixed widget rendering issues	2016-12-06 21:01:06 +01:00
Martin Tůma	a9668ca86e	Added options dialogue	2016-12-06 01:48:26 +01:00
Martin Tůma	181f60ed40	README update	2016-11-23 19:54:46 +01:00
Martin Tůma	307405d661	Improved track date handling	2016-11-23 18:45:06 +01:00
Martin Tůma	1242423ca8	Fixed possible invalid memory access	2016-11-23 18:44:22 +01:00
Martin Tůma	2bdab0f449	NMEA parser improvements	2016-11-22 00:13:41 +01:00
Martin Tůma	4e23df3a66	Fixed broken date handling	2016-11-21 21:59:21 +01:00
Martin Tůma	23f5a317d0	Fixed graph bounds issue	2016-11-18 18:02:40 +01:00
Martin Tůma	80bc9f1f01	Fixed bounds check	2016-11-18 09:23:43 +01:00
Martin Tůma	dec3f10df3	Localization update	2016-11-18 08:10:23 +01:00
Martin Tůma	296d4c6c9d	Added NMEA icons	2016-11-18 08:03:04 +01:00
Martin Tůma	668558cf2e	Improved error reporting	2016-11-17 23:31:09 +01:00
Martin Tůma	a6053a4d7b	Made the NMEA parser more robust	2016-11-17 19:43:02 +01:00
Martin Tůma	535361dada	Added support for NMEA files	2016-11-16 23:54:15 +01:00
Martin Tůma	e9e7660beb	Fixed path/distances size difference issue	2016-11-15 18:08:44 +01:00
Martin Tůma	eb5692a0ab	Fixed path marker inaccuracy issue.	2016-11-14 22:12:43 +01:00
Martin Tůma	367427b26a	Code cleanup	2016-11-13 09:49:31 +01:00