Use the propper array delete operator

(Use the common logic in the Track class instead)

.appveyor.yml

@@ -1,4 +1,4 @@
-version: 7.32.{build}
+version: 7.36.{build}
 
 configuration:
   - Release

README.md

@@ -9,7 +9,7 @@ GPXSee is a Qt-based GPS log file viewer and analyzer that supports all common G
 * Support for DEM files (SRTM HGT).
 * Support for multiple tracks in one view.
 * Support for POI files.
-* Print/export to PDF.
+* Print/export to PDF/PNG.
 * Full-screen mode.
 * HiDPI/Retina displays & maps support.
 * Native GUI for Windows, Mac OS X and Linux.

gpxsee.pro

@@ -3,7 +3,7 @@ unix:!macx {
 } else {
     TARGET = GPXSee
 }
-VERSION = 7.32
+VERSION = 7.36
 
 QT += core \
     gui \
@@ -21,6 +21,7 @@ INCLUDEPATH += ./src
 HEADERS += src/common/config.h \
     src/GUI/graphicsscene.h \
     src/GUI/mapaction.h \
+    src/GUI/marginswidget.h \
     src/GUI/popup.h \
     src/common/garmin.h \
     src/common/staticassert.h \
@@ -53,7 +54,6 @@ HEADERS += src/common/config.h \
     src/GUI/palette.h \
     src/GUI/heartrategraph.h \
     src/GUI/trackinfo.h \
-    src/GUI/exportdialog.h \
     src/GUI/fileselectwidget.h \
     src/GUI/margins.h \
     src/GUI/temperaturegraph.h \
@@ -93,8 +93,10 @@ HEADERS += src/common/config.h \
     src/map/IMG/bitstream.h \
     src/map/IMG/deltastream.h \
     src/map/IMG/gmap.h \
+    src/map/IMG/huffmanbuffer.h \
     src/map/IMG/huffmanstream.h \
     src/map/IMG/huffmantable.h \
+    src/map/IMG/huffmantext.h \
     src/map/IMG/nodfile.h \
     src/map/IMG/mapdata.h \
     src/map/IMG/rastertile.h \
@@ -198,8 +200,11 @@ HEADERS += src/common/config.h \
     src/data/cupparser.h \
     src/data/gpiparser.h \
     src/data/address.h \
-    src/data/smlparser.h
+    src/data/smlparser.h \
+    src/GUI/pdfexportdialog.h \
+    src/GUI/pngexportdialog.h
 SOURCES += src/main.cpp \
+    src/GUI/marginswidget.cpp \
     src/GUI/popup.cpp \
     src/common/coordinates.cpp \
     src/common/rectc.cpp \
@@ -224,7 +229,6 @@ SOURCES += src/main.cpp \
     src/GUI/palette.cpp \
     src/GUI/heartrategraph.cpp \
     src/GUI/trackinfo.cpp \
-    src/GUI/exportdialog.cpp \
     src/GUI/fileselectwidget.cpp \
     src/GUI/temperaturegraph.cpp \
     src/GUI/trackitem.cpp \
@@ -256,8 +260,10 @@ SOURCES += src/main.cpp \
     src/map/IMG/bitstream.cpp \
     src/map/IMG/deltastream.cpp \
     src/map/IMG/gmap.cpp \
+    src/map/IMG/huffmanbuffer.cpp \
     src/map/IMG/huffmanstream.cpp \
     src/map/IMG/huffmantable.cpp \
+    src/map/IMG/huffmantext.cpp \
     src/map/IMG/nodfile.cpp \
     src/map/IMG/mapdata.cpp \
     src/map/IMG/rastertile.cpp \
@@ -344,7 +350,9 @@ SOURCES += src/main.cpp \
     src/data/cupparser.cpp \
     src/GUI/graphicsscene.cpp \
     src/data/gpiparser.cpp \
-    src/data/smlparser.cpp
+    src/data/smlparser.cpp \
+    src/GUI/pdfexportdialog.cpp \
+    src/GUI/pngexportdialog.cpp
 
 greaterThan(QT_MAJOR_VERSION, 4) {
     HEADERS += src/data/geojsonparser.h

gpxsee.qrc

@@ -67,10 +67,12 @@
 		<file alias="cinema-11.png">icons/POI/cinema-11.png</file>
 		<file alias="clothing-store-11.png">icons/POI/clothing-store-11.png</file>
 		<file alias="communications-tower-11.png">icons/POI/communications-tower-11.png</file>
+		<file alias="convenience-11.png">icons/POI/convenience-11.png</file>
 		<file alias="dam-11.png">icons/POI/dam-11.png</file>
 		<file alias="danger-11.png">icons/POI/danger-11.png</file>
 		<file alias="drinking-water-11.png">icons/POI/drinking-water-11.png</file>
 		<file alias="fast-food-11.png">icons/POI/fast-food-11.png</file>
+		<file alias="entrance-alt1-11.png">icons/POI/entrance-alt1-11.png</file>
 		<file alias="fire-station-11.png">icons/POI/fire-station-11.png</file>
 		<file alias="fitness-centre-11.png">icons/POI/fitness-centre-11.png</file>
 		<file alias="fuel-11.png">icons/POI/fuel-11.png</file>
@@ -97,7 +99,6 @@
 		<file alias="place-of-worship-11.png">icons/POI/place-of-worship-11.png</file>
 		<file alias="police-11.png">icons/POI/police-11.png</file>
 		<file alias="post-11.png">icons/POI/post-11.png</file>
-		<file alias="prison-11.png">icons/POI/prison-11.png</file>
 		<file alias="religious-christian-11.png">icons/POI/religious-christian-11.png</file>
 		<file alias="religious-jewish-11.png">icons/POI/religious-jewish-11.png</file>
 		<file alias="religious-muslim-11.png">icons/POI/religious-muslim-11.png</file>

lang/gpxsee_cs.ts

@@ -204,106 +204,6 @@
         <translation>Minimum</translation>
     </message>
 </context>
-<context>
-    <name>ExportDialog</name>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="135"/>
-        <source>Export to PDF</source>
-        <translation>Exportovat do PDF</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="52"/>
-        <source>Portrait</source>
-        <translation>Na výšku</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="53"/>
-        <source>Landscape</source>
-        <translation>Na šířku</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="97"/>
-        <source>Page size:</source>
-        <translation>Velikost stránky:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="99"/>
-        <source>Orientation:</source>
-        <translation>Orientace:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="94"/>
-        <source>Page Setup</source>
-        <translation>Nastavení stránky</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="25"/>
-        <source>PDF files</source>
-        <translation>Soubory PDF</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="25"/>
-        <source>All files</source>
-        <translation>Všechny soubory</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="66"/>
-        <source>in</source>
-        <translation>in</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="66"/>
-        <source>mm</source>
-        <translation>mm</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="98"/>
-        <source>Resolution:</source>
-        <translation>Rozlišení:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="100"/>
-        <source>Margins:</source>
-        <translation>Okraje:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="106"/>
-        <source>File:</source>
-        <translation>Soubor:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="113"/>
-        <source>Output file</source>
-        <translation>Výstupní soubor</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="120"/>
-        <source>Export</source>
-        <translation>Exportovat</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="142"/>
-        <location filename="../src/GUI/exportdialog.cpp" line="152"/>
-        <location filename="../src/GUI/exportdialog.cpp" line="157"/>
-        <source>Error</source>
-        <translation>Chyba</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="142"/>
-        <source>No output file selected.</source>
-        <translation>Nebyl zvolen žádný výstupní soubor.</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="152"/>
-        <source>%1 is a directory.</source>
-        <translation>%1 je adresář.</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="157"/>
-        <source>%1 is not writable.</source>
-        <translation>%1 nelze zapsat.</translation>
-    </message>
-</context>
 <context>
     <name>FileSelectWidget</name>
     <message>
@@ -311,6 +211,21 @@
         <source>Select file</source>
         <translation>Vybrat soubor</translation>
     </message>
+    <message>
+        <location filename="../src/GUI/fileselectwidget.cpp" line="48"/>
+        <source>No output file selected.</source>
+        <translation>Nebyl zvolen žádný výstupní soubor.</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/fileselectwidget.cpp" line="58"/>
+        <source>%1 is a directory.</source>
+        <translation>%1 je adresář.</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/fileselectwidget.cpp" line="62"/>
+        <source>%1 is not writable.</source>
+        <translation>%1 nelze zapsat.</translation>
+    </message>
 </context>
 <context>
     <name>Format</name>
@@ -346,12 +261,12 @@
 <context>
     <name>GUI</name>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="748"/>
+        <location filename="../src/GUI/gui.cpp" line="756"/>
         <source>Open file</source>
         <translation>Otevřít soubor</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="859"/>
+        <location filename="../src/GUI/gui.cpp" line="867"/>
         <source>Open POI file</source>
         <translation>Otevřít POI soubor</translation>
     </message>
@@ -362,58 +277,58 @@
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="214"/>
-        <location filename="../src/GUI/gui.cpp" line="691"/>
-        <location filename="../src/GUI/gui.cpp" line="692"/>
+        <location filename="../src/GUI/gui.cpp" line="699"/>
+        <location filename="../src/GUI/gui.cpp" line="700"/>
         <source>Keyboard controls</source>
         <translation>Ovládací klávesy</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="240"/>
+        <location filename="../src/GUI/gui.cpp" line="247"/>
         <source>Close</source>
         <translation>Zavřít</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="246"/>
+        <location filename="../src/GUI/gui.cpp" line="253"/>
         <source>Reload</source>
         <translation>Znovu načíst</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="596"/>
+        <location filename="../src/GUI/gui.cpp" line="604"/>
         <source>Show</source>
         <translation>Zobrazit</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="588"/>
+        <location filename="../src/GUI/gui.cpp" line="596"/>
         <source>File</source>
         <translation>Soubor</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="265"/>
+        <location filename="../src/GUI/gui.cpp" line="272"/>
         <source>Close POI files</source>
         <translation>Zavřit POI soubory</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="269"/>
+        <location filename="../src/GUI/gui.cpp" line="276"/>
         <source>Overlap POIs</source>
         <translation>Překrývat POI</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="274"/>
+        <location filename="../src/GUI/gui.cpp" line="281"/>
         <source>Show POI labels</source>
         <translation>Zobrazit názvy POI</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="279"/>
+        <location filename="../src/GUI/gui.cpp" line="286"/>
         <source>Show POIs</source>
         <translation>Zobrazit POI</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="290"/>
+        <location filename="../src/GUI/gui.cpp" line="297"/>
         <source>Show map</source>
         <translation>Zobrazit mapu</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="303"/>
+        <location filename="../src/GUI/gui.cpp" line="310"/>
         <source>Clear tile cache</source>
         <translation>Vymazat mezipaměť dlaždic</translation>
     </message>
@@ -424,349 +339,354 @@
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="211"/>
-        <location filename="../src/GUI/gui.cpp" line="725"/>
-        <location filename="../src/GUI/gui.cpp" line="726"/>
+        <location filename="../src/GUI/gui.cpp" line="733"/>
+        <location filename="../src/GUI/gui.cpp" line="734"/>
         <source>Paths</source>
         <translation>Cesty</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="253"/>
+        <location filename="../src/GUI/gui.cpp" line="241"/>
+        <source>Export to PNG...</source>
+        <translation>Exportovat do PNG...</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/gui.cpp" line="260"/>
         <source>Statistics...</source>
         <translation>Statistika...</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="261"/>
+        <location filename="../src/GUI/gui.cpp" line="268"/>
         <source>Load POI file...</source>
         <translation>Nahrát POI soubor...</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="299"/>
+        <location filename="../src/GUI/gui.cpp" line="306"/>
         <source>Load map...</source>
         <translation>Nahrát mapu...</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="308"/>
-        <location filename="../src/GUI/gui.cpp" line="313"/>
-        <location filename="../src/GUI/gui.cpp" line="708"/>
+        <location filename="../src/GUI/gui.cpp" line="315"/>
+        <location filename="../src/GUI/gui.cpp" line="320"/>
+        <location filename="../src/GUI/gui.cpp" line="716"/>
         <source>Next map</source>
         <translation>Následující mapa</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="318"/>
+        <location filename="../src/GUI/gui.cpp" line="325"/>
         <source>Show cursor coordinates</source>
         <translation>Zobrazit souřadnice kurzoru</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="325"/>
+        <location filename="../src/GUI/gui.cpp" line="332"/>
         <source>Show tracks</source>
         <translation>Zobrazit cesty</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="330"/>
+        <location filename="../src/GUI/gui.cpp" line="337"/>
         <source>Show routes</source>
         <translation>Zobrazit trasy</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="335"/>
+        <location filename="../src/GUI/gui.cpp" line="342"/>
         <source>Show waypoints</source>
         <translation>Zobrazit navigační body</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="340"/>
+        <location filename="../src/GUI/gui.cpp" line="347"/>
         <source>Show areas</source>
         <translation>Zobrazit plochy</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="345"/>
+        <location filename="../src/GUI/gui.cpp" line="352"/>
         <source>Waypoint labels</source>
         <translation>Názvy navigačních bodů</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="355"/>
+        <location filename="../src/GUI/gui.cpp" line="362"/>
         <source>km/mi markers</source>
         <translation>Kilometrovníky</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="362"/>
+        <location filename="../src/GUI/gui.cpp" line="369"/>
         <source>Show graphs</source>
         <translation>Zobrazit grafy</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="386"/>
+        <location filename="../src/GUI/gui.cpp" line="393"/>
         <source>Show grid</source>
         <translation>Zobrazit mřížku</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="391"/>
+        <location filename="../src/GUI/gui.cpp" line="398"/>
         <source>Show slider info</source>
         <translation>Zobrazit informace o posuvníku</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="396"/>
+        <location filename="../src/GUI/gui.cpp" line="403"/>
         <source>Show path markers</source>
         <translation>Zobrazit pozici na trase</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="403"/>
+        <location filename="../src/GUI/gui.cpp" line="410"/>
         <source>Show toolbars</source>
         <translation>Zobrazovat nástrojové lišty</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="410"/>
+        <location filename="../src/GUI/gui.cpp" line="417"/>
         <source>Total time</source>
         <translation>Celkový čas</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="416"/>
-        <location filename="../src/GUI/gui.cpp" line="1086"/>
-        <location filename="../src/GUI/gui.cpp" line="1152"/>
+        <location filename="../src/GUI/gui.cpp" line="423"/>
+        <location filename="../src/GUI/gui.cpp" line="1131"/>
+        <location filename="../src/GUI/gui.cpp" line="1198"/>
         <source>Moving time</source>
         <translation>Čistý čas</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="424"/>
+        <location filename="../src/GUI/gui.cpp" line="431"/>
         <source>Metric</source>
         <translation>Metrické</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="430"/>
+        <location filename="../src/GUI/gui.cpp" line="437"/>
         <source>Imperial</source>
         <translation>Imperiální</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="436"/>
+        <location filename="../src/GUI/gui.cpp" line="443"/>
         <source>Nautical</source>
         <translation>Námořní</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="444"/>
+        <location filename="../src/GUI/gui.cpp" line="451"/>
         <source>Decimal degrees (DD)</source>
         <translation>Desetinné stupně (DD)</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="450"/>
+        <location filename="../src/GUI/gui.cpp" line="457"/>
         <source>Degrees and decimal minutes (DMM)</source>
         <translation>Stupně a desetinné minuty (DMM)</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="457"/>
+        <location filename="../src/GUI/gui.cpp" line="464"/>
         <source>Degrees, minutes, seconds (DMS)</source>
         <translation>Stupně, minuty, vteřiny (DMS)</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="463"/>
+        <location filename="../src/GUI/gui.cpp" line="470"/>
         <source>Fullscreen mode</source>
         <translation>Celoobrazovkový režim</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="470"/>
+        <location filename="../src/GUI/gui.cpp" line="477"/>
         <source>Options...</source>
         <translation>Nastavení...</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="476"/>
+        <location filename="../src/GUI/gui.cpp" line="483"/>
         <source>Next</source>
         <translation>Následující</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="480"/>
+        <location filename="../src/GUI/gui.cpp" line="487"/>
         <source>Previous</source>
         <translation>Předchozí</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="484"/>
+        <location filename="../src/GUI/gui.cpp" line="491"/>
         <source>Last</source>
         <translation>Poslední</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="488"/>
+        <location filename="../src/GUI/gui.cpp" line="495"/>
         <source>First</source>
         <translation>První</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="532"/>
+        <location filename="../src/GUI/gui.cpp" line="540"/>
         <source>POI files</source>
         <translation>POI soubory</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="544"/>
+        <location filename="../src/GUI/gui.cpp" line="552"/>
         <source>Display</source>
         <translation>Zobrazit</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="558"/>
+        <location filename="../src/GUI/gui.cpp" line="566"/>
         <source>Units</source>
         <translation>Jednotky</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="562"/>
+        <location filename="../src/GUI/gui.cpp" line="570"/>
         <source>Coordinates format</source>
         <translation>Formát souřadnic</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="670"/>
+        <location filename="../src/GUI/gui.cpp" line="678"/>
         <source>Version %1</source>
         <translation>Verze %1</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="674"/>
+        <location filename="../src/GUI/gui.cpp" line="682"/>
         <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 %1.</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 %1.</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="701"/>
+        <location filename="../src/GUI/gui.cpp" line="709"/>
         <source>Append file</source>
         <translation>Přidat soubor</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="702"/>
+        <location filename="../src/GUI/gui.cpp" line="710"/>
         <source>Next/Previous</source>
         <translation>Následující/Předchozí</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="704"/>
+        <location filename="../src/GUI/gui.cpp" line="712"/>
         <source>Toggle graph type</source>
         <translation>Přepnout typ grafu</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="706"/>
+        <location filename="../src/GUI/gui.cpp" line="714"/>
         <source>Toggle time type</source>
         <translation>Přepnout typ času</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="710"/>
+        <location filename="../src/GUI/gui.cpp" line="718"/>
         <source>Previous map</source>
         <translation>Předchozí mapa</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="711"/>
+        <location filename="../src/GUI/gui.cpp" line="719"/>
         <source>Zoom in</source>
         <translation>Přiblížit</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="713"/>
+        <location filename="../src/GUI/gui.cpp" line="721"/>
         <source>Zoom out</source>
         <translation>Oddálit</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="715"/>
+        <location filename="../src/GUI/gui.cpp" line="723"/>
         <source>Digital zoom</source>
         <translation>Digitální zoom</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="716"/>
+        <location filename="../src/GUI/gui.cpp" line="724"/>
         <source>Zoom</source>
         <translation>Zoom</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="733"/>
+        <location filename="../src/GUI/gui.cpp" line="741"/>
         <source>GCS/PCS directory:</source>
         <translation>Adresář s GCS/PCS daty:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="735"/>
+        <location filename="../src/GUI/gui.cpp" line="743"/>
         <source>DEM directory:</source>
         <translation>Adresář s DEM daty:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="737"/>
+        <location filename="../src/GUI/gui.cpp" line="745"/>
         <source>Styles directory:</source>
         <translation>Adresář se styly:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1064"/>
-        <location filename="../src/GUI/gui.cpp" line="1132"/>
+        <location filename="../src/GUI/gui.cpp" line="1109"/>
+        <location filename="../src/GUI/gui.cpp" line="1178"/>
         <source>Areas</source>
         <translation>Plochy</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1107"/>
-        <location filename="../src/GUI/gui.cpp" line="1108"/>
+        <location filename="../src/GUI/gui.cpp" line="1152"/>
+        <location filename="../src/GUI/gui.cpp" line="1153"/>
         <source>Statistics</source>
         <translation>Statistika</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1340"/>
+        <location filename="../src/GUI/gui.cpp" line="1424"/>
         <source>Open map file</source>
         <translation>Otevřít mapový soubor</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1401"/>
+        <location filename="../src/GUI/gui.cpp" line="1485"/>
         <source>No files loaded</source>
         <translation>Nejsou načteny žádné soubory</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1070"/>
-        <location filename="../src/GUI/gui.cpp" line="1074"/>
-        <location filename="../src/GUI/gui.cpp" line="1138"/>
-        <location filename="../src/GUI/gui.cpp" line="1141"/>
+        <location filename="../src/GUI/gui.cpp" line="1115"/>
+        <location filename="../src/GUI/gui.cpp" line="1119"/>
+        <location filename="../src/GUI/gui.cpp" line="1184"/>
+        <location filename="../src/GUI/gui.cpp" line="1187"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="496"/>
+        <location filename="../src/GUI/gui.cpp" line="503"/>
         <source>&amp;File</source>
         <translation>&amp;Soubor</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="511"/>
+        <location filename="../src/GUI/gui.cpp" line="519"/>
         <source>&amp;Map</source>
         <translation>&amp;Mapa</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="521"/>
+        <location filename="../src/GUI/gui.cpp" line="529"/>
         <source>&amp;Graph</source>
         <translation>&amp;Graf</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="531"/>
+        <location filename="../src/GUI/gui.cpp" line="539"/>
         <source>&amp;POI</source>
         <translation>&amp;POI</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="543"/>
+        <location filename="../src/GUI/gui.cpp" line="551"/>
         <source>&amp;Data</source>
         <translation>&amp;Data</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="554"/>
+        <location filename="../src/GUI/gui.cpp" line="562"/>
         <source>&amp;Settings</source>
         <translation>&amp;Nastavení</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="572"/>
+        <location filename="../src/GUI/gui.cpp" line="580"/>
         <source>&amp;Help</source>
         <translation>N&amp;ápověda</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="729"/>
+        <location filename="../src/GUI/gui.cpp" line="737"/>
         <source>Map directory:</source>
         <translation>Adresář s mapami:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="731"/>
+        <location filename="../src/GUI/gui.cpp" line="739"/>
         <source>POI directory:</source>
         <translation>Adresář s POI body:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="739"/>
+        <location filename="../src/GUI/gui.cpp" line="747"/>
         <source>Tile cache directory:</source>
         <translation>Adresář mezipaměti dlaždic:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1058"/>
-        <location filename="../src/GUI/gui.cpp" line="1128"/>
+        <location filename="../src/GUI/gui.cpp" line="1103"/>
+        <location filename="../src/GUI/gui.cpp" line="1174"/>
         <source>Routes</source>
         <translation>Trasy</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1360"/>
-        <location filename="../src/GUI/gui.cpp" line="1391"/>
+        <location filename="../src/GUI/gui.cpp" line="1444"/>
+        <location filename="../src/GUI/gui.cpp" line="1475"/>
         <source>Error loading map:</source>
         <translation>Mapu nelze načíst:</translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/GUI/gui.cpp" line="1405"/>
+        <location filename="../src/GUI/gui.cpp" line="1489"/>
         <source>%n files</source>
         <translation>
             <numerusform>%n soubor</numerusform>
@@ -775,7 +695,7 @@
         </translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="695"/>
+        <location filename="../src/GUI/gui.cpp" line="703"/>
         <source>Next file</source>
         <translation>Následující soubor</translation>
     </message>
@@ -790,81 +710,81 @@
         <translation>Exportovat do PDF...</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1061"/>
-        <location filename="../src/GUI/gui.cpp" line="1130"/>
+        <location filename="../src/GUI/gui.cpp" line="1106"/>
+        <location filename="../src/GUI/gui.cpp" line="1176"/>
         <source>Waypoints</source>
         <translation>Navigační body</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="696"/>
+        <location filename="../src/GUI/gui.cpp" line="704"/>
         <source>Previous file</source>
         <translation>Předchozí soubor</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="350"/>
+        <location filename="../src/GUI/gui.cpp" line="357"/>
         <source>Route waypoints</source>
         <translation>Body tras</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="698"/>
+        <location filename="../src/GUI/gui.cpp" line="706"/>
         <source>First file</source>
         <translation>První soubor</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="700"/>
+        <location filename="../src/GUI/gui.cpp" line="708"/>
         <source>Last file</source>
         <translation>Poslední soubor</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="848"/>
+        <location filename="../src/GUI/gui.cpp" line="856"/>
         <source>Error loading data file:</source>
         <translation>Datový soubor nelze načíst:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="851"/>
-        <location filename="../src/GUI/gui.cpp" line="886"/>
+        <location filename="../src/GUI/gui.cpp" line="859"/>
+        <location filename="../src/GUI/gui.cpp" line="894"/>
         <source>Line: %1</source>
         <translation>Řádka: %1</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="883"/>
+        <location filename="../src/GUI/gui.cpp" line="891"/>
         <source>Error loading POI file:</source>
         <translation>Soubor POI nelze načíst:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1122"/>
+        <location filename="../src/GUI/gui.cpp" line="1168"/>
         <source>Name</source>
         <translation>Název</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1055"/>
-        <location filename="../src/GUI/gui.cpp" line="1126"/>
+        <location filename="../src/GUI/gui.cpp" line="1100"/>
+        <location filename="../src/GUI/gui.cpp" line="1172"/>
         <source>Tracks</source>
         <translation>Cesty</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="217"/>
-        <location filename="../src/GUI/gui.cpp" line="669"/>
+        <location filename="../src/GUI/gui.cpp" line="677"/>
         <source>About GPXSee</source>
         <translation>O aplikaci GPXSee</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="603"/>
+        <location filename="../src/GUI/gui.cpp" line="611"/>
         <source>Navigation</source>
         <translation>Navigace</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="372"/>
-        <location filename="../src/GUI/gui.cpp" line="1081"/>
-        <location filename="../src/GUI/gui.cpp" line="1148"/>
+        <location filename="../src/GUI/gui.cpp" line="379"/>
+        <location filename="../src/GUI/gui.cpp" line="1126"/>
+        <location filename="../src/GUI/gui.cpp" line="1194"/>
         <source>Distance</source>
         <translation>Vzdálenost</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="379"/>
-        <location filename="../src/GUI/gui.cpp" line="555"/>
-        <location filename="../src/GUI/gui.cpp" line="1084"/>
-        <location filename="../src/GUI/gui.cpp" line="1150"/>
+        <location filename="../src/GUI/gui.cpp" line="386"/>
+        <location filename="../src/GUI/gui.cpp" line="563"/>
+        <location filename="../src/GUI/gui.cpp" line="1129"/>
+        <location filename="../src/GUI/gui.cpp" line="1196"/>
         <source>Time</source>
         <translation>Čas</translation>
     </message>
@@ -1580,6 +1500,159 @@
         <translation>Nastavení</translation>
     </message>
 </context>
+<context>
+    <name>PDFExportDialog</name>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="24"/>
+        <source>PDF files</source>
+        <translation>Soubory PDF</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="24"/>
+        <source>All files</source>
+        <translation>Všechny soubory</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="51"/>
+        <source>Portrait</source>
+        <translation>Na výšku</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="52"/>
+        <source>Landscape</source>
+        <translation>Na šířku</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="62"/>
+        <source>in</source>
+        <translation>in</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="62"/>
+        <source>cm</source>
+        <translation>cm</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="68"/>
+        <source>Page Setup</source>
+        <translation>Nastavení stránky</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="71"/>
+        <source>Page size:</source>
+        <translation>Velikost stránky:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="72"/>
+        <source>Resolution:</source>
+        <translation>Rozlišení:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="73"/>
+        <source>Orientation:</source>
+        <translation>Orientace:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="74"/>
+        <source>Margins:</source>
+        <translation>Okraje:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="80"/>
+        <source>File:</source>
+        <translation>Soubor:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="87"/>
+        <source>Output file</source>
+        <translation>Výstupní soubor</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="94"/>
+        <source>Export</source>
+        <translation>Exportovat</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="109"/>
+        <source>Export to PDF</source>
+        <translation>Exportovat do PDF</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="117"/>
+        <source>Error</source>
+        <translation>Chyba</translation>
+    </message>
+</context>
+<context>
+    <name>PNGExportDialog</name>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="22"/>
+        <source>PNG files</source>
+        <translation>Soubory PNG</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="22"/>
+        <source>All files</source>
+        <translation>Všechny soubory</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="30"/>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="35"/>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="39"/>
+        <source>px</source>
+        <translation>px</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="41"/>
+        <source>Use anti-aliasing</source>
+        <translation>Vyhlazovat hrany</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="45"/>
+        <source>Image Setup</source>
+        <translation>Nastavení obrázku</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="48"/>
+        <source>Image width:</source>
+        <translation>Šířka:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="49"/>
+        <source>Image height:</source>
+        <translation>Výška:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="50"/>
+        <source>Margins:</source>
+        <translation>Okraje:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="57"/>
+        <source>File:</source>
+        <translation>Soubor:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="64"/>
+        <source>Output file</source>
+        <translation>Výstupní soubor</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="71"/>
+        <source>Export</source>
+        <translation>Exportovat</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="86"/>
+        <source>Export to PNG</source>
+        <translation>Exportovat do PNG</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="94"/>
+        <source>Error</source>
+        <translation>Chyba</translation>
+    </message>
+</context>
 <context>
     <name>PolygonItem</name>
     <message>

lang/gpxsee_de.ts

@@ -204,106 +204,6 @@
         <translation>Minimum</translation>
     </message>
 </context>
-<context>
-    <name>ExportDialog</name>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="135"/>
-        <source>Export to PDF</source>
-        <translation>In PDF exportieren</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="52"/>
-        <source>Portrait</source>
-        <translation>Hochformat</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="53"/>
-        <source>Landscape</source>
-        <translation>Querformat</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="97"/>
-        <source>Page size:</source>
-        <translation>Seitengröße:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="99"/>
-        <source>Orientation:</source>
-        <translation>Ausrichtung:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="94"/>
-        <source>Page Setup</source>
-        <translation>Seite einrichten</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="25"/>
-        <source>PDF files</source>
-        <translation>PDF-Dateien</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="25"/>
-        <source>All files</source>
-        <translation>Alle Dateien</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="66"/>
-        <source>in</source>
-        <translation>in</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="66"/>
-        <source>mm</source>
-        <translation>mm</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="98"/>
-        <source>Resolution:</source>
-        <translation>Druckauflösung:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="100"/>
-        <source>Margins:</source>
-        <translation>Ränder:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="106"/>
-        <source>File:</source>
-        <translation>Ausgabedatei:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="113"/>
-        <source>Output file</source>
-        <translation>Ausgabedatei</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="120"/>
-        <source>Export</source>
-        <translation>Export</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="142"/>
-        <location filename="../src/GUI/exportdialog.cpp" line="152"/>
-        <location filename="../src/GUI/exportdialog.cpp" line="157"/>
-        <source>Error</source>
-        <translation>Fehler</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="142"/>
-        <source>No output file selected.</source>
-        <translation>Keine Ausgabedatei ausgewählt.</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="152"/>
-        <source>%1 is a directory.</source>
-        <translation>%1 ist ein Verzeichnis.</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="157"/>
-        <source>%1 is not writable.</source>
-        <translation>%1 ist nicht beschreibbar.</translation>
-    </message>
-</context>
 <context>
     <name>FileSelectWidget</name>
     <message>
@@ -311,6 +211,21 @@
         <source>Select file</source>
         <translation>Datei auswählen</translation>
     </message>
+    <message>
+        <location filename="../src/GUI/fileselectwidget.cpp" line="48"/>
+        <source>No output file selected.</source>
+        <translation>Keine Ausgabedatei ausgewählt.</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/fileselectwidget.cpp" line="58"/>
+        <source>%1 is a directory.</source>
+        <translation>%1 ist ein Verzeichnis.</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/fileselectwidget.cpp" line="62"/>
+        <source>%1 is not writable.</source>
+        <translation>%1 ist nicht beschreibbar.</translation>
+    </message>
 </context>
 <context>
     <name>Format</name>
@@ -346,22 +261,22 @@
 <context>
     <name>GUI</name>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="729"/>
+        <location filename="../src/GUI/gui.cpp" line="737"/>
         <source>Map directory:</source>
         <translation>Kartenverzeichnis:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="731"/>
+        <location filename="../src/GUI/gui.cpp" line="739"/>
         <source>POI directory:</source>
         <translation>POI-Verzeichnis:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="748"/>
+        <location filename="../src/GUI/gui.cpp" line="756"/>
         <source>Open file</source>
         <translation>Datei öffnen</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="859"/>
+        <location filename="../src/GUI/gui.cpp" line="867"/>
         <source>Open POI file</source>
         <translation>POI-Datei öffnen</translation>
     </message>
@@ -372,58 +287,58 @@
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="214"/>
-        <location filename="../src/GUI/gui.cpp" line="691"/>
-        <location filename="../src/GUI/gui.cpp" line="692"/>
+        <location filename="../src/GUI/gui.cpp" line="699"/>
+        <location filename="../src/GUI/gui.cpp" line="700"/>
         <source>Keyboard controls</source>
         <translation>Tastaturkürzel</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="240"/>
+        <location filename="../src/GUI/gui.cpp" line="247"/>
         <source>Close</source>
         <translation>Schließen</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="246"/>
+        <location filename="../src/GUI/gui.cpp" line="253"/>
         <source>Reload</source>
         <translation>Neu laden</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="596"/>
+        <location filename="../src/GUI/gui.cpp" line="604"/>
         <source>Show</source>
         <translation>Ansicht</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="588"/>
+        <location filename="../src/GUI/gui.cpp" line="596"/>
         <source>File</source>
         <translation>Datei</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="265"/>
+        <location filename="../src/GUI/gui.cpp" line="272"/>
         <source>Close POI files</source>
         <translation>POI-Datei schließen</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="269"/>
+        <location filename="../src/GUI/gui.cpp" line="276"/>
         <source>Overlap POIs</source>
         <translation>POIs überlappen</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="274"/>
+        <location filename="../src/GUI/gui.cpp" line="281"/>
         <source>Show POI labels</source>
         <translation>POI-Labels anzeigen</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="279"/>
+        <location filename="../src/GUI/gui.cpp" line="286"/>
         <source>Show POIs</source>
         <translation>POIs anzeigen</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="290"/>
+        <location filename="../src/GUI/gui.cpp" line="297"/>
         <source>Show map</source>
         <translation>Karte anzeigen</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="303"/>
+        <location filename="../src/GUI/gui.cpp" line="310"/>
         <source>Clear tile cache</source>
         <translation>Kachel-Cache bereinigen</translation>
     </message>
@@ -434,285 +349,290 @@
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="211"/>
-        <location filename="../src/GUI/gui.cpp" line="725"/>
-        <location filename="../src/GUI/gui.cpp" line="726"/>
+        <location filename="../src/GUI/gui.cpp" line="733"/>
+        <location filename="../src/GUI/gui.cpp" line="734"/>
         <source>Paths</source>
         <translation>Pfade</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="253"/>
+        <location filename="../src/GUI/gui.cpp" line="241"/>
+        <source>Export to PNG...</source>
+        <translation>Als PNG exportieren...</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/gui.cpp" line="260"/>
         <source>Statistics...</source>
         <translation>Statistiken …</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="261"/>
+        <location filename="../src/GUI/gui.cpp" line="268"/>
         <source>Load POI file...</source>
         <translation>POI-Datei laden …</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="299"/>
+        <location filename="../src/GUI/gui.cpp" line="306"/>
         <source>Load map...</source>
         <translation>Karte laden …</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="308"/>
-        <location filename="../src/GUI/gui.cpp" line="313"/>
-        <location filename="../src/GUI/gui.cpp" line="708"/>
+        <location filename="../src/GUI/gui.cpp" line="315"/>
+        <location filename="../src/GUI/gui.cpp" line="320"/>
+        <location filename="../src/GUI/gui.cpp" line="716"/>
         <source>Next map</source>
         <translation>Nächste Karte</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="318"/>
+        <location filename="../src/GUI/gui.cpp" line="325"/>
         <source>Show cursor coordinates</source>
         <translation>Cursor-Koordinaten anzeigen</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="325"/>
+        <location filename="../src/GUI/gui.cpp" line="332"/>
         <source>Show tracks</source>
         <translation>Strecken anzeigen</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="330"/>
+        <location filename="../src/GUI/gui.cpp" line="337"/>
         <source>Show routes</source>
         <translation>Routen anzeigen</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="335"/>
+        <location filename="../src/GUI/gui.cpp" line="342"/>
         <source>Show waypoints</source>
         <translation>Wegpunkte anzeigen</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="340"/>
+        <location filename="../src/GUI/gui.cpp" line="347"/>
         <source>Show areas</source>
         <translation>Flächen anzeigen</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="345"/>
+        <location filename="../src/GUI/gui.cpp" line="352"/>
         <source>Waypoint labels</source>
         <translation>Wegpunkt-Labels</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="355"/>
+        <location filename="../src/GUI/gui.cpp" line="362"/>
         <source>km/mi markers</source>
         <translation>km/mi-Markierungen</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="362"/>
+        <location filename="../src/GUI/gui.cpp" line="369"/>
         <source>Show graphs</source>
         <translation>Graphen anzeigen</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="386"/>
+        <location filename="../src/GUI/gui.cpp" line="393"/>
         <source>Show grid</source>
         <translation>Gitter anzeigen</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="391"/>
+        <location filename="../src/GUI/gui.cpp" line="398"/>
         <source>Show slider info</source>
         <translation>Schieberinfo anzeigen</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="396"/>
+        <location filename="../src/GUI/gui.cpp" line="403"/>
         <source>Show path markers</source>
         <translation>Pfadposition anzeigen</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="403"/>
+        <location filename="../src/GUI/gui.cpp" line="410"/>
         <source>Show toolbars</source>
         <translation>Toolbars anzeigen</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="410"/>
+        <location filename="../src/GUI/gui.cpp" line="417"/>
         <source>Total time</source>
         <translation>Gesamtzeit</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="416"/>
-        <location filename="../src/GUI/gui.cpp" line="1086"/>
-        <location filename="../src/GUI/gui.cpp" line="1152"/>
+        <location filename="../src/GUI/gui.cpp" line="423"/>
+        <location filename="../src/GUI/gui.cpp" line="1131"/>
+        <location filename="../src/GUI/gui.cpp" line="1198"/>
         <source>Moving time</source>
         <translation>Bewegungszeit</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="424"/>
+        <location filename="../src/GUI/gui.cpp" line="431"/>
         <source>Metric</source>
         <translation>Metrisch</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="430"/>
+        <location filename="../src/GUI/gui.cpp" line="437"/>
         <source>Imperial</source>
         <translation>Angloamerikanisch</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="436"/>
+        <location filename="../src/GUI/gui.cpp" line="443"/>
         <source>Nautical</source>
         <translation>Nautisch</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="444"/>
+        <location filename="../src/GUI/gui.cpp" line="451"/>
         <source>Decimal degrees (DD)</source>
         <translation>Dezimalgrad (DD)</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="450"/>
+        <location filename="../src/GUI/gui.cpp" line="457"/>
         <source>Degrees and decimal minutes (DMM)</source>
         <translation>Grad und Dezimalminuten (DMM)</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="457"/>
+        <location filename="../src/GUI/gui.cpp" line="464"/>
         <source>Degrees, minutes, seconds (DMS)</source>
         <translation>Grad, Minuten, Sekunden (DMS)</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="463"/>
+        <location filename="../src/GUI/gui.cpp" line="470"/>
         <source>Fullscreen mode</source>
         <translation>Vollbildmodus</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="470"/>
+        <location filename="../src/GUI/gui.cpp" line="477"/>
         <source>Options...</source>
         <translation>Einstellungen …</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="476"/>
+        <location filename="../src/GUI/gui.cpp" line="483"/>
         <source>Next</source>
         <translation>Nächste</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="480"/>
+        <location filename="../src/GUI/gui.cpp" line="487"/>
         <source>Previous</source>
         <translation>Vorherige</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="484"/>
+        <location filename="../src/GUI/gui.cpp" line="491"/>
         <source>Last</source>
         <translation>Letzte</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="488"/>
+        <location filename="../src/GUI/gui.cpp" line="495"/>
         <source>First</source>
         <translation>Erste</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="532"/>
+        <location filename="../src/GUI/gui.cpp" line="540"/>
         <source>POI files</source>
         <translation>POI-Dateien</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="544"/>
+        <location filename="../src/GUI/gui.cpp" line="552"/>
         <source>Display</source>
         <translation>Anzeige</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="558"/>
+        <location filename="../src/GUI/gui.cpp" line="566"/>
         <source>Units</source>
         <translation>Einheiten</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="562"/>
+        <location filename="../src/GUI/gui.cpp" line="570"/>
         <source>Coordinates format</source>
         <translation>Koordinatenformate</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="670"/>
+        <location filename="../src/GUI/gui.cpp" line="678"/>
         <source>Version %1</source>
         <translation>Version %1</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="674"/>
+        <location filename="../src/GUI/gui.cpp" line="682"/>
         <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 %1.</source>
         <translation>GPXSee wird unter der GNU General Public License version 3 veröffentlicht. Mehr Informationen zu GPXSee auf der Homepage %1.</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="701"/>
+        <location filename="../src/GUI/gui.cpp" line="709"/>
         <source>Append file</source>
         <translation>An Datei anhängen</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="702"/>
+        <location filename="../src/GUI/gui.cpp" line="710"/>
         <source>Next/Previous</source>
         <translation>Nächste/Vorherige</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="704"/>
+        <location filename="../src/GUI/gui.cpp" line="712"/>
         <source>Toggle graph type</source>
         <translation>Graphtyp umschalten</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="706"/>
+        <location filename="../src/GUI/gui.cpp" line="714"/>
         <source>Toggle time type</source>
         <translation>Zeittyp umschalten</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="710"/>
+        <location filename="../src/GUI/gui.cpp" line="718"/>
         <source>Previous map</source>
         <translation>Vorherige Karte</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="711"/>
+        <location filename="../src/GUI/gui.cpp" line="719"/>
         <source>Zoom in</source>
         <translation>Hineinzoomen</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="713"/>
+        <location filename="../src/GUI/gui.cpp" line="721"/>
         <source>Zoom out</source>
         <translation>Herauszoomen</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="715"/>
+        <location filename="../src/GUI/gui.cpp" line="723"/>
         <source>Digital zoom</source>
         <translation>Digitaler Zoom</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="716"/>
+        <location filename="../src/GUI/gui.cpp" line="724"/>
         <source>Zoom</source>
         <translation>Zoom</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="733"/>
+        <location filename="../src/GUI/gui.cpp" line="741"/>
         <source>GCS/PCS directory:</source>
         <translation>GCS/PCS-Verzeichnis:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="735"/>
+        <location filename="../src/GUI/gui.cpp" line="743"/>
         <source>DEM directory:</source>
         <translation>DEM-Verzeichnis:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="737"/>
+        <location filename="../src/GUI/gui.cpp" line="745"/>
         <source>Styles directory:</source>
         <translation>Formatvorlagen-Verzeichnis:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1064"/>
-        <location filename="../src/GUI/gui.cpp" line="1132"/>
+        <location filename="../src/GUI/gui.cpp" line="1109"/>
+        <location filename="../src/GUI/gui.cpp" line="1178"/>
         <source>Areas</source>
         <translation>Flächen</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1107"/>
-        <location filename="../src/GUI/gui.cpp" line="1108"/>
+        <location filename="../src/GUI/gui.cpp" line="1152"/>
+        <location filename="../src/GUI/gui.cpp" line="1153"/>
         <source>Statistics</source>
         <translation>Statistiken</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1340"/>
+        <location filename="../src/GUI/gui.cpp" line="1424"/>
         <source>Open map file</source>
         <translation>Kartendatei öffnen</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1360"/>
-        <location filename="../src/GUI/gui.cpp" line="1391"/>
+        <location filename="../src/GUI/gui.cpp" line="1444"/>
+        <location filename="../src/GUI/gui.cpp" line="1475"/>
         <source>Error loading map:</source>
         <translation>Fehler beim Laden der Kartendatei:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1401"/>
+        <location filename="../src/GUI/gui.cpp" line="1485"/>
         <source>No files loaded</source>
         <translation>Keine Dateien geladen</translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/GUI/gui.cpp" line="1405"/>
+        <location filename="../src/GUI/gui.cpp" line="1489"/>
         <source>%n files</source>
         <translation>
             <numerusform>%n Datei</numerusform>
@@ -720,21 +640,21 @@
         </translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1070"/>
-        <location filename="../src/GUI/gui.cpp" line="1074"/>
-        <location filename="../src/GUI/gui.cpp" line="1138"/>
-        <location filename="../src/GUI/gui.cpp" line="1141"/>
+        <location filename="../src/GUI/gui.cpp" line="1115"/>
+        <location filename="../src/GUI/gui.cpp" line="1119"/>
+        <location filename="../src/GUI/gui.cpp" line="1184"/>
+        <location filename="../src/GUI/gui.cpp" line="1187"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1058"/>
-        <location filename="../src/GUI/gui.cpp" line="1128"/>
+        <location filename="../src/GUI/gui.cpp" line="1103"/>
+        <location filename="../src/GUI/gui.cpp" line="1174"/>
         <source>Routes</source>
         <translation>Routen</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="695"/>
+        <location filename="../src/GUI/gui.cpp" line="703"/>
         <source>Next file</source>
         <translation>Nächste Datei</translation>
     </message>
@@ -749,121 +669,121 @@
         <translation>Als PDF exportieren …</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1061"/>
-        <location filename="../src/GUI/gui.cpp" line="1130"/>
+        <location filename="../src/GUI/gui.cpp" line="1106"/>
+        <location filename="../src/GUI/gui.cpp" line="1176"/>
         <source>Waypoints</source>
         <translation>Wegpunkte</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="696"/>
+        <location filename="../src/GUI/gui.cpp" line="704"/>
         <source>Previous file</source>
         <translation>Vorherige Datei</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="350"/>
+        <location filename="../src/GUI/gui.cpp" line="357"/>
         <source>Route waypoints</source>
         <translation>Routen-Wegpunkte</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="496"/>
+        <location filename="../src/GUI/gui.cpp" line="503"/>
         <source>&amp;File</source>
         <translation>&amp;Datei</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="511"/>
+        <location filename="../src/GUI/gui.cpp" line="519"/>
         <source>&amp;Map</source>
         <translation>&amp;Karte</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="521"/>
+        <location filename="../src/GUI/gui.cpp" line="529"/>
         <source>&amp;Graph</source>
         <translation>&amp;Graph</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="531"/>
+        <location filename="../src/GUI/gui.cpp" line="539"/>
         <source>&amp;POI</source>
         <translation>&amp;POI</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="543"/>
+        <location filename="../src/GUI/gui.cpp" line="551"/>
         <source>&amp;Data</source>
         <translation>D&amp;ata</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="554"/>
+        <location filename="../src/GUI/gui.cpp" line="562"/>
         <source>&amp;Settings</source>
         <translation>&amp;Einstellungen</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="572"/>
+        <location filename="../src/GUI/gui.cpp" line="580"/>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="698"/>
+        <location filename="../src/GUI/gui.cpp" line="706"/>
         <source>First file</source>
         <translation>Erste Datei</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="700"/>
+        <location filename="../src/GUI/gui.cpp" line="708"/>
         <source>Last file</source>
         <translation>Letzte Datei</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="739"/>
+        <location filename="../src/GUI/gui.cpp" line="747"/>
         <source>Tile cache directory:</source>
         <translation>Kachel-Cache-Verzeichnis:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="848"/>
+        <location filename="../src/GUI/gui.cpp" line="856"/>
         <source>Error loading data file:</source>
         <translation>Fehler beim Laden der Datendatei:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="851"/>
-        <location filename="../src/GUI/gui.cpp" line="886"/>
+        <location filename="../src/GUI/gui.cpp" line="859"/>
+        <location filename="../src/GUI/gui.cpp" line="894"/>
         <source>Line: %1</source>
         <translation>Zeile: %1</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="883"/>
+        <location filename="../src/GUI/gui.cpp" line="891"/>
         <source>Error loading POI file:</source>
         <translation>Fehler beim Laden der POI-Datei:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1122"/>
+        <location filename="../src/GUI/gui.cpp" line="1168"/>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1055"/>
-        <location filename="../src/GUI/gui.cpp" line="1126"/>
+        <location filename="../src/GUI/gui.cpp" line="1100"/>
+        <location filename="../src/GUI/gui.cpp" line="1172"/>
         <source>Tracks</source>
         <translation>Strecken</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="217"/>
-        <location filename="../src/GUI/gui.cpp" line="669"/>
+        <location filename="../src/GUI/gui.cpp" line="677"/>
         <source>About GPXSee</source>
         <translation>Über GPXSee</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="603"/>
+        <location filename="../src/GUI/gui.cpp" line="611"/>
         <source>Navigation</source>
         <translation>Navigation</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="372"/>
-        <location filename="../src/GUI/gui.cpp" line="1081"/>
-        <location filename="../src/GUI/gui.cpp" line="1148"/>
+        <location filename="../src/GUI/gui.cpp" line="379"/>
+        <location filename="../src/GUI/gui.cpp" line="1126"/>
+        <location filename="../src/GUI/gui.cpp" line="1194"/>
         <source>Distance</source>
         <translation>Distanz</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="379"/>
-        <location filename="../src/GUI/gui.cpp" line="555"/>
-        <location filename="../src/GUI/gui.cpp" line="1084"/>
-        <location filename="../src/GUI/gui.cpp" line="1150"/>
+        <location filename="../src/GUI/gui.cpp" line="386"/>
+        <location filename="../src/GUI/gui.cpp" line="563"/>
+        <location filename="../src/GUI/gui.cpp" line="1129"/>
+        <location filename="../src/GUI/gui.cpp" line="1196"/>
         <source>Time</source>
         <translation>Zeit</translation>
     </message>
@@ -1352,7 +1272,7 @@
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="442"/>
         <source>Use segments</source>
-        <translation type="unfinished"></translation>
+        <translation>Segmente Verwenden</translation>
     </message>
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="481"/>
@@ -1579,6 +1499,159 @@
         <translation>Einstellungen</translation>
     </message>
 </context>
+<context>
+    <name>PDFExportDialog</name>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="24"/>
+        <source>PDF files</source>
+        <translation>PDF-Dateien</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="24"/>
+        <source>All files</source>
+        <translation>Alle Dateien</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="51"/>
+        <source>Portrait</source>
+        <translation>Hochformat</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="52"/>
+        <source>Landscape</source>
+        <translation>Querformat</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="62"/>
+        <source>in</source>
+        <translation>in</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="62"/>
+        <source>cm</source>
+        <translation>cm</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="68"/>
+        <source>Page Setup</source>
+        <translation>Seite einrichten</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="71"/>
+        <source>Page size:</source>
+        <translation>Seitengröße:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="72"/>
+        <source>Resolution:</source>
+        <translation>Druckauflösung:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="73"/>
+        <source>Orientation:</source>
+        <translation>Ausrichtung:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="74"/>
+        <source>Margins:</source>
+        <translation>Ränder:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="80"/>
+        <source>File:</source>
+        <translation>Ausgabedatei:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="87"/>
+        <source>Output file</source>
+        <translation>Ausgabedatei</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="94"/>
+        <source>Export</source>
+        <translation>Export</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="109"/>
+        <source>Export to PDF</source>
+        <translation>In PDF exportieren</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="117"/>
+        <source>Error</source>
+        <translation>Fehler</translation>
+    </message>
+</context>
+<context>
+    <name>PNGExportDialog</name>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="22"/>
+        <source>PNG files</source>
+        <translation>PNG-Dateien</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="22"/>
+        <source>All files</source>
+        <translation>Alle Dateien</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="30"/>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="35"/>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="39"/>
+        <source>px</source>
+        <translation>px</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="41"/>
+        <source>Use anti-aliasing</source>
+        <translation>Anti-Aliasing verwenden</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="45"/>
+        <source>Image Setup</source>
+        <translation>Bildeinstellungen</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="48"/>
+        <source>Image width:</source>
+        <translation>Bildbreite:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="49"/>
+        <source>Image height:</source>
+        <translation>Bildhöhe:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="50"/>
+        <source>Margins:</source>
+        <translation>Ränder:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="57"/>
+        <source>File:</source>
+        <translation>Ausgabedatei:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="64"/>
+        <source>Output file</source>
+        <translation>Ausgabedatei</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="71"/>
+        <source>Export</source>
+        <translation>Export</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="86"/>
+        <source>Export to PNG</source>
+        <translation>In PNG exportieren</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="94"/>
+        <source>Error</source>
+        <translation>Fehler</translation>
+    </message>
+</context>
 <context>
     <name>PolygonItem</name>
     <message>

lang/gpxsee_es.ts

@@ -204,106 +204,6 @@
         <translation>Mínima</translation>
     </message>
 </context>
-<context>
-    <name>ExportDialog</name>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="25"/>
-        <source>PDF files</source>
-        <translation>Archivos PDF</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="25"/>
-        <source>All files</source>
-        <translation>Todos los archivos</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="52"/>
-        <source>Portrait</source>
-        <translation>Vertical</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="53"/>
-        <source>Landscape</source>
-        <translation>Horizontal</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="66"/>
-        <source>mm</source>
-        <translation>mm</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="66"/>
-        <source>in</source>
-        <translation>in</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="94"/>
-        <source>Page Setup</source>
-        <translation>Configuración de página</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="97"/>
-        <source>Page size:</source>
-        <translation>Formato de página:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="98"/>
-        <source>Resolution:</source>
-        <translation>Resolución:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="99"/>
-        <source>Orientation:</source>
-        <translation>Orientación:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="100"/>
-        <source>Margins:</source>
-        <translation>Márgenes:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="106"/>
-        <source>File:</source>
-        <translation>Archivo:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="113"/>
-        <source>Output file</source>
-        <translation>Nombre</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="120"/>
-        <source>Export</source>
-        <translation>Exportar</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="135"/>
-        <source>Export to PDF</source>
-        <translation>Exportar a PDF</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="142"/>
-        <location filename="../src/GUI/exportdialog.cpp" line="152"/>
-        <location filename="../src/GUI/exportdialog.cpp" line="157"/>
-        <source>Error</source>
-        <translation>Error</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="142"/>
-        <source>No output file selected.</source>
-        <translation>Falta nombre de archivo.</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="152"/>
-        <source>%1 is a directory.</source>
-        <translation>%1 es una carpeta.</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="157"/>
-        <source>%1 is not writable.</source>
-        <translation>%1 es de solo lectura.</translation>
-    </message>
-</context>
 <context>
     <name>FileSelectWidget</name>
     <message>
@@ -311,6 +211,21 @@
         <source>Select file</source>
         <translation>Escoger archivo</translation>
     </message>
+    <message>
+        <location filename="../src/GUI/fileselectwidget.cpp" line="48"/>
+        <source>No output file selected.</source>
+        <translation>Falta nombre de archivo.</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/fileselectwidget.cpp" line="58"/>
+        <source>%1 is a directory.</source>
+        <translation>%1 es una carpeta.</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/fileselectwidget.cpp" line="62"/>
+        <source>%1 is not writable.</source>
+        <translation>%1 es de solo lectura.</translation>
+    </message>
 </context>
 <context>
     <name>Format</name>
@@ -352,21 +267,21 @@
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="211"/>
-        <location filename="../src/GUI/gui.cpp" line="725"/>
-        <location filename="../src/GUI/gui.cpp" line="726"/>
+        <location filename="../src/GUI/gui.cpp" line="733"/>
+        <location filename="../src/GUI/gui.cpp" line="734"/>
         <source>Paths</source>
         <translation>Trayectos</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="214"/>
-        <location filename="../src/GUI/gui.cpp" line="691"/>
-        <location filename="../src/GUI/gui.cpp" line="692"/>
+        <location filename="../src/GUI/gui.cpp" line="699"/>
+        <location filename="../src/GUI/gui.cpp" line="700"/>
         <source>Keyboard controls</source>
         <translation>Atajos de teclado</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="217"/>
-        <location filename="../src/GUI/gui.cpp" line="669"/>
+        <location filename="../src/GUI/gui.cpp" line="677"/>
         <source>About GPXSee</source>
         <translation>Acerca de GPXSee</translation>
     </message>
@@ -386,481 +301,486 @@
         <translation>Exportar a PDF...</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="240"/>
+        <location filename="../src/GUI/gui.cpp" line="241"/>
+        <source>Export to PNG...</source>
+        <translation>Exportar a PNG...</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/gui.cpp" line="247"/>
         <source>Close</source>
         <translation>Cerrar</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="246"/>
+        <location filename="../src/GUI/gui.cpp" line="253"/>
         <source>Reload</source>
         <translation>Recargar</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="253"/>
+        <location filename="../src/GUI/gui.cpp" line="260"/>
         <source>Statistics...</source>
         <translation>Estadísticas...</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="261"/>
+        <location filename="../src/GUI/gui.cpp" line="268"/>
         <source>Load POI file...</source>
         <translation>Cargar archivo de POI...</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="265"/>
+        <location filename="../src/GUI/gui.cpp" line="272"/>
         <source>Close POI files</source>
         <translation>Cerrar archivos de POI</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="269"/>
+        <location filename="../src/GUI/gui.cpp" line="276"/>
         <source>Overlap POIs</source>
         <translation>Sobreponer POI</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="274"/>
+        <location filename="../src/GUI/gui.cpp" line="281"/>
         <source>Show POI labels</source>
         <translation>Ver etiquetas en los POI</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="279"/>
+        <location filename="../src/GUI/gui.cpp" line="286"/>
         <source>Show POIs</source>
         <translation>Ver POI</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="290"/>
+        <location filename="../src/GUI/gui.cpp" line="297"/>
         <source>Show map</source>
         <translation>Ver mapa</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="299"/>
+        <location filename="../src/GUI/gui.cpp" line="306"/>
         <source>Load map...</source>
         <translation>Cargar mapa...</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="303"/>
+        <location filename="../src/GUI/gui.cpp" line="310"/>
         <source>Clear tile cache</source>
         <translation>Limpiar antememoria de teselas</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="308"/>
-        <location filename="../src/GUI/gui.cpp" line="313"/>
-        <location filename="../src/GUI/gui.cpp" line="708"/>
+        <location filename="../src/GUI/gui.cpp" line="315"/>
+        <location filename="../src/GUI/gui.cpp" line="320"/>
+        <location filename="../src/GUI/gui.cpp" line="716"/>
         <source>Next map</source>
         <translation>Próximo mapa</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="318"/>
+        <location filename="../src/GUI/gui.cpp" line="325"/>
         <source>Show cursor coordinates</source>
         <translation>Mostrar las coordenadas del cursor</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="325"/>
+        <location filename="../src/GUI/gui.cpp" line="332"/>
         <source>Show tracks</source>
         <translation>Ver pistas</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="330"/>
+        <location filename="../src/GUI/gui.cpp" line="337"/>
         <source>Show routes</source>
         <translation>Ver rutas</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="335"/>
+        <location filename="../src/GUI/gui.cpp" line="342"/>
         <source>Show waypoints</source>
         <translation>Ver puntos de referencia</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="340"/>
+        <location filename="../src/GUI/gui.cpp" line="347"/>
         <source>Show areas</source>
         <translation>Ver áreas</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="345"/>
+        <location filename="../src/GUI/gui.cpp" line="352"/>
         <source>Waypoint labels</source>
         <translation>Etiquetas de los waypoints</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="350"/>
+        <location filename="../src/GUI/gui.cpp" line="357"/>
         <source>Route waypoints</source>
         <translation>Puntos de referencia de ruta</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="355"/>
+        <location filename="../src/GUI/gui.cpp" line="362"/>
         <source>km/mi markers</source>
         <translation>Hitos kilométricos o cada milla</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="362"/>
+        <location filename="../src/GUI/gui.cpp" line="369"/>
         <source>Show graphs</source>
         <translation>Ver gráficas</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="372"/>
-        <location filename="../src/GUI/gui.cpp" line="1081"/>
-        <location filename="../src/GUI/gui.cpp" line="1148"/>
+        <location filename="../src/GUI/gui.cpp" line="379"/>
+        <location filename="../src/GUI/gui.cpp" line="1126"/>
+        <location filename="../src/GUI/gui.cpp" line="1194"/>
         <source>Distance</source>
         <translation>Distancia</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="379"/>
-        <location filename="../src/GUI/gui.cpp" line="555"/>
-        <location filename="../src/GUI/gui.cpp" line="1084"/>
-        <location filename="../src/GUI/gui.cpp" line="1150"/>
+        <location filename="../src/GUI/gui.cpp" line="386"/>
+        <location filename="../src/GUI/gui.cpp" line="563"/>
+        <location filename="../src/GUI/gui.cpp" line="1129"/>
+        <location filename="../src/GUI/gui.cpp" line="1196"/>
         <source>Time</source>
         <translation>Tiempo</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="386"/>
+        <location filename="../src/GUI/gui.cpp" line="393"/>
         <source>Show grid</source>
         <translation>Ver cuadrícula</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="391"/>
+        <location filename="../src/GUI/gui.cpp" line="398"/>
         <source>Show slider info</source>
         <translation>Ver datos al señalar</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="396"/>
+        <location filename="../src/GUI/gui.cpp" line="403"/>
         <source>Show path markers</source>
         <translation>Ver marcadores de camino</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="403"/>
+        <location filename="../src/GUI/gui.cpp" line="410"/>
         <source>Show toolbars</source>
         <translation>Ver barra de herramientas</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="410"/>
+        <location filename="../src/GUI/gui.cpp" line="417"/>
         <source>Total time</source>
         <translation>Tiempo total</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="416"/>
-        <location filename="../src/GUI/gui.cpp" line="1086"/>
-        <location filename="../src/GUI/gui.cpp" line="1152"/>
+        <location filename="../src/GUI/gui.cpp" line="423"/>
+        <location filename="../src/GUI/gui.cpp" line="1131"/>
+        <location filename="../src/GUI/gui.cpp" line="1198"/>
         <source>Moving time</source>
         <translation>Tiempo en movimiento</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="424"/>
+        <location filename="../src/GUI/gui.cpp" line="431"/>
         <source>Metric</source>
         <translation>Métrico</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="430"/>
+        <location filename="../src/GUI/gui.cpp" line="437"/>
         <source>Imperial</source>
         <translation>Anglosajón</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="436"/>
+        <location filename="../src/GUI/gui.cpp" line="443"/>
         <source>Nautical</source>
         <translation>Náutica</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="444"/>
+        <location filename="../src/GUI/gui.cpp" line="451"/>
         <source>Decimal degrees (DD)</source>
         <translation>Grados decimales (DD)</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="450"/>
+        <location filename="../src/GUI/gui.cpp" line="457"/>
         <source>Degrees and decimal minutes (DMM)</source>
         <translation>Grados y minutos decimales (DMM)</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="457"/>
+        <location filename="../src/GUI/gui.cpp" line="464"/>
         <source>Degrees, minutes, seconds (DMS)</source>
         <translation>Grados, minutos, segundos (GMS)</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="463"/>
+        <location filename="../src/GUI/gui.cpp" line="470"/>
         <source>Fullscreen mode</source>
         <translation>Pantalla completa</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="470"/>
+        <location filename="../src/GUI/gui.cpp" line="477"/>
         <source>Options...</source>
         <translation>Opciones...</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="476"/>
+        <location filename="../src/GUI/gui.cpp" line="483"/>
         <source>Next</source>
         <translation>Siguiente</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="480"/>
+        <location filename="../src/GUI/gui.cpp" line="487"/>
         <source>Previous</source>
         <translation>Anterior</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="484"/>
+        <location filename="../src/GUI/gui.cpp" line="491"/>
         <source>Last</source>
         <translation>Último</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="488"/>
+        <location filename="../src/GUI/gui.cpp" line="495"/>
         <source>First</source>
         <translation>Primer</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="496"/>
+        <location filename="../src/GUI/gui.cpp" line="503"/>
         <source>&amp;File</source>
         <translation>&amp;Archivo</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="511"/>
+        <location filename="../src/GUI/gui.cpp" line="519"/>
         <source>&amp;Map</source>
         <translation>&amp;Mapa</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="521"/>
+        <location filename="../src/GUI/gui.cpp" line="529"/>
         <source>&amp;Graph</source>
         <translation>&amp;Gráfico</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="531"/>
+        <location filename="../src/GUI/gui.cpp" line="539"/>
         <source>&amp;POI</source>
         <translation>P&amp;OI</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="532"/>
+        <location filename="../src/GUI/gui.cpp" line="540"/>
         <source>POI files</source>
         <translation>Archivos de POI</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="543"/>
+        <location filename="../src/GUI/gui.cpp" line="551"/>
         <source>&amp;Data</source>
         <translation>&amp;Datos</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="544"/>
+        <location filename="../src/GUI/gui.cpp" line="552"/>
         <source>Display</source>
         <translation>Pantalla</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="554"/>
+        <location filename="../src/GUI/gui.cpp" line="562"/>
         <source>&amp;Settings</source>
         <translation>&amp;Preferencias</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="558"/>
+        <location filename="../src/GUI/gui.cpp" line="566"/>
         <source>Units</source>
         <translation>Unidades</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="562"/>
+        <location filename="../src/GUI/gui.cpp" line="570"/>
         <source>Coordinates format</source>
         <translation>Formato de coordenadas</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="572"/>
+        <location filename="../src/GUI/gui.cpp" line="580"/>
         <source>&amp;Help</source>
         <translation>Ay&amp;uda</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="588"/>
+        <location filename="../src/GUI/gui.cpp" line="596"/>
         <source>File</source>
         <translation>Archivo</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="596"/>
+        <location filename="../src/GUI/gui.cpp" line="604"/>
         <source>Show</source>
         <translation>Ver</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="603"/>
+        <location filename="../src/GUI/gui.cpp" line="611"/>
         <source>Navigation</source>
         <translation>Navegación</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="670"/>
+        <location filename="../src/GUI/gui.cpp" line="678"/>
         <source>Version %1</source>
         <translation>Versión %1</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="674"/>
+        <location filename="../src/GUI/gui.cpp" line="682"/>
         <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 %1.</source>
         <translation>GPXSee se distribuye bajo Licencia Plica General GNU versión 3. Más información en la web del proyecto %1.</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="695"/>
+        <location filename="../src/GUI/gui.cpp" line="703"/>
         <source>Next file</source>
         <translation>Siguiente archivo</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="696"/>
+        <location filename="../src/GUI/gui.cpp" line="704"/>
         <source>Previous file</source>
         <translation>Archivo anterior</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="698"/>
+        <location filename="../src/GUI/gui.cpp" line="706"/>
         <source>First file</source>
         <translation>Primer archivo</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="700"/>
+        <location filename="../src/GUI/gui.cpp" line="708"/>
         <source>Last file</source>
         <translation>Último archivo</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="701"/>
+        <location filename="../src/GUI/gui.cpp" line="709"/>
         <source>Append file</source>
         <translation>Adjuntar archivo</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="702"/>
+        <location filename="../src/GUI/gui.cpp" line="710"/>
         <source>Next/Previous</source>
         <translation>Siguiente/Anterior</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="704"/>
+        <location filename="../src/GUI/gui.cpp" line="712"/>
         <source>Toggle graph type</source>
         <translation>Tipo de gráfica</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="706"/>
+        <location filename="../src/GUI/gui.cpp" line="714"/>
         <source>Toggle time type</source>
         <translation>Cambiar hora</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="710"/>
+        <location filename="../src/GUI/gui.cpp" line="718"/>
         <source>Previous map</source>
         <translation>Anterior mapa</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="711"/>
+        <location filename="../src/GUI/gui.cpp" line="719"/>
         <source>Zoom in</source>
         <translation>Acercar</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="713"/>
+        <location filename="../src/GUI/gui.cpp" line="721"/>
         <source>Zoom out</source>
         <translation>Alejar</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="715"/>
+        <location filename="../src/GUI/gui.cpp" line="723"/>
         <source>Digital zoom</source>
         <translation>Escala digital</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="716"/>
+        <location filename="../src/GUI/gui.cpp" line="724"/>
         <source>Zoom</source>
         <translation>Escala</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="729"/>
+        <location filename="../src/GUI/gui.cpp" line="737"/>
         <source>Map directory:</source>
         <translation>Carpeta de mapas:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="731"/>
+        <location filename="../src/GUI/gui.cpp" line="739"/>
         <source>POI directory:</source>
         <translation>Carpeta de POI:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="733"/>
+        <location filename="../src/GUI/gui.cpp" line="741"/>
         <source>GCS/PCS directory:</source>
         <translation>Carpeta de GCS/PCS:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="735"/>
+        <location filename="../src/GUI/gui.cpp" line="743"/>
         <source>DEM directory:</source>
         <translation>Carpeta del MDT :</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="737"/>
+        <location filename="../src/GUI/gui.cpp" line="745"/>
         <source>Styles directory:</source>
         <translation>Directorio de estilos:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="739"/>
+        <location filename="../src/GUI/gui.cpp" line="747"/>
         <source>Tile cache directory:</source>
         <translation>Cache de teselas:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="748"/>
+        <location filename="../src/GUI/gui.cpp" line="756"/>
         <source>Open file</source>
         <translation>Abrir archivo</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="848"/>
+        <location filename="../src/GUI/gui.cpp" line="856"/>
         <source>Error loading data file:</source>
         <translation>Error de carga del archivo:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="851"/>
-        <location filename="../src/GUI/gui.cpp" line="886"/>
+        <location filename="../src/GUI/gui.cpp" line="859"/>
+        <location filename="../src/GUI/gui.cpp" line="894"/>
         <source>Line: %1</source>
         <translation>Renglón: %1</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="859"/>
+        <location filename="../src/GUI/gui.cpp" line="867"/>
         <source>Open POI file</source>
         <translation>Cargar archivo de POI</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="883"/>
+        <location filename="../src/GUI/gui.cpp" line="891"/>
         <source>Error loading POI file:</source>
         <translation>Error al cargar el archivo de POI:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1055"/>
-        <location filename="../src/GUI/gui.cpp" line="1126"/>
+        <location filename="../src/GUI/gui.cpp" line="1100"/>
+        <location filename="../src/GUI/gui.cpp" line="1172"/>
         <source>Tracks</source>
         <translation>Tracks</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1058"/>
-        <location filename="../src/GUI/gui.cpp" line="1128"/>
+        <location filename="../src/GUI/gui.cpp" line="1103"/>
+        <location filename="../src/GUI/gui.cpp" line="1174"/>
         <source>Routes</source>
         <translation>Rutas</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1061"/>
-        <location filename="../src/GUI/gui.cpp" line="1130"/>
+        <location filename="../src/GUI/gui.cpp" line="1106"/>
+        <location filename="../src/GUI/gui.cpp" line="1176"/>
         <source>Waypoints</source>
         <translation>Puntos de referencia</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1064"/>
-        <location filename="../src/GUI/gui.cpp" line="1132"/>
+        <location filename="../src/GUI/gui.cpp" line="1109"/>
+        <location filename="../src/GUI/gui.cpp" line="1178"/>
         <source>Areas</source>
         <translation>Áreas</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1070"/>
-        <location filename="../src/GUI/gui.cpp" line="1074"/>
-        <location filename="../src/GUI/gui.cpp" line="1138"/>
-        <location filename="../src/GUI/gui.cpp" line="1141"/>
+        <location filename="../src/GUI/gui.cpp" line="1115"/>
+        <location filename="../src/GUI/gui.cpp" line="1119"/>
+        <location filename="../src/GUI/gui.cpp" line="1184"/>
+        <location filename="../src/GUI/gui.cpp" line="1187"/>
         <source>Date</source>
         <translation>Fecha</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1107"/>
-        <location filename="../src/GUI/gui.cpp" line="1108"/>
+        <location filename="../src/GUI/gui.cpp" line="1152"/>
+        <location filename="../src/GUI/gui.cpp" line="1153"/>
         <source>Statistics</source>
         <translation>Estadísticas</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1122"/>
+        <location filename="../src/GUI/gui.cpp" line="1168"/>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1340"/>
+        <location filename="../src/GUI/gui.cpp" line="1424"/>
         <source>Open map file</source>
         <translation>Abrir archivo de mapa</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1360"/>
-        <location filename="../src/GUI/gui.cpp" line="1391"/>
+        <location filename="../src/GUI/gui.cpp" line="1444"/>
+        <location filename="../src/GUI/gui.cpp" line="1475"/>
         <source>Error loading map:</source>
         <translation>Error al cargar el archivo de mapa:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1401"/>
+        <location filename="../src/GUI/gui.cpp" line="1485"/>
         <source>No files loaded</source>
         <translation>Sin archivos cargados</translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/GUI/gui.cpp" line="1405"/>
+        <location filename="../src/GUI/gui.cpp" line="1489"/>
         <source>%n files</source>
         <translation>
             <numerusform>%n archivo</numerusform>
@@ -1579,6 +1499,159 @@
         <translation>Opciones</translation>
     </message>
 </context>
+<context>
+    <name>PDFExportDialog</name>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="24"/>
+        <source>PDF files</source>
+        <translation>Archivos PDF</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="24"/>
+        <source>All files</source>
+        <translation>Todos los archivos</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="51"/>
+        <source>Portrait</source>
+        <translation>Vertical</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="52"/>
+        <source>Landscape</source>
+        <translation>Horizontal</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="62"/>
+        <source>in</source>
+        <translation>in</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="62"/>
+        <source>cm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="68"/>
+        <source>Page Setup</source>
+        <translation>Configuración de página</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="71"/>
+        <source>Page size:</source>
+        <translation>Formato de página:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="72"/>
+        <source>Resolution:</source>
+        <translation>Resolución:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="73"/>
+        <source>Orientation:</source>
+        <translation>Orientación:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="74"/>
+        <source>Margins:</source>
+        <translation>Márgenes:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="80"/>
+        <source>File:</source>
+        <translation>Archivo:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="87"/>
+        <source>Output file</source>
+        <translation>Nombre</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="94"/>
+        <source>Export</source>
+        <translation>Exportar</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="109"/>
+        <source>Export to PDF</source>
+        <translation>Exportar a PDF</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="117"/>
+        <source>Error</source>
+        <translation>Error</translation>
+    </message>
+</context>
+<context>
+    <name>PNGExportDialog</name>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="22"/>
+        <source>PNG files</source>
+        <translation>Archivos PNG</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="22"/>
+        <source>All files</source>
+        <translation>Todos los archivos</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="30"/>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="35"/>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="39"/>
+        <source>px</source>
+        <translation>px</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="41"/>
+        <source>Use anti-aliasing</source>
+        <translation type="unfinished">Usar anti-aliasing</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="45"/>
+        <source>Image Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="48"/>
+        <source>Image width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="49"/>
+        <source>Image height:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="50"/>
+        <source>Margins:</source>
+        <translation>Márgenes:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="57"/>
+        <source>File:</source>
+        <translation>Archivo:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="64"/>
+        <source>Output file</source>
+        <translation>Nombre</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="71"/>
+        <source>Export</source>
+        <translation>Exportar</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="86"/>
+        <source>Export to PNG</source>
+        <translation>Exportar a PNG</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="94"/>
+        <source>Error</source>
+        <translation>Error</translation>
+    </message>
+</context>
 <context>
     <name>PolygonItem</name>
     <message>

lang/gpxsee_fi.ts

@@ -204,106 +204,6 @@
         <translation>Minimi</translation>
     </message>
 </context>
-<context>
-    <name>ExportDialog</name>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="135"/>
-        <source>Export to PDF</source>
-        <translation>Vie PDF:ksi</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="52"/>
-        <source>Portrait</source>
-        <translation>Pystysuunta</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="53"/>
-        <source>Landscape</source>
-        <translation>Vaakasuunta</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="97"/>
-        <source>Page size:</source>
-        <translation>Sivukoko:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="99"/>
-        <source>Orientation:</source>
-        <translation>Suunta:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="94"/>
-        <source>Page Setup</source>
-        <translation>Sivuasetukset</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="25"/>
-        <source>PDF files</source>
-        <translation>PDF-tiedostot</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="25"/>
-        <source>All files</source>
-        <translation>Kaikki tiedostot</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="66"/>
-        <source>in</source>
-        <translation>in</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="66"/>
-        <source>mm</source>
-        <translation>mm</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="98"/>
-        <source>Resolution:</source>
-        <translation>Resoluutio:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="100"/>
-        <source>Margins:</source>
-        <translation>Reunukset:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="106"/>
-        <source>File:</source>
-        <translation>Tiedosto:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="113"/>
-        <source>Output file</source>
-        <translation>Tulostustiedosto</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="120"/>
-        <source>Export</source>
-        <translation>Vie</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="142"/>
-        <location filename="../src/GUI/exportdialog.cpp" line="152"/>
-        <location filename="../src/GUI/exportdialog.cpp" line="157"/>
-        <source>Error</source>
-        <translation>Virhe</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="142"/>
-        <source>No output file selected.</source>
-        <translation>Ei tulostustiedostoa valittu.</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="152"/>
-        <source>%1 is a directory.</source>
-        <translation>%1 on hakemisto.</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="157"/>
-        <source>%1 is not writable.</source>
-        <translation>%1 ei voi kirjoittaa.</translation>
-    </message>
-</context>
 <context>
     <name>FileSelectWidget</name>
     <message>
@@ -311,6 +211,21 @@
         <source>Select file</source>
         <translation>Valitse tiedosto</translation>
     </message>
+    <message>
+        <location filename="../src/GUI/fileselectwidget.cpp" line="48"/>
+        <source>No output file selected.</source>
+        <translation>Ei tulostustiedostoa valittu.</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/fileselectwidget.cpp" line="58"/>
+        <source>%1 is a directory.</source>
+        <translation>%1 on hakemisto.</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/fileselectwidget.cpp" line="62"/>
+        <source>%1 is not writable.</source>
+        <translation>%1 ei voi kirjoittaa.</translation>
+    </message>
 </context>
 <context>
     <name>Format</name>
@@ -346,12 +261,12 @@
 <context>
     <name>GUI</name>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="748"/>
+        <location filename="../src/GUI/gui.cpp" line="756"/>
         <source>Open file</source>
         <translation>Avaa tiedosto</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="859"/>
+        <location filename="../src/GUI/gui.cpp" line="867"/>
         <source>Open POI file</source>
         <translation>Avaa POI-tiedosto</translation>
     </message>
@@ -362,58 +277,58 @@
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="214"/>
-        <location filename="../src/GUI/gui.cpp" line="691"/>
-        <location filename="../src/GUI/gui.cpp" line="692"/>
+        <location filename="../src/GUI/gui.cpp" line="699"/>
+        <location filename="../src/GUI/gui.cpp" line="700"/>
         <source>Keyboard controls</source>
         <translation>Näppäimistön säätimet</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="240"/>
+        <location filename="../src/GUI/gui.cpp" line="247"/>
         <source>Close</source>
         <translation>Sulje</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="246"/>
+        <location filename="../src/GUI/gui.cpp" line="253"/>
         <source>Reload</source>
         <translation>Lataa uudelleen</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="596"/>
+        <location filename="../src/GUI/gui.cpp" line="604"/>
         <source>Show</source>
         <translation>Näytä</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="588"/>
+        <location filename="../src/GUI/gui.cpp" line="596"/>
         <source>File</source>
         <translation>Tiedosto</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="265"/>
+        <location filename="../src/GUI/gui.cpp" line="272"/>
         <source>Close POI files</source>
         <translation>Sulje POI-tiedostot</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="269"/>
+        <location filename="../src/GUI/gui.cpp" line="276"/>
         <source>Overlap POIs</source>
         <translation>Aseta POI:t limittäin</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="274"/>
+        <location filename="../src/GUI/gui.cpp" line="281"/>
         <source>Show POI labels</source>
         <translation>Näytä POI:n nimiöt</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="279"/>
+        <location filename="../src/GUI/gui.cpp" line="286"/>
         <source>Show POIs</source>
         <translation>Näytä POI:t</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="290"/>
+        <location filename="../src/GUI/gui.cpp" line="297"/>
         <source>Show map</source>
         <translation>Näytä kartta</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="303"/>
+        <location filename="../src/GUI/gui.cpp" line="310"/>
         <source>Clear tile cache</source>
         <translation>Tyhjennä välimuisti</translation>
     </message>
@@ -424,349 +339,354 @@
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="211"/>
-        <location filename="../src/GUI/gui.cpp" line="725"/>
-        <location filename="../src/GUI/gui.cpp" line="726"/>
+        <location filename="../src/GUI/gui.cpp" line="733"/>
+        <location filename="../src/GUI/gui.cpp" line="734"/>
         <source>Paths</source>
         <translation>Tiedostopolut</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="253"/>
+        <location filename="../src/GUI/gui.cpp" line="241"/>
+        <source>Export to PNG...</source>
+        <translation>Vie PNG:ksi...</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/gui.cpp" line="260"/>
         <source>Statistics...</source>
         <translation>Tilasto...</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="261"/>
+        <location filename="../src/GUI/gui.cpp" line="268"/>
         <source>Load POI file...</source>
         <translation>Lataa POI-tiedosto...</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="299"/>
+        <location filename="../src/GUI/gui.cpp" line="306"/>
         <source>Load map...</source>
         <translation>Lataa kartta...</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="308"/>
-        <location filename="../src/GUI/gui.cpp" line="313"/>
-        <location filename="../src/GUI/gui.cpp" line="708"/>
+        <location filename="../src/GUI/gui.cpp" line="315"/>
+        <location filename="../src/GUI/gui.cpp" line="320"/>
+        <location filename="../src/GUI/gui.cpp" line="716"/>
         <source>Next map</source>
         <translation>Seuraava kartta</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="318"/>
+        <location filename="../src/GUI/gui.cpp" line="325"/>
         <source>Show cursor coordinates</source>
         <translation>Näytä kohdistimen koordinaatit</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="325"/>
+        <location filename="../src/GUI/gui.cpp" line="332"/>
         <source>Show tracks</source>
         <translation>Näytä jäljet</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="330"/>
+        <location filename="../src/GUI/gui.cpp" line="337"/>
         <source>Show routes</source>
         <translation>Näytä reitit</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="335"/>
+        <location filename="../src/GUI/gui.cpp" line="342"/>
         <source>Show waypoints</source>
         <translation>Näytä reittipisteet</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="340"/>
+        <location filename="../src/GUI/gui.cpp" line="347"/>
         <source>Show areas</source>
         <translation>Näytä alueet</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="345"/>
+        <location filename="../src/GUI/gui.cpp" line="352"/>
         <source>Waypoint labels</source>
         <translation>Reittipisteen nimiöt</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="355"/>
+        <location filename="../src/GUI/gui.cpp" line="362"/>
         <source>km/mi markers</source>
         <translation>km/mi merkit</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="362"/>
+        <location filename="../src/GUI/gui.cpp" line="369"/>
         <source>Show graphs</source>
         <translation>Näytä kaaviokuvat</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="386"/>
+        <location filename="../src/GUI/gui.cpp" line="393"/>
         <source>Show grid</source>
         <translation>Näytä ruudukko</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="391"/>
+        <location filename="../src/GUI/gui.cpp" line="398"/>
         <source>Show slider info</source>
         <translation>Näytä liukusäätimen arvo</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="396"/>
+        <location filename="../src/GUI/gui.cpp" line="403"/>
         <source>Show path markers</source>
         <translation>Näytä merkki jäljellä</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="403"/>
+        <location filename="../src/GUI/gui.cpp" line="410"/>
         <source>Show toolbars</source>
         <translation>Näytä työkalupalkit</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="410"/>
+        <location filename="../src/GUI/gui.cpp" line="417"/>
         <source>Total time</source>
         <translation>Kokonaisaika</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="416"/>
-        <location filename="../src/GUI/gui.cpp" line="1086"/>
-        <location filename="../src/GUI/gui.cpp" line="1152"/>
+        <location filename="../src/GUI/gui.cpp" line="423"/>
+        <location filename="../src/GUI/gui.cpp" line="1131"/>
+        <location filename="../src/GUI/gui.cpp" line="1198"/>
         <source>Moving time</source>
         <translation>Liikkumisaika</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="424"/>
+        <location filename="../src/GUI/gui.cpp" line="431"/>
         <source>Metric</source>
         <translation>Metriset</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="430"/>
+        <location filename="../src/GUI/gui.cpp" line="437"/>
         <source>Imperial</source>
         <translation>Brittiläiset</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="436"/>
+        <location filename="../src/GUI/gui.cpp" line="443"/>
         <source>Nautical</source>
         <translation>Merelliset</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="444"/>
+        <location filename="../src/GUI/gui.cpp" line="451"/>
         <source>Decimal degrees (DD)</source>
         <translation>Desimaaliasteet (DD)</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="450"/>
+        <location filename="../src/GUI/gui.cpp" line="457"/>
         <source>Degrees and decimal minutes (DMM)</source>
         <translation>Asteet, desimaaliminuutit (DMM)</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="457"/>
+        <location filename="../src/GUI/gui.cpp" line="464"/>
         <source>Degrees, minutes, seconds (DMS)</source>
         <translation>Asteet, minuutit, sekunnit (DMS)</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="463"/>
+        <location filename="../src/GUI/gui.cpp" line="470"/>
         <source>Fullscreen mode</source>
         <translation>Kokoruututila</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="470"/>
+        <location filename="../src/GUI/gui.cpp" line="477"/>
         <source>Options...</source>
         <translation>Valinnat...</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="476"/>
+        <location filename="../src/GUI/gui.cpp" line="483"/>
         <source>Next</source>
         <translation>Seuraava</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="480"/>
+        <location filename="../src/GUI/gui.cpp" line="487"/>
         <source>Previous</source>
         <translation>Edellinen</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="484"/>
+        <location filename="../src/GUI/gui.cpp" line="491"/>
         <source>Last</source>
         <translation>Viimeinen</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="488"/>
+        <location filename="../src/GUI/gui.cpp" line="495"/>
         <source>First</source>
         <translation>Ensimmäinen</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="532"/>
+        <location filename="../src/GUI/gui.cpp" line="540"/>
         <source>POI files</source>
         <translation>POI-tiedostot</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="544"/>
+        <location filename="../src/GUI/gui.cpp" line="552"/>
         <source>Display</source>
         <translation>Näytä</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="558"/>
+        <location filename="../src/GUI/gui.cpp" line="566"/>
         <source>Units</source>
         <translation>Yksiköt</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="562"/>
+        <location filename="../src/GUI/gui.cpp" line="570"/>
         <source>Coordinates format</source>
         <translation>Koordinaattien muoto</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="670"/>
+        <location filename="../src/GUI/gui.cpp" line="678"/>
         <source>Version %1</source>
         <translation>Versio %1</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="674"/>
+        <location filename="../src/GUI/gui.cpp" line="682"/>
         <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 %1.</source>
         <translation>GPXSee levitetään GNU yleisen lisenssin version 3 alaisena. Voit katsoa lisätietoja GPXSee:stä projektin kotisivulla %1.</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="701"/>
+        <location filename="../src/GUI/gui.cpp" line="709"/>
         <source>Append file</source>
         <translation>Lisää tiedosto</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="702"/>
+        <location filename="../src/GUI/gui.cpp" line="710"/>
         <source>Next/Previous</source>
         <translation>Seuraava/edellinen</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="704"/>
+        <location filename="../src/GUI/gui.cpp" line="712"/>
         <source>Toggle graph type</source>
         <translation>Vaihda kaaviokuvan tyyppi</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="706"/>
+        <location filename="../src/GUI/gui.cpp" line="714"/>
         <source>Toggle time type</source>
         <translation>Vaihda ajan tyyppi</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="710"/>
+        <location filename="../src/GUI/gui.cpp" line="718"/>
         <source>Previous map</source>
         <translation>Edellinen kartta</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="711"/>
+        <location filename="../src/GUI/gui.cpp" line="719"/>
         <source>Zoom in</source>
         <translation>Lähennä</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="713"/>
+        <location filename="../src/GUI/gui.cpp" line="721"/>
         <source>Zoom out</source>
         <translation>Loitonna</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="715"/>
+        <location filename="../src/GUI/gui.cpp" line="723"/>
         <source>Digital zoom</source>
         <translation>Digitaalinen zoomi</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="716"/>
+        <location filename="../src/GUI/gui.cpp" line="724"/>
         <source>Zoom</source>
         <translation>Zoom</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="733"/>
+        <location filename="../src/GUI/gui.cpp" line="741"/>
         <source>GCS/PCS directory:</source>
         <translation>GCS/PCS:n hakemisto:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="735"/>
+        <location filename="../src/GUI/gui.cpp" line="743"/>
         <source>DEM directory:</source>
         <translation>DEM -tietojen hakemisto:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="737"/>
+        <location filename="../src/GUI/gui.cpp" line="745"/>
         <source>Styles directory:</source>
         <translation>Tyylitiedostoiden hakemisto:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1064"/>
-        <location filename="../src/GUI/gui.cpp" line="1132"/>
+        <location filename="../src/GUI/gui.cpp" line="1109"/>
+        <location filename="../src/GUI/gui.cpp" line="1178"/>
         <source>Areas</source>
         <translation>Alueet</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1107"/>
-        <location filename="../src/GUI/gui.cpp" line="1108"/>
+        <location filename="../src/GUI/gui.cpp" line="1152"/>
+        <location filename="../src/GUI/gui.cpp" line="1153"/>
         <source>Statistics</source>
         <translation>Tilasto</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1340"/>
+        <location filename="../src/GUI/gui.cpp" line="1424"/>
         <source>Open map file</source>
         <translation>Avaa karttatiedosto</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1401"/>
+        <location filename="../src/GUI/gui.cpp" line="1485"/>
         <source>No files loaded</source>
         <translation>Yhtään tiedostoa ei ladattu</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1070"/>
-        <location filename="../src/GUI/gui.cpp" line="1074"/>
-        <location filename="../src/GUI/gui.cpp" line="1138"/>
-        <location filename="../src/GUI/gui.cpp" line="1141"/>
+        <location filename="../src/GUI/gui.cpp" line="1115"/>
+        <location filename="../src/GUI/gui.cpp" line="1119"/>
+        <location filename="../src/GUI/gui.cpp" line="1184"/>
+        <location filename="../src/GUI/gui.cpp" line="1187"/>
         <source>Date</source>
         <translation>Päivämäärä</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="496"/>
+        <location filename="../src/GUI/gui.cpp" line="503"/>
         <source>&amp;File</source>
         <translation>&amp;Tiedosto</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="511"/>
+        <location filename="../src/GUI/gui.cpp" line="519"/>
         <source>&amp;Map</source>
         <translation>&amp;Kartat</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="521"/>
+        <location filename="../src/GUI/gui.cpp" line="529"/>
         <source>&amp;Graph</source>
         <translation>Kaa&amp;viokuva</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="531"/>
+        <location filename="../src/GUI/gui.cpp" line="539"/>
         <source>&amp;POI</source>
         <translation>&amp;POI</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="543"/>
+        <location filename="../src/GUI/gui.cpp" line="551"/>
         <source>&amp;Data</source>
         <translation>Tie&amp;dot</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="554"/>
+        <location filename="../src/GUI/gui.cpp" line="562"/>
         <source>&amp;Settings</source>
         <translation>&amp;Asetukset</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="572"/>
+        <location filename="../src/GUI/gui.cpp" line="580"/>
         <source>&amp;Help</source>
         <translation>&amp;Ohje</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="729"/>
+        <location filename="../src/GUI/gui.cpp" line="737"/>
         <source>Map directory:</source>
         <translation>Karttojen hakemisto:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="731"/>
+        <location filename="../src/GUI/gui.cpp" line="739"/>
         <source>POI directory:</source>
         <translation>POI:n hakemisto:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="739"/>
+        <location filename="../src/GUI/gui.cpp" line="747"/>
         <source>Tile cache directory:</source>
         <translation>Välimuistin hakemisto:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1058"/>
-        <location filename="../src/GUI/gui.cpp" line="1128"/>
+        <location filename="../src/GUI/gui.cpp" line="1103"/>
+        <location filename="../src/GUI/gui.cpp" line="1174"/>
         <source>Routes</source>
         <translation>Reitit</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1360"/>
-        <location filename="../src/GUI/gui.cpp" line="1391"/>
+        <location filename="../src/GUI/gui.cpp" line="1444"/>
+        <location filename="../src/GUI/gui.cpp" line="1475"/>
         <source>Error loading map:</source>
         <translation>Virhe ladattaessa karttaa:</translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/GUI/gui.cpp" line="1405"/>
+        <location filename="../src/GUI/gui.cpp" line="1489"/>
         <source>%n files</source>
         <translation>
             <numerusform>%n tiedosto</numerusform>
@@ -774,7 +694,7 @@
         </translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="695"/>
+        <location filename="../src/GUI/gui.cpp" line="703"/>
         <source>Next file</source>
         <translation>Seuraava tiedosto</translation>
     </message>
@@ -789,81 +709,81 @@
         <translation>Vie PDF:ksi...</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1061"/>
-        <location filename="../src/GUI/gui.cpp" line="1130"/>
+        <location filename="../src/GUI/gui.cpp" line="1106"/>
+        <location filename="../src/GUI/gui.cpp" line="1176"/>
         <source>Waypoints</source>
         <translation>Reittipisteet</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="696"/>
+        <location filename="../src/GUI/gui.cpp" line="704"/>
         <source>Previous file</source>
         <translation>Edellinen tiedosto</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="350"/>
+        <location filename="../src/GUI/gui.cpp" line="357"/>
         <source>Route waypoints</source>
         <translation>Reittipisteet</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="698"/>
+        <location filename="../src/GUI/gui.cpp" line="706"/>
         <source>First file</source>
         <translation>Ensimmäinen tiedosto</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="700"/>
+        <location filename="../src/GUI/gui.cpp" line="708"/>
         <source>Last file</source>
         <translation>Viimeinen tiedosto</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="848"/>
+        <location filename="../src/GUI/gui.cpp" line="856"/>
         <source>Error loading data file:</source>
         <translation>Virhe ladattaessa datatiedostoa:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="851"/>
-        <location filename="../src/GUI/gui.cpp" line="886"/>
+        <location filename="../src/GUI/gui.cpp" line="859"/>
+        <location filename="../src/GUI/gui.cpp" line="894"/>
         <source>Line: %1</source>
         <translation>Rivi: %1</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="883"/>
+        <location filename="../src/GUI/gui.cpp" line="891"/>
         <source>Error loading POI file:</source>
         <translation>Virhe ladattaessa POI-tiedostoa:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1122"/>
+        <location filename="../src/GUI/gui.cpp" line="1168"/>
         <source>Name</source>
         <translation>Nimi</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1055"/>
-        <location filename="../src/GUI/gui.cpp" line="1126"/>
+        <location filename="../src/GUI/gui.cpp" line="1100"/>
+        <location filename="../src/GUI/gui.cpp" line="1172"/>
         <source>Tracks</source>
         <translation>Jäljet</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="217"/>
-        <location filename="../src/GUI/gui.cpp" line="669"/>
+        <location filename="../src/GUI/gui.cpp" line="677"/>
         <source>About GPXSee</source>
         <translation>Tietoja GPXSee:stä</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="603"/>
+        <location filename="../src/GUI/gui.cpp" line="611"/>
         <source>Navigation</source>
         <translation>Navigointi</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="372"/>
-        <location filename="../src/GUI/gui.cpp" line="1081"/>
-        <location filename="../src/GUI/gui.cpp" line="1148"/>
+        <location filename="../src/GUI/gui.cpp" line="379"/>
+        <location filename="../src/GUI/gui.cpp" line="1126"/>
+        <location filename="../src/GUI/gui.cpp" line="1194"/>
         <source>Distance</source>
         <translation>Etäisyys</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="379"/>
-        <location filename="../src/GUI/gui.cpp" line="555"/>
-        <location filename="../src/GUI/gui.cpp" line="1084"/>
-        <location filename="../src/GUI/gui.cpp" line="1150"/>
+        <location filename="../src/GUI/gui.cpp" line="386"/>
+        <location filename="../src/GUI/gui.cpp" line="563"/>
+        <location filename="../src/GUI/gui.cpp" line="1129"/>
+        <location filename="../src/GUI/gui.cpp" line="1196"/>
         <source>Time</source>
         <translation>Aika</translation>
     </message>
@@ -1352,7 +1272,7 @@
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="442"/>
         <source>Use segments</source>
-        <translation type="unfinished"></translation>
+        <translation>Käytä segmenttejä</translation>
     </message>
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="481"/>
@@ -1579,6 +1499,159 @@
         <translation>Valinnat</translation>
     </message>
 </context>
+<context>
+    <name>PDFExportDialog</name>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="24"/>
+        <source>PDF files</source>
+        <translation>PDF-tiedostot</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="24"/>
+        <source>All files</source>
+        <translation>Kaikki tiedostot</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="51"/>
+        <source>Portrait</source>
+        <translation>Pystysuunta</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="52"/>
+        <source>Landscape</source>
+        <translation>Vaakasuunta</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="62"/>
+        <source>in</source>
+        <translation>in</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="62"/>
+        <source>cm</source>
+        <translation>cm</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="68"/>
+        <source>Page Setup</source>
+        <translation>Sivuasetukset</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="71"/>
+        <source>Page size:</source>
+        <translation>Sivukoko:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="72"/>
+        <source>Resolution:</source>
+        <translation>Resoluutio:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="73"/>
+        <source>Orientation:</source>
+        <translation>Suunta:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="74"/>
+        <source>Margins:</source>
+        <translation>Reunukset:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="80"/>
+        <source>File:</source>
+        <translation>Tiedosto:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="87"/>
+        <source>Output file</source>
+        <translation>Tulostustiedosto</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="94"/>
+        <source>Export</source>
+        <translation>Vie</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="109"/>
+        <source>Export to PDF</source>
+        <translation>Vie PDF:ksi</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="117"/>
+        <source>Error</source>
+        <translation>Virhe</translation>
+    </message>
+</context>
+<context>
+    <name>PNGExportDialog</name>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="22"/>
+        <source>PNG files</source>
+        <translation>PNG-tiedostot</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="22"/>
+        <source>All files</source>
+        <translation>Kaikki tiedostot</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="30"/>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="35"/>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="39"/>
+        <source>px</source>
+        <translation>px</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="41"/>
+        <source>Use anti-aliasing</source>
+        <translation>Käytä reunanpehmennystä</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="45"/>
+        <source>Image Setup</source>
+        <translation>Kuvaasetukset</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="48"/>
+        <source>Image width:</source>
+        <translation>Kuvan leveys:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="49"/>
+        <source>Image height:</source>
+        <translation>Kuvan korkeus:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="50"/>
+        <source>Margins:</source>
+        <translation>Reunukset:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="57"/>
+        <source>File:</source>
+        <translation>Tiedosto:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="64"/>
+        <source>Output file</source>
+        <translation>Tulostustiedosto</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="71"/>
+        <source>Export</source>
+        <translation>Vie</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="86"/>
+        <source>Export to PNG</source>
+        <translation>Vie PNG:ksi</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="94"/>
+        <source>Error</source>
+        <translation>Virhe</translation>
+    </message>
+</context>
 <context>
     <name>PolygonItem</name>
     <message>

lang/gpxsee_fr.ts

@@ -204,106 +204,6 @@
         <translation>Minimum</translation>
     </message>
 </context>
-<context>
-    <name>ExportDialog</name>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="135"/>
-        <source>Export to PDF</source>
-        <translation>Exporter au format PDF</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="52"/>
-        <source>Portrait</source>
-        <translation>Portrait</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="53"/>
-        <source>Landscape</source>
-        <translation>Paysage</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="97"/>
-        <source>Page size:</source>
-        <translation>Format de papier :</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="99"/>
-        <source>Orientation:</source>
-        <translation>Orientation :</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="94"/>
-        <source>Page Setup</source>
-        <translation>Style de page</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="25"/>
-        <source>PDF files</source>
-        <translation>Fichiers PDF</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="25"/>
-        <source>All files</source>
-        <translation>Tous les fichiers</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="66"/>
-        <source>in</source>
-        <translation>po</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="66"/>
-        <source>mm</source>
-        <translation>mm</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="98"/>
-        <source>Resolution:</source>
-        <translation>Résolution :</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="100"/>
-        <source>Margins:</source>
-        <translation>Marges :</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="106"/>
-        <source>File:</source>
-        <translation>Fichier :</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="113"/>
-        <source>Output file</source>
-        <translation>Fichier exporté</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="120"/>
-        <source>Export</source>
-        <translation>Exporter</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="142"/>
-        <location filename="../src/GUI/exportdialog.cpp" line="152"/>
-        <location filename="../src/GUI/exportdialog.cpp" line="157"/>
-        <source>Error</source>
-        <translation>Erreur</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="142"/>
-        <source>No output file selected.</source>
-        <translation>Auncun fichier sélectionné.</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="152"/>
-        <source>%1 is a directory.</source>
-        <translation>%1 est un dossier.</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="157"/>
-        <source>%1 is not writable.</source>
-        <translation>%1 n&apos;est pas inscriptible.</translation>
-    </message>
-</context>
 <context>
     <name>FileSelectWidget</name>
     <message>
@@ -311,6 +211,21 @@
         <source>Select file</source>
         <translation>Sélectionner un fichier</translation>
     </message>
+    <message>
+        <location filename="../src/GUI/fileselectwidget.cpp" line="48"/>
+        <source>No output file selected.</source>
+        <translation>Auncun fichier sélectionné.</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/fileselectwidget.cpp" line="58"/>
+        <source>%1 is a directory.</source>
+        <translation>%1 est un dossier.</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/fileselectwidget.cpp" line="62"/>
+        <source>%1 is not writable.</source>
+        <translation>%1 n&apos;est pas inscriptible.</translation>
+    </message>
 </context>
 <context>
     <name>Format</name>
@@ -346,22 +261,22 @@
 <context>
     <name>GUI</name>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="729"/>
+        <location filename="../src/GUI/gui.cpp" line="737"/>
         <source>Map directory:</source>
         <translation>Dossier des cartes :</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="731"/>
+        <location filename="../src/GUI/gui.cpp" line="739"/>
         <source>POI directory:</source>
         <translation>Dossier des POI :</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="748"/>
+        <location filename="../src/GUI/gui.cpp" line="756"/>
         <source>Open file</source>
         <translation>Ouvrir un fichier</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="859"/>
+        <location filename="../src/GUI/gui.cpp" line="867"/>
         <source>Open POI file</source>
         <translation>Ouvrir un fichier POI</translation>
     </message>
@@ -372,58 +287,58 @@
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="214"/>
-        <location filename="../src/GUI/gui.cpp" line="691"/>
-        <location filename="../src/GUI/gui.cpp" line="692"/>
+        <location filename="../src/GUI/gui.cpp" line="699"/>
+        <location filename="../src/GUI/gui.cpp" line="700"/>
         <source>Keyboard controls</source>
         <translation>Raccourcis clavier</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="240"/>
+        <location filename="../src/GUI/gui.cpp" line="247"/>
         <source>Close</source>
         <translation>Fermer</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="246"/>
+        <location filename="../src/GUI/gui.cpp" line="253"/>
         <source>Reload</source>
         <translation>Actualiser</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="596"/>
+        <location filename="../src/GUI/gui.cpp" line="604"/>
         <source>Show</source>
         <translation>Afficher</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="588"/>
+        <location filename="../src/GUI/gui.cpp" line="596"/>
         <source>File</source>
         <translation>Fichier</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="265"/>
+        <location filename="../src/GUI/gui.cpp" line="272"/>
         <source>Close POI files</source>
         <translation>Fermer les fichiers POI</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="269"/>
+        <location filename="../src/GUI/gui.cpp" line="276"/>
         <source>Overlap POIs</source>
         <translation>Superposer les POI</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="274"/>
+        <location filename="../src/GUI/gui.cpp" line="281"/>
         <source>Show POI labels</source>
         <translation>Afficher les notes des POI</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="279"/>
+        <location filename="../src/GUI/gui.cpp" line="286"/>
         <source>Show POIs</source>
         <translation>Afficher les POI</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="290"/>
+        <location filename="../src/GUI/gui.cpp" line="297"/>
         <source>Show map</source>
         <translation>Afficher la carte</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="303"/>
+        <location filename="../src/GUI/gui.cpp" line="310"/>
         <source>Clear tile cache</source>
         <translation>Effacer les tuiles en cache</translation>
     </message>
@@ -434,285 +349,290 @@
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="211"/>
-        <location filename="../src/GUI/gui.cpp" line="725"/>
-        <location filename="../src/GUI/gui.cpp" line="726"/>
+        <location filename="../src/GUI/gui.cpp" line="733"/>
+        <location filename="../src/GUI/gui.cpp" line="734"/>
         <source>Paths</source>
         <translation>Chemins d&apos;accès</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="253"/>
+        <location filename="../src/GUI/gui.cpp" line="241"/>
+        <source>Export to PNG...</source>
+        <translation>Exporter au format PNG...</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/gui.cpp" line="260"/>
         <source>Statistics...</source>
         <translation>Statistiques...</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="261"/>
+        <location filename="../src/GUI/gui.cpp" line="268"/>
         <source>Load POI file...</source>
         <translation>Charger un fichier POI...</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="299"/>
+        <location filename="../src/GUI/gui.cpp" line="306"/>
         <source>Load map...</source>
         <translation>Charger une carte...</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="308"/>
-        <location filename="../src/GUI/gui.cpp" line="313"/>
-        <location filename="../src/GUI/gui.cpp" line="708"/>
+        <location filename="../src/GUI/gui.cpp" line="315"/>
+        <location filename="../src/GUI/gui.cpp" line="320"/>
+        <location filename="../src/GUI/gui.cpp" line="716"/>
         <source>Next map</source>
         <translation>Carte suivante</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="318"/>
+        <location filename="../src/GUI/gui.cpp" line="325"/>
         <source>Show cursor coordinates</source>
         <translation>Afficher les coordonnées du pointeur</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="325"/>
+        <location filename="../src/GUI/gui.cpp" line="332"/>
         <source>Show tracks</source>
         <translation>Afficher la trace</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="330"/>
+        <location filename="../src/GUI/gui.cpp" line="337"/>
         <source>Show routes</source>
         <translation>Afficher la route</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="335"/>
+        <location filename="../src/GUI/gui.cpp" line="342"/>
         <source>Show waypoints</source>
         <translation>Afficher les points de jalonnement</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="340"/>
+        <location filename="../src/GUI/gui.cpp" line="347"/>
         <source>Show areas</source>
         <translation>Afficher les zones</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="345"/>
+        <location filename="../src/GUI/gui.cpp" line="352"/>
         <source>Waypoint labels</source>
         <translation>Étiquettes des jalons</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="355"/>
+        <location filename="../src/GUI/gui.cpp" line="362"/>
         <source>km/mi markers</source>
         <translation>Bornes kilométriques ou milliaires</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="362"/>
+        <location filename="../src/GUI/gui.cpp" line="369"/>
         <source>Show graphs</source>
         <translation>Afficher les graphes</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="386"/>
+        <location filename="../src/GUI/gui.cpp" line="393"/>
         <source>Show grid</source>
         <translation>Afficher la grille</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="391"/>
+        <location filename="../src/GUI/gui.cpp" line="398"/>
         <source>Show slider info</source>
         <translation>Afficher les infos du curseur</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="396"/>
+        <location filename="../src/GUI/gui.cpp" line="403"/>
         <source>Show path markers</source>
         <translation>Afficher les points de chemin</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="403"/>
+        <location filename="../src/GUI/gui.cpp" line="410"/>
         <source>Show toolbars</source>
         <translation>Afficher la barre d&apos;outils</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="410"/>
+        <location filename="../src/GUI/gui.cpp" line="417"/>
         <source>Total time</source>
         <translation>Durée totale</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="416"/>
-        <location filename="../src/GUI/gui.cpp" line="1086"/>
-        <location filename="../src/GUI/gui.cpp" line="1152"/>
+        <location filename="../src/GUI/gui.cpp" line="423"/>
+        <location filename="../src/GUI/gui.cpp" line="1131"/>
+        <location filename="../src/GUI/gui.cpp" line="1198"/>
         <source>Moving time</source>
         <translation>Durée en déplacement</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="424"/>
+        <location filename="../src/GUI/gui.cpp" line="431"/>
         <source>Metric</source>
         <translation>Métrique</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="430"/>
+        <location filename="../src/GUI/gui.cpp" line="437"/>
         <source>Imperial</source>
         <translation>Anglo-saxon</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="436"/>
+        <location filename="../src/GUI/gui.cpp" line="443"/>
         <source>Nautical</source>
         <translation>Marin</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="444"/>
+        <location filename="../src/GUI/gui.cpp" line="451"/>
         <source>Decimal degrees (DD)</source>
         <translation>Degrés décimaux (DD)</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="450"/>
+        <location filename="../src/GUI/gui.cpp" line="457"/>
         <source>Degrees and decimal minutes (DMM)</source>
         <translation>Degrés, minutes décimales (DMM)</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="457"/>
+        <location filename="../src/GUI/gui.cpp" line="464"/>
         <source>Degrees, minutes, seconds (DMS)</source>
         <translation>Degrés, minutes, secondes (DMS)</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="463"/>
+        <location filename="../src/GUI/gui.cpp" line="470"/>
         <source>Fullscreen mode</source>
         <translation>Mode plein écran</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="470"/>
+        <location filename="../src/GUI/gui.cpp" line="477"/>
         <source>Options...</source>
         <translation>Options...</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="476"/>
+        <location filename="../src/GUI/gui.cpp" line="483"/>
         <source>Next</source>
         <translation>Suivant</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="480"/>
+        <location filename="../src/GUI/gui.cpp" line="487"/>
         <source>Previous</source>
         <translation>Précédant</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="484"/>
+        <location filename="../src/GUI/gui.cpp" line="491"/>
         <source>Last</source>
         <translation>Dernier</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="488"/>
+        <location filename="../src/GUI/gui.cpp" line="495"/>
         <source>First</source>
         <translation>Premier</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="532"/>
+        <location filename="../src/GUI/gui.cpp" line="540"/>
         <source>POI files</source>
         <translation>Fichiers POI</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="544"/>
+        <location filename="../src/GUI/gui.cpp" line="552"/>
         <source>Display</source>
         <translation>Affichage</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="558"/>
+        <location filename="../src/GUI/gui.cpp" line="566"/>
         <source>Units</source>
         <translation>Système d&apos;unités</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="562"/>
+        <location filename="../src/GUI/gui.cpp" line="570"/>
         <source>Coordinates format</source>
         <translation>Unités des coordonnées</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="670"/>
+        <location filename="../src/GUI/gui.cpp" line="678"/>
         <source>Version %1</source>
         <translation>Version %1</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="674"/>
+        <location filename="../src/GUI/gui.cpp" line="682"/>
         <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 %1.</source>
         <translation>GPXSee est distribué selon les termes de la licence publique générale GNU (version 3). Pour plus d&apos;information sur GPXSee, visiter le site du projet %1.</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="701"/>
+        <location filename="../src/GUI/gui.cpp" line="709"/>
         <source>Append file</source>
         <translation>Joindre un fichier</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="702"/>
+        <location filename="../src/GUI/gui.cpp" line="710"/>
         <source>Next/Previous</source>
         <translation>Suivant/Précédant</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="704"/>
+        <location filename="../src/GUI/gui.cpp" line="712"/>
         <source>Toggle graph type</source>
         <translation>Controler le type de graphe</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="706"/>
+        <location filename="../src/GUI/gui.cpp" line="714"/>
         <source>Toggle time type</source>
         <translation>Controler le type de durée</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="710"/>
+        <location filename="../src/GUI/gui.cpp" line="718"/>
         <source>Previous map</source>
         <translation>Carte précédente</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="711"/>
+        <location filename="../src/GUI/gui.cpp" line="719"/>
         <source>Zoom in</source>
         <translation>Zoomer</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="713"/>
+        <location filename="../src/GUI/gui.cpp" line="721"/>
         <source>Zoom out</source>
         <translation>Dézoomer</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="715"/>
+        <location filename="../src/GUI/gui.cpp" line="723"/>
         <source>Digital zoom</source>
         <translation>Zoom numérique</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="716"/>
+        <location filename="../src/GUI/gui.cpp" line="724"/>
         <source>Zoom</source>
         <translation>Zoom</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="733"/>
+        <location filename="../src/GUI/gui.cpp" line="741"/>
         <source>GCS/PCS directory:</source>
         <translation>Dossiers GCS/PCS :</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="735"/>
+        <location filename="../src/GUI/gui.cpp" line="743"/>
         <source>DEM directory:</source>
         <translation>Dossier DEM :</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="737"/>
+        <location filename="../src/GUI/gui.cpp" line="745"/>
         <source>Styles directory:</source>
         <translation>Dossier de styles :</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1064"/>
-        <location filename="../src/GUI/gui.cpp" line="1132"/>
+        <location filename="../src/GUI/gui.cpp" line="1109"/>
+        <location filename="../src/GUI/gui.cpp" line="1178"/>
         <source>Areas</source>
         <translation>Zones</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1107"/>
-        <location filename="../src/GUI/gui.cpp" line="1108"/>
+        <location filename="../src/GUI/gui.cpp" line="1152"/>
+        <location filename="../src/GUI/gui.cpp" line="1153"/>
         <source>Statistics</source>
         <translation>Statistiques</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1340"/>
+        <location filename="../src/GUI/gui.cpp" line="1424"/>
         <source>Open map file</source>
         <translation>Ouvrir un fichier de carte</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1360"/>
-        <location filename="../src/GUI/gui.cpp" line="1391"/>
+        <location filename="../src/GUI/gui.cpp" line="1444"/>
+        <location filename="../src/GUI/gui.cpp" line="1475"/>
         <source>Error loading map:</source>
         <translation>Erreur lors du chargement de la carte :</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1401"/>
+        <location filename="../src/GUI/gui.cpp" line="1485"/>
         <source>No files loaded</source>
         <translation>Aucun fichier chargé</translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/GUI/gui.cpp" line="1405"/>
+        <location filename="../src/GUI/gui.cpp" line="1489"/>
         <source>%n files</source>
         <translation>
             <numerusform>%n fichier</numerusform>
@@ -720,21 +640,21 @@
         </translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1070"/>
-        <location filename="../src/GUI/gui.cpp" line="1074"/>
-        <location filename="../src/GUI/gui.cpp" line="1138"/>
-        <location filename="../src/GUI/gui.cpp" line="1141"/>
+        <location filename="../src/GUI/gui.cpp" line="1115"/>
+        <location filename="../src/GUI/gui.cpp" line="1119"/>
+        <location filename="../src/GUI/gui.cpp" line="1184"/>
+        <location filename="../src/GUI/gui.cpp" line="1187"/>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1058"/>
-        <location filename="../src/GUI/gui.cpp" line="1128"/>
+        <location filename="../src/GUI/gui.cpp" line="1103"/>
+        <location filename="../src/GUI/gui.cpp" line="1174"/>
         <source>Routes</source>
         <translation>Routes</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="695"/>
+        <location filename="../src/GUI/gui.cpp" line="703"/>
         <source>Next file</source>
         <translation>Fichier suivant</translation>
     </message>
@@ -749,121 +669,121 @@
         <translation>Exporter au format PDF...</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1061"/>
-        <location filename="../src/GUI/gui.cpp" line="1130"/>
+        <location filename="../src/GUI/gui.cpp" line="1106"/>
+        <location filename="../src/GUI/gui.cpp" line="1176"/>
         <source>Waypoints</source>
         <translation>Points de jalonnement</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="696"/>
+        <location filename="../src/GUI/gui.cpp" line="704"/>
         <source>Previous file</source>
         <translation>Fichier précédent</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="350"/>
+        <location filename="../src/GUI/gui.cpp" line="357"/>
         <source>Route waypoints</source>
         <translation>Jalons de route</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="496"/>
+        <location filename="../src/GUI/gui.cpp" line="503"/>
         <source>&amp;File</source>
         <translation>&amp;Fichier</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="511"/>
+        <location filename="../src/GUI/gui.cpp" line="519"/>
         <source>&amp;Map</source>
         <translation>&amp;Carte</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="521"/>
+        <location filename="../src/GUI/gui.cpp" line="529"/>
         <source>&amp;Graph</source>
         <translation>&amp;Graphe</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="531"/>
+        <location filename="../src/GUI/gui.cpp" line="539"/>
         <source>&amp;POI</source>
         <translation>&amp;POI</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="543"/>
+        <location filename="../src/GUI/gui.cpp" line="551"/>
         <source>&amp;Data</source>
         <translation>&amp;Données</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="554"/>
+        <location filename="../src/GUI/gui.cpp" line="562"/>
         <source>&amp;Settings</source>
         <translation>Pa&amp;ramètres</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="572"/>
+        <location filename="../src/GUI/gui.cpp" line="580"/>
         <source>&amp;Help</source>
         <translation>&amp;Aide</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="698"/>
+        <location filename="../src/GUI/gui.cpp" line="706"/>
         <source>First file</source>
         <translation>Premier fichier</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="700"/>
+        <location filename="../src/GUI/gui.cpp" line="708"/>
         <source>Last file</source>
         <translation>Dernier fichier</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="739"/>
+        <location filename="../src/GUI/gui.cpp" line="747"/>
         <source>Tile cache directory:</source>
         <translation>Dossier du cache de tuiles :</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="848"/>
+        <location filename="../src/GUI/gui.cpp" line="856"/>
         <source>Error loading data file:</source>
         <translation>Erreur lors du chargement des données :</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="851"/>
-        <location filename="../src/GUI/gui.cpp" line="886"/>
+        <location filename="../src/GUI/gui.cpp" line="859"/>
+        <location filename="../src/GUI/gui.cpp" line="894"/>
         <source>Line: %1</source>
         <translation>Ligne : %1</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="883"/>
+        <location filename="../src/GUI/gui.cpp" line="891"/>
         <source>Error loading POI file:</source>
         <translation>Erreur lors du chargement du fichier POI :</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1122"/>
+        <location filename="../src/GUI/gui.cpp" line="1168"/>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1055"/>
-        <location filename="../src/GUI/gui.cpp" line="1126"/>
+        <location filename="../src/GUI/gui.cpp" line="1100"/>
+        <location filename="../src/GUI/gui.cpp" line="1172"/>
         <source>Tracks</source>
         <translation>Traces</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="217"/>
-        <location filename="../src/GUI/gui.cpp" line="669"/>
+        <location filename="../src/GUI/gui.cpp" line="677"/>
         <source>About GPXSee</source>
         <translation>À propos de GPXSee</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="603"/>
+        <location filename="../src/GUI/gui.cpp" line="611"/>
         <source>Navigation</source>
         <translation>Navigation</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="372"/>
-        <location filename="../src/GUI/gui.cpp" line="1081"/>
-        <location filename="../src/GUI/gui.cpp" line="1148"/>
+        <location filename="../src/GUI/gui.cpp" line="379"/>
+        <location filename="../src/GUI/gui.cpp" line="1126"/>
+        <location filename="../src/GUI/gui.cpp" line="1194"/>
         <source>Distance</source>
         <translation>Distance</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="379"/>
-        <location filename="../src/GUI/gui.cpp" line="555"/>
-        <location filename="../src/GUI/gui.cpp" line="1084"/>
-        <location filename="../src/GUI/gui.cpp" line="1150"/>
+        <location filename="../src/GUI/gui.cpp" line="386"/>
+        <location filename="../src/GUI/gui.cpp" line="563"/>
+        <location filename="../src/GUI/gui.cpp" line="1129"/>
+        <location filename="../src/GUI/gui.cpp" line="1196"/>
         <source>Time</source>
         <translation>Temps</translation>
     </message>
@@ -1352,7 +1272,7 @@
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="442"/>
         <source>Use segments</source>
-        <translation type="unfinished"></translation>
+        <translation>Utiliser des segments</translation>
     </message>
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="481"/>
@@ -1579,6 +1499,159 @@
         <translation>Options</translation>
     </message>
 </context>
+<context>
+    <name>PDFExportDialog</name>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="24"/>
+        <source>PDF files</source>
+        <translation>Fichiers PDF</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="24"/>
+        <source>All files</source>
+        <translation>Tous les fichiers</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="51"/>
+        <source>Portrait</source>
+        <translation>Portrait</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="52"/>
+        <source>Landscape</source>
+        <translation>Paysage</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="62"/>
+        <source>in</source>
+        <translation>po</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="62"/>
+        <source>cm</source>
+        <translation>cm</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="68"/>
+        <source>Page Setup</source>
+        <translation>Style de page</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="71"/>
+        <source>Page size:</source>
+        <translation>Format de papier :</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="72"/>
+        <source>Resolution:</source>
+        <translation>Résolution :</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="73"/>
+        <source>Orientation:</source>
+        <translation>Orientation :</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="74"/>
+        <source>Margins:</source>
+        <translation>Marges :</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="80"/>
+        <source>File:</source>
+        <translation>Fichier :</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="87"/>
+        <source>Output file</source>
+        <translation>Fichier exporté</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="94"/>
+        <source>Export</source>
+        <translation>Exporter</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="109"/>
+        <source>Export to PDF</source>
+        <translation>Exporter au format PDF</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="117"/>
+        <source>Error</source>
+        <translation>Erreur</translation>
+    </message>
+</context>
+<context>
+    <name>PNGExportDialog</name>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="22"/>
+        <source>PNG files</source>
+        <translation>Fichiers PNG</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="22"/>
+        <source>All files</source>
+        <translation>Tous les fichiers</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="30"/>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="35"/>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="39"/>
+        <source>px</source>
+        <translation>px</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="41"/>
+        <source>Use anti-aliasing</source>
+        <translation>Utiliser l&apos;anticrénelage</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="45"/>
+        <source>Image Setup</source>
+        <translation>Paramètres d&apos;image</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="48"/>
+        <source>Image width:</source>
+        <translation>largeur :</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="49"/>
+        <source>Image height:</source>
+        <translation>hauteur :</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="50"/>
+        <source>Margins:</source>
+        <translation>Marges :</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="57"/>
+        <source>File:</source>
+        <translation>Fichier :</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="64"/>
+        <source>Output file</source>
+        <translation>Fichier exporté</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="71"/>
+        <source>Export</source>
+        <translation>Exporter</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="86"/>
+        <source>Export to PNG</source>
+        <translation>Exporter au format PNG</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="94"/>
+        <source>Error</source>
+        <translation>Erreur</translation>
+    </message>
+</context>
 <context>
     <name>PolygonItem</name>
     <message>

lang/gpxsee_hu.ts

@@ -204,106 +204,6 @@
         <translation>Minimum</translation>
     </message>
 </context>
-<context>
-    <name>ExportDialog</name>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="25"/>
-        <source>PDF files</source>
-        <translation>PDF fájlok</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="25"/>
-        <source>All files</source>
-        <translation>Minden fájl</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="52"/>
-        <source>Portrait</source>
-        <translation>Álló</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="53"/>
-        <source>Landscape</source>
-        <translation>Fekvő</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="66"/>
-        <source>mm</source>
-        <translation>mm</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="66"/>
-        <source>in</source>
-        <translation>hüvelyk</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="94"/>
-        <source>Page Setup</source>
-        <translation>Oldalbeállítás</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="97"/>
-        <source>Page size:</source>
-        <translation>Oldalméret:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="98"/>
-        <source>Resolution:</source>
-        <translation>Felbontás:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="99"/>
-        <source>Orientation:</source>
-        <translation>Tájolás:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="100"/>
-        <source>Margins:</source>
-        <translation>Margók:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="106"/>
-        <source>File:</source>
-        <translation>Fájl:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="113"/>
-        <source>Output file</source>
-        <translation>Kimeneti fájl</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="120"/>
-        <source>Export</source>
-        <translation>Exportálás</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="135"/>
-        <source>Export to PDF</source>
-        <translation>Exportálás PDF-be</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="142"/>
-        <location filename="../src/GUI/exportdialog.cpp" line="152"/>
-        <location filename="../src/GUI/exportdialog.cpp" line="157"/>
-        <source>Error</source>
-        <translation>Hiba</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="142"/>
-        <source>No output file selected.</source>
-        <translation>Nincs kimeneti fájl.</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="152"/>
-        <source>%1 is a directory.</source>
-        <translation>A(z) %1 egy mappa.</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="157"/>
-        <source>%1 is not writable.</source>
-        <translation>A(z) %1 írásvédett.</translation>
-    </message>
-</context>
 <context>
     <name>FileSelectWidget</name>
     <message>
@@ -311,6 +211,21 @@
         <source>Select file</source>
         <translation>Fájl választása</translation>
     </message>
+    <message>
+        <location filename="../src/GUI/fileselectwidget.cpp" line="48"/>
+        <source>No output file selected.</source>
+        <translation>Nincs kiválasztott kimeneti fájl.</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/fileselectwidget.cpp" line="58"/>
+        <source>%1 is a directory.</source>
+        <translation>A(z) %1 egy mappa.</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/fileselectwidget.cpp" line="62"/>
+        <source>%1 is not writable.</source>
+        <translation>A(z) %1 írásvédett.</translation>
+    </message>
 </context>
 <context>
     <name>Format</name>
@@ -352,21 +267,21 @@
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="211"/>
-        <location filename="../src/GUI/gui.cpp" line="725"/>
-        <location filename="../src/GUI/gui.cpp" line="726"/>
+        <location filename="../src/GUI/gui.cpp" line="733"/>
+        <location filename="../src/GUI/gui.cpp" line="734"/>
         <source>Paths</source>
         <translation>Elérési utak</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="214"/>
-        <location filename="../src/GUI/gui.cpp" line="691"/>
-        <location filename="../src/GUI/gui.cpp" line="692"/>
+        <location filename="../src/GUI/gui.cpp" line="699"/>
+        <location filename="../src/GUI/gui.cpp" line="700"/>
         <source>Keyboard controls</source>
         <translation>Gyorsbillentyűk</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="217"/>
-        <location filename="../src/GUI/gui.cpp" line="669"/>
+        <location filename="../src/GUI/gui.cpp" line="677"/>
         <source>About GPXSee</source>
         <translation>GPXSee névjegye</translation>
     </message>
@@ -386,484 +301,490 @@
         <translation>Exportálás PDF-be...</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="240"/>
+        <location filename="../src/GUI/gui.cpp" line="241"/>
+        <source>Export to PNG...</source>
+        <translation>Exportálás PNG-be...</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/gui.cpp" line="247"/>
         <source>Close</source>
         <translation>Fájl bezárása</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="246"/>
+        <location filename="../src/GUI/gui.cpp" line="253"/>
         <source>Reload</source>
         <translation>Újratöltés</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="253"/>
+        <location filename="../src/GUI/gui.cpp" line="260"/>
         <source>Statistics...</source>
         <translation>Statisztika...</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="261"/>
+        <location filename="../src/GUI/gui.cpp" line="268"/>
         <source>Load POI file...</source>
         <translation>POI fájl betöltése...</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="265"/>
+        <location filename="../src/GUI/gui.cpp" line="272"/>
         <source>Close POI files</source>
         <translation>POI fájlok bezárása</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="269"/>
+        <location filename="../src/GUI/gui.cpp" line="276"/>
         <source>Overlap POIs</source>
         <translation>POI-k átfedése</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="274"/>
+        <location filename="../src/GUI/gui.cpp" line="281"/>
         <source>Show POI labels</source>
         <translation>POI-k nevének mutatása</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="279"/>
+        <location filename="../src/GUI/gui.cpp" line="286"/>
         <source>Show POIs</source>
         <translation>POI-k mutatása</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="290"/>
+        <location filename="../src/GUI/gui.cpp" line="297"/>
         <source>Show map</source>
         <translation>Térkép mutatása</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="299"/>
+        <location filename="../src/GUI/gui.cpp" line="306"/>
         <source>Load map...</source>
         <translation>Térkép betöltése...</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="303"/>
+        <location filename="../src/GUI/gui.cpp" line="310"/>
         <source>Clear tile cache</source>
         <translation>Gyorsítótár törlése</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="308"/>
-        <location filename="../src/GUI/gui.cpp" line="313"/>
-        <location filename="../src/GUI/gui.cpp" line="708"/>
+        <location filename="../src/GUI/gui.cpp" line="315"/>
+        <location filename="../src/GUI/gui.cpp" line="320"/>
+        <location filename="../src/GUI/gui.cpp" line="716"/>
         <source>Next map</source>
         <translation>Következő térkép</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="318"/>
+        <location filename="../src/GUI/gui.cpp" line="325"/>
         <source>Show cursor coordinates</source>
         <translation>Mutassa a kurzor koordinátáit</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="325"/>
+        <location filename="../src/GUI/gui.cpp" line="332"/>
         <source>Show tracks</source>
         <translation>Nyomvonalak mutatása</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="330"/>
+        <location filename="../src/GUI/gui.cpp" line="337"/>
         <source>Show routes</source>
         <translation>Útvonalak mutatása</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="335"/>
+        <location filename="../src/GUI/gui.cpp" line="342"/>
         <source>Show waypoints</source>
         <translation>Köztespontok mutatása</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="340"/>
+        <location filename="../src/GUI/gui.cpp" line="347"/>
         <source>Show areas</source>
         <translation>Területek mutatása</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="345"/>
+        <location filename="../src/GUI/gui.cpp" line="352"/>
         <source>Waypoint labels</source>
         <translation>Köztespontok neve</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="350"/>
+        <location filename="../src/GUI/gui.cpp" line="357"/>
         <source>Route waypoints</source>
         <translation>Útvonal köztespontok</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="355"/>
+        <location filename="../src/GUI/gui.cpp" line="362"/>
         <source>km/mi markers</source>
         <translation>km(mérföld) jelölők</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="362"/>
+        <location filename="../src/GUI/gui.cpp" line="369"/>
         <source>Show graphs</source>
         <translation>Grafikon mutatása</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="372"/>
-        <location filename="../src/GUI/gui.cpp" line="1081"/>
-        <location filename="../src/GUI/gui.cpp" line="1148"/>
+        <location filename="../src/GUI/gui.cpp" line="379"/>
+        <location filename="../src/GUI/gui.cpp" line="1126"/>
+        <location filename="../src/GUI/gui.cpp" line="1194"/>
         <source>Distance</source>
         <translation>Távolság</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="379"/>
-        <location filename="../src/GUI/gui.cpp" line="555"/>
-        <location filename="../src/GUI/gui.cpp" line="1084"/>
-        <location filename="../src/GUI/gui.cpp" line="1150"/>
+        <location filename="../src/GUI/gui.cpp" line="386"/>
+        <location filename="../src/GUI/gui.cpp" line="563"/>
+        <location filename="../src/GUI/gui.cpp" line="1129"/>
+        <location filename="../src/GUI/gui.cpp" line="1196"/>
         <source>Time</source>
         <translation>Idő</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="386"/>
+        <location filename="../src/GUI/gui.cpp" line="393"/>
         <source>Show grid</source>
         <translation>Rácsvonalak mutatása</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="391"/>
+        <location filename="../src/GUI/gui.cpp" line="398"/>
         <source>Show slider info</source>
         <translation>Adatok a csúszka mellett</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="396"/>
+        <location filename="../src/GUI/gui.cpp" line="403"/>
         <source>Show path markers</source>
         <translation>Pozíció mutatása a térképen</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="403"/>
+        <location filename="../src/GUI/gui.cpp" line="410"/>
         <source>Show toolbars</source>
         <translation>Gombok mutatása</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="410"/>
+        <location filename="../src/GUI/gui.cpp" line="417"/>
         <source>Total time</source>
         <translation>Teljes időtartam</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="416"/>
-        <location filename="../src/GUI/gui.cpp" line="1086"/>
-        <location filename="../src/GUI/gui.cpp" line="1152"/>
+        <location filename="../src/GUI/gui.cpp" line="423"/>
+        <location filename="../src/GUI/gui.cpp" line="1131"/>
+        <location filename="../src/GUI/gui.cpp" line="1198"/>
         <source>Moving time</source>
         <translation>Mozgásban töltött idő</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="424"/>
+        <location filename="../src/GUI/gui.cpp" line="431"/>
         <source>Metric</source>
         <translation>Metrikus</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="430"/>
+        <location filename="../src/GUI/gui.cpp" line="437"/>
         <source>Imperial</source>
         <translation>Angolszász</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="436"/>
+        <location filename="../src/GUI/gui.cpp" line="443"/>
         <source>Nautical</source>
         <translation>Tengeri</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="444"/>
+        <location filename="../src/GUI/gui.cpp" line="451"/>
         <source>Decimal degrees (DD)</source>
         <translation>Fok, tizedfok (DD)</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="450"/>
+        <location filename="../src/GUI/gui.cpp" line="457"/>
         <source>Degrees and decimal minutes (DMM)</source>
         <translation>Fok, perc (DMM)</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="457"/>
+        <location filename="../src/GUI/gui.cpp" line="464"/>
         <source>Degrees, minutes, seconds (DMS)</source>
         <translation>Fok, perc, másodperc (DMS)</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="463"/>
+        <location filename="../src/GUI/gui.cpp" line="470"/>
         <source>Fullscreen mode</source>
         <translation>Teljes képernyős</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="470"/>
+        <location filename="../src/GUI/gui.cpp" line="477"/>
         <source>Options...</source>
         <translation>Beállítások...</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="476"/>
+        <location filename="../src/GUI/gui.cpp" line="483"/>
         <source>Next</source>
         <translation>Következő</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="480"/>
+        <location filename="../src/GUI/gui.cpp" line="487"/>
         <source>Previous</source>
         <translation>Előző</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="484"/>
+        <location filename="../src/GUI/gui.cpp" line="491"/>
         <source>Last</source>
         <translation>Utolsó</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="488"/>
+        <location filename="../src/GUI/gui.cpp" line="495"/>
         <source>First</source>
         <translation>Első</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="496"/>
+        <location filename="../src/GUI/gui.cpp" line="503"/>
         <source>&amp;File</source>
         <translation>&amp;Fájl</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="511"/>
+        <location filename="../src/GUI/gui.cpp" line="519"/>
         <source>&amp;Map</source>
         <translation>&amp;Térkép</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="521"/>
+        <location filename="../src/GUI/gui.cpp" line="529"/>
         <source>&amp;Graph</source>
         <translation>&amp;Grafikon</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="531"/>
+        <location filename="../src/GUI/gui.cpp" line="539"/>
         <source>&amp;POI</source>
         <translation>&amp;POI</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="532"/>
+        <location filename="../src/GUI/gui.cpp" line="540"/>
         <source>POI files</source>
         <translation>POI fájlok</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="543"/>
+        <location filename="../src/GUI/gui.cpp" line="551"/>
         <source>&amp;Data</source>
         <translation>&amp;Adatok</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="544"/>
+        <location filename="../src/GUI/gui.cpp" line="552"/>
         <source>Display</source>
         <translation>Megjelenítés</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="554"/>
+        <location filename="../src/GUI/gui.cpp" line="562"/>
         <source>&amp;Settings</source>
         <translation>&amp;Beállítások</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="558"/>
+        <location filename="../src/GUI/gui.cpp" line="566"/>
         <source>Units</source>
         <translation>Mértékegységek</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="562"/>
+        <location filename="../src/GUI/gui.cpp" line="570"/>
         <source>Coordinates format</source>
         <translation>Koordináta formátum</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="572"/>
+        <location filename="../src/GUI/gui.cpp" line="580"/>
         <source>&amp;Help</source>
         <translation>&amp;Segítség</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="588"/>
+        <location filename="../src/GUI/gui.cpp" line="596"/>
         <source>File</source>
         <translation>Műveletgombok</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="596"/>
+        <location filename="../src/GUI/gui.cpp" line="604"/>
         <source>Show</source>
         <translation>Szűrőgombok</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="603"/>
+        <location filename="../src/GUI/gui.cpp" line="611"/>
         <source>Navigation</source>
         <translation>Léptető gombok</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="670"/>
+        <location filename="../src/GUI/gui.cpp" line="678"/>
         <source>Version %1</source>
         <translation>%1. verzió</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="674"/>
+        <location filename="../src/GUI/gui.cpp" line="682"/>
         <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 %1.</source>
         <translation>A GPXSee-t a GNU General Public License 3. verziója szerint terjesztik. A GPXSee-re vonatkozó további információkért látogasson el a projekt honlapjára a %1 oldalon.</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="695"/>
+        <location filename="../src/GUI/gui.cpp" line="703"/>
         <source>Next file</source>
         <translation>Következő fájl (léptetés)</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="696"/>
+        <location filename="../src/GUI/gui.cpp" line="704"/>
         <source>Previous file</source>
         <translation>Előző fájl (léptetés)</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="698"/>
+        <location filename="../src/GUI/gui.cpp" line="706"/>
         <source>First file</source>
         <translation>Első fájl</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="700"/>
+        <location filename="../src/GUI/gui.cpp" line="708"/>
         <source>Last file</source>
         <translation>Utolsó fájl</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="701"/>
+        <location filename="../src/GUI/gui.cpp" line="709"/>
         <source>Append file</source>
         <translation>További fájl (hozzáadás)</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="702"/>
+        <location filename="../src/GUI/gui.cpp" line="710"/>
         <source>Next/Previous</source>
         <translation>Következő/előző</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="704"/>
+        <location filename="../src/GUI/gui.cpp" line="712"/>
         <source>Toggle graph type</source>
         <translation>Grafikon: idő/távolság váltás</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="706"/>
+        <location filename="../src/GUI/gui.cpp" line="714"/>
         <source>Toggle time type</source>
         <translation>Idő: összes/mozgásban váltás</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="710"/>
+        <location filename="../src/GUI/gui.cpp" line="718"/>
         <source>Previous map</source>
         <translation>Előző térkép</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="711"/>
+        <location filename="../src/GUI/gui.cpp" line="719"/>
         <source>Zoom in</source>
         <translation>Nagyítás</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="713"/>
+        <location filename="../src/GUI/gui.cpp" line="721"/>
         <source>Zoom out</source>
         <translation>Kicsinyítés</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="715"/>
+        <location filename="../src/GUI/gui.cpp" line="723"/>
         <source>Digital zoom</source>
         <translation>Digitális nagyítás</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="716"/>
+        <location filename="../src/GUI/gui.cpp" line="724"/>
         <source>Zoom</source>
         <translation>Nagyítás</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="729"/>
+        <location filename="../src/GUI/gui.cpp" line="737"/>
         <source>Map directory:</source>
         <translation>Térképmappa:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="731"/>
+        <location filename="../src/GUI/gui.cpp" line="739"/>
         <source>POI directory:</source>
         <translation>POI mappa:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="733"/>
+        <location filename="../src/GUI/gui.cpp" line="741"/>
         <source>GCS/PCS directory:</source>
         <translation>GCS/PCS mappa:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="735"/>
+        <location filename="../src/GUI/gui.cpp" line="743"/>
         <source>DEM directory:</source>
         <translation>DEM mappa:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="737"/>
+        <location filename="../src/GUI/gui.cpp" line="745"/>
         <source>Styles directory:</source>
         <translation>Stílusok mappa:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="739"/>
+        <location filename="../src/GUI/gui.cpp" line="747"/>
         <source>Tile cache directory:</source>
         <translation>Gyorsítótár mappa:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="748"/>
+        <location filename="../src/GUI/gui.cpp" line="756"/>
         <source>Open file</source>
         <translation>Fájl megnyitása</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="848"/>
+        <location filename="../src/GUI/gui.cpp" line="856"/>
         <source>Error loading data file:</source>
         <translation>Adatfájl betöltési hiba:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="851"/>
-        <location filename="../src/GUI/gui.cpp" line="886"/>
+        <location filename="../src/GUI/gui.cpp" line="859"/>
+        <location filename="../src/GUI/gui.cpp" line="894"/>
         <source>Line: %1</source>
         <translation>Sor: %1</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="859"/>
+        <location filename="../src/GUI/gui.cpp" line="867"/>
         <source>Open POI file</source>
         <translation>POI fájl megnyitása</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="883"/>
+        <location filename="../src/GUI/gui.cpp" line="891"/>
         <source>Error loading POI file:</source>
         <translation>Hiba a POI fájl betöltése során:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1055"/>
-        <location filename="../src/GUI/gui.cpp" line="1126"/>
+        <location filename="../src/GUI/gui.cpp" line="1100"/>
+        <location filename="../src/GUI/gui.cpp" line="1172"/>
         <source>Tracks</source>
         <translation>Nyomvonalak</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1058"/>
-        <location filename="../src/GUI/gui.cpp" line="1128"/>
+        <location filename="../src/GUI/gui.cpp" line="1103"/>
+        <location filename="../src/GUI/gui.cpp" line="1174"/>
         <source>Routes</source>
         <translation>Útvonalak</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1061"/>
-        <location filename="../src/GUI/gui.cpp" line="1130"/>
+        <location filename="../src/GUI/gui.cpp" line="1106"/>
+        <location filename="../src/GUI/gui.cpp" line="1176"/>
         <source>Waypoints</source>
         <translation>Köztespontok</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1064"/>
-        <location filename="../src/GUI/gui.cpp" line="1132"/>
+        <location filename="../src/GUI/gui.cpp" line="1109"/>
+        <location filename="../src/GUI/gui.cpp" line="1178"/>
         <source>Areas</source>
         <translation>Területek</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1070"/>
-        <location filename="../src/GUI/gui.cpp" line="1074"/>
-        <location filename="../src/GUI/gui.cpp" line="1138"/>
-        <location filename="../src/GUI/gui.cpp" line="1141"/>
+        <location filename="../src/GUI/gui.cpp" line="1115"/>
+        <location filename="../src/GUI/gui.cpp" line="1119"/>
+        <location filename="../src/GUI/gui.cpp" line="1184"/>
+        <location filename="../src/GUI/gui.cpp" line="1187"/>
         <source>Date</source>
         <translation>Dátum</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1107"/>
-        <location filename="../src/GUI/gui.cpp" line="1108"/>
+        <location filename="../src/GUI/gui.cpp" line="1152"/>
+        <location filename="../src/GUI/gui.cpp" line="1153"/>
         <source>Statistics</source>
         <translation>Összesítés</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1122"/>
+        <location filename="../src/GUI/gui.cpp" line="1168"/>
         <source>Name</source>
         <translation>Név</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1340"/>
+        <location filename="../src/GUI/gui.cpp" line="1424"/>
         <source>Open map file</source>
         <translation>Térképfájl megnyitása</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1360"/>
-        <location filename="../src/GUI/gui.cpp" line="1391"/>
+        <location filename="../src/GUI/gui.cpp" line="1444"/>
+        <location filename="../src/GUI/gui.cpp" line="1475"/>
         <source>Error loading map:</source>
         <translation>Térképbetöltési hiba:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1401"/>
+        <location filename="../src/GUI/gui.cpp" line="1485"/>
         <source>No files loaded</source>
         <translation>Nincs betöltött fájl</translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/GUI/gui.cpp" line="1405"/>
+        <location filename="../src/GUI/gui.cpp" line="1489"/>
         <source>%n files</source>
         <translation>
             <numerusform>%n fájl</numerusform>
+            <numerusform>%n fájl</numerusform>
         </translation>
     </message>
 </context>
@@ -1392,7 +1313,7 @@
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="442"/>
         <source>Use segments</source>
-        <translation type="unfinished"></translation>
+        <translation>Szakaszok használata</translation>
     </message>
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="481"/>
@@ -1578,6 +1499,159 @@
         <translation>Beállítások</translation>
     </message>
 </context>
+<context>
+    <name>PDFExportDialog</name>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="24"/>
+        <source>PDF files</source>
+        <translation>PDF fájlok</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="24"/>
+        <source>All files</source>
+        <translation>Minden fájl</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="51"/>
+        <source>Portrait</source>
+        <translation>Álló</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="52"/>
+        <source>Landscape</source>
+        <translation>Fekvő</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="62"/>
+        <source>in</source>
+        <translation>hüvelyk</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="62"/>
+        <source>cm</source>
+        <translation>cm</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="68"/>
+        <source>Page Setup</source>
+        <translation>Oldalbeállítás</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="71"/>
+        <source>Page size:</source>
+        <translation>Oldalméret:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="72"/>
+        <source>Resolution:</source>
+        <translation>Felbontás:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="73"/>
+        <source>Orientation:</source>
+        <translation>Tájolás:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="74"/>
+        <source>Margins:</source>
+        <translation>Margók:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="80"/>
+        <source>File:</source>
+        <translation>Fájl:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="87"/>
+        <source>Output file</source>
+        <translation>Kimeneti fájl</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="94"/>
+        <source>Export</source>
+        <translation>Exportálás</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="109"/>
+        <source>Export to PDF</source>
+        <translation>Exportálás PDF-be</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="117"/>
+        <source>Error</source>
+        <translation>Hiba</translation>
+    </message>
+</context>
+<context>
+    <name>PNGExportDialog</name>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="22"/>
+        <source>PNG files</source>
+        <translation>PNG fájlok</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="22"/>
+        <source>All files</source>
+        <translation>Minden fájl</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="30"/>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="35"/>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="39"/>
+        <source>px</source>
+        <translation>pont</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="41"/>
+        <source>Use anti-aliasing</source>
+        <translation>Élsimítás be</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="45"/>
+        <source>Image Setup</source>
+        <translation>Kép beállítása</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="48"/>
+        <source>Image width:</source>
+        <translation>Kép szélessége:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="49"/>
+        <source>Image height:</source>
+        <translation>Kép magassága:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="50"/>
+        <source>Margins:</source>
+        <translation>Margók:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="57"/>
+        <source>File:</source>
+        <translation>Fájl:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="64"/>
+        <source>Output file</source>
+        <translation>Kimeneti fájl</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="71"/>
+        <source>Export</source>
+        <translation>Exportálás</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="86"/>
+        <source>Export to PNG</source>
+        <translation>Exportálás PNG-be</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="94"/>
+        <source>Error</source>
+        <translation>Hiba</translation>
+    </message>
+</context>
 <context>
     <name>PolygonItem</name>
     <message>

lang/gpxsee_it.ts

@@ -204,106 +204,6 @@
         <translation>Minima</translation>
     </message>
 </context>
-<context>
-    <name>ExportDialog</name>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="25"/>
-        <source>PDF files</source>
-        <translation>File PDF</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="25"/>
-        <source>All files</source>
-        <translation>Tutti i file</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="52"/>
-        <source>Portrait</source>
-        <translation>Ritratto (Portrait)</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="53"/>
-        <source>Landscape</source>
-        <translation>Paesaggio (Landscape)</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="66"/>
-        <source>mm</source>
-        <translation>mm</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="66"/>
-        <source>in</source>
-        <translation>in</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="94"/>
-        <source>Page Setup</source>
-        <translation>Impostazioni pagina</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="97"/>
-        <source>Page size:</source>
-        <translation>Dimensioni pagina:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="98"/>
-        <source>Resolution:</source>
-        <translation>Risoluzione:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="99"/>
-        <source>Orientation:</source>
-        <translation>Orientamento:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="100"/>
-        <source>Margins:</source>
-        <translation>Margini:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="106"/>
-        <source>File:</source>
-        <translation>File:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="113"/>
-        <source>Output file</source>
-        <translation>Output file</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="120"/>
-        <source>Export</source>
-        <translation>Esporta</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="135"/>
-        <source>Export to PDF</source>
-        <translation>Esporta in PDF</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="142"/>
-        <location filename="../src/GUI/exportdialog.cpp" line="152"/>
-        <location filename="../src/GUI/exportdialog.cpp" line="157"/>
-        <source>Error</source>
-        <translation>Errore</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="142"/>
-        <source>No output file selected.</source>
-        <translation>Nessun file di output selezionato.</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="152"/>
-        <source>%1 is a directory.</source>
-        <translation>%1 è una cartella.</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="157"/>
-        <source>%1 is not writable.</source>
-        <translation>%1 non è scrivibile.</translation>
-    </message>
-</context>
 <context>
     <name>FileSelectWidget</name>
     <message>
@@ -311,6 +211,21 @@
         <source>Select file</source>
         <translation>Seleziona file</translation>
     </message>
+    <message>
+        <location filename="../src/GUI/fileselectwidget.cpp" line="48"/>
+        <source>No output file selected.</source>
+        <translation>Nessun file di output selezionato.</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/fileselectwidget.cpp" line="58"/>
+        <source>%1 is a directory.</source>
+        <translation>%1 è una cartella.</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/fileselectwidget.cpp" line="62"/>
+        <source>%1 is not writable.</source>
+        <translation>%1 non è scrivibile.</translation>
+    </message>
 </context>
 <context>
     <name>Format</name>
@@ -352,21 +267,21 @@
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="211"/>
-        <location filename="../src/GUI/gui.cpp" line="725"/>
-        <location filename="../src/GUI/gui.cpp" line="726"/>
+        <location filename="../src/GUI/gui.cpp" line="733"/>
+        <location filename="../src/GUI/gui.cpp" line="734"/>
         <source>Paths</source>
         <translation>Percorsi</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="214"/>
-        <location filename="../src/GUI/gui.cpp" line="691"/>
-        <location filename="../src/GUI/gui.cpp" line="692"/>
+        <location filename="../src/GUI/gui.cpp" line="699"/>
+        <location filename="../src/GUI/gui.cpp" line="700"/>
         <source>Keyboard controls</source>
         <translation>Scorciatoie da tastiera</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="217"/>
-        <location filename="../src/GUI/gui.cpp" line="669"/>
+        <location filename="../src/GUI/gui.cpp" line="677"/>
         <source>About GPXSee</source>
         <translation>A proposito di GPXSee</translation>
     </message>
@@ -386,481 +301,486 @@
         <translation>Esporta in PDF...</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="240"/>
+        <location filename="../src/GUI/gui.cpp" line="241"/>
+        <source>Export to PNG...</source>
+        <translation>Esporta in PNG...</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/gui.cpp" line="247"/>
         <source>Close</source>
         <translation>Chiudi</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="246"/>
+        <location filename="../src/GUI/gui.cpp" line="253"/>
         <source>Reload</source>
         <translation>Ricarica</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="253"/>
+        <location filename="../src/GUI/gui.cpp" line="260"/>
         <source>Statistics...</source>
         <translation>Statistiche...</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="261"/>
+        <location filename="../src/GUI/gui.cpp" line="268"/>
         <source>Load POI file...</source>
         <translation>Carica file POI...</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="265"/>
+        <location filename="../src/GUI/gui.cpp" line="272"/>
         <source>Close POI files</source>
         <translation>Chiudi file POI</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="269"/>
+        <location filename="../src/GUI/gui.cpp" line="276"/>
         <source>Overlap POIs</source>
         <translation>Sovrapponi POI</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="274"/>
+        <location filename="../src/GUI/gui.cpp" line="281"/>
         <source>Show POI labels</source>
         <translation>Mostra etichette POI</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="279"/>
+        <location filename="../src/GUI/gui.cpp" line="286"/>
         <source>Show POIs</source>
         <translation>Mostra POI</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="290"/>
+        <location filename="../src/GUI/gui.cpp" line="297"/>
         <source>Show map</source>
         <translation>Mostra mappa</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="299"/>
+        <location filename="../src/GUI/gui.cpp" line="306"/>
         <source>Load map...</source>
         <translation>Carica mappa...</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="303"/>
+        <location filename="../src/GUI/gui.cpp" line="310"/>
         <source>Clear tile cache</source>
         <translation>Cancella cache mappe</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="308"/>
-        <location filename="../src/GUI/gui.cpp" line="313"/>
-        <location filename="../src/GUI/gui.cpp" line="708"/>
+        <location filename="../src/GUI/gui.cpp" line="315"/>
+        <location filename="../src/GUI/gui.cpp" line="320"/>
+        <location filename="../src/GUI/gui.cpp" line="716"/>
         <source>Next map</source>
         <translation>Mappa successiva</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="318"/>
+        <location filename="../src/GUI/gui.cpp" line="325"/>
         <source>Show cursor coordinates</source>
         <translation>Mostra coordinate del cursore</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="325"/>
+        <location filename="../src/GUI/gui.cpp" line="332"/>
         <source>Show tracks</source>
         <translation>Mostra tracce</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="330"/>
+        <location filename="../src/GUI/gui.cpp" line="337"/>
         <source>Show routes</source>
         <translation>Mostra percorso</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="335"/>
+        <location filename="../src/GUI/gui.cpp" line="342"/>
         <source>Show waypoints</source>
         <translation>Mostra punti</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="340"/>
+        <location filename="../src/GUI/gui.cpp" line="347"/>
         <source>Show areas</source>
         <translation>Mostra aree</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="345"/>
+        <location filename="../src/GUI/gui.cpp" line="352"/>
         <source>Waypoint labels</source>
         <translation>Etichette punti</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="350"/>
+        <location filename="../src/GUI/gui.cpp" line="357"/>
         <source>Route waypoints</source>
         <translation>Punti del percorso</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="355"/>
+        <location filename="../src/GUI/gui.cpp" line="362"/>
         <source>km/mi markers</source>
         <translation>Pietre miliari</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="362"/>
+        <location filename="../src/GUI/gui.cpp" line="369"/>
         <source>Show graphs</source>
         <translation>Mostra grafici</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="372"/>
-        <location filename="../src/GUI/gui.cpp" line="1081"/>
-        <location filename="../src/GUI/gui.cpp" line="1148"/>
+        <location filename="../src/GUI/gui.cpp" line="379"/>
+        <location filename="../src/GUI/gui.cpp" line="1126"/>
+        <location filename="../src/GUI/gui.cpp" line="1194"/>
         <source>Distance</source>
         <translation>Distanza</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="379"/>
-        <location filename="../src/GUI/gui.cpp" line="555"/>
-        <location filename="../src/GUI/gui.cpp" line="1084"/>
-        <location filename="../src/GUI/gui.cpp" line="1150"/>
+        <location filename="../src/GUI/gui.cpp" line="386"/>
+        <location filename="../src/GUI/gui.cpp" line="563"/>
+        <location filename="../src/GUI/gui.cpp" line="1129"/>
+        <location filename="../src/GUI/gui.cpp" line="1196"/>
         <source>Time</source>
         <translation>Tempo</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="386"/>
+        <location filename="../src/GUI/gui.cpp" line="393"/>
         <source>Show grid</source>
         <translation>Mostra griglia</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="391"/>
+        <location filename="../src/GUI/gui.cpp" line="398"/>
         <source>Show slider info</source>
         <translation>Mostra informazioni cursore</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="396"/>
+        <location filename="../src/GUI/gui.cpp" line="403"/>
         <source>Show path markers</source>
         <translation>Mostra marcatori del percorso</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="403"/>
+        <location filename="../src/GUI/gui.cpp" line="410"/>
         <source>Show toolbars</source>
         <translation>Mostra barra degli strumenti</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="410"/>
+        <location filename="../src/GUI/gui.cpp" line="417"/>
         <source>Total time</source>
         <translation>Tempo totale</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="416"/>
-        <location filename="../src/GUI/gui.cpp" line="1086"/>
-        <location filename="../src/GUI/gui.cpp" line="1152"/>
+        <location filename="../src/GUI/gui.cpp" line="423"/>
+        <location filename="../src/GUI/gui.cpp" line="1131"/>
+        <location filename="../src/GUI/gui.cpp" line="1198"/>
         <source>Moving time</source>
         <translation>Tempo in movimento</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="424"/>
+        <location filename="../src/GUI/gui.cpp" line="431"/>
         <source>Metric</source>
         <translation>Metrico</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="430"/>
+        <location filename="../src/GUI/gui.cpp" line="437"/>
         <source>Imperial</source>
         <translation>Imperiale</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="436"/>
+        <location filename="../src/GUI/gui.cpp" line="443"/>
         <source>Nautical</source>
         <translation>Nautico</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="444"/>
+        <location filename="../src/GUI/gui.cpp" line="451"/>
         <source>Decimal degrees (DD)</source>
         <translation>Gradi decimali (DD)</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="450"/>
+        <location filename="../src/GUI/gui.cpp" line="457"/>
         <source>Degrees and decimal minutes (DMM)</source>
         <translation>Gradi e minuti decimali (DMM)</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="457"/>
+        <location filename="../src/GUI/gui.cpp" line="464"/>
         <source>Degrees, minutes, seconds (DMS)</source>
         <translation>Gradi, minuti e secondi (DMS)</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="463"/>
+        <location filename="../src/GUI/gui.cpp" line="470"/>
         <source>Fullscreen mode</source>
         <translation>Schermo intero</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="470"/>
+        <location filename="../src/GUI/gui.cpp" line="477"/>
         <source>Options...</source>
         <translation>Opzioni...</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="476"/>
+        <location filename="../src/GUI/gui.cpp" line="483"/>
         <source>Next</source>
         <translation>Successivo</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="480"/>
+        <location filename="../src/GUI/gui.cpp" line="487"/>
         <source>Previous</source>
         <translation>Precedente</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="484"/>
+        <location filename="../src/GUI/gui.cpp" line="491"/>
         <source>Last</source>
         <translation>Ultimo</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="488"/>
+        <location filename="../src/GUI/gui.cpp" line="495"/>
         <source>First</source>
         <translation>Primo</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="496"/>
+        <location filename="../src/GUI/gui.cpp" line="503"/>
         <source>&amp;File</source>
         <translation>&amp;File</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="511"/>
+        <location filename="../src/GUI/gui.cpp" line="519"/>
         <source>&amp;Map</source>
         <translation>&amp;Mappa</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="521"/>
+        <location filename="../src/GUI/gui.cpp" line="529"/>
         <source>&amp;Graph</source>
         <translation>&amp;Grafico</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="531"/>
+        <location filename="../src/GUI/gui.cpp" line="539"/>
         <source>&amp;POI</source>
         <translation>&amp;POI</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="532"/>
+        <location filename="../src/GUI/gui.cpp" line="540"/>
         <source>POI files</source>
         <translation>File POI</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="543"/>
+        <location filename="../src/GUI/gui.cpp" line="551"/>
         <source>&amp;Data</source>
         <translation>&amp;Dati</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="544"/>
+        <location filename="../src/GUI/gui.cpp" line="552"/>
         <source>Display</source>
         <translation>Mostra</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="554"/>
+        <location filename="../src/GUI/gui.cpp" line="562"/>
         <source>&amp;Settings</source>
         <translation>Impo&amp;stazioni</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="558"/>
+        <location filename="../src/GUI/gui.cpp" line="566"/>
         <source>Units</source>
         <translation>Unità</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="562"/>
+        <location filename="../src/GUI/gui.cpp" line="570"/>
         <source>Coordinates format</source>
         <translation>Formato coordinate</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="572"/>
+        <location filename="../src/GUI/gui.cpp" line="580"/>
         <source>&amp;Help</source>
         <translation>&amp;Aiuto</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="588"/>
+        <location filename="../src/GUI/gui.cpp" line="596"/>
         <source>File</source>
         <translation>File</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="596"/>
+        <location filename="../src/GUI/gui.cpp" line="604"/>
         <source>Show</source>
         <translation>Mostra</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="603"/>
+        <location filename="../src/GUI/gui.cpp" line="611"/>
         <source>Navigation</source>
         <translation>Navigazione</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="670"/>
+        <location filename="../src/GUI/gui.cpp" line="678"/>
         <source>Version %1</source>
         <translation>Versione %1</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="674"/>
+        <location filename="../src/GUI/gui.cpp" line="682"/>
         <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 %1.</source>
         <translation>GPXSee è distribuito sotto i termini della GNU General Public License versione 3. Per maggiori informazioni su GPXSee visitare il sito del progetto %1.</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="695"/>
+        <location filename="../src/GUI/gui.cpp" line="703"/>
         <source>Next file</source>
         <translation>File successivo</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="696"/>
+        <location filename="../src/GUI/gui.cpp" line="704"/>
         <source>Previous file</source>
         <translation>File precedente</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="698"/>
+        <location filename="../src/GUI/gui.cpp" line="706"/>
         <source>First file</source>
         <translation>Primo file</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="700"/>
+        <location filename="../src/GUI/gui.cpp" line="708"/>
         <source>Last file</source>
         <translation>Ultimo file</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="701"/>
+        <location filename="../src/GUI/gui.cpp" line="709"/>
         <source>Append file</source>
         <translation>Aggiungi file</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="702"/>
+        <location filename="../src/GUI/gui.cpp" line="710"/>
         <source>Next/Previous</source>
         <translation>Successivo/Precedente</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="704"/>
+        <location filename="../src/GUI/gui.cpp" line="712"/>
         <source>Toggle graph type</source>
         <translation>Cambia formato del grafico</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="706"/>
+        <location filename="../src/GUI/gui.cpp" line="714"/>
         <source>Toggle time type</source>
         <translation>Cambia formato del tempo</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="710"/>
+        <location filename="../src/GUI/gui.cpp" line="718"/>
         <source>Previous map</source>
         <translation>Mappa precedente</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="711"/>
+        <location filename="../src/GUI/gui.cpp" line="719"/>
         <source>Zoom in</source>
         <translation>Zoom in</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="713"/>
+        <location filename="../src/GUI/gui.cpp" line="721"/>
         <source>Zoom out</source>
         <translation>Zoom out</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="715"/>
+        <location filename="../src/GUI/gui.cpp" line="723"/>
         <source>Digital zoom</source>
         <translation>Zoom digitale</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="716"/>
+        <location filename="../src/GUI/gui.cpp" line="724"/>
         <source>Zoom</source>
         <translation>Zoom</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="729"/>
+        <location filename="../src/GUI/gui.cpp" line="737"/>
         <source>Map directory:</source>
         <translation>Cartella mappe:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="731"/>
+        <location filename="../src/GUI/gui.cpp" line="739"/>
         <source>POI directory:</source>
         <translation>Cartella POI:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="733"/>
+        <location filename="../src/GUI/gui.cpp" line="741"/>
         <source>GCS/PCS directory:</source>
         <translation>Cartella GCS/PCS:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="735"/>
+        <location filename="../src/GUI/gui.cpp" line="743"/>
         <source>DEM directory:</source>
         <translation>Cartella DEM:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="737"/>
+        <location filename="../src/GUI/gui.cpp" line="745"/>
         <source>Styles directory:</source>
         <translation>Cartella stili:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="739"/>
+        <location filename="../src/GUI/gui.cpp" line="747"/>
         <source>Tile cache directory:</source>
         <translation>Cartella cache mappe:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="748"/>
+        <location filename="../src/GUI/gui.cpp" line="756"/>
         <source>Open file</source>
         <translation>Apri file</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="848"/>
+        <location filename="../src/GUI/gui.cpp" line="856"/>
         <source>Error loading data file:</source>
         <translation>Errore caricamento file:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="851"/>
-        <location filename="../src/GUI/gui.cpp" line="886"/>
+        <location filename="../src/GUI/gui.cpp" line="859"/>
+        <location filename="../src/GUI/gui.cpp" line="894"/>
         <source>Line: %1</source>
         <translation>Linea: %1</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="859"/>
+        <location filename="../src/GUI/gui.cpp" line="867"/>
         <source>Open POI file</source>
         <translation>Apri file POI</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="883"/>
+        <location filename="../src/GUI/gui.cpp" line="891"/>
         <source>Error loading POI file:</source>
         <translation>Errore caricamento file POI:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1055"/>
-        <location filename="../src/GUI/gui.cpp" line="1126"/>
+        <location filename="../src/GUI/gui.cpp" line="1100"/>
+        <location filename="../src/GUI/gui.cpp" line="1172"/>
         <source>Tracks</source>
         <translation>Tracce</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1058"/>
-        <location filename="../src/GUI/gui.cpp" line="1128"/>
+        <location filename="../src/GUI/gui.cpp" line="1103"/>
+        <location filename="../src/GUI/gui.cpp" line="1174"/>
         <source>Routes</source>
         <translation>Percorsi</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1061"/>
-        <location filename="../src/GUI/gui.cpp" line="1130"/>
+        <location filename="../src/GUI/gui.cpp" line="1106"/>
+        <location filename="../src/GUI/gui.cpp" line="1176"/>
         <source>Waypoints</source>
         <translation>Punti</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1064"/>
-        <location filename="../src/GUI/gui.cpp" line="1132"/>
+        <location filename="../src/GUI/gui.cpp" line="1109"/>
+        <location filename="../src/GUI/gui.cpp" line="1178"/>
         <source>Areas</source>
         <translation>Aree</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1070"/>
-        <location filename="../src/GUI/gui.cpp" line="1074"/>
-        <location filename="../src/GUI/gui.cpp" line="1138"/>
-        <location filename="../src/GUI/gui.cpp" line="1141"/>
+        <location filename="../src/GUI/gui.cpp" line="1115"/>
+        <location filename="../src/GUI/gui.cpp" line="1119"/>
+        <location filename="../src/GUI/gui.cpp" line="1184"/>
+        <location filename="../src/GUI/gui.cpp" line="1187"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1107"/>
-        <location filename="../src/GUI/gui.cpp" line="1108"/>
+        <location filename="../src/GUI/gui.cpp" line="1152"/>
+        <location filename="../src/GUI/gui.cpp" line="1153"/>
         <source>Statistics</source>
         <translation>Statistiche</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1122"/>
+        <location filename="../src/GUI/gui.cpp" line="1168"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1340"/>
+        <location filename="../src/GUI/gui.cpp" line="1424"/>
         <source>Open map file</source>
         <translation>Apri file mappa</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1360"/>
-        <location filename="../src/GUI/gui.cpp" line="1391"/>
+        <location filename="../src/GUI/gui.cpp" line="1444"/>
+        <location filename="../src/GUI/gui.cpp" line="1475"/>
         <source>Error loading map:</source>
         <translation>Errore caricamento mappa:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1401"/>
+        <location filename="../src/GUI/gui.cpp" line="1485"/>
         <source>No files loaded</source>
         <translation>Nessun file caricato</translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/GUI/gui.cpp" line="1405"/>
+        <location filename="../src/GUI/gui.cpp" line="1489"/>
         <source>%n files</source>
         <translation>
             <numerusform>%n file</numerusform>
@@ -1579,6 +1499,159 @@
         <translation>Opzioni</translation>
     </message>
 </context>
+<context>
+    <name>PDFExportDialog</name>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="24"/>
+        <source>PDF files</source>
+        <translation>File PDF</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="24"/>
+        <source>All files</source>
+        <translation>Tutti i file</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="51"/>
+        <source>Portrait</source>
+        <translation>Ritratto (Portrait)</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="52"/>
+        <source>Landscape</source>
+        <translation>Paesaggio (Landscape)</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="62"/>
+        <source>in</source>
+        <translation>in</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="62"/>
+        <source>cm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="68"/>
+        <source>Page Setup</source>
+        <translation>Impostazioni pagina</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="71"/>
+        <source>Page size:</source>
+        <translation>Dimensioni pagina:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="72"/>
+        <source>Resolution:</source>
+        <translation>Risoluzione:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="73"/>
+        <source>Orientation:</source>
+        <translation>Orientamento:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="74"/>
+        <source>Margins:</source>
+        <translation>Margini:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="80"/>
+        <source>File:</source>
+        <translation>File:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="87"/>
+        <source>Output file</source>
+        <translation>Output file</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="94"/>
+        <source>Export</source>
+        <translation>Esporta</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="109"/>
+        <source>Export to PDF</source>
+        <translation>Esporta in PDF</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="117"/>
+        <source>Error</source>
+        <translation>Errore</translation>
+    </message>
+</context>
+<context>
+    <name>PNGExportDialog</name>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="22"/>
+        <source>PNG files</source>
+        <translation>File PNG</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="22"/>
+        <source>All files</source>
+        <translation>Tutti i file</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="30"/>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="35"/>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="39"/>
+        <source>px</source>
+        <translation>px</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="41"/>
+        <source>Use anti-aliasing</source>
+        <translation type="unfinished">Usa anti-alias</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="45"/>
+        <source>Image Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="48"/>
+        <source>Image width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="49"/>
+        <source>Image height:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="50"/>
+        <source>Margins:</source>
+        <translation>Margini:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="57"/>
+        <source>File:</source>
+        <translation>File:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="64"/>
+        <source>Output file</source>
+        <translation>Output file</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="71"/>
+        <source>Export</source>
+        <translation>Esporta</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="86"/>
+        <source>Export to PNG</source>
+        <translation>Esporta in PNG</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="94"/>
+        <source>Error</source>
+        <translation>Errore</translation>
+    </message>
+</context>
 <context>
     <name>PolygonItem</name>
     <message>

lang/gpxsee_nb.ts

@@ -204,106 +204,6 @@
         <translation>Minimum</translation>
     </message>
 </context>
-<context>
-    <name>ExportDialog</name>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="25"/>
-        <source>PDF files</source>
-        <translation>PDF-filer</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="25"/>
-        <source>All files</source>
-        <translation>Alle filer</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="52"/>
-        <source>Portrait</source>
-        <translation>Stående</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="53"/>
-        <source>Landscape</source>
-        <translation>Liggende</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="66"/>
-        <source>mm</source>
-        <translation>mm</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="66"/>
-        <source>in</source>
-        <translation>tommer</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="94"/>
-        <source>Page Setup</source>
-        <translation>Sideoppsett</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="97"/>
-        <source>Page size:</source>
-        <translation>Sidestørrelse:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="98"/>
-        <source>Resolution:</source>
-        <translation>Oppløsning:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="99"/>
-        <source>Orientation:</source>
-        <translation>Sideretning:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="100"/>
-        <source>Margins:</source>
-        <translation>Marger:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="106"/>
-        <source>File:</source>
-        <translation>Fil:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="113"/>
-        <source>Output file</source>
-        <translation>Utdatafil</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="120"/>
-        <source>Export</source>
-        <translation>Eksporter</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="135"/>
-        <source>Export to PDF</source>
-        <translation>Eksporter til PDF</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="142"/>
-        <location filename="../src/GUI/exportdialog.cpp" line="152"/>
-        <location filename="../src/GUI/exportdialog.cpp" line="157"/>
-        <source>Error</source>
-        <translation>Feil</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="142"/>
-        <source>No output file selected.</source>
-        <translation>Ingen utdatafil valgt.</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="152"/>
-        <source>%1 is a directory.</source>
-        <translation>%1 er en mappe.</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="157"/>
-        <source>%1 is not writable.</source>
-        <translation>%1 er skrivebeskyttet.</translation>
-    </message>
-</context>
 <context>
     <name>FileSelectWidget</name>
     <message>
@@ -311,6 +211,21 @@
         <source>Select file</source>
         <translation>Velg fil</translation>
     </message>
+    <message>
+        <location filename="../src/GUI/fileselectwidget.cpp" line="48"/>
+        <source>No output file selected.</source>
+        <translation>Ingen utdatafil valgt.</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/fileselectwidget.cpp" line="58"/>
+        <source>%1 is a directory.</source>
+        <translation>%1 er en mappe.</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/fileselectwidget.cpp" line="62"/>
+        <source>%1 is not writable.</source>
+        <translation>%1 er skrivebeskyttet.</translation>
+    </message>
 </context>
 <context>
     <name>Format</name>
@@ -352,21 +267,21 @@
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="211"/>
-        <location filename="../src/GUI/gui.cpp" line="725"/>
-        <location filename="../src/GUI/gui.cpp" line="726"/>
+        <location filename="../src/GUI/gui.cpp" line="733"/>
+        <location filename="../src/GUI/gui.cpp" line="734"/>
         <source>Paths</source>
         <translation>Stier</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="214"/>
-        <location filename="../src/GUI/gui.cpp" line="691"/>
-        <location filename="../src/GUI/gui.cpp" line="692"/>
+        <location filename="../src/GUI/gui.cpp" line="699"/>
+        <location filename="../src/GUI/gui.cpp" line="700"/>
         <source>Keyboard controls</source>
         <translation>Tastatursnarveier</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="217"/>
-        <location filename="../src/GUI/gui.cpp" line="669"/>
+        <location filename="../src/GUI/gui.cpp" line="677"/>
         <source>About GPXSee</source>
         <translation>Om</translation>
     </message>
@@ -386,481 +301,486 @@
         <translation>Eksporter til PDF…</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="240"/>
+        <location filename="../src/GUI/gui.cpp" line="241"/>
+        <source>Export to PNG...</source>
+        <translation>Eksporter til PNG…</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/gui.cpp" line="247"/>
         <source>Close</source>
         <translation>Lukk</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="246"/>
+        <location filename="../src/GUI/gui.cpp" line="253"/>
         <source>Reload</source>
         <translation>Last inn igjen</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="253"/>
+        <location filename="../src/GUI/gui.cpp" line="260"/>
         <source>Statistics...</source>
         <translation>Statistikk…</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="261"/>
+        <location filename="../src/GUI/gui.cpp" line="268"/>
         <source>Load POI file...</source>
         <translation>Last inn POI-fil…</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="265"/>
+        <location filename="../src/GUI/gui.cpp" line="272"/>
         <source>Close POI files</source>
         <translation>Lukk POI-filer</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="269"/>
+        <location filename="../src/GUI/gui.cpp" line="276"/>
         <source>Overlap POIs</source>
         <translation>Overlapp POI-er</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="274"/>
+        <location filename="../src/GUI/gui.cpp" line="281"/>
         <source>Show POI labels</source>
         <translation>Vis POI-etiketter</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="279"/>
+        <location filename="../src/GUI/gui.cpp" line="286"/>
         <source>Show POIs</source>
         <translation>Vis POI-er</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="290"/>
+        <location filename="../src/GUI/gui.cpp" line="297"/>
         <source>Show map</source>
         <translation>Vis kart</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="299"/>
+        <location filename="../src/GUI/gui.cpp" line="306"/>
         <source>Load map...</source>
         <translation>Last inn kart…</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="303"/>
+        <location filename="../src/GUI/gui.cpp" line="310"/>
         <source>Clear tile cache</source>
         <translation>Tøm flishurtiglager</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="308"/>
-        <location filename="../src/GUI/gui.cpp" line="313"/>
-        <location filename="../src/GUI/gui.cpp" line="708"/>
+        <location filename="../src/GUI/gui.cpp" line="315"/>
+        <location filename="../src/GUI/gui.cpp" line="320"/>
+        <location filename="../src/GUI/gui.cpp" line="716"/>
         <source>Next map</source>
         <translation>Neste kart</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="318"/>
+        <location filename="../src/GUI/gui.cpp" line="325"/>
         <source>Show cursor coordinates</source>
         <translation>Vis peker-koordinater</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="325"/>
+        <location filename="../src/GUI/gui.cpp" line="332"/>
         <source>Show tracks</source>
         <translation>Vis spor</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="330"/>
+        <location filename="../src/GUI/gui.cpp" line="337"/>
         <source>Show routes</source>
         <translation>Vis ruter</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="335"/>
+        <location filename="../src/GUI/gui.cpp" line="342"/>
         <source>Show waypoints</source>
         <translation>Vis veipunkter</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="340"/>
+        <location filename="../src/GUI/gui.cpp" line="347"/>
         <source>Show areas</source>
         <translation>Vis områder</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="345"/>
+        <location filename="../src/GUI/gui.cpp" line="352"/>
         <source>Waypoint labels</source>
         <translation>Veipunktetiketter</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="350"/>
+        <location filename="../src/GUI/gui.cpp" line="357"/>
         <source>Route waypoints</source>
         <translation>Ruteveipunkter</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="355"/>
+        <location filename="../src/GUI/gui.cpp" line="362"/>
         <source>km/mi markers</source>
         <translation>km/mi-markører</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="362"/>
+        <location filename="../src/GUI/gui.cpp" line="369"/>
         <source>Show graphs</source>
         <translation>Vis diagrammer</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="372"/>
-        <location filename="../src/GUI/gui.cpp" line="1081"/>
-        <location filename="../src/GUI/gui.cpp" line="1148"/>
+        <location filename="../src/GUI/gui.cpp" line="379"/>
+        <location filename="../src/GUI/gui.cpp" line="1126"/>
+        <location filename="../src/GUI/gui.cpp" line="1194"/>
         <source>Distance</source>
         <translation>Avstand</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="379"/>
-        <location filename="../src/GUI/gui.cpp" line="555"/>
-        <location filename="../src/GUI/gui.cpp" line="1084"/>
-        <location filename="../src/GUI/gui.cpp" line="1150"/>
+        <location filename="../src/GUI/gui.cpp" line="386"/>
+        <location filename="../src/GUI/gui.cpp" line="563"/>
+        <location filename="../src/GUI/gui.cpp" line="1129"/>
+        <location filename="../src/GUI/gui.cpp" line="1196"/>
         <source>Time</source>
         <translation>Tid</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="386"/>
+        <location filename="../src/GUI/gui.cpp" line="393"/>
         <source>Show grid</source>
         <translation>Vis rutenett</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="391"/>
+        <location filename="../src/GUI/gui.cpp" line="398"/>
         <source>Show slider info</source>
         <translation>Vis linjalinfo</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="396"/>
+        <location filename="../src/GUI/gui.cpp" line="403"/>
         <source>Show path markers</source>
         <translation>Vis veimarkører</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="403"/>
+        <location filename="../src/GUI/gui.cpp" line="410"/>
         <source>Show toolbars</source>
         <translation>Vis verktøylinjer</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="410"/>
+        <location filename="../src/GUI/gui.cpp" line="417"/>
         <source>Total time</source>
         <translation>Total tid</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="416"/>
-        <location filename="../src/GUI/gui.cpp" line="1086"/>
-        <location filename="../src/GUI/gui.cpp" line="1152"/>
+        <location filename="../src/GUI/gui.cpp" line="423"/>
+        <location filename="../src/GUI/gui.cpp" line="1131"/>
+        <location filename="../src/GUI/gui.cpp" line="1198"/>
         <source>Moving time</source>
         <translation>Tid i bevegelse</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="424"/>
+        <location filename="../src/GUI/gui.cpp" line="431"/>
         <source>Metric</source>
         <translation>Metrisk</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="430"/>
+        <location filename="../src/GUI/gui.cpp" line="437"/>
         <source>Imperial</source>
         <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="436"/>
+        <location filename="../src/GUI/gui.cpp" line="443"/>
         <source>Nautical</source>
         <translation>Nautisk</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="444"/>
+        <location filename="../src/GUI/gui.cpp" line="451"/>
         <source>Decimal degrees (DD)</source>
         <translation>Desimalgrader (DD)</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="450"/>
+        <location filename="../src/GUI/gui.cpp" line="457"/>
         <source>Degrees and decimal minutes (DMM)</source>
         <translation>Desimalgrader og desimalminutter (DMM)</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="457"/>
+        <location filename="../src/GUI/gui.cpp" line="464"/>
         <source>Degrees, minutes, seconds (DMS)</source>
         <translation>Grader, minutter, sekunder (DMS)</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="463"/>
+        <location filename="../src/GUI/gui.cpp" line="470"/>
         <source>Fullscreen mode</source>
         <translation>Fullskjermsmodus</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="470"/>
+        <location filename="../src/GUI/gui.cpp" line="477"/>
         <source>Options...</source>
         <translation>Valg…</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="476"/>
+        <location filename="../src/GUI/gui.cpp" line="483"/>
         <source>Next</source>
         <translation>Neste</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="480"/>
+        <location filename="../src/GUI/gui.cpp" line="487"/>
         <source>Previous</source>
         <translation>Forrige</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="484"/>
+        <location filename="../src/GUI/gui.cpp" line="491"/>
         <source>Last</source>
         <translation>Siste</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="488"/>
+        <location filename="../src/GUI/gui.cpp" line="495"/>
         <source>First</source>
         <translation>Første</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="496"/>
+        <location filename="../src/GUI/gui.cpp" line="503"/>
         <source>&amp;File</source>
         <translation>&amp;Fil</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="511"/>
+        <location filename="../src/GUI/gui.cpp" line="519"/>
         <source>&amp;Map</source>
         <translation>&amp;Kart</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="521"/>
+        <location filename="../src/GUI/gui.cpp" line="529"/>
         <source>&amp;Graph</source>
         <translation>&amp;Graf</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="531"/>
+        <location filename="../src/GUI/gui.cpp" line="539"/>
         <source>&amp;POI</source>
         <translation>&amp;POI</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="532"/>
+        <location filename="../src/GUI/gui.cpp" line="540"/>
         <source>POI files</source>
         <translation>POI-filer</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="543"/>
+        <location filename="../src/GUI/gui.cpp" line="551"/>
         <source>&amp;Data</source>
         <translation>&amp;Data</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="544"/>
+        <location filename="../src/GUI/gui.cpp" line="552"/>
         <source>Display</source>
         <translation>Vis</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="554"/>
+        <location filename="../src/GUI/gui.cpp" line="562"/>
         <source>&amp;Settings</source>
         <translation>&amp;Innstillinger</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="558"/>
+        <location filename="../src/GUI/gui.cpp" line="566"/>
         <source>Units</source>
         <translation>Enheter</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="562"/>
+        <location filename="../src/GUI/gui.cpp" line="570"/>
         <source>Coordinates format</source>
         <translation>Koordinatformat</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="572"/>
+        <location filename="../src/GUI/gui.cpp" line="580"/>
         <source>&amp;Help</source>
         <translation>&amp;Hjelp</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="588"/>
+        <location filename="../src/GUI/gui.cpp" line="596"/>
         <source>File</source>
         <translation>Fil</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="596"/>
+        <location filename="../src/GUI/gui.cpp" line="604"/>
         <source>Show</source>
         <translation>Vis</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="603"/>
+        <location filename="../src/GUI/gui.cpp" line="611"/>
         <source>Navigation</source>
         <translation>Navigasjon</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="670"/>
+        <location filename="../src/GUI/gui.cpp" line="678"/>
         <source>Version %1</source>
         <translation>Versjon %1</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="674"/>
+        <location filename="../src/GUI/gui.cpp" line="682"/>
         <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 %1.</source>
         <translation>GPXSee er distribuert i henhold til vilkårene i GNU general public lisens, versjon 3. For mer info om GPXSee, besøk prosjekthjemmesiden på %1.</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="695"/>
+        <location filename="../src/GUI/gui.cpp" line="703"/>
         <source>Next file</source>
         <translation>Neste fil</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="696"/>
+        <location filename="../src/GUI/gui.cpp" line="704"/>
         <source>Previous file</source>
         <translation>Forrige fil</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="698"/>
+        <location filename="../src/GUI/gui.cpp" line="706"/>
         <source>First file</source>
         <translation>Første fil</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="700"/>
+        <location filename="../src/GUI/gui.cpp" line="708"/>
         <source>Last file</source>
         <translation>Siste fil</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="701"/>
+        <location filename="../src/GUI/gui.cpp" line="709"/>
         <source>Append file</source>
         <translation>Legg til fil</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="702"/>
+        <location filename="../src/GUI/gui.cpp" line="710"/>
         <source>Next/Previous</source>
         <translation>Neste/forrige</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="704"/>
+        <location filename="../src/GUI/gui.cpp" line="712"/>
         <source>Toggle graph type</source>
         <translation>Veksle diagramtype</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="706"/>
+        <location filename="../src/GUI/gui.cpp" line="714"/>
         <source>Toggle time type</source>
         <translation>Veksle tidstype</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="710"/>
+        <location filename="../src/GUI/gui.cpp" line="718"/>
         <source>Previous map</source>
         <translation>Forrige kart</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="711"/>
+        <location filename="../src/GUI/gui.cpp" line="719"/>
         <source>Zoom in</source>
         <translation>Forstørr</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="713"/>
+        <location filename="../src/GUI/gui.cpp" line="721"/>
         <source>Zoom out</source>
         <translation>Forminsk</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="715"/>
+        <location filename="../src/GUI/gui.cpp" line="723"/>
         <source>Digital zoom</source>
         <translation>Digital forstørrelse</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="716"/>
+        <location filename="../src/GUI/gui.cpp" line="724"/>
         <source>Zoom</source>
         <translation>Forstørr</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="735"/>
+        <location filename="../src/GUI/gui.cpp" line="743"/>
         <source>DEM directory:</source>
         <translation>DEM-mappe:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="737"/>
+        <location filename="../src/GUI/gui.cpp" line="745"/>
         <source>Styles directory:</source>
         <translation>Stilmappe:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="739"/>
+        <location filename="../src/GUI/gui.cpp" line="747"/>
         <source>Tile cache directory:</source>
         <translation>Flishurtiglagringsmappe:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="729"/>
+        <location filename="../src/GUI/gui.cpp" line="737"/>
         <source>Map directory:</source>
         <translation>Kartmappe:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="731"/>
+        <location filename="../src/GUI/gui.cpp" line="739"/>
         <source>POI directory:</source>
         <translation>POI-mappe:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="733"/>
+        <location filename="../src/GUI/gui.cpp" line="741"/>
         <source>GCS/PCS directory:</source>
         <translation>GCS-/PCS-mappe:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="748"/>
+        <location filename="../src/GUI/gui.cpp" line="756"/>
         <source>Open file</source>
         <translation>Åpne fil</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="848"/>
+        <location filename="../src/GUI/gui.cpp" line="856"/>
         <source>Error loading data file:</source>
         <translation>Feil ved innlasting av datafil:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="851"/>
-        <location filename="../src/GUI/gui.cpp" line="886"/>
+        <location filename="../src/GUI/gui.cpp" line="859"/>
+        <location filename="../src/GUI/gui.cpp" line="894"/>
         <source>Line: %1</source>
         <translation>Linje: %1</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="859"/>
+        <location filename="../src/GUI/gui.cpp" line="867"/>
         <source>Open POI file</source>
         <translation>Åpne POI-fil</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="883"/>
+        <location filename="../src/GUI/gui.cpp" line="891"/>
         <source>Error loading POI file:</source>
         <translation>Kunne ikke laste inn POI-fil:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1055"/>
-        <location filename="../src/GUI/gui.cpp" line="1126"/>
+        <location filename="../src/GUI/gui.cpp" line="1100"/>
+        <location filename="../src/GUI/gui.cpp" line="1172"/>
         <source>Tracks</source>
         <translation>Spor</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1058"/>
-        <location filename="../src/GUI/gui.cpp" line="1128"/>
+        <location filename="../src/GUI/gui.cpp" line="1103"/>
+        <location filename="../src/GUI/gui.cpp" line="1174"/>
         <source>Routes</source>
         <translation>Ruter</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1061"/>
-        <location filename="../src/GUI/gui.cpp" line="1130"/>
+        <location filename="../src/GUI/gui.cpp" line="1106"/>
+        <location filename="../src/GUI/gui.cpp" line="1176"/>
         <source>Waypoints</source>
         <translation>Veipunkter</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1064"/>
-        <location filename="../src/GUI/gui.cpp" line="1132"/>
+        <location filename="../src/GUI/gui.cpp" line="1109"/>
+        <location filename="../src/GUI/gui.cpp" line="1178"/>
         <source>Areas</source>
         <translation>Områder</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1070"/>
-        <location filename="../src/GUI/gui.cpp" line="1074"/>
-        <location filename="../src/GUI/gui.cpp" line="1138"/>
-        <location filename="../src/GUI/gui.cpp" line="1141"/>
+        <location filename="../src/GUI/gui.cpp" line="1115"/>
+        <location filename="../src/GUI/gui.cpp" line="1119"/>
+        <location filename="../src/GUI/gui.cpp" line="1184"/>
+        <location filename="../src/GUI/gui.cpp" line="1187"/>
         <source>Date</source>
         <translation>Dato</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1107"/>
-        <location filename="../src/GUI/gui.cpp" line="1108"/>
+        <location filename="../src/GUI/gui.cpp" line="1152"/>
+        <location filename="../src/GUI/gui.cpp" line="1153"/>
         <source>Statistics</source>
         <translation>Statistikk</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1122"/>
+        <location filename="../src/GUI/gui.cpp" line="1168"/>
         <source>Name</source>
         <translation>Navn</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1340"/>
+        <location filename="../src/GUI/gui.cpp" line="1424"/>
         <source>Open map file</source>
         <translation>Åpne kartfil</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1360"/>
-        <location filename="../src/GUI/gui.cpp" line="1391"/>
+        <location filename="../src/GUI/gui.cpp" line="1444"/>
+        <location filename="../src/GUI/gui.cpp" line="1475"/>
         <source>Error loading map:</source>
         <translation>Feil ved innlasting av kart:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1401"/>
+        <location filename="../src/GUI/gui.cpp" line="1485"/>
         <source>No files loaded</source>
         <translation>Ingen filer lastet opp</translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/GUI/gui.cpp" line="1405"/>
+        <location filename="../src/GUI/gui.cpp" line="1489"/>
         <source>%n files</source>
         <translation>
             <numerusform>%n fil</numerusform>
@@ -1387,7 +1307,7 @@
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="442"/>
         <source>Use segments</source>
-        <translation type="unfinished"></translation>
+        <translation>Bruk segmenter</translation>
     </message>
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="481"/>
@@ -1579,6 +1499,159 @@
         <translation>Valg</translation>
     </message>
 </context>
+<context>
+    <name>PDFExportDialog</name>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="24"/>
+        <source>PDF files</source>
+        <translation>PDF-filer</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="24"/>
+        <source>All files</source>
+        <translation>Alle filer</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="51"/>
+        <source>Portrait</source>
+        <translation>Stående</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="52"/>
+        <source>Landscape</source>
+        <translation>Liggende</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="62"/>
+        <source>in</source>
+        <translation>tommer</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="62"/>
+        <source>cm</source>
+        <translation>cm</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="68"/>
+        <source>Page Setup</source>
+        <translation>Sideoppsett</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="71"/>
+        <source>Page size:</source>
+        <translation>Sidestørrelse:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="72"/>
+        <source>Resolution:</source>
+        <translation>Oppløsning:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="73"/>
+        <source>Orientation:</source>
+        <translation>Sideretning:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="74"/>
+        <source>Margins:</source>
+        <translation>Marger:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="80"/>
+        <source>File:</source>
+        <translation>Fil:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="87"/>
+        <source>Output file</source>
+        <translation>Utdatafil</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="94"/>
+        <source>Export</source>
+        <translation>Eksporter</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="109"/>
+        <source>Export to PDF</source>
+        <translation>Eksporter til PDF</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="117"/>
+        <source>Error</source>
+        <translation>Feil</translation>
+    </message>
+</context>
+<context>
+    <name>PNGExportDialog</name>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="22"/>
+        <source>PNG files</source>
+        <translation>PNG-filer</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="22"/>
+        <source>All files</source>
+        <translation>Alle filer</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="30"/>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="35"/>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="39"/>
+        <source>px</source>
+        <translation>px</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="41"/>
+        <source>Use anti-aliasing</source>
+        <translation type="unfinished">Bruk kanutjevning</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="45"/>
+        <source>Image Setup</source>
+        <translation>Bildeoppsett</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="48"/>
+        <source>Image width:</source>
+        <translation>Bildebredde:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="49"/>
+        <source>Image height:</source>
+        <translation>Bildehøyde:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="50"/>
+        <source>Margins:</source>
+        <translation>Marger:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="57"/>
+        <source>File:</source>
+        <translation>Fil:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="64"/>
+        <source>Output file</source>
+        <translation>Utdatafil</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="71"/>
+        <source>Export</source>
+        <translation>Eksporter</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="86"/>
+        <source>Export to PNG</source>
+        <translation>Eksporter til PNG</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="94"/>
+        <source>Error</source>
+        <translation>Feil</translation>
+    </message>
+</context>
 <context>
     <name>PolygonItem</name>
     <message>
@@ -1871,7 +1944,7 @@
     <message>
         <location filename="../src/GUI/trackitem.cpp" line="17"/>
         <source>Comment</source>
-        <translation type="unfinished">Kommentar</translation>
+        <translation>Kommentar</translation>
     </message>
     <message>
         <location filename="../src/GUI/trackitem.cpp" line="18"/>
@@ -1929,7 +2002,7 @@
     <message>
         <location filename="../src/GUI/waypointitem.cpp" line="51"/>
         <source>Comment</source>
-        <translation type="unfinished">Kommentar</translation>
+        <translation>Kommentar</translation>
     </message>
     <message>
         <location filename="../src/GUI/waypointitem.cpp" line="64"/>

lang/gpxsee_pl.ts

@@ -204,106 +204,6 @@
         <translation>Minimum</translation>
     </message>
 </context>
-<context>
-    <name>ExportDialog</name>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="135"/>
-        <source>Export to PDF</source>
-        <translation>Eksportuj do PDF</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="52"/>
-        <source>Portrait</source>
-        <translation>Pionowo</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="53"/>
-        <source>Landscape</source>
-        <translation>Poziomo</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="97"/>
-        <source>Page size:</source>
-        <translation>Rozmiar strony:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="99"/>
-        <source>Orientation:</source>
-        <translation>Orientacja:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="94"/>
-        <source>Page Setup</source>
-        <translation>Ustawienia strony</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="25"/>
-        <source>PDF files</source>
-        <translation>Pliki PDF</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="25"/>
-        <source>All files</source>
-        <translation>Wszystkie pliki</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="66"/>
-        <source>in</source>
-        <translation>in</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="66"/>
-        <source>mm</source>
-        <translation>mm</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="98"/>
-        <source>Resolution:</source>
-        <translation>Rozdzielczość:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="100"/>
-        <source>Margins:</source>
-        <translation>Marginesy:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="106"/>
-        <source>File:</source>
-        <translation>Plik:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="113"/>
-        <source>Output file</source>
-        <translation>Plik docelowy</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="120"/>
-        <source>Export</source>
-        <translation>Eksportuj</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="142"/>
-        <location filename="../src/GUI/exportdialog.cpp" line="152"/>
-        <location filename="../src/GUI/exportdialog.cpp" line="157"/>
-        <source>Error</source>
-        <translation>Błąd</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="142"/>
-        <source>No output file selected.</source>
-        <translation>Nie wybrano pliku docelowego.</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="152"/>
-        <source>%1 is a directory.</source>
-        <translation>%1 jest katalogiem.</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="157"/>
-        <source>%1 is not writable.</source>
-        <translation>%1 nie jest zapisywalny.</translation>
-    </message>
-</context>
 <context>
     <name>FileSelectWidget</name>
     <message>
@@ -311,6 +211,21 @@
         <source>Select file</source>
         <translation>Wybierz plik</translation>
     </message>
+    <message>
+        <location filename="../src/GUI/fileselectwidget.cpp" line="48"/>
+        <source>No output file selected.</source>
+        <translation>Nie wybrano pliku docelowego.</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/fileselectwidget.cpp" line="58"/>
+        <source>%1 is a directory.</source>
+        <translation>%1 jest katalogiem.</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/fileselectwidget.cpp" line="62"/>
+        <source>%1 is not writable.</source>
+        <translation>%1 nie jest zapisywalny.</translation>
+    </message>
 </context>
 <context>
     <name>Format</name>
@@ -346,12 +261,12 @@
 <context>
     <name>GUI</name>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="748"/>
+        <location filename="../src/GUI/gui.cpp" line="756"/>
         <source>Open file</source>
         <translation>Otwórz plik</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="859"/>
+        <location filename="../src/GUI/gui.cpp" line="867"/>
         <source>Open POI file</source>
         <translation>Otwórz plik POI</translation>
     </message>
@@ -362,58 +277,58 @@
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="214"/>
-        <location filename="../src/GUI/gui.cpp" line="691"/>
-        <location filename="../src/GUI/gui.cpp" line="692"/>
+        <location filename="../src/GUI/gui.cpp" line="699"/>
+        <location filename="../src/GUI/gui.cpp" line="700"/>
         <source>Keyboard controls</source>
         <translation>Elementy sterujące klawiatury</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="240"/>
+        <location filename="../src/GUI/gui.cpp" line="247"/>
         <source>Close</source>
         <translation>Zamknij</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="246"/>
+        <location filename="../src/GUI/gui.cpp" line="253"/>
         <source>Reload</source>
         <translation>Odśwież</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="596"/>
+        <location filename="../src/GUI/gui.cpp" line="604"/>
         <source>Show</source>
         <translation>Pokaż</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="588"/>
+        <location filename="../src/GUI/gui.cpp" line="596"/>
         <source>File</source>
         <translation>Plik</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="265"/>
+        <location filename="../src/GUI/gui.cpp" line="272"/>
         <source>Close POI files</source>
         <translation>Zamknij pliki POI</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="269"/>
+        <location filename="../src/GUI/gui.cpp" line="276"/>
         <source>Overlap POIs</source>
         <translation>Nakładka POI</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="274"/>
+        <location filename="../src/GUI/gui.cpp" line="281"/>
         <source>Show POI labels</source>
         <translation>Pokaż etykiety POI</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="279"/>
+        <location filename="../src/GUI/gui.cpp" line="286"/>
         <source>Show POIs</source>
         <translation>Pokaż punkty POI</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="290"/>
+        <location filename="../src/GUI/gui.cpp" line="297"/>
         <source>Show map</source>
         <translation>Pokaż mapę</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="303"/>
+        <location filename="../src/GUI/gui.cpp" line="310"/>
         <source>Clear tile cache</source>
         <translation>Wyczyść pamięć podręczną kafelków</translation>
     </message>
@@ -424,349 +339,354 @@
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="211"/>
-        <location filename="../src/GUI/gui.cpp" line="725"/>
-        <location filename="../src/GUI/gui.cpp" line="726"/>
+        <location filename="../src/GUI/gui.cpp" line="733"/>
+        <location filename="../src/GUI/gui.cpp" line="734"/>
         <source>Paths</source>
         <translation>Ścieżki</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="253"/>
+        <location filename="../src/GUI/gui.cpp" line="241"/>
+        <source>Export to PNG...</source>
+        <translation>Eksportuj do PNG...</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/gui.cpp" line="260"/>
         <source>Statistics...</source>
         <translation>Statystyka...</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="261"/>
+        <location filename="../src/GUI/gui.cpp" line="268"/>
         <source>Load POI file...</source>
         <translation>Załaduj plik POI...</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="299"/>
+        <location filename="../src/GUI/gui.cpp" line="306"/>
         <source>Load map...</source>
         <translation>Załaduj mapę...</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="308"/>
-        <location filename="../src/GUI/gui.cpp" line="313"/>
-        <location filename="../src/GUI/gui.cpp" line="708"/>
+        <location filename="../src/GUI/gui.cpp" line="315"/>
+        <location filename="../src/GUI/gui.cpp" line="320"/>
+        <location filename="../src/GUI/gui.cpp" line="716"/>
         <source>Next map</source>
         <translation>Następna mapa</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="318"/>
+        <location filename="../src/GUI/gui.cpp" line="325"/>
         <source>Show cursor coordinates</source>
         <translation>Pokaż współrzędne kursora</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="325"/>
+        <location filename="../src/GUI/gui.cpp" line="332"/>
         <source>Show tracks</source>
         <translation>Pokaż ślady</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="330"/>
+        <location filename="../src/GUI/gui.cpp" line="337"/>
         <source>Show routes</source>
         <translation>Pokaż trasy</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="335"/>
+        <location filename="../src/GUI/gui.cpp" line="342"/>
         <source>Show waypoints</source>
         <translation>Pokaż punkty nawigacyjne</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="340"/>
+        <location filename="../src/GUI/gui.cpp" line="347"/>
         <source>Show areas</source>
         <translation>Pokaż obszary</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="345"/>
+        <location filename="../src/GUI/gui.cpp" line="352"/>
         <source>Waypoint labels</source>
         <translation>Etykiety punktów nawigacyjnych</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="355"/>
+        <location filename="../src/GUI/gui.cpp" line="362"/>
         <source>km/mi markers</source>
         <translation>Znaczniki km/mi</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="362"/>
+        <location filename="../src/GUI/gui.cpp" line="369"/>
         <source>Show graphs</source>
         <translation>Pokaż wykresy</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="386"/>
+        <location filename="../src/GUI/gui.cpp" line="393"/>
         <source>Show grid</source>
         <translation>Pokaż siatkę</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="391"/>
+        <location filename="../src/GUI/gui.cpp" line="398"/>
         <source>Show slider info</source>
         <translation>Pokaż informację o suwaku</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="396"/>
+        <location filename="../src/GUI/gui.cpp" line="403"/>
         <source>Show path markers</source>
         <translation>Pokaż znaczniki ścieżki</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="403"/>
+        <location filename="../src/GUI/gui.cpp" line="410"/>
         <source>Show toolbars</source>
         <translation>Pokaż paski narzędzi</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="410"/>
+        <location filename="../src/GUI/gui.cpp" line="417"/>
         <source>Total time</source>
         <translation>Całkowity czas</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="416"/>
-        <location filename="../src/GUI/gui.cpp" line="1086"/>
-        <location filename="../src/GUI/gui.cpp" line="1152"/>
+        <location filename="../src/GUI/gui.cpp" line="423"/>
+        <location filename="../src/GUI/gui.cpp" line="1131"/>
+        <location filename="../src/GUI/gui.cpp" line="1198"/>
         <source>Moving time</source>
         <translation>Czas ruchu</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="424"/>
+        <location filename="../src/GUI/gui.cpp" line="431"/>
         <source>Metric</source>
         <translation>Metryczne</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="430"/>
+        <location filename="../src/GUI/gui.cpp" line="437"/>
         <source>Imperial</source>
         <translation>Imperialne</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="436"/>
+        <location filename="../src/GUI/gui.cpp" line="443"/>
         <source>Nautical</source>
         <translation>Morskie</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="444"/>
+        <location filename="../src/GUI/gui.cpp" line="451"/>
         <source>Decimal degrees (DD)</source>
         <translation>Stopnie dziesiętne (DD)</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="450"/>
+        <location filename="../src/GUI/gui.cpp" line="457"/>
         <source>Degrees and decimal minutes (DMM)</source>
         <translation>Stopnie i minuty dziesiętne (DMM)</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="457"/>
+        <location filename="../src/GUI/gui.cpp" line="464"/>
         <source>Degrees, minutes, seconds (DMS)</source>
         <translation>Stopnie, minuty, sekundy (DMS)</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="463"/>
+        <location filename="../src/GUI/gui.cpp" line="470"/>
         <source>Fullscreen mode</source>
         <translation>Tryb pełnoekranowy</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="470"/>
+        <location filename="../src/GUI/gui.cpp" line="477"/>
         <source>Options...</source>
         <translation>Opcje...</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="476"/>
+        <location filename="../src/GUI/gui.cpp" line="483"/>
         <source>Next</source>
         <translation>Następny</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="480"/>
+        <location filename="../src/GUI/gui.cpp" line="487"/>
         <source>Previous</source>
         <translation>Poprzedni</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="484"/>
+        <location filename="../src/GUI/gui.cpp" line="491"/>
         <source>Last</source>
         <translation>Ostatni</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="488"/>
+        <location filename="../src/GUI/gui.cpp" line="495"/>
         <source>First</source>
         <translation>Pierwszy</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="532"/>
+        <location filename="../src/GUI/gui.cpp" line="540"/>
         <source>POI files</source>
         <translation>Pliki POI</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="544"/>
+        <location filename="../src/GUI/gui.cpp" line="552"/>
         <source>Display</source>
         <translation>Wyświetlanie</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="558"/>
+        <location filename="../src/GUI/gui.cpp" line="566"/>
         <source>Units</source>
         <translation>Jednostki</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="562"/>
+        <location filename="../src/GUI/gui.cpp" line="570"/>
         <source>Coordinates format</source>
         <translation>Format współrzędnych</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="670"/>
+        <location filename="../src/GUI/gui.cpp" line="678"/>
         <source>Version %1</source>
         <translation>Wersja %1</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="674"/>
+        <location filename="../src/GUI/gui.cpp" line="682"/>
         <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 %1.</source>
         <translation>Program GPXSee jest rozpowszechniany na warunkach licencji GNU General Public License w wersji 3. Więcej informacji o programie GPXSee można znaleźć na stronie głównej projektu pod adresem %1.</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="701"/>
+        <location filename="../src/GUI/gui.cpp" line="709"/>
         <source>Append file</source>
         <translation>Dołącz plik</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="702"/>
+        <location filename="../src/GUI/gui.cpp" line="710"/>
         <source>Next/Previous</source>
         <translation>Następny/Poprzedni</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="704"/>
+        <location filename="../src/GUI/gui.cpp" line="712"/>
         <source>Toggle graph type</source>
         <translation>Zmień typ wykresu</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="706"/>
+        <location filename="../src/GUI/gui.cpp" line="714"/>
         <source>Toggle time type</source>
         <translation>Zmień typ czasu</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="710"/>
+        <location filename="../src/GUI/gui.cpp" line="718"/>
         <source>Previous map</source>
         <translation>Poprzednia mapa</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="711"/>
+        <location filename="../src/GUI/gui.cpp" line="719"/>
         <source>Zoom in</source>
         <translation>Przybliż</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="713"/>
+        <location filename="../src/GUI/gui.cpp" line="721"/>
         <source>Zoom out</source>
         <translation>Oddal</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="715"/>
+        <location filename="../src/GUI/gui.cpp" line="723"/>
         <source>Digital zoom</source>
         <translation>Zoom cyfrowy</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="716"/>
+        <location filename="../src/GUI/gui.cpp" line="724"/>
         <source>Zoom</source>
         <translation>Zoom</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="733"/>
+        <location filename="../src/GUI/gui.cpp" line="741"/>
         <source>GCS/PCS directory:</source>
         <translation>Katalog plików GCS/PCS:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="735"/>
+        <location filename="../src/GUI/gui.cpp" line="743"/>
         <source>DEM directory:</source>
         <translation>Katalog z danymi DEM:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="737"/>
+        <location filename="../src/GUI/gui.cpp" line="745"/>
         <source>Styles directory:</source>
         <translation>Katalog ze stylami:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1064"/>
-        <location filename="../src/GUI/gui.cpp" line="1132"/>
+        <location filename="../src/GUI/gui.cpp" line="1109"/>
+        <location filename="../src/GUI/gui.cpp" line="1178"/>
         <source>Areas</source>
         <translation>Obszary</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1107"/>
-        <location filename="../src/GUI/gui.cpp" line="1108"/>
+        <location filename="../src/GUI/gui.cpp" line="1152"/>
+        <location filename="../src/GUI/gui.cpp" line="1153"/>
         <source>Statistics</source>
         <translation>Statystyka</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1340"/>
+        <location filename="../src/GUI/gui.cpp" line="1424"/>
         <source>Open map file</source>
         <translation>Otwórz plik mapy</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1401"/>
+        <location filename="../src/GUI/gui.cpp" line="1485"/>
         <source>No files loaded</source>
         <translation>Nie załadowano żadnych plików</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1070"/>
-        <location filename="../src/GUI/gui.cpp" line="1074"/>
-        <location filename="../src/GUI/gui.cpp" line="1138"/>
-        <location filename="../src/GUI/gui.cpp" line="1141"/>
+        <location filename="../src/GUI/gui.cpp" line="1115"/>
+        <location filename="../src/GUI/gui.cpp" line="1119"/>
+        <location filename="../src/GUI/gui.cpp" line="1184"/>
+        <location filename="../src/GUI/gui.cpp" line="1187"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="496"/>
+        <location filename="../src/GUI/gui.cpp" line="503"/>
         <source>&amp;File</source>
         <translation>&amp;Plik</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="511"/>
+        <location filename="../src/GUI/gui.cpp" line="519"/>
         <source>&amp;Map</source>
         <translation>&amp;Mapa</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="521"/>
+        <location filename="../src/GUI/gui.cpp" line="529"/>
         <source>&amp;Graph</source>
         <translation>&amp;Wykres</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="531"/>
+        <location filename="../src/GUI/gui.cpp" line="539"/>
         <source>&amp;POI</source>
         <translation>P&amp;OI</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="543"/>
+        <location filename="../src/GUI/gui.cpp" line="551"/>
         <source>&amp;Data</source>
         <translation>&amp;Dane</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="554"/>
+        <location filename="../src/GUI/gui.cpp" line="562"/>
         <source>&amp;Settings</source>
         <translation>&amp;Ustawienia</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="572"/>
+        <location filename="../src/GUI/gui.cpp" line="580"/>
         <source>&amp;Help</source>
         <translation>Pomo&amp;c</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="729"/>
+        <location filename="../src/GUI/gui.cpp" line="737"/>
         <source>Map directory:</source>
         <translation>Katalog z mapami:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="731"/>
+        <location filename="../src/GUI/gui.cpp" line="739"/>
         <source>POI directory:</source>
         <translation>Katalog z POI:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="739"/>
+        <location filename="../src/GUI/gui.cpp" line="747"/>
         <source>Tile cache directory:</source>
         <translation>Katalog pamięci podręcznej kafelków:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1058"/>
-        <location filename="../src/GUI/gui.cpp" line="1128"/>
+        <location filename="../src/GUI/gui.cpp" line="1103"/>
+        <location filename="../src/GUI/gui.cpp" line="1174"/>
         <source>Routes</source>
         <translation>Trasy</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1360"/>
-        <location filename="../src/GUI/gui.cpp" line="1391"/>
+        <location filename="../src/GUI/gui.cpp" line="1444"/>
+        <location filename="../src/GUI/gui.cpp" line="1475"/>
         <source>Error loading map:</source>
         <translation>Wystąpił błąd podczas ładowania mapy:</translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/GUI/gui.cpp" line="1405"/>
+        <location filename="../src/GUI/gui.cpp" line="1489"/>
         <source>%n files</source>
         <translation>
             <numerusform>%n plik</numerusform>
@@ -775,7 +695,7 @@
         </translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="695"/>
+        <location filename="../src/GUI/gui.cpp" line="703"/>
         <source>Next file</source>
         <translation>Następny plik</translation>
     </message>
@@ -790,81 +710,81 @@
         <translation>Eksportuj do PDF...</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1061"/>
-        <location filename="../src/GUI/gui.cpp" line="1130"/>
+        <location filename="../src/GUI/gui.cpp" line="1106"/>
+        <location filename="../src/GUI/gui.cpp" line="1176"/>
         <source>Waypoints</source>
         <translation>Punkty nawigacyjne</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="696"/>
+        <location filename="../src/GUI/gui.cpp" line="704"/>
         <source>Previous file</source>
         <translation>Poprzedni plik</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="350"/>
+        <location filename="../src/GUI/gui.cpp" line="357"/>
         <source>Route waypoints</source>
         <translation>Punkty trasy</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="698"/>
+        <location filename="../src/GUI/gui.cpp" line="706"/>
         <source>First file</source>
         <translation>Pierwszy plik</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="700"/>
+        <location filename="../src/GUI/gui.cpp" line="708"/>
         <source>Last file</source>
         <translation>Ostatni plik</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="848"/>
+        <location filename="../src/GUI/gui.cpp" line="856"/>
         <source>Error loading data file:</source>
         <translation>Błąd podczas ładowania pliku danych:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="851"/>
-        <location filename="../src/GUI/gui.cpp" line="886"/>
+        <location filename="../src/GUI/gui.cpp" line="859"/>
+        <location filename="../src/GUI/gui.cpp" line="894"/>
         <source>Line: %1</source>
         <translation>Linia: %1</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="883"/>
+        <location filename="../src/GUI/gui.cpp" line="891"/>
         <source>Error loading POI file:</source>
         <translation>Błąd podczas ładowania pliku POI:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1122"/>
+        <location filename="../src/GUI/gui.cpp" line="1168"/>
         <source>Name</source>
         <translation>Nazwa</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1055"/>
-        <location filename="../src/GUI/gui.cpp" line="1126"/>
+        <location filename="../src/GUI/gui.cpp" line="1100"/>
+        <location filename="../src/GUI/gui.cpp" line="1172"/>
         <source>Tracks</source>
         <translation>Ślady</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="217"/>
-        <location filename="../src/GUI/gui.cpp" line="669"/>
+        <location filename="../src/GUI/gui.cpp" line="677"/>
         <source>About GPXSee</source>
         <translation>O programie GPXSee</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="603"/>
+        <location filename="../src/GUI/gui.cpp" line="611"/>
         <source>Navigation</source>
         <translation>Nawigacja</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="372"/>
-        <location filename="../src/GUI/gui.cpp" line="1081"/>
-        <location filename="../src/GUI/gui.cpp" line="1148"/>
+        <location filename="../src/GUI/gui.cpp" line="379"/>
+        <location filename="../src/GUI/gui.cpp" line="1126"/>
+        <location filename="../src/GUI/gui.cpp" line="1194"/>
         <source>Distance</source>
         <translation>Dystans</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="379"/>
-        <location filename="../src/GUI/gui.cpp" line="555"/>
-        <location filename="../src/GUI/gui.cpp" line="1084"/>
-        <location filename="../src/GUI/gui.cpp" line="1150"/>
+        <location filename="../src/GUI/gui.cpp" line="386"/>
+        <location filename="../src/GUI/gui.cpp" line="563"/>
+        <location filename="../src/GUI/gui.cpp" line="1129"/>
+        <location filename="../src/GUI/gui.cpp" line="1196"/>
         <source>Time</source>
         <translation>Czas</translation>
     </message>
@@ -1580,6 +1500,159 @@
         <translation>Opcje</translation>
     </message>
 </context>
+<context>
+    <name>PDFExportDialog</name>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="24"/>
+        <source>PDF files</source>
+        <translation>Pliki PDF</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="24"/>
+        <source>All files</source>
+        <translation>Wszystkie pliki</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="51"/>
+        <source>Portrait</source>
+        <translation>Pionowo</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="52"/>
+        <source>Landscape</source>
+        <translation>Poziomo</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="62"/>
+        <source>in</source>
+        <translation>in</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="62"/>
+        <source>cm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="68"/>
+        <source>Page Setup</source>
+        <translation>Ustawienia strony</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="71"/>
+        <source>Page size:</source>
+        <translation>Rozmiar strony:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="72"/>
+        <source>Resolution:</source>
+        <translation>Rozdzielczość:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="73"/>
+        <source>Orientation:</source>
+        <translation>Orientacja:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="74"/>
+        <source>Margins:</source>
+        <translation>Marginesy:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="80"/>
+        <source>File:</source>
+        <translation>Plik:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="87"/>
+        <source>Output file</source>
+        <translation>Plik docelowy</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="94"/>
+        <source>Export</source>
+        <translation>Eksportuj</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="109"/>
+        <source>Export to PDF</source>
+        <translation>Eksportuj do PDF</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="117"/>
+        <source>Error</source>
+        <translation>Błąd</translation>
+    </message>
+</context>
+<context>
+    <name>PNGExportDialog</name>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="22"/>
+        <source>PNG files</source>
+        <translation>Pliki PNG</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="22"/>
+        <source>All files</source>
+        <translation>Wszystkie pliki</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="30"/>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="35"/>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="39"/>
+        <source>px</source>
+        <translation>px</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="41"/>
+        <source>Use anti-aliasing</source>
+        <translation type="unfinished">Użyj wygładzania</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="45"/>
+        <source>Image Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="48"/>
+        <source>Image width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="49"/>
+        <source>Image height:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="50"/>
+        <source>Margins:</source>
+        <translation>Marginesy:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="57"/>
+        <source>File:</source>
+        <translation>Plik:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="64"/>
+        <source>Output file</source>
+        <translation>Plik docelowy</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="71"/>
+        <source>Export</source>
+        <translation>Eksportuj</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="86"/>
+        <source>Export to PNG</source>
+        <translation>Eksportuj do PNG</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="94"/>
+        <source>Error</source>
+        <translation>Błąd</translation>
+    </message>
+</context>
 <context>
     <name>PolygonItem</name>
     <message>

lang/gpxsee_pt_BR.ts

@@ -204,106 +204,6 @@
         <translation>Mínima</translation>
     </message>
 </context>
-<context>
-    <name>ExportDialog</name>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="25"/>
-        <source>PDF files</source>
-        <translation>Arquivos PDF</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="25"/>
-        <source>All files</source>
-        <translation>Todos os arquivos</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="52"/>
-        <source>Portrait</source>
-        <translation>Retrato</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="53"/>
-        <source>Landscape</source>
-        <translation>Paisagem</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="66"/>
-        <source>mm</source>
-        <translation>mm</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="66"/>
-        <source>in</source>
-        <translation>in</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="94"/>
-        <source>Page Setup</source>
-        <translation>Configurar Página</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="97"/>
-        <source>Page size:</source>
-        <translation>Tamanho do papel:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="98"/>
-        <source>Resolution:</source>
-        <translation>Resolução:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="99"/>
-        <source>Orientation:</source>
-        <translation>Orientação:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="100"/>
-        <source>Margins:</source>
-        <translation>Margens:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="106"/>
-        <source>File:</source>
-        <translation>Arquivo:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="113"/>
-        <source>Output file</source>
-        <translation>Arquivo de saída</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="120"/>
-        <source>Export</source>
-        <translation>Exportar</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="135"/>
-        <source>Export to PDF</source>
-        <translation>Exportar para PDF</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="142"/>
-        <location filename="../src/GUI/exportdialog.cpp" line="152"/>
-        <location filename="../src/GUI/exportdialog.cpp" line="157"/>
-        <source>Error</source>
-        <translation>Erro</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="142"/>
-        <source>No output file selected.</source>
-        <translation>Nenhum arquivo de saída selecionado.</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="152"/>
-        <source>%1 is a directory.</source>
-        <translation>%1 é uma pasta.</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="157"/>
-        <source>%1 is not writable.</source>
-        <translation>%1 é apenas para leitura.</translation>
-    </message>
-</context>
 <context>
     <name>FileSelectWidget</name>
     <message>
@@ -311,6 +211,21 @@
         <source>Select file</source>
         <translation>Selecionar arquivo</translation>
     </message>
+    <message>
+        <location filename="../src/GUI/fileselectwidget.cpp" line="48"/>
+        <source>No output file selected.</source>
+        <translation>Nenhum arquivo de saída selecionado.</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/fileselectwidget.cpp" line="58"/>
+        <source>%1 is a directory.</source>
+        <translation>%1 é uma pasta.</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/fileselectwidget.cpp" line="62"/>
+        <source>%1 is not writable.</source>
+        <translation>%1 é apenas para leitura.</translation>
+    </message>
 </context>
 <context>
     <name>Format</name>
@@ -352,21 +267,21 @@
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="211"/>
-        <location filename="../src/GUI/gui.cpp" line="725"/>
-        <location filename="../src/GUI/gui.cpp" line="726"/>
+        <location filename="../src/GUI/gui.cpp" line="733"/>
+        <location filename="../src/GUI/gui.cpp" line="734"/>
         <source>Paths</source>
         <translation>Caminhos</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="214"/>
-        <location filename="../src/GUI/gui.cpp" line="691"/>
-        <location filename="../src/GUI/gui.cpp" line="692"/>
+        <location filename="../src/GUI/gui.cpp" line="699"/>
+        <location filename="../src/GUI/gui.cpp" line="700"/>
         <source>Keyboard controls</source>
         <translation>Controles de teclado</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="217"/>
-        <location filename="../src/GUI/gui.cpp" line="669"/>
+        <location filename="../src/GUI/gui.cpp" line="677"/>
         <source>About GPXSee</source>
         <translation>Sobre o GPXSee</translation>
     </message>
@@ -386,481 +301,486 @@
         <translation>Exportar para PDF...</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="240"/>
+        <location filename="../src/GUI/gui.cpp" line="241"/>
+        <source>Export to PNG...</source>
+        <translation>Exportar para PNG...</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/gui.cpp" line="247"/>
         <source>Close</source>
         <translation>Fechar</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="246"/>
+        <location filename="../src/GUI/gui.cpp" line="253"/>
         <source>Reload</source>
         <translation>Recarregar</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="253"/>
+        <location filename="../src/GUI/gui.cpp" line="260"/>
         <source>Statistics...</source>
         <translation>Estatísticas...</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="261"/>
+        <location filename="../src/GUI/gui.cpp" line="268"/>
         <source>Load POI file...</source>
         <translation>Carregar arquivo POI...</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="265"/>
+        <location filename="../src/GUI/gui.cpp" line="272"/>
         <source>Close POI files</source>
         <translation>Fechar arquivos POI</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="269"/>
+        <location filename="../src/GUI/gui.cpp" line="276"/>
         <source>Overlap POIs</source>
         <translation>Sobrepor POIs</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="274"/>
+        <location filename="../src/GUI/gui.cpp" line="281"/>
         <source>Show POI labels</source>
         <translation>Mostrar etiquetas POI</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="279"/>
+        <location filename="../src/GUI/gui.cpp" line="286"/>
         <source>Show POIs</source>
         <translation>Mostrar POIs</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="290"/>
+        <location filename="../src/GUI/gui.cpp" line="297"/>
         <source>Show map</source>
         <translation>Mostrar mapa</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="299"/>
+        <location filename="../src/GUI/gui.cpp" line="306"/>
         <source>Load map...</source>
         <translation>Carregar mapa...</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="303"/>
+        <location filename="../src/GUI/gui.cpp" line="310"/>
         <source>Clear tile cache</source>
         <translation>Limpar o cache de ladrilhos</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="308"/>
-        <location filename="../src/GUI/gui.cpp" line="313"/>
-        <location filename="../src/GUI/gui.cpp" line="708"/>
+        <location filename="../src/GUI/gui.cpp" line="315"/>
+        <location filename="../src/GUI/gui.cpp" line="320"/>
+        <location filename="../src/GUI/gui.cpp" line="716"/>
         <source>Next map</source>
         <translation>Próximo mapa</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="318"/>
+        <location filename="../src/GUI/gui.cpp" line="325"/>
         <source>Show cursor coordinates</source>
         <translation>Mostrar coordenadas do cursor</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="325"/>
+        <location filename="../src/GUI/gui.cpp" line="332"/>
         <source>Show tracks</source>
         <translation>Mostrar trilhas</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="330"/>
+        <location filename="../src/GUI/gui.cpp" line="337"/>
         <source>Show routes</source>
         <translation>Mostrar rotas</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="335"/>
+        <location filename="../src/GUI/gui.cpp" line="342"/>
         <source>Show waypoints</source>
         <translation>Mostrar waypoints</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="340"/>
+        <location filename="../src/GUI/gui.cpp" line="347"/>
         <source>Show areas</source>
         <translation>Mostrar áreas</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="345"/>
+        <location filename="../src/GUI/gui.cpp" line="352"/>
         <source>Waypoint labels</source>
         <translation>Etiquetas de waypoint</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="350"/>
+        <location filename="../src/GUI/gui.cpp" line="357"/>
         <source>Route waypoints</source>
         <translation>Waypoints da rota</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="355"/>
+        <location filename="../src/GUI/gui.cpp" line="362"/>
         <source>km/mi markers</source>
         <translation>Marcadores de km/mi</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="362"/>
+        <location filename="../src/GUI/gui.cpp" line="369"/>
         <source>Show graphs</source>
         <translation>Mostrar gráficos</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="372"/>
-        <location filename="../src/GUI/gui.cpp" line="1081"/>
-        <location filename="../src/GUI/gui.cpp" line="1148"/>
+        <location filename="../src/GUI/gui.cpp" line="379"/>
+        <location filename="../src/GUI/gui.cpp" line="1126"/>
+        <location filename="../src/GUI/gui.cpp" line="1194"/>
         <source>Distance</source>
         <translation>Distância</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="379"/>
-        <location filename="../src/GUI/gui.cpp" line="555"/>
-        <location filename="../src/GUI/gui.cpp" line="1084"/>
-        <location filename="../src/GUI/gui.cpp" line="1150"/>
+        <location filename="../src/GUI/gui.cpp" line="386"/>
+        <location filename="../src/GUI/gui.cpp" line="563"/>
+        <location filename="../src/GUI/gui.cpp" line="1129"/>
+        <location filename="../src/GUI/gui.cpp" line="1196"/>
         <source>Time</source>
         <translation>Tempo</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="386"/>
+        <location filename="../src/GUI/gui.cpp" line="393"/>
         <source>Show grid</source>
         <translation>Mostrar grade</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="391"/>
+        <location filename="../src/GUI/gui.cpp" line="398"/>
         <source>Show slider info</source>
         <translation>Mostrar informações do cursor</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="396"/>
+        <location filename="../src/GUI/gui.cpp" line="403"/>
         <source>Show path markers</source>
         <translation>Mostrar marcadores de caminho</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="403"/>
+        <location filename="../src/GUI/gui.cpp" line="410"/>
         <source>Show toolbars</source>
         <translation>Mostrar barra de ferramentas</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="410"/>
+        <location filename="../src/GUI/gui.cpp" line="417"/>
         <source>Total time</source>
         <translation>Tempo total</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="416"/>
-        <location filename="../src/GUI/gui.cpp" line="1086"/>
-        <location filename="../src/GUI/gui.cpp" line="1152"/>
+        <location filename="../src/GUI/gui.cpp" line="423"/>
+        <location filename="../src/GUI/gui.cpp" line="1131"/>
+        <location filename="../src/GUI/gui.cpp" line="1198"/>
         <source>Moving time</source>
         <translation>Tempo em movimento</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="424"/>
+        <location filename="../src/GUI/gui.cpp" line="431"/>
         <source>Metric</source>
         <translation>Métrica</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="430"/>
+        <location filename="../src/GUI/gui.cpp" line="437"/>
         <source>Imperial</source>
         <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="436"/>
+        <location filename="../src/GUI/gui.cpp" line="443"/>
         <source>Nautical</source>
         <translation>Naútica</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="444"/>
+        <location filename="../src/GUI/gui.cpp" line="451"/>
         <source>Decimal degrees (DD)</source>
         <translation>Graus decimais (DD)</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="450"/>
+        <location filename="../src/GUI/gui.cpp" line="457"/>
         <source>Degrees and decimal minutes (DMM)</source>
         <translation>Graus e minutos decimais (DMM)</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="457"/>
+        <location filename="../src/GUI/gui.cpp" line="464"/>
         <source>Degrees, minutes, seconds (DMS)</source>
         <translation>Graus, minutos, segundos (DMS)</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="463"/>
+        <location filename="../src/GUI/gui.cpp" line="470"/>
         <source>Fullscreen mode</source>
         <translation>Tela inteira</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="470"/>
+        <location filename="../src/GUI/gui.cpp" line="477"/>
         <source>Options...</source>
         <translation>Preferências...</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="476"/>
+        <location filename="../src/GUI/gui.cpp" line="483"/>
         <source>Next</source>
         <translation>Próximo</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="480"/>
+        <location filename="../src/GUI/gui.cpp" line="487"/>
         <source>Previous</source>
         <translation>Anterior</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="484"/>
+        <location filename="../src/GUI/gui.cpp" line="491"/>
         <source>Last</source>
         <translation>Último</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="488"/>
+        <location filename="../src/GUI/gui.cpp" line="495"/>
         <source>First</source>
         <translation>Primeiro</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="496"/>
+        <location filename="../src/GUI/gui.cpp" line="503"/>
         <source>&amp;File</source>
         <translation>&amp;Arquivo</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="511"/>
+        <location filename="../src/GUI/gui.cpp" line="519"/>
         <source>&amp;Map</source>
         <translation>&amp;Mapa</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="521"/>
+        <location filename="../src/GUI/gui.cpp" line="529"/>
         <source>&amp;Graph</source>
         <translation>&amp;Gráfico</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="531"/>
+        <location filename="../src/GUI/gui.cpp" line="539"/>
         <source>&amp;POI</source>
         <translation>&amp;POI</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="532"/>
+        <location filename="../src/GUI/gui.cpp" line="540"/>
         <source>POI files</source>
         <translation>Arquivos POI</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="543"/>
+        <location filename="../src/GUI/gui.cpp" line="551"/>
         <source>&amp;Data</source>
         <translation>&amp;Dados</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="544"/>
+        <location filename="../src/GUI/gui.cpp" line="552"/>
         <source>Display</source>
         <translation>Visualizar</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="554"/>
+        <location filename="../src/GUI/gui.cpp" line="562"/>
         <source>&amp;Settings</source>
         <translation>&amp;Configurações</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="558"/>
+        <location filename="../src/GUI/gui.cpp" line="566"/>
         <source>Units</source>
         <translation>Unidades</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="562"/>
+        <location filename="../src/GUI/gui.cpp" line="570"/>
         <source>Coordinates format</source>
         <translation>Formato de coordenadas</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="572"/>
+        <location filename="../src/GUI/gui.cpp" line="580"/>
         <source>&amp;Help</source>
         <translation>Aj&amp;uda</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="588"/>
+        <location filename="../src/GUI/gui.cpp" line="596"/>
         <source>File</source>
         <translation>Arquivo</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="596"/>
+        <location filename="../src/GUI/gui.cpp" line="604"/>
         <source>Show</source>
         <translation>Exibir</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="603"/>
+        <location filename="../src/GUI/gui.cpp" line="611"/>
         <source>Navigation</source>
         <translation>Navegação</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="670"/>
+        <location filename="../src/GUI/gui.cpp" line="678"/>
         <source>Version %1</source>
         <translation>Versão %1</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="674"/>
+        <location filename="../src/GUI/gui.cpp" line="682"/>
         <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 %1.</source>
         <translation>GPXSee é distribuído nos termos da Licença Pública Geral GNU versão 3. Para mais informações sobre o GPXSee visite a página do projeto em %1.</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="695"/>
+        <location filename="../src/GUI/gui.cpp" line="703"/>
         <source>Next file</source>
         <translation>Próximo arquivo</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="696"/>
+        <location filename="../src/GUI/gui.cpp" line="704"/>
         <source>Previous file</source>
         <translation>Arquivo anterior</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="698"/>
+        <location filename="../src/GUI/gui.cpp" line="706"/>
         <source>First file</source>
         <translation>Primeiro arquivo</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="700"/>
+        <location filename="../src/GUI/gui.cpp" line="708"/>
         <source>Last file</source>
         <translation>Último arquivo</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="701"/>
+        <location filename="../src/GUI/gui.cpp" line="709"/>
         <source>Append file</source>
         <translation>Anexar arquivo</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="702"/>
+        <location filename="../src/GUI/gui.cpp" line="710"/>
         <source>Next/Previous</source>
         <translation>Próximo/Anterior</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="704"/>
+        <location filename="../src/GUI/gui.cpp" line="712"/>
         <source>Toggle graph type</source>
         <translation>Alterna o tipo do gráfico</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="706"/>
+        <location filename="../src/GUI/gui.cpp" line="714"/>
         <source>Toggle time type</source>
         <translation>Alterna o tipo de tempo</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="710"/>
+        <location filename="../src/GUI/gui.cpp" line="718"/>
         <source>Previous map</source>
         <translation>Mapa anterior</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="711"/>
+        <location filename="../src/GUI/gui.cpp" line="719"/>
         <source>Zoom in</source>
         <translation>Aumentar o zoom</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="713"/>
+        <location filename="../src/GUI/gui.cpp" line="721"/>
         <source>Zoom out</source>
         <translation>Reduzir o zoom</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="715"/>
+        <location filename="../src/GUI/gui.cpp" line="723"/>
         <source>Digital zoom</source>
         <translation>Zoom digital</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="716"/>
+        <location filename="../src/GUI/gui.cpp" line="724"/>
         <source>Zoom</source>
         <translation>Zoom</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="729"/>
+        <location filename="../src/GUI/gui.cpp" line="737"/>
         <source>Map directory:</source>
         <translation>Diretório de mapas:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="731"/>
+        <location filename="../src/GUI/gui.cpp" line="739"/>
         <source>POI directory:</source>
         <translation>Diretório de POI:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="733"/>
+        <location filename="../src/GUI/gui.cpp" line="741"/>
         <source>GCS/PCS directory:</source>
         <translation>Diretório de GCS/PCS:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="735"/>
+        <location filename="../src/GUI/gui.cpp" line="743"/>
         <source>DEM directory:</source>
         <translation>Diretório de DEM:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="737"/>
+        <location filename="../src/GUI/gui.cpp" line="745"/>
         <source>Styles directory:</source>
         <translation>Diretório de estilos:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="739"/>
+        <location filename="../src/GUI/gui.cpp" line="747"/>
         <source>Tile cache directory:</source>
         <translation>Diretório de cache de ladrilhos:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="748"/>
+        <location filename="../src/GUI/gui.cpp" line="756"/>
         <source>Open file</source>
         <translation>Abrir arquivo</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="848"/>
+        <location filename="../src/GUI/gui.cpp" line="856"/>
         <source>Error loading data file:</source>
         <translation>Erro ao carregar arquivo de dados:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="851"/>
-        <location filename="../src/GUI/gui.cpp" line="886"/>
+        <location filename="../src/GUI/gui.cpp" line="859"/>
+        <location filename="../src/GUI/gui.cpp" line="894"/>
         <source>Line: %1</source>
         <translation>Linha: %1</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="859"/>
+        <location filename="../src/GUI/gui.cpp" line="867"/>
         <source>Open POI file</source>
         <translation>Abrir aquivo POI</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="883"/>
+        <location filename="../src/GUI/gui.cpp" line="891"/>
         <source>Error loading POI file:</source>
         <translation>Erro ao carregar arquivo POI:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1055"/>
-        <location filename="../src/GUI/gui.cpp" line="1126"/>
+        <location filename="../src/GUI/gui.cpp" line="1100"/>
+        <location filename="../src/GUI/gui.cpp" line="1172"/>
         <source>Tracks</source>
         <translation>Trilhas</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1058"/>
-        <location filename="../src/GUI/gui.cpp" line="1128"/>
+        <location filename="../src/GUI/gui.cpp" line="1103"/>
+        <location filename="../src/GUI/gui.cpp" line="1174"/>
         <source>Routes</source>
         <translation>Rotas</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1061"/>
-        <location filename="../src/GUI/gui.cpp" line="1130"/>
+        <location filename="../src/GUI/gui.cpp" line="1106"/>
+        <location filename="../src/GUI/gui.cpp" line="1176"/>
         <source>Waypoints</source>
         <translation>Waypoints</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1064"/>
-        <location filename="../src/GUI/gui.cpp" line="1132"/>
+        <location filename="../src/GUI/gui.cpp" line="1109"/>
+        <location filename="../src/GUI/gui.cpp" line="1178"/>
         <source>Areas</source>
         <translation>Áreas</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1070"/>
-        <location filename="../src/GUI/gui.cpp" line="1074"/>
-        <location filename="../src/GUI/gui.cpp" line="1138"/>
-        <location filename="../src/GUI/gui.cpp" line="1141"/>
+        <location filename="../src/GUI/gui.cpp" line="1115"/>
+        <location filename="../src/GUI/gui.cpp" line="1119"/>
+        <location filename="../src/GUI/gui.cpp" line="1184"/>
+        <location filename="../src/GUI/gui.cpp" line="1187"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1107"/>
-        <location filename="../src/GUI/gui.cpp" line="1108"/>
+        <location filename="../src/GUI/gui.cpp" line="1152"/>
+        <location filename="../src/GUI/gui.cpp" line="1153"/>
         <source>Statistics</source>
         <translation>Estatísticas</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1122"/>
+        <location filename="../src/GUI/gui.cpp" line="1168"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1340"/>
+        <location filename="../src/GUI/gui.cpp" line="1424"/>
         <source>Open map file</source>
         <translation>Abrir arquivo de mapa</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1360"/>
-        <location filename="../src/GUI/gui.cpp" line="1391"/>
+        <location filename="../src/GUI/gui.cpp" line="1444"/>
+        <location filename="../src/GUI/gui.cpp" line="1475"/>
         <source>Error loading map:</source>
         <translation>Erro ao carregar o mapa:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1401"/>
+        <location filename="../src/GUI/gui.cpp" line="1485"/>
         <source>No files loaded</source>
         <translation>Nenhum arquivo carregado</translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/GUI/gui.cpp" line="1405"/>
+        <location filename="../src/GUI/gui.cpp" line="1489"/>
         <source>%n files</source>
         <translation>
             <numerusform>%n arquivo</numerusform>
@@ -1393,7 +1313,7 @@
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="442"/>
         <source>Use segments</source>
-        <translation type="unfinished"></translation>
+        <translation>Usar segmentos</translation>
     </message>
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="481"/>
@@ -1579,6 +1499,159 @@
         <translation>Preferências</translation>
     </message>
 </context>
+<context>
+    <name>PDFExportDialog</name>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="24"/>
+        <source>PDF files</source>
+        <translation>Arquivos PDF</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="24"/>
+        <source>All files</source>
+        <translation>Todos os arquivos</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="51"/>
+        <source>Portrait</source>
+        <translation>Retrato</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="52"/>
+        <source>Landscape</source>
+        <translation>Paisagem</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="62"/>
+        <source>in</source>
+        <translation>in</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="62"/>
+        <source>cm</source>
+        <translation>cm</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="68"/>
+        <source>Page Setup</source>
+        <translation>Configurar Página</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="71"/>
+        <source>Page size:</source>
+        <translation>Tamanho do papel:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="72"/>
+        <source>Resolution:</source>
+        <translation>Resolução:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="73"/>
+        <source>Orientation:</source>
+        <translation>Orientação:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="74"/>
+        <source>Margins:</source>
+        <translation>Margens:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="80"/>
+        <source>File:</source>
+        <translation>Arquivo:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="87"/>
+        <source>Output file</source>
+        <translation>Arquivo de saída</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="94"/>
+        <source>Export</source>
+        <translation>Exportar</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="109"/>
+        <source>Export to PDF</source>
+        <translation>Exportar para PDF</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="117"/>
+        <source>Error</source>
+        <translation>Erro</translation>
+    </message>
+</context>
+<context>
+    <name>PNGExportDialog</name>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="22"/>
+        <source>PNG files</source>
+        <translation>Arquivos PNG</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="22"/>
+        <source>All files</source>
+        <translation>Todos os arquivos</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="30"/>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="35"/>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="39"/>
+        <source>px</source>
+        <translation>px</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="41"/>
+        <source>Use anti-aliasing</source>
+        <translation>Usar anti-aliasing</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="45"/>
+        <source>Image Setup</source>
+        <translation>Configuração da Imagem</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="48"/>
+        <source>Image width:</source>
+        <translation>Largura da imagem:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="49"/>
+        <source>Image height:</source>
+        <translation>Altura da imagem:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="50"/>
+        <source>Margins:</source>
+        <translation>Margens:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="57"/>
+        <source>File:</source>
+        <translation>Arquivo:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="64"/>
+        <source>Output file</source>
+        <translation>Arquivo de saída</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="71"/>
+        <source>Export</source>
+        <translation>Exportar</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="86"/>
+        <source>Export to PNG</source>
+        <translation>Exportar para PNG</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="94"/>
+        <source>Error</source>
+        <translation>Erro</translation>
+    </message>
+</context>
 <context>
     <name>PolygonItem</name>
     <message>

lang/gpxsee_ru.ts

@@ -204,106 +204,6 @@
         <translation>Минимум</translation>
     </message>
 </context>
-<context>
-    <name>ExportDialog</name>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="135"/>
-        <source>Export to PDF</source>
-        <translation>Экспорт в PDF</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="52"/>
-        <source>Portrait</source>
-        <translation>Портретная</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="53"/>
-        <source>Landscape</source>
-        <translation>Ландшафтная</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="97"/>
-        <source>Page size:</source>
-        <translation>Размер страницы:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="99"/>
-        <source>Orientation:</source>
-        <translation>Ориентация:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="94"/>
-        <source>Page Setup</source>
-        <translation>Параметры страницы</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="25"/>
-        <source>PDF files</source>
-        <translation>PDF файлы</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="25"/>
-        <source>All files</source>
-        <translation>Все файлы</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="66"/>
-        <source>in</source>
-        <translation>in</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="66"/>
-        <source>mm</source>
-        <translation>мм</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="98"/>
-        <source>Resolution:</source>
-        <translation>Разрешение:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="100"/>
-        <source>Margins:</source>
-        <translation>Поля:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="106"/>
-        <source>File:</source>
-        <translation>Файл:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="113"/>
-        <source>Output file</source>
-        <translation>Файл вывода</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="120"/>
-        <source>Export</source>
-        <translation>Экспорт</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="142"/>
-        <location filename="../src/GUI/exportdialog.cpp" line="152"/>
-        <location filename="../src/GUI/exportdialog.cpp" line="157"/>
-        <source>Error</source>
-        <translation>Ошибка</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="142"/>
-        <source>No output file selected.</source>
-        <translation>Не выбран файл вывода.</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="152"/>
-        <source>%1 is a directory.</source>
-        <translation>Файл %1 - это директория.</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="157"/>
-        <source>%1 is not writable.</source>
-        <translation>%1 не доступен для записи.</translation>
-    </message>
-</context>
 <context>
     <name>FileSelectWidget</name>
     <message>
@@ -311,6 +211,21 @@
         <source>Select file</source>
         <translation>Выбрать файл</translation>
     </message>
+    <message>
+        <location filename="../src/GUI/fileselectwidget.cpp" line="48"/>
+        <source>No output file selected.</source>
+        <translation>Не выбран файл вывода.</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/fileselectwidget.cpp" line="58"/>
+        <source>%1 is a directory.</source>
+        <translation>%1 - это директория.</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/fileselectwidget.cpp" line="62"/>
+        <source>%1 is not writable.</source>
+        <translation>%1 не доступен для записи.</translation>
+    </message>
 </context>
 <context>
     <name>Format</name>
@@ -346,12 +261,12 @@
 <context>
     <name>GUI</name>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="748"/>
+        <location filename="../src/GUI/gui.cpp" line="756"/>
         <source>Open file</source>
         <translation>Открыть файл</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="859"/>
+        <location filename="../src/GUI/gui.cpp" line="867"/>
         <source>Open POI file</source>
         <translation>Открыть файл с точками POI</translation>
     </message>
@@ -362,58 +277,58 @@
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="214"/>
-        <location filename="../src/GUI/gui.cpp" line="691"/>
-        <location filename="../src/GUI/gui.cpp" line="692"/>
+        <location filename="../src/GUI/gui.cpp" line="699"/>
+        <location filename="../src/GUI/gui.cpp" line="700"/>
         <source>Keyboard controls</source>
         <translation>Управление с помощью клавиатуры</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="240"/>
+        <location filename="../src/GUI/gui.cpp" line="247"/>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="246"/>
+        <location filename="../src/GUI/gui.cpp" line="253"/>
         <source>Reload</source>
         <translation>Обновить</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="596"/>
+        <location filename="../src/GUI/gui.cpp" line="604"/>
         <source>Show</source>
         <translation>Показать</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="588"/>
+        <location filename="../src/GUI/gui.cpp" line="596"/>
         <source>File</source>
         <translation>Файл</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="265"/>
+        <location filename="../src/GUI/gui.cpp" line="272"/>
         <source>Close POI files</source>
         <translation>Закрыть файлы с точками POI</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="269"/>
+        <location filename="../src/GUI/gui.cpp" line="276"/>
         <source>Overlap POIs</source>
         <translation>Перекрывать точки POI</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="274"/>
+        <location filename="../src/GUI/gui.cpp" line="281"/>
         <source>Show POI labels</source>
         <translation>Показывать подписи к точкам POI</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="279"/>
+        <location filename="../src/GUI/gui.cpp" line="286"/>
         <source>Show POIs</source>
         <translation>Показывать точки POI</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="290"/>
+        <location filename="../src/GUI/gui.cpp" line="297"/>
         <source>Show map</source>
         <translation>Показывать карту</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="303"/>
+        <location filename="../src/GUI/gui.cpp" line="310"/>
         <source>Clear tile cache</source>
         <translation>Очистить кэш</translation>
     </message>
@@ -424,349 +339,354 @@
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="211"/>
-        <location filename="../src/GUI/gui.cpp" line="725"/>
-        <location filename="../src/GUI/gui.cpp" line="726"/>
+        <location filename="../src/GUI/gui.cpp" line="733"/>
+        <location filename="../src/GUI/gui.cpp" line="734"/>
         <source>Paths</source>
         <translation>Пути</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="253"/>
+        <location filename="../src/GUI/gui.cpp" line="241"/>
+        <source>Export to PNG...</source>
+        <translation>Экспорт в PNG...</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/gui.cpp" line="260"/>
         <source>Statistics...</source>
         <translation>Статистика…</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="261"/>
+        <location filename="../src/GUI/gui.cpp" line="268"/>
         <source>Load POI file...</source>
         <translation>Загрузить файл с точками POI…</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="299"/>
+        <location filename="../src/GUI/gui.cpp" line="306"/>
         <source>Load map...</source>
         <translation>Загрузить карту…</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="308"/>
-        <location filename="../src/GUI/gui.cpp" line="313"/>
-        <location filename="../src/GUI/gui.cpp" line="708"/>
+        <location filename="../src/GUI/gui.cpp" line="315"/>
+        <location filename="../src/GUI/gui.cpp" line="320"/>
+        <location filename="../src/GUI/gui.cpp" line="716"/>
         <source>Next map</source>
         <translation>Следующая карта</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="318"/>
+        <location filename="../src/GUI/gui.cpp" line="325"/>
         <source>Show cursor coordinates</source>
         <translation>Показывать координаты курсора</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="325"/>
+        <location filename="../src/GUI/gui.cpp" line="332"/>
         <source>Show tracks</source>
         <translation>Показывать треки</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="330"/>
+        <location filename="../src/GUI/gui.cpp" line="337"/>
         <source>Show routes</source>
         <translation>Показывать маршруты</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="335"/>
+        <location filename="../src/GUI/gui.cpp" line="342"/>
         <source>Show waypoints</source>
         <translation>Показывать точки</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="340"/>
+        <location filename="../src/GUI/gui.cpp" line="347"/>
         <source>Show areas</source>
         <translation>Показывать области</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="345"/>
+        <location filename="../src/GUI/gui.cpp" line="352"/>
         <source>Waypoint labels</source>
         <translation>Подписи точек</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="355"/>
+        <location filename="../src/GUI/gui.cpp" line="362"/>
         <source>km/mi markers</source>
         <translation>км/мл отметки</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="362"/>
+        <location filename="../src/GUI/gui.cpp" line="369"/>
         <source>Show graphs</source>
         <translation>Показывать графики</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="386"/>
+        <location filename="../src/GUI/gui.cpp" line="393"/>
         <source>Show grid</source>
         <translation>Показывать сетку</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="391"/>
+        <location filename="../src/GUI/gui.cpp" line="398"/>
         <source>Show slider info</source>
         <translation>Показывать значение на слайдере</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="396"/>
+        <location filename="../src/GUI/gui.cpp" line="403"/>
         <source>Show path markers</source>
         <translation>Показывать указатель на треке</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="403"/>
+        <location filename="../src/GUI/gui.cpp" line="410"/>
         <source>Show toolbars</source>
-        <translation>Показывать панели инструментов</translation>
+        <translation>Показывать панель инструментов</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="410"/>
+        <location filename="../src/GUI/gui.cpp" line="417"/>
         <source>Total time</source>
         <translation>Общее время</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="416"/>
-        <location filename="../src/GUI/gui.cpp" line="1086"/>
-        <location filename="../src/GUI/gui.cpp" line="1152"/>
+        <location filename="../src/GUI/gui.cpp" line="423"/>
+        <location filename="../src/GUI/gui.cpp" line="1131"/>
+        <location filename="../src/GUI/gui.cpp" line="1198"/>
         <source>Moving time</source>
         <translation>Время движения</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="424"/>
+        <location filename="../src/GUI/gui.cpp" line="431"/>
         <source>Metric</source>
         <translation>Метрические</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="430"/>
+        <location filename="../src/GUI/gui.cpp" line="437"/>
         <source>Imperial</source>
         <translation>Британские</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="436"/>
+        <location filename="../src/GUI/gui.cpp" line="443"/>
         <source>Nautical</source>
         <translation>Морские</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="444"/>
+        <location filename="../src/GUI/gui.cpp" line="451"/>
         <source>Decimal degrees (DD)</source>
         <translation>Десятичные градусы (DD)</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="450"/>
+        <location filename="../src/GUI/gui.cpp" line="457"/>
         <source>Degrees and decimal minutes (DMM)</source>
         <translation>Градусы, десятичные минуты (DMM)</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="457"/>
+        <location filename="../src/GUI/gui.cpp" line="464"/>
         <source>Degrees, minutes, seconds (DMS)</source>
         <translation>Градусы, минуты, секунды (DMS)</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="463"/>
+        <location filename="../src/GUI/gui.cpp" line="470"/>
         <source>Fullscreen mode</source>
         <translation>Полноэкранный режим</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="470"/>
+        <location filename="../src/GUI/gui.cpp" line="477"/>
         <source>Options...</source>
         <translation>Параметры…</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="476"/>
+        <location filename="../src/GUI/gui.cpp" line="483"/>
         <source>Next</source>
         <translation>Следующий</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="480"/>
+        <location filename="../src/GUI/gui.cpp" line="487"/>
         <source>Previous</source>
         <translation>Предыдущий</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="484"/>
+        <location filename="../src/GUI/gui.cpp" line="491"/>
         <source>Last</source>
         <translation>Последний</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="488"/>
+        <location filename="../src/GUI/gui.cpp" line="495"/>
         <source>First</source>
         <translation>Первый</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="532"/>
+        <location filename="../src/GUI/gui.cpp" line="540"/>
         <source>POI files</source>
         <translation>Файлы с точками POI</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="544"/>
+        <location filename="../src/GUI/gui.cpp" line="552"/>
         <source>Display</source>
         <translation>Отображать</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="558"/>
+        <location filename="../src/GUI/gui.cpp" line="566"/>
         <source>Units</source>
         <translation>Единицы</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="562"/>
+        <location filename="../src/GUI/gui.cpp" line="570"/>
         <source>Coordinates format</source>
         <translation>Формат координат</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="670"/>
+        <location filename="../src/GUI/gui.cpp" line="678"/>
         <source>Version %1</source>
         <translation>Версия %1</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="674"/>
+        <location filename="../src/GUI/gui.cpp" line="682"/>
         <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 %1.</source>
-        <translation>GPXSee распространяется в соответствиями с условиями версии 3 Стандартной Общественной Лицензии GNU. Для получения дополнительной информации о GPXSee посетите страницу проекта %1.</translation>
+        <translation>GPXSee распространяется в соответствии с условиями GNU General Public License 3 версии. Для получения дополнительной информации о GPXSee посетите страницу проекта %1.</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="701"/>
+        <location filename="../src/GUI/gui.cpp" line="709"/>
         <source>Append file</source>
         <translation>Добавить файл</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="702"/>
+        <location filename="../src/GUI/gui.cpp" line="710"/>
         <source>Next/Previous</source>
         <translation>Следующий/предыдущий</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="704"/>
+        <location filename="../src/GUI/gui.cpp" line="712"/>
         <source>Toggle graph type</source>
         <translation>Переключить тип графика</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="706"/>
+        <location filename="../src/GUI/gui.cpp" line="714"/>
         <source>Toggle time type</source>
         <translation>Переключить тип времени</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="710"/>
+        <location filename="../src/GUI/gui.cpp" line="718"/>
         <source>Previous map</source>
         <translation>Предыдущая карта</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="711"/>
+        <location filename="../src/GUI/gui.cpp" line="719"/>
         <source>Zoom in</source>
         <translation>Увеличить</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="713"/>
+        <location filename="../src/GUI/gui.cpp" line="721"/>
         <source>Zoom out</source>
         <translation>Уменьшить</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="715"/>
+        <location filename="../src/GUI/gui.cpp" line="723"/>
         <source>Digital zoom</source>
         <translation>Цифровой зум</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="716"/>
+        <location filename="../src/GUI/gui.cpp" line="724"/>
         <source>Zoom</source>
         <translation>Zoom</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="733"/>
+        <location filename="../src/GUI/gui.cpp" line="741"/>
         <source>GCS/PCS directory:</source>
         <translation>Каталог с GCS/PCS:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="735"/>
+        <location filename="../src/GUI/gui.cpp" line="743"/>
         <source>DEM directory:</source>
         <translation>Каталог с DEM данными:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="737"/>
+        <location filename="../src/GUI/gui.cpp" line="745"/>
         <source>Styles directory:</source>
         <translation>Каталог со стилями:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1064"/>
-        <location filename="../src/GUI/gui.cpp" line="1132"/>
+        <location filename="../src/GUI/gui.cpp" line="1109"/>
+        <location filename="../src/GUI/gui.cpp" line="1178"/>
         <source>Areas</source>
         <translation>Области</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1107"/>
-        <location filename="../src/GUI/gui.cpp" line="1108"/>
+        <location filename="../src/GUI/gui.cpp" line="1152"/>
+        <location filename="../src/GUI/gui.cpp" line="1153"/>
         <source>Statistics</source>
         <translation>Статистика</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1340"/>
+        <location filename="../src/GUI/gui.cpp" line="1424"/>
         <source>Open map file</source>
         <translation>Открыть файл карты</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1401"/>
+        <location filename="../src/GUI/gui.cpp" line="1485"/>
         <source>No files loaded</source>
         <translation>Нет загруженных файлов</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1070"/>
-        <location filename="../src/GUI/gui.cpp" line="1074"/>
-        <location filename="../src/GUI/gui.cpp" line="1138"/>
-        <location filename="../src/GUI/gui.cpp" line="1141"/>
+        <location filename="../src/GUI/gui.cpp" line="1115"/>
+        <location filename="../src/GUI/gui.cpp" line="1119"/>
+        <location filename="../src/GUI/gui.cpp" line="1184"/>
+        <location filename="../src/GUI/gui.cpp" line="1187"/>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="496"/>
+        <location filename="../src/GUI/gui.cpp" line="503"/>
         <source>&amp;File</source>
         <translation>&amp;Файл</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="511"/>
+        <location filename="../src/GUI/gui.cpp" line="519"/>
         <source>&amp;Map</source>
         <translation>&amp;Карты</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="521"/>
+        <location filename="../src/GUI/gui.cpp" line="529"/>
         <source>&amp;Graph</source>
         <translation>&amp;График</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="531"/>
+        <location filename="../src/GUI/gui.cpp" line="539"/>
         <source>&amp;POI</source>
         <translation>&amp;Точки POI</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="543"/>
+        <location filename="../src/GUI/gui.cpp" line="551"/>
         <source>&amp;Data</source>
         <translation>&amp;Данные</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="554"/>
+        <location filename="../src/GUI/gui.cpp" line="562"/>
         <source>&amp;Settings</source>
-        <translation>&amp;Параметры</translation>
+        <translation>&amp;Настройки</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="572"/>
+        <location filename="../src/GUI/gui.cpp" line="580"/>
         <source>&amp;Help</source>
         <translation>&amp;Справка</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="729"/>
+        <location filename="../src/GUI/gui.cpp" line="737"/>
         <source>Map directory:</source>
         <translation>Каталог с картами:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="731"/>
+        <location filename="../src/GUI/gui.cpp" line="739"/>
         <source>POI directory:</source>
         <translation>Каталог с POI:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="739"/>
+        <location filename="../src/GUI/gui.cpp" line="747"/>
         <source>Tile cache directory:</source>
         <translation>Каталог кеша тайлов:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1058"/>
-        <location filename="../src/GUI/gui.cpp" line="1128"/>
+        <location filename="../src/GUI/gui.cpp" line="1103"/>
+        <location filename="../src/GUI/gui.cpp" line="1174"/>
         <source>Routes</source>
         <translation>Маршруты</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1360"/>
-        <location filename="../src/GUI/gui.cpp" line="1391"/>
+        <location filename="../src/GUI/gui.cpp" line="1444"/>
+        <location filename="../src/GUI/gui.cpp" line="1475"/>
         <source>Error loading map:</source>
         <translation>Ошибка загрузки карты:</translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/GUI/gui.cpp" line="1405"/>
+        <location filename="../src/GUI/gui.cpp" line="1489"/>
         <source>%n files</source>
         <translation>
             <numerusform>%n файл</numerusform>
@@ -775,7 +695,7 @@
         </translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="695"/>
+        <location filename="../src/GUI/gui.cpp" line="703"/>
         <source>Next file</source>
         <translation>Следующий файл</translation>
     </message>
@@ -790,81 +710,81 @@
         <translation>Экспорт в PDF…</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1061"/>
-        <location filename="../src/GUI/gui.cpp" line="1130"/>
+        <location filename="../src/GUI/gui.cpp" line="1106"/>
+        <location filename="../src/GUI/gui.cpp" line="1176"/>
         <source>Waypoints</source>
         <translation>Точки</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="696"/>
+        <location filename="../src/GUI/gui.cpp" line="704"/>
         <source>Previous file</source>
         <translation>Предыдущий файл</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="350"/>
+        <location filename="../src/GUI/gui.cpp" line="357"/>
         <source>Route waypoints</source>
         <translation>Маршрутные точки</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="698"/>
+        <location filename="../src/GUI/gui.cpp" line="706"/>
         <source>First file</source>
         <translation>Первый файл</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="700"/>
+        <location filename="../src/GUI/gui.cpp" line="708"/>
         <source>Last file</source>
         <translation>Последний файл</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="848"/>
+        <location filename="../src/GUI/gui.cpp" line="856"/>
         <source>Error loading data file:</source>
         <translation>Ошибка загрузки файла данных:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="851"/>
-        <location filename="../src/GUI/gui.cpp" line="886"/>
+        <location filename="../src/GUI/gui.cpp" line="859"/>
+        <location filename="../src/GUI/gui.cpp" line="894"/>
         <source>Line: %1</source>
         <translation>Строка: %1</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="883"/>
+        <location filename="../src/GUI/gui.cpp" line="891"/>
         <source>Error loading POI file:</source>
         <translation>Ошибка загрузки файла с точками POI:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1122"/>
+        <location filename="../src/GUI/gui.cpp" line="1168"/>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1055"/>
-        <location filename="../src/GUI/gui.cpp" line="1126"/>
+        <location filename="../src/GUI/gui.cpp" line="1100"/>
+        <location filename="../src/GUI/gui.cpp" line="1172"/>
         <source>Tracks</source>
         <translation>Треки</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="217"/>
-        <location filename="../src/GUI/gui.cpp" line="669"/>
+        <location filename="../src/GUI/gui.cpp" line="677"/>
         <source>About GPXSee</source>
         <translation>О GPXSee</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="603"/>
+        <location filename="../src/GUI/gui.cpp" line="611"/>
         <source>Navigation</source>
         <translation>Навигация</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="372"/>
-        <location filename="../src/GUI/gui.cpp" line="1081"/>
-        <location filename="../src/GUI/gui.cpp" line="1148"/>
+        <location filename="../src/GUI/gui.cpp" line="379"/>
+        <location filename="../src/GUI/gui.cpp" line="1126"/>
+        <location filename="../src/GUI/gui.cpp" line="1194"/>
         <source>Distance</source>
         <translation>Расстояние</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="379"/>
-        <location filename="../src/GUI/gui.cpp" line="555"/>
-        <location filename="../src/GUI/gui.cpp" line="1084"/>
-        <location filename="../src/GUI/gui.cpp" line="1150"/>
+        <location filename="../src/GUI/gui.cpp" line="386"/>
+        <location filename="../src/GUI/gui.cpp" line="563"/>
+        <location filename="../src/GUI/gui.cpp" line="1129"/>
+        <location filename="../src/GUI/gui.cpp" line="1196"/>
         <source>Time</source>
         <translation>Время</translation>
     </message>
@@ -1353,7 +1273,7 @@
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="442"/>
         <source>Use segments</source>
-        <translation type="unfinished"></translation>
+        <translation>Использовать сегменты</translation>
     </message>
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="481"/>
@@ -1580,6 +1500,159 @@
         <translation>Параметры</translation>
     </message>
 </context>
+<context>
+    <name>PDFExportDialog</name>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="24"/>
+        <source>PDF files</source>
+        <translation>PDF файлы</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="24"/>
+        <source>All files</source>
+        <translation>Все файлы</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="51"/>
+        <source>Portrait</source>
+        <translation>Портретная</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="52"/>
+        <source>Landscape</source>
+        <translation>Ландшафтная</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="62"/>
+        <source>in</source>
+        <translation>in</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="62"/>
+        <source>cm</source>
+        <translation>см</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="68"/>
+        <source>Page Setup</source>
+        <translation>Параметры страницы</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="71"/>
+        <source>Page size:</source>
+        <translation>Размер страницы:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="72"/>
+        <source>Resolution:</source>
+        <translation>Разрешение:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="73"/>
+        <source>Orientation:</source>
+        <translation>Ориентация:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="74"/>
+        <source>Margins:</source>
+        <translation>Поля:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="80"/>
+        <source>File:</source>
+        <translation>Файл:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="87"/>
+        <source>Output file</source>
+        <translation>Файл вывода</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="94"/>
+        <source>Export</source>
+        <translation>Экспорт</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="109"/>
+        <source>Export to PDF</source>
+        <translation>Экспорт в PDF</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="117"/>
+        <source>Error</source>
+        <translation>Ошибка</translation>
+    </message>
+</context>
+<context>
+    <name>PNGExportDialog</name>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="22"/>
+        <source>PNG files</source>
+        <translation>PNG файлы</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="22"/>
+        <source>All files</source>
+        <translation>Все файлы</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="30"/>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="35"/>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="39"/>
+        <source>px</source>
+        <translation>пикс</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="41"/>
+        <source>Use anti-aliasing</source>
+        <translation>Использовать сглаживание</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="45"/>
+        <source>Image Setup</source>
+        <translation>Параметры изображения</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="48"/>
+        <source>Image width:</source>
+        <translation>Ширина изображения:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="49"/>
+        <source>Image height:</source>
+        <translation>Высота изображения:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="50"/>
+        <source>Margins:</source>
+        <translation>Поля:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="57"/>
+        <source>File:</source>
+        <translation>Файл:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="64"/>
+        <source>Output file</source>
+        <translation>Файл вывода</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="71"/>
+        <source>Export</source>
+        <translation>Экспорт</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="86"/>
+        <source>Export to PNG</source>
+        <translation>Экспорт в PNG</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="94"/>
+        <source>Error</source>
+        <translation>Ошибка</translation>
+    </message>
+</context>
 <context>
     <name>PolygonItem</name>
     <message>

lang/gpxsee_sv.ts

@@ -204,106 +204,6 @@
         <translation>Minimum</translation>
     </message>
 </context>
-<context>
-    <name>ExportDialog</name>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="135"/>
-        <source>Export to PDF</source>
-        <translation>Exportera till PDF</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="52"/>
-        <source>Portrait</source>
-        <translation>Stående</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="53"/>
-        <source>Landscape</source>
-        <translation>Liggande</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="97"/>
-        <source>Page size:</source>
-        <translation>Sidstorlek:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="99"/>
-        <source>Orientation:</source>
-        <translation>Orientering:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="94"/>
-        <source>Page Setup</source>
-        <translation>Sidinställning</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="25"/>
-        <source>PDF files</source>
-        <translation>PDF-filer</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="25"/>
-        <source>All files</source>
-        <translation>Alla filer</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="66"/>
-        <source>in</source>
-        <translation>i</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="66"/>
-        <source>mm</source>
-        <translation>mm</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="98"/>
-        <source>Resolution:</source>
-        <translation>Upplösning:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="100"/>
-        <source>Margins:</source>
-        <translation>Marginaler:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="106"/>
-        <source>File:</source>
-        <translation>Fil:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="113"/>
-        <source>Output file</source>
-        <translation>Utdatafil</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="120"/>
-        <source>Export</source>
-        <translation>Exportera</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="142"/>
-        <location filename="../src/GUI/exportdialog.cpp" line="152"/>
-        <location filename="../src/GUI/exportdialog.cpp" line="157"/>
-        <source>Error</source>
-        <translation>Fel</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="142"/>
-        <source>No output file selected.</source>
-        <translation>Ingen utdatafil vald.</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="152"/>
-        <source>%1 is a directory.</source>
-        <translation>%1 är en mapp.</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="157"/>
-        <source>%1 is not writable.</source>
-        <translation>%1 är skrivskyddad.</translation>
-    </message>
-</context>
 <context>
     <name>FileSelectWidget</name>
     <message>
@@ -311,6 +211,21 @@
         <source>Select file</source>
         <translation>Välj fil</translation>
     </message>
+    <message>
+        <location filename="../src/GUI/fileselectwidget.cpp" line="48"/>
+        <source>No output file selected.</source>
+        <translation>Ingen utdatafil vald.</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/fileselectwidget.cpp" line="58"/>
+        <source>%1 is a directory.</source>
+        <translation>%1 är en mapp.</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/fileselectwidget.cpp" line="62"/>
+        <source>%1 is not writable.</source>
+        <translation>%1 är skrivskyddad.</translation>
+    </message>
 </context>
 <context>
     <name>Format</name>
@@ -346,22 +261,22 @@
 <context>
     <name>GUI</name>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="729"/>
+        <location filename="../src/GUI/gui.cpp" line="737"/>
         <source>Map directory:</source>
         <translation>Kartmapp:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="731"/>
+        <location filename="../src/GUI/gui.cpp" line="739"/>
         <source>POI directory:</source>
         <translation>POI-mapp:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="748"/>
+        <location filename="../src/GUI/gui.cpp" line="756"/>
         <source>Open file</source>
         <translation>Öppna fil</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="859"/>
+        <location filename="../src/GUI/gui.cpp" line="867"/>
         <source>Open POI file</source>
         <translation>Öppna POI-fil</translation>
     </message>
@@ -372,58 +287,58 @@
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="214"/>
-        <location filename="../src/GUI/gui.cpp" line="691"/>
-        <location filename="../src/GUI/gui.cpp" line="692"/>
+        <location filename="../src/GUI/gui.cpp" line="699"/>
+        <location filename="../src/GUI/gui.cpp" line="700"/>
         <source>Keyboard controls</source>
         <translation>Snabbtangenter</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="240"/>
+        <location filename="../src/GUI/gui.cpp" line="247"/>
         <source>Close</source>
         <translation>Stäng</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="246"/>
+        <location filename="../src/GUI/gui.cpp" line="253"/>
         <source>Reload</source>
         <translation>Uppdatera</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="596"/>
+        <location filename="../src/GUI/gui.cpp" line="604"/>
         <source>Show</source>
         <translation>Visa</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="588"/>
+        <location filename="../src/GUI/gui.cpp" line="596"/>
         <source>File</source>
         <translation>Arkiv</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="265"/>
+        <location filename="../src/GUI/gui.cpp" line="272"/>
         <source>Close POI files</source>
         <translation>Stäng POI-filer</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="269"/>
+        <location filename="../src/GUI/gui.cpp" line="276"/>
         <source>Overlap POIs</source>
         <translation>Överlappa POI:er</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="274"/>
+        <location filename="../src/GUI/gui.cpp" line="281"/>
         <source>Show POI labels</source>
         <translation>Visa POI-namn</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="279"/>
+        <location filename="../src/GUI/gui.cpp" line="286"/>
         <source>Show POIs</source>
         <translation>Visa POI:er</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="290"/>
+        <location filename="../src/GUI/gui.cpp" line="297"/>
         <source>Show map</source>
         <translation>Visa karta</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="303"/>
+        <location filename="../src/GUI/gui.cpp" line="310"/>
         <source>Clear tile cache</source>
         <translation>Rensa kart-cache</translation>
     </message>
@@ -434,285 +349,290 @@
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="211"/>
-        <location filename="../src/GUI/gui.cpp" line="725"/>
-        <location filename="../src/GUI/gui.cpp" line="726"/>
+        <location filename="../src/GUI/gui.cpp" line="733"/>
+        <location filename="../src/GUI/gui.cpp" line="734"/>
         <source>Paths</source>
         <translation>Sökvägar</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="253"/>
+        <location filename="../src/GUI/gui.cpp" line="241"/>
+        <source>Export to PNG...</source>
+        <translation>Exportera till PNG...</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/gui.cpp" line="260"/>
         <source>Statistics...</source>
         <translation>Statistik...</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="261"/>
+        <location filename="../src/GUI/gui.cpp" line="268"/>
         <source>Load POI file...</source>
         <translation>Läs in POI-fil...</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="299"/>
+        <location filename="../src/GUI/gui.cpp" line="306"/>
         <source>Load map...</source>
         <translation>Läs in karta...</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="308"/>
-        <location filename="../src/GUI/gui.cpp" line="313"/>
-        <location filename="../src/GUI/gui.cpp" line="708"/>
+        <location filename="../src/GUI/gui.cpp" line="315"/>
+        <location filename="../src/GUI/gui.cpp" line="320"/>
+        <location filename="../src/GUI/gui.cpp" line="716"/>
         <source>Next map</source>
         <translation>Nästa karta</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="318"/>
+        <location filename="../src/GUI/gui.cpp" line="325"/>
         <source>Show cursor coordinates</source>
         <translation>Visa markörkoordinater</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="325"/>
+        <location filename="../src/GUI/gui.cpp" line="332"/>
         <source>Show tracks</source>
         <translation>Visa spår</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="330"/>
+        <location filename="../src/GUI/gui.cpp" line="337"/>
         <source>Show routes</source>
         <translation>Visa rutter</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="335"/>
+        <location filename="../src/GUI/gui.cpp" line="342"/>
         <source>Show waypoints</source>
         <translation>Visa vägpunkter</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="340"/>
+        <location filename="../src/GUI/gui.cpp" line="347"/>
         <source>Show areas</source>
         <translation>Visa områden</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="345"/>
+        <location filename="../src/GUI/gui.cpp" line="352"/>
         <source>Waypoint labels</source>
         <translation>Vägpunktsnamn</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="355"/>
+        <location filename="../src/GUI/gui.cpp" line="362"/>
         <source>km/mi markers</source>
         <translation>km/mi-markörer</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="362"/>
+        <location filename="../src/GUI/gui.cpp" line="369"/>
         <source>Show graphs</source>
         <translation>Visa diagram</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="386"/>
+        <location filename="../src/GUI/gui.cpp" line="393"/>
         <source>Show grid</source>
         <translation>Visa stödlinjer</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="391"/>
+        <location filename="../src/GUI/gui.cpp" line="398"/>
         <source>Show slider info</source>
         <translation>Visa reglageinfo</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="396"/>
+        <location filename="../src/GUI/gui.cpp" line="403"/>
         <source>Show path markers</source>
         <translation>Visa vägmarkörer</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="403"/>
+        <location filename="../src/GUI/gui.cpp" line="410"/>
         <source>Show toolbars</source>
         <translation>Visa verktygsfält</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="410"/>
+        <location filename="../src/GUI/gui.cpp" line="417"/>
         <source>Total time</source>
         <translation>Total tid</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="416"/>
-        <location filename="../src/GUI/gui.cpp" line="1086"/>
-        <location filename="../src/GUI/gui.cpp" line="1152"/>
+        <location filename="../src/GUI/gui.cpp" line="423"/>
+        <location filename="../src/GUI/gui.cpp" line="1131"/>
+        <location filename="../src/GUI/gui.cpp" line="1198"/>
         <source>Moving time</source>
         <translation>Förflyttningstid</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="424"/>
+        <location filename="../src/GUI/gui.cpp" line="431"/>
         <source>Metric</source>
         <translation>Meter</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="430"/>
+        <location filename="../src/GUI/gui.cpp" line="437"/>
         <source>Imperial</source>
         <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="436"/>
+        <location filename="../src/GUI/gui.cpp" line="443"/>
         <source>Nautical</source>
         <translation>Nautiska</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="444"/>
+        <location filename="../src/GUI/gui.cpp" line="451"/>
         <source>Decimal degrees (DD)</source>
         <translation>Decimala grader (DD)</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="450"/>
+        <location filename="../src/GUI/gui.cpp" line="457"/>
         <source>Degrees and decimal minutes (DMM)</source>
         <translation>Grader och decimala minuter (DMM)</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="457"/>
+        <location filename="../src/GUI/gui.cpp" line="464"/>
         <source>Degrees, minutes, seconds (DMS)</source>
         <translation>Grader, minuter, sekunder (DMS)</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="463"/>
+        <location filename="../src/GUI/gui.cpp" line="470"/>
         <source>Fullscreen mode</source>
         <translation>Helskärmsläge</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="470"/>
+        <location filename="../src/GUI/gui.cpp" line="477"/>
         <source>Options...</source>
         <translation>Alternativ...</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="476"/>
+        <location filename="../src/GUI/gui.cpp" line="483"/>
         <source>Next</source>
         <translation>Nästa</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="480"/>
+        <location filename="../src/GUI/gui.cpp" line="487"/>
         <source>Previous</source>
         <translation>Föregående</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="484"/>
+        <location filename="../src/GUI/gui.cpp" line="491"/>
         <source>Last</source>
         <translation>Sista</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="488"/>
+        <location filename="../src/GUI/gui.cpp" line="495"/>
         <source>First</source>
         <translation>Första</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="532"/>
+        <location filename="../src/GUI/gui.cpp" line="540"/>
         <source>POI files</source>
         <translation>POI-filer</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="544"/>
+        <location filename="../src/GUI/gui.cpp" line="552"/>
         <source>Display</source>
         <translation>Visa</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="558"/>
+        <location filename="../src/GUI/gui.cpp" line="566"/>
         <source>Units</source>
         <translation>Enhet</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="562"/>
+        <location filename="../src/GUI/gui.cpp" line="570"/>
         <source>Coordinates format</source>
         <translation>Koordinatformat</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="670"/>
+        <location filename="../src/GUI/gui.cpp" line="678"/>
         <source>Version %1</source>
         <translation>Version %1</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="674"/>
+        <location filename="../src/GUI/gui.cpp" line="682"/>
         <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 %1.</source>
         <translation>GPXSee distribueras under vilkoren för GNU General Public License version 3. För mer info om GPXSee, besök hemsidan på %1.</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="701"/>
+        <location filename="../src/GUI/gui.cpp" line="709"/>
         <source>Append file</source>
         <translation>Lägg till fil</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="702"/>
+        <location filename="../src/GUI/gui.cpp" line="710"/>
         <source>Next/Previous</source>
         <translation>Nästa/Föregående</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="704"/>
+        <location filename="../src/GUI/gui.cpp" line="712"/>
         <source>Toggle graph type</source>
         <translation>Växla diagramtyp</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="706"/>
+        <location filename="../src/GUI/gui.cpp" line="714"/>
         <source>Toggle time type</source>
         <translation>Växla tidstyp</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="710"/>
+        <location filename="../src/GUI/gui.cpp" line="718"/>
         <source>Previous map</source>
         <translation>Föregående karta</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="711"/>
+        <location filename="../src/GUI/gui.cpp" line="719"/>
         <source>Zoom in</source>
         <translation>Zooma in</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="713"/>
+        <location filename="../src/GUI/gui.cpp" line="721"/>
         <source>Zoom out</source>
         <translation>Zooma ut</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="715"/>
+        <location filename="../src/GUI/gui.cpp" line="723"/>
         <source>Digital zoom</source>
         <translation>Digital zoom</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="716"/>
+        <location filename="../src/GUI/gui.cpp" line="724"/>
         <source>Zoom</source>
         <translation>Zoom</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="733"/>
+        <location filename="../src/GUI/gui.cpp" line="741"/>
         <source>GCS/PCS directory:</source>
         <translation>GCS-/PCS-mapp:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="735"/>
+        <location filename="../src/GUI/gui.cpp" line="743"/>
         <source>DEM directory:</source>
         <translation>DEM-mapp:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="737"/>
+        <location filename="../src/GUI/gui.cpp" line="745"/>
         <source>Styles directory:</source>
         <translation>Mapp för stilar:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1064"/>
-        <location filename="../src/GUI/gui.cpp" line="1132"/>
+        <location filename="../src/GUI/gui.cpp" line="1109"/>
+        <location filename="../src/GUI/gui.cpp" line="1178"/>
         <source>Areas</source>
         <translation>Områden</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1107"/>
-        <location filename="../src/GUI/gui.cpp" line="1108"/>
+        <location filename="../src/GUI/gui.cpp" line="1152"/>
+        <location filename="../src/GUI/gui.cpp" line="1153"/>
         <source>Statistics</source>
         <translation>Statistik</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1340"/>
+        <location filename="../src/GUI/gui.cpp" line="1424"/>
         <source>Open map file</source>
         <translation>Öppna kartfil</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1360"/>
-        <location filename="../src/GUI/gui.cpp" line="1391"/>
+        <location filename="../src/GUI/gui.cpp" line="1444"/>
+        <location filename="../src/GUI/gui.cpp" line="1475"/>
         <source>Error loading map:</source>
         <translation>Fel vid inläsning av karta:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1401"/>
+        <location filename="../src/GUI/gui.cpp" line="1485"/>
         <source>No files loaded</source>
         <translation>Inga filer inlästa</translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/GUI/gui.cpp" line="1405"/>
+        <location filename="../src/GUI/gui.cpp" line="1489"/>
         <source>%n files</source>
         <translation>
             <numerusform>%n fil</numerusform>
@@ -720,21 +640,21 @@
         </translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1070"/>
-        <location filename="../src/GUI/gui.cpp" line="1074"/>
-        <location filename="../src/GUI/gui.cpp" line="1138"/>
-        <location filename="../src/GUI/gui.cpp" line="1141"/>
+        <location filename="../src/GUI/gui.cpp" line="1115"/>
+        <location filename="../src/GUI/gui.cpp" line="1119"/>
+        <location filename="../src/GUI/gui.cpp" line="1184"/>
+        <location filename="../src/GUI/gui.cpp" line="1187"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1058"/>
-        <location filename="../src/GUI/gui.cpp" line="1128"/>
+        <location filename="../src/GUI/gui.cpp" line="1103"/>
+        <location filename="../src/GUI/gui.cpp" line="1174"/>
         <source>Routes</source>
         <translation>Rutter</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="695"/>
+        <location filename="../src/GUI/gui.cpp" line="703"/>
         <source>Next file</source>
         <translation>Nästa fil</translation>
     </message>
@@ -749,121 +669,121 @@
         <translation>Exportera till PDF...</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1061"/>
-        <location filename="../src/GUI/gui.cpp" line="1130"/>
+        <location filename="../src/GUI/gui.cpp" line="1106"/>
+        <location filename="../src/GUI/gui.cpp" line="1176"/>
         <source>Waypoints</source>
         <translation>Vägpunkter</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="696"/>
+        <location filename="../src/GUI/gui.cpp" line="704"/>
         <source>Previous file</source>
         <translation>Föregående fil</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="350"/>
+        <location filename="../src/GUI/gui.cpp" line="357"/>
         <source>Route waypoints</source>
         <translation>Ruttvägpunkter</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="496"/>
+        <location filename="../src/GUI/gui.cpp" line="503"/>
         <source>&amp;File</source>
         <translation>&amp;Arkiv</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="511"/>
+        <location filename="../src/GUI/gui.cpp" line="519"/>
         <source>&amp;Map</source>
         <translation>&amp;Karta</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="521"/>
+        <location filename="../src/GUI/gui.cpp" line="529"/>
         <source>&amp;Graph</source>
         <translation>&amp;Diagram</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="531"/>
+        <location filename="../src/GUI/gui.cpp" line="539"/>
         <source>&amp;POI</source>
         <translation>&amp;POI</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="543"/>
+        <location filename="../src/GUI/gui.cpp" line="551"/>
         <source>&amp;Data</source>
         <translation>Da&amp;ta</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="554"/>
+        <location filename="../src/GUI/gui.cpp" line="562"/>
         <source>&amp;Settings</source>
         <translation>&amp;Inställningar</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="572"/>
+        <location filename="../src/GUI/gui.cpp" line="580"/>
         <source>&amp;Help</source>
         <translation>&amp;Hjälp</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="698"/>
+        <location filename="../src/GUI/gui.cpp" line="706"/>
         <source>First file</source>
         <translation>Första filen</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="700"/>
+        <location filename="../src/GUI/gui.cpp" line="708"/>
         <source>Last file</source>
         <translation>Sista filen</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="739"/>
+        <location filename="../src/GUI/gui.cpp" line="747"/>
         <source>Tile cache directory:</source>
         <translation>Mapp för kart-cache:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="848"/>
+        <location filename="../src/GUI/gui.cpp" line="856"/>
         <source>Error loading data file:</source>
         <translation>Fel vid inläsning av datafil:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="851"/>
-        <location filename="../src/GUI/gui.cpp" line="886"/>
+        <location filename="../src/GUI/gui.cpp" line="859"/>
+        <location filename="../src/GUI/gui.cpp" line="894"/>
         <source>Line: %1</source>
         <translation>Rad: %1</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="883"/>
+        <location filename="../src/GUI/gui.cpp" line="891"/>
         <source>Error loading POI file:</source>
         <translation>Fel vid inläsning av POI-fil:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1122"/>
+        <location filename="../src/GUI/gui.cpp" line="1168"/>
         <source>Name</source>
         <translation>Namn</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1055"/>
-        <location filename="../src/GUI/gui.cpp" line="1126"/>
+        <location filename="../src/GUI/gui.cpp" line="1100"/>
+        <location filename="../src/GUI/gui.cpp" line="1172"/>
         <source>Tracks</source>
         <translation>Spår</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="217"/>
-        <location filename="../src/GUI/gui.cpp" line="669"/>
+        <location filename="../src/GUI/gui.cpp" line="677"/>
         <source>About GPXSee</source>
         <translation>Om GPXSee</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="603"/>
+        <location filename="../src/GUI/gui.cpp" line="611"/>
         <source>Navigation</source>
         <translation>Navigation</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="372"/>
-        <location filename="../src/GUI/gui.cpp" line="1081"/>
-        <location filename="../src/GUI/gui.cpp" line="1148"/>
+        <location filename="../src/GUI/gui.cpp" line="379"/>
+        <location filename="../src/GUI/gui.cpp" line="1126"/>
+        <location filename="../src/GUI/gui.cpp" line="1194"/>
         <source>Distance</source>
         <translation>Avstånd</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="379"/>
-        <location filename="../src/GUI/gui.cpp" line="555"/>
-        <location filename="../src/GUI/gui.cpp" line="1084"/>
-        <location filename="../src/GUI/gui.cpp" line="1150"/>
+        <location filename="../src/GUI/gui.cpp" line="386"/>
+        <location filename="../src/GUI/gui.cpp" line="563"/>
+        <location filename="../src/GUI/gui.cpp" line="1129"/>
+        <location filename="../src/GUI/gui.cpp" line="1196"/>
         <source>Time</source>
         <translation>Tid</translation>
     </message>
@@ -1352,7 +1272,7 @@
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="442"/>
         <source>Use segments</source>
-        <translation type="unfinished"></translation>
+        <translation>Använd segment</translation>
     </message>
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="481"/>
@@ -1579,6 +1499,159 @@
         <translation>Alternativ</translation>
     </message>
 </context>
+<context>
+    <name>PDFExportDialog</name>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="24"/>
+        <source>PDF files</source>
+        <translation>PDF-filer</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="24"/>
+        <source>All files</source>
+        <translation>Alla filer</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="51"/>
+        <source>Portrait</source>
+        <translation>Stående</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="52"/>
+        <source>Landscape</source>
+        <translation>Liggande</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="62"/>
+        <source>in</source>
+        <translation>i</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="62"/>
+        <source>cm</source>
+        <translation>cm</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="68"/>
+        <source>Page Setup</source>
+        <translation>Sidinställning</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="71"/>
+        <source>Page size:</source>
+        <translation>Sidstorlek:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="72"/>
+        <source>Resolution:</source>
+        <translation>Upplösning:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="73"/>
+        <source>Orientation:</source>
+        <translation>Orientering:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="74"/>
+        <source>Margins:</source>
+        <translation>Marginaler:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="80"/>
+        <source>File:</source>
+        <translation>Fil:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="87"/>
+        <source>Output file</source>
+        <translation>Utdatafil</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="94"/>
+        <source>Export</source>
+        <translation>Exportera</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="109"/>
+        <source>Export to PDF</source>
+        <translation>Exportera till PDF</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="117"/>
+        <source>Error</source>
+        <translation>Fel</translation>
+    </message>
+</context>
+<context>
+    <name>PNGExportDialog</name>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="22"/>
+        <source>PNG files</source>
+        <translation>PNG-filer</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="22"/>
+        <source>All files</source>
+        <translation>Alla filer</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="30"/>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="35"/>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="39"/>
+        <source>px</source>
+        <translation>px</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="41"/>
+        <source>Use anti-aliasing</source>
+        <translation>Använd kantutjämning</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="45"/>
+        <source>Image Setup</source>
+        <translation>Bildinställning</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="48"/>
+        <source>Image width:</source>
+        <translation>Bildbredd:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="49"/>
+        <source>Image height:</source>
+        <translation>Bildhöjd:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="50"/>
+        <source>Margins:</source>
+        <translation>Marginaler:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="57"/>
+        <source>File:</source>
+        <translation>Fil:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="64"/>
+        <source>Output file</source>
+        <translation>Utdatafil</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="71"/>
+        <source>Export</source>
+        <translation>Exportera</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="86"/>
+        <source>Export to PNG</source>
+        <translation>Exportera till PNG</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="94"/>
+        <source>Error</source>
+        <translation>Fel</translation>
+    </message>
+</context>
 <context>
     <name>PolygonItem</name>
     <message>

lang/gpxsee_tr.ts

@@ -89,7 +89,7 @@
     <message>
         <location filename="../src/data/data.cpp" line="145"/>
         <source>JPEG images</source>
-        <translation>JPEG resimler</translation>
+        <translation>JPEG görüntüler</translation>
     </message>
     <message>
         <location filename="../src/data/data.cpp" line="146"/>
@@ -204,106 +204,6 @@
         <translation>Asgari</translation>
     </message>
 </context>
-<context>
-    <name>ExportDialog</name>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="25"/>
-        <source>PDF files</source>
-        <translation>PDF dosyalar</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="25"/>
-        <source>All files</source>
-        <translation>Tüm dosyalar</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="52"/>
-        <source>Portrait</source>
-        <translation>Dikey</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="53"/>
-        <source>Landscape</source>
-        <translation>Yatay</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="66"/>
-        <source>mm</source>
-        <translation>mm</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="66"/>
-        <source>in</source>
-        <translation>inç</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="94"/>
-        <source>Page Setup</source>
-        <translation>Sayfa Düzeni</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="97"/>
-        <source>Page size:</source>
-        <translation>Sayfa boyutu:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="98"/>
-        <source>Resolution:</source>
-        <translation>Çözünürlük:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="99"/>
-        <source>Orientation:</source>
-        <translation>Yönlendirme:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="100"/>
-        <source>Margins:</source>
-        <translation>Kenar boşlukları:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="106"/>
-        <source>File:</source>
-        <translation>Dosya:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="113"/>
-        <source>Output file</source>
-        <translation>Çıktı dosyası</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="120"/>
-        <source>Export</source>
-        <translation>Dışa aktar</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="135"/>
-        <source>Export to PDF</source>
-        <translation>PDF olarak dışa aktar</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="142"/>
-        <location filename="../src/GUI/exportdialog.cpp" line="152"/>
-        <location filename="../src/GUI/exportdialog.cpp" line="157"/>
-        <source>Error</source>
-        <translation>Hata</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="142"/>
-        <source>No output file selected.</source>
-        <translation>Çıkış dosyası seçilmedi.</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="152"/>
-        <source>%1 is a directory.</source>
-        <translation>%1 bir klasör.</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="157"/>
-        <source>%1 is not writable.</source>
-        <translation>%1 yazılabilir değil.</translation>
-    </message>
-</context>
 <context>
     <name>FileSelectWidget</name>
     <message>
@@ -311,6 +211,21 @@
         <source>Select file</source>
         <translation>Dosya seç</translation>
     </message>
+    <message>
+        <location filename="../src/GUI/fileselectwidget.cpp" line="48"/>
+        <source>No output file selected.</source>
+        <translation>Çıktı dosyası seçilmedi.</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/fileselectwidget.cpp" line="58"/>
+        <source>%1 is a directory.</source>
+        <translation>%1 bir dizin.</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/fileselectwidget.cpp" line="62"/>
+        <source>%1 is not writable.</source>
+        <translation>%1 yazılabilir değil.</translation>
+    </message>
 </context>
 <context>
     <name>Format</name>
@@ -352,21 +267,21 @@
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="211"/>
-        <location filename="../src/GUI/gui.cpp" line="725"/>
-        <location filename="../src/GUI/gui.cpp" line="726"/>
+        <location filename="../src/GUI/gui.cpp" line="733"/>
+        <location filename="../src/GUI/gui.cpp" line="734"/>
         <source>Paths</source>
         <translation>Klasör konumları</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="214"/>
-        <location filename="../src/GUI/gui.cpp" line="691"/>
-        <location filename="../src/GUI/gui.cpp" line="692"/>
+        <location filename="../src/GUI/gui.cpp" line="699"/>
+        <location filename="../src/GUI/gui.cpp" line="700"/>
         <source>Keyboard controls</source>
         <translation>Klavye kontrolleri</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="217"/>
-        <location filename="../src/GUI/gui.cpp" line="669"/>
+        <location filename="../src/GUI/gui.cpp" line="677"/>
         <source>About GPXSee</source>
         <translation>Hakkında GPXSee</translation>
     </message>
@@ -386,481 +301,486 @@
         <translation>PDF olarak dışa aktar...</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="240"/>
+        <location filename="../src/GUI/gui.cpp" line="241"/>
+        <source>Export to PNG...</source>
+        <translation>PNG olarak dışa aktar...</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/gui.cpp" line="247"/>
         <source>Close</source>
         <translation>Kapat</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="246"/>
+        <location filename="../src/GUI/gui.cpp" line="253"/>
         <source>Reload</source>
         <translation>Yeniden yükle</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="253"/>
+        <location filename="../src/GUI/gui.cpp" line="260"/>
         <source>Statistics...</source>
         <translation>İstatistikler...</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="261"/>
+        <location filename="../src/GUI/gui.cpp" line="268"/>
         <source>Load POI file...</source>
         <translation>POI dosyası yükle...</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="265"/>
+        <location filename="../src/GUI/gui.cpp" line="272"/>
         <source>Close POI files</source>
         <translation>POI dosyaları kapat</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="269"/>
+        <location filename="../src/GUI/gui.cpp" line="276"/>
         <source>Overlap POIs</source>
         <translation>POI&apos;leri üst üste getir</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="274"/>
+        <location filename="../src/GUI/gui.cpp" line="281"/>
         <source>Show POI labels</source>
         <translation>POI etiketlerini göster</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="279"/>
+        <location filename="../src/GUI/gui.cpp" line="286"/>
         <source>Show POIs</source>
         <translation>POI&apos;leri göster</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="290"/>
+        <location filename="../src/GUI/gui.cpp" line="297"/>
         <source>Show map</source>
         <translation>Haritayı göster</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="299"/>
+        <location filename="../src/GUI/gui.cpp" line="306"/>
         <source>Load map...</source>
         <translation>Harita yükle...</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="303"/>
+        <location filename="../src/GUI/gui.cpp" line="310"/>
         <source>Clear tile cache</source>
         <translation>Döşeme önbelleğini temizle</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="308"/>
-        <location filename="../src/GUI/gui.cpp" line="313"/>
-        <location filename="../src/GUI/gui.cpp" line="708"/>
+        <location filename="../src/GUI/gui.cpp" line="315"/>
+        <location filename="../src/GUI/gui.cpp" line="320"/>
+        <location filename="../src/GUI/gui.cpp" line="716"/>
         <source>Next map</source>
         <translation>Sonraki harita</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="318"/>
+        <location filename="../src/GUI/gui.cpp" line="325"/>
         <source>Show cursor coordinates</source>
         <translation>İmleç koordinatlarını göster</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="325"/>
+        <location filename="../src/GUI/gui.cpp" line="332"/>
         <source>Show tracks</source>
         <translation>İzleri göster</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="330"/>
+        <location filename="../src/GUI/gui.cpp" line="337"/>
         <source>Show routes</source>
         <translation>Rotaları göster</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="335"/>
+        <location filename="../src/GUI/gui.cpp" line="342"/>
         <source>Show waypoints</source>
         <translation>Yer işaretlerini göster</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="340"/>
+        <location filename="../src/GUI/gui.cpp" line="347"/>
         <source>Show areas</source>
         <translation>Alanları göster</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="345"/>
+        <location filename="../src/GUI/gui.cpp" line="352"/>
         <source>Waypoint labels</source>
         <translation>Yer işareti etiketleri</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="350"/>
+        <location filename="../src/GUI/gui.cpp" line="357"/>
         <source>Route waypoints</source>
         <translation>Rota yer işaretleri</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="355"/>
+        <location filename="../src/GUI/gui.cpp" line="362"/>
         <source>km/mi markers</source>
         <translation>km/mil işaretleri</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="362"/>
+        <location filename="../src/GUI/gui.cpp" line="369"/>
         <source>Show graphs</source>
         <translation>Grafikleri göster</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="372"/>
-        <location filename="../src/GUI/gui.cpp" line="1081"/>
-        <location filename="../src/GUI/gui.cpp" line="1148"/>
+        <location filename="../src/GUI/gui.cpp" line="379"/>
+        <location filename="../src/GUI/gui.cpp" line="1126"/>
+        <location filename="../src/GUI/gui.cpp" line="1194"/>
         <source>Distance</source>
         <translation>Mesafe</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="379"/>
-        <location filename="../src/GUI/gui.cpp" line="555"/>
-        <location filename="../src/GUI/gui.cpp" line="1084"/>
-        <location filename="../src/GUI/gui.cpp" line="1150"/>
+        <location filename="../src/GUI/gui.cpp" line="386"/>
+        <location filename="../src/GUI/gui.cpp" line="563"/>
+        <location filename="../src/GUI/gui.cpp" line="1129"/>
+        <location filename="../src/GUI/gui.cpp" line="1196"/>
         <source>Time</source>
         <translation>Zaman</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="386"/>
+        <location filename="../src/GUI/gui.cpp" line="393"/>
         <source>Show grid</source>
         <translation>Izgarayı göster</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="391"/>
+        <location filename="../src/GUI/gui.cpp" line="398"/>
         <source>Show slider info</source>
         <translation>Kaydırıcı bilgisi göster</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="396"/>
+        <location filename="../src/GUI/gui.cpp" line="403"/>
         <source>Show path markers</source>
         <translation>Yol işaretleyicilerini göster</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="403"/>
+        <location filename="../src/GUI/gui.cpp" line="410"/>
         <source>Show toolbars</source>
         <translation>Araç çubuklarını göster</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="410"/>
+        <location filename="../src/GUI/gui.cpp" line="417"/>
         <source>Total time</source>
         <translation>Toplam süre</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="416"/>
-        <location filename="../src/GUI/gui.cpp" line="1086"/>
-        <location filename="../src/GUI/gui.cpp" line="1152"/>
+        <location filename="../src/GUI/gui.cpp" line="423"/>
+        <location filename="../src/GUI/gui.cpp" line="1131"/>
+        <location filename="../src/GUI/gui.cpp" line="1198"/>
         <source>Moving time</source>
         <translation>Hareket süresi</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="424"/>
+        <location filename="../src/GUI/gui.cpp" line="431"/>
         <source>Metric</source>
         <translation>Metrik</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="430"/>
+        <location filename="../src/GUI/gui.cpp" line="437"/>
         <source>Imperial</source>
         <translation>Emperyal</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="436"/>
+        <location filename="../src/GUI/gui.cpp" line="443"/>
         <source>Nautical</source>
         <translation>Denizcilik</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="444"/>
+        <location filename="../src/GUI/gui.cpp" line="451"/>
         <source>Decimal degrees (DD)</source>
         <translation>Desimal derece (DD)</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="450"/>
+        <location filename="../src/GUI/gui.cpp" line="457"/>
         <source>Degrees and decimal minutes (DMM)</source>
         <translation>Derece ve desimal dakika (DDD)</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="457"/>
+        <location filename="../src/GUI/gui.cpp" line="464"/>
         <source>Degrees, minutes, seconds (DMS)</source>
         <translation>Derece, dakika, saniye (DDS)</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="463"/>
+        <location filename="../src/GUI/gui.cpp" line="470"/>
         <source>Fullscreen mode</source>
         <translation>Tam ekran modu</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="470"/>
+        <location filename="../src/GUI/gui.cpp" line="477"/>
         <source>Options...</source>
         <translation>Seçenekler...</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="476"/>
+        <location filename="../src/GUI/gui.cpp" line="483"/>
         <source>Next</source>
         <translation>Sonraki</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="480"/>
+        <location filename="../src/GUI/gui.cpp" line="487"/>
         <source>Previous</source>
         <translation>Önceki</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="484"/>
+        <location filename="../src/GUI/gui.cpp" line="491"/>
         <source>Last</source>
         <translation>Son</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="488"/>
+        <location filename="../src/GUI/gui.cpp" line="495"/>
         <source>First</source>
         <translation>İlk</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="496"/>
+        <location filename="../src/GUI/gui.cpp" line="503"/>
         <source>&amp;File</source>
         <translation>&amp;Dosya</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="511"/>
+        <location filename="../src/GUI/gui.cpp" line="519"/>
         <source>&amp;Map</source>
         <translation>&amp;Harita</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="521"/>
+        <location filename="../src/GUI/gui.cpp" line="529"/>
         <source>&amp;Graph</source>
         <translation>&amp;Grafik</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="531"/>
+        <location filename="../src/GUI/gui.cpp" line="539"/>
         <source>&amp;POI</source>
         <translation>&amp;POI</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="532"/>
+        <location filename="../src/GUI/gui.cpp" line="540"/>
         <source>POI files</source>
         <translation>POI dosyalar</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="543"/>
+        <location filename="../src/GUI/gui.cpp" line="551"/>
         <source>&amp;Data</source>
         <translation>&amp;Veri</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="544"/>
+        <location filename="../src/GUI/gui.cpp" line="552"/>
         <source>Display</source>
         <translation>Görüntüleme</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="554"/>
+        <location filename="../src/GUI/gui.cpp" line="562"/>
         <source>&amp;Settings</source>
         <translation>&amp;Ayarlar</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="558"/>
+        <location filename="../src/GUI/gui.cpp" line="566"/>
         <source>Units</source>
         <translation>Birimler</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="562"/>
+        <location filename="../src/GUI/gui.cpp" line="570"/>
         <source>Coordinates format</source>
         <translation>Koordinat biçimi</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="572"/>
+        <location filename="../src/GUI/gui.cpp" line="580"/>
         <source>&amp;Help</source>
         <translation>&amp;Yardım</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="588"/>
+        <location filename="../src/GUI/gui.cpp" line="596"/>
         <source>File</source>
         <translation>Dosya</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="596"/>
+        <location filename="../src/GUI/gui.cpp" line="604"/>
         <source>Show</source>
         <translation>Göster</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="603"/>
+        <location filename="../src/GUI/gui.cpp" line="611"/>
         <source>Navigation</source>
         <translation>Navigasyon</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="670"/>
+        <location filename="../src/GUI/gui.cpp" line="678"/>
         <source>Version %1</source>
         <translation>Sürüm %1</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="674"/>
+        <location filename="../src/GUI/gui.cpp" line="682"/>
         <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 %1.</source>
         <translation>GPXSee, GNU Genel Kamu Lisansı sürüm 3 şartlarına göre dağıtılır. GPXSee hakkında daha fazla bilgi için %1 proje ana sayfasını ziyaret edin.</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="695"/>
+        <location filename="../src/GUI/gui.cpp" line="703"/>
         <source>Next file</source>
         <translation>Sonraki dosya</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="696"/>
+        <location filename="../src/GUI/gui.cpp" line="704"/>
         <source>Previous file</source>
         <translation>Önceki dosya</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="698"/>
+        <location filename="../src/GUI/gui.cpp" line="706"/>
         <source>First file</source>
         <translation>İlk dosya</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="700"/>
+        <location filename="../src/GUI/gui.cpp" line="708"/>
         <source>Last file</source>
         <translation>Son dosya</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="701"/>
+        <location filename="../src/GUI/gui.cpp" line="709"/>
         <source>Append file</source>
         <translation>Dosya ekle</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="702"/>
+        <location filename="../src/GUI/gui.cpp" line="710"/>
         <source>Next/Previous</source>
         <translation>Sonraki/Önceki</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="704"/>
+        <location filename="../src/GUI/gui.cpp" line="712"/>
         <source>Toggle graph type</source>
         <translation>Geçiş grafik türü</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="706"/>
+        <location filename="../src/GUI/gui.cpp" line="714"/>
         <source>Toggle time type</source>
         <translation>Geçiş zaman türü</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="710"/>
+        <location filename="../src/GUI/gui.cpp" line="718"/>
         <source>Previous map</source>
         <translation>Önceki harita</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="711"/>
+        <location filename="../src/GUI/gui.cpp" line="719"/>
         <source>Zoom in</source>
         <translation>Yaklaş</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="713"/>
+        <location filename="../src/GUI/gui.cpp" line="721"/>
         <source>Zoom out</source>
         <translation>Uzaklaş</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="715"/>
+        <location filename="../src/GUI/gui.cpp" line="723"/>
         <source>Digital zoom</source>
         <translation>Sayısal zum</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="716"/>
+        <location filename="../src/GUI/gui.cpp" line="724"/>
         <source>Zoom</source>
         <translation>Zum</translation>
     </message>
-    <message>
-        <location filename="../src/GUI/gui.cpp" line="729"/>
-        <source>Map directory:</source>
-        <translation>Harita klasörü:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/gui.cpp" line="731"/>
-        <source>POI directory:</source>
-        <translation>POI klasörü:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/gui.cpp" line="733"/>
-        <source>GCS/PCS directory:</source>
-        <translation>GCS/PCS klasörü:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/gui.cpp" line="735"/>
-        <source>DEM directory:</source>
-        <translation>DEM klasörü:</translation>
-    </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="737"/>
-        <source>Styles directory:</source>
-        <translation>Stil klasörü:</translation>
+        <source>Map directory:</source>
+        <translation>Harita dizini:</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="739"/>
-        <source>Tile cache directory:</source>
-        <translation>Döşeme önbellek klasörü:</translation>
+        <source>POI directory:</source>
+        <translation>POI dizini:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="748"/>
+        <location filename="../src/GUI/gui.cpp" line="741"/>
+        <source>GCS/PCS directory:</source>
+        <translation>GCS/PCS dizini:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/gui.cpp" line="743"/>
+        <source>DEM directory:</source>
+        <translation>DEM dizini:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/gui.cpp" line="745"/>
+        <source>Styles directory:</source>
+        <translation>Tarz dizini:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/gui.cpp" line="747"/>
+        <source>Tile cache directory:</source>
+        <translation>Döşeme önbellek dizini:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/gui.cpp" line="756"/>
         <source>Open file</source>
         <translation>Dosya aç</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="848"/>
+        <location filename="../src/GUI/gui.cpp" line="856"/>
         <source>Error loading data file:</source>
         <translation>Veri dosyası yüklenirken hata oluştu:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="851"/>
-        <location filename="../src/GUI/gui.cpp" line="886"/>
+        <location filename="../src/GUI/gui.cpp" line="859"/>
+        <location filename="../src/GUI/gui.cpp" line="894"/>
         <source>Line: %1</source>
         <translation>Satır: %1</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="859"/>
+        <location filename="../src/GUI/gui.cpp" line="867"/>
         <source>Open POI file</source>
         <translation>POI dosyası aç</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="883"/>
+        <location filename="../src/GUI/gui.cpp" line="891"/>
         <source>Error loading POI file:</source>
         <translation>POI dosyası yükleme hatası:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1055"/>
-        <location filename="../src/GUI/gui.cpp" line="1126"/>
+        <location filename="../src/GUI/gui.cpp" line="1100"/>
+        <location filename="../src/GUI/gui.cpp" line="1172"/>
         <source>Tracks</source>
         <translation>İzler</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1058"/>
-        <location filename="../src/GUI/gui.cpp" line="1128"/>
+        <location filename="../src/GUI/gui.cpp" line="1103"/>
+        <location filename="../src/GUI/gui.cpp" line="1174"/>
         <source>Routes</source>
         <translation>Rotalar</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1061"/>
-        <location filename="../src/GUI/gui.cpp" line="1130"/>
+        <location filename="../src/GUI/gui.cpp" line="1106"/>
+        <location filename="../src/GUI/gui.cpp" line="1176"/>
         <source>Waypoints</source>
         <translation>Yer işaretleri</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1064"/>
-        <location filename="../src/GUI/gui.cpp" line="1132"/>
+        <location filename="../src/GUI/gui.cpp" line="1109"/>
+        <location filename="../src/GUI/gui.cpp" line="1178"/>
         <source>Areas</source>
         <translation>Alanlar</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1070"/>
-        <location filename="../src/GUI/gui.cpp" line="1074"/>
-        <location filename="../src/GUI/gui.cpp" line="1138"/>
-        <location filename="../src/GUI/gui.cpp" line="1141"/>
+        <location filename="../src/GUI/gui.cpp" line="1115"/>
+        <location filename="../src/GUI/gui.cpp" line="1119"/>
+        <location filename="../src/GUI/gui.cpp" line="1184"/>
+        <location filename="../src/GUI/gui.cpp" line="1187"/>
         <source>Date</source>
         <translation>Tarih</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1107"/>
-        <location filename="../src/GUI/gui.cpp" line="1108"/>
+        <location filename="../src/GUI/gui.cpp" line="1152"/>
+        <location filename="../src/GUI/gui.cpp" line="1153"/>
         <source>Statistics</source>
         <translation>İstatistikler</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1122"/>
+        <location filename="../src/GUI/gui.cpp" line="1168"/>
         <source>Name</source>
         <translation>Adı</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1340"/>
+        <location filename="../src/GUI/gui.cpp" line="1424"/>
         <source>Open map file</source>
         <translation>Harita dosyası aç</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1360"/>
-        <location filename="../src/GUI/gui.cpp" line="1391"/>
+        <location filename="../src/GUI/gui.cpp" line="1444"/>
+        <location filename="../src/GUI/gui.cpp" line="1475"/>
         <source>Error loading map:</source>
         <translation>Harita yüklenirken hata oluştu:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1401"/>
+        <location filename="../src/GUI/gui.cpp" line="1485"/>
         <source>No files loaded</source>
         <translation>Hiç dosya yüklenmedi</translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/GUI/gui.cpp" line="1405"/>
+        <location filename="../src/GUI/gui.cpp" line="1489"/>
         <source>%n files</source>
         <translation>
             <numerusform>%n dosya</numerusform>
@@ -1048,7 +968,7 @@
     <message>
         <location filename="../src/map/maplist.cpp" line="112"/>
         <source>GeoTIFF images</source>
-        <translation>GeoTIFF görüntü</translation>
+        <translation>GeoTIFF görüntüler</translation>
     </message>
     <message>
         <location filename="../src/map/maplist.cpp" line="113"/>
@@ -1116,7 +1036,7 @@
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="122"/>
         <source>Track style:</source>
-        <translation>İz stili:</translation>
+        <translation>İz tarzı:</translation>
     </message>
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="124"/>
@@ -1130,7 +1050,7 @@
         <location filename="../src/GUI/optionsdialog.cpp" line="142"/>
         <location filename="../src/GUI/optionsdialog.cpp" line="161"/>
         <source>Style:</source>
-        <translation>Stil:</translation>
+        <translation>Tarz:</translation>
     </message>
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="126"/>
@@ -1145,7 +1065,7 @@
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="139"/>
         <source>Route style:</source>
-        <translation>Rota stili:</translation>
+        <translation>Rota tarzı:</translation>
     </message>
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="143"/>
@@ -1160,7 +1080,7 @@
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="157"/>
         <source>Area border style:</source>
-        <translation>Alan sınır stili:</translation>
+        <translation>Alan sınır tarzı:</translation>
     </message>
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="158"/>
@@ -1579,6 +1499,159 @@
         <translation>Seçenekler</translation>
     </message>
 </context>
+<context>
+    <name>PDFExportDialog</name>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="24"/>
+        <source>PDF files</source>
+        <translation>PDF dosyaları</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="24"/>
+        <source>All files</source>
+        <translation>Tüm dosyalar</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="51"/>
+        <source>Portrait</source>
+        <translation>Dikey</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="52"/>
+        <source>Landscape</source>
+        <translation>Yatay</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="62"/>
+        <source>in</source>
+        <translation>inç</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="62"/>
+        <source>cm</source>
+        <translation>cm</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="68"/>
+        <source>Page Setup</source>
+        <translation>Sayfa Düzeni</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="71"/>
+        <source>Page size:</source>
+        <translation>Sayfa boyutu:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="72"/>
+        <source>Resolution:</source>
+        <translation>Çözünürlük:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="73"/>
+        <source>Orientation:</source>
+        <translation>Yönlendirme:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="74"/>
+        <source>Margins:</source>
+        <translation>Kenar boşlukları:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="80"/>
+        <source>File:</source>
+        <translation>Dosya:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="87"/>
+        <source>Output file</source>
+        <translation>Çıktı dosyası</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="94"/>
+        <source>Export</source>
+        <translation>Dışa aktar</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="109"/>
+        <source>Export to PDF</source>
+        <translation>PDF olarak dışa aktar</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="117"/>
+        <source>Error</source>
+        <translation>Hata</translation>
+    </message>
+</context>
+<context>
+    <name>PNGExportDialog</name>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="22"/>
+        <source>PNG files</source>
+        <translation>PNG dosyaları</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="22"/>
+        <source>All files</source>
+        <translation>Tüm dosyalar</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="30"/>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="35"/>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="39"/>
+        <source>px</source>
+        <translation>px</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="41"/>
+        <source>Use anti-aliasing</source>
+        <translation>Kenar yumuşatma kullan</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="45"/>
+        <source>Image Setup</source>
+        <translation>Görüntü Düzeni</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="48"/>
+        <source>Image width:</source>
+        <translation>Görüntü genişliği:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="49"/>
+        <source>Image height:</source>
+        <translation>Görüntü yüksekliği:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="50"/>
+        <source>Margins:</source>
+        <translation>Kenar boşlukları:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="57"/>
+        <source>File:</source>
+        <translation>Dosya:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="64"/>
+        <source>Output file</source>
+        <translation>Çıktı dosyası</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="71"/>
+        <source>Export</source>
+        <translation>Dışa aktar</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="86"/>
+        <source>Export to PNG</source>
+        <translation>PNG olarak dışa aktar</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="94"/>
+        <source>Error</source>
+        <translation>Hata</translation>
+    </message>
+</context>
 <context>
     <name>PolygonItem</name>
     <message>

lang/gpxsee_uk.ts

@@ -204,106 +204,6 @@
         <translation>Мінімум</translation>
     </message>
 </context>
-<context>
-    <name>ExportDialog</name>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="25"/>
-        <source>PDF files</source>
-        <translation>PDF файли</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="25"/>
-        <source>All files</source>
-        <translation>Всі файли</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="52"/>
-        <source>Portrait</source>
-        <translation>Портретна</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="53"/>
-        <source>Landscape</source>
-        <translation>Ландшафтна</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="66"/>
-        <source>mm</source>
-        <translation>мм</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="66"/>
-        <source>in</source>
-        <translation>дюйм</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="94"/>
-        <source>Page Setup</source>
-        <translation>Налаштування сторінки</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="97"/>
-        <source>Page size:</source>
-        <translation>Розмір сторінки:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="98"/>
-        <source>Resolution:</source>
-        <translation>Роздільна здатність:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="99"/>
-        <source>Orientation:</source>
-        <translation>Орієнтація:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="100"/>
-        <source>Margins:</source>
-        <translation>Поля:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="106"/>
-        <source>File:</source>
-        <translation>Файл:</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="113"/>
-        <source>Output file</source>
-        <translation>Вихідний файл</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="120"/>
-        <source>Export</source>
-        <translation>Експорт</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="135"/>
-        <source>Export to PDF</source>
-        <translation>Експорт до PDF</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="142"/>
-        <location filename="../src/GUI/exportdialog.cpp" line="152"/>
-        <location filename="../src/GUI/exportdialog.cpp" line="157"/>
-        <source>Error</source>
-        <translation>Помилка</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="142"/>
-        <source>No output file selected.</source>
-        <translation>Не обрано вихідний файл.</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="152"/>
-        <source>%1 is a directory.</source>
-        <translation>%1 є каталогом.</translation>
-    </message>
-    <message>
-        <location filename="../src/GUI/exportdialog.cpp" line="157"/>
-        <source>%1 is not writable.</source>
-        <translation>%1 недоступний для запису.</translation>
-    </message>
-</context>
 <context>
     <name>FileSelectWidget</name>
     <message>
@@ -311,6 +211,21 @@
         <source>Select file</source>
         <translation>Вибрати файл</translation>
     </message>
+    <message>
+        <location filename="../src/GUI/fileselectwidget.cpp" line="48"/>
+        <source>No output file selected.</source>
+        <translation>Не обрано вихідний файл.</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/fileselectwidget.cpp" line="58"/>
+        <source>%1 is a directory.</source>
+        <translation>%1 є каталогом.</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/fileselectwidget.cpp" line="62"/>
+        <source>%1 is not writable.</source>
+        <translation>%1 недоступний для запису.</translation>
+    </message>
 </context>
 <context>
     <name>Format</name>
@@ -352,21 +267,21 @@
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="211"/>
-        <location filename="../src/GUI/gui.cpp" line="725"/>
-        <location filename="../src/GUI/gui.cpp" line="726"/>
+        <location filename="../src/GUI/gui.cpp" line="733"/>
+        <location filename="../src/GUI/gui.cpp" line="734"/>
         <source>Paths</source>
         <translation>Шляхи</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="214"/>
-        <location filename="../src/GUI/gui.cpp" line="691"/>
-        <location filename="../src/GUI/gui.cpp" line="692"/>
+        <location filename="../src/GUI/gui.cpp" line="699"/>
+        <location filename="../src/GUI/gui.cpp" line="700"/>
         <source>Keyboard controls</source>
         <translation>Управління з клавіатури</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="217"/>
-        <location filename="../src/GUI/gui.cpp" line="669"/>
+        <location filename="../src/GUI/gui.cpp" line="677"/>
         <source>About GPXSee</source>
         <translation>Про GPXSee</translation>
     </message>
@@ -386,481 +301,486 @@
         <translation>Експорт до PDF...</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="240"/>
+        <location filename="../src/GUI/gui.cpp" line="241"/>
+        <source>Export to PNG...</source>
+        <translation>Експорт до PNG...</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/gui.cpp" line="247"/>
         <source>Close</source>
         <translation>Закрити</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="246"/>
+        <location filename="../src/GUI/gui.cpp" line="253"/>
         <source>Reload</source>
         <translation>Оновити</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="253"/>
+        <location filename="../src/GUI/gui.cpp" line="260"/>
         <source>Statistics...</source>
         <translation>Статистика...</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="261"/>
+        <location filename="../src/GUI/gui.cpp" line="268"/>
         <source>Load POI file...</source>
         <translation>Завантажити POI файл...</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="265"/>
+        <location filename="../src/GUI/gui.cpp" line="272"/>
         <source>Close POI files</source>
         <translation>Закрити POI файли</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="269"/>
+        <location filename="../src/GUI/gui.cpp" line="276"/>
         <source>Overlap POIs</source>
         <translation>Перекривати точки POI</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="274"/>
+        <location filename="../src/GUI/gui.cpp" line="281"/>
         <source>Show POI labels</source>
         <translation>Показати мітки до точок POI</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="279"/>
+        <location filename="../src/GUI/gui.cpp" line="286"/>
         <source>Show POIs</source>
         <translation>Відображати точки POI</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="290"/>
+        <location filename="../src/GUI/gui.cpp" line="297"/>
         <source>Show map</source>
         <translation>Відображати мапу</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="299"/>
+        <location filename="../src/GUI/gui.cpp" line="306"/>
         <source>Load map...</source>
         <translation>Завантажити мапу...</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="303"/>
+        <location filename="../src/GUI/gui.cpp" line="310"/>
         <source>Clear tile cache</source>
         <translation>Очистити кеш-пам’ять</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="308"/>
-        <location filename="../src/GUI/gui.cpp" line="313"/>
-        <location filename="../src/GUI/gui.cpp" line="708"/>
+        <location filename="../src/GUI/gui.cpp" line="315"/>
+        <location filename="../src/GUI/gui.cpp" line="320"/>
+        <location filename="../src/GUI/gui.cpp" line="716"/>
         <source>Next map</source>
         <translation>Наступна мапа</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="318"/>
+        <location filename="../src/GUI/gui.cpp" line="325"/>
         <source>Show cursor coordinates</source>
         <translation>Відображати координати курсора</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="325"/>
+        <location filename="../src/GUI/gui.cpp" line="332"/>
         <source>Show tracks</source>
         <translation>Відображати треки</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="330"/>
+        <location filename="../src/GUI/gui.cpp" line="337"/>
         <source>Show routes</source>
         <translation>Відображати маршрути</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="335"/>
+        <location filename="../src/GUI/gui.cpp" line="342"/>
         <source>Show waypoints</source>
         <translation>Відображати маршрутні точки</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="340"/>
+        <location filename="../src/GUI/gui.cpp" line="347"/>
         <source>Show areas</source>
         <translation>Відображати області</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="345"/>
+        <location filename="../src/GUI/gui.cpp" line="352"/>
         <source>Waypoint labels</source>
         <translation>Підписи маршрутних точок</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="350"/>
+        <location filename="../src/GUI/gui.cpp" line="357"/>
         <source>Route waypoints</source>
         <translation>Маршрутні точки маршруту</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="355"/>
+        <location filename="../src/GUI/gui.cpp" line="362"/>
         <source>km/mi markers</source>
         <translation>км/миля позначки</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="362"/>
+        <location filename="../src/GUI/gui.cpp" line="369"/>
         <source>Show graphs</source>
         <translation>Відображати графіки</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="372"/>
-        <location filename="../src/GUI/gui.cpp" line="1081"/>
-        <location filename="../src/GUI/gui.cpp" line="1148"/>
+        <location filename="../src/GUI/gui.cpp" line="379"/>
+        <location filename="../src/GUI/gui.cpp" line="1126"/>
+        <location filename="../src/GUI/gui.cpp" line="1194"/>
         <source>Distance</source>
         <translation>Відстань</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="379"/>
-        <location filename="../src/GUI/gui.cpp" line="555"/>
-        <location filename="../src/GUI/gui.cpp" line="1084"/>
-        <location filename="../src/GUI/gui.cpp" line="1150"/>
+        <location filename="../src/GUI/gui.cpp" line="386"/>
+        <location filename="../src/GUI/gui.cpp" line="563"/>
+        <location filename="../src/GUI/gui.cpp" line="1129"/>
+        <location filename="../src/GUI/gui.cpp" line="1196"/>
         <source>Time</source>
         <translation>Час</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="386"/>
+        <location filename="../src/GUI/gui.cpp" line="393"/>
         <source>Show grid</source>
         <translation>Відображати сітку</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="391"/>
+        <location filename="../src/GUI/gui.cpp" line="398"/>
         <source>Show slider info</source>
         <translation>Відображати інформацію на повзунку</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="396"/>
+        <location filename="../src/GUI/gui.cpp" line="403"/>
         <source>Show path markers</source>
         <translation>Відображати маркери шляху</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="403"/>
+        <location filename="../src/GUI/gui.cpp" line="410"/>
         <source>Show toolbars</source>
         <translation>Відображати панелі інструментів</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="410"/>
+        <location filename="../src/GUI/gui.cpp" line="417"/>
         <source>Total time</source>
         <translation>Загальний час</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="416"/>
-        <location filename="../src/GUI/gui.cpp" line="1086"/>
-        <location filename="../src/GUI/gui.cpp" line="1152"/>
+        <location filename="../src/GUI/gui.cpp" line="423"/>
+        <location filename="../src/GUI/gui.cpp" line="1131"/>
+        <location filename="../src/GUI/gui.cpp" line="1198"/>
         <source>Moving time</source>
         <translation>Час руху</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="424"/>
+        <location filename="../src/GUI/gui.cpp" line="431"/>
         <source>Metric</source>
         <translation>Метричні</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="430"/>
+        <location filename="../src/GUI/gui.cpp" line="437"/>
         <source>Imperial</source>
         <translation>Імперські</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="436"/>
+        <location filename="../src/GUI/gui.cpp" line="443"/>
         <source>Nautical</source>
         <translation>Морські</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="444"/>
+        <location filename="../src/GUI/gui.cpp" line="451"/>
         <source>Decimal degrees (DD)</source>
         <translation>Десяткові градуси (DD)</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="450"/>
+        <location filename="../src/GUI/gui.cpp" line="457"/>
         <source>Degrees and decimal minutes (DMM)</source>
         <translation>Градуси та десяткові мінути (DMM)</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="457"/>
+        <location filename="../src/GUI/gui.cpp" line="464"/>
         <source>Degrees, minutes, seconds (DMS)</source>
         <translation>Градуси, мінути, секунди (DMS)</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="463"/>
+        <location filename="../src/GUI/gui.cpp" line="470"/>
         <source>Fullscreen mode</source>
         <translation>Повноекранний режим</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="470"/>
+        <location filename="../src/GUI/gui.cpp" line="477"/>
         <source>Options...</source>
         <translation>Налаштування...</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="476"/>
+        <location filename="../src/GUI/gui.cpp" line="483"/>
         <source>Next</source>
         <translation>Наступний</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="480"/>
+        <location filename="../src/GUI/gui.cpp" line="487"/>
         <source>Previous</source>
         <translation>Попередній</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="484"/>
+        <location filename="../src/GUI/gui.cpp" line="491"/>
         <source>Last</source>
         <translation>Останній</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="488"/>
+        <location filename="../src/GUI/gui.cpp" line="495"/>
         <source>First</source>
         <translation>Перший</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="496"/>
+        <location filename="../src/GUI/gui.cpp" line="503"/>
         <source>&amp;File</source>
         <translation>&amp;Файл</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="511"/>
+        <location filename="../src/GUI/gui.cpp" line="519"/>
         <source>&amp;Map</source>
         <translation>&amp;Мапи</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="521"/>
+        <location filename="../src/GUI/gui.cpp" line="529"/>
         <source>&amp;Graph</source>
         <translation>&amp;Графік</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="531"/>
+        <location filename="../src/GUI/gui.cpp" line="539"/>
         <source>&amp;POI</source>
         <translation>&amp;Точки POI</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="532"/>
+        <location filename="../src/GUI/gui.cpp" line="540"/>
         <source>POI files</source>
         <translation>Файли із точками POI</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="543"/>
+        <location filename="../src/GUI/gui.cpp" line="551"/>
         <source>&amp;Data</source>
         <translation>&amp;Дані</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="544"/>
+        <location filename="../src/GUI/gui.cpp" line="552"/>
         <source>Display</source>
         <translation>Відображати</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="554"/>
+        <location filename="../src/GUI/gui.cpp" line="562"/>
         <source>&amp;Settings</source>
         <translation>&amp;Налаштування</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="558"/>
+        <location filename="../src/GUI/gui.cpp" line="566"/>
         <source>Units</source>
         <translation>Одиниці</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="562"/>
+        <location filename="../src/GUI/gui.cpp" line="570"/>
         <source>Coordinates format</source>
         <translation>Формат координат</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="572"/>
+        <location filename="../src/GUI/gui.cpp" line="580"/>
         <source>&amp;Help</source>
         <translation>&amp;Допомога</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="588"/>
+        <location filename="../src/GUI/gui.cpp" line="596"/>
         <source>File</source>
         <translation>Файл</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="596"/>
+        <location filename="../src/GUI/gui.cpp" line="604"/>
         <source>Show</source>
         <translation>Відобразити</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="603"/>
+        <location filename="../src/GUI/gui.cpp" line="611"/>
         <source>Navigation</source>
         <translation>Навігація</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="670"/>
+        <location filename="../src/GUI/gui.cpp" line="678"/>
         <source>Version %1</source>
         <translation>Версія %1</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="674"/>
+        <location filename="../src/GUI/gui.cpp" line="682"/>
         <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 %1.</source>
         <translation>GPXSee розповсюджується згідно умов ліцензії GNU General Public License version 3. Більше інформації про GPXSee знаходиться на офіційній сторінці проєкту, що доступна за посиланням %1.</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="695"/>
+        <location filename="../src/GUI/gui.cpp" line="703"/>
         <source>Next file</source>
         <translation>Наступний файл</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="696"/>
+        <location filename="../src/GUI/gui.cpp" line="704"/>
         <source>Previous file</source>
         <translation>Попередній файл</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="698"/>
+        <location filename="../src/GUI/gui.cpp" line="706"/>
         <source>First file</source>
         <translation>Перший файл</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="700"/>
+        <location filename="../src/GUI/gui.cpp" line="708"/>
         <source>Last file</source>
         <translation>Останній файл</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="701"/>
+        <location filename="../src/GUI/gui.cpp" line="709"/>
         <source>Append file</source>
         <translation>Додати файл</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="702"/>
+        <location filename="../src/GUI/gui.cpp" line="710"/>
         <source>Next/Previous</source>
         <translation>Наступний/попередній</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="704"/>
+        <location filename="../src/GUI/gui.cpp" line="712"/>
         <source>Toggle graph type</source>
         <translation>Змінити тип графіка</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="706"/>
+        <location filename="../src/GUI/gui.cpp" line="714"/>
         <source>Toggle time type</source>
         <translation>Змінити тип часу</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="710"/>
+        <location filename="../src/GUI/gui.cpp" line="718"/>
         <source>Previous map</source>
         <translation>Попередня мапа</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="711"/>
+        <location filename="../src/GUI/gui.cpp" line="719"/>
         <source>Zoom in</source>
         <translation>Збільшити</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="713"/>
+        <location filename="../src/GUI/gui.cpp" line="721"/>
         <source>Zoom out</source>
         <translation>Зменшити</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="715"/>
+        <location filename="../src/GUI/gui.cpp" line="723"/>
         <source>Digital zoom</source>
         <translation>Цифровий зум</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="716"/>
+        <location filename="../src/GUI/gui.cpp" line="724"/>
         <source>Zoom</source>
         <translation>Зум</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="729"/>
+        <location filename="../src/GUI/gui.cpp" line="737"/>
         <source>Map directory:</source>
         <translation>Каталог мап:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="731"/>
+        <location filename="../src/GUI/gui.cpp" line="739"/>
         <source>POI directory:</source>
         <translation>Каталог POI:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="733"/>
+        <location filename="../src/GUI/gui.cpp" line="741"/>
         <source>GCS/PCS directory:</source>
         <translation>Каталог GCS/PCS:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="735"/>
+        <location filename="../src/GUI/gui.cpp" line="743"/>
         <source>DEM directory:</source>
         <translation>Каталог DEM:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="737"/>
+        <location filename="../src/GUI/gui.cpp" line="745"/>
         <source>Styles directory:</source>
         <translation>Каталог стилів:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="739"/>
+        <location filename="../src/GUI/gui.cpp" line="747"/>
         <source>Tile cache directory:</source>
         <translation>Каталог кеша тайлів:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="748"/>
+        <location filename="../src/GUI/gui.cpp" line="756"/>
         <source>Open file</source>
         <translation>Відкрити файл</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="848"/>
+        <location filename="../src/GUI/gui.cpp" line="856"/>
         <source>Error loading data file:</source>
         <translation>Помилка завантаження файлу даних:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="851"/>
-        <location filename="../src/GUI/gui.cpp" line="886"/>
+        <location filename="../src/GUI/gui.cpp" line="859"/>
+        <location filename="../src/GUI/gui.cpp" line="894"/>
         <source>Line: %1</source>
         <translation>Строка: %1</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="859"/>
+        <location filename="../src/GUI/gui.cpp" line="867"/>
         <source>Open POI file</source>
         <translation>Відкрити файл із точками POI</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="883"/>
+        <location filename="../src/GUI/gui.cpp" line="891"/>
         <source>Error loading POI file:</source>
         <translation>Помилка під час завантаження файлу POI:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1055"/>
-        <location filename="../src/GUI/gui.cpp" line="1126"/>
+        <location filename="../src/GUI/gui.cpp" line="1100"/>
+        <location filename="../src/GUI/gui.cpp" line="1172"/>
         <source>Tracks</source>
         <translation>Треки</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1058"/>
-        <location filename="../src/GUI/gui.cpp" line="1128"/>
+        <location filename="../src/GUI/gui.cpp" line="1103"/>
+        <location filename="../src/GUI/gui.cpp" line="1174"/>
         <source>Routes</source>
         <translation>Маршрути</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1061"/>
-        <location filename="../src/GUI/gui.cpp" line="1130"/>
+        <location filename="../src/GUI/gui.cpp" line="1106"/>
+        <location filename="../src/GUI/gui.cpp" line="1176"/>
         <source>Waypoints</source>
         <translation>Маршрутні точки</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1064"/>
-        <location filename="../src/GUI/gui.cpp" line="1132"/>
+        <location filename="../src/GUI/gui.cpp" line="1109"/>
+        <location filename="../src/GUI/gui.cpp" line="1178"/>
         <source>Areas</source>
         <translation>Області</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1070"/>
-        <location filename="../src/GUI/gui.cpp" line="1074"/>
-        <location filename="../src/GUI/gui.cpp" line="1138"/>
-        <location filename="../src/GUI/gui.cpp" line="1141"/>
+        <location filename="../src/GUI/gui.cpp" line="1115"/>
+        <location filename="../src/GUI/gui.cpp" line="1119"/>
+        <location filename="../src/GUI/gui.cpp" line="1184"/>
+        <location filename="../src/GUI/gui.cpp" line="1187"/>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1107"/>
-        <location filename="../src/GUI/gui.cpp" line="1108"/>
+        <location filename="../src/GUI/gui.cpp" line="1152"/>
+        <location filename="../src/GUI/gui.cpp" line="1153"/>
         <source>Statistics</source>
         <translation>Статистика</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1122"/>
+        <location filename="../src/GUI/gui.cpp" line="1168"/>
         <source>Name</source>
         <translation>Ім’я</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1340"/>
+        <location filename="../src/GUI/gui.cpp" line="1424"/>
         <source>Open map file</source>
         <translation>Відкрити файл мапи</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1360"/>
-        <location filename="../src/GUI/gui.cpp" line="1391"/>
+        <location filename="../src/GUI/gui.cpp" line="1444"/>
+        <location filename="../src/GUI/gui.cpp" line="1475"/>
         <source>Error loading map:</source>
         <translation>Помилка завантаження мапи:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1401"/>
+        <location filename="../src/GUI/gui.cpp" line="1485"/>
         <source>No files loaded</source>
         <translation>Файли не завантажені</translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/GUI/gui.cpp" line="1405"/>
+        <location filename="../src/GUI/gui.cpp" line="1489"/>
         <source>%n files</source>
         <translation>
             <numerusform>%n файл</numerusform>
@@ -1394,7 +1314,7 @@
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="442"/>
         <source>Use segments</source>
-        <translation type="unfinished"></translation>
+        <translation>Використовувати сегменти</translation>
     </message>
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="481"/>
@@ -1580,6 +1500,159 @@
         <translation>Налаштування</translation>
     </message>
 </context>
+<context>
+    <name>PDFExportDialog</name>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="24"/>
+        <source>PDF files</source>
+        <translation>PDF файли</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="24"/>
+        <source>All files</source>
+        <translation>Всі файли</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="51"/>
+        <source>Portrait</source>
+        <translation>Портретна</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="52"/>
+        <source>Landscape</source>
+        <translation>Ландшафтна</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="62"/>
+        <source>in</source>
+        <translation>in</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="62"/>
+        <source>cm</source>
+        <translation>см</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="68"/>
+        <source>Page Setup</source>
+        <translation>Налаштування сторінки</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="71"/>
+        <source>Page size:</source>
+        <translation>Розмір сторінки:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="72"/>
+        <source>Resolution:</source>
+        <translation>Роздільна здатність:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="73"/>
+        <source>Orientation:</source>
+        <translation>Орієнтація:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="74"/>
+        <source>Margins:</source>
+        <translation>Поля:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="80"/>
+        <source>File:</source>
+        <translation>Файл:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="87"/>
+        <source>Output file</source>
+        <translation>Вихідний файл</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="94"/>
+        <source>Export</source>
+        <translation>Експорт</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="109"/>
+        <source>Export to PDF</source>
+        <translation>Експорт до PDF</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pdfexportdialog.cpp" line="117"/>
+        <source>Error</source>
+        <translation>Помилка</translation>
+    </message>
+</context>
+<context>
+    <name>PNGExportDialog</name>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="22"/>
+        <source>PNG files</source>
+        <translation>PNG файли</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="22"/>
+        <source>All files</source>
+        <translation>Всі файли</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="30"/>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="35"/>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="39"/>
+        <source>px</source>
+        <translation>px</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="41"/>
+        <source>Use anti-aliasing</source>
+        <translation>Використовувати згладжування</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="45"/>
+        <source>Image Setup</source>
+        <translation>Налаштування зображення</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="48"/>
+        <source>Image width:</source>
+        <translation>Ширина зображення:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="49"/>
+        <source>Image height:</source>
+        <translation>Висота зображення:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="50"/>
+        <source>Margins:</source>
+        <translation>Поля:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="57"/>
+        <source>File:</source>
+        <translation>Файл:</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="64"/>
+        <source>Output file</source>
+        <translation>Вихідний файл</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="71"/>
+        <source>Export</source>
+        <translation>Експорт</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="86"/>
+        <source>Export to PNG</source>
+        <translation>Експорт до PNG</translation>
+    </message>
+    <message>
+        <location filename="../src/GUI/pngexportdialog.cpp" line="94"/>
+        <source>Error</source>
+        <translation>Помилка</translation>
+    </message>
+</context>
 <context>
     <name>PolygonItem</name>
     <message>

pkg/gpxsee.nsi

@@ -7,7 +7,7 @@
 ; The name of the installer
 Name "GPXSee"
 ; Program version
-!define VERSION "7.32"
+!define VERSION "7.36"
 
 ; The file to write
 OutFile "GPXSee-${VERSION}.exe"
@@ -17,6 +17,9 @@ SetCompressor /SOLID lzma
 ; Required execution level
 RequestExecutionLevel admin
 
+; Don't let the OS scale(blur) the installer GUI
+ManifestDPIAware true
+
 ; The default installation directory
 InstallDir "$PROGRAMFILES\GPXSee"
 

pkg/gpxsee64.nsi

@@ -7,7 +7,7 @@
 ; The name of the installer
 Name "GPXSee"
 ; Program version
-!define VERSION "7.32"
+!define VERSION "7.36"
 
 ; The file to write
 OutFile "GPXSee-${VERSION}_x64.exe"
@@ -17,6 +17,9 @@ SetCompressor /SOLID lzma
 ; Required execution level
 RequestExecutionLevel admin
 
+; Don't let the OS scale(blur) the installer GUI
+ManifestDPIAware true
+
 ; The default installation directory
 InstallDir "$PROGRAMFILES64\GPXSee"
 

src/GUI/fileselectwidget.cpp

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

src/GUI/fileselectwidget.h

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

src/GUI/gui.cpp

@@ -140,10 +140,9 @@ void GUI::createMapActions()
 
 MapAction *GUI::createMapAction(Map *map)
 {
-	MapAction *a = new MapAction(map);
+	MapAction *a = new MapAction(map, _mapsActionGroup);
 	a->setMenuRole(QAction::NoRole);
 	a->setCheckable(true);
-	a->setActionGroup(_mapsActionGroup);
 	connect(a, SIGNAL(triggered()), this, SLOT(mapChanged()));
 
 	return a;
@@ -230,13 +229,20 @@ void GUI::createActions()
 	_printFileAction->setActionGroup(_fileActionGroup);
 	connect(_printFileAction, SIGNAL(triggered()), this, SLOT(printFile()));
 	addAction(_printFileAction);
-	_exportFileAction = new QAction(QIcon(EXPORT_FILE_ICON),
+	_exportPDFFileAction = new QAction(QIcon(EXPORT_FILE_ICON),
 	  tr("Export to PDF..."), this);
-	_exportFileAction->setMenuRole(QAction::NoRole);
-	_exportFileAction->setShortcut(EXPORT_SHORTCUT);
-	_exportFileAction->setActionGroup(_fileActionGroup);
-	connect(_exportFileAction, SIGNAL(triggered()), this, SLOT(exportFile()));
-	addAction(_exportFileAction);
+	_exportPDFFileAction->setMenuRole(QAction::NoRole);
+	_exportPDFFileAction->setShortcut(PDF_EXPORT_SHORTCUT);
+	_exportPDFFileAction->setActionGroup(_fileActionGroup);
+	connect(_exportPDFFileAction, SIGNAL(triggered()), this, SLOT(exportPDFFile()));
+	addAction(_exportPDFFileAction);
+	_exportPNGFileAction = new QAction(QIcon(EXPORT_FILE_ICON),
+	  tr("Export to PNG..."), this);
+	_exportPNGFileAction->setMenuRole(QAction::NoRole);
+	_exportPNGFileAction->setShortcut(PNG_EXPORT_SHORTCUT);
+	_exportPNGFileAction->setActionGroup(_fileActionGroup);
+	connect(_exportPNGFileAction, SIGNAL(triggered()), this, SLOT(exportPNGFile()));
+	addAction(_exportPNGFileAction);
 	_closeFileAction = new QAction(QIcon(CLOSE_FILE_ICON), tr("Close"), this);
 	_closeFileAction->setMenuRole(QAction::NoRole);
 	_closeFileAction->setShortcut(CLOSE_SHORTCUT);
@@ -497,7 +503,8 @@ void GUI::createMenus()
 	fileMenu->addAction(_openFileAction);
 	fileMenu->addSeparator();
 	fileMenu->addAction(_printFileAction);
-	fileMenu->addAction(_exportFileAction);
+	fileMenu->addAction(_exportPDFFileAction);
+	fileMenu->addAction(_exportPNGFileAction);
 	fileMenu->addSeparator();
 	fileMenu->addAction(_statisticsAction);
 	fileMenu->addSeparator();
@@ -928,7 +935,7 @@ void GUI::openOptions()
 	Options options(_options);
 	bool reload = false;
 
-	OptionsDialog dialog(&options, this);
+	OptionsDialog dialog(options, _units, this);
 	if (dialog.exec() != QDialog::Accepted)
 		return;
 
@@ -1019,9 +1026,9 @@ void GUI::printFile()
 		plot(&printer);
 }
 
-void GUI::exportFile()
+void GUI::exportPDFFile()
 {
-	ExportDialog dialog(&_export, this);
+	PDFExportDialog dialog(_pdfExport, _units, this);
 	if (dialog.exec() != QDialog::Accepted)
 		return;
 
@@ -1029,16 +1036,53 @@ void GUI::exportFile()
 	printer.setOutputFormat(QPrinter::PdfFormat);
 	printer.setCreator(QString(APP_NAME) + QString(" ")
 	  + QString(APP_VERSION));
-	printer.setResolution(_export.resolution);
-	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);
+	printer.setResolution(_pdfExport.resolution);
+	printer.setOrientation(_pdfExport.orientation);
+	printer.setOutputFileName(_pdfExport.fileName);
+	printer.setPaperSize(_pdfExport.paperSize);
+	printer.setPageMargins(_pdfExport.margins.left(), _pdfExport.margins.top(),
+	  _pdfExport.margins.right(), _pdfExport.margins.bottom(),
+	  QPrinter::Millimeter);
 
 	plot(&printer);
 }
 
+void GUI::exportPNGFile()
+{
+	PNGExportDialog dialog(_pngExport, this);
+	if (dialog.exec() != QDialog::Accepted)
+		return;
+
+	QImage img(_pngExport.size, QImage::Format_ARGB32_Premultiplied);
+	QPainter p(&img);
+	QRectF rect(0, 0, img.width(), img.height());
+	QRectF contentRect(rect.adjusted(_pngExport.margins.left(),
+	  _pngExport.margins.top(), -_pngExport.margins.right(),
+	  -_pngExport.margins.bottom()));
+
+	if (_pngExport.antialiasing)
+		p.setRenderHint(QPainter::Antialiasing);
+	p.fillRect(rect, Qt::white);
+	plotMainPage(&p, contentRect, 1.0, true);
+	img.save(_pngExport.fileName);
+
+	if (!_tabs.isEmpty() && _options.separateGraphPage) {
+		QImage img2(_pngExport.size.width(), (int)graphPlotHeight(rect, 1)
+		  + _pngExport.margins.bottom(), QImage::Format_ARGB32_Premultiplied);
+		QPainter p2(&img2);
+		QRectF rect2(0, 0, img2.width(), img2.height());
+
+		if (_pngExport.antialiasing)
+			p2.setRenderHint(QPainter::Antialiasing);
+		p2.fillRect(rect2, Qt::white);
+		plotGraphsPage(&p2, contentRect, 1);
+
+		QFileInfo fi(_pngExport.fileName);
+		img2.save(fi.absolutePath() + "/" + fi.baseName() + "-graphs."
+		  + fi.suffix());
+	}
+}
+
 void GUI::statistics()
 {
 	QLocale l(QLocale::system());
@@ -1110,12 +1154,13 @@ void GUI::statistics()
 	msgBox.exec();
 }
 
-void GUI::plot(QPrinter *printer)
+void GUI::plotMainPage(QPainter *painter, const QRectF &rect, qreal ratio,
+  bool expand)
 {
 	QLocale l(QLocale::system());
-	QPainter p(printer);
 	TrackInfo info;
-	qreal ih, gh, mh, ratio;
+	qreal ih, gh, mh;
+	int sc;
 
 
 	if (!_pathName.isNull() && _options.printName)
@@ -1151,53 +1196,91 @@ void GUI::plot(QPrinter *printer)
 	if (movingTime() > 0 && _options.printMovingTime)
 		info.insert(tr("Moving time"), Format::timeSpan(movingTime()));
 
-	qreal fsr = 1085.0 / (qMax(printer->width(), printer->height())
-	  / (qreal)printer->resolution());
-	ratio = p.paintEngine()->paintDevice()->logicalDpiX() / fsr;
 	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), ratio);
+		info.plot(painter, QRectF(rect.x(), rect.y(), rect.width(), ih), ratio);
 	}
 	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)
-		  : 0.15 * (printer->height() - ih - 2*mh);
+		qreal r = rect.width() / rect.height();
+		gh = (rect.width() > rect.height())
+		  ? 0.15 * r * (rect.height() - ih - 2*mh)
+		  : 0.15 * (rect.height() - ih - 2*mh);
+		if (gh < 150)
+			gh = 150;
+		sc = 2;
 		GraphTab *gt = static_cast<GraphTab*>(_graphTabWidget->currentWidget());
-		gt->plot(&p,  QRectF(0, printer->height() - gh, printer->width(), gh),
-		  ratio);
-	} else
+		gt->plot(painter,  QRectF(rect.x(), rect.y() + rect.height() - gh,
+		  rect.width(), gh), ratio);
+	} else {
 		gh = 0;
-	_mapView->plot(&p, QRectF(0, ih + mh, printer->width(), printer->height()
-	  - (ih + 2*mh + gh)), ratio, _options.hiresPrint);
+		sc = 1;
+	}
 
-	if (_graphTabWidget->isVisible() && _options.separateGraphPage) {
-		printer->newPage();
+	MapView::PlotFlags flags = MapView::NoFlags;
+	if (_options.hiresPrint)
+		flags |= MapView::HiRes;
+	if (expand)
+		flags |= MapView::Expand;
 
-		int cnt = 0;
-		for (int i = 0; i < _tabs.size(); i++)
-			if (!_tabs.at(i)->isEmpty())
-				cnt++;
+	_mapView->plot(painter, QRectF(rect.x(), rect.y() + ih + mh, rect.width(),
+	  rect.height() - (ih + sc*mh + gh)), ratio, flags);
+}
 
-		qreal sp = ratio * 20;
-		gh = qMin((printer->height() - ((cnt - 1) * sp))/(qreal)cnt,
-		  0.20 * printer->height());
+void GUI::plotGraphsPage(QPainter *painter, const QRectF &rect, qreal ratio)
+{
+	int cnt = 0;
+	for (int i = 0; i < _tabs.size(); i++)
+		if (!_tabs.at(i)->isEmpty())
+			cnt++;
 
-		qreal y = 0;
-		for (int i = 0; i < _tabs.size(); i++) {
-			if (!_tabs.at(i)->isEmpty()) {
-				_tabs.at(i)->plot(&p,  QRectF(0, y, printer->width(), gh),
-				  ratio);
-				y += gh + sp;
-			}
+	qreal sp = ratio * 20;
+	qreal gh = qMin((rect.height() - ((cnt - 1) * sp))/(qreal)cnt,
+	  0.20 * rect.height());
+
+	qreal y = 0;
+	for (int i = 0; i < _tabs.size(); i++) {
+		if (!_tabs.at(i)->isEmpty()) {
+			_tabs.at(i)->plot(painter,  QRectF(rect.x(), rect.y() + y,
+			  rect.width(), gh), ratio);
+			y += gh + sp;
 		}
 	}
 }
 
+qreal GUI::graphPlotHeight(const QRectF &rect, qreal ratio)
+{
+	int cnt = 0;
+	for (int i = 0; i < _tabs.size(); i++)
+		if (!_tabs.at(i)->isEmpty())
+			cnt++;
+
+	qreal sp = ratio * 20;
+	qreal gh = qMin((rect.height() - ((cnt - 1) * sp))/(qreal)cnt,
+	  0.20 * rect.height());
+
+	return cnt * gh + (cnt - 1) * sp;
+}
+
+void GUI::plot(QPrinter *printer)
+{
+	QPainter p(printer);
+	qreal fsr = 1085.0 / (qMax(printer->width(), printer->height())
+	  / (qreal)printer->resolution());
+	qreal ratio = p.paintEngine()->paintDevice()->logicalDpiX() / fsr;
+	QRectF rect(0, 0, printer->width(), printer->height());
+
+	plotMainPage(&p, rect, ratio);
+
+	if (!_tabs.isEmpty() && _options.separateGraphPage) {
+		printer->newPage();
+		plotGraphsPage(&p, rect, ratio);
+	}
+}
+
 void GUI::reloadFiles()
 {
 	_trackCount = 0;
@@ -1552,8 +1635,7 @@ void GUI::setTimeType(TimeType type)
 
 void GUI::setUnits(Units units)
 {
-	_export.units = units;
-	_options.units = units;
+	_units = units;
 
 	_mapView->setUnits(units);
 	for (int i = 0; i <_tabs.count(); i++)
@@ -1796,23 +1878,42 @@ void GUI::writeSettings()
 		  _showTicksAction->isChecked());
 	settings.endGroup();
 
-	settings.beginGroup(EXPORT_SETTINGS_GROUP);
-	if (_export.orientation != PAPER_ORIENTATION_DEFAULT)
-		settings.setValue(PAPER_ORIENTATION_SETTING, _export.orientation);
-	if (_export.resolution != RESOLUTION_DEFAULT)
-		settings.setValue(RESOLUTION_SETTING, _export.resolution);
-	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.beginGroup(PDF_EXPORT_SETTINGS_GROUP);
+	if (_pdfExport.orientation != PAPER_ORIENTATION_DEFAULT)
+		settings.setValue(PAPER_ORIENTATION_SETTING, _pdfExport.orientation);
+	if (_pdfExport.resolution != RESOLUTION_DEFAULT)
+		settings.setValue(RESOLUTION_SETTING, _pdfExport.resolution);
+	if (_pdfExport.paperSize != PAPER_SIZE_DEFAULT)
+		settings.setValue(PAPER_SIZE_SETTING, _pdfExport.paperSize);
+	if (_pdfExport.margins.left() != PDF_MARGIN_LEFT_DEFAULT)
+		settings.setValue(PDF_MARGIN_LEFT_SETTING, _pdfExport.margins.left());
+	if (_pdfExport.margins.top() != PDF_MARGIN_TOP_DEFAULT)
+		settings.setValue(PDF_MARGIN_TOP_SETTING, _pdfExport.margins.top());
+	if (_pdfExport.margins.right() != PDF_MARGIN_RIGHT_DEFAULT)
+		settings.setValue(PDF_MARGIN_RIGHT_SETTING, _pdfExport.margins.right());
+	if (_pdfExport.margins.bottom() != PDF_MARGIN_BOTTOM_DEFAULT)
+		settings.setValue(PDF_MARGIN_BOTTOM_SETTING, _pdfExport.margins.bottom());
+	if (_pdfExport.fileName != PDF_FILENAME_DEFAULT)
+		settings.setValue(PDF_FILENAME_SETTING, _pdfExport.fileName);
+	settings.endGroup();
+
+	settings.beginGroup(PNG_EXPORT_SETTINGS_GROUP);
+	if (_pngExport.size.width() != PNG_WIDTH_DEFAULT)
+		settings.setValue(PNG_WIDTH_SETTING, _pngExport.size.width());
+	if (_pngExport.size.height() != PNG_HEIGHT_DEFAULT)
+		settings.setValue(PNG_HEIGHT_SETTING, _pngExport.size.height());
+	if (_pngExport.margins.left() != PNG_MARGIN_LEFT_DEFAULT)
+		settings.setValue(PNG_MARGIN_LEFT_SETTING, _pngExport.margins.left());
+	if (_pngExport.margins.top() != PNG_MARGIN_TOP_DEFAULT)
+		settings.setValue(PNG_MARGIN_TOP_SETTING, _pngExport.margins.top());
+	if (_pngExport.margins.right() != PNG_MARGIN_RIGHT_DEFAULT)
+		settings.setValue(PNG_MARGIN_RIGHT_SETTING, _pngExport.margins.right());
+	if (_pngExport.margins.bottom() != PNG_MARGIN_BOTTOM_DEFAULT)
+		settings.setValue(PNG_MARGIN_BOTTOM_SETTING, _pngExport.margins.bottom());
+	if (_pngExport.antialiasing != PNG_ANTIALIASING_DEFAULT)
+		settings.setValue(PNG_ANTIALIASING_SETTING, _pngExport.antialiasing);
+	if (_pngExport.fileName != PNG_FILENAME_DEFAULT)
+		settings.setValue(PNG_FILENAME_SETTING, _pngExport.fileName);
 	settings.endGroup();
 
 	settings.beginGroup(OPTIONS_SETTINGS_GROUP);
@@ -2078,23 +2179,42 @@ void GUI::readSettings()
 	}
 	settings.endGroup();
 
-	settings.beginGroup(EXPORT_SETTINGS_GROUP);
-	_export.orientation = (QPrinter::Orientation) settings.value(
+	settings.beginGroup(PDF_EXPORT_SETTINGS_GROUP);
+	_pdfExport.orientation = (QPrinter::Orientation) settings.value(
 	  PAPER_ORIENTATION_SETTING, PAPER_ORIENTATION_DEFAULT).toInt();
-	_export.resolution = settings.value(RESOLUTION_SETTING, RESOLUTION_DEFAULT)
+	_pdfExport.resolution = settings.value(RESOLUTION_SETTING,
+	  RESOLUTION_DEFAULT).toInt();
+	_pdfExport.paperSize = (QPrinter::PaperSize) settings.value(
+	  PAPER_SIZE_SETTING, PAPER_SIZE_DEFAULT).toInt();
+	qreal ml = settings.value(PDF_MARGIN_LEFT_SETTING, PDF_MARGIN_LEFT_DEFAULT)
+	  .toReal();
+	qreal mt = settings.value(PDF_MARGIN_TOP_SETTING, PDF_MARGIN_TOP_DEFAULT)
+	  .toReal();
+	qreal mr = settings.value(PDF_MARGIN_RIGHT_SETTING,
+	  PDF_MARGIN_RIGHT_DEFAULT).toReal();
+	qreal mb = settings.value(PDF_MARGIN_BOTTOM_SETTING,
+	  PDF_MARGIN_BOTTOM_DEFAULT).toReal();
+	_pdfExport.margins = MarginsF(ml, mt, mr, mb);
+	_pdfExport.fileName = settings.value(PDF_FILENAME_SETTING,
+	 PDF_FILENAME_DEFAULT).toString();
+	settings.endGroup();
+
+	settings.beginGroup(PNG_EXPORT_SETTINGS_GROUP);
+	_pngExport.size = QSize(settings.value(PNG_WIDTH_SETTING, PNG_WIDTH_DEFAULT)
+	  .toInt(), settings.value(PNG_HEIGHT_SETTING, PNG_HEIGHT_DEFAULT).toInt());
+	int mli = settings.value(PNG_MARGIN_LEFT_SETTING, PNG_MARGIN_LEFT_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();
+	int mti = settings.value(PNG_MARGIN_TOP_SETTING, PNG_MARGIN_TOP_DEFAULT)
+	  .toInt();
+	int mri = settings.value(PNG_MARGIN_RIGHT_SETTING, PNG_MARGIN_RIGHT_DEFAULT)
+	  .toInt();
+	int mbi = settings.value(PNG_MARGIN_BOTTOM_SETTING, PNG_MARGIN_BOTTOM_DEFAULT)
+	  .toInt();
+	_pngExport.margins = QMargins(mli, mti, mri, mbi);
+	_pngExport.antialiasing = settings.value(PNG_ANTIALIASING_SETTING,
+	  PNG_ANTIALIASING_DEFAULT).toBool();
+	_pngExport.fileName = settings.value(PNG_FILENAME_SETTING,
+	  PNG_FILENAME_DEFAULT).toString();
 	settings.endGroup();
 
 	settings.beginGroup(OPTIONS_SETTINGS_GROUP);

src/GUI/gui.h

@@ -10,7 +10,8 @@
 #include "units.h"
 #include "timetype.h"
 #include "format.h"
-#include "exportdialog.h"
+#include "pdfexportdialog.h"
+#include "pngexportdialog.h"
 #include "optionsdialog.h"
 
 class QMenu;
@@ -45,7 +46,8 @@ private slots:
 	void keys();
 	void paths();
 	void printFile();
-	void exportFile();
+	void exportPDFFile();
+	void exportPNGFile();
 	void openFile();
 	void closeAll();
 	void reloadFiles();
@@ -97,6 +99,10 @@ private:
 	void loadPOIs();
 	void closeFiles();
 	void plot(QPrinter *printer);
+	void plotMainPage(QPainter *painter, const QRectF &rect, qreal ratio,
+	  bool expand = false);
+	void plotGraphsPage(QPainter *painter, const QRectF &rect, qreal ratio);
+	qreal graphPlotHeight(const QRectF &rect, qreal ratio);
 
 	QAction *createPOIFileAction(const QString &fileName);
 	MapAction *createMapAction(Map *map);
@@ -113,7 +119,6 @@ private:
 	bool openPOIFile(const QString &fileName);
 	bool loadFile(const QString &fileName);
 	bool loadMap(const QString &fileName);
-	void exportFile(const QString &fileName);
 	void updateStatusBarInfo();
 	void updateWindowTitle();
 	void updateNavigationActions();
@@ -153,7 +158,8 @@ private:
 	QAction *_aboutAction;
 	QAction *_aboutQtAction;
 	QAction *_printFileAction;
-	QAction *_exportFileAction;
+	QAction *_exportPDFFileAction;
+	QAction *_exportPNGFileAction;
 	QAction *_openFileAction;
 	QAction *_closeFileAction;
 	QAction *_reloadFileAction;
@@ -228,10 +234,13 @@ private:
 	QList<QByteArray> _windowStates;
 	int _frameStyle;
 
-	Export _export;
+	PDFExport _pdfExport;
+	PNGExport _pngExport;
 	Options _options;
 
 	QString _dataDir, _mapDir, _poiDir;
+
+	Units _units;
 };
 
 #endif // GUI_H

src/GUI/keys.h

@@ -18,7 +18,8 @@
 #define OPEN_SHORTCUT           QKeySequence(QKeySequence::Open)
 #define CLOSE_SHORTCUT          QKeySequence(QKeySequence::Close)
 #define RELOAD_SHORTCUT         QKeySequence(QKeySequence::Refresh)
-#define EXPORT_SHORTCUT         QKeySequence(Qt::CTRL + Qt::Key_E)
+#define PDF_EXPORT_SHORTCUT     QKeySequence(Qt::CTRL + Qt::Key_E)
+#define PNG_EXPORT_SHORTCUT     QKeySequence(Qt::CTRL + Qt::Key_X)
 #define SHOW_POI_SHORTCUT       QKeySequence(Qt::CTRL + Qt::Key_P)
 #define SHOW_MAP_SHORTCUT       QKeySequence(Qt::CTRL + Qt::Key_M)
 #define NEXT_MAP_SHORTCUT       QKeySequence(QKeySequence::Forward)

src/GUI/mapview.cpp

@@ -531,7 +531,7 @@ void MapView::keyPressEvent(QKeyEvent *event)
 }
 
 void MapView::plot(QPainter *painter, const QRectF &target, qreal scale,
-  bool hires)
+  PlotFlags flags)
 {
 	QRect orig, adj;
 	qreal ratio, diff, q;
@@ -559,10 +559,18 @@ void MapView::plot(QPainter *painter, const QRectF &target, qreal scale,
 		diff = (orig.height() * ratio) - orig.width();
 		adj = orig.adjusted(-diff/2, 0, diff/2, 0);
 	}
-	q = (target.width() / scale) / adj.width();
+
+	// Expand the view if plotting into a bitmap
+	if (flags & Expand) {
+		qreal xdiff = (target.width() - adj.width()) / 2.0;
+		qreal ydiff = (target.height() - adj.height()) / 2.0;
+		adj.adjust(-xdiff, -ydiff, xdiff, ydiff);
+		q = 1.0;
+	} else
+		q = (target.width() / scale) / adj.width();
 
 	// Adjust the view for printing
-	if (hires) {
+	if (flags & HiRes) {
 		zoom = _map->zoom();
 		QRectF vr(mapToScene(orig).boundingRect());
 		origScene = vr.center();
@@ -594,7 +602,7 @@ void MapView::plot(QPainter *painter, const QRectF &target, qreal scale,
 	render(painter, target, adj);
 
 	// Revert view changes to display mode
-	if (hires) {
+	if (flags & HiRes) {
 		_map->setZoom(zoom);
 		rescale();
 		centerOn(origScene);

src/GUI/mapview.h

@@ -5,6 +5,7 @@
 #include <QVector>
 #include <QHash>
 #include <QList>
+#include <QFlags>
 #include "common/rectc.h"
 #include "common/config.h"
 #include "data/waypoint.h"
@@ -38,6 +39,13 @@ class MapView : public QGraphicsView
 	Q_OBJECT
 
 public:
+	enum Flag {
+		NoFlags = 0,
+		HiRes = 1,
+		Expand = 2
+	};
+	Q_DECLARE_FLAGS(PlotFlags, Flag)
+
 	MapView(Map *map, POI *poi, QWidget *parent = 0);
 
 	QList<PathItem *> loadData(const Data &data);
@@ -46,7 +54,8 @@ public:
 	void setPOI(POI *poi);
 	void setMap(Map *map);
 
-	void plot(QPainter *painter, const QRectF &target, qreal scale, bool hires);
+	void plot(QPainter *painter, const QRectF &target, qreal scale,
+	  PlotFlags flags);
 
 	void clear();
 

src/GUI/margins.h

@@ -16,15 +16,22 @@ public:
 	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;
 };
 
+inline MarginsF operator*(const MarginsF &margins, qreal factor)
+{
+	return MarginsF(margins.left() * factor, margins.top() * factor,
+	  margins.right() * factor, margins.bottom() * factor);
+}
+
+inline MarginsF operator/(const MarginsF &margins, qreal factor)
+{
+	return MarginsF(margins.left() / factor, margins.top() / factor,
+	  margins.right() / factor, margins.bottom() / factor);
+}
+
 #ifndef QT_NO_DEBUG
 inline QDebug operator<<(QDebug dbg, const MarginsF &margins)
 {

src/GUI/marginswidget.cpp

@@ -0,0 +1,111 @@
+#include <QSpinBox>
+#include <QGridLayout>
+#include "units.h"
+#include "marginswidget.h"
+
+MarginsWidget::MarginsWidget(QWidget *parent) : QWidget(parent)
+{
+	_top = new QSpinBox();
+	_bottom = new QSpinBox();
+	_left = new QSpinBox();
+	_right = new QSpinBox();
+
+	_top->setMaximumWidth(_top->sizeHint().width());
+	_bottom->setMaximumWidth(_bottom->sizeHint().width());
+	_left->setMaximumWidth(_left->sizeHint().width());
+	_right->setMaximumWidth(_right->sizeHint().width());
+
+	QGridLayout *layout = new QGridLayout();
+	layout->addWidget(_top, 0, 0, 1, 2, Qt::AlignCenter);
+	layout->addWidget(_left, 1, 0, 1, 1, Qt::AlignRight);
+	layout->addWidget(_right, 1, 1, 1, 1, Qt::AlignLeft);
+	layout->addWidget(_bottom, 2, 0, 1, 2, Qt::AlignCenter);
+
+	setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+	setLayout(layout);
+}
+
+void MarginsWidget::setValue(const QMargins &value)
+{
+	_top->setValue(value.top());
+	_bottom->setValue(value.bottom());
+	_left->setValue(value.left());
+	_right->setValue(value.right());
+}
+
+void MarginsWidget::setUnits(const QString &units)
+{
+	_top->setSuffix(UNIT_SPACE + units);
+	_bottom->setSuffix(UNIT_SPACE + units);
+	_left->setSuffix(UNIT_SPACE + units);
+	_right->setSuffix(UNIT_SPACE + units);
+
+	_top->setMaximumWidth(_top->sizeHint().width());
+	_bottom->setMaximumWidth(_bottom->sizeHint().width());
+	_left->setMaximumWidth(_left->sizeHint().width());
+	_right->setMaximumWidth(_right->sizeHint().width());
+}
+
+QMargins MarginsWidget::value() const
+{
+	return QMargins(_left->value(), _top->value(), _right->value(),
+	  _bottom->value());
+}
+
+
+MarginsFWidget::MarginsFWidget(QWidget *parent) : QWidget(parent)
+{
+	_top = new QDoubleSpinBox();
+	_bottom = new QDoubleSpinBox();
+	_left = new QDoubleSpinBox();
+	_right = new QDoubleSpinBox();
+
+	_top->setMaximumWidth(_top->sizeHint().width());
+	_bottom->setMaximumWidth(_bottom->sizeHint().width());
+	_left->setMaximumWidth(_left->sizeHint().width());
+	_right->setMaximumWidth(_right->sizeHint().width());
+
+	QGridLayout *layout = new QGridLayout();
+	layout->addWidget(_top, 0, 0, 1, 2, Qt::AlignCenter);
+	layout->addWidget(_left, 1, 0, 1, 1, Qt::AlignRight);
+	layout->addWidget(_right, 1, 1, 1, 1, Qt::AlignLeft);
+	layout->addWidget(_bottom, 2, 0, 1, 2, Qt::AlignCenter);
+
+	setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+	setLayout(layout);
+}
+
+void MarginsFWidget::setValue(const MarginsF &value)
+{
+	_top->setValue(value.top());
+	_bottom->setValue(value.bottom());
+	_left->setValue(value.left());
+	_right->setValue(value.right());
+}
+
+void MarginsFWidget::setUnits(const QString &units)
+{
+	_top->setSuffix(UNIT_SPACE + units);
+	_bottom->setSuffix(UNIT_SPACE + units);
+	_left->setSuffix(UNIT_SPACE + units);
+	_right->setSuffix(UNIT_SPACE + units);
+
+	_top->setMaximumWidth(_top->sizeHint().width());
+	_bottom->setMaximumWidth(_bottom->sizeHint().width());
+	_left->setMaximumWidth(_left->sizeHint().width());
+	_right->setMaximumWidth(_right->sizeHint().width());
+}
+
+void MarginsFWidget::setSingleStep(qreal step)
+{
+	_top->setSingleStep(step);
+	_bottom->setSingleStep(step);
+	_left->setSingleStep(step);
+	_right->setSingleStep(step);
+}
+
+MarginsF MarginsFWidget::value() const
+{
+	return MarginsF(_left->value(), _top->value(), _right->value(),
+	  _bottom->value());
+}

src/GUI/marginswidget.h

@@ -0,0 +1,48 @@
+#ifndef MARGINSWIDGET_H
+#define MARGINSWIDGET_H
+
+#include <QWidget>
+#include <QMargins>
+#include "margins.h"
+
+class QSpinBox;
+class QDoubleSpinBox;
+
+class MarginsWidget : public QWidget
+{
+	Q_OBJECT
+
+public:
+	MarginsWidget(QWidget *parent = 0);
+
+	QMargins value() const;
+	void setValue(const QMargins &value);
+	void setUnits(const QString &units);
+
+private:
+	QSpinBox *_top;
+	QSpinBox *_bottom;
+	QSpinBox *_left;
+	QSpinBox *_right;
+};
+
+class MarginsFWidget : public QWidget
+{
+	Q_OBJECT
+
+public:
+	MarginsFWidget(QWidget *parent = 0);
+
+	MarginsF value() const;
+	void setValue(const MarginsF &value);
+	void setUnits(const QString &units);
+	void setSingleStep(qreal step);
+
+private:
+	QDoubleSpinBox *_top;
+	QDoubleSpinBox *_bottom;
+	QDoubleSpinBox *_left;
+	QDoubleSpinBox *_right;
+};
+
+#endif // MARGINSWIDGET_H

src/GUI/optionsdialog.cpp

@@ -56,12 +56,12 @@ QWidget *OptionsDialog::createMapPage()
 		  + projections.at(i).value();
 		_projection->addItem(text, QVariant(projections.at(i).key()));
 	}
-	_projection->setCurrentIndex(_projection->findData(_options->projection));
+	_projection->setCurrentIndex(_projection->findData(_options.projection));
 
 #ifdef ENABLE_HIDPI
 	_hidpi = new QRadioButton(tr("High-resolution"));
 	_lodpi = new QRadioButton(tr("Standard"));
-	if (_options->hidpiMap)
+	if (_options.hidpiMap)
 		_hidpi->setChecked(true);
 	else
 		_lodpi->setChecked(true);
@@ -112,10 +112,10 @@ QWidget *OptionsDialog::createAppearancePage()
 {
 	// Tracks
 	_trackWidth = new QSpinBox();
-	_trackWidth->setValue(_options->trackWidth);
+	_trackWidth->setValue(_options.trackWidth);
 	_trackWidth->setMinimum(1);
 	_trackStyle = new StyleComboBox();
-	_trackStyle->setValue(_options->trackStyle);
+	_trackStyle->setValue(_options.trackStyle);
 	QFormLayout *trackLayout = new QFormLayout();
 #ifdef Q_OS_MAC
 	trackLayout->addRow(tr("Track width:"), _trackWidth);
@@ -129,10 +129,10 @@ QWidget *OptionsDialog::createAppearancePage()
 
 	// Routes
 	_routeWidth = new QSpinBox();
-	_routeWidth->setValue(_options->routeWidth);
+	_routeWidth->setValue(_options.routeWidth);
 	_routeWidth->setMinimum(1);
 	_routeStyle = new StyleComboBox();
-	_routeStyle->setValue(_options->routeStyle);
+	_routeStyle->setValue(_options.routeStyle);
 	QFormLayout *routeLayout = new QFormLayout();
 #ifdef Q_OS_MAC
 	routeLayout->addRow(tr("Route width:"), _routeWidth);
@@ -146,11 +146,11 @@ QWidget *OptionsDialog::createAppearancePage()
 
 	// Areas
 	_areaWidth = new QSpinBox();
-	_areaWidth->setValue(_options->areaWidth);
+	_areaWidth->setValue(_options.areaWidth);
 	_areaStyle = new StyleComboBox();
-	_areaStyle->setValue(_options->areaStyle);
+	_areaStyle->setValue(_options.areaStyle);
 	_areaOpacity = new PercentSlider();
-	_areaOpacity->setValue(_options->areaOpacity);
+	_areaOpacity->setValue(_options.areaOpacity);
 	QFormLayout *areaLayout = new QFormLayout();
 #ifdef Q_OS_MAC
 	areaLayout->addRow(tr("Area border width:"), _areaWidth);
@@ -166,15 +166,15 @@ QWidget *OptionsDialog::createAppearancePage()
 
 	// Palette & antialiasing
 	_baseColor = new ColorBox();
-	_baseColor->setColor(_options->palette.color());
+	_baseColor->setColor(_options.palette.color());
 	_colorOffset = new PercentSlider();
-	_colorOffset->setValue(_options->palette.shift() * 100);
+	_colorOffset->setValue(_options.palette.shift() * 100);
 	QFormLayout *paletteLayout = new QFormLayout();
 	paletteLayout->addRow(tr("Base color:"), _baseColor);
 	paletteLayout->addRow(tr("Palette shift:"), _colorOffset);
 
 	_pathAA = new QCheckBox(tr("Use anti-aliasing"));
-	_pathAA->setChecked(_options->pathAntiAliasing);
+	_pathAA->setChecked(_options.pathAntiAliasing);
 	QFormLayout *pathAALayout = new QFormLayout();
 	pathAALayout->addWidget(_pathAA);
 
@@ -201,9 +201,9 @@ QWidget *OptionsDialog::createAppearancePage()
 	// Waypoints
 	_waypointSize = new QSpinBox();
 	_waypointSize->setMinimum(1);
-	_waypointSize->setValue(_options->waypointSize);
+	_waypointSize->setValue(_options.waypointSize);
 	_waypointColor = new ColorBox();
-	_waypointColor->setColor(_options->waypointColor);
+	_waypointColor->setColor(_options.waypointColor);
 	QFormLayout *waypointLayout = new QFormLayout();
 #ifdef Q_OS_MAC
 	waypointLayout->addRow(tr("Waypoint color:"), _waypointColor);
@@ -217,9 +217,9 @@ QWidget *OptionsDialog::createAppearancePage()
 
 	_poiSize = new QSpinBox();
 	_poiSize->setMinimum(1);
-	_poiSize->setValue(_options->poiSize);
+	_poiSize->setValue(_options.poiSize);
 	_poiColor = new ColorBox();
-	_poiColor->setColor(_options->poiColor);
+	_poiColor->setColor(_options.poiColor);
 	QFormLayout *poiLayout = new QFormLayout();
 #ifdef Q_OS_MAC
 	poiLayout->addRow(tr("POI color:"), _poiColor);
@@ -247,9 +247,9 @@ QWidget *OptionsDialog::createAppearancePage()
 
 	// Graphs
 	_sliderColor = new ColorBox();
-	_sliderColor->setColor(_options->sliderColor);
+	_sliderColor->setColor(_options.sliderColor);
 	_graphWidth = new QSpinBox();
-	_graphWidth->setValue(_options->graphWidth);
+	_graphWidth->setValue(_options.graphWidth);
 	_graphWidth->setMinimum(1);
 
 	QFormLayout *graphLayout = new QFormLayout();
@@ -257,7 +257,7 @@ QWidget *OptionsDialog::createAppearancePage()
 	graphLayout->addRow(tr("Slider color:"), _sliderColor);
 
 	_graphAA = new QCheckBox(tr("Use anti-aliasing"));
-	_graphAA->setChecked(_options->graphAntiAliasing);
+	_graphAA->setChecked(_options.graphAntiAliasing);
 	QFormLayout *graphAALayout = new QFormLayout();
 	graphAALayout->addWidget(_graphAA);
 
@@ -271,9 +271,9 @@ QWidget *OptionsDialog::createAppearancePage()
 
 	// Map
 	_mapOpacity = new PercentSlider();
-	_mapOpacity->setValue(_options->mapOpacity);
+	_mapOpacity->setValue(_options.mapOpacity);
 	_backgroundColor = new ColorBox();
-	_backgroundColor->setColor(_options->backgroundColor);
+	_backgroundColor->setColor(_options.backgroundColor);
 	_backgroundColor->enableAlphaChannel(false);
 
 	QFormLayout *mapLayout = new QFormLayout();
@@ -301,19 +301,19 @@ QWidget *OptionsDialog::createDataPage()
 	QString filterToolTip = tr("Moving average window size");
 
 	_elevationFilter = new OddSpinBox();
-	_elevationFilter->setValue(_options->elevationFilter);
+	_elevationFilter->setValue(_options.elevationFilter);
 	_elevationFilter->setToolTip(filterToolTip);
 	_speedFilter = new OddSpinBox();
-	_speedFilter->setValue(_options->speedFilter);
+	_speedFilter->setValue(_options.speedFilter);
 	_speedFilter->setToolTip(filterToolTip);
 	_heartRateFilter = new OddSpinBox();
-	_heartRateFilter->setValue(_options->heartRateFilter);
+	_heartRateFilter->setValue(_options.heartRateFilter);
 	_heartRateFilter->setToolTip(filterToolTip);
 	_cadenceFilter = new OddSpinBox();
-	_cadenceFilter->setValue(_options->cadenceFilter);
+	_cadenceFilter->setValue(_options.cadenceFilter);
 	_cadenceFilter->setToolTip(filterToolTip);
 	_powerFilter = new OddSpinBox();
-	_powerFilter->setValue(_options->powerFilter);
+	_powerFilter->setValue(_options.powerFilter);
 	_powerFilter->setToolTip(filterToolTip);
 
 	QFormLayout *smoothLayout = new QFormLayout();
@@ -328,7 +328,7 @@ QWidget *OptionsDialog::createDataPage()
 #endif // Q_OS_MAC
 
 	_outlierEliminate = new QCheckBox(tr("Eliminate GPS outliers"));
-	_outlierEliminate->setChecked(_options->outlierEliminate);
+	_outlierEliminate->setChecked(_options.outlierEliminate);
 
 	QFormLayout *outlierLayout = new QFormLayout();
 	outlierLayout->addWidget(_outlierEliminate);
@@ -349,7 +349,7 @@ QWidget *OptionsDialog::createDataPage()
 
 	_automaticPause = new QRadioButton(tr("Automatic"));
 	_manualPause = new QRadioButton(tr("Custom"));
-	if (_options->automaticPause)
+	if (_options.automaticPause)
 		_automaticPause->setChecked(true);
 	else
 		_manualPause->setChecked(true);
@@ -359,20 +359,20 @@ QWidget *OptionsDialog::createDataPage()
 	_pauseSpeed->setSingleStep(0.1);
 	_pauseSpeed->setMinimum(0.1);
 	_pauseSpeed->setEnabled(_manualPause->isChecked());
-	if (_options->units == Imperial) {
-		_pauseSpeed->setValue(_options->pauseSpeed * MS2MIH);
+	if (_units == Imperial) {
+		_pauseSpeed->setValue(_options.pauseSpeed * MS2MIH);
 		_pauseSpeed->setSuffix(UNIT_SPACE + tr("mi/h"));
-	} else if (_options->units == Nautical) {
-		_pauseSpeed->setValue(_options->pauseSpeed * MS2KN);
+	} else if (_units == Nautical) {
+		_pauseSpeed->setValue(_options.pauseSpeed * MS2KN);
 		_pauseSpeed->setSuffix(UNIT_SPACE + tr("kn"));
 	} else {
-		_pauseSpeed->setValue(_options->pauseSpeed * MS2KMH);
+		_pauseSpeed->setValue(_options.pauseSpeed * MS2KMH);
 		_pauseSpeed->setSuffix(UNIT_SPACE + tr("km/h"));
 	}
 	_pauseInterval = new QSpinBox();
 	_pauseInterval->setMinimum(1);
 	_pauseInterval->setSuffix(UNIT_SPACE + tr("s"));
-	_pauseInterval->setValue(_options->pauseInterval);
+	_pauseInterval->setValue(_options.pauseInterval);
 	_pauseInterval->setEnabled(_manualPause->isChecked());
 
 	connect(_automaticPause, SIGNAL(toggled(bool)), this,
@@ -400,29 +400,29 @@ QWidget *OptionsDialog::createDataPage()
 
 	_computedSpeed = new QRadioButton(tr("Computed from distance/time"));
 	_reportedSpeed = new QRadioButton(tr("Recorded by device"));
-	if (_options->useReportedSpeed)
+	if (_options.useReportedSpeed)
 		_reportedSpeed->setChecked(true);
 	else
 		_computedSpeed->setChecked(true);
 	_showSecondarySpeed = new QCheckBox(tr("Show secondary speed"));
-	_showSecondarySpeed->setChecked(_options->showSecondarySpeed);
+	_showSecondarySpeed->setChecked(_options.showSecondarySpeed);
 
 	_dataGPSElevation = new QRadioButton(tr("GPS data"));
 	_dataDEMElevation = new QRadioButton(tr("DEM data"));
-	if (_options->dataUseDEM)
+	if (_options.dataUseDEM)
 		_dataDEMElevation->setChecked(true);
 	else
 		_dataGPSElevation->setChecked(true);
 	_showSecondaryElevation = new QCheckBox(tr("Show secondary elevation"));
-	_showSecondaryElevation->setChecked(_options->showSecondaryElevation);
+	_showSecondaryElevation->setChecked(_options.showSecondaryElevation);
 
 #ifdef ENABLE_TIMEZONES
 	_utcZone = new QRadioButton(tr("UTC"));
 	_systemZone = new QRadioButton(tr("System"));
 	_customZone = new QRadioButton(tr("Custom"));
-	if (_options->timeZone.type() == TimeZoneInfo::UTC)
+	if (_options.timeZone.type() == TimeZoneInfo::UTC)
 		_utcZone->setChecked(true);
-	else if (_options->timeZone.type() == TimeZoneInfo::System)
+	else if (_options.timeZone.type() == TimeZoneInfo::System)
 		_systemZone->setChecked(true);
 	else
 		_customZone->setChecked(true);
@@ -431,7 +431,7 @@ QWidget *OptionsDialog::createDataPage()
 	QList<QByteArray> zones = QTimeZone::availableTimeZoneIds();
 	for (int i = 0; i < zones.size(); i++)
 		_timeZone->addItem(zones.at(i));
-	_timeZone->setCurrentText(_options->timeZone.customZone().id());
+	_timeZone->setCurrentText(_options.timeZone.customZone().id());
 	connect(_customZone, SIGNAL(toggled(bool)), _timeZone,
 	  SLOT(setEnabled(bool)));
 	QHBoxLayout *customZoneLayout = new QHBoxLayout();
@@ -440,7 +440,7 @@ QWidget *OptionsDialog::createDataPage()
 #endif // ENABLE_TIMEZONES
 
 	_useSegments = new QCheckBox(tr("Use segments"));
-	_useSegments->setChecked(_options->useSegments);
+	_useSegments->setChecked(_options.useSegments);
 
 	QWidget *sourceTab = new QWidget();
 	QVBoxLayout *sourceTabLayout = new QVBoxLayout();
@@ -541,14 +541,14 @@ QWidget *OptionsDialog::createPOIPage()
 	_poiRadius = new QDoubleSpinBox();
 	_poiRadius->setSingleStep(1);
 	_poiRadius->setDecimals(1);
-	if (_options->units == Imperial) {
-		_poiRadius->setValue(_options->poiRadius / MIINM);
+	if (_units == Imperial) {
+		_poiRadius->setValue(_options.poiRadius / MIINM);
 		_poiRadius->setSuffix(UNIT_SPACE + tr("mi"));
-	} else if (_options->units == Nautical) {
-		_poiRadius->setValue(_options->poiRadius / NMIINM);
+	} else if (_units == Nautical) {
+		_poiRadius->setValue(_options.poiRadius / NMIINM);
 		_poiRadius->setSuffix(UNIT_SPACE + tr("nmi"));
 	} else {
-		_poiRadius->setValue(_options->poiRadius / KMINM);
+		_poiRadius->setValue(_options.poiRadius / KMINM);
 		_poiRadius->setSuffix(UNIT_SPACE + tr("km"));
 	}
 
@@ -568,7 +568,7 @@ QWidget *OptionsDialog::createExportPage()
 {
 	_wysiwyg = new QRadioButton(tr("WYSIWYG"));
 	_hires = new QRadioButton(tr("High-Resolution"));
-	if (_options->hiresPrint)
+	if (_options.hiresPrint)
 		_hires->setChecked(true);
 	else
 		_wysiwyg->setChecked(true);
@@ -597,17 +597,17 @@ QWidget *OptionsDialog::createExportPage()
 
 
 	_name = new QCheckBox(tr("Name"));
-	_name->setChecked(_options->printName);
+	_name->setChecked(_options.printName);
 	_date = new QCheckBox(tr("Date"));
-	_date->setChecked(_options->printDate);
+	_date->setChecked(_options.printDate);
 	_distance = new QCheckBox(tr("Distance"));
-	_distance->setChecked(_options->printDistance);
+	_distance->setChecked(_options.printDistance);
 	_time = new QCheckBox(tr("Time"));
-	_time->setChecked(_options->printTime);
+	_time->setChecked(_options.printTime);
 	_movingTime = new QCheckBox(tr("Moving time"));
-	_movingTime->setChecked(_options->printMovingTime);
+	_movingTime->setChecked(_options.printMovingTime);
 	_itemCount = new QCheckBox(tr("Item count (>1)"));
-	_itemCount->setChecked(_options->printItemCount);
+	_itemCount->setChecked(_options.printItemCount);
 
 	QFormLayout *headerTabLayout = new QFormLayout();
 	headerTabLayout->addWidget(_name);
@@ -622,7 +622,7 @@ QWidget *OptionsDialog::createExportPage()
 
 
 	_separateGraphPage = new QCheckBox(tr("Separate graph page"));
-	_separateGraphPage->setChecked(_options->separateGraphPage);
+	_separateGraphPage->setChecked(_options.separateGraphPage);
 
 	QFormLayout *graphTabLayout = new QFormLayout();
 	graphTabLayout->addWidget(_separateGraphPage);
@@ -641,23 +641,23 @@ QWidget *OptionsDialog::createExportPage()
 QWidget *OptionsDialog::createSystemPage()
 {
 	_useOpenGL = new QCheckBox(tr("Use OpenGL"));
-	_useOpenGL->setChecked(_options->useOpenGL);
+	_useOpenGL->setChecked(_options.useOpenGL);
 #ifdef ENABLE_HTTP2
 	_enableHTTP2 = new QCheckBox(tr("Enable HTTP/2"));
-	_enableHTTP2->setChecked(_options->enableHTTP2);
+	_enableHTTP2->setChecked(_options.enableHTTP2);
 #endif // ENABLE_HTTP2
 
 	_pixmapCache = new QSpinBox();
 	_pixmapCache->setMinimum(16);
 	_pixmapCache->setMaximum(1024);
 	_pixmapCache->setSuffix(UNIT_SPACE + tr("MB"));
-	_pixmapCache->setValue(_options->pixmapCache);
+	_pixmapCache->setValue(_options.pixmapCache);
 
 	_connectionTimeout = new QSpinBox();
 	_connectionTimeout->setMinimum(30);
 	_connectionTimeout->setMaximum(120);
 	_connectionTimeout->setSuffix(UNIT_SPACE + tr("s"));
-	_connectionTimeout->setValue(_options->connectionTimeout);
+	_connectionTimeout->setValue(_options.connectionTimeout);
 
 	QFormLayout *formLayout = new QFormLayout();
 	formLayout->addRow(tr("Image cache size:"), _pixmapCache);
@@ -682,8 +682,8 @@ QWidget *OptionsDialog::createSystemPage()
 	return systemPage;
 }
 
-OptionsDialog::OptionsDialog(Options *options, QWidget *parent)
-  : QDialog(parent), _options(options)
+OptionsDialog::OptionsDialog(Options &options, Units units, QWidget *parent)
+  : QDialog(parent), _options(options), _units(units)
 {
 	QStackedWidget *pages = new QStackedWidget();
 	pages->addWidget(createAppearancePage());
@@ -735,82 +735,82 @@ OptionsDialog::OptionsDialog(Options *options, QWidget *parent)
 
 void OptionsDialog::accept()
 {
-	_options->palette.setColor(_baseColor->color());
-	_options->palette.setShift(_colorOffset->value() / 100.0);
-	_options->mapOpacity = _mapOpacity->value();
-	_options->backgroundColor = _backgroundColor->color();
-	_options->trackWidth = _trackWidth->value();
-	_options->trackStyle = (Qt::PenStyle) _trackStyle->itemData(
+	_options.palette.setColor(_baseColor->color());
+	_options.palette.setShift(_colorOffset->value() / 100.0);
+	_options.mapOpacity = _mapOpacity->value();
+	_options.backgroundColor = _backgroundColor->color();
+	_options.trackWidth = _trackWidth->value();
+	_options.trackStyle = (Qt::PenStyle) _trackStyle->itemData(
 	  _trackStyle->currentIndex()).toInt();
-	_options->routeWidth = _routeWidth->value();
-	_options->routeStyle = (Qt::PenStyle) _routeStyle->itemData(
+	_options.routeWidth = _routeWidth->value();
+	_options.routeStyle = (Qt::PenStyle) _routeStyle->itemData(
 	  _routeStyle->currentIndex()).toInt();
-	_options->pathAntiAliasing = _pathAA->isChecked();
-	_options->areaWidth = _areaWidth->value();
-	_options->areaStyle = (Qt::PenStyle) _areaStyle->itemData(
+	_options.pathAntiAliasing = _pathAA->isChecked();
+	_options.areaWidth = _areaWidth->value();
+	_options.areaStyle = (Qt::PenStyle) _areaStyle->itemData(
 	  _areaStyle->currentIndex()).toInt();
-	_options->areaOpacity = _areaOpacity->value();
-	_options->waypointSize = _waypointSize->value();
-	_options->waypointColor = _waypointColor->color();
-	_options->poiSize = _poiSize->value();
-	_options->poiColor = _poiColor->color();
-	_options->graphWidth = _graphWidth->value();
-	_options->sliderColor = _sliderColor->color();
-	_options->graphAntiAliasing = _graphAA->isChecked();
+	_options.areaOpacity = _areaOpacity->value();
+	_options.waypointSize = _waypointSize->value();
+	_options.waypointColor = _waypointColor->color();
+	_options.poiSize = _poiSize->value();
+	_options.poiColor = _poiColor->color();
+	_options.graphWidth = _graphWidth->value();
+	_options.sliderColor = _sliderColor->color();
+	_options.graphAntiAliasing = _graphAA->isChecked();
 
-	_options->projection = _projection->itemData(_projection->currentIndex())
+	_options.projection = _projection->itemData(_projection->currentIndex())
 	  .toInt();
 #ifdef ENABLE_HIDPI
-	_options->hidpiMap = _hidpi->isChecked();
+	_options.hidpiMap = _hidpi->isChecked();
 #endif // ENABLE_HIDPI
 
-	_options->elevationFilter = _elevationFilter->value();
-	_options->speedFilter = _speedFilter->value();
-	_options->heartRateFilter = _heartRateFilter->value();
-	_options->cadenceFilter = _cadenceFilter->value();
-	_options->powerFilter = _powerFilter->value();
-	_options->outlierEliminate = _outlierEliminate->isChecked();
-	_options->automaticPause = _automaticPause->isChecked();
-	qreal pauseSpeed = (_options->units == Imperial)
-		? _pauseSpeed->value() / MS2MIH : (_options->units == Nautical)
+	_options.elevationFilter = _elevationFilter->value();
+	_options.speedFilter = _speedFilter->value();
+	_options.heartRateFilter = _heartRateFilter->value();
+	_options.cadenceFilter = _cadenceFilter->value();
+	_options.powerFilter = _powerFilter->value();
+	_options.outlierEliminate = _outlierEliminate->isChecked();
+	_options.automaticPause = _automaticPause->isChecked();
+	qreal pauseSpeed = (_units == Imperial)
+		? _pauseSpeed->value() / MS2MIH : (_units == Nautical)
 		? _pauseSpeed->value() / MS2KN : _pauseSpeed->value() / MS2KMH;
-	if (qAbs(pauseSpeed - _options->pauseSpeed) > 0.01)
-		_options->pauseSpeed = pauseSpeed;
-	_options->pauseInterval = _pauseInterval->value();
-	_options->useReportedSpeed = _reportedSpeed->isChecked();
-	_options->dataUseDEM = _dataDEMElevation->isChecked();
-	_options->showSecondaryElevation = _showSecondaryElevation->isChecked();
-	_options->showSecondarySpeed = _showSecondarySpeed->isChecked();
+	if (qAbs(pauseSpeed - _options.pauseSpeed) > 0.01)
+		_options.pauseSpeed = pauseSpeed;
+	_options.pauseInterval = _pauseInterval->value();
+	_options.useReportedSpeed = _reportedSpeed->isChecked();
+	_options.dataUseDEM = _dataDEMElevation->isChecked();
+	_options.showSecondaryElevation = _showSecondaryElevation->isChecked();
+	_options.showSecondarySpeed = _showSecondarySpeed->isChecked();
 #ifdef ENABLE_TIMEZONES
-	_options->timeZone.setType(_utcZone->isChecked()
+	_options.timeZone.setType(_utcZone->isChecked()
 	  ? TimeZoneInfo::UTC : _systemZone->isChecked()
 	  ? TimeZoneInfo::System : TimeZoneInfo::Custom);
-	_options->timeZone.setCustomZone(QTimeZone(_timeZone->currentText()
+	_options.timeZone.setCustomZone(QTimeZone(_timeZone->currentText()
 	  .toLatin1()));
 #endif // ENABLE_TIMEZONES
-	_options->useSegments = _useSegments->isChecked();
+	_options.useSegments = _useSegments->isChecked();
 
-	qreal poiRadius = (_options->units == Imperial)
-		? _poiRadius->value() * MIINM : (_options->units == Nautical)
+	qreal poiRadius = (_units == Imperial)
+		? _poiRadius->value() * MIINM : (_units == Nautical)
 		? _poiRadius->value() * NMIINM : _poiRadius->value() * KMINM;
-	if (qAbs(poiRadius - _options->poiRadius) > 0.01)
-		_options->poiRadius = poiRadius;
+	if (qAbs(poiRadius - _options.poiRadius) > 0.01)
+		_options.poiRadius = poiRadius;
 
-	_options->useOpenGL = _useOpenGL->isChecked();
+	_options.useOpenGL = _useOpenGL->isChecked();
 #ifdef ENABLE_HTTP2
-	_options->enableHTTP2 = _enableHTTP2->isChecked();
+	_options.enableHTTP2 = _enableHTTP2->isChecked();
 #endif // ENABLE_HTTP2
-	_options->pixmapCache = _pixmapCache->value();
-	_options->connectionTimeout = _connectionTimeout->value();
+	_options.pixmapCache = _pixmapCache->value();
+	_options.connectionTimeout = _connectionTimeout->value();
 
-	_options->hiresPrint = _hires->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();
+	_options.hiresPrint = _hires->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();
 }

src/GUI/optionsdialog.h

@@ -82,8 +82,6 @@ struct Options {
 	bool printMovingTime;
 	bool printItemCount;
 	bool separateGraphPage;
-
-	Units units;
 };
 
 class OptionsDialog : public QDialog
@@ -94,7 +92,7 @@ public slots:
 	void accept();
 
 public:
-	OptionsDialog(Options *options, QWidget *parent = 0);
+	OptionsDialog(Options &options, Units units, QWidget *parent = 0);
 
 private slots:
 	void automaticPauseDetectionSet(bool set);
@@ -107,8 +105,9 @@ private:
 	QWidget *createSystemPage();
 	QWidget *createExportPage();
 
-	Options *_options;
+	Options &_options;
 
+	Units _units;
 	// Appearance
 	ColorBox *_baseColor;
 	PercentSlider *_colorOffset;

src/GUI/pdfexportdialog.cpp

@@ -1,30 +1,27 @@
 #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 "marginswidget.h"
 #include "fileselectwidget.h"
 #include "units.h"
-#include "exportdialog.h"
+#include "pdfexportdialog.h"
 
 
-ExportDialog::ExportDialog(Export *exp, QWidget *parent)
-  : QDialog(parent), _export(exp)
+PDFExportDialog::PDFExportDialog(PDFExport &exp, Units units, QWidget *parent)
+  : QDialog(parent), _export(exp), _units(units)
 {
 	int index;
 
 	_fileSelect = new FileSelectWidget();
 	_fileSelect->setFilter(tr("PDF files") + " (*.pdf);;" + tr("All files")
 	  + " (*)");
-	_fileSelect->setFile(_export->fileName);
+	_fileSelect->setFile(_export.fileName);
 
 	_paperSize = new QComboBox();
 	_paperSize->addItem("A2", QPrinter::A2);
@@ -39,14 +36,14 @@ ExportDialog::ExportDialog(Export *exp, QWidget *parent)
 	_paperSize->addItem("Tabloid", QPrinter::Tabloid);
 	_paperSize->addItem("Legal", QPrinter::Legal);
 	_paperSize->addItem("Letter", QPrinter::Letter);
-	if ((index = _paperSize->findData(_export->paperSize)) >= 0)
+	if ((index = _paperSize->findData(_export.paperSize)) >= 0)
 		_paperSize->setCurrentIndex(index);
 
 	_resolution = new QComboBox();
 	_resolution->addItem("150 DPI", 150);
 	_resolution->addItem("300 DPI", 300);
 	_resolution->addItem("600 DPI", 600);
-	if ((index = _resolution->findData(_export->resolution)) >= 0)
+	if ((index = _resolution->findData(_export.resolution)) >= 0)
 		_resolution->setCurrentIndex(index);
 
 	_portrait = new QRadioButton(tr("Portrait"));
@@ -54,41 +51,16 @@ ExportDialog::ExportDialog(Export *exp, QWidget *parent)
 	QHBoxLayout *orientationLayout = new QHBoxLayout();
 	orientationLayout->addWidget(_portrait);
 	orientationLayout->addWidget(_landscape);
-	if (_export->orientation == QPrinter::Portrait)
+	if (_export.orientation == QPrinter::Portrait)
 		_portrait->setChecked(true);
 	else
 		_landscape->setChecked(true);
 
-	_topMargin = new QDoubleSpinBox();
-	_bottomMargin = new QDoubleSpinBox();
-	_leftMargin = new QDoubleSpinBox();
-	_rightMargin = new QDoubleSpinBox();
-	QString us = (_export->units == Metric) ? tr("mm") : tr("in");
-	_topMargin->setSuffix(UNIT_SPACE + us);
-	_bottomMargin->setSuffix(UNIT_SPACE + us);
-	_leftMargin->setSuffix(UNIT_SPACE + us);
-	_rightMargin->setSuffix(UNIT_SPACE + us);
-	if (_export->units == Metric) {
-		_topMargin->setValue(_export->margins.top());
-		_bottomMargin->setValue(_export->margins.bottom());
-		_leftMargin->setValue(_export->margins.left());
-		_rightMargin->setValue(_export->margins.right());
-	} else {
-		_topMargin->setValue(_export->margins.top() * MM2IN);
-		_bottomMargin->setValue(_export->margins.bottom() * MM2IN);
-		_leftMargin->setValue(_export->margins.left() * MM2IN);
-		_rightMargin->setValue(_export->margins.right() * MM2IN);
-		_topMargin->setSingleStep(0.1);
-		_bottomMargin->setSingleStep(0.1);
-		_leftMargin->setSingleStep(0.1);
-		_rightMargin->setSingleStep(0.1);
-	}
-
-	QGridLayout *marginsLayout = new QGridLayout();
-	marginsLayout->addWidget(_topMargin, 0, 0, 1, 2, Qt::AlignCenter);
-	marginsLayout->addWidget(_leftMargin, 1, 0, 1, 1, Qt::AlignRight);
-	marginsLayout->addWidget(_rightMargin, 1, 1, 1, 1, Qt::AlignLeft);
-	marginsLayout->addWidget(_bottomMargin, 2, 0, 1, 2, Qt::AlignCenter);
+	_margins = new MarginsFWidget();
+	_margins->setUnits((units == Metric) ? tr("cm") : tr("in"));
+	_margins->setSingleStep(0.1);
+	_margins->setValue((units == Metric)
+	  ? _export.margins * MM2CM : _export.margins * MM2IN);
 
 #ifndef Q_OS_MAC
 	QGroupBox *pageSetupBox = new QGroupBox(tr("Page Setup"));
@@ -97,7 +69,7 @@ ExportDialog::ExportDialog(Export *exp, QWidget *parent)
 	pageSetupLayout->addRow(tr("Page size:"), _paperSize);
 	pageSetupLayout->addRow(tr("Resolution:"), _resolution);
 	pageSetupLayout->addRow(tr("Orientation:"), orientationLayout);
-	pageSetupLayout->addRow(tr("Margins:"), marginsLayout);
+	pageSetupLayout->addRow(tr("Margins:"), _margins);
 #ifdef Q_OS_MAC
 	QFrame *line = new QFrame();
 	line->setFrameShape(QFrame::HLine);
@@ -111,7 +83,7 @@ ExportDialog::ExportDialog(Export *exp, QWidget *parent)
 
 #ifndef Q_OS_MAC
 	QGroupBox *outputFileBox = new QGroupBox(tr("Output file"));
-	QHBoxLayout *outputFileLayout = new QHBoxLayout();
+	QVBoxLayout *outputFileLayout = new QVBoxLayout();
 	outputFileLayout->addWidget(_fileSelect);
 	outputFileBox->setLayout(outputFileLayout);
 #endif // Q_OS_MAC
@@ -136,41 +108,13 @@ ExportDialog::ExportDialog(Export *exp, QWidget *parent)
 	setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
 }
 
-bool ExportDialog::checkFile()
+void PDFExportDialog::accept()
 {
-	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())
+	QString error;
+	if (!_fileSelect->checkFile(error)) {
+		QMessageBox::warning(this, tr("Error"), error);
 		return;
+	}
 
 	QPrinter::Orientation orientation = _portrait->isChecked()
 	  ? QPrinter::Portrait : QPrinter::Landscape;
@@ -178,17 +122,12 @@ void ExportDialog::accept()
 	  (_paperSize->itemData(_paperSize->currentIndex()).toInt());
 	int resolution = _resolution->itemData(_resolution->currentIndex()).toInt();
 
-	_export->fileName = _fileSelect->file();
-	_export->paperSize = paperSize;
-	_export->resolution = resolution;
-	_export->orientation = orientation;
-	if (_export->units == Imperial)
-		_export->margins = MarginsF(_leftMargin->value() / MM2IN,
-		_topMargin->value() / MM2IN, _rightMargin->value() / MM2IN,
-		_bottomMargin->value() / MM2IN);
-	else
-		_export->margins = MarginsF(_leftMargin->value(), _topMargin->value(),
-		  _rightMargin->value(), _bottomMargin->value());
+	_export.fileName = _fileSelect->file();
+	_export.paperSize = paperSize;
+	_export.resolution = resolution;
+	_export.orientation = orientation;
+	_export.margins = (_units == Imperial)
+	  ? _margins->value() / MM2IN : _margins->value() / MM2CM;
 
 	QDialog::accept();
 }

src/GUI/pdfexportdialog.h

@@ -1,5 +1,5 @@
-#ifndef EXPORTDIALOG_H
-#define EXPORTDIALOG_H
+#ifndef PDFEXPORTDIALOG_H
+#define PDFEXPORTDIALOG_H
 
 #include <QDialog>
 #include <QPrinter>
@@ -9,42 +9,37 @@
 class QComboBox;
 class QRadioButton;
 class FileSelectWidget;
-class QDoubleSpinBox;
+class MarginsFWidget;
 
-struct Export {
+struct PDFExport
+{
 	QString fileName;
 	QPrinter::PaperSize paperSize;
 	QPrinter::Orientation orientation;
 	MarginsF margins;
 	int resolution;
-
-	Units units;
 };
 
-class ExportDialog : public QDialog
+class PDFExportDialog : public QDialog
 {
 	Q_OBJECT
 
 public:
-	ExportDialog(Export *exp, QWidget *parent = 0);
+	PDFExportDialog(PDFExport &exp, Units units, QWidget *parent = 0);
 
 public slots:
 	void accept();
 
 private:
-	bool checkFile();
-
-	Export *_export;
+	PDFExport &_export;
 
+	Units _units;
 	FileSelectWidget *_fileSelect;
 	QComboBox *_paperSize;
 	QComboBox *_resolution;
 	QRadioButton *_portrait;
 	QRadioButton *_landscape;
-	QDoubleSpinBox *_topMargin;
-	QDoubleSpinBox *_bottomMargin;
-	QDoubleSpinBox *_leftMargin;
-	QDoubleSpinBox *_rightMargin;
+	MarginsFWidget *_margins;
 };
 
-#endif // EXPORTDIALOG_H
+#endif // PDFEXPORTDIALOG_H

src/GUI/pngexportdialog.cpp

@@ -0,0 +1,101 @@
+#include <QVBoxLayout>
+#include <QFormLayout>
+#include <QDialogButtonBox>
+#include <QGroupBox>
+#include <QSpinBox>
+#include <QMessageBox>
+#include <QTabWidget>
+#include <QCheckBox>
+#include "units.h"
+#include "fileselectwidget.h"
+#include "marginswidget.h"
+#include "pngexportdialog.h"
+
+
+PNGExportDialog::PNGExportDialog(PNGExport &exp, QWidget *parent)
+  : QDialog(parent), _export(exp)
+{
+	_fileSelect = new FileSelectWidget();
+	_fileSelect->setFilter(tr("PNG files") + " (*.png);;" + tr("All files")
+	  + " (*)");
+	_fileSelect->setFile(_export.fileName);
+
+	_width = new QSpinBox();
+	_width->setMinimum(256);
+	_width->setMaximum(4096);
+	_width->setValue(_export.size.width());
+	_width->setSuffix(UNIT_SPACE + tr("px"));
+	_height = new QSpinBox();
+	_height->setMinimum(256);
+	_height->setMaximum(4096);
+	_height->setValue(_export.size.height());
+	_height->setSuffix(UNIT_SPACE + tr("px"));
+
+	_margins = new MarginsWidget();
+	_margins->setValue(_export.margins);
+	_margins->setUnits(tr("px"));
+
+	_antialiasing = new QCheckBox(tr("Use anti-aliasing"));
+	_antialiasing->setChecked(_export.antialiasing);
+
+#ifndef Q_OS_MAC
+	QGroupBox *pageSetupBox = new QGroupBox(tr("Image Setup"));
+#endif // Q_OS_MAC
+	QFormLayout *pageSetupLayout = new QFormLayout;
+	pageSetupLayout->addRow(tr("Image width:"), _width);
+	pageSetupLayout->addRow(tr("Image height:"), _height);
+	pageSetupLayout->addRow(tr("Margins:"), _margins);
+	pageSetupLayout->addWidget(_antialiasing);
+#ifdef Q_OS_MAC
+	QFrame *line = new QFrame();
+	line->setFrameShape(QFrame::HLine);
+	line->setFrameShadow(QFrame::Sunken);
+	pageSetupLayout->addRow(line);
+	pageSetupLayout->addRow(tr("File:"), _fileSelect);
+	pageSetupLayout->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow);
+#else // Q_OS_MAC
+	pageSetupBox->setLayout(pageSetupLayout);
+#endif // Q_OS_MAC
+
+#ifndef Q_OS_MAC
+	QGroupBox *outputFileBox = new QGroupBox(tr("Output file"));
+	QVBoxLayout *outputFileLayout = new QVBoxLayout();
+	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 PNG"));
+	setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
+}
+
+void PNGExportDialog::accept()
+{
+	QString error;
+	if (!_fileSelect->checkFile(error)) {
+		QMessageBox::warning(this, tr("Error"), error);
+		return;
+	}
+
+	_export.fileName = _fileSelect->file();
+	_export.size = QSize(_width->value(), _height->value());
+	_export.margins = _margins->value();
+	_export.antialiasing = _antialiasing->isChecked();
+
+	QDialog::accept();
+}

src/GUI/pngexportdialog.h

@@ -0,0 +1,41 @@
+#ifndef PNGEXPORTDIALOG_H
+#define PNGEXPORTDIALOG_H
+
+#include <QDialog>
+#include <QMargins>
+#include "margins.h"
+
+class FileSelectWidget;
+class MarginsWidget;
+class QSpinBox;
+class QCheckBox;
+
+struct PNGExport
+{
+	QString fileName;
+	QSize size;
+	QMargins margins;
+	bool antialiasing;
+};
+
+class PNGExportDialog : public QDialog
+{
+	Q_OBJECT
+
+public:
+	PNGExportDialog(PNGExport &exp, QWidget *parent = 0);
+
+public slots:
+	void accept();
+
+private:
+	PNGExport &_export;
+
+	FileSelectWidget *_fileSelect;
+	QSpinBox *_width;
+	QSpinBox *_height;
+	MarginsWidget *_margins;
+	QCheckBox *_antialiasing;
+};
+
+#endif // PNGEXPORTDIALOG_H

src/GUI/settings.h

@@ -66,26 +66,45 @@
 #define SHOW_WAYPOINT_LABELS_SETTING      "waypointLabels"
 #define SHOW_WAYPOINT_LABELS_DEFAULT      true
 
-#define EXPORT_SETTINGS_GROUP             "Export"
+#define PDF_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"). \
+#define PDF_MARGIN_LEFT_SETTING           "marginLeft"
+#define PDF_MARGIN_LEFT_DEFAULT           5 /* mm */
+#define PDF_MARGIN_TOP_SETTING            "marginTop"
+#define PDF_MARGIN_TOP_DEFAULT            5 /* mm */
+#define PDF_MARGIN_RIGHT_SETTING          "marginRight"
+#define PDF_MARGIN_RIGHT_DEFAULT          5 /* mm */
+#define PDF_MARGIN_BOTTOM_SETTING         "marginBottom"
+#define PDF_MARGIN_BOTTOM_DEFAULT         5 /* mm */
+#define PDF_FILENAME_SETTING              "fileName"
+#define PDF_FILENAME_DEFAULT              QString("%1/export.pdf"). \
                                             arg(QDir::currentPath())
 #define RESOLUTION_SETTING                "resolution"
 #define RESOLUTION_DEFAULT                600
 
+#define PNG_EXPORT_SETTINGS_GROUP         "PNGExport"
+#define PNG_WIDTH_SETTING                 "width"
+#define PNG_WIDTH_DEFAULT                 600
+#define PNG_HEIGHT_SETTING                "height"
+#define PNG_HEIGHT_DEFAULT                800
+#define PNG_MARGIN_LEFT_SETTING           "marginLeft"
+#define PNG_MARGIN_LEFT_DEFAULT           5 /* px */
+#define PNG_MARGIN_TOP_SETTING            "marginTop"
+#define PNG_MARGIN_TOP_DEFAULT            5 /* px */
+#define PNG_MARGIN_RIGHT_SETTING          "marginRight"
+#define PNG_MARGIN_RIGHT_DEFAULT          5 /* px */
+#define PNG_MARGIN_BOTTOM_SETTING         "marginBottom"
+#define PNG_MARGIN_BOTTOM_DEFAULT         5 /* px */
+#define PNG_ANTIALIASING_SETTING          "antialiasing"
+#define PNG_ANTIALIASING_DEFAULT          true
+#define PNG_FILENAME_SETTING              "fileName"
+#define PNG_FILENAME_DEFAULT              QString("%1/export.png"). \
+											arg(QDir::currentPath())
+
 #define OPTIONS_SETTINGS_GROUP            "Options"
 #define PALETTE_COLOR_SETTING             "paletteColor"
 #define PALETTE_COLOR_DEFAULT             QColor(Qt::blue)
@@ -122,7 +141,7 @@
 #define PATH_AA_SETTING                   "pathAntiAliasing"
 #define PATH_AA_DEFAULT                   true
 #define GRAPH_AA_SETTING                  "graphAntiAliasing"
-#define GRAPH_AA_DEFAULT                  false
+#define GRAPH_AA_DEFAULT                  true
 #define ELEVATION_FILTER_SETTING          "elevationFilter"
 #define ELEVATION_FILTER_DEFAULT          3
 #define SPEED_FILTER_SETTING              "speedFilter"

src/GUI/units.h

@@ -16,6 +16,7 @@ enum Units {
 #define MS2KN   1.943844490000  // m/s -> kn
 #define FT2MI   0.000189393939  // ft -> mi
 #define MM2IN   0.039370100000  // mm -> in
+#define MM2CM   0.100000000000  // mm -> cm
 #define H2S     0.000277777778  // h -> s
 #define MIN2S   0.016666666667  // min -> s
 

src/common/garmin.h

@@ -15,4 +15,15 @@ inline double toWGS24(qint32 v)
 	return toWGS32(LS(v, 8));
 }
 
+inline quint8 vs(const quint8 b0)
+{
+	static const quint8 sizes[] = {4, 1, 2, 1, 3, 1, 2, 1};
+	return sizes[b0 & 0x07];
+}
+
+inline quint8 bs(const quint8 val)
+{
+	return (val + 7) >> 3;
+}
+
 #endif // GARMIN_H

src/common/rectc.h

@@ -15,7 +15,8 @@ public:
 	bool isNull() const
 	  {return _tl.isNull() && _br.isNull();}
 	bool isValid() const
-	  {return (_tl.isValid() && _br.isValid() && _tl != _br);}
+	  {return (_tl.isValid() && _br.isValid()
+	  && _tl.lat() > _br.lat() && _tl.lon() < _br.lon());}
 
 	Coordinates topLeft() const {return _tl;}
 	Coordinates bottomRight() const {return _br;}

src/common/rtree.h

@@ -1,7 +1,6 @@
 #ifndef RTREE_H
 #define RTREE_H
 
-#include <cstdio>
 #include <cmath>
 #include <cstdlib>
 #include <QtGlobal>
@@ -387,10 +386,10 @@ RTREE_TEMPLATE
 void RTREE_QUAL::Insert(const ELEMTYPE a_min[NUMDIMS],
   const ELEMTYPE a_max[NUMDIMS], const DATATYPE& a_dataId)
 {
-	#ifdef _DEBUG
+	#ifndef QT_NO_DEBUG
 	for (int index=0; index<NUMDIMS; ++index)
 		Q_ASSERT(a_min[index] <= a_max[index]);
-	#endif //_DEBUG
+	#endif // QT_NO_DEBUG
 
 	Rect rect;
 
@@ -407,10 +406,10 @@ RTREE_TEMPLATE
 void RTREE_QUAL::Remove(const ELEMTYPE a_min[NUMDIMS],
   const ELEMTYPE a_max[NUMDIMS], const DATATYPE& a_dataId)
 {
-	#ifdef _DEBUG
+	#ifndef QT_NO_DEBUG
 	for (int index=0; index<NUMDIMS; ++index)
 		Q_ASSERT(a_min[index] <= a_max[index]);
-	#endif //_DEBUG
+	#endif // QT_NO_DEBUG
 
 	Rect rect;
 
@@ -427,10 +426,10 @@ RTREE_TEMPLATE
 int RTREE_QUAL::Search(const ELEMTYPE a_min[NUMDIMS], const ELEMTYPE a_max[NUMDIMS],
   bool a_resultCallback(DATATYPE a_data, void* a_context), void* a_context) const
 {
-	#ifdef _DEBUG
+	#ifndef QT_NO_DEBUG
 	for (int index=0; index<NUMDIMS; ++index)
 		Q_ASSERT(a_min[index] <= a_max[index]);
-	#endif //_DEBUG
+	#endif // QT_NO_DEBUG
 
 	Rect rect;
 
@@ -636,10 +635,10 @@ bool RTREE_QUAL::InsertRect(Rect* a_rect, const DATATYPE& a_id, Node** a_root,
 {
 	Q_ASSERT(a_rect && a_root);
 	Q_ASSERT(a_level >= 0 && a_level <= (*a_root)->m_level);
-	#ifdef _DEBUG
+	#ifndef QT_NO_DEBUG
 	for (int index=0; index < NUMDIMS; ++index)
 		Q_ASSERT(a_rect->m_min[index] <= a_rect->m_max[index]);
-	#endif //_DEBUG  
+	#endif // QT_NO_DEBUG
 
 	Node* newRoot;
 	Node* newNode;

src/common/tifffile.h

@@ -33,18 +33,18 @@ public:
 			return false;
 
 #if Q_BYTE_ORDER == Q_BIG_ENDIAN
-			if (_be)
-				val = data;
-			else {
-				for (size_t i = 0; i < sizeof(T); i++)
-					*((char *)&val + i) = *((char*)&data + sizeof(T) - 1 - i);
-			}
+		if (_be)
+			val = data;
+		else {
+			for (size_t i = 0; i < sizeof(T); i++)
+				*((char *)&val + i) = *((char*)&data + sizeof(T) - 1 - i);
+		}
 #else
-			if (_be) {
-				for (size_t i = 0; i < sizeof(T); i++)
-					*((char *)&val + i) = *((char*)&data + sizeof(T) - 1 - i);
-			} else
-				val = data;
+		if (_be) {
+			for (size_t i = 0; i < sizeof(T); i++)
+				*((char *)&val + i) = *((char*)&data + sizeof(T) - 1 - i);
+		} else
+			val = data;
 #endif
 
 		return true;

src/data/fitparser.cpp

@@ -51,13 +51,13 @@ class FITParser::CTX {
 public:
 	CTX(QFile *file, QVector<Waypoint> &waypoints)
 	  : file(file), waypoints(waypoints), len(0), endian(0), timestamp(0),
-	  lastWrite(0), ratio(NAN) {}
+	  ratio(NAN) {}
 
 	QFile *file;
 	QVector<Waypoint> &waypoints;
 	quint32 len;
 	quint8 endian;
-	quint32 timestamp, lastWrite;
+	quint32 timestamp;
 	MessageDefinition defs[16];
 	qreal ratio;
 	Trackpoint trackpoint;
@@ -361,14 +361,12 @@ bool FITParser::parseData(CTX &ctx, const MessageDefinition *def)
 			ctx.ratio = ((qreal)front / (qreal)rear);
 		}
 	} else if (def->globalId == RECORD_MESSAGE) {
-		if (ctx.timestamp > ctx.lastWrite
-		  && ctx.trackpoint.coordinates().isValid()) {
+		if (ctx.trackpoint.coordinates().isValid()) {
 			ctx.trackpoint.setTimestamp(QDateTime::fromTime_t(ctx.timestamp
 			  + 631065600));
 			ctx.trackpoint.setRatio(ctx.ratio);
 			ctx.segment.append(ctx.trackpoint);
 			ctx.trackpoint = Trackpoint();
-			ctx.lastWrite = ctx.timestamp;
 		}
 	} else if (def->globalId == COURSE_POINT)
 		if (waypoint.coordinates().isValid())

src/data/track.cpp

@@ -95,9 +95,11 @@ Track::Track(const TrackData &data) : _pause(0)
 	if (_useSegments)
 		_data = data;
 	else {
-		_data.append(SegmentData());
-		for (int i = 0; i < data.size(); i++)
-			_data[0] << data.at(i);
+		if (!data.isEmpty()) {
+			_data.append(data.first());
+			for (int i = 1; i < data.size(); i++)
+				_data.first() << data.at(i);
+		}
 	}
 
 	for (int i = 0; i < _data.size(); i++) {

src/map/IMG/bitstream.cpp

@@ -12,6 +12,22 @@ bool BitStream1::flush()
 	return true;
 }
 
+bool BitStream1::readUInt24(quint32 &val)
+{
+	quint8 b;
+
+	val = 0;
+
+	for (int i = 0; i < 3; i++) {
+		if (!read(8, b))
+			return false;
+		val |= (b << (i * 8));
+	}
+
+	return true;
+}
+
+
 bool BitStream4F::flush()
 {
 	if (_length && !_file.seek(_hdl, _file.pos(_hdl) + _length))

src/map/IMG/bitstream.h

@@ -12,6 +12,8 @@ public:
 	bool flush();
 	quint64 bitsAvailable() const {return (quint64)_length * 8 + _remaining;}
 
+	bool readUInt24(quint32 &val);
+
 private:
 	const SubFile &_file;
 	SubFile::Handle &_hdl;

src/map/IMG/gmap.cpp

@@ -81,7 +81,11 @@ bool GMAP::loadTile(const QDir &dir, bool baseMap)
 	QFileInfoList ml = dir.entryInfoList(QDir::Files);
 	for (int i = 0; i < ml.size(); i++) {
 		const QFileInfo &fi = ml.at(i);
-		tile->addFile(fi.absoluteFilePath(), tileType(fi.suffix()));
+		SubFile::Type tt = tileType(fi.suffix());
+		if (VectorTile::isTileFile(tt)) {
+			_files.append(new QString(fi.absoluteFilePath()));
+			tile->addFile(_files.last(), tt);
+		}
 	}
 
 	if (!tile->init()) {
@@ -131,8 +135,10 @@ GMAP::GMAP(const QString &fileName) : _fileName(fileName)
 			  fi.absoluteFilePath() == baseMap.absoluteFilePath());
 	}
 
-	if (baseDir.exists(typFilePath))
-		_typ = new SubFile(baseDir.filePath(typFilePath));
+	if (baseDir.exists(typFilePath)) {
+		_files.append(new QString(baseDir.filePath(typFilePath)));
+		_typ = new SubFile(_files.last());
+	}
 
 	if (!_tileTree.Count())
 		_errorString = "No usable map tile found";
@@ -140,6 +146,11 @@ GMAP::GMAP(const QString &fileName) : _fileName(fileName)
 		_valid = true;
 }
 
+GMAP::~GMAP()
+{
+	qDeleteAll(_files);
+}
+
 bool GMAP::isGMAP(const QString &path)
 {
 	QFile file(path);

src/map/IMG/gmap.h

@@ -10,6 +10,7 @@ class GMAP : public MapData
 {
 public:
 	GMAP(const QString &fileName);
+	~GMAP();
 
 	QString fileName() const {return _fileName;}
 
@@ -25,6 +26,7 @@ private:
 	bool loadTile(const QDir &dir, bool baseMap);
 
 	QString _fileName;
+	QList<const QString*> _files;
 };
 
 #endif // GMAP_H

src/map/IMG/huffmanbuffer.cpp

@@ -0,0 +1,24 @@
+#include "rgnfile.h"
+#include "huffmanbuffer.h"
+
+bool HuffmanBuffer::load(const RGNFile *rgn, SubFile::Handle &rgnHdl)
+{
+	quint32 recordSize, recordOffset = rgn->dictOffset();
+
+	for (int i = 0; i <= _id; i++) {
+		if (!rgn->seek(rgnHdl, recordOffset))
+			return false;
+		if (!rgn->readVUInt32(rgnHdl, recordSize))
+			return false;
+		recordOffset = rgn->pos(rgnHdl) + recordSize;
+		if (recordOffset > rgn->dictOffset() + rgn->dictSize())
+			return false;
+	};
+
+	resize(recordSize);
+	for (int i = 0; i < QByteArray::size(); i++)
+		if (!rgn->readUInt8(rgnHdl, *((quint8*)(data() + i))))
+			return false;
+
+	return true;
+}

src/map/IMG/huffmanbuffer.h

@@ -0,0 +1,21 @@
+#ifndef HUFFMANBUFFER_H
+#define HUFFMANBUFFER_H
+
+#include <QByteArray>
+#include "subfile.h"
+
+class RGNFile;
+
+class HuffmanBuffer : public QByteArray
+{
+public:
+	HuffmanBuffer(quint8 id) : _id(id) {}
+
+	quint8 id() const {return _id;}
+	bool load(const RGNFile *rgn, SubFile::Handle &rgnHdl);
+
+private:
+	quint8 _id;
+};
+
+#endif // HUFFMANBUFFER_H

src/map/IMG/huffmanstream.cpp

@@ -13,10 +13,10 @@ bool HuffmanStreamF::init(bool line)
 	quint32 eb;
 	if (!_bs.read(1, eb))
 		return false;
-	if (eb) {
-		qWarning() << "Extended lines/polygons not supported";
+
+	Q_ASSERT(!eb);
+	if (eb)
 		return false;
-	}
 
 	return true;
 }

src/map/IMG/huffmantable.cpp

@@ -1,17 +1,7 @@
+#include "common/garmin.h"
 #include "huffmantable.h"
 
 
-static quint8 vs(const quint8 b0)
-{
-	static const quint8 sizes[] = {4, 1, 2, 1, 3, 1, 2, 1};
-	return sizes[b0 & 0x07];
-}
-
-static inline quint8 bs(const quint8 val)
-{
-	return (val + 7) >> 3;
-}
-
 static inline quint32 readVUint32(const quint8 *buffer, quint32 bytes)
 {
 	quint32 val = 0;
@@ -22,10 +12,9 @@ static inline quint32 readVUint32(const quint8 *buffer, quint32 bytes)
 	return val;
 }
 
-bool HuffmanTable::load(const SubFile &file, SubFile::Handle &hdl,
-  quint32 offset, quint32 size, quint32 id)
+bool HuffmanTable::load(const RGNFile *rgn, SubFile::Handle &rgnHdl)
 {
-	if (!getBuffer(file, hdl, offset, size, id))
+	if (!_buffer.load(rgn, rgnHdl))
 		return false;
 
 	_s0 = (quint8)_buffer.at(0) & 0x0F;
@@ -42,31 +31,6 @@ bool HuffmanTable::load(const SubFile &file, SubFile::Handle &hdl,
 	_s10 = _s14 + _s1c * _s1d;
 	_s18 = _s10 + (_s1 << _s0);
 
-	_id = id;
-
-	return true;
-}
-
-bool HuffmanTable::getBuffer(const SubFile &file, SubFile::Handle &hdl,
-  quint32 offset, quint32 size, quint8 id)
-{
-	quint32 recordSize, recordOffset = offset;
-
-	for (int i = 0; i <= id; i++) {
-		if (!file.seek(hdl, recordOffset))
-			return false;
-		if (!file.readVUInt32(hdl, recordSize))
-			return false;
-		recordOffset = file.pos(hdl) + recordSize;
-		if (recordOffset > offset + size)
-			return false;
-	};
-
-	_buffer.resize(recordSize);
-	for (int i = 0; i < _buffer.size(); i++)
-		if (!file.readUInt8(hdl, *((quint8*)(_buffer.data() + i))))
-			return false;
-
 	return true;
 }
 

src/map/IMG/huffmantable.h

@@ -1,31 +1,26 @@
 #ifndef HUFFMANTABLE_H
 #define HUFFMANTABLE_H
 
-#include "subfile.h"
+#include "huffmanbuffer.h"
+
+class RGNFile;
 
 class HuffmanTable {
 public:
-	HuffmanTable() : _s2(0) {}
+	HuffmanTable(quint8 id) : _buffer(id) {}
 
-	bool load(const SubFile &file, SubFile::Handle &hdl, quint32 offset,
-	  quint32 size, quint32 id);
-	bool isNull() const {return _s2 == 0;}
+	bool load(const RGNFile *rgn, SubFile::Handle &rgnHdl);
 	quint8 maxSymbolSize() const {return _s2;}
 	quint32 symbol(quint32 data, quint8 &size) const;
 
-	quint8 id() const {return _id;}
+	quint8 id() const {return _buffer.id();}
 
 private:
-	bool getBuffer(const SubFile &file, SubFile::Handle &hdl, quint32 offset,
-	  quint32 size, quint8 id);
-
-	QByteArray _buffer;
+	HuffmanBuffer _buffer;
 	quint8 _s0, _s1, _s2, _s3;
 	quint8 *_s10, *_s14, *_s18;
 	quint8 _s1c, _s1d, _s1e, _s1f, _s20;
 	quint16 _s22;
-
-	quint8 _id;
 };
 
 #endif // HUFFMANTABLE_H

src/map/IMG/huffmantext.cpp

@@ -0,0 +1,169 @@
+#include "common/garmin.h"
+#include "subfile.h"
+#include "huffmantext.h"
+
+
+static inline quint32 readVUint32(const quint8 *buffer, quint32 bytes)
+{
+	quint32 val = 0;
+
+	for (quint32 i = 0; i < bytes; i++)
+		val = val | (quint32)*(buffer - i) << ((bytes - i - 1) << 3);
+
+	return val;
+}
+
+bool HuffmanText::load(const RGNFile *rgn, SubFile::Handle &rgnHdl)
+{
+	if (!_buffer.load(rgn, rgnHdl))
+		return false;
+
+	quint8 *buffer = (quint8 *)_buffer.constData();
+	_b0 = buffer[0];
+	_b1 = buffer[1];
+	_b2 = buffer[2];
+	_b3 = buffer[3];
+	_vs = vs(buffer[4]);
+	_bs3 = bs(_b3);
+	_bs1 = bs(_b1);
+	_mul = _bs1 + 1 + _vs;
+	_bp1 = buffer + _vs + 4;
+	_bp2 = _bp1 + _mul * _b2;
+	_bp3 = _bp2 + ((_bs3 + 1) << (_b0 & 0xf));
+	_bp4 = _bp3 - 1;
+
+	return true;
+}
+
+bool HuffmanText::fetch(const SubFile *file, SubFile::Handle &hdl,
+  quint32 &data, quint32 &bits, quint32 &usedBits, quint32 &usedData) const
+{
+	quint32 rs, ls, old;
+
+	bits = _b1 - bits;
+
+	if (usedBits < bits) {
+		old = usedBits ? usedData >> (0x20 - usedBits) : 0;
+		if (!file->readVUInt32SW(hdl, 4, usedData))
+			return false;
+		ls = bits - usedBits;
+		rs = 0x20 - (bits - usedBits);
+		old = usedData >> rs | old << ls;
+	} else {
+		ls = bits;
+		rs = usedBits - bits;
+		old = usedData >> (0x20 - bits);
+	}
+
+	usedData = usedData << ls;
+	data = data | old << (0x20 - _b1);
+	usedBits = rs;
+
+	return true;
+}
+
+bool HuffmanText::decode(const SubFile *file, SubFile::Handle &hdl,
+  QVector<quint8> &str) const
+{
+	quint32 bits = 0;
+	quint32 data = 0;
+	quint32 usedBits = 0;
+	quint32 usedData = 0;
+	quint32 ls = 8;
+	quint32 lo = _vs * 8 - 8;
+
+
+	while (true) {
+		if (!fetch(file, hdl, data, bits, usedBits, usedData))
+			return false;
+
+		quint32 off = (data >> (0x20 - (_b0 & 0xf))) * (_bs3 + 1);
+		quint32 sb = _bp2[off];
+		quint32 ss = 0;
+		quint32 sym = _b2 - 1;
+		quint32 size;
+
+		if ((_b0 & 0xf) == 0 || (sb & 1) == 0) {
+			if ((_b0 & 0xf) != 0) {
+				ss = sb >> 1;
+				sym = _bp2[off + 1];
+			}
+
+			quint8 *tp = _bp1 + ss * _mul;
+			quint32 sd = data >> (0x20 - _b1);
+			while (ss < sym) {
+				quint32 cnt = (sym + 1 + ss) >> 1;
+				quint8 *prev = _bp1 + cnt * _mul;
+				quint32 nd = readVUint32(prev + _bs1 - 1, _bs1);
+
+				if (sd <= nd) {
+					sym = cnt - (sd < nd);
+					if (sd < nd) {
+						prev = tp;
+						cnt = ss;
+					}
+				}
+				tp = prev;
+				ss = cnt;
+			}
+
+			quint32 o1 = readVUint32(tp + _bs1 - 1, _bs1);
+			tp = tp + _bs1;
+			quint32 o2 = readVUint32(tp + _vs, _vs);
+			size = tp[0];
+			quint32 os = (sd - o1) >> (_b1 - size);
+
+			if ((_b0 & 0x10) == 0) {
+				sym = readVUint32(_bp4 + (o2 + 1 + os) * _bs3, _bs3);
+			} else {
+				quint32 v = (os + o2) * _b3;
+				quint32 idx = v >> 3;
+				quint32 r = v & 7;
+				quint32 shift = 8 - r;
+				sym = _bp3[idx] >> r;
+				if (shift < _b3) {
+					quint32 sz = bs(_b3 - shift);
+					quint32 val = readVUint32(_bp3 + idx + sz, sz);
+					sym = sym | val << shift;
+				}
+			}
+		} else {
+			sym = readVUint32(_bp2 + off + _bs3, _bs3);
+			size = (sb >> 1);
+		}
+
+		if (_b1 < size)
+			return false;
+		data = data << size;
+		bits = _b1 - size;
+
+		if ((_b3 & 7) == 0) {
+			for (quint32 i = 0; i < (_b3 >> 3); i++) {
+				str.append((quint8)sym);
+				if (((quint8)sym == '\0'))
+					return true;
+				sym = sym >> 8;
+			}
+		} else {
+			quint32 cnt = _b3;
+
+			if (ls <= _b3) {
+				do {
+					quint32 shift = ls;
+					lo = sym << (8 - shift) | (quint32)((quint8)lo >> shift);
+					sym = sym >> shift;
+					str.append((uchar)lo);
+					if (((uchar)lo == '\0'))
+						return true;
+					cnt = cnt - ls;
+					ls = 8;
+				} while (7 < cnt);
+				ls = 8;
+			}
+			if (cnt != 0) {
+				lo = sym << (8 - cnt) | (quint32)((quint8)lo >> cnt);
+				ls = ls - cnt;
+			}
+		}
+	}
+}

src/map/IMG/huffmantext.h

@@ -0,0 +1,35 @@
+#ifndef HUFFMANTEXT_H
+#define HUFFMANTEXT_H
+
+#include "huffmanbuffer.h"
+
+class HuffmanText
+{
+public:
+	HuffmanText() : _buffer(0) {}
+
+	bool load(const RGNFile *rgn, SubFile::Handle &rgnHdl);
+	bool decode(const SubFile *file, SubFile::Handle &hdl,
+	  QVector<quint8> &str) const;
+
+private:
+	bool fetch(const SubFile *file, SubFile::Handle &hdl, quint32 &data,
+	  quint32 &bits, quint32 &usedBits, quint32 &usedData) const;
+
+	HuffmanBuffer _buffer;
+
+	quint32 _b0;
+	quint32 _b1;
+	quint32 _b2;
+	quint32 _b3;
+	quint32 _vs;
+	quint32 _bs3;
+	quint32 _bs1;
+	quint32 _mul;
+	quint8 *_bp1;
+	quint8 *_bp2;
+	quint8 *_bp3;
+	quint8 *_bp4;
+};
+
+#endif // HUFFMANTEXT_H

src/map/IMG/lblfile.cpp

@@ -1,4 +1,6 @@
 #include <QTextCodec>
+#include "huffmantext.h"
+#include "rgnfile.h"
 #include "lblfile.h"
 
 enum Charset {Normal, Symbol, Special};
@@ -55,21 +57,48 @@ static QString capitalized(const QString &str)
 }
 
 
-bool LBLFile::init(Handle &hdl)
+LBLFile::~LBLFile()
 {
-	quint16 codepage;
-	quint8 multiplier, poiMultiplier;
+	delete _huffmanText;
+        delete[] _table;
+}
 
-	if (!(seek(hdl, _gmpOffset + 0x15) && readUInt32(hdl, _offset)
-	  && readUInt32(hdl, _size) && readUInt8(hdl, multiplier)
+bool LBLFile::load(Handle &hdl, const RGNFile *rgn, Handle &rgnHdl)
+{
+	quint16 hdrLen, codepage;
+
+	if (!(seek(hdl, _gmpOffset) && readUInt16(hdl, hdrLen)
+	  && seek(hdl, _gmpOffset + 0x15) && readUInt32(hdl, _offset)
+	  && readUInt32(hdl, _size) && readUInt8(hdl, _multiplier)
 	  && readUInt8(hdl, _encoding) && seek(hdl, _gmpOffset + 0x57)
 	  && readUInt32(hdl, _poiOffset) && readUInt32(hdl, _poiSize)
-	  && readUInt8(hdl, poiMultiplier) && seek(hdl, _gmpOffset + 0xAA)
+	  && readUInt8(hdl, _poiMultiplier) && seek(hdl, _gmpOffset + 0xAA)
 	  && readUInt16(hdl, codepage)))
 		return false;
 
-	_multiplier = 1<<multiplier;
-	_poiMultiplier = 1<<poiMultiplier;
+	if (hdrLen >= 0x132) {
+		quint32 offset, size;
+		quint16 recordSize;
+		if (!(seek(hdl, _gmpOffset + 0x124) && readUInt32(hdl, offset)
+		  && readUInt32(hdl, size) && readUInt16(hdl, recordSize)))
+			return false;
+
+		if (size && recordSize) {
+			_table = new quint32[size / recordSize];
+			if (!seek(hdl, offset))
+				return false;
+			for (quint32 i = 0; i < size / recordSize; i++) {
+				if (!readVUInt32(hdl, recordSize, _table[i]))
+					return false;
+			}
+		}
+	}
+
+	if (_encoding == 11) {
+		_huffmanText = new HuffmanText();
+		if (!_huffmanText->load(rgn, rgnHdl))
+			return false;
+	}
 
 	if (codepage == 65001)
 		_codec = QTextCodec::codecForName("UTF-8");
@@ -82,6 +111,14 @@ bool LBLFile::init(Handle &hdl)
 	return true;
 }
 
+void LBLFile::clear()
+{
+	delete _huffmanText;
+        delete[] _table;
+	_huffmanText = 0;
+	_table = 0;
+}
+
 Label LBLFile::label6b(Handle &hdl, quint32 offset, bool capitalize) const
 {
 	Label::Shield::Type shieldType = Label::Shield::None;
@@ -135,20 +172,16 @@ Label LBLFile::label6b(Handle &hdl, quint32 offset, bool capitalize) const
 	}
 }
 
-Label LBLFile::label8b(Handle &hdl, quint32 offset, bool capitalize) const
+Label LBLFile::str2label(const QVector<quint8> &str, bool capitalize) const
 {
 	Label::Shield::Type shieldType = Label::Shield::None;
 	QByteArray label, shieldLabel;
 	QByteArray *bap = &label;
-	quint8 c;
 
-	if (!seek(hdl, offset))
-		return Label();
+	for (int i = 0; i < str.size(); i++) {
+		const quint8 &c = str.at(i);
 
-	while (true) {
-		if (!readUInt8(hdl, c))
-			return Label();
-		if (!c || c == 0x1d)
+		if (c == 0 || c == 0x1d)
 			break;
 
 		if (c == 0x1c)
@@ -158,10 +191,10 @@ Label LBLFile::label8b(Handle &hdl, quint32 offset, bool capitalize) const
 				bap = &label;
 			else
 				bap->append(' ');
-		} else if (c <= 0x07) {
+		} else if (c < 0x07) {
 			shieldType = static_cast<Label::Shield::Type>(c);
 			bap = &shieldLabel;
-		} else if (bap == &shieldLabel && QChar(c).isSpace()) {
+		} else if (bap == &shieldLabel && c == 0x20) {
 			bap = &label;
 		} else
 			bap->append(c);
@@ -175,21 +208,74 @@ Label LBLFile::label8b(Handle &hdl, quint32 offset, bool capitalize) const
 	  Label::Shield(shieldType, shieldText));
 }
 
-Label LBLFile::label(Handle &hdl, quint32 offset, bool poi, bool capitalize)
+Label LBLFile::label8b(Handle &hdl, quint32 offset, bool capitalize) const
 {
-	if (!_multiplier && !init(hdl))
-		return QString();
+	QVector<quint8> str;
+	quint8 c;
 
+	if (!seek(hdl, offset))
+		return Label();
+
+	do {
+		if (!readUInt8(hdl, c))
+			return Label();
+		str.append(c);
+	} while (c);
+
+	return str2label(str, capitalize);
+}
+
+Label LBLFile::labelHuffman(Handle &hdl, quint32 offset, bool capitalize) const
+{
+	QVector<quint8> str;
+
+	if (!seek(hdl, offset))
+		return Label();
+	if (!_huffmanText->decode(this, hdl, str))
+		return Label();
+	if (!_table)
+		return str2label(str, capitalize);
+
+
+	QVector<quint8> str2;
+	for (int i = 0; i < str.size(); i++) {
+		quint32 val = _table[str.at(i)];
+		if (val) {
+			if (!seek(hdl, _offset + ((val & 0x7fffff) << _multiplier)))
+				return Label();
+
+			if (str2.size() && str2.back() == '\0')
+				str2[str2.size() - 1] = ' ';
+			else if (str2.size())
+				str2.append(' ');
+			if (!_huffmanText->decode(this, hdl, str2))
+				return Label();
+		} else {
+			if (str.at(i) == 7) {
+				str2.append(0);
+				break;
+			}
+			if (str2.size() && str2.back() == '\0')
+				str2[str2.size() - 1] = ' ';
+			str2.append(str.at(i));
+		}
+	}
+
+	return str2label(str2, capitalize);
+}
+
+Label LBLFile::label(Handle &hdl, quint32 offset, bool poi, bool capitalize) const
+{
 	quint32 labelOffset;
 	if (poi) {
 		quint32 poiOffset;
-		if (!(_poiSize >= offset * _poiMultiplier
-		  && seek(hdl, _poiOffset + offset * _poiMultiplier)
+		if (!(_poiSize >= (offset << _poiMultiplier)
+		  && seek(hdl, _poiOffset + (offset << _poiMultiplier))
 		  && readUInt24(hdl, poiOffset) && (poiOffset & 0x3FFFFF)))
 			return QString();
-		labelOffset = _offset + (poiOffset & 0x3FFFFF) * _multiplier;
+		labelOffset = _offset + ((poiOffset & 0x3FFFFF) << _multiplier);
 	} else
-		labelOffset = _offset + offset * _multiplier;
+		labelOffset = _offset + (offset << _multiplier);
 
 	if (labelOffset > _offset + _size)
 		return QString();
@@ -200,6 +286,8 @@ Label LBLFile::label(Handle &hdl, quint32 offset, bool poi, bool capitalize)
 		case 9:
 		case 10:
 			return label8b(hdl, labelOffset, capitalize);
+		case 11:
+			return labelHuffman(hdl, labelOffset, capitalize);
 		default:
 			return Label();
 	}

src/map/IMG/lblfile.h

@@ -5,28 +5,40 @@
 #include "label.h"
 
 class QTextCodec;
+class HuffmanText;
+class RGNFile;
 
 class LBLFile : public SubFile
 {
 public:
 	LBLFile(IMG *img)
-	  : SubFile(img), _codec(0), _offset(0), _size(0), _poiOffset(0),
-	  _poiSize(0), _poiMultiplier(0), _multiplier(0), _encoding(0) {}
-	LBLFile(const QString &path)
-	  : SubFile(path), _codec(0), _offset(0), _size(0), _poiOffset(0),
-	  _poiSize(0), _poiMultiplier(0), _multiplier(0), _encoding(0) {}
+	  : SubFile(img), _huffmanText(0), _table(0), _codec(0), _offset(0),
+	  _size(0), _poiOffset(0), _poiSize(0), _poiMultiplier(0), _multiplier(0),
+	  _encoding(0) {}
+	LBLFile(const QString *path)
+	  : SubFile(path), _huffmanText(0), _table(0), _codec(0), _offset(0),
+	  _size(0), _poiOffset(0), _poiSize(0), _poiMultiplier(0), _multiplier(0),
+	  _encoding(0) {}
 	LBLFile(SubFile *gmp, quint32 offset) : SubFile(gmp, offset),
-	  _codec(0), _offset(0), _size(0), _poiOffset(0), _poiSize(0),
-	  _poiMultiplier(0), _multiplier(0), _encoding(0) {}
+	  _huffmanText(0), _table(0), _codec(0), _offset(0), _size(0),
+	  _poiOffset(0), _poiSize(0), _poiMultiplier(0), _multiplier(0),
+	  _encoding(0) {}
+	~LBLFile();
+
+	bool load(Handle &hdl, const RGNFile *rgn, Handle &rgnHdl);
+	void clear();
 
 	Label label(Handle &hdl, quint32 offset, bool poi = false,
-	  bool capitalize = true);
+	  bool capitalize = true) const;
 
 private:
-	bool init(Handle &hdl);
-
+	Label str2label(const QVector<quint8> &str, bool capitalize) const;
 	Label label6b(Handle &hdl, quint32 offset, bool capitalize) const;
 	Label label8b(Handle &hdl, quint32 offset, bool capitalize) const;
+	Label labelHuffman(Handle &hdl, quint32 offset, bool capitalize) const;
+
+	HuffmanText *_huffmanText;
+	quint32 *_table;
 
 	QTextCodec *_codec;
 	quint32 _offset;

src/map/IMG/mapdata.cpp

@@ -107,7 +107,7 @@ void MapData::load()
 	else {
 		QString typFile(ProgramPaths::typFile());
 		if (!typFile.isEmpty()) {
-			SubFile typ(typFile);
+			SubFile typ(&typFile);
 			_style = new Style(&typ);
 		} else
 			_style = new Style();

src/map/IMG/mapdata.h

@@ -21,7 +21,7 @@ public:
 	struct Poly {
 		/* QPointF insted of Coordinates for performance reasons (no need to
 		   duplicate all the vectors for drawing). Note, that we do not want to
-		   ll2xy() the points in the IMG class as this can not be done in
+		   ll2xy() the points in the MapData class as this can not be done in
 		   parallel. */
 		QVector<QPointF> points;
 		Label label;
@@ -38,22 +38,12 @@ public:
 		Coordinates coordinates;
 		Label label;
 		quint32 type;
-		bool poi;
 		quint64 id;
 
 		bool operator<(const Point &other) const
 		  {return id < other.id;}
 	};
 
-	struct Polys {
-		Polys() {}
-		Polys(const QList<Poly> &polygons, const QList<Poly> &lines)
-			: polygons(polygons), lines(lines) {}
-
-		QList<Poly> polygons;
-		QList<Poly> lines;
-	};
-
 	MapData();
 	virtual ~MapData();
 
@@ -88,15 +78,26 @@ protected:
 	QString _errorString;
 
 private:
+	struct Polys {
+		Polys() {}
+		Polys(const QList<Poly> &polygons, const QList<Poly> &lines)
+			: polygons(polygons), lines(lines) {}
+
+		QList<Poly> polygons;
+		QList<Poly> lines;
+	};
+
 	QCache<const SubDiv*, Polys> _polyCache;
 	QCache<const SubDiv*, QList<Point> > _pointCache;
+
+	friend class VectorTile;
+	friend class PolyCTX;
 };
 
 #ifndef QT_NO_DEBUG
 inline QDebug operator<<(QDebug dbg, const MapData::Point &point)
 {
-	dbg.nospace() << "Point(" << hex << point.type << ", " << point.label
-	  << ", " << point.poi << ")";
+	dbg.nospace() << "Point(" << hex << point.type << ", " << point.label << ")";
 	return dbg.space();
 }
 

src/map/IMG/netfile.cpp

@@ -3,6 +3,7 @@
 #include "subdiv.h"
 #include "nodfile.h"
 #include "lblfile.h"
+#include "rgnfile.h"
 #include "netfile.h"
 
 
@@ -93,7 +94,7 @@ static bool seekToLine(BitStream4R &bs, quint8 line)
 }
 
 static bool readLine(BitStream4R &bs, const SubDiv *subdiv,
-  const HuffmanTable &table, IMG::Poly &poly)
+  const HuffmanTable *table, MapData::Poly &poly)
 {
 	quint32 v1, v2, v2b;
 	if (!bs.readVuint32SM(v1, v2, v2b))
@@ -113,7 +114,7 @@ static bool readLine(BitStream4R &bs, const SubDiv *subdiv,
 	poly.boundingRect = RectC(c, c);
 	poly.points.append(QPointF(c.lon(), c.lat()));
 
-	HuffmanStreamR stream(bs, table);
+	HuffmanStreamR stream(bs, *table);
 	if (!stream.init())
 		return false;
 	qint32 lonDelta, latDelta;
@@ -132,8 +133,8 @@ static bool readLine(BitStream4R &bs, const SubDiv *subdiv,
 	return stream.atEnd();
 }
 
-static bool readNodeGeometry(NODFile *nod, SubFile::Handle &nodHdl,
-  NODFile::AdjacencyInfo &adj, IMG::Poly &poly, quint16 cnt = 0xFFFF)
+static bool readNodeGeometry(const NODFile *nod, SubFile::Handle &nodHdl,
+  NODFile::AdjacencyInfo &adj, MapData::Poly &poly, quint16 cnt = 0xFFFF)
 {
 	for (int i = 0; i <= cnt; i++) {
 		int ret = nod->nextNode(nodHdl, adj);
@@ -151,7 +152,7 @@ static bool readNodeGeometry(NODFile *nod, SubFile::Handle &nodHdl,
 	return true;
 }
 
-static bool skipNodes(NODFile *nod, SubFile::Handle &nodHdl,
+static bool skipNodes(const NODFile *nod, SubFile::Handle &nodHdl,
   NODFile::AdjacencyInfo &adj, int cnt)
 {
 	for (int i = 0; i < cnt; i++)
@@ -161,10 +162,10 @@ static bool skipNodes(NODFile *nod, SubFile::Handle &nodHdl,
 	return true;
 }
 
-static bool readShape(NODFile *nod, SubFile::Handle &nodHdl,
-  NODFile::AdjacencyInfo &adj, BitStream4R &bs, const HuffmanTable &table,
-  const SubDiv *subdiv, quint32 shift, IMG::Poly &poly, quint16 cnt = 0xFFFF,
-  bool check = false)
+static bool readShape(const NODFile *nod, SubFile::Handle &nodHdl,
+  NODFile::AdjacencyInfo &adj, BitStream4R &bs, const HuffmanTable *table,
+  const SubDiv *subdiv, quint32 shift, MapData::Poly &poly,
+  quint16 cnt = 0xFFFF, bool check = false)
 {
 	quint32 v1, v2, v2b;
 	if (!bs.readVuint32SM(v1, v2, v2b))
@@ -217,7 +218,7 @@ static bool readShape(NODFile *nod, SubFile::Handle &nodHdl,
 		poly.points.append(QPointF(c.lon(), c.lat()));
 		poly.boundingRect = poly.boundingRect.united(c);
 
-		while (!(adj.flags & 1)) {
+		while (!adj.eog) {
 			int ret = nod->nextNode(nodHdl, adj);
 			if (ret < 0)
 				return false;
@@ -233,7 +234,7 @@ static bool readShape(NODFile *nod, SubFile::Handle &nodHdl,
 		}
 	}
 
-	HuffmanStreamR stream(bs, table);
+	HuffmanStreamR stream(bs, *table);
 	if (!stream.init(lonSign, latSign, flags, extraBits))
 		return false;
 	qint32 lonDelta, latDelta;
@@ -299,7 +300,7 @@ static bool readShape(NODFile *nod, SubFile::Handle &nodHdl,
 			steps = 0;
 			startWithStream = false;
 
-			if (adj.flags & 1)
+			if (adj.eog)
 				eos = 0;
 		}
 
@@ -330,7 +331,7 @@ static bool readShape(NODFile *nod, SubFile::Handle &nodHdl,
 				poly.points.append(QPointF(c.lon(), c.lat()));
 				poly.boundingRect = poly.boundingRect.united(c);
 				pos = adj.nodeInfo.pos;
-			} while (!(adj.flags & 1) && nodes < cnt);
+			} while (!adj.eog && nodes < cnt);
 
 			if (nodes == cnt)
 				break;
@@ -345,36 +346,33 @@ static bool readShape(NODFile *nod, SubFile::Handle &nodHdl,
 }
 
 
-bool NETFile::linkLabel(Handle &hdl, quint32 offset, quint32 size, LBLFile *lbl,
-  Handle &lblHdl, Label &label)
+NETFile::~NETFile()
+{
+	delete _huffmanTable;
+}
+
+bool NETFile::linkLabel(Handle &hdl, quint32 offset, quint32 size,
+  const LBLFile *lbl, Handle &lblHdl, Label &label) const
 {
 	if (!seek(hdl, offset))
 		return false;
 	BitStream1 bs(*this, hdl, size);
 
-	quint32 flags, b, labelPtr = 0;
+	quint32 flags, labelPtr;
 	if (!bs.read(8, flags))
 		return false;
-	for (int i = 0; i < 3; i++) {
-		if (!bs.read(8, b))
-			return false;
-		labelPtr |= (b << (i * 8));
-	}
+	if (!(flags & 1))
+		return true;
 
-	if (lbl && (labelPtr & 0x3FFFFF)) {
-		if (labelPtr & 0x400000) {
-			quint32 lblOff;
-			if (lblOffset(hdl, labelPtr & 0x3FFFFF, lblOff) && lblOff)
-				label = lbl->label(lblHdl, lblOff);
-
-		} else
-			label = lbl->label(lblHdl, labelPtr & 0x3FFFFF);
-	}
+	if (!bs.readUInt24(labelPtr))
+		return false;
+	if (labelPtr & 0x3FFFFF)
+		label = lbl->label(lblHdl, labelPtr & 0x3FFFFF);
 
 	return true;
 }
 
-bool NETFile::init(Handle &hdl)
+bool NETFile::load(Handle &hdl, const RGNFile *rgn, Handle &rgnHdl)
 {
 	quint16 hdrLen;
 
@@ -387,31 +385,36 @@ bool NETFile::init(Handle &hdl)
 		quint32 info;
 		if (!(seek(hdl, _gmpOffset + 0x37) && readUInt32(hdl, info)))
 			return false;
-		_tableId = ((info >> 2) & 0xF);
-
 		if (!(seek(hdl, _gmpOffset + 0x43) && readUInt32(hdl, _linksOffset)
 		  && readUInt32(hdl, _linksSize) && readUInt8(hdl, _linksShift)))
 			return false;
-	}
 
-	_init = true;
+		quint8 tableId = ((info >> 2) & 0xF);
+		if (_linksSize && (!rgn->huffmanTable() || rgn->huffmanTable()->id()
+		  != tableId)) {
+			_huffmanTable = new HuffmanTable(tableId);
+			if (!_huffmanTable->load(rgn, rgnHdl))
+				return false;
+		}
+
+		_tp = _huffmanTable ? _huffmanTable : rgn->huffmanTable();
+	}
 
 	return true;
 }
 
-bool NETFile::link(const SubDiv *subdiv, quint32 shift, Handle &hdl,
-  NODFile *nod, Handle &nodHdl, LBLFile *lbl, Handle &lblHdl,
-  const NODFile::BlockInfo blockInfo, quint8 linkId, quint8 lineId,
-  const HuffmanTable &table, QList<IMG::Poly> *lines)
+void NETFile::clear()
 {
-	if (!_init && !init(hdl))
-		return false;
+	delete _huffmanTable;
+	_huffmanTable = 0;
+}
 
-	Q_ASSERT(_tableId == table.id());
-	if (_tableId != table.id())
-		return false;
-
-	IMG::Poly poly;
+bool NETFile::link(const SubDiv *subdiv, quint32 shift, Handle &hdl,
+  const NODFile *nod, Handle &nodHdl, const LBLFile *lbl, Handle &lblHdl,
+  const NODFile::BlockInfo &blockInfo, quint8 linkId, quint8 lineId,
+  QList<MapData::Poly> *lines) const
+{
+	MapData::Poly poly;
 	if (!nod->linkType(nodHdl, blockInfo, linkId, poly.type))
 		return false;
 
@@ -447,7 +450,7 @@ bool NETFile::link(const SubDiv *subdiv, quint32 shift, Handle &hdl,
 
 		if (s69 == 1) {
 			if (s68 == 1) {
-				if (!readShape(nod, nodHdl, adj, bs, table, subdiv, shift, poly))
+				if (!readShape(nod, nodHdl, adj, bs, _tp, subdiv, shift, poly))
 					return false;
 			} else {
 				if (!readNodeGeometry(nod, nodHdl, adj, poly))
@@ -461,7 +464,7 @@ bool NETFile::link(const SubDiv *subdiv, quint32 shift, Handle &hdl,
 				if (i == lineId) {
 					if (shape) {
 						bool check = (i < ca.size()) ? (ca.at(i) & mask) : false;
-						if (!readShape(nod, nodHdl, adj, bs, table, subdiv,
+						if (!readShape(nod, nodHdl, adj, bs, _tp, subdiv,
 						  shift, poly, step, check))
 							return false;
 					} else {
@@ -485,23 +488,21 @@ bool NETFile::link(const SubDiv *subdiv, quint32 shift, Handle &hdl,
 			return false;
 		if (!seekToLine(bs, lineId))
 			return false;
-		if (!readLine(bs, subdiv, table, poly))
+		if (!readLine(bs, subdiv, _tp, poly))
 			return false;
 	}
 
-	linkLabel(hdl, linkOffset, _linksSize - (linkOffset - _linksOffset), lbl,
-	  lblHdl, poly.label);
+	if (lbl)
+		linkLabel(hdl, linkOffset, _linksSize - (linkOffset - _linksOffset),
+		  lbl, lblHdl, poly.label);
 
 	lines->append(poly);
 
 	return true;
 }
 
-bool NETFile::lblOffset(Handle &hdl, quint32 netOffset, quint32 &lblOffset)
+bool NETFile::lblOffset(Handle &hdl, quint32 netOffset, quint32 &lblOffset) const
 {
-	if (!_init && !init(hdl))
-		return false;
-
 	if (!(seek(hdl, _offset + (netOffset << _shift))
 	  && readUInt24(hdl, lblOffset)))
 		return false;

src/map/IMG/netfile.h

@@ -1,42 +1,44 @@
 #ifndef NETFILE_H
 #define NETFILE_H
 
-#include "img.h"
 #include "subfile.h"
 #include "nodfile.h"
 
-class NODFile;
 class LBLFile;
+class RGNFile;
 class SubDiv;
 class HuffmanTable;
 
 class NETFile : public SubFile
 {
 public:
-	NETFile(IMG *img) : SubFile(img), _offset(0), _size(0), _linksOffset(0),
-	  _linksSize(0), _shift(0), _linksShift(0), _init(false) {}
-	NETFile(const QString &path) : SubFile(path), _offset(0), _size(0),
-	  _linksOffset(0), _linksSize(0), _shift(0), _linksShift(0),
-	  _init(false) {}
-	NETFile(SubFile *gmp, quint32 offset) : SubFile(gmp, offset),
+	NETFile(IMG *img) : SubFile(img), _huffmanTable(0), _tp(0), _offset(0),
+	  _size(0), _linksOffset(0), _linksSize(0), _shift(0), _linksShift(0) {}
+	NETFile(const QString *path) : SubFile(path), _huffmanTable(0), _tp(0),
 	  _offset(0), _size(0), _linksOffset(0), _linksSize(0), _shift(0),
-	  _linksShift(0), _init(false) {}
+	  _linksShift(0) {}
+	NETFile(SubFile *gmp, quint32 offset) : SubFile(gmp, offset),
+	  _huffmanTable(0), _tp(0), _offset(0), _size(0), _linksOffset(0),
+	  _linksSize(0), _shift(0), _linksShift(0) {}
+	~NETFile();
 
-	bool lblOffset(Handle &hdl, quint32 netOffset, quint32 &lblOffset);
-	bool link(const SubDiv *subdiv, quint32 shift, Handle &hdl, NODFile *nod,
-	  Handle &nodHdl, LBLFile *lbl, Handle &lblHdl,
-	  const NODFile::BlockInfo blockInfo, quint8 linkId, quint8 lineId,
-	  const HuffmanTable &table, QList<IMG::Poly> *lines);
+	bool load(Handle &hdl, const RGNFile *rgn, Handle &rgnHdl);
+	void clear();
+
+	bool lblOffset(Handle &hdl, quint32 netOffset, quint32 &lblOffset) const;
+	bool link(const SubDiv *subdiv, quint32 shift, Handle &hdl,
+	  const NODFile *nod, Handle &nodHdl, const LBLFile *lbl, Handle &lblHdl,
+	  const NODFile::BlockInfo &blockInfo, quint8 linkId, quint8 lineId,
+	  QList<MapData::Poly> *lines) const;
 
 private:
-	bool init(Handle &hdl);
-	bool linkLabel(Handle &hdl, quint32 offset, quint32 size, LBLFile *lbl,
-	  Handle &lblHdl, Label &label);
+	bool linkLabel(Handle &hdl, quint32 offset, quint32 size,
+	  const LBLFile *lbl, Handle &lblHdl, Label &label) const;
 
+	HuffmanTable *_huffmanTable;
+	const HuffmanTable *_tp;
 	quint32 _offset, _size, _linksOffset, _linksSize;
 	quint8 _shift, _linksShift;
-	quint8 _tableId;
-	bool _init;
 };
 
 #endif // NETFILE_H

src/map/IMG/nodfile.cpp

@@ -5,7 +5,8 @@
 #define ARRAY_SIZE(array) \
   (sizeof(array) / sizeof(array[0]))
 
-static const struct {
+static const struct
+{
 	quint8 lon;
 	quint8 lat;
 } LLBITS[] = {
@@ -13,12 +14,16 @@ static const struct {
 	{0x14, 0xc}, {0x14, 0x14}
 };
 
-union NodeShift {
-	qint32 offset;
-	quint8 id;
+struct NodeOffset
+{
+	bool ext;
+	union {
+		qint32 offset;
+		quint8 id;
+	} u;
 };
 
-static bool adjDistInfo(BitStream1 &bs, bool extraBit, quint8 &flags)
+static bool adjDistInfo(BitStream1 &bs, bool extraBit, bool &eog)
 {
 	quint32 data, cnt;
 
@@ -26,7 +31,7 @@ static bool adjDistInfo(BitStream1 &bs, bool extraBit, quint8 &flags)
 		return false;
 
 	data <<= !extraBit;
-	flags |= (quint8)data & 1;
+	eog |= (quint8)data & 1;
 	data >>= 1;
 
 	for (cnt = 0; (data >> cnt) & 1; cnt++) {
@@ -39,8 +44,7 @@ static bool adjDistInfo(BitStream1 &bs, bool extraBit, quint8 &flags)
 	return true;
 }
 
-static bool adjNodeInfo(BitStream1 &bs, bool extraBit, NodeShift &shift,
-  quint8 &flags)
+static bool adjNodeInfo(BitStream1 &bs, bool extraBit, NodeOffset &offset)
 {
 	quint32 data;
 
@@ -49,19 +53,20 @@ static bool adjNodeInfo(BitStream1 &bs, bool extraBit, NodeShift &shift,
 
 	data <<= !extraBit;
 
-	if (data & 1)
-		shift.id = data >> 1;
-	else {
+	if (data & 1) {
+		offset.ext = true;
+		offset.u.id = data >> 1;
+	} else {
 		quint32 bits = (data >> 1) & 7;
 		quint32 data2;
-		flags |= 2;
 
 		if (!bs.read(bits + extraBit + 1, data2))
 			return false;
 
 		data = data2 << (6 - extraBit) | data >> 4;
 		bits = 0x19 - bits;
-		shift.offset = ((qint32)(data << bits) >> bits);
+		offset.ext = false;
+		offset.u.offset = ((qint32)(data << bits) >> bits);
 	}
 
 	return true;
@@ -76,42 +81,36 @@ static bool skipOptAdjData(BitStream1 &bs)
 }
 
 
-bool NODFile::init(Handle &hdl)
+bool NODFile::load(Handle &hdl)
 {
 	quint16 hdrLen;
 
 	if (!(seek(hdl, _gmpOffset) && readUInt16(hdl, hdrLen)))
 		return false;
+	if (hdrLen < 0x7b)
+		return true;
 
-	if (hdrLen >= 0x7b) {
-		if (!(seek(hdl, _gmpOffset + 0x1d) && readUInt32(hdl, _flags)
-		  && readUInt8(hdl, _blockShift) && readUInt8(hdl, _nodeShift)))
-			return false;
+	if (!(seek(hdl, _gmpOffset + 0x1d) && readUInt32(hdl, _flags)
+	  && readUInt8(hdl, _blockShift) && readUInt8(hdl, _nodeShift)))
+		return false;
 
-		if (!(seek(hdl, _gmpOffset + 0x67) && readUInt32(hdl, _blockOffset)
-		  && readUInt32(hdl, _blockSize) && readUInt16(hdl, _blockRecordSize)
-		  && readUInt32(hdl, _indexOffset) && readUInt32(hdl, _indexSize)
-		  && readUInt16(hdl, _indexRecordSize) && readUInt32(hdl, _indexFlags)))
-			return false;
-	}
-
-	return true;
-}
-
-quint32 NODFile::indexIdSize(Handle &hdl)
-{
-	if (!_indexRecordSize && !init(hdl))
-		return 0;
+	if (!(seek(hdl, _gmpOffset + 0x67) && readUInt32(hdl, _blockOffset)
+	  && readUInt32(hdl, _blockSize) && readUInt16(hdl, _blockRecordSize)
+	  && readUInt32(hdl, _indexOffset) && readUInt32(hdl, _indexSize)
+	  && readUInt16(hdl, _indexRecordSize) && readUInt32(hdl, _indexFlags)))
+		return false;
 
+	if (!_indexRecordSize)
+		return false;
 	quint32 indexCount = _indexSize / _indexRecordSize;
 	if (indexCount <= 0x100)
-		return 1;
+		_indexIdSize = 1;
 	else if (indexCount <= 0x1000)
-		return 2;
+		_indexIdSize = 2;
 	else if (indexCount <= 0x1000000)
-		return 3;
-	else
-		return 0;
+		_indexIdSize = 3;
+
+	return (_indexIdSize > 0);
 }
 
 bool NODFile::readBlock(Handle &hdl, quint32 blockOffset,
@@ -300,13 +299,14 @@ bool NODFile::absAdjInfo(Handle &hdl, AdjacencyInfo &adj) const
 	quint32 m2p = 2;
 	quint32 skip = 8;
 	quint32 flags;
-	quint32 nextOffset;
+	quint32 nextOffset = 0xFFFFFFFF;
 	bool extraBit = (adj.nodeInfo.flags >> 6) & 1;
 	bool linkIdValid = true;
 	bool firstLoop = true;
+	NodeOffset offset;
 
 	do {
-		adj.flags = 0;
+		adj.eog = false;
 
 		if (!bs.read(8, flags))
 			return false;
@@ -334,15 +334,15 @@ bool NODFile::absAdjInfo(Handle &hdl, AdjacencyInfo &adj) const
 		}
 
 		if (!(flags & 0x10)) {
-			if (!adjDistInfo(bs, (m2 == 1 && linkIdValid), adj.flags))
+			if (!adjDistInfo(bs, (m2 == 1 && linkIdValid), adj.eog))
 				return false;
 
-			NodeShift shift;
-			if (!adjNodeInfo(bs, extraBit, shift, adj.flags))
+			if (!adjNodeInfo(bs, extraBit, offset))
 				return false;
-			if (adj.flags & 2)
-				nextOffset = adj.nodeOffset + shift.offset;
-			else if (!nodeOffset(adj.extHdl, adj.blockInfo, shift.id, nextOffset))
+			if (!offset.ext)
+				nextOffset = adj.nodeOffset + offset.u.offset;
+			else if (!nodeOffset(adj.extHdl, adj.blockInfo, offset.u.id,
+			  nextOffset))
 				return false;
 
 			m2p = m2;
@@ -371,7 +371,7 @@ bool NODFile::absAdjInfo(Handle &hdl, AdjacencyInfo &adj) const
 
 			if ((adj.linkOffset == li.linkOffset) || (adj.linkId == linkId)) {
 				adj.nodeOffset = nextOffset;
-				if (!(adj.flags & 2)) {
+				if (offset.ext) {
 					adj.linkId = 0xFFFFFFFF;
 					return nodeBlock(hdl, adj.nodeOffset << _nodeShift,
 					  adj.blockInfo);
@@ -403,13 +403,14 @@ bool NODFile::relAdjInfo(Handle &hdl, AdjacencyInfo &adj) const
 	quint32 skip = 8;
 	quint32 flagsBits = 8;
 	quint32 flags;
-	quint32 nextOffset;
+	quint32 nextOffset = 0xFFFFFFFF;
+	NodeOffset offset;
 	bool extraBit = (adj.nodeInfo.flags >> 6) & 1;
 	bool linkIdValid = true;
 	bool firstLoop = true;
 
 	do {
-		adj.flags = 0;
+		adj.eog = false;
 
 		if (!bs.read(flagsBits, flags))
 			return false;
@@ -440,17 +441,17 @@ bool NODFile::relAdjInfo(Handle &hdl, AdjacencyInfo &adj) const
 		}
 
 		if ((flags & 0x50) == 0x50) {
-			if (!adjDistInfo(bs, false, adj.flags))
+			if (!adjDistInfo(bs, false, adj.eog))
 				return false;
-			adj.flags |= 1;
+			adj.eog = true;
 		}
 		if ((flags >> 6) & 1) {
-			NodeShift shift;
-			if (!adjNodeInfo(bs, extraBit, shift, adj.flags))
+			if (!adjNodeInfo(bs, extraBit, offset))
 				return false;
-			if (adj.flags & 2)
-				nextOffset = adj.nodeOffset + shift.offset;
-			else if (!nodeOffset(adj.extHdl, adj.blockInfo, shift.id, nextOffset))
+			if (!offset.ext)
+				nextOffset = adj.nodeOffset + offset.u.offset;
+			else if (!nodeOffset(adj.extHdl, adj.blockInfo, offset.u.id,
+			  nextOffset))
 				return false;
 		}
 
@@ -467,7 +468,7 @@ bool NODFile::relAdjInfo(Handle &hdl, AdjacencyInfo &adj) const
 
 			if ((adj.linkOffset == li.linkOffset) || (adj.linkId == linkId)) {
 				adj.nodeOffset = nextOffset;
-				if (!(adj.flags & 2)) {
+				if (offset.ext) {
 					adj.linkId = 0xFFFFFFFF;
 					return nodeBlock(hdl, adj.nodeOffset << _nodeShift,
 					  adj.blockInfo);
@@ -485,7 +486,7 @@ bool NODFile::relAdjInfo(Handle &hdl, AdjacencyInfo &adj) const
 	return true;
 }
 
-int NODFile::nextNode(Handle &hdl, AdjacencyInfo &adjInfo)
+int NODFile::nextNode(Handle &hdl, AdjacencyInfo &adjInfo) const
 {
 	if (adjInfo.nodeOffset == 0xFFFFFFFF)
 		return 1;
@@ -507,42 +508,35 @@ bool NODFile::linkType(Handle &hdl, const BlockInfo &blockInfo, quint8 linkId,
 	  + blockInfo.hdr.s11 * 3;
 	quint32 low = 0;
 	quint32 high = blockInfo.hdr.s12 - 1;
-	quint32 pos;
+	quint32 pos = blockInfo.hdr.s12;
 	quint16 val;
 
 	if (high > 1) {
 		do {
 			pos = (low + high) / 2;
 
-			if (!seek(hdl, offset + _blockRecordSize * pos))
-				return false;
-			if (!readUInt16(hdl, val))
+			if (!(seek(hdl, offset + _blockRecordSize * pos)
+			  && readUInt16(hdl, val)))
 				return false;
 
-			quint32 tmp = pos;
-			if ((val >> 8) <= linkId) {
+			if ((val >> 8) <= linkId)
 				low = pos;
-				tmp = high;
-			}
-			high = tmp;
+			else
+				high = pos;
 		} while (low + 1 < high);
 	}
 
-	if (!seek(hdl, offset + _blockRecordSize * low))
-		return false;
-	if (!readUInt16(hdl, val))
+	if (!(seek(hdl, offset + _blockRecordSize * low) && readUInt16(hdl, val)))
 		return false;
 
 	type = val & 0x3f;
 
 	if ((low < high) && (pos != high)) {
-		if (!seek(hdl, offset + _blockRecordSize * high))
+		if (!(seek(hdl, offset + _blockRecordSize * high)
+		  && readUInt16(hdl, val)))
 			return false;
-		if (!readUInt16(hdl, val))
-			return false;
-		if ((val >> 8) <= linkId) {
+		if ((val >> 8) <= linkId)
 			type = (val & 0x3f);
-		}
 	}
 
 	type <<= 8;

src/map/IMG/nodfile.h

@@ -1,7 +1,6 @@
 #ifndef NODFILE_H
 #define NODFILE_H
 
-#include "img.h"
 #include "subfile.h"
 
 class NODFile : public SubFile
@@ -46,35 +45,36 @@ public:
 		{}
 
 		Handle extHdl;
-		struct BlockInfo blockInfo;
-		struct NodeInfo nodeInfo;
+		BlockInfo blockInfo;
+		NodeInfo nodeInfo;
 		quint32 nodeOffset;
 		quint32 linkOffset;
 		quint32 linkId;
-		quint8 flags;
+		bool eog;
 	};
 
 	NODFile(IMG *img) : SubFile(img), _indexOffset(0), _indexSize(0),
 	  _indexFlags(0), _blockOffset(0), _blockSize(0), _indexRecordSize(0),
-	  _blockRecordSize(0), _blockShift(0), _nodeShift(0) {}
-	NODFile(const QString &path) : SubFile(path), _indexOffset(0), _indexSize(0),
+	  _blockRecordSize(0), _blockShift(0), _nodeShift(0), _indexIdSize(0) {}
+	NODFile(const QString *path) : SubFile(path), _indexOffset(0), _indexSize(0),
 	  _indexFlags(0), _blockOffset(0), _blockSize(0), _indexRecordSize(0),
-	  _blockRecordSize(0), _blockShift(0), _nodeShift(0) {}
+	  _blockRecordSize(0), _blockShift(0), _nodeShift(0), _indexIdSize(0) {}
 	NODFile(SubFile *gmp, quint32 offset) : SubFile(gmp, offset),
-	  _indexOffset(0), _indexSize(0),_indexFlags(0), _blockOffset(0),
+	  _indexOffset(0), _indexSize(0), _indexFlags(0), _blockOffset(0),
 	  _blockSize(0), _indexRecordSize(0), _blockRecordSize(0), _blockShift(0),
-	  _nodeShift(0) {}
+	  _nodeShift(0), _indexIdSize(0) {}
 
-	quint32 indexIdSize(Handle &hdl);
+	bool load(Handle &hdl);
+
+	quint32 indexIdSize() const {return _indexIdSize;}
 	bool blockInfo(Handle &hdl, quint32 blockId, BlockInfo &blockInfo) const;
 	bool linkInfo(Handle &hdl, const BlockInfo &blockInfo, quint32 linkId,
 	  LinkInfo &linkInfo) const;
 	bool linkType(Handle &hdl, const BlockInfo &blockInfo, quint8 linkId,
 	  quint32 &type) const;
-	int nextNode(Handle &hdl, AdjacencyInfo &adjInfo);
+	int nextNode(Handle &hdl, AdjacencyInfo &adjInfo) const;
 
 private:
-	bool init(Handle &hdl);
 	bool nodeInfo(Handle &hdl, const BlockInfo &blockInfo, quint32 nodeOffset,
 	  NodeInfo &nodeInfo) const;
 	bool nodeOffset(Handle &hdl, const BlockInfo &blockInfo, quint8 nodeId,
@@ -89,10 +89,10 @@ private:
 	bool nodeBlock(Handle &hdl, quint32 nodeOffset, BlockInfo &blockInfo) const;
 	bool readBlock(Handle &hdl, quint32 blockOffset, BlockInfo &blockInfo) const;
 
-	quint32 _indexOffset, _indexSize, _indexFlags, _blockOffset, _blockSize;
+	quint32 _flags, _indexOffset, _indexSize, _indexFlags, _blockOffset,
+	  _blockSize;
 	quint16 _indexRecordSize, _blockRecordSize;
-	quint8 _blockShift, _nodeShift;
-	quint32 _flags;
+	quint8 _blockShift, _nodeShift, _indexIdSize;
 };
 
 #endif // NETFILE_H

src/map/IMG/rastertile.cpp

@@ -28,7 +28,7 @@ static int minPOIZoom(Style::POIClass cl)
 		case Style::Food:
 		case Style::Shopping:
 		case Style::Services:
-			return 27;
+			return 26;
 		case Style::Accommodation:
 		case Style::Recreation:
 			return 25;
@@ -237,10 +237,28 @@ void RasterTile::drawTextItems(QPainter *painter,
 		textItems.at(i)->paint(painter);
 }
 
+static void removeDuplicitLabel(QList<TextItem *> &labels, const QString &text,
+  const QRectF &tileRect)
+{
+	for (int i = 0; i < labels.size(); i++) {
+		TextItem *item = labels.at(i);
+		if (tileRect.contains(item->boundingRect()) && *(item->text()) == text) {
+			labels.removeAt(i);
+			delete item;
+			return;
+		}
+	}
+}
+
 void RasterTile::processPolygons(QList<TextItem*> &textItems)
 {
+	QRectF tileRect(_xy, _img.size());
+	QSet<QString> set;
+	QList<TextItem *> labels;
+
 	for (int i = 0; i < _polygons.size(); i++) {
 		MapData::Poly &poly = _polygons[i];
+		bool exists = set.contains(poly.label.text());
 
 		if (poly.label.text().isEmpty())
 			continue;
@@ -253,12 +271,20 @@ void RasterTile::processPolygons(QList<TextItem*> &textItems)
 			  centroid(poly.points).toPoint(), &poly.label.text(),
 			  poiFont(), 0, &style.brush().color());
 			if (item->isValid() && !item->collides(textItems)
-			  && rectNearPolygon(poly.points, item->boundingRect()))
-				textItems.append(item);
-			else
+			  && !item->collides(labels)
+			  && !(exists && tileRect.contains(item->boundingRect()))
+			  && rectNearPolygon(poly.points, item->boundingRect())) {
+				if (exists)
+					removeDuplicitLabel(labels, poly.label.text(), tileRect);
+				else
+					set.insert(poly.label.text());
+				labels.append(item);
+			} else
 				delete item;
 		}
 	}
+
+	textItems.append(labels);
 }
 
 void RasterTile::processLines(QList<TextItem*> &textItems)
@@ -372,14 +398,15 @@ void RasterTile::processPoints(QList<TextItem*> &textItems)
 	for (int i = 0; i < _points.size(); i++) {
 		MapData::Point &point = _points[i];
 		const Style::Point &style = _style->point(point.type);
+		bool poi = Style::isPOI(point.type);
 
-		if (point.poi && _zoom < minPOIZoom(Style::poiClass(point.type)))
+		if (poi && _zoom < minPOIZoom(Style::poiClass(point.type)))
 			continue;
 
 		const QString *label = point.label.text().isEmpty()
 		  ? 0 : &(point.label.text());
 		const QImage *img = style.img().isNull() ? 0 : &style.img();
-		const QFont *fnt = point.poi
+		const QFont *fnt = poi
 		  ? poiFont(style.textFontSize()) : font(style.textFontSize());
 		const QColor *color = style.textColor().isValid()
 		  ? &style.textColor() : 0;

src/map/IMG/rgnfile.cpp

@@ -24,6 +24,11 @@ static quint64 pointId(const QPoint &pos, quint32 type, quint32 labelPtr)
 	return id;
 }
 
+RGNFile::~RGNFile()
+{
+	delete _huffmanTable;
+}
+
 bool RGNFile::skipClassFields(Handle &hdl) const
 {
 	quint8 flags;
@@ -96,7 +101,7 @@ bool RGNFile::skipGblFields(Handle &hdl, quint32 flags) const
 	return seek(hdl, pos(hdl) + cnt);
 }
 
-bool RGNFile::init(Handle &hdl)
+bool RGNFile::load(Handle &hdl)
 {
 	quint16 hdrLen;
 
@@ -125,24 +130,29 @@ bool RGNFile::init(Handle &hdl)
 	}
 
 	if (hdrLen >= 0x7D) {
-		quint32 dictOffset, dictSize, info;
-		if (!(seek(hdl, _gmpOffset + 0x71) && readUInt32(hdl, dictOffset)
-		  && readUInt32(hdl, dictSize) && readUInt32(hdl, info)))
+		quint32 info;
+		if (!(seek(hdl, _gmpOffset + 0x71) && readUInt32(hdl, _dictOffset)
+		  && readUInt32(hdl, _dictSize) && readUInt32(hdl, info)))
 			return false;
 
-		if (dictSize && dictOffset && (info & 0x1E))
-			if (!_huffmanTable.load(*this, hdl, dictOffset, dictSize,
-			  ((info >> 1) & 0xF) - 1))
+		if (_dictSize && _dictOffset && (info & 0x1E)) {
+			_huffmanTable = new HuffmanTable(((info >> 1) & 0xF) - 1);
+			if (!_huffmanTable->load(this, hdl))
 				return false;
+		}
 	}
 
-	_init = true;
-
 	return true;
 }
 
+void RGNFile::clear()
+{
+	delete _huffmanTable;
+	_huffmanTable = 0;
+}
+
 bool RGNFile::polyObjects(Handle &hdl, const SubDiv *subdiv,
-  SegmentType segmentType, LBLFile *lbl, Handle &lblHdl, NETFile *net,
+  SegmentType segmentType, const LBLFile *lbl, Handle &lblHdl, NETFile *net,
   Handle &netHdl, QList<IMG::Poly> *polys) const
 {
 	const SubDiv::Segment &segment = (segmentType == Line)
@@ -218,7 +228,7 @@ bool RGNFile::polyObjects(Handle &hdl, const SubDiv *subdiv,
 }
 
 bool RGNFile::extPolyObjects(Handle &hdl, const SubDiv *subdiv, quint32 shift,
-  SegmentType segmentType, LBLFile *lbl, Handle &lblHdl,
+  SegmentType segmentType, const LBLFile *lbl, Handle &lblHdl,
   QList<IMG::Poly> *polys) const
 {
 	quint32 labelPtr, len;
@@ -246,13 +256,13 @@ bool RGNFile::extPolyObjects(Handle &hdl, const SubDiv *subdiv, quint32 shift,
 		poly.type = 0x10000 | (quint16(type)<<8) | (subtype & 0x1F);
 		labelPtr = 0;
 
-		if (!_huffmanTable.isNull()) {
+		if (_huffmanTable) {
 			pos = QPoint(LS(subdiv->lon(), 8) + LS(lon, 32-subdiv->bits()),
 			  LS(subdiv->lat(), 8) + LS(lat, (32-subdiv->bits())));
 
 			qint32 lonDelta, latDelta;
 			BitStream4F bs(*this, hdl, len);
-			HuffmanStreamF stream(bs, _huffmanTable);
+			HuffmanStreamF stream(bs, *_huffmanTable);
 			if (!stream.init(segmentType == Line))
 				return false;
 
@@ -329,7 +339,7 @@ bool RGNFile::extPolyObjects(Handle &hdl, const SubDiv *subdiv, quint32 shift,
 }
 
 bool RGNFile::pointObjects(Handle &hdl, const SubDiv *subdiv,
-  SegmentType segmentType, LBLFile *lbl, Handle &lblHdl,
+  SegmentType segmentType, const LBLFile *lbl, Handle &lblHdl,
   QList<IMG::Point> *points) const
 {
 	const SubDiv::Segment &segment = (segmentType == IndexedPoint)
@@ -362,11 +372,9 @@ bool RGNFile::pointObjects(Handle &hdl, const SubDiv *subdiv,
 		point.type = (quint16)type<<8 | subtype;
 		point.coordinates = Coordinates(toWGS24(pos.x()), toWGS24(pos.y()));
 		point.id = pointId(pos, point.type, labelPtr & 0x3FFFFF);
-		point.poi = labelPtr & 0x400000;
 		if (lbl && (labelPtr & 0x3FFFFF))
-			point.label = lbl->label(lblHdl, labelPtr & 0x3FFFFF, point.poi,
-			  !(point.type == 0x1400 || point.type == 0x1500
-			  || point.type == 0x1e00));
+			point.label = lbl->label(lblHdl, labelPtr & 0x3FFFFF, labelPtr & 0x400000,
+			  !(point.type == 0x1400 || point.type == 0x1500 || point.type == 0x1e00));
 
 		points->append(point);
 	}
@@ -374,11 +382,12 @@ bool RGNFile::pointObjects(Handle &hdl, const SubDiv *subdiv,
 	return true;
 }
 
-bool RGNFile::extPointObjects(Handle &hdl, const SubDiv *subdiv, LBLFile *lbl,
-  Handle &lblHdl, QList<IMG::Point> *points) const
+bool RGNFile::extPointObjects(Handle &hdl, const SubDiv *subdiv,
+  const LBLFile *lbl, Handle &lblHdl, QList<IMG::Point> *points) const
 {
 	const SubDiv::Segment &segment = subdiv->extPoints();
 
+
 	if (!segment.isValid())
 		return true;
 	if (!seek(hdl, segment.offset()))
@@ -414,9 +423,8 @@ bool RGNFile::extPointObjects(Handle &hdl, const SubDiv *subdiv, LBLFile *lbl,
 
 		point.coordinates = Coordinates(toWGS24(pos.x()), toWGS24(pos.y()));
 		point.id = pointId(pos, point.type, labelPtr & 0x3FFFFF);
-		point.poi = labelPtr & 0x400000;
 		if (lbl && (labelPtr & 0x3FFFFF))
-			point.label = lbl->label(lblHdl, labelPtr & 0x3FFFFF, point.poi);
+			point.label = lbl->label(lblHdl, labelPtr & 0x3FFFFF, false);
 
 		points->append(point);
 	}
@@ -425,30 +433,27 @@ bool RGNFile::extPointObjects(Handle &hdl, const SubDiv *subdiv, LBLFile *lbl,
 }
 
 bool RGNFile::links(Handle &hdl, const SubDiv *subdiv, quint32 shift,
-  NETFile *net, Handle &netHdl, NODFile *nod, Handle &nodHdl, LBLFile *lbl,
-  Handle &lblHdl, QList<IMG::Poly> *lines) const
+  const NETFile *net, Handle &netHdl, const NODFile *nod, Handle &nodHdl,
+  const LBLFile *lbl, Handle &lblHdl, QList<IMG::Poly> *lines) const
 {
-	quint32 size, blockIndexIdSize, blockIndexId;
+	quint32 size, blockIndexId;
 	quint8 flags;
 	const SubDiv::Segment &segment = subdiv->roadReferences();
 
+	if (!net || !nod)
+		return false;
 	if (!segment.isValid())
 		return true;
 	if (!seek(hdl, segment.offset()))
 		return false;
 
-	if (!net || !nod)
-		return false;
-	if (!(blockIndexIdSize = nod->indexIdSize(nodHdl)))
-		return false;
-
 	while (pos(hdl) < segment.end()) {
 		if (!readVUInt32(hdl, size))
 			return false;
 
 		quint32 entryStart = pos(hdl);
 
-		if (!(readUInt8(hdl, flags) && readVUInt32(hdl, blockIndexIdSize,
+		if (!(readUInt8(hdl, flags) && readVUInt32(hdl, nod->indexIdSize(),
 		  blockIndexId)))
 			return false;
 
@@ -496,10 +501,11 @@ bool RGNFile::links(Handle &hdl, const SubDiv *subdiv, quint32 shift,
 			}
 
 			net->link(subdiv, shift, netHdl, nod, nodHdl, lbl, lblHdl,
-			  blockInfo, linkId, lineId, _huffmanTable, lines);
+			  blockInfo, linkId, lineId, lines);
 		}
 
-		Q_ASSERT(entryStart + size == pos(hdl));
+		if (entryStart + size != pos(hdl))
+			return false;
 	}
 
 	return true;
@@ -548,7 +554,7 @@ QMap<RGNFile::SegmentType, SubDiv::Segment> RGNFile::segments(Handle &hdl,
 	return ret;
 }
 
-bool RGNFile::subdivInit(Handle &hdl, SubDiv *subdiv) const
+bool RGNFile::subdivInit(Handle &hdl, SubDiv *subdiv)
 {
 	QMap<RGNFile::SegmentType, SubDiv::Segment> seg(segments(hdl, subdiv));
 	SubDiv::Segment extPoints, extLines, extPolygons;

src/map/IMG/rgnfile.h

@@ -1,14 +1,13 @@
 #ifndef RGNFILE_H
 #define RGNFILE_H
 
-#include "img.h"
 #include "subfile.h"
 #include "subdiv.h"
-#include "huffmantable.h"
 
 class LBLFile;
 class NETFile;
 class NODFile;
+class HuffmanTable;
 
 class RGNFile : public SubFile
 {
@@ -22,35 +21,41 @@ public:
 	};
 
 	RGNFile(IMG *img)
-	  : SubFile(img), _offset(0), _size(0), _polygonsOffset(0),
+	  : SubFile(img), _huffmanTable(0), _offset(0), _size(0), _polygonsOffset(0),
 	  _polygonsSize(0), _linesOffset(0), _linesSize(0), _pointsOffset(0),
-	  _pointsSize(0), _init(false) {}
-	RGNFile(const QString &path)
-	  : SubFile(path), _offset(0), _size(0), _polygonsOffset(0),
+	  _pointsSize(0) {}
+	RGNFile(const QString *path)
+	  : SubFile(path), _huffmanTable(0), _offset(0), _size(0), _polygonsOffset(0),
 	  _polygonsSize(0), _linesOffset(0), _linesSize(0), _pointsOffset(0),
-	  _pointsSize(0), _init(false) {}
-	RGNFile(SubFile *gmp, quint32 offset) : SubFile(gmp, offset), _offset(0),
-	  _size(0), _polygonsOffset(0), _polygonsSize(0), _linesOffset(0),
-	  _linesSize(0), _pointsOffset(0), _pointsSize(0), _init(false) {}
+	  _pointsSize(0) {}
+	RGNFile(SubFile *gmp, quint32 offset) : SubFile(gmp, offset),
+	  _huffmanTable(0), _offset(0), _size(0), _polygonsOffset(0),
+	  _polygonsSize(0), _linesOffset(0), _linesSize(0), _pointsOffset(0),
+	  _pointsSize(0) {}
+	~RGNFile();
 
-	bool initialized() const {return _init;}
-	bool init(Handle &hdl);
+	void clear();
+	bool load(Handle &hdl);
 
 	bool polyObjects(Handle &hdl, const SubDiv *subdiv, SegmentType segmentType,
-	  LBLFile *lbl, Handle &lblHdl, NETFile *net, Handle &netHdl,
-	  QList<IMG::Poly> *polys) const;
+	  const LBLFile *lbl, Handle &lblHdl, NETFile *net, Handle &netHdl,
+	  QList<MapData::Poly> *polys) const;
 	bool pointObjects(Handle &hdl, const SubDiv *subdiv, SegmentType segmentType,
-	  LBLFile *lbl, Handle &lblHdl, QList<IMG::Point> *points) const;
+	  const LBLFile *lbl, Handle &lblHdl, QList<MapData::Point> *points) const;
 	bool extPolyObjects(Handle &hdl, const SubDiv *subdiv, quint32 shift,
-	  SegmentType segmentType, LBLFile *lbl, Handle &lblHdl,
-	  QList<IMG::Poly> *polys) const;
-	bool extPointObjects(Handle &hdl, const SubDiv *subdiv, LBLFile *lbl,
-	  Handle &lblHdl, QList<IMG::Point> *points) const;
-	bool links(Handle &hdl, const SubDiv *subdiv, quint32 shift, NETFile *net,
-	  Handle &netHdl, NODFile *nod, Handle &nodHdl, LBLFile *lbl, Handle &lblHdl,
-	  QList<IMG::Poly> *lines) const;
+	  SegmentType segmentType, const LBLFile *lbl, Handle &lblHdl,
+	  QList<MapData::Poly> *polys) const;
+	bool extPointObjects(Handle &hdl, const SubDiv *subdiv, const LBLFile *lbl,
+	  Handle &lblHdl, QList<MapData::Point> *points) const;
+	bool links(Handle &hdl, const SubDiv *subdiv, quint32 shift,
+	  const NETFile *net, Handle &netHdl, const NODFile *nod, Handle &nodHdl,
+	  const LBLFile *lbl, Handle &lblHdl, QList<MapData::Poly> *lines) const;
 
-	bool subdivInit(Handle &hdl, SubDiv *subdiv) const;
+	bool subdivInit(Handle &hdl, SubDiv *subdiv);
+
+	const HuffmanTable *huffmanTable() const {return _huffmanTable;}
+	quint32 dictOffset() const {return _dictOffset;}
+	quint32 dictSize() const {return _dictSize;}
 
 private:
 	QMap<SegmentType, SubDiv::Segment> segments(Handle &hdl, SubDiv *subdiv)
@@ -60,8 +65,12 @@ private:
 	  const;
 	bool skipGblFields(Handle &hdl, quint32 flags) const;
 
+	HuffmanTable *_huffmanTable;
+
 	quint32 _offset;
 	quint32 _size;
+	quint32 _dictOffset;
+	quint32 _dictSize;
 
 	quint32 _polygonsOffset;
 	quint32 _polygonsSize;
@@ -75,10 +84,6 @@ private:
 	quint32 _pointsSize;
 	quint32 _pointsLclFlags[3];
 	quint32 _pointsGblFlags;
-
-	HuffmanTable _huffmanTable;
-
-	bool _init;
 };
 
 #endif // RGNFILE_H

src/map/IMG/style.cpp

@@ -39,9 +39,7 @@ void Style::defaultPolygonStyle()
 	_polygons[TYPE(0x1f)] = Polygon(QBrush(QColor("#9ac269"),
 	  Qt::BDiagPattern));
 	_polygons[TYPE(0x28)] = Polygon(QBrush("#9fc4e1"));
-	_polygons[TYPE(0x29)] = Polygon(QBrush("#9fc4e1"));
 	_polygons[TYPE(0x32)] = Polygon(QBrush("#9fc4e1"));
-	_polygons[TYPE(0x3b)] = Polygon(QBrush("#9fc4e1"));
 	_polygons[TYPE(0x3c)] = Polygon(QBrush("#9fc4e1"));
 	_polygons[TYPE(0x3d)] = Polygon(QBrush("#9fc4e1"));
 	_polygons[TYPE(0x3e)] = Polygon(QBrush("#9fc4e1"));
@@ -51,13 +49,12 @@ void Style::defaultPolygonStyle()
 	_polygons[TYPE(0x42)] = Polygon(QBrush("#9fc4e1"));
 	_polygons[TYPE(0x43)] = Polygon(QBrush("#9fc4e1"));
 	_polygons[TYPE(0x44)] = Polygon(QBrush("#9fc4e1"));
-	_polygons[TYPE(0x45)] = Polygon(QBrush("#9fc4e1"));
 	_polygons[TYPE(0x46)] = Polygon(QBrush("#9fc4e1"));
 	_polygons[TYPE(0x47)] = Polygon(QBrush("#9fc4e1"));
 	_polygons[TYPE(0x48)] = Polygon(QBrush("#9fc4e1"));
 	_polygons[TYPE(0x49)] = Polygon(QBrush("#9fc4e1"));
-	_polygons[TYPE(0x4b)] = Polygon(QBrush("#f1f0e5"), QPen("#f1f0e5"));
 	_polygons[TYPE(0x4a)] = Polygon(QBrush("#f1f0e5"), QPen("#f1f0e5"));
+	_polygons[TYPE(0x4b)] = Polygon(QBrush("#f1f0e5"), QPen("#f1f0e5"));
 	_polygons[TYPE(0x4c)] = Polygon(QBrush("#9fc4e1", Qt::Dense6Pattern));
 	_polygons[TYPE(0x4d)] = Polygon(QBrush("#ddf1fd"));
 	_polygons[TYPE(0x4e)] = Polygon(QBrush("#f8f8f8"));
@@ -66,18 +63,73 @@ void Style::defaultPolygonStyle()
 	_polygons[TYPE(0x51)] = Polygon(QBrush("#9fc4e1", Qt::Dense4Pattern));
 	_polygons[TYPE(0x52)] = Polygon(QBrush("#cadfaf"));
 
-	_drawOrder << TYPE(0x4b) << TYPE(0x4a) << TYPE(0x01) << TYPE(0x02)
-	  << TYPE(0x03) << TYPE(0x17) << TYPE(0x18) << TYPE(0x1a) << TYPE(0x28)
-	  << TYPE(0x29) << TYPE(0x32) << TYPE(0x3b) << TYPE(0x3c) << TYPE(0x3d)
-	  << TYPE(0x3e) << TYPE(0x3f) << TYPE(0x40) << TYPE(0x41) << TYPE(0x42)
-	  << TYPE(0x43) << TYPE(0x44) << TYPE(0x45) << TYPE(0x46) << TYPE(0x47)
-	  << TYPE(0x48) << TYPE(0x49) << TYPE(0x4c) << TYPE(0x4d) << TYPE(0x4e)
-	  << TYPE(0x4f) << TYPE(0x50) << TYPE(0x51) << TYPE(0x52) << TYPE(0x14)
-	  << TYPE(0x15) << TYPE(0x16) << TYPE(0x1e) << TYPE(0x1f) << TYPE(0x04)
-	  << TYPE(0x05) << TYPE(0x06) << TYPE(0x07) << TYPE(0x08) << TYPE(0x09)
-	  << TYPE(0x0a) << TYPE(0x0b) << TYPE(0x0c) << TYPE(0x0d) << TYPE(0x0e)
-	  << TYPE(0x0f) << TYPE(0x10) << TYPE(0x11) << TYPE(0x12) << TYPE(0x19)
-	  << TYPE(0x13);
+	// NT types
+	_polygons[0x10800] = _polygons[TYPE(0x01)];
+	_polygons[0x10801] = _polygons[TYPE(0x02)];
+	_polygons[0x10802] = _polygons[TYPE(0x03)];
+	_polygons[0x10901] = _polygons[TYPE(0x04)];
+	_polygons[0x10902] = _polygons[TYPE(0x05)];
+	_polygons[0x10903] = _polygons[TYPE(0x06)];
+	_polygons[0x10904] = _polygons[TYPE(0x07)];
+	_polygons[0x10905] = _polygons[TYPE(0x08)];
+	_polygons[0x10906] = _polygons[TYPE(0x09)];
+	_polygons[0x10907] = _polygons[TYPE(0x0a)];
+	_polygons[0x10908] = _polygons[TYPE(0x0b)];
+	_polygons[0x10909] = _polygons[TYPE(0x0c)];
+	_polygons[0x1090a] = _polygons[TYPE(0x0d)];
+	_polygons[0x1090b] = _polygons[TYPE(0x0e)];
+	_polygons[0x10900] = _polygons[TYPE(0x13)];
+	_polygons[0x10a01] = _polygons[TYPE(0x14)];
+	_polygons[0x10a02] = _polygons[TYPE(0x15)];
+	_polygons[0x10a03] = _polygons[TYPE(0x16)];
+	_polygons[0x10a04] = _polygons[TYPE(0x17)];
+	_polygons[0x1090c] = _polygons[TYPE(0x18)];
+	_polygons[0x1090d] = _polygons[TYPE(0x19)];
+	_polygons[0x1090e] = _polygons[TYPE(0x1a)];
+	_polygons[0x10a05] = _polygons[TYPE(0x1e)];
+	_polygons[0x10a06] = _polygons[TYPE(0x1f)];
+	_polygons[0x10b01] = _polygons[TYPE(0x28)];
+	_polygons[0x10b02] = _polygons[TYPE(0x32)];
+	_polygons[0x10b03] = _polygons[TYPE(0x3c)];
+	_polygons[0x10b04] = _polygons[TYPE(0x3d)];
+	_polygons[0x10b05] = _polygons[TYPE(0x3e)];
+	_polygons[0x10b06] = _polygons[TYPE(0x3f)];
+	_polygons[0x10b07] = _polygons[TYPE(0x40)];
+	_polygons[0x10b08] = _polygons[TYPE(0x41)];
+	_polygons[0x10b09] = _polygons[TYPE(0x42)];
+	_polygons[0x10b0a] = _polygons[TYPE(0x43)];
+	_polygons[0x10b0b] = _polygons[TYPE(0x44)];
+	_polygons[0x10b0c] = _polygons[TYPE(0x46)];
+	_polygons[0x10b0d] = _polygons[TYPE(0x47)];
+	_polygons[0x10b0e] = _polygons[TYPE(0x48)];
+	_polygons[0x10b0f] = _polygons[TYPE(0x49)];
+	_polygons[0x10d01] = _polygons[TYPE(0x4b)];
+	_polygons[0x10b10] = _polygons[TYPE(0x4c)];
+	_polygons[0x10c00] = _polygons[TYPE(0x4d)];
+	_polygons[0x10c01] = _polygons[TYPE(0x4e)];
+	_polygons[0x10c02] = _polygons[TYPE(0x4f)];
+	_polygons[0x10c03] = _polygons[TYPE(0x50)];
+	_polygons[0x10c04] = _polygons[TYPE(0x51)];
+	_polygons[0x10c05] = _polygons[TYPE(0x52)];
+
+	// Draw order
+	_drawOrder << TYPE(0x4b) << 0x10d01 << TYPE(0x4a) << TYPE(0x01) << 0x10800
+	  << TYPE(0x02) << 0x10801 << TYPE(0x03) << 0x10802 << TYPE(0x17) << 0x10a04
+	  << TYPE(0x18) << 0x1090c << TYPE(0x1a) << 0x1090e << TYPE(0x28) << 0x10b01
+	  << TYPE(0x32) << 0x10b02 << TYPE(0x3c) << 0x10b03 << TYPE(0x3d) << 0x10b04
+	  << TYPE(0x3e) << 0x10b05 << TYPE(0x3f) << 0x10b06 << TYPE(0x40) << 0x10b07
+	  << TYPE(0x41) << 0x10b08 << TYPE(0x42) << 0x10b09 << TYPE(0x43) << 0x10b0a
+	  << TYPE(0x44) << 0x10b0b << TYPE(0x46) << 0x10b0c << TYPE(0x47) << 0x10b0d
+	  << TYPE(0x48) << 0x10b0e << TYPE(0x49) << 0x10b0f << TYPE(0x4c) << 0x10b10
+	  << TYPE(0x4d) << 0x10c00 << TYPE(0x4e) << 0x10c01 << TYPE(0x4f) << 0x10c02
+	  << TYPE(0x50) << 0x10c03 << TYPE(0x51) << 0x10c04 << TYPE(0x52) << 0x10c05
+	  << TYPE(0x14) << 0x10a01 << TYPE(0x15) << 0x10a02 << TYPE(0x16) << 0x10a03
+	  << TYPE(0x1e) << 0x10a05 << TYPE(0x1f) << 0x10a06 << TYPE(0x04) << 0x10901
+	  << TYPE(0x05) << 0x10902 << TYPE(0x06) << 0x10903 << TYPE(0x07) << 0x10904
+	  << TYPE(0x08) << 0x10905 << TYPE(0x09) << 0x10906 << TYPE(0x0a) << 0x10907
+	  << TYPE(0x0b) << 0x10908 << TYPE(0x0c) << 0x10909 << TYPE(0x0d) << 0x1090a
+	  << TYPE(0x0e) << 0x1090b << TYPE(0x0f) << TYPE(0x10) << TYPE(0x11)
+	  << TYPE(0x12) << TYPE(0x19) << 0x1090d << TYPE(0x13) << 0x10900;
 }
 
 static QImage railroad()
@@ -148,6 +200,22 @@ void Style::defaultLineStyle()
 	//_lines[TYPE(0x28)] = Line(QPen(QColor("#5a5a5a"), 1, Qt::SolidLine));
 	_lines[TYPE(0x29)] = Line(QPen(QColor("#5a5a5a"), 1, Qt::SolidLine));
 	_lines[TYPE(0x29)].setTextFontSize(None);
+
+	// NT types
+	_lines[0x10c00] = _lines[TYPE(0x14)];
+	_lines[0x10a00] = _lines[TYPE(0x18)];
+	_lines[0x10b04] = _lines[TYPE(0x1e)];
+	_lines[0x10a01] = _lines[TYPE(0x1f)];
+	_lines[0x10900] = _lines[TYPE(0x20)];
+	_lines[0x10901] = _lines[TYPE(0x21)];
+	_lines[0x10902] = _lines[TYPE(0x22)];
+	_lines[0x10903] = _lines[TYPE(0x23)];
+	_lines[0x10904] = _lines[TYPE(0x24)];
+	_lines[0x10905] = _lines[TYPE(0x25)];
+	_lines[0x10a02] = _lines[TYPE(0x26)];
+	_lines[0x10c02] = _lines[TYPE(0x27)];
+	//_lines[0x10c03] = _lines[TYPE(0x28)];
+	_lines[0x10c04] = _lines[TYPE(0x29)];
 }
 
 void Style::defaultPointStyle()
@@ -221,10 +289,13 @@ void Style::defaultPointStyle()
 	_points[0x2d0b] = Point(QImage(":/airfield-11.png"));
 
 	_points[0x2e02] = Point(QImage(":/grocery-11.png"));
+	_points[0x2e03] = Point(QImage(":/shop-11.png"));
 	_points[0x2e05] = Point(QImage(":/pharmacy-11.png"));
+	_points[0x2e06] = Point(QImage(":/convenience-11.png"));
 	_points[0x2e07] = Point(QImage(":/clothing-store-11.png"));
 	_points[0x2e08] = Point(QImage(":/garden-centre-11.png"));
 	_points[0x2e09] = Point(QImage(":/furniture-11.png"));
+	_points[0x2e0a] = Point(QImage(":/shop-11.png"));
 	_points[0x2e0c] = Point(QImage(":/shop-11.png"));
 
 	_points[0x2f01] = Point(QImage(":/fuel-11.png"));
@@ -248,7 +319,8 @@ void Style::defaultPointStyle()
 	_points[0x3001] = Point(QImage(":/police-11.png"));
 	_points[0x3002] = Point(QImage(":/hospital-11.png"));
 	_points[0x3003] = Point(QImage(":/town-hall-11.png"));
-	_points[0x3007] = Point(QImage(":/prison-11.png"));
+	_points[0x3006] = Point(QImage(":/entrance-alt1-11.png"));
+	_points[0x3007] = Point(QImage(":/town-hall-11.png"));
 	_points[0x3008] = Point(QImage(":/fire-station-11.png"));
 
 	_points[0x4000] = Point(QImage(":/golf-11.png"));
@@ -296,6 +368,87 @@ void Style::defaultPointStyle()
 	_points[0x6513] = Point(QImage(":/wetland-11.png"));
 	_points[0x6604] = Point(QImage(":/beach-11.png"));
 	_points[0x6616] = Point(QImage(":/mountain-11.png"));
+
+
+	// NT types
+	_points[0x11401] = _points[TYPE(0x01)];
+	_points[0x11402] = _points[TYPE(0x02)];
+	_points[0x11403] = _points[TYPE(0x03)];
+	_points[0x10b00] = _points[0x2a00];
+	_points[0x10b01] = _points[0x2a01];
+	_points[0x10b02] = _points[0x2a02];
+	_points[0x10b03] = _points[0x2a03];
+	_points[0x10b04] = _points[0x2a04];
+	_points[0x10b05] = _points[0x2a05];
+	_points[0x10b06] = _points[0x2a06];
+	_points[0x10b07] = _points[0x2a07];
+	_points[0x10b08] = _points[0x2a08];
+	_points[0x10b09] = _points[0x2a09];
+	_points[0x10b0a] = _points[0x2a0a];
+	_points[0x10b0b] = _points[0x2a0b];
+	_points[0x10b0c] = _points[0x2a0c];
+	_points[0x10b0d] = _points[0x2a0d];
+	_points[0x10b0e] = _points[0x2a0e];
+	_points[0x10b0f] = _points[0x2a0f];
+	_points[0x10b10] = _points[0x2a10];
+	_points[0x10b11] = _points[0x2a11];
+	_points[0x10c01] = _points[0x2b01];
+	_points[0x10c02] = _points[0x2b02];
+	_points[0x10c03] = _points[0x2b03];
+	_points[0x10c04] = _points[0x2b04];
+	_points[0x10d01] = _points[0x2c01];
+	_points[0x10d02] = _points[0x2c02];
+	_points[0x10d03] = _points[0x2c03];
+	_points[0x10d04] = _points[0x2c04];
+	_points[0x10d05] = _points[0x2c05];
+	_points[0x10d06] = _points[0x2c06];
+	_points[0x10d07] = _points[0x2c07];
+	_points[0x10d08] = _points[0x2c08];
+	_points[0x10d0a] = _points[0x2c0a];
+	_points[0x10d0b] = _points[0x2c0b];
+	_points[0x10d0d] = _points[0x2c0d];
+	_points[0x10d0e] = _points[0x2c0e];
+	_points[0x10d10] = _points[0x2c10];
+	_points[0x10e01] = _points[0x2d01];
+	_points[0x10e02] = _points[0x2d02];
+	_points[0x10e03] = _points[0x2d03];
+	_points[0x10e04] = _points[0x2d04];
+	_points[0x10e05] = _points[0x2d05];
+	_points[0x10e06] = _points[0x2d06];
+	_points[0x10e07] = _points[0x2d07];
+	_points[0x10e08] = _points[0x2d08];
+	_points[0x10e09] = _points[0x2d09];
+	_points[0x10e0a] = _points[0x2d0a];
+	_points[0x10e0b] = _points[0x2d0b];
+	_points[0x10f02] = _points[0x2e02];
+	_points[0x10f03] = _points[0x2e03];
+	_points[0x10f05] = _points[0x2e05];
+	_points[0x10f06] = _points[0x2e06];
+	_points[0x10f07] = _points[0x2e07];
+	_points[0x10f08] = _points[0x2e08];
+	_points[0x10f09] = _points[0x2e09];
+	_points[0x10f0a] = _points[0x2e0a];
+	_points[0x11001] = _points[0x2f01];
+	_points[0x11002] = _points[0x2f02];
+	_points[0x11003] = _points[0x2f03];
+	_points[0x11004] = _points[0x2f04];
+	_points[0x11005] = _points[0x2f05];
+	_points[0x11006] = _points[0x2f06];
+	_points[0x11007] = _points[0x2f07];
+	_points[0x11008] = _points[0x2f08];
+	_points[0x11009] = _points[0x2f09];
+	_points[0x1100b] = _points[0x2f0b];
+	_points[0x1100c] = _points[0x2f0c];
+	_points[0x11010] = _points[0x2f10];
+	_points[0x11012] = _points[0x2f12];
+	_points[0x11013] = _points[0x2f13];
+	_points[0x11017] = _points[0x2f17];
+	_points[0x11101] = _points[0x3001];
+	_points[0x11102] = _points[0x3002];
+	_points[0x11103] = _points[0x3003];
+	_points[0x11106] = _points[0x3006];
+	_points[0x11107] = _points[0x3007];
+	_points[0x11108] = _points[0x3008];
 }
 
 static bool readBitmap(SubFile *file, SubFile::Handle &hdl, QImage &img,
@@ -985,19 +1138,26 @@ const Style::Point &Style::point(quint32 type) const
 
 Style::POIClass Style::poiClass(quint32 type)
 {
-	if ((type >= 0x2a00 && type < 0x2b00) || type == 0x2c0a || type == 0x2d02)
+	if ((type >= 0x2a00 && type < 0x2b00) || type == 0x2c0a || type == 0x2d02
+	  || (type & 0xffff00) == TYPE(0x10b))
 		return Food;
-	else if (type >= 0x2b00 && type < 0x2c00)
+	else if ((type >= 0x2b00 && type < 0x2c00)
+	  || (type & 0xffff00) == TYPE(0x10c))
 		return Accommodation;
-	else if (type >= 0x2c00 && type < 0x2e00)
+	else if ((type >= 0x2c00 && type < 0x2e00)
+	  || (type & 0xffff00) == TYPE(0x10d) || (type & 0xffff00) == TYPE(0x10e))
 		return Recreation;
-	else if (type >= 0x2e00 && type < 0x2f00)
+	else if ((type >= 0x2e00 && type < 0x2f00)
+	  || (type & 0xffff00) == TYPE(0x10f))
 		return Shopping;
-	else if ((type >= 0x2f00 && type < 0x2f0f) || type == 0x2f17)
+	else if ((type >= 0x2f00 && type < 0x2f0f) || type == 0x2f17
+	  || (type >= 0x11001 && type < 0x1100f))
 		return Transport;
-	else if (type >= 0x2f0f && type < 0x3000)
+	else if ((type >= 0x2f0f && type < 0x3000)
+	  || (type >= 0x1100f && type < 0x11100))
 		return Services;
-	else if (type >= 0x3000 && type < 0x3100)
+	else if ((type >= 0x3000 && type < 0x3100)
+	  || (type & 0xffff00) == TYPE(0x111))
 		return Community;
 	else if (type >= 0x4000 && type < 0x6000)
 		return Elementary;

src/map/IMG/style.h

@@ -108,15 +108,19 @@ public:
 	const Point &point(quint32 type) const;
 	const QList<quint32> &drawOrder() const {return _drawOrder;}
 
+	static bool isPOI(quint32 type)
+	  {return !((type >= TYPE(0x01) && type <= TYPE(0x1f))
+	  || (type >= 0x11400 && type < 0x11500));}
 	static bool isContourLine(quint32 type)
 	  {return ((type >= TYPE(0x20) && type <= TYPE(0x25))
 	  || (type & 0xffff00) == TYPE(0x109));}
 	static bool isWaterArea(quint32 type)
-	  {return (type >= TYPE(0x3c) && type <= TYPE(0x44));}
+	  {return ((type >= TYPE(0x3c) && type <= TYPE(0x44))
+	  || (type & 0xffff00) == TYPE(0x10b));}
 	static bool isMilitaryArea(quint32 type)
-	  {return (type == TYPE(0x04));}
+	  {return (type == TYPE(0x04) || type == 0x10901);}
 	static bool isNatureReserve(quint32 type)
-	  {return (type == TYPE(0x16));}
+	  {return (type == TYPE(0x16) || type == 0x10a03);}
 	static bool isSpot(quint32 type)
 	  {return (type == TYPE(0x62) || type == TYPE(0x63));}
 	static bool isSummit(quint32 type)

src/map/IMG/subfile.h

@@ -42,14 +42,12 @@ public:
 	  : _gmpOffset(0), _img(img), _blocks(new QVector<quint16>()), _path(0) {}
 	SubFile(SubFile *gmp, quint32 offset) : _gmpOffset(offset), _img(gmp->_img),
 	  _blocks(gmp->_blocks), _path(gmp->_path) {}
-	SubFile(const QString &path)
-	  : _gmpOffset(0), _img(0), _blocks(0), _path(new QString(path)) {}
+	SubFile(const QString *path)
+	  : _gmpOffset(0), _img(0), _blocks(0), _path(path) {}
 	~SubFile()
 	{
-		if (!_gmpOffset) {
+		if (!_gmpOffset)
 			delete _blocks;
-			delete _path;
-		}
 	}
 
 	void addBlock(quint16 block) {_blocks->append(block);}
@@ -151,7 +149,7 @@ private:
 
 	IMG *_img;
 	QVector<quint16> *_blocks;
-	QString *_path;
+	const QString *_path;
 };
 
 #endif // SUBFILE_H

src/map/IMG/textitem.h

@@ -10,13 +10,18 @@ class QPainter;
 class TextItem
 {
 public:
+	TextItem(const QString *text) : _text(text) {}
 	virtual ~TextItem() {}
 
 	virtual QPainterPath shape() const = 0;
 	virtual QRectF boundingRect() const = 0;
 	virtual void paint(QPainter *painter) const = 0;
 
+	const QString *text() const {return _text;}
 	bool collides(const QList<TextItem*> &list) const;
+
+protected:
+	const QString *_text;
 };
 
 #endif // TEXTITEM_H

src/map/IMG/textpathitem.cpp

@@ -137,7 +137,7 @@ static bool reverse(const QPainterPath &path)
 
 TextPathItem::TextPathItem(const QPolygonF &line, const QString *label,
   const QRect &tileRect, const QFont *font, const QColor *color)
-  : _text(label), _font(font), _color(color)
+  : TextItem(label), _font(font), _color(color)
 {
 	qreal cw = font->pixelSize() * 0.7;
 	qreal textWidth = _text->size() * cw;

src/map/IMG/textpathitem.h

@@ -8,7 +8,7 @@
 class TextPathItem : public TextItem
 {
 public:
-	TextPathItem() : _text(0), _font(0), _color(0) {}
+	TextPathItem() : TextItem(0), _font(0), _color(0) {}
 	TextPathItem(const QPolygonF &line, const QString *label,
 	  const QRect &tileRect, const QFont *font, const QColor *color);
 
@@ -19,7 +19,6 @@ public:
 	void paint(QPainter *painter) const;
 
 private:
-	const QString *_text;
 	const QFont *_font;
 	const QColor *_color;
 	QPainterPath _path;

src/map/IMG/textpointitem.cpp

@@ -17,7 +17,7 @@ static void expand(QRect &rect, int width)
 
 TextPointItem::TextPointItem(const QPoint &point, const QString *text,
   const QFont *font, const QImage *img, const QColor *color,
-  const QColor *bgColor) : _text(font ? text : 0), _font(font), _img(img),
+  const QColor *bgColor) : TextItem(font ? text : 0), _font(font), _img(img),
   _color(color), _bgColor(bgColor)
 {
 	if (_text) {

src/map/IMG/textpointitem.h

@@ -14,7 +14,7 @@ class QColor;
 class TextPointItem : public TextItem
 {
 public:
-	TextPointItem() : _text(0), _font(0), _img(0) {}
+	TextPointItem() : TextItem(0), _font(0), _img(0) {}
 	TextPointItem(const QPoint &point, const QString *text, const QFont *font,
 	  const QImage *img, const QColor *color, const QColor *bgColor = 0);
 
@@ -27,7 +27,6 @@ public:
 	void setPos(const QPoint &point);
 
 private:
-	const QString *_text;
 	const QFont *_font;
 	const QImage *_img;
 	const QColor *_color, *_bgColor;

src/map/IMG/trefile.cpp

@@ -5,7 +5,12 @@
 
 static inline double RB(qint32 val)
 {
-	return (val == -0x800000 || val == 0x800000) ? 180.0 : toWGS24(val);
+	return (val == -0x800000 || val >= 0x800000) ? 180.0 : toWGS24(val);
+}
+
+static inline double LB(qint32 val)
+{
+	return (val <= -0x800000) ? -180.0 : toWGS24(val);
 }
 
 static void demangle(quint8 *data, quint32 size, quint32 key)
@@ -60,7 +65,8 @@ bool TREFile::init()
 		return false;
 	_bounds = RectC(Coordinates(toWGS24(west), toWGS24(north)),
 	  Coordinates(RB(east), toWGS24(south)));
-	Q_ASSERT(_bounds.left() <= _bounds.right());
+	if (!_bounds.isValid())
+		return false;
 
 	// Levels & subdivs info
 	quint32 levelsOffset, levelsSize, subdivSize;
@@ -187,21 +193,27 @@ bool TREFile::load(int idx)
 
 		width &= 0x7FFF;
 		width = LS(width, 24 - level.bits);
+		height &= 0x7FFF;
 		height = LS(height, 24 - level.bits);
 
 		s = new SubDiv(offset, lon, lat, level.level, level.bits, objects);
 		sl.append(s);
 
 		double min[2], max[2];
-		RectC bounds(Coordinates(toWGS24(lon - width), toWGS24(lat + height)),
+		RectC bounds(Coordinates(LB(lon - width), toWGS24(lat + height)),
 		  Coordinates(RB(lon + width), toWGS24(lat - height)));
-		Q_ASSERT(bounds.left() <= bounds.right());
 
 		min[0] = bounds.left();
 		min[1] = bounds.bottom();
 		max[0] = bounds.right();
 		max[1] = bounds.top();
 
+		/* both mkgmap and cGPSmapper generate all kinds of broken subdiv bounds
+		   (zero lat/lon, zero width/height, ...) so we check only that the
+		   subdiv item does not break the rtree, not for full bounds validity. */
+		if (!(min[0] <= max[0] && min[1] <= max[1]))
+			goto error;
+
 		tree->Insert(min, max, s);
 	}
 

src/map/IMG/trefile.h

@@ -14,7 +14,7 @@ class TREFile : public SubFile
 {
 public:
 	TREFile(IMG *img) : SubFile(img) {}
-	TREFile(const QString &path) : SubFile(path) {}
+	TREFile(const QString *path) : SubFile(path) {}
 	TREFile(SubFile *gmp, quint32 offset) : SubFile(gmp, offset) {}
 	~TREFile();
 

src/map/IMG/vectortile.cpp

@@ -1,16 +1,16 @@
 #include "vectortile.h"
 
 
-static void copyPolys(const RectC &rect, QList<IMG::Poly> *src,
-  QList<IMG::Poly> *dst)
+static void copyPolys(const RectC &rect, QList<MapData::Poly> *src,
+  QList<MapData::Poly> *dst)
 {
 	for (int i = 0; i < src->size(); i++)
 		if (rect.intersects(src->at(i).boundingRect))
 			dst->append(src->at(i));
 }
 
-static void copyPoints(const RectC &rect, QList<IMG::Point> *src,
-  QList<IMG::Point> *dst)
+static void copyPoints(const RectC &rect, QList<MapData::Point> *src,
+  QList<MapData::Point> *dst)
 {
 	for (int j = 0; j < src->size(); j++)
 		if (rect.contains(src->at(j).coordinates))
@@ -38,58 +38,6 @@ SubFile *VectorTile::file(SubFile::Type type)
 	}
 }
 
-SubFile *VectorTile::addFile(IMG *img, SubFile::Type type)
-{
-	switch (type) {
-		case SubFile::TRE:
-			_tre = new TREFile(img);
-			return _tre;
-		case SubFile::RGN:
-			_rgn = new RGNFile(img);
-			return _rgn;
-		case SubFile::LBL:
-			_lbl = new LBLFile(img);
-			return _lbl;
-		case SubFile::NET:
-			_net = new NETFile(img);
-			return _net;
-		case SubFile::NOD:
-			_nod = new NODFile(img);
-			return _nod;
-		case SubFile::GMP:
-			_gmp = new SubFile(img);
-			return _gmp;
-		default:
-			return 0;
-	}
-}
-
-SubFile *VectorTile::addFile(const QString &path, SubFile::Type type)
-{
-	switch (type) {
-		case SubFile::TRE:
-			_tre = new TREFile(path);
-			return _tre;
-		case SubFile::RGN:
-			_rgn = new RGNFile(path);
-			return _rgn;
-		case SubFile::LBL:
-			_lbl = new LBLFile(path);
-			return _lbl;
-		case SubFile::NET:
-			_net = new NETFile(path);
-			return _net;
-		case SubFile::NOD:
-			_nod = new NODFile(path);
-			return _nod;
-		case SubFile::GMP:
-			_gmp = new SubFile(path);
-			return _gmp;
-		default:
-			return 0;
-	}
-}
-
 bool VectorTile::init()
 {
 	if (_gmp && !initGMP())
@@ -120,23 +68,54 @@ bool VectorTile::initGMP()
 	return true;
 }
 
+bool VectorTile::load(SubFile::Handle &rgnHdl, SubFile::Handle &lblHdl,
+  SubFile::Handle &netHdl, SubFile::Handle &nodHdl)
+{
+	_loaded = -1;
+
+	if (!_rgn->load(rgnHdl))
+		return false;
+	if (_lbl && !_lbl->load(lblHdl, _rgn, rgnHdl))
+		return false;
+	if (_net && !_net->load(netHdl, _rgn, rgnHdl))
+		return false;
+	if (_nod && !_nod->load(nodHdl))
+		return false;
+
+	_loaded = 1;
+
+	return true;
+}
+
+void VectorTile::clear()
+{
+	_tre->clear();
+	_rgn->clear();
+	if (_lbl)
+		_lbl->clear();
+	if (_net)
+		_net->clear();
+
+	_loaded = 0;
+}
+
 void VectorTile::polys(const RectC &rect, int bits, bool baseMap,
-  QList<IMG::Poly> *polygons, QList<IMG::Poly> *lines,
-  QCache<const SubDiv *, IMG::Polys> *polyCache) const
+  QList<MapData::Poly> *polygons, QList<MapData::Poly> *lines,
+  QCache<const SubDiv *, MapData::Polys> *polyCache)
 {
 	SubFile::Handle rgnHdl(_rgn), lblHdl(_lbl), netHdl(_net), nodHdl(_nod);
 
-	if (!_rgn->initialized() && !_rgn->init(rgnHdl))
+	if (_loaded < 0 || (!_loaded && !load(rgnHdl, lblHdl, netHdl, nodHdl)))
 		return;
 
 	QList<SubDiv*> subdivs = _tre->subdivs(rect, bits, baseMap);
 	for (int i = 0; i < subdivs.size(); i++) {
 		SubDiv *subdiv = subdivs.at(i);
 
-		IMG::Polys *polys = polyCache->object(subdiv);
+		MapData::Polys *polys = polyCache->object(subdiv);
 		if (!polys) {
 			quint32 shift = _tre->shift(subdiv->bits());
-			QList<IMG::Poly> p, l;
+			QList<MapData::Poly> p, l;
 
 			if (!subdiv->initialized() && !_rgn->subdivInit(rgnHdl, subdiv))
 				continue;
@@ -154,7 +133,7 @@ void VectorTile::polys(const RectC &rect, int bits, bool baseMap,
 
 			copyPolys(rect, &p, polygons);
 			copyPolys(rect, &l, lines);
-			polyCache->insert(subdiv, new IMG::Polys(p, l));
+			polyCache->insert(subdiv, new MapData::Polys(p, l));
 		} else {
 			copyPolys(rect, &(polys->polygons), polygons);
 			copyPolys(rect, &(polys->lines), lines);
@@ -163,21 +142,21 @@ void VectorTile::polys(const RectC &rect, int bits, bool baseMap,
 }
 
 void VectorTile::points(const RectC &rect, int bits, bool baseMap,
-  QList<IMG::Point> *points, QCache<const SubDiv *,
-  QList<IMG::Point> > *pointCache) const
+  QList<MapData::Point> *points, QCache<const SubDiv *,
+  QList<MapData::Point> > *pointCache)
 {
-	SubFile::Handle rgnHdl(_rgn), lblHdl(_lbl);
+	SubFile::Handle rgnHdl(_rgn), lblHdl(_lbl), netHdl(_net), nodHdl(_nod);
 
-	if (!_rgn->initialized() && !_rgn->init(rgnHdl))
+	if (_loaded < 0 || (!_loaded && !load(rgnHdl, lblHdl, netHdl, nodHdl)))
 		return;
 
 	QList<SubDiv*> subdivs = _tre->subdivs(rect, bits, baseMap);
 	for (int i = 0; i < subdivs.size(); i++) {
 		SubDiv *subdiv = subdivs.at(i);
 
-		QList<IMG::Point> *pl = pointCache->object(subdiv);
+		QList<MapData::Point> *pl = pointCache->object(subdiv);
 		if (!pl) {
-			QList<IMG::Point> p;
+			QList<MapData::Point> p;
 
 			if (!subdiv->initialized() && !_rgn->subdivInit(rgnHdl, subdiv))
 				continue;
@@ -189,7 +168,7 @@ void VectorTile::points(const RectC &rect, int bits, bool baseMap,
 			_rgn->extPointObjects(rgnHdl, subdiv, _lbl, lblHdl, &p);
 
 			copyPoints(rect, &p, points);
-			pointCache->insert(subdiv, new QList<IMG::Point>(p));
+			pointCache->insert(subdiv, new QList<MapData::Point>(p));
 		} else
 			copyPoints(rect, pl, points);
 	}

src/map/IMG/vectortile.h

@@ -1,7 +1,6 @@
 #ifndef VECTORTILE_H
 #define VECTORTILE_H
 
-#include "trefile.h"
 #include "trefile.h"
 #include "rgnfile.h"
 #include "lblfile.h"
@@ -10,7 +9,8 @@
 
 class VectorTile {
 public:
-	VectorTile() : _tre(0), _rgn(0), _lbl(0), _net(0), _nod(0), _gmp(0) {}
+	VectorTile()
+	  : _tre(0), _rgn(0), _lbl(0), _net(0), _nod(0), _gmp(0), _loaded(0) {}
 	~VectorTile()
 	{
 		delete _tre; delete _rgn; delete _lbl; delete _net; delete _nod;
@@ -19,21 +19,19 @@ public:
 
 	bool init();
 	void markAsBasemap() {_tre->markAsBasemap();}
-	void clear() {_tre->clear();}
+	void clear();
 
 	const RectC &bounds() const {return _tre->bounds();}
 	Range zooms() const {return _tre->zooms();}
 
 	SubFile *file(SubFile::Type type);
-	SubFile *addFile(IMG *img, SubFile::Type type);
-	SubFile *addFile(const QString &path, SubFile::Type type);
 
 	void polys(const RectC &rect, int bits, bool baseMap,
-	  QList<IMG::Poly> *polygons, QList<IMG::Poly> *lines,
-	  QCache<const SubDiv *, IMG::Polys> *polyCache) const;
+	  QList<MapData::Poly> *polygons, QList<MapData::Poly> *lines,
+	  QCache<const SubDiv *, MapData::Polys> *polyCache);
 	void points(const RectC &rect, int bits, bool baseMap,
-	  QList<IMG::Point> *points, QCache<const SubDiv*,
-	  QList<IMG::Point> > *pointCache) const;
+	  QList<MapData::Point> *points, QCache<const SubDiv*,
+	  QList<MapData::Point> > *pointCache);
 
 	static bool isTileFile(SubFile::Type type)
 	{
@@ -42,8 +40,37 @@ public:
 		  || type == SubFile::NOD || type == SubFile::GMP);
 	}
 
+	template<typename T>
+	SubFile *addFile(T *container, SubFile::Type type)
+	{
+		switch (type) {
+			case SubFile::TRE:
+				_tre = new TREFile(container);
+				return _tre;
+			case SubFile::RGN:
+				_rgn = new RGNFile(container);
+				return _rgn;
+			case SubFile::LBL:
+				_lbl = new LBLFile(container);
+				return _lbl;
+			case SubFile::NET:
+				_net = new NETFile(container);
+				return _net;
+			case SubFile::NOD:
+				_nod = new NODFile(container);
+				return _nod;
+			case SubFile::GMP:
+				_gmp = new SubFile(container);
+				return _gmp;
+			default:
+				return 0;
+		}
+	}
+
 private:
 	bool initGMP();
+	bool load(SubFile::Handle &rgnHdl, SubFile::Handle &lblHdl,
+	  SubFile::Handle &netHdl, SubFile::Handle &nodHdl);
 
 	TREFile *_tre;
 	RGNFile *_rgn;
@@ -51,6 +78,8 @@ private:
 	NETFile *_net;
 	NODFile *_nod;
 	SubFile *_gmp;
+
+	int _loaded;
 };
 
 #ifndef QT_NO_DEBUG

src/map/crs.cpp

@@ -28,7 +28,7 @@ Projection CRS::projection(const QString &crs)
 			return Projection();
 	}
 
-	if (authority == "EPSG") {
+	if (!authority.compare("EPSG", Qt::CaseInsensitive)) {
 		epsg = code.toInt(&res);
 		if (!res)
 			return Projection();
@@ -39,7 +39,7 @@ Projection CRS::projection(const QString &crs)
 			return Projection(gcs);
 		else
 			return Projection();
-	} else if (authority == "OGC") {
+	} else if (!authority.compare("OGC", Qt::CaseInsensitive)) {
 		if (code == "CRS84")
 			return Projection(GCS::gcs(4326), CoordinateSystem::XY);
 		else

src/map/geotiff.cpp

@@ -61,19 +61,19 @@
 	((map).contains(key) && (map).value(key).SHORT != 32767)
 
 
-typedef struct {
+struct GeoKeyHeader {
 	quint16 KeyDirectoryVersion;
 	quint16 KeyRevision;
 	quint16 MinorRevision;
 	quint16 NumberOfKeys;
-} Header;
+};
 
-typedef struct {
+struct GeoKeyEntry {
 	quint16 KeyID;
 	quint16 TIFFTagLocation;
 	quint16 Count;
 	quint16 ValueOffset;
-} KeyEntry;
+};
 
 
 bool GeoTIFF::readEntry(TIFFFile &file, Ctx &ctx) const
@@ -196,8 +196,8 @@ bool GeoTIFF::readMatrix(TIFFFile &file, quint32 offset, double matrix[16]) cons
 
 bool GeoTIFF::readKeys(TIFFFile &file, Ctx &ctx, QMap<quint16, Value> &kv) const
 {
-	Header header;
-	KeyEntry entry;
+	GeoKeyHeader header;
+	GeoKeyEntry entry;
 	Value value;
 
 	if (!file.seek(ctx.keys))

src/map/imgmap.cpp

@@ -136,6 +136,9 @@ void IMGMap::updateTransform()
 	RectD prect(_dataBounds, _projection);
 	_bounds = QRectF(_transform.proj2img(prect.topLeft()),
 	  _transform.proj2img(prect.bottomRight()));
+	// Adjust the bounds of world maps to avoid problems with wrapping
+	if (_dataBounds.left() == -180.0 || _dataBounds.right() == 180.0)
+		_bounds.adjust(0.5, 0, -0.5, 0);
 }
 
 QPointF IMGMap::ll2xy(const Coordinates &c)
@@ -194,7 +197,7 @@ void IMGMap::draw(QPainter *painter, const QRectF &rect, Flags flags)
 
 					QRectF polyRect(ttl, QPointF(ttl.x() + TILE_SIZE,
 					  ttl.y() + TILE_SIZE));
-					polyRect &= bounds().adjusted(0.5, 0.5, -0.5, -0.5);
+					polyRect &= bounds();
 					RectD polyRectD(_transform.img2proj(polyRect.topLeft()),
 					  _transform.img2proj(polyRect.bottomRight()));
 					_data.at(n)->polys(polyRectD.toRectC(_projection, 4), _zoom,
@@ -204,7 +207,7 @@ void IMGMap::draw(QPainter *painter, const QRectF &rect, Flags flags)
 					QRectF pointRect(QPointF(ttl.x() - TEXT_EXTENT,
 					  ttl.y() - TEXT_EXTENT), QPointF(ttl.x() + TILE_SIZE
 					  + TEXT_EXTENT, ttl.y() + TILE_SIZE + TEXT_EXTENT));
-					pointRect &= bounds().adjusted(0.5, 0.5, -0.5, -0.5);
+					pointRect &= bounds();
 					RectD pointRectD(_transform.img2proj(pointRect.topLeft()),
 					  _transform.img2proj(pointRect.bottomRight()));
 					_data.at(n)->points(pointRectD.toRectC(_projection, 4),
@@ -241,7 +244,7 @@ void IMGMap::setProjection(const Projection &projection)
 
 	_projection = projection;
 	// Limit the bounds for some well known Mercator projections
-	// (GARMIN world maps have N/S bounds up to 90/-90!)
+	// (world maps have N/S bounds up to 90/-90!)
 	_dataBounds = (_projection == PCS::pcs(3857) || _projection == PCS::pcs(3395))
 	  ? _data.first()->bounds() & OSM::BOUNDS : _data.first()->bounds();
 

src/map/tar.cpp

@@ -9,7 +9,7 @@
 #define BLOCKCOUNT(size) \
 	((size)/BLOCKSIZE + ((size) % BLOCKSIZE > 0 ? 1 : 0))
 
-struct Header
+struct TARHeader
 {
 	char name[100];               /*   0 */
 	char mode[8];                 /* 100 */
@@ -61,7 +61,7 @@ bool Tar::open()
 bool Tar::loadTar()
 {
 	char buffer[BLOCKSIZE];
-	struct Header *hdr = (struct Header*)&buffer;
+	TARHeader *hdr = (TARHeader*)&buffer;
 	quint64 size;
 	qint64 ret;
 
@@ -113,7 +113,7 @@ bool Tar::loadTmi(const QString &path)
 QByteArray Tar::file(const QString &name)
 {
 	char buffer[BLOCKSIZE];
-	struct Header *hdr = (struct Header*)&buffer;
+	TARHeader *hdr = (TARHeader*)&buffer;
 	quint64 size;
 
 	QMap<QString, quint64>::const_iterator it(_index.find(name));