Fixed printing on Windows XP

Some more PDF export dialog polishing
PDF export dialog polishing
2025-07-01 21:39:15 +02:00 · 2016-05-29 19:35:38 +02:00 · 2016-05-28 07:39:40 +02:00 · 2016-05-27 22:45:58 +02:00 · 2016-05-26 00:57:27 +02:00 · 2016-05-26 00:24:19 +02:00
33 changed files with 1151 additions and 559 deletions
--- a/Info.plist
+++ b/Info.plist
@ -5,15 +5,15 @@
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
 	<key>CFBundleIconFile</key>
-	<string>gpxsee.icns</string>
+	<string>@ICON@</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.13</string>
+	<string>@SHORT_VERSION@</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleExecutable</key>
-	<string>GPXSee</string>
+	<string>@EXECUTABLE@</string>
 	<key>CFBundleIdentifier</key>
 	<string>cz.wz.tumic.GPXSee</string>

--- a/gpxsee.pro
+++ b/gpxsee.pro
@ -1,5 +1,5 @@
 TARGET = GPXSee
-VERSION = 2.13
+VERSION = 2.15
 QT += core \
    gui \
    network
@ -39,7 +39,11 @@ HEADERS += src/config.h \
    src/range.h \
    src/cpuarch.h \
    src/settings.h \
-    src/app.h
+    src/app.h \
+    src/trackinfo.h \
+    src/exportdialog.h \
+    src/fileselectwidget.h \
+    src/margins.h
 SOURCES += src/main.cpp \
    src/gui.cpp \
    src/gpx.cpp \
@ -66,7 +70,10 @@ SOURCES += src/main.cpp \
    src/palette.cpp \
    src/heartrategraph.cpp \
    src/range.cpp \
-    src/app.cpp
+    src/app.cpp \
+    src/trackinfo.cpp \
+    src/exportdialog.cpp \
+    src/fileselectwidget.cpp
 RESOURCES += gpxsee.qrc
 TRANSLATIONS = lang/gpxsee_cs.ts
 macx {
--- a/gpxsee.qrc
+++ b/gpxsee.qrc
@ -2,8 +2,8 @@
    <qresource prefix="/">
        <file>icons/dialog-close.png</file>
        <file>icons/document-open.png</file>
-        <file>icons/document-save-as.png</file>
-        <file>icons/document-save.png</file>
+        <file>icons/document-print.png</file>
+        <file>icons/document-export.png</file>
        <file>icons/flag.png</file>
        <file>icons/gpxsee.png</file>
        <file>icons/application-exit.png</file>
--- a/icons/document-export.png
+++ b/icons/document-export.png
--- a/icons/document-print.png
+++ b/icons/document-print.png
--- a/icons/document-save-as.png
+++ b/icons/document-save-as.png
--- a/icons/document-save.png
+++ b/icons/document-save.png
--- a/lang/gpxsee_cs.ts
+++ b/lang/gpxsee_cs.ts
@ -57,377 +57,458 @@
    </message>
 </context>
 <context>
-    <name>GUI</name>
+    <name>ExportDialog</name>
    <message>
-        <location filename="../src/gui.cpp" line="448"/>
-        <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>
+        <location filename="../src/exportdialog.cpp" line="122"/>
+        <source>Export to PDF</source>
+        <translation>Exportovat do PDF</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="512"/>
-        <source>Open file</source>
-        <translation>Otevřít soubor</translation>
+        <location filename="../src/exportdialog.cpp" line="29"/>
+        <source>PDF files (*.pdf);;All files (*)</source>
+        <translation>Soubory PDF (*.pdf);;Všechny soubory (*)</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="208"/>
-        <source>Save as</source>
-        <translation>Uložit jako</translation>
+        <location filename="../src/exportdialog.cpp" line="42"/>
+        <source>Portrait</source>
+        <translation>Na výšku</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="583"/>
-        <source>Open POI file</source>
-        <translation>Otevřít POI soubor</translation>
+        <location filename="../src/exportdialog.cpp" line="43"/>
+        <source>Landscape</source>
+        <translation>Na šířku</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="197"/>
-        <source>Open</source>
-        <translation>Otevřít</translation>
+        <location filename="../src/exportdialog.cpp" line="85"/>
+        <source>Page size:</source>
+        <translation>Velikost stránky:</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="181"/>
-        <source>Quit</source>
-        <translation>Ukončit</translation>
+        <location filename="../src/exportdialog.cpp" line="86"/>
+        <source>Orientation:</source>
+        <translation>Orientace:</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="189"/>
-        <location filename="../src/gui.cpp" line="464"/>
-        <location filename="../src/gui.cpp" line="465"/>
-        <source>Keyboard controls</source>
-        <translation>Ovládací klávesy</translation>
+        <location filename="../src/exportdialog.cpp" line="82"/>
+        <source>Page Setup</source>
+        <translation>Nastavení stránky</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="202"/>
-        <source>Save</source>
-        <translation>Uložit</translation>
+        <location filename="../src/exportdialog.cpp" line="55"/>
+        <source>in</source>
+        <translation>in</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="214"/>
-        <source>Close</source>
-        <translation>Zavřít</translation>
+        <location filename="../src/exportdialog.cpp" line="55"/>
+        <source>mm</source>
+        <translation>mm</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="220"/>
-        <source>Reload</source>
-        <translation>Znovu načíst</translation>
+        <location filename="../src/exportdialog.cpp" line="87"/>
+        <source>Margins:</source>
+        <translation>Okraje:</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="379"/>
-        <source>Show</source>
-        <translation>Zobrazit</translation>
+        <location filename="../src/exportdialog.cpp" line="93"/>
+        <source>File:</source>
+        <translation>Soubor:</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="321"/>
-        <location filename="../src/gui.cpp" line="370"/>
-        <source>File</source>
-        <translation>Soubor</translation>
+        <location filename="../src/exportdialog.cpp" line="99"/>
+        <source>Output file</source>
+        <translation>Výstupní soubor</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="187"/>
-        <location filename="../src/gui.cpp" line="487"/>
-        <location filename="../src/gui.cpp" line="488"/>
-        <source>Data sources</source>
-        <translation>Zdroje dat</translation>
+        <location filename="../src/exportdialog.cpp" line="106"/>
+        <source>Export</source>
+        <translation>Exportovat</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="228"/>
-        <source>Load POI file</source>
-        <translation>Nahrát POI soubor</translation>
-    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="231"/>
-        <source>Close POI files</source>
-        <translation>Zavřit POI soubory</translation>
-    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="234"/>
-        <source>Show POIs</source>
-        <translation>Zobrazit POI</translation>
-    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="242"/>
-        <source>Show map</source>
-        <translation>Zobrazit mapu</translation>
-    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="248"/>
-        <source>Clear tile cache</source>
-        <translation>Vymazat mezipaměť dlaždic</translation>
-    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="258"/>
-        <location filename="../src/gui.cpp" line="262"/>
-        <location filename="../src/gui.cpp" line="474"/>
-        <source>Next map</source>
-        <translation>Následující mapa</translation>
-    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="269"/>
-        <source>Show graphs</source>
-        <translation>Zobrazovat grafy</translation>
-    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="276"/>
-        <source>Show toolbars</source>
-        <translation>Zobrazovat nástrojové lišty</translation>
-    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="283"/>
-        <source>Metric</source>
-        <translation>Metrické</translation>
-    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="289"/>
-        <source>Imperial</source>
-        <translation>Imperiální</translation>
-    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="295"/>
-        <source>Fullscreen mode</source>
-        <translation>Celoobrazovkový režim</translation>
-    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="303"/>
-        <source>Next</source>
-        <translation>Následující</translation>
-    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="306"/>
-        <source>Previous</source>
-        <translation>Předchozí</translation>
-    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="310"/>
-        <source>Last</source>
-        <translation>Poslední</translation>
-    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="313"/>
-        <source>First</source>
-        <translation>První</translation>
-    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="335"/>
-        <source>Map</source>
-        <translation>Mapa</translation>
-    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="342"/>
-        <source>POI</source>
-        <translation>POI</translation>
-    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="343"/>
-        <source>POI files</source>
-        <translation>POI soubory</translation>
-    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="351"/>
-        <source>Settings</source>
-        <translation>Nastavení</translation>
-    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="352"/>
-        <source>Units</source>
-        <translation>Jednotky</translation>
-    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="361"/>
-        <source>Help</source>
-        <translation>Nápověda</translation>
-    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="476"/>
-        <source>Previous map</source>
-        <translation>Předchozí mapa</translation>
-    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="822"/>
-        <source>No GPX files loaded</source>
-        <translation>Nejsou načteny žádné GPX soubory</translation>
-    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="922"/>
-        <source>Elevation</source>
-        <translation>Výška</translation>
-    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="923"/>
-        <source>Speed</source>
-        <translation>Rychlost</translation>
-    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="924"/>
-        <source>Heart rate</source>
-        <translation>Tep</translation>
-    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="467"/>
-        <source>Next file</source>
-        <translation>Následující soubor</translation>
-    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="444"/>
-        <source>Version </source>
-        <translation>Verze </translation>
-    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="468"/>
-        <source>Previous file</source>
-        <translation>Předchozí soubor</translation>
-    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="470"/>
-        <source>First file</source>
-        <translation>První soubor</translation>
-    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="471"/>
-        <source>Last file</source>
-        <translation>Poslední soubor</translation>
-    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="472"/>
-        <source>Append modifier</source>
-        <translation>Modifikátor nahradit/přidat</translation>
-    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="491"/>
-        <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="494"/>
-        <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="502"/>
-        <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="513"/>
-        <source>GPX files (*.gpx);;All files (*)</source>
-        <translation>soubory GPX (*.gpx);;všechny soubory (*)</translation>
-    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="574"/>
-        <location filename="../src/gui.cpp" line="600"/>
-        <source>Line: %1</source>
-        <translation>Řádka: %1</translation>
-    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="584"/>
-        <source>GPX files (*.gpx);;CSV files (*.csv);;All files (*)</source>
-        <translation>soubory GPX (*.gpx);;soubory CSV (*.csv);;všechny soubory (*)</translation>
-    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="665"/>
-        <location filename="../src/gui.cpp" line="837"/>
-        <source>mi</source>
-        <translation>mi</translation>
-    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="668"/>
-        <location filename="../src/gui.cpp" line="670"/>
-        <location filename="../src/gui.cpp" line="672"/>
-        <location filename="../src/gui.cpp" line="674"/>
-        <location filename="../src/gui.cpp" line="834"/>
-        <source>ft</source>
-        <translation>ft</translation>
-    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="671"/>
-        <location filename="../src/gui.cpp" line="683"/>
-        <source>Maximum</source>
-        <translation>Maximum</translation>
-    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="673"/>
-        <location filename="../src/gui.cpp" line="685"/>
-        <source>Minimum</source>
-        <translation>Minimum</translation>
-    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="192"/>
-        <location filename="../src/gui.cpp" line="442"/>
-        <source>About GPXSee</source>
-        <translation>O aplikaci GPXSee</translation>
-    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="386"/>
-        <source>Navigation</source>
-        <translation>Navigace</translation>
-    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="490"/>
-        <source>Map sources</source>
-        <translation>Mapové zdroje</translation>
-    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="501"/>
-        <source>POIs</source>
-        <translation>POI body</translation>
-    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="664"/>
-        <location filename="../src/gui.cpp" line="676"/>
-        <source>Distance</source>
-        <translation>Vzdálenost</translation>
-    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="666"/>
-        <location filename="../src/gui.cpp" line="678"/>
-        <source>Time</source>
-        <translation>Čas</translation>
-    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="667"/>
-        <location filename="../src/gui.cpp" line="679"/>
-        <source>Ascent</source>
-        <translation>Stoupání</translation>
-    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="680"/>
-        <location filename="../src/gui.cpp" line="682"/>
-        <location filename="../src/gui.cpp" line="684"/>
-        <location filename="../src/gui.cpp" line="686"/>
-        <location filename="../src/gui.cpp" line="841"/>
-        <source>m</source>
-        <translation>m</translation>
-    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="669"/>
-        <location filename="../src/gui.cpp" line="681"/>
-        <source>Descent</source>
-        <translation>Klesání</translation>
-    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="829"/>
-        <source>%1 tracks</source>
-        <translation>Počet tras: %1</translation>
-    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="677"/>
-        <location filename="../src/gui.cpp" line="844"/>
-        <source>km</source>
-        <translation>km</translation>
-    </message>
-    <message>
-        <location filename="../src/gui.cpp" line="576"/>
-        <location filename="../src/gui.cpp" line="601"/>
+        <location filename="../src/exportdialog.cpp" line="129"/>
+        <location filename="../src/exportdialog.cpp" line="139"/>
+        <location filename="../src/exportdialog.cpp" line="144"/>
        <source>Error</source>
        <translation>Chyba</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="571"/>
+        <location filename="../src/exportdialog.cpp" line="129"/>
+        <source>No output file selected.</source>
+        <translation>Nebyl zvolen žádný výstupní soubor.</translation>
+    </message>
+    <message>
+        <location filename="../src/exportdialog.cpp" line="139"/>
+        <source>%1 is a directory.</source>
+        <translation>%1 je adresář.</translation>
+    </message>
+    <message>
+        <location filename="../src/exportdialog.cpp" line="144"/>
+        <source>%1 is not writable.</source>
+        <translation>%1 nelze zapsat.</translation>
+    </message>
+</context>
+<context>
+    <name>FileSelectWidget</name>
+    <message>
+        <location filename="../src/fileselectwidget.cpp" line="10"/>
+        <source>Browse...</source>
+        <translation>Procházet...</translation>
+    </message>
+    <message>
+        <location filename="../src/fileselectwidget.cpp" line="22"/>
+        <source>Select file</source>
+        <translation>Vybrat soubor</translation>
+    </message>
+</context>
+<context>
+    <name>GUI</name>
+    <message>
+        <location filename="../src/gui.cpp" line="458"/>
+        <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="522"/>
+        <source>Open file</source>
+        <translation>Otevřít soubor</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="599"/>
+        <source>Open POI file</source>
+        <translation>Otevřít POI soubor</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="203"/>
+        <source>Open</source>
+        <translation>Otevřít</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="187"/>
+        <source>Quit</source>
+        <translation>Ukončit</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="195"/>
+        <location filename="../src/gui.cpp" line="474"/>
+        <location filename="../src/gui.cpp" line="475"/>
+        <source>Keyboard controls</source>
+        <translation>Ovládací klávesy</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="219"/>
+        <source>Close</source>
+        <translation>Zavřít</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="225"/>
+        <source>Reload</source>
+        <translation>Znovu načíst</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="381"/>
+        <source>Show</source>
+        <translation>Zobrazit</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="322"/>
+        <location filename="../src/gui.cpp" line="375"/>
+        <source>File</source>
+        <translation>Soubor</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="193"/>
+        <location filename="../src/gui.cpp" line="497"/>
+        <location filename="../src/gui.cpp" line="498"/>
+        <source>Data sources</source>
+        <translation>Zdroje dat</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="233"/>
+        <source>Load POI file</source>
+        <translation>Nahrát POI soubor</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="236"/>
+        <source>Close POI files</source>
+        <translation>Zavřit POI soubory</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="239"/>
+        <source>Show POIs</source>
+        <translation>Zobrazit POI</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="247"/>
+        <source>Show map</source>
+        <translation>Zobrazit mapu</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="253"/>
+        <source>Clear tile cache</source>
+        <translation>Vymazat mezipaměť dlaždic</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="262"/>
+        <location filename="../src/gui.cpp" line="266"/>
+        <location filename="../src/gui.cpp" line="484"/>
+        <source>Next map</source>
+        <translation>Následující mapa</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="273"/>
+        <source>Show graphs</source>
+        <translation>Zobrazovat grafy</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="279"/>
+        <source>Show toolbars</source>
+        <translation>Zobrazovat nástrojové lišty</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="285"/>
+        <source>Metric</source>
+        <translation>Metrické</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="290"/>
+        <source>Imperial</source>
+        <translation>Imperiální</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="296"/>
+        <source>Fullscreen mode</source>
+        <translation>Celoobrazovkový režim</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="304"/>
+        <source>Next</source>
+        <translation>Následující</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="307"/>
+        <source>Previous</source>
+        <translation>Předchozí</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="311"/>
+        <source>Last</source>
+        <translation>Poslední</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="314"/>
+        <source>First</source>
+        <translation>První</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="336"/>
+        <source>Map</source>
+        <translation>Mapa</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="343"/>
+        <source>POI</source>
+        <translation>POI</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="344"/>
+        <source>POI files</source>
+        <translation>POI soubory</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="352"/>
+        <source>Settings</source>
+        <translation>Nastavení</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="353"/>
+        <source>Units</source>
+        <translation>Jednotky</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="362"/>
+        <source>Help</source>
+        <translation>Nápověda</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="486"/>
+        <source>Previous map</source>
+        <translation>Předchozí mapa</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="684"/>
+        <location filename="../src/gui.cpp" line="687"/>
+        <source>Date</source>
+        <translation>Datum</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="860"/>
+        <source>No GPX files loaded</source>
+        <translation>Nejsou načteny žádné GPX soubory</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="420"/>
+        <source>Elevation</source>
+        <translation>Výška</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="421"/>
+        <source>Speed</source>
+        <translation>Rychlost</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="422"/>
+        <source>Heart rate</source>
+        <translation>Tep</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="477"/>
+        <source>Next file</source>
+        <translation>Následující soubor</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="454"/>
+        <source>Version </source>
+        <translation>Verze </translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="208"/>
+        <source>Print...</source>
+        <translation>Tisknout...</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="213"/>
+        <source>Export to PDF...</source>
+        <translation>Exportovat do PDF...</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="478"/>
+        <source>Previous file</source>
+        <translation>Předchozí soubor</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="480"/>
+        <source>First file</source>
+        <translation>První soubor</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="481"/>
+        <source>Last file</source>
+        <translation>Poslední soubor</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="482"/>
+        <source>Append modifier</source>
+        <translation>Modifikátor nahradit/přidat</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="501"/>
+        <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="504"/>
+        <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="512"/>
+        <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="523"/>
+        <source>GPX files (*.gpx);;All files (*)</source>
+        <translation>Soubory GPX (*.gpx);;Všechny soubory (*)</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="590"/>
+        <location filename="../src/gui.cpp" line="616"/>
+        <source>Line: %1</source>
+        <translation>Řádka: %1</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="600"/>
+        <source>GPX files (*.gpx);;CSV files (*.csv);;All files (*)</source>
+        <translation>Soubory GPX (*.gpx);;Soubory CSV (*.csv);;Všechny soubory (*)</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="690"/>
+        <source>Tracks</source>
+        <translation>Počet tras</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="696"/>
+        <location filename="../src/gui.cpp" line="875"/>
+        <source>mi</source>
+        <translation>mi</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="872"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="198"/>
+        <location filename="../src/gui.cpp" line="452"/>
+        <source>About GPXSee</source>
+        <translation>O aplikaci GPXSee</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="385"/>
+        <source>Navigation</source>
+        <translation>Navigace</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="500"/>
+        <source>Map sources</source>
+        <translation>Mapové zdroje</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="511"/>
+        <source>POIs</source>
+        <translation>POI body</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="695"/>
+        <location filename="../src/gui.cpp" line="698"/>
+        <source>Distance</source>
+        <translation>Vzdálenost</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="703"/>
+        <source>Time</source>
+        <translation>Čas</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="879"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="867"/>
+        <source>%1 tracks</source>
+        <translation>Počet tras: %1</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="699"/>
+        <location filename="../src/gui.cpp" line="882"/>
+        <source>km</source>
+        <translation>km</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="592"/>
+        <location filename="../src/gui.cpp" line="617"/>
+        <source>Error</source>
+        <translation>Chyba</translation>
+    </message>
+    <message>
+        <location filename="../src/gui.cpp" line="587"/>
        <source>Error loading GPX file:
 %1</source>
        <translation>Soubor GPX nelze otevřít:
 %1</translation>
    </message>
    <message>
-        <location filename="../src/gui.cpp" line="597"/>
+        <location filename="../src/gui.cpp" line="613"/>
        <source>Error loading POI file:
 %1</source>
        <translation>Soubor POI nelze otevřít:
@ -485,22 +566,22 @@
 <context>
    <name>QObject</name>
    <message>
-        <location filename="../src/scaleitem.cpp" line="83"/>
+        <location filename="../src/scaleitem.cpp" line="81"/>
        <source>mi</source>
        <translation>mi</translation>
    </message>
    <message>
-        <location filename="../src/scaleitem.cpp" line="83"/>
+        <location filename="../src/scaleitem.cpp" line="81"/>
        <source>ft</source>
        <translation>ft</translation>
    </message>
    <message>
-        <location filename="../src/scaleitem.cpp" line="85"/>
+        <location filename="../src/scaleitem.cpp" line="83"/>
        <source>km</source>
        <translation>km</translation>
    </message>
    <message>
-        <location filename="../src/scaleitem.cpp" line="85"/>
+        <location filename="../src/scaleitem.cpp" line="83"/>
        <source>m</source>
        <translation>m</translation>
    </message>
--- a/pkg/gpxsee.nsi
+++ b/pkg/gpxsee.nsi
@ -3,9 +3,11 @@

 ; The name of the installer
 Name "GPXSee"
+; Program version
+!define VERSION "2.15"

 ; The file to write
-OutFile "install.exe"
+OutFile "GPXSee-${VERSION}.exe"

 ; Required execution level 
 RequestExecutionLevel admin
@ -67,7 +69,7 @@ Section "GPXSee (required)" SEC_APP
  ; Write the uninstall keys for Windows
  WriteRegStr HKLM "${REGENTRY}" "DisplayName" "GPXSee"
  WriteRegStr HKLM "${REGENTRY}" "Publisher" "Martin Tuma"
-  WriteRegStr HKLM "${REGENTRY}" "DisplayVersion" "2.13"
+  WriteRegStr HKLM "${REGENTRY}" "DisplayVersion" "${VERSION}"
  WriteRegStr HKLM "${REGENTRY}" "UninstallString" '"$INSTDIR\uninstall.exe"'
  WriteRegDWORD HKLM "${REGENTRY}" "NoModify" 1
  WriteRegDWORD HKLM "${REGENTRY}" "NoRepair" 1
@ -100,6 +102,7 @@ Section "QT libs" SEC_QT
  File "libGLESv2.dll"
  File /r "platforms"
  File /r "imageformats"
+  File /r "printsupport"
 
 SectionEnd

--- a/pkg/gpxsee64.nsi
+++ b/pkg/gpxsee64.nsi
@ -3,9 +3,11 @@

 ; The name of the installer
 Name "GPXSee"
+; Program version
+!define VERSION "2.15"

 ; The file to write
-OutFile "install.exe"
+OutFile "GPXSee-${VERSION}_x64.exe"

 ; Required execution level 
 RequestExecutionLevel admin
@ -75,7 +77,7 @@ Section "GPXSee (required)" SEC_APP
  ; Write the uninstall keys for Windows
  WriteRegStr HKLM "${REGENTRY}" "DisplayName" "GPXSee"
  WriteRegStr HKLM "${REGENTRY}" "Publisher" "Martin Tuma"
-  WriteRegStr HKLM "${REGENTRY}" "DisplayVersion" "2.13"
+  WriteRegStr HKLM "${REGENTRY}" "DisplayVersion" "${VERSION}"
  WriteRegStr HKLM "${REGENTRY}" "UninstallString" '"$INSTDIR\uninstall.exe"'
  WriteRegDWORD HKLM "${REGENTRY}" "NoModify" 1
  WriteRegDWORD HKLM "${REGENTRY}" "NoRepair" 1
@ -108,6 +110,7 @@ Section "QT libs" SEC_QT
  File "libGLESv2.dll"
  File /r "platforms"
  File /r "imageformats"
+  File /r "printsupport"
 
 SectionEnd

--- a/src/config.h
+++ b/src/config.h
@ -11,6 +11,7 @@

 #define FONT_FAMILY     "Arial"
 #define FONT_SIZE       12
+#define SCREEN_DPI      96.0

 #define MAP_FILE        QString("maps.txt")
 #define POI_DIR         QString("POI")
--- a/src/downloader.cpp
+++ b/src/downloader.cpp
@ -23,12 +23,12 @@ Downloader::Downloader()
 			SLOT(downloadFinished(QNetworkReply*)));
 }

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

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

 	QNetworkRequest request(url);
 	request.setAttribute(QNetworkRequest::User, QVariant(dl.file()));
@ -36,6 +36,8 @@ void Downloader::doDownload(const Download &dl)
 	QNetworkReply *reply = _manager.get(request);

 	_currentDownloads.append(reply);
+
+	return true;
 }

 bool Downloader::saveToDisk(const QString &filename, QIODevice *data)
@ -74,8 +76,12 @@ void Downloader::downloadFinished(QNetworkReply *reply)
 		emit finished();
 }

-void Downloader::get(const QList<Download> &list)
+bool Downloader::get(const QList<Download> &list)
 {
+	bool finishEmitted = false;
+
 	for (int i = 0; i < list.count(); i++)
-		doDownload(list.at(i));
+		finishEmitted |= doDownload(list.at(i));
+
+	return finishEmitted;
 }
--- a/src/downloader.h
+++ b/src/downloader.h
@ -30,7 +30,7 @@ class Downloader : public QObject
 public:
 	static Downloader& instance()
 		{static Downloader i; return i;}
-	void get(const QList<Download> &list);
+	bool get(const QList<Download> &list);

 signals:
 	void finished();
@ -43,7 +43,7 @@ private:
 	Downloader(Downloader const&);
 	void operator=(Downloader const&);

-	void doDownload(const Download &dl);
+	bool doDownload(const Download &dl);
 	bool saveToDisk(const QString &filename, QIODevice *data);

 	QNetworkAccessManager _manager;
--- a/src/exportdialog.cpp
+++ b/src/exportdialog.cpp
@ -0,0 +1,174 @@
+#include <QVBoxLayout>
+#include <QHBoxLayout>
+#include <QFormLayout>
+#include <QGridLayout>
+#include <QDialogButtonBox>
+#include <QGroupBox>
+#include <QComboBox>
+#include <QRadioButton>
+#include <QPushButton>
+#include <QFileInfo>
+#include <QMessageBox>
+#include <QTabWidget>
+#include <QDoubleSpinBox>
+#include <QLocale>
+#include "fileselectwidget.h"
+#include "units.h"
+#include "exportdialog.h"
+
+
+ExportDialog::ExportDialog(QPrinter *printer, QWidget *parent)
+  : QDialog(parent), _printer(printer)
+{
+	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());
+
+	_paperSize = new QComboBox();
+	_paperSize->addItem("A3", QPrinter::A3);
+	_paperSize->addItem("A4", QPrinter::A4);
+	_paperSize->addItem("A5", QPrinter::A5);
+	_paperSize->addItem("Tabloid", QPrinter::Tabloid);
+	_paperSize->addItem("Legal", QPrinter::Legal);
+	_paperSize->addItem("Letter", QPrinter::Letter);
+	if ((index = _paperSize->findData(_printer->paperSize())) >= 0)
+		_paperSize->setCurrentIndex(index);
+
+	_portrait = new QRadioButton(tr("Portrait"));
+	_landscape = new QRadioButton(tr("Landscape"));
+	QHBoxLayout *orientationLayout = new QHBoxLayout();
+	orientationLayout->addWidget(_portrait);
+	orientationLayout->addWidget(_landscape);
+	if (_printer->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);
+	_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) {
+		_topMargin->setSingleStep(0.1);
+		_bottomMargin->setSingleStep(0.1);
+		_leftMargin->setSingleStep(0.1);
+		_rightMargin->setSingleStep(0.1);
+	}
+
+	QGridLayout *marginsLayout = new QGridLayout();
+	marginsLayout->addWidget(_topMargin, 0, 0, 1, 2, Qt::AlignCenter);
+	marginsLayout->addWidget(_leftMargin, 1, 0, 1, 1, Qt::AlignRight);
+	marginsLayout->addWidget(_rightMargin, 1, 1, 1, 1, Qt::AlignLeft);
+	marginsLayout->addWidget(_bottomMargin, 2, 0, 1, 2, Qt::AlignCenter);
+
+#ifndef Q_OS_MAC
+	QGroupBox *pageSetupBox = new QGroupBox(tr("Page Setup"));
+#endif // Q_OS_MAC
+	QFormLayout *pageSetupLayout = new QFormLayout;
+	pageSetupLayout->addRow(tr("Page size:"), _paperSize);
+	pageSetupLayout->addRow(tr("Orientation:"), orientationLayout);
+	pageSetupLayout->addRow(tr("Margins:"), marginsLayout);
+#ifdef Q_OS_MAC
+	QFrame *line = new QFrame();
+	line->setFrameShape(QFrame::HLine);
+	line->setFrameShadow(QFrame::Sunken);
+	pageSetupLayout->addRow(line);
+	pageSetupLayout->addRow(tr("File:"), _fileSelect);
+#else // Q_OS_MAC
+	pageSetupBox->setLayout(pageSetupLayout);
+#endif // Q_OS_MAC
+
+#ifndef Q_OS_MAC
+	QGroupBox *outputFileBox = new QGroupBox(tr("Output file"));
+	QHBoxLayout *outputFileLayout = new QHBoxLayout();
+	outputFileLayout->addWidget(_fileSelect);
+	outputFileBox->setLayout(outputFileLayout);
+#endif // Q_OS_MAC
+
+	QDialogButtonBox *buttonBox = new QDialogButtonBox();
+	buttonBox->addButton(tr("Export"), QDialogButtonBox::AcceptRole);
+	buttonBox->addButton(QDialogButtonBox::Cancel);
+	connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
+	connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
+
+	QVBoxLayout *layout = new QVBoxLayout;
+#ifdef Q_OS_MAC
+	layout->addLayout(pageSetupLayout);
+#else // Q_OS_MAC
+	layout->addWidget(pageSetupBox);
+	layout->addWidget(outputFileBox);
+#endif // Q_OS_MAC
+	layout->addWidget(buttonBox);
+	setLayout(layout);
+
+	setWindowTitle(tr("Export to PDF"));
+	setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
+}
+
+bool ExportDialog::checkFile()
+{
+	if (_fileSelect->file().isEmpty()) {
+		QMessageBox::warning(this, tr("Error"), tr("No output file selected."));
+		return false;
+	}
+
+	QFile file(_fileSelect->file());
+	QFileInfo fi(file);
+	bool exists = fi.exists();
+	bool opened = false;
+
+	if (exists && fi.isDir()) {
+		QMessageBox::warning(this, tr("Error"), tr("%1 is a directory.")
+		  .arg(file.fileName()));
+		return false;
+	} else if ((exists && !fi.isWritable())
+	  || !(opened = file.open(QFile::Append))) {
+		QMessageBox::warning(this, tr("Error"), tr("%1 is not writable.")
+		  .arg(file.fileName()));
+		return false;
+	}
+	if (opened) {
+		file.close();
+		if (!exists)
+			file.remove();
+	}
+
+	return true;
+}
+
+void ExportDialog::accept()
+{
+	if (!checkFile())
+		return;
+
+	QPrinter::Orientation orientation = _portrait->isChecked()
+	  ? QPrinter::Portrait : QPrinter::Landscape;
+	QPrinter::PaperSize paperSize = static_cast<QPrinter::PaperSize>
+	  (_paperSize->itemData(_paperSize->currentIndex()).toInt());
+
+	_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);
+
+	QDialog::accept();
+}
--- a/src/exportdialog.h
+++ b/src/exportdialog.h
@ -0,0 +1,39 @@
+#ifndef EXPORTDIALOG_H
+#define EXPORTDIALOG_H
+
+#include <QDialog>
+#include <QPrinter>
+
+class QComboBox;
+class QRadioButton;
+class FileSelectWidget;
+class QDoubleSpinBox;
+
+class ExportDialog : public QDialog
+{
+	Q_OBJECT
+
+public:
+	ExportDialog(QPrinter *printer, QWidget *parent = 0);
+
+public slots:
+	void accept();
+
+private:
+	bool checkFile();
+
+	QPrinter *_printer;
+
+	QPrinter::Unit _units;
+
+	FileSelectWidget *_fileSelect;
+	QComboBox *_paperSize;
+	QRadioButton *_portrait;
+	QRadioButton *_landscape;
+	QDoubleSpinBox *_topMargin;
+	QDoubleSpinBox *_bottomMargin;
+	QDoubleSpinBox *_leftMargin;
+	QDoubleSpinBox *_rightMargin;
+};
+
+#endif // EXPORTDIALOG_H
--- a/src/fileselectwidget.cpp
+++ b/src/fileselectwidget.cpp
@ -0,0 +1,33 @@
+#include <QPushButton>
+#include <QFileDialog>
+#include <QHBoxLayout>
+#include <QFileInfo>
+#include <QApplication>
+#include <QFontMetrics>
+#include "fileselectwidget.h"
+
+
+FileSelectWidget::FileSelectWidget(QWidget *parent) : QWidget(parent)
+{
+	QFontMetrics fm(QApplication::font());
+	_edit = new QLineEdit();
+	_edit->setMinimumWidth(fm.boundingRect(QDir::homePath()).width());
+	_button = new QPushButton(tr("Browse..."));
+	connect(_button, SIGNAL(clicked()), this, SLOT(browse()));
+
+	QHBoxLayout *layout = new QHBoxLayout();
+	layout->setMargin(0);
+	layout->addWidget(_edit);
+	layout->addWidget(_button);
+	setLayout(layout);
+}
+
+void FileSelectWidget::browse()
+{
+	QFileInfo fi(_edit->text());
+	QString fileName = QFileDialog::getSaveFileName(this, tr("Select file"),
+	  fi.dir().absolutePath(), _filter);
+
+	if (!fileName.isEmpty())
+		_edit->setText(fileName);
+}
--- a/src/fileselectwidget.h
+++ b/src/fileselectwidget.h
@ -0,0 +1,30 @@
+#ifndef FILESELECTWIDGET_H
+#define FILESELECTWIDGET_H
+
+#include <QWidget>
+#include <QLineEdit>
+
+class QPushButton;
+
+class FileSelectWidget : public QWidget
+{
+	Q_OBJECT
+
+public:
+	FileSelectWidget(QWidget *parent = 0);
+
+	QString file() {return _edit->text();}
+	void setFile(const QString &file) {_edit->setText(file);}
+	void setFilter(const QString &filter) {_filter = filter;}
+
+private slots:
+	void browse();
+
+private:
+	QLineEdit *_edit;
+	QPushButton *_button;
+
+	QString _filter;
+};
+
+#endif // FILESELECTWIDGET_H
--- a/src/graphview.cpp
+++ b/src/graphview.cpp
@ -1,7 +1,8 @@
 #include <QGraphicsView>
 #include <QGraphicsSceneMouseEvent>
 #include <QEvent>
-#include <QGraphicsSimpleTextItem>
+#include <QPaintEngine>
+#include <QPaintDevice>
 #include "config.h"
 #include "axisitem.h"
 #include "slideritem.h"
@ -67,8 +68,6 @@ GraphView::~GraphView()

 	if (_info->scene() != _scene)
 		delete _info;
-
-	delete _scene;
 }

 void GraphView::updateBounds(const QPointF &point)
@ -240,17 +239,18 @@ void GraphView::resizeEvent(QResizeEvent *)

 void GraphView::plot(QPainter *painter, const QRectF &target)
 {
-	qreal ratio = target.width() / target.height();
-	QSizeF orig = _scene->sceneRect().size();
-	QSizeF canvas = QSizeF(orig.height() * ratio, orig.height());
+	qreal ratio = painter->paintEngine()->paintDevice()->logicalDpiX()
+	  / SCREEN_DPI;
+	QSizeF canvas = QSizeF(target.width() / ratio, target.height() / ratio);

+	setUpdatesEnabled(false);
 	redraw(canvas);
-	_slider->hide();
-	_info->hide();
-	_scene->render(painter, target, QRectF());
+	if (_slider->pos().x() == _slider->area().left())
+		_slider->hide();
+	_scene->render(painter, target);
 	_slider->show();
-	_info->show();
-	redraw(orig);
+	redraw();
+	setUpdatesEnabled(true);
 }

 void GraphView::clear()
--- a/src/gui.cpp
+++ b/src/gui.cpp
@ -4,8 +4,10 @@
 #include <QStatusBar>
 #include <QMessageBox>
 #include <QFileDialog>
-#include <QPrinter>
+#include <QPrintDialog>
 #include <QPainter>
+#include <QPaintEngine>
+#include <QPaintDevice>
 #include <QKeyEvent>
 #include <QSignalMapper>
 #include <QMenu>
@ -15,6 +17,7 @@
 #include <QAction>
 #include <QLabel>
 #include <QSettings>
+#include <QLocale>
 #include "config.h"
 #include "icons.h"
 #include "keys.h"
@ -26,19 +29,13 @@
 #include "speedgraph.h"
 #include "heartrategraph.h"
 #include "trackview.h"
-#include "infoitem.h"
+#include "trackinfo.h"
 #include "filebrowser.h"
 #include "cpuarch.h"
+#include "exportdialog.h"
 #include "gui.h"


-#define ARRAY_SIZE(a) (sizeof(a)/sizeof(a[0]))
-
-struct GraphTab {
-	GraphView *view;
-	QString label;
-};
-
 static QString timeSpan(qreal time)
 {
 	unsigned h, m, s;
@ -51,7 +48,6 @@ static QString timeSpan(qreal time)
 	  .arg(s, 2, 10, QChar('0'));
 }

-
 GUI::GUI(QWidget *parent) : QMainWindow(parent)
 {
 	loadMaps();
@ -64,13 +60,6 @@ GUI::GUI(QWidget *parent) : QMainWindow(parent)
 	createTrackGraphs();
 	createStatusBar();

-	connect(_elevationGraph, SIGNAL(sliderPositionChanged(qreal)), this,
-	  SLOT(sliderPositionChanged(qreal)));
-	connect(_speedGraph, SIGNAL(sliderPositionChanged(qreal)), this,
-	  SLOT(sliderPositionChanged(qreal)));
-	connect(_heartRateGraph, SIGNAL(sliderPositionChanged(qreal)), this,
-	  SLOT(sliderPositionChanged(qreal)));
-
 	_browser = new FileBrowser(this);
 	_browser->setFilter(QStringList("*.gpx"));

@ -100,6 +89,20 @@ GUI::GUI(QWidget *parent) : QMainWindow(parent)
 	updateTrackView();

 	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);
+}
+
+GUI::~GUI()
+{
+	for (int i = 0; i < _tabs.size(); i++) {
+		if (_trackGraphs->indexOf(_tabs.at(i).first) < 0)
+			delete _tabs.at(i).first;
+	}
 }

 void GUI::loadMaps()
@ -201,18 +204,17 @@ void GUI::createActions()
 	_openFileAction->setShortcut(OPEN_SHORTCUT);
 	connect(_openFileAction, SIGNAL(triggered()), this, SLOT(openFile()));
 	addAction(_openFileAction);
-	_saveFileAction = new QAction(QIcon(QPixmap(SAVE_FILE_ICON)),
-	  tr("Save"), this);
-	_saveFileAction->setShortcut(SAVE_SHORTCUT);
-	_saveFileAction->setActionGroup(_fileActionGroup);
-	connect(_saveFileAction, SIGNAL(triggered()), this, SLOT(saveFile()));
-	addAction(_saveFileAction);
-	_saveAsAction = new QAction(QIcon(QPixmap(SAVE_AS_ICON)),
-	  tr("Save as"), this);
-	_saveAsAction->setShortcut(SAVE_AS_SHORTCUT);
-	_saveAsAction->setActionGroup(_fileActionGroup);
-	connect(_saveAsAction, SIGNAL(triggered()), this, SLOT(saveAs()));
-	addAction(_saveAsAction);
+	_printFileAction = new QAction(QIcon(QPixmap(PRINT_FILE_ICON)),
+	  tr("Print..."), this);
+	_printFileAction->setActionGroup(_fileActionGroup);
+	connect(_printFileAction, SIGNAL(triggered()), this, SLOT(printFile()));
+	addAction(_printFileAction);
+	_exportFileAction = new QAction(QIcon(QPixmap(EXPORT_FILE_ICON)),
+	  tr("Export to PDF..."), this);
+	_exportFileAction->setShortcut(EXPORT_SHORTCUT);
+	_exportFileAction->setActionGroup(_fileActionGroup);
+	connect(_exportFileAction, SIGNAL(triggered()), this, SLOT(exportFile()));
+	addAction(_exportFileAction);
 	_closeFileAction = new QAction(QIcon(QPixmap(CLOSE_FILE_ICON)),
 	  tr("Close"), this);
 	_closeFileAction->setShortcut(CLOSE_SHORTCUT);
@ -320,8 +322,8 @@ void GUI::createMenus()
 	_fileMenu = menuBar()->addMenu(tr("File"));
 	_fileMenu->addAction(_openFileAction);
 	_fileMenu->addSeparator();
-	_fileMenu->addAction(_saveFileAction);
-	_fileMenu->addAction(_saveAsAction);
+	_fileMenu->addAction(_printFileAction);
+	_fileMenu->addAction(_exportFileAction);
 	_fileMenu->addSeparator();
 	_fileMenu->addAction(_reloadFileAction);
 	_fileMenu->addSeparator();
@ -366,30 +368,25 @@ void GUI::createMenus()

 void GUI::createToolBars()
 {
+#ifdef Q_OS_MAC
+	setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
+#endif // Q_OS_MAC
+
 	_fileToolBar = addToolBar(tr("File"));
 	_fileToolBar->addAction(_openFileAction);
-	_fileToolBar->addAction(_saveFileAction);
 	_fileToolBar->addAction(_reloadFileAction);
 	_fileToolBar->addAction(_closeFileAction);
-#ifdef Q_OS_MAC
-	_fileToolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
-#endif // Q_OS_MAC
+	_fileToolBar->addAction(_printFileAction);

 	_showToolBar = addToolBar(tr("Show"));
 	_showToolBar->addAction(_showPOIAction);
 	_showToolBar->addAction(_showMapAction);
-#ifdef Q_OS_MAC
-	_showToolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
-#endif // Q_OS_MAC

 	_navigationToolBar = addToolBar(tr("Navigation"));
 	_navigationToolBar->addAction(_firstAction);
 	_navigationToolBar->addAction(_prevAction);
 	_navigationToolBar->addAction(_nextAction);
 	_navigationToolBar->addAction(_lastAction);
-#ifdef Q_OS_MAC
-	_navigationToolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
-#endif // Q_OS_MAC
 }

 void GUI::createTrackView()
@ -419,6 +416,17 @@ void GUI::createTrackGraphs()
 #ifdef Q_OS_WIN32
 	_trackGraphs->setDocumentMode(true);
 #endif // Q_OS_WIN32
+
+	_tabs.append(GraphTab(_elevationGraph, tr("Elevation")));
+	_tabs.append(GraphTab(_speedGraph, tr("Speed")));
+	_tabs.append(GraphTab(_heartRateGraph, tr("Heart rate")));
+
+	connect(_elevationGraph, SIGNAL(sliderPositionChanged(qreal)), this,
+	  SLOT(sliderPositionChanged(qreal)));
+	connect(_speedGraph, SIGNAL(sliderPositionChanged(qreal)), this,
+	  SLOT(sliderPositionChanged(qreal)));
+	connect(_heartRateGraph, SIGNAL(sliderPositionChanged(qreal)), this,
+	  SLOT(sliderPositionChanged(qreal)));
 }

 void GUI::createStatusBar()
@ -564,6 +572,11 @@ bool GUI::loadFile(const QString &fileName)
 		for (int i = 0; i < gpx.trackCount(); i++) {
 			_distance += gpx.track(i).distance();
 			_time += gpx.track(i).time();
+			const QDate &date = gpx.track(i).date().date();
+			if (_dateRange.first.isNull() || _dateRange.first > date)
+				_dateRange.first = date;
+			if (_dateRange.second.isNull() || _dateRange.second < date)
+				_dateRange.second = date;
 		}

 		_trackCount += gpx.trackCount();
@ -627,75 +640,97 @@ void GUI::closePOIFiles()
 	_poi.clear();
 }

-void GUI::saveAs()
-{
-	QString fileName = QFileDialog::getSaveFileName(this, "Export to PDF",
-	  QString(), "*.pdf");
-
-	if (!fileName.isEmpty()) {
-		saveFile(fileName);
-		_saveFileName = fileName;
-	}
-}
-
-void GUI::saveFile()
-{
-	if (_saveFileName.isEmpty())
-		emit saveAs();
-	else
-		saveFile(_saveFileName);
-}
-
-void GUI::saveFile(const QString &fileName)
+void GUI::printFile()
 {
 	QPrinter printer(QPrinter::HighResolution);
-	printer.setPageSize(QPrinter::A4);
-	printer.setOrientation(_track->orientation());
-	printer.setOutputFormat(QPrinter::PdfFormat);
-	printer.setOutputFileName(fileName);
+	QPrintDialog dialog(&printer, this);

-	QPainter p(&printer);
+	if (dialog.exec() == QDialog::Accepted)
+		plot(&printer);
+}

-	_track->plot(&p, QRectF(0, 300, printer.width(), (0.80 * printer.height())
-	  - 400));
-	_elevationGraph->plot(&p,  QRectF(0, 0.80 * printer.height(),
-	  printer.width(), printer.height() * 0.20));
+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);

-	QGraphicsScene scene;
-	InfoItem info;
-	if (_imperialUnitsAction->isChecked()) {
-		info.insert(tr("Distance"), QString::number(_distance * M2MI, 'f', 1)
-		  + UNIT_SPACE + tr("mi"));
-		info.insert(tr("Time"), timeSpan(_time));
-		info.insert(tr("Ascent"), QString::number(_elevationGraph->ascent()
-		  * M2FT, 'f', 0) + UNIT_SPACE + tr("ft"));
-		info.insert(tr("Descent"), QString::number(_elevationGraph->descent()
-		  * M2FT, 'f', 0) + UNIT_SPACE + tr("ft"));
-		info.insert(tr("Maximum"), QString::number(_elevationGraph->max()
-		  * M2FT, 'f', 0) + UNIT_SPACE + tr("ft"));
-		info.insert(tr("Minimum"), QString::number(_elevationGraph->min()
-		  * M2FT, 'f', 0) + UNIT_SPACE + tr("ft"));
-	} else {
-		info.insert(tr("Distance"), QString::number(_distance * M2KM, 'f', 1)
-		  + UNIT_SPACE + tr("km"));
-		info.insert(tr("Time"), timeSpan(_time));
-		info.insert(tr("Ascent"), QString::number(_elevationGraph->ascent(),
-		  'f', 0) + UNIT_SPACE + tr("m"));
-		info.insert(tr("Descent"), QString::number(_elevationGraph->descent(),
-		  'f', 0) + UNIT_SPACE + tr("m"));
-		info.insert(tr("Maximum"), QString::number(_elevationGraph->max(), 'f',
-		  0) + UNIT_SPACE + tr("m"));
-		info.insert(tr("Minimum"), QString::number(_elevationGraph->min(), 'f',
-		  0) + UNIT_SPACE + tr("m"));
+	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);
 	}
-	scene.addItem(&info);
-	scene.render(&p, QRectF(0, 0, printer.width(), 200));
+}
+
+void GUI::plot(QPrinter *printer)
+{
+	QPainter p(printer);
+	TrackInfo info;
+	qreal ih, gh, mh, ratio;
+
+
+	if (_dateRange.first.isValid()) {
+		if (_dateRange.first == _dateRange.second) {
+			QString format = QLocale::system().dateFormat(QLocale::LongFormat);
+			info.insert(tr("Date"), _dateRange.first.toString(format));
+		} else {
+			QString format = QLocale::system().dateFormat(QLocale::ShortFormat);
+			info.insert(tr("Date"), QString("%1 - %2")
+			  .arg(_dateRange.first.toString(format),
+			  _dateRange.second.toString(format)));
+			info.insert(tr("Tracks"), QString::number(_trackCount));
+		}
+	}
+	if (_distance > 0) {
+		if (_imperialUnitsAction->isChecked()) {
+			info.insert(tr("Distance"), QString::number(_distance * M2MI, 'f',
+			  1) + UNIT_SPACE + tr("mi"));
+		} else {
+			info.insert(tr("Distance"), QString::number(_distance * M2KM, 'f',
+			  1) + UNIT_SPACE + tr("km"));
+		}
+	}
+	if (_time > 0)
+		info.insert(tr("Time"), timeSpan(_time));
+
+
+	ratio = p.paintEngine()->paintDevice()->logicalDpiX() / SCREEN_DPI;
+	if (info.isEmpty()) {
+		ih = 0;
+		mh = 0;
+	} else {
+		ih = info.contentSize().height() * ratio;
+		mh = ih / 2;
+		info.plot(&p, QRectF(0, 0, printer->width(), ih));
+	}
+	if (_trackGraphs->isVisible()) {
+		qreal r = (((qreal)(printer)->width()) / (qreal)(printer->height()));
+		gh = (printer->width() > printer->height())
+		  ? 0.15 * r * (printer->height() - ih - 2*mh)
+		  : 0.15 * (printer->height() - ih - 2*mh);
+		gh = qMax(gh, ratio * 150);
+		GraphView *gv = static_cast<GraphView*>(_trackGraphs->currentWidget());
+		gv->plot(&p,  QRectF(0, printer->height() - gh, printer->width(), gh));
+	} else
+		gh = 0;
+	_track->plot(&p, QRectF(0, ih + mh, printer->width(), printer->height()
+	  - (ih + 2*mh + gh)));
 }

 void GUI::reloadFile()
 {
 	_distance = 0;
 	_time = 0;
+	_dateRange = DateRange(QDate(), QDate());
 	_trackCount = 0;

 	_elevationGraph->clear();
@ -724,6 +759,7 @@ void GUI::closeFiles()
 {
 	_distance = 0;
 	_time = 0;
+	_dateRange = DateRange(QDate(), QDate());
 	_trackCount = 0;

 	_sliderPos = 0;
@ -929,24 +965,19 @@ void GUI::updateNavigationActions()

 void GUI::updateGraphTabs()
 {
-	struct GraphTab tabs[] = {
-	  {_elevationGraph, tr("Elevation")},
-	  {_speedGraph, tr("Speed")},
-	  {_heartRateGraph, tr("Heart rate")}
-	};
 	int index;
 	GraphView *gv;

-	for (int i = 0; i < (int)ARRAY_SIZE(tabs); i++) {
-		gv = tabs[i].view;
+	for (int i = 0; i < _tabs.size(); i++) {
+		gv = _tabs.at(i).first;
 		if (!gv->count() && (index = _trackGraphs->indexOf(gv)) >= 0)
 			_trackGraphs->removeTab(index);
 	}

-	for (int i = 0; i < (int)ARRAY_SIZE(tabs); i++) {
-		gv = tabs[i].view;
+	for (int i = 0; i < _tabs.size(); i++) {
+		gv = _tabs.at(i).first;
 		if (gv->count() && _trackGraphs->indexOf(gv) < 0)
-			_trackGraphs->insertTab(i, gv, tabs[i].label);
+			_trackGraphs->insertTab(i, gv, _tabs.at(i).second);
 	}

 	if (_trackGraphs->count()) {
@ -1108,7 +1139,9 @@ void GUI::readSettings()
 	settings.endGroup();

 	settings.beginGroup(SETTINGS_SETTINGS_GROUP);
-	if (settings.value(UNITS_SETTING, Metric).toInt() == Imperial) {
+	Units u = QLocale::system().measurementSystem() == QLocale::ImperialSystem
+	  ? Imperial : Metric;
+	if (settings.value(UNITS_SETTING, u).toInt() == Imperial) {
 		setImperialUnits();
 		_imperialUnitsAction->setChecked(true);
 	} else
--- a/src/gui.h
+++ b/src/gui.h
@ -4,7 +4,10 @@
 #include <QMainWindow>
 #include <QString>
 #include <QList>
+#include <QDate>
+#include <QPrinter>
 #include "poi.h"
+#include "margins.h"

 class QMenu;
 class QToolBar;
@ -13,6 +16,7 @@ class QActionGroup;
 class QAction;
 class QLabel;
 class QSignalMapper;
+class QPrinter;
 class FileBrowser;
 class GraphView;
 class ElevationGraph;
@ -27,6 +31,7 @@ class GUI : public QMainWindow

 public:
 	GUI(QWidget *parent = 0);
+	~GUI();

 	bool openFile(const QString &fileName);

@ -34,8 +39,8 @@ private slots:
 	void about();
 	void keys();
 	void dataSources();
-	void saveFile();
-	void saveAs();
+	void printFile();
+	void exportFile();
 	void openFile();
 	void closeAll();
 	void reloadFile();
@ -65,9 +70,13 @@ private slots:
 	void sliderPositionChanged(qreal pos);

 private:
+	typedef QPair<GraphView *, QString> GraphTab;
+	typedef QPair<QDate, QDate> DateRange;
+
 	void loadMaps();
 	void loadPOIs();
 	void closeFiles();
+	void plot(QPrinter *printer);

 	QAction *createPOIFileAction(int index);
 	void createPOIFilesActions();
@ -81,7 +90,7 @@ private:

 	bool openPOIFile(const QString &fileName);
 	bool loadFile(const QString &fileName);
-	void saveFile(const QString &fileName);
+	void exportFile(const QString &fileName);
 	void updateStatusBarInfo();
 	void updateWindowTitle();
 	void updateNavigationActions();
@ -115,8 +124,8 @@ private:
 	QAction *_dataSourcesAction;
 	QAction *_aboutAction;
 	QAction *_aboutQtAction;
-	QAction *_saveFileAction;
-	QAction *_saveAsAction;
+	QAction *_printFileAction;
+	QAction *_exportFileAction;
 	QAction *_openFileAction;
 	QAction *_closeFileAction;
 	QAction *_reloadFileAction;
@ -145,27 +154,33 @@ private:
 	QLabel *_distanceLabel;
 	QLabel *_timeLabel;

+	TrackView *_track;
 	ElevationGraph *_elevationGraph;
 	SpeedGraph *_speedGraph;
 	HeartRateGraph *_heartRateGraph;
-	TrackView *_track;
+	QList<GraphTab> _tabs;

 	POI _poi;
 	QList<Map*> _maps;

 	FileBrowser *_browser;
 	QList<QString> _files;
-	QString _saveFileName;
 	Map *_currentMap;

+	int _trackCount;
 	qreal _distance;
 	qreal _time;
-	int _trackCount;
+	DateRange _dateRange;

 	qreal _sliderPos;

 	int _frameStyle;
 	bool _showGraphs;
+
+	QString _exportFileName;
+	QPrinter::PaperSize _exportPaperSize;
+	QPrinter::Orientation _exportOrientation;
+	MarginsF _exportMargins;
 };

 #endif // GUI_H
--- a/src/icons.h
+++ b/src/icons.h
@ -3,8 +3,8 @@

 #define APP_ICON         ":/icons/gpxsee.png"
 #define OPEN_FILE_ICON   ":/icons/document-open.png"
-#define SAVE_FILE_ICON   ":/icons/document-save.png"
-#define SAVE_AS_ICON     ":/icons/document-save-as.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"
--- a/src/infoitem.h
+++ b/src/infoitem.h
@ -15,6 +15,7 @@ public:

 	void insert(const QString &key, const QString &value);
 	void clear();
+	bool isEmpty() {return _list.isEmpty();}

 private:
 	void updateBoundingRect();
--- a/src/keys.h
+++ b/src/keys.h
@ -12,10 +12,9 @@

 #define QUIT_SHORTCUT         QKeySequence::Quit
 #define OPEN_SHORTCUT         QKeySequence::Open
-#define SAVE_SHORTCUT         QKeySequence::Save
-#define SAVE_AS_SHORTCUT      QKeySequence::SaveAs
 #define CLOSE_SHORTCUT        QKeySequence::Close
 #define RELOAD_SHORTCUT       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
--- a/src/map.cpp
+++ b/src/map.cpp
@ -25,29 +25,26 @@ void Map::emitLoaded()
 	emit loaded();
 }

-void Map::loadTiles(QList<Tile> &list)
+void Map::loadTiles(QList<Tile> &list, bool block)
+{
+	if (block)
+		loadTilesSync(list);
+	else
+		loadTilesAsync(list);
+}
+
+void Map::loadTilesAsync(QList<Tile> &list)
 {
 	QList<Download> dl;

-	for (int i = 0; i < list.size(); ++i) {
+	for (int i = 0; i < list.size(); i++) {
 		Tile &t = list[i];
-		QString file = TILES_DIR + QString("/%1/%2-%3-%4")
-		  .arg(_name).arg(t.zoom()).arg(t.xy().rx()).arg(t.xy().ry());
+		QString file = tileFile(t);
 		QFileInfo fi(file);

-		if (fi.exists()) {
-			if (!t.pixmap().load(file))
-				fprintf(stderr, "Error loading map tile: %s\n",
-				  qPrintable(file));
-		} else {
-			t.pixmap() = QPixmap(TILE_SIZE, TILE_SIZE);
-			t.pixmap().fill();
-
-			QString url(_url);
-			url.replace("$z", QString::number(t.zoom()));
-			url.replace("$x", QString::number(t.xy().x()));
-			url.replace("$y", QString::number(t.xy().y()));
-			dl.append(Download(url, file));
+		if (!(fi.exists() && loadTileFile(t, file))) {
+			fillTile(t);
+			dl.append(Download(tileUrl(t), file));
 		}
 	}

@ -55,6 +52,75 @@ void Map::loadTiles(QList<Tile> &list)
 		Downloader::instance().get(dl);
 }

+void Map::loadTilesSync(QList<Tile> &list)
+{
+	QList<Download> dl;
+
+	for (int i = 0; i < list.size(); i++) {
+		Tile &t = list[i];
+		QString file = tileFile(t);
+		QFileInfo fi(file);
+
+		if (!(fi.exists() && loadTileFile(t, file)))
+			dl.append(Download(tileUrl(t), file));
+	}
+
+	if (dl.empty())
+		return;
+
+	QEventLoop wait;
+	connect(&Downloader::instance(), SIGNAL(finished()), &wait, SLOT(quit()));
+	if (Downloader::instance().get(dl))
+		wait.exec();
+
+	for (int i = 0; i < list.size(); i++) {
+		Tile &t = list[i];
+
+		if (t.pixmap().isNull()) {
+			QString file = tileFile(t);
+			QFileInfo fi(file);
+
+			if (!(fi.exists() && loadTileFile(t, file)))
+				fillTile(t);
+		}
+	}
+}
+
+void Map::fillTile(Tile &tile)
+{
+	tile.pixmap() = QPixmap(TILE_SIZE, TILE_SIZE);
+	tile.pixmap().fill();
+}
+
+bool Map::loadTileFile(Tile &tile, const QString &file)
+{
+	if (!tile.pixmap().load(file)) {
+		fprintf(stderr, "%s: error loading tile file\n", qPrintable(file));
+		return false;
+	}
+
+	return true;
+}
+
+QString Map::tileUrl(const Tile &tile)
+{
+	QString url(_url);
+
+	url.replace("$z", QString::number(tile.zoom()));
+	url.replace("$x", QString::number(tile.xy().x()));
+	url.replace("$y", QString::number(tile.xy().y()));
+
+	return url;
+}
+
+QString Map::tileFile(const Tile &tile)
+{
+	QString file = TILES_DIR + QString("/%1/%2-%3-%4").arg(_name)
+	  .arg(tile.zoom()).arg(tile.xy().x()).arg(tile.xy().y());
+
+	return file;
+}
+
 void Map::clearCache()
 {
 	QString path = TILES_DIR + QString("/") + _name;
--- a/src/map.h
+++ b/src/map.h
@ -10,7 +10,7 @@ public:
 		{_xy = xy; _zoom = zoom;}

 	int zoom() const {return _zoom;}
-	QPoint& xy() {return _xy;}
+	const QPoint& xy() const {return _xy;}
 	QPixmap& pixmap() {return _pixmap;}

 private:
@ -29,7 +29,7 @@ public:
 	  const QString &url = QString());

 	const QString &name() const {return _name;}
-	void loadTiles(QList<Tile> &list);
+	void loadTiles(QList<Tile> &list, bool block);
 	void clearCache();

 signals:
@ -39,6 +39,14 @@ private slots:
 	void emitLoaded();

 private:
+	QString tileUrl(const Tile &tile);
+	QString tileFile(const Tile &tile);
+	bool loadTileFile(Tile &tile, const QString &file);
+	void fillTile(Tile &tile);
+
+	void loadTilesAsync(QList<Tile> &list);
+	void loadTilesSync(QList<Tile> &list);
+
 	QString _name;
 	QString _url;
 };
--- a/src/margins.cpp
+++ b/src/margins.cpp
@ -0,0 +1,9 @@
+#include "margins.h"
+
+
+QDebug operator<<(QDebug dbg, const MarginsF &margins)
+{
+	dbg.nospace() << "MarginsF(" << margins.left() << ", " << margins.top()
+	  << ", " << margins.right() << margins.bottom() << ")";
+	return dbg.maybeSpace();
+}
--- a/src/margins.h
+++ b/src/margins.h
@ -0,0 +1,30 @@
+#ifndef MARGINS_H
+#define MARGINS_H
+
+#include <QtGlobal>
+#include <QDebug>
+
+class MarginsF
+{
+public:
+	MarginsF() {_left = 0; _top = 0; _right = 0; _bottom = 0;}
+	MarginsF(qreal left, qreal top, qreal right, qreal bottom)
+	  {_left = left, _top = top; _right = right; _bottom = bottom;}
+
+	qreal left() const {return _left;}
+	qreal top() const {return _top;}
+	qreal right() const {return _right;}
+	qreal bottom() const {return _bottom;}
+
+	qreal &rleft() {return _left;}
+	qreal &rtop() {return _top;}
+	qreal &rright() {return _right;}
+	qreal &rbottom() {return _bottom;}
+
+private:
+	qreal _left, _top, _right, _bottom;
+};
+
+QDebug operator<<(QDebug dbg, const MarginsF &margins);
+
+#endif // MARGINS_H
--- a/src/scaleitem.cpp
+++ b/src/scaleitem.cpp
@ -67,14 +67,12 @@ void ScaleItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
 	for (int i = 0; i < SEGMENTS; i += 2)
 		painter->fillRect(QRectF(i * _width, br.height() + PADDING, _width,
 		  SCALE_HEIGHT), Qt::black);
-
-	if (aa)
-		painter->setRenderHint(QPainter::Antialiasing, true);
-
 /*
 	painter->setPen(Qt::red);
 	painter->drawRect(boundingRect());
 */
+	if (aa)
+		painter->setRenderHint(QPainter::Antialiasing, true);
 }

 QString ScaleItem::units() const
--- a/src/trackinfo.cpp
+++ b/src/trackinfo.cpp
@ -0,0 +1,40 @@
+#include <QPaintEngine>
+#include <QPaintDevice>
+#include "config.h"
+#include "infoitem.h"
+#include "trackinfo.h"
+
+
+TrackInfo::TrackInfo(QObject *parent) : QGraphicsScene(parent)
+{
+	_info = new InfoItem();
+	addItem(_info);
+}
+
+void TrackInfo::insert(const QString &key, const QString &value)
+{
+	_info->insert(key, value);
+}
+
+void TrackInfo::plot(QPainter *painter, const QRectF &target)
+{
+	qreal ratio = painter->paintEngine()->paintDevice()->logicalDpiX()
+	  / SCREEN_DPI;
+	QSizeF canvas = QSizeF(target.width() / ratio, target.height() / ratio);
+	QSizeF diff = QSizeF(qAbs(canvas.width() - sceneRect().width()),
+	  qAbs(canvas.height() - sceneRect().height()));
+	QRectF adj = sceneRect().adjusted(0, -diff.height()/2, diff.width(),
+	  diff.height()/2);
+
+	render(painter, target, adj);
+}
+
+bool TrackInfo::isEmpty() const
+{
+	return _info->isEmpty();
+}
+
+QSizeF TrackInfo::contentSize() const
+{
+	return sceneRect().size();
+}
--- a/src/trackinfo.h
+++ b/src/trackinfo.h
@ -0,0 +1,24 @@
+#ifndef TRACKINFO_H
+#define TRACKINFO_H
+
+#include <QGraphicsScene>
+
+class InfoItem;
+
+class TrackInfo : public QGraphicsScene
+{
+	Q_OBJECT
+
+public:
+	TrackInfo(QObject *parent = 0);
+
+	void insert(const QString &key, const QString &value);
+	void plot(QPainter *painter, const QRectF &target);
+	bool isEmpty() const;
+	QSizeF contentSize() const;
+
+private:
+	InfoItem *_info;
+};
+
+#endif // TRACKINFO_H
--- a/src/trackview.cpp
+++ b/src/trackview.cpp
@ -36,11 +36,14 @@ TrackView::TrackView(QWidget *parent)
 	_map = 0;
 	_maxPath = 0;
 	_maxDistance = 0;
+
+	_plot = false;
 }

 TrackView::~TrackView()
 {
-	delete _scene;
+	if (_mapScale->scene() != _scene)
+		delete _mapScale;
 }

 void TrackView::addTrack(const QVector<QPointF> &track)
@ -294,7 +297,8 @@ void TrackView::setMap(Map *map)
 {
 	_map = map;
 	if (_map)
-		connect(_map, SIGNAL(loaded()), this, SLOT(redraw()));
+		connect(_map, SIGNAL(loaded()), this, SLOT(redraw()),
+		  Qt::UniqueConnection);
 	resetCachedContent();
 }

@ -342,48 +346,38 @@ void TrackView::wheelEvent(QWheelEvent *event)
 	resetCachedContent();
 }

-void TrackView::setTrackLineWidth(qreal width)
-{
-	for (int i = 0; i < _paths.size(); i++) {
-		QPen pen(_paths.at(i)->pen());
-		pen.setWidthF(width);
-		_paths.at(i)->setPen(pen);
-	}
-}
-
 void TrackView::plot(QPainter *painter, const QRectF &target)
 {
-	QRectF orig, adj;
+	QRect orig, adj;
 	qreal ratio, diff;

-	_scene->removeItem(_mapScale);
-	orig = _scene->itemsBoundingRect().adjusted(0, 0, 0,
-	  _mapScale->boundingRect().height());
-	_scene->addItem(_mapScale);

-	if (target.width()/target.height() > orig.width()/orig.height()) {
-		ratio = target.width()/target.height();
-		diff = qAbs((orig.height() * ratio) - orig.width());
-		adj = orig.adjusted(-diff/2, 0, diff/2, 0);
-	} else {
+	orig = viewport()->rect();
+
+	if (orig.height() * (target.width() / target.height()) - orig.width() < 0) {
 		ratio = target.height()/target.width();
-		diff = fabs((orig.width() * ratio) - orig.height());
+		diff = (orig.width() * ratio) - orig.height();
 		adj = orig.adjusted(0, -diff/2, 0, diff/2);
+	} else {
+		ratio = target.width() / target.height();
+		diff = (orig.height() * ratio) - orig.width();
+		adj = orig.adjusted(-diff/2, 0, diff/2, 0);
 	}

-	_mapScale->setPos(adj.bottomRight()
-	  + QPoint(-_mapScale->boundingRect().width(),
-	  -_mapScale->boundingRect().height()));
+	setUpdatesEnabled(false);
+	_plot = true;

-	setTrackLineWidth(0);
-	_scene->render(painter, target, adj);
-	setTrackLineWidth(TRACK_WIDTH * _scale);
-}
+	QPointF pos = _mapScale->pos();
+	_mapScale->setPos(mapToScene(QPoint(adj.bottomRight() + QPoint(
+	  -(SCALE_OFFSET + _mapScale->boundingRect().width()),
+	  -(SCALE_OFFSET + _mapScale->boundingRect().height())))));

-enum QPrinter::Orientation TrackView::orientation() const
-{
-	return (sceneRect().width() > sceneRect().height())
-		? QPrinter::Landscape : QPrinter::Portrait;
+	render(painter, target, adj);
+
+	_mapScale->setPos(pos);
+
+	_plot = false;
+	setUpdatesEnabled(true);
 }

 void TrackView::clearPOI()
@ -439,18 +433,17 @@ void TrackView::movePositionMarker(qreal val)

 void TrackView::drawBackground(QPainter *painter, const QRectF &rect)
 {
-	if ((_paths.isEmpty() && _locations.isEmpty())|| !_map) {
+	if ((_paths.isEmpty() && _locations.isEmpty()) || !_map) {
 		painter->fillRect(rect, Qt::white);
 		return;
 	}

-	painter->setWorldMatrixEnabled(false);
-
 	QRectF rr(rect.topLeft() * _scale, rect.size());
 	QPoint tile = mercator2tile(QPointF(rr.topLeft().x(), -rr.topLeft().y()),
 	  _zoom);
 	QPointF tm = tile2mercator(tile, _zoom);
-	QPoint tl = mapFromScene(QPointF(tm.x() / _scale, -tm.y() / _scale));
+	QPoint tl = mapToScene(mapFromScene(QPointF(tm.x() / _scale,
+	  -tm.y() / _scale))).toPoint();

 	QList<Tile> tiles;
 	for (int i = 0; i <= rr.size().width() / TILE_SIZE + 1; i++) {
@ -459,12 +452,12 @@ void TrackView::drawBackground(QPainter *painter, const QRectF &rect)
 		}
 	}

-	_map->loadTiles(tiles);
+	_map->loadTiles(tiles, _plot);

 	for (int i = 0; i < tiles.count(); i++) {
 		Tile &t = tiles[i];
-		QPoint tp(tl.x() + (t.xy().rx() - tile.rx()) * TILE_SIZE,
-		  tl.y() + (t.xy().ry() - tile.ry()) * TILE_SIZE);
+		QPoint tp(tl.x() + (t.xy().x() - tile.x()) * TILE_SIZE,
+		  tl.y() + (t.xy().y() - tile.y()) * TILE_SIZE);
 		painter->drawPixmap(tp, t.pixmap());
 	}
 }
@ -496,9 +489,10 @@ void TrackView::resizeEvent(QResizeEvent *e)

 void TrackView::paintEvent(QPaintEvent *e)
 {
-	QPointF scenePos = mapToScene(rect().bottomLeft() + QPoint(SCALE_OFFSET,
+	QPointF scenePos = mapToScene(rect().bottomRight() + QPoint(
+	  -(SCALE_OFFSET + _mapScale->boundingRect().width()),
 	  -(SCALE_OFFSET + _mapScale->boundingRect().height())));
-	if (_mapScale->pos() != scenePos)
+	if (_mapScale->pos() != scenePos && !_plot)
 		_mapScale->setPos(scenePos);

 	QGraphicsView::paintEvent(e);
--- a/src/trackview.h
+++ b/src/trackview.h
@ -5,7 +5,6 @@
 #include <QVector>
 #include <QHash>
 #include <QList>
-#include <QPrinter>
 #include "units.h"
 #include "palette.h"
 #include "waypoint.h"
@ -35,7 +34,6 @@ public:
 	void setUnits(enum Units units);

 	void plot(QPainter *painter, const QRectF &target);
-	enum QPrinter::Orientation orientation() const;

 	int trackCount() const {return _paths.count();}
 	int waypointCount() const {return _locations.count();}
@ -57,9 +55,6 @@ private:
 	void rescale(qreal scale);
 	void rescale();

-	void showMarkers(bool show);
-	void setTrackLineWidth(qreal width);
-
 	void wheelEvent(QWheelEvent *event);
 	void drawBackground(QPainter *painter, const QRectF &rect);
 	void resizeEvent(QResizeEvent *e);
@ -81,6 +76,8 @@ private:

 	qreal _scale;
 	int _zoom;
+
+	bool _plot;
 };

 #endif // TRACKVIEW_H
--- a/src/units.h
+++ b/src/units.h
@ -12,13 +12,14 @@ enum Units {
 #define MS2KMH  3.600000000000  // m/s -> km/h
 #define MS2MIH  2.236936290000  // m/s -> mi/h
 #define FT2MI   0.000189393939  // ft -> mi
+#define MM2IN   0.039370100000  // mm -> in

 #define KMINM   1000     // 1 km in m
 #define MIINFT  5280     // 1 mi in ft
 #define MIINM   1609.344 // 1mi in m

 #ifdef Q_OS_WIN32
-#define UNIT_SPACE     " "
+#define UNIT_SPACE     QString(" ")
 #else // Q_OS_WIN32
 #define UNIT_SPACE     QString::fromUtf8("\xE2\x80\x89")
 #endif // Q_OS_WIN32
Author	SHA1	Message	Date
Martin Tůma	35dea229b4	Fixed printing on Windows XP	2016-05-29 19:35:38 +02:00
Martin Tůma	330b6547c4	Some more PDF export dialog polishing	2016-05-28 07:39:40 +02:00
Martin Tůma	498d33b77d	PDF export dialog polishing	2016-05-27 22:45:58 +02:00
Martin Tůma	3592d9e68f	Some more PDF info	2016-05-26 00:57:27 +02:00
Martin Tůma	7d38b55f60	Remove the PDF export dialog window superfluous "Help" button on Windows	2016-05-26 00:24:19 +02:00
Martin Tůma	82df1bec0e	Improved PDF export dialog	2016-05-25 23:27:07 +02:00
Martin Tůma	82cbbbb52a	Added basic PDF export settings	2016-05-24 03:01:22 +02:00
Martin Tůma	b8e404b789	Plots are now paper size agnostic	2016-05-22 15:47:23 +02:00
Martin Tůma	2ad94947d7	Make the file info and graph info having the same text size in plots.	2016-05-22 11:54:27 +02:00
Martin Tůma	b713da0012	Fixed QT4 compile issue	2016-05-21 16:18:48 +02:00
Martin Tůma	daf4ef894c	Yet another bunch of print/PDF export improvements	2016-05-21 16:10:24 +02:00
Martin Tůma	eae8e23c6c	Yet another print/pdf export fix	2016-05-21 00:28:06 +02:00
Martin Tůma	b9f7af33d7	Fixed graph shrinking on export/print	2016-05-20 23:47:37 +02:00
Martin Tůma	f334901db3	Print/pdf export related cosmetics	2016-05-20 22:44:03 +02:00
Martin Tůma	ffcba53b91	Added proper tile download for PDF exports/printing	2016-05-19 01:10:40 +02:00
Martin Tůma	f326c7e002	Added missing string localization Code cleanup	2016-05-18 22:25:55 +02:00
Martin Tůma	15d4bd05f9	Keep the toolbar small	2016-05-17 00:45:49 +02:00
Martin Tůma	43bc7dd682	System defined toolbar style does't seem to be a that good idea...	2016-05-15 22:50:44 +02:00
Martin Tůma	a8cc02c1f9	Version++	2016-05-15 22:40:49 +02:00
Martin Tůma	511deada2e	Added printing support "Save" is now "Export"	2016-05-15 22:38:15 +02:00
Martin Tůma	36937d8f2d	Added support for maps in PDF export	2016-05-15 13:19:07 +02:00
Martin Tůma	969d87ec51	Improved toolbar style handling	2016-05-14 09:28:56 +02:00
Martin Tůma	07255aa8ae	Some more code cleanup	2016-05-13 18:48:42 +02:00
Martin Tůma	e73f9448e9	Fixed plot region	2016-05-12 09:09:14 +02:00
Martin Tůma	ee9a8df51f	Code cleanup	2016-05-12 09:03:05 +02:00
Martin Tůma	dcdd250858	Improved packaging scripts	2016-05-05 22:28:53 +02:00
Martin Tůma	6f73740da6	Program version (and some other stuff) now added by qmake.	2016-05-04 18:25:52 +02:00