1
0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-07-05 15:12:51 +02:00

Compare commits

...

28 Commits
5.15 ... 5.16

Author SHA1 Message Date
3ce3de119b Updated 4Umaps URL 2018-08-08 00:22:59 +02:00
872ecdfa58 Now building the windows version using Qt 5.11 2018-08-05 23:23:53 +02:00
121a262ea1 Remaining WGS84 deduplication 2018-07-26 23:51:11 +02:00
06c9fbd849 Properly unified the qmake/macros versions 2018-07-24 18:02:36 +02:00
aa928d96e0 Fixed OS X build 2018-07-24 18:00:40 +02:00
004e9bfef3 Fixed QT version handling in build process 2018-07-24 17:23:14 +02:00
34de55cf0c Do the comma substitution only on ASCII files 2018-07-24 17:21:45 +02:00
c0e458a437 Added support for HTTP/2 2018-07-23 23:53:58 +02:00
33739acafe Merge branch 'master' of https://github.com/tumic0/GPXSee 2018-07-23 21:56:29 +02:00
fe4eed8aa2 Fixed error reporting 2018-07-23 21:55:43 +02:00
f5ca757348 Update gpxsee_sv.ts (#139)
new strings translated
2018-07-22 10:19:22 +02:00
476f26752f Added explicit actions menu roles (broken qt heuristics workaround) 2018-07-21 23:25:24 +02:00
588859ca3a Code cleanup 2018-07-21 21:11:37 +02:00
cc8d237786 Translations update (#138) 2018-07-21 19:17:35 +02:00
5dde297210 Version++ 2018-07-21 18:20:48 +02:00
d1469290cf Translations update 2018-07-21 18:19:31 +02:00
51d4284ebe Layout adjustment 2018-07-21 18:11:19 +02:00
531eb256f1 Added statistics window 2018-07-21 16:13:18 +02:00
79388aa753 Improved paths dialogue formating 2018-07-21 14:24:13 +02:00
2980299a2a A better (shorter) directory description 2018-07-21 12:52:52 +02:00
796e61ada4 Improved path info dialogue 2018-07-21 12:24:08 +02:00
90473300e0 Added missing projection parameter handling 2018-07-21 10:08:26 +02:00
5706cdcfa1 Added workaround for broken nakarte.tk maps 2018-07-13 10:10:44 +02:00
d794ee4b22 Includes cleanup 2018-07-13 09:55:36 +02:00
262ee5bb5f Map API cleanup 2018-07-13 09:51:41 +02:00
5547cf668e Make Coverity happy 2018-07-10 08:58:37 +02:00
dd9e42ad27 Update gpxsee_sv.ts (#136)
new strings translated
2018-07-04 08:18:24 +02:00
e192116191 Update README.md 2018-07-03 23:53:05 +02:00
48 changed files with 1301 additions and 956 deletions

View File

@ -1,14 +1,14 @@
version: 5.15.{build} version: 5.16.{build}
configuration: Release configuration: Release
platform: Any CPU platform: Any CPU
environment: environment:
NSISDIR: C:\Program Files (x86)\NSIS NSISDIR: C:\Program Files (x86)\NSIS
matrix: matrix:
- QTDIR: C:\Qt\5.9\msvc2015 - QTDIR: C:\Qt\5.11\msvc2015
PLATFORM: x86 PLATFORM: x86
NSI: gpxsee.nsi NSI: gpxsee.nsi
OPENSSLDIR: C:\OpenSSL-Win32\bin OPENSSLDIR: C:\OpenSSL-Win32\bin
- QTDIR: C:\Qt\5.9\msvc2015_64 - QTDIR: C:\Qt\5.11\msvc2015_64
PLATFORM: x86_amd64 PLATFORM: x86_amd64
NSI: gpxsee64.nsi NSI: gpxsee64.nsi
OPENSSLDIR: C:\OpenSSL-Win64\bin OPENSSLDIR: C:\OpenSSL-Win64\bin

View File

@ -5,7 +5,7 @@ KML, FIT, IGC, NMEA and OziExplorer files.
## Features ## Features
* User-definable online maps (OSM/Google tiles, WMTS, WMS). * User-definable online maps (OSM/Google tiles, WMTS, WMS).
* Offline maps (OziExplorer maps, TrekBuddy maps/atlases, Garmin JNX maps, GeoTIFF images). * Offline maps (OziExplorer maps, TrekBuddy maps/atlases, Garmin JNX maps, GeoTIFF images).
* Elevation, speed, heart rate, cadence, power and temperature graphs. * Elevation, speed, heart rate, cadence, power, temperature and gear ratio/shifts graphs.
* Support for multiple tracks in one view. * Support for multiple tracks in one view.
* Support for POI files. * Support for POI files.
* Print/export to PDF. * Print/export to PDF.

View File

@ -1,12 +1,16 @@
TARGET = GPXSee TARGET = GPXSee
VERSION = 5.15 VERSION = 5.16
QT += core \ QT += core \
gui \ gui \
network network
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets greaterThan(QT_MAJOR_VERSION, 4) {
greaterThan(QT_MAJOR_VERSION, 4): QT += printsupport QT += widgets
lessThan(QT_VERSION, 5.4): QT += opengl QT += printsupport
macx: QT += opengl }
lessThan(QT_MAJOR_VERSION, 5) {QT += opengl}
equals(QT_MAJOR_VERSION, 5) : lessThan(QT_MINOR_VERSION, 4) {QT += opengl}
INCLUDEPATH += ./src INCLUDEPATH += ./src
HEADERS += src/config.h \ HEADERS += src/config.h \
src/common/staticassert.h \ src/common/staticassert.h \
@ -132,7 +136,8 @@ HEADERS += src/config.h \
src/map/geocentric.h \ src/map/geocentric.h \
src/map/mercator.h \ src/map/mercator.h \
src/map/jnxmap.h \ src/map/jnxmap.h \
src/map/krovak.h src/map/krovak.h \
src/GUI/kv.h
SOURCES += src/main.cpp \ SOURCES += src/main.cpp \
src/common/coordinates.cpp \ src/common/coordinates.cpp \
src/common/rectc.cpp \ src/common/rectc.cpp \
@ -234,6 +239,7 @@ SOURCES += src/main.cpp \
src/map/jnxmap.cpp \ src/map/jnxmap.cpp \
src/map/krovak.cpp \ src/map/krovak.cpp \
src/map/map.cpp src/map/map.cpp
RESOURCES += gpxsee.qrc RESOURCES += gpxsee.qrc
TRANSLATIONS = lang/gpxsee_cs.ts \ TRANSLATIONS = lang/gpxsee_cs.ts \
lang/gpxsee_sv.ts \ lang/gpxsee_sv.ts \
@ -242,6 +248,7 @@ TRANSLATIONS = lang/gpxsee_cs.ts \
lang/gpxsee_fi.ts \ lang/gpxsee_fi.ts \
lang/gpxsee_fr.ts \ lang/gpxsee_fr.ts \
lang/gpxsee_pl.ts lang/gpxsee_pl.ts
macx { macx {
ICON = icons/gpxsee.icns ICON = icons/gpxsee.icns
QMAKE_INFO_PLIST = pkg/Info.plist QMAKE_INFO_PLIST = pkg/Info.plist
@ -282,4 +289,5 @@ win32 {
icons/wpt.ico icons/wpt.ico
DEFINES += _USE_MATH_DEFINES DEFINES += _USE_MATH_DEFINES
} }
DEFINES += APP_VERSION=\\\"$$VERSION\\\" DEFINES += APP_VERSION=\\\"$$VERSION\\\"

View File

@ -306,17 +306,17 @@
<context> <context>
<name>GUI</name> <name>GUI</name>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="590"/> <location filename="../src/GUI/gui.cpp" line="595"/>
<source>GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at </source> <source>GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at </source>
<translation>Program GPXSee je distribuován pod podmínkami licence GNU General Public License verze 3. Pro více informací navštivte stránky programu na adrese </translation> <translation>Program GPXSee je distribuován pod podmínkami licence GNU General Public License verze 3. Pro více informací navštivte stránky programu na adrese </translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="664"/> <location filename="../src/GUI/gui.cpp" line="669"/>
<source>Open file</source> <source>Open file</source>
<translation>Otevřít soubor</translation> <translation>Otevřít soubor</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="769"/> <location filename="../src/GUI/gui.cpp" line="774"/>
<source>Open POI file</source> <source>Open POI file</source>
<translation>Otevřít POI soubor</translation> <translation>Otevřít POI soubor</translation>
</message> </message>
@ -327,8 +327,8 @@
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="205"/> <location filename="../src/GUI/gui.cpp" line="205"/>
<location filename="../src/GUI/gui.cpp" line="607"/> <location filename="../src/GUI/gui.cpp" line="612"/>
<location filename="../src/GUI/gui.cpp" line="608"/> <location filename="../src/GUI/gui.cpp" line="613"/>
<source>Keyboard controls</source> <source>Keyboard controls</source>
<translation>Ovládací klávesy</translation> <translation>Ovládací klávesy</translation>
</message> </message>
@ -343,42 +343,42 @@
<translation>Znovu načíst</translation> <translation>Znovu načíst</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="518"/> <location filename="../src/GUI/gui.cpp" line="523"/>
<source>Show</source> <source>Show</source>
<translation>Zobrazit</translation> <translation>Zobrazit</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="512"/> <location filename="../src/GUI/gui.cpp" line="517"/>
<source>File</source> <source>File</source>
<translation>Soubor</translation> <translation>Soubor</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="247"/> <location filename="../src/GUI/gui.cpp" line="251"/>
<source>Close POI files</source> <source>Close POI files</source>
<translation>Zavřit POI soubory</translation> <translation>Zavřit POI soubory</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="249"/> <location filename="../src/GUI/gui.cpp" line="253"/>
<source>Overlap POIs</source> <source>Overlap POIs</source>
<translation>Překrývat POI</translation> <translation>Překrývat POI</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="253"/> <location filename="../src/GUI/gui.cpp" line="257"/>
<source>Show POI labels</source> <source>Show POI labels</source>
<translation>Zobrazit názvy POI</translation> <translation>Zobrazit názvy POI</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="258"/> <location filename="../src/GUI/gui.cpp" line="262"/>
<source>Show POIs</source> <source>Show POIs</source>
<translation>Zobrazit POI</translation> <translation>Zobrazit POI</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="267"/> <location filename="../src/GUI/gui.cpp" line="271"/>
<source>Show map</source> <source>Show map</source>
<translation>Zobrazit mapu</translation> <translation>Zobrazit mapu</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="277"/> <location filename="../src/GUI/gui.cpp" line="281"/>
<source>Clear tile cache</source> <source>Clear tile cache</source>
<translation>Vymazat mezipaměť dlaždic</translation> <translation>Vymazat mezipaměť dlaždic</translation>
</message> </message>
@ -389,297 +389,310 @@
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="203"/> <location filename="../src/GUI/gui.cpp" line="203"/>
<location filename="../src/GUI/gui.cpp" line="641"/> <location filename="../src/GUI/gui.cpp" line="646"/>
<location filename="../src/GUI/gui.cpp" line="642"/> <location filename="../src/GUI/gui.cpp" line="647"/>
<source>Paths</source> <source>Paths</source>
<translation>Cesty</translation> <translation>Cesty</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="244"/> <location filename="../src/GUI/gui.cpp" line="241"/>
<source>Statistics...</source>
<translation>Statistika...</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="248"/>
<source>Load POI file...</source> <source>Load POI file...</source>
<translation>Nahrát POI soubor...</translation> <translation>Nahrát POI soubor...</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="275"/> <location filename="../src/GUI/gui.cpp" line="279"/>
<source>Load map...</source> <source>Load map...</source>
<translation>Nahrát mapu...</translation> <translation>Nahrát mapu...</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="281"/>
<location filename="../src/GUI/gui.cpp" line="285"/> <location filename="../src/GUI/gui.cpp" line="285"/>
<location filename="../src/GUI/gui.cpp" line="624"/> <location filename="../src/GUI/gui.cpp" line="289"/>
<location filename="../src/GUI/gui.cpp" line="629"/>
<source>Next map</source> <source>Next map</source>
<translation>Následující mapa</translation> <translation>Následující mapa</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="295"/> <location filename="../src/GUI/gui.cpp" line="299"/>
<source>Show tracks</source> <source>Show tracks</source>
<translation>Zobrazit cesty</translation> <translation>Zobrazit cesty</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="299"/> <location filename="../src/GUI/gui.cpp" line="303"/>
<source>Show routes</source> <source>Show routes</source>
<translation>Zobrazit trasy</translation> <translation>Zobrazit trasy</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="303"/> <location filename="../src/GUI/gui.cpp" line="307"/>
<source>Show waypoints</source> <source>Show waypoints</source>
<translation>Zobrazit navigační body</translation> <translation>Zobrazit navigační body</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="307"/> <location filename="../src/GUI/gui.cpp" line="311"/>
<source>Waypoint labels</source> <source>Waypoint labels</source>
<translation>Názvy navigačních bodů</translation> <translation>Názvy navigačních bodů</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="318"/> <location filename="../src/GUI/gui.cpp" line="322"/>
<source>Show graphs</source> <source>Show graphs</source>
<translation>Zobrazit grafy</translation> <translation>Zobrazit grafy</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="338"/> <location filename="../src/GUI/gui.cpp" line="342"/>
<source>Show grid</source> <source>Show grid</source>
<translation>Zobrazit mřížku</translation> <translation>Zobrazit mřížku</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="342"/> <location filename="../src/GUI/gui.cpp" line="346"/>
<source>Show slider info</source> <source>Show slider info</source>
<translation>Zobrazit informace o posuvníku</translation> <translation>Zobrazit informace o posuvníku</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="348"/> <location filename="../src/GUI/gui.cpp" line="352"/>
<source>Show toolbars</source> <source>Show toolbars</source>
<translation>Zobrazovat nástrojové lišty</translation> <translation>Zobrazovat nástrojové lišty</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="354"/> <location filename="../src/GUI/gui.cpp" line="358"/>
<source>Total time</source> <source>Total time</source>
<translation>Celkový čas</translation> <translation>Celkový čas</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="359"/> <location filename="../src/GUI/gui.cpp" line="363"/>
<location filename="../src/GUI/gui.cpp" line="949"/> <location filename="../src/GUI/gui.cpp" line="955"/>
<location filename="../src/GUI/gui.cpp" line="1020"/>
<source>Moving time</source> <source>Moving time</source>
<translation>Čistý čas</translation> <translation>Čistý čas</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="366"/> <location filename="../src/GUI/gui.cpp" line="370"/>
<source>Metric</source> <source>Metric</source>
<translation>Metrické</translation> <translation>Metrické</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="371"/> <location filename="../src/GUI/gui.cpp" line="375"/>
<source>Imperial</source> <source>Imperial</source>
<translation>Imperiální</translation> <translation>Imperiální</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="376"/> <location filename="../src/GUI/gui.cpp" line="380"/>
<source>Nautical</source> <source>Nautical</source>
<translation>Námořní</translation> <translation>Námořní</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="383"/> <location filename="../src/GUI/gui.cpp" line="387"/>
<source>Decimal degrees (DD)</source> <source>Decimal degrees (DD)</source>
<translation>Desetinné stupně (DD)</translation> <translation>Desetinné stupně (DD)</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="388"/> <location filename="../src/GUI/gui.cpp" line="392"/>
<source>Degrees and decimal minutes (DMM)</source> <source>Degrees and decimal minutes (DMM)</source>
<translation>Stupně a desetinné minuty (DMM)</translation> <translation>Stupně a desetinné minuty (DMM)</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="394"/> <location filename="../src/GUI/gui.cpp" line="398"/>
<source>Degrees, minutes, seconds (DMS)</source> <source>Degrees, minutes, seconds (DMS)</source>
<translation>Stupně, minuty, vteřiny (DMS)</translation> <translation>Stupně, minuty, vteřiny (DMS)</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="399"/> <location filename="../src/GUI/gui.cpp" line="403"/>
<source>Fullscreen mode</source> <source>Fullscreen mode</source>
<translation>Celoobrazovkový režim</translation> <translation>Celoobrazovkový režim</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="405"/> <location filename="../src/GUI/gui.cpp" line="409"/>
<source>Options...</source> <source>Options...</source>
<translation>Nastavení...</translation> <translation>Nastavení...</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="411"/> <location filename="../src/GUI/gui.cpp" line="415"/>
<source>Next</source> <source>Next</source>
<translation>Následující</translation> <translation>Následující</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="414"/> <location filename="../src/GUI/gui.cpp" line="418"/>
<source>Previous</source> <source>Previous</source>
<translation>Předchozí</translation> <translation>Předchozí</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="418"/> <location filename="../src/GUI/gui.cpp" line="422"/>
<source>Last</source> <source>Last</source>
<translation>Poslední</translation> <translation>Poslední</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="421"/> <location filename="../src/GUI/gui.cpp" line="425"/>
<source>First</source> <source>First</source>
<translation>První</translation> <translation>První</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="461"/> <location filename="../src/GUI/gui.cpp" line="466"/>
<source>POI files</source> <source>POI files</source>
<translation>POI soubory</translation> <translation>POI soubory</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="473"/> <location filename="../src/GUI/gui.cpp" line="478"/>
<source>Display</source> <source>Display</source>
<translation>Zobrazit</translation> <translation>Zobrazit</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="485"/> <location filename="../src/GUI/gui.cpp" line="490"/>
<source>Units</source> <source>Units</source>
<translation>Jednotky</translation> <translation>Jednotky</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="489"/> <location filename="../src/GUI/gui.cpp" line="494"/>
<source>Coordinates format</source> <source>Coordinates format</source>
<translation>Formát souřadnic</translation> <translation>Formát souřadnic</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="617"/> <location filename="../src/GUI/gui.cpp" line="622"/>
<source>Append file</source> <source>Append file</source>
<translation>Přidat soubor</translation> <translation>Přidat soubor</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="618"/> <location filename="../src/GUI/gui.cpp" line="623"/>
<source>Next/Previous</source> <source>Next/Previous</source>
<translation>Následující/Předchozí</translation> <translation>Následující/Předchozí</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="620"/> <location filename="../src/GUI/gui.cpp" line="625"/>
<source>Toggle graph type</source> <source>Toggle graph type</source>
<translation>Přepnout typ grafu</translation> <translation>Přepnout typ grafu</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="622"/> <location filename="../src/GUI/gui.cpp" line="627"/>
<source>Toggle time type</source> <source>Toggle time type</source>
<translation>Přepnout typ času</translation> <translation>Přepnout typ času</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="626"/> <location filename="../src/GUI/gui.cpp" line="631"/>
<source>Previous map</source> <source>Previous map</source>
<translation>Předchozí mapa</translation> <translation>Předchozí mapa</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="627"/> <location filename="../src/GUI/gui.cpp" line="632"/>
<source>Zoom in</source> <source>Zoom in</source>
<translation>Přiblížit</translation> <translation>Přiblížit</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="629"/> <location filename="../src/GUI/gui.cpp" line="634"/>
<source>Zoom out</source> <source>Zoom out</source>
<translation>Oddálit</translation> <translation>Oddálit</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="631"/> <location filename="../src/GUI/gui.cpp" line="636"/>
<source>Digital zoom</source> <source>Digital zoom</source>
<translation>Digitální zoom</translation> <translation>Digitální zoom</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="632"/> <location filename="../src/GUI/gui.cpp" line="637"/>
<source>Zoom</source> <source>Zoom</source>
<translation>Zoom</translation> <translation>Zoom</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="1148"/> <location filename="../src/GUI/gui.cpp" line="650"/>
<source>Global</source>
<translation>Globální</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="654"/>
<location filename="../src/GUI/gui.cpp" line="660"/>
<source>GCS/PCS directory:</source>
<translation>Adresář s GCS/PCS soubory:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="656"/>
<source>User-specific</source>
<translation>Uživatelské</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="976"/>
<location filename="../src/GUI/gui.cpp" line="977"/>
<source>Statistics</source>
<translation>Statistika</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="1219"/>
<source>Open map file</source> <source>Open map file</source>
<translation>Otevřít mapový soubor</translation> <translation>Otevřít mapový soubor</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="1188"/> <location filename="../src/GUI/gui.cpp" line="1259"/>
<source>No files loaded</source> <source>No files loaded</source>
<translation>Nejsou načteny žádné soubory</translation> <translation>Nejsou načteny žádné soubory</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="935"/> <location filename="../src/GUI/gui.cpp" line="939"/>
<location filename="../src/GUI/gui.cpp" line="938"/> <location filename="../src/GUI/gui.cpp" line="943"/>
<location filename="../src/GUI/gui.cpp" line="1006"/>
<location filename="../src/GUI/gui.cpp" line="1009"/>
<source>Date</source> <source>Date</source>
<translation>Datum</translation> <translation>Datum</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="429"/> <location filename="../src/GUI/gui.cpp" line="433"/>
<source>&amp;File</source> <source>&amp;File</source>
<translation>&amp;Soubor</translation> <translation>&amp;Soubor</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="443"/> <location filename="../src/GUI/gui.cpp" line="448"/>
<source>&amp;Map</source> <source>&amp;Map</source>
<translation>&amp;Mapa</translation> <translation>&amp;Mapa</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="451"/> <location filename="../src/GUI/gui.cpp" line="456"/>
<source>&amp;Graph</source> <source>&amp;Graph</source>
<translation>&amp;Graf</translation> <translation>&amp;Graf</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="460"/> <location filename="../src/GUI/gui.cpp" line="465"/>
<source>&amp;POI</source> <source>&amp;POI</source>
<translation>&amp;POI</translation> <translation>&amp;POI</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="472"/> <location filename="../src/GUI/gui.cpp" line="477"/>
<source>&amp;Data</source> <source>&amp;Data</source>
<translation>&amp;Data</translation> <translation>&amp;Data</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="481"/> <location filename="../src/GUI/gui.cpp" line="486"/>
<source>&amp;Settings</source> <source>&amp;Settings</source>
<translation>&amp;Nastavení</translation> <translation>&amp;Nastavení</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="499"/> <location filename="../src/GUI/gui.cpp" line="504"/>
<source>&amp;Help</source> <source>&amp;Help</source>
<translation>N&amp;ápověda</translation> <translation>N&amp;ápověda</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="645"/> <location filename="../src/GUI/gui.cpp" line="650"/>
<location filename="../src/GUI/gui.cpp" line="657"/>
<source>Map directory:</source> <source>Map directory:</source>
<translation>Adresář s mapami:</translation> <translation>Adresář s mapami:</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="647"/> <location filename="../src/GUI/gui.cpp" line="652"/>
<location filename="../src/GUI/gui.cpp" line="658"/>
<source>POI directory:</source> <source>POI directory:</source>
<translation>Adresář s POI body:</translation> <translation>Adresář s POI body:</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="649"/> <location filename="../src/GUI/gui.cpp" line="930"/>
<source>GCS file:</source> <location filename="../src/GUI/gui.cpp" line="998"/>
<translation>Soubor s GCS daty:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="650"/>
<source>PCS file:</source>
<translation>Soubor s PCS daty:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="652"/>
<source>Ellipsoids file:</source>
<translation>Soubor s daty elipsoidů:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="655"/>
<source>User override directory:</source>
<translation>Uživatelský adresář:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="927"/>
<source>Routes</source> <source>Routes</source>
<translation>Trasy</translation> <translation>Trasy</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="1177"/> <location filename="../src/GUI/gui.cpp" line="1248"/>
<source>Error loading map:</source> <source>Error loading map:</source>
<translation>Mapu nelze načíst:</translation> <translation>Mapu nelze načíst:</translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<location filename="../src/GUI/gui.cpp" line="1192"/> <location filename="../src/GUI/gui.cpp" line="1263"/>
<source>%n files</source> <source>%n files</source>
<translation> <translation>
<numerusform>%n soubor</numerusform> <numerusform>%n soubor</numerusform>
@ -688,12 +701,12 @@
</translation> </translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="611"/> <location filename="../src/GUI/gui.cpp" line="616"/>
<source>Next file</source> <source>Next file</source>
<translation>Následující soubor</translation> <translation>Následující soubor</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="587"/> <location filename="../src/GUI/gui.cpp" line="592"/>
<source>Version </source> <source>Version </source>
<translation>Verze </translation> <translation>Verze </translation>
</message> </message>
@ -708,77 +721,81 @@
<translation>Exportovat do PDF...</translation> <translation>Exportovat do PDF...</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="929"/> <location filename="../src/GUI/gui.cpp" line="933"/>
<location filename="../src/GUI/gui.cpp" line="1000"/>
<source>Waypoints</source> <source>Waypoints</source>
<translation>Navigační body</translation> <translation>Navigační body</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="612"/> <location filename="../src/GUI/gui.cpp" line="617"/>
<source>Previous file</source> <source>Previous file</source>
<translation>Předchozí soubor</translation> <translation>Předchozí soubor</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="311"/> <location filename="../src/GUI/gui.cpp" line="315"/>
<source>Route waypoints</source> <source>Route waypoints</source>
<translation>Body tras</translation> <translation>Body tras</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="614"/> <location filename="../src/GUI/gui.cpp" line="619"/>
<source>First file</source> <source>First file</source>
<translation>První soubor</translation> <translation>První soubor</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="616"/> <location filename="../src/GUI/gui.cpp" line="621"/>
<source>Last file</source> <source>Last file</source>
<translation>Poslední soubor</translation> <translation>Poslední soubor</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="758"/> <location filename="../src/GUI/gui.cpp" line="763"/>
<source>Error loading data file:</source> <source>Error loading data file:</source>
<translation>Datový soubor nelze načíst:</translation> <translation>Datový soubor nelze načíst:</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="761"/> <location filename="../src/GUI/gui.cpp" line="766"/>
<location filename="../src/GUI/gui.cpp" line="788"/> <location filename="../src/GUI/gui.cpp" line="793"/>
<source>Line: %1</source> <source>Line: %1</source>
<translation>Řádka: %1</translation> <translation>Řádka: %1</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="785"/> <location filename="../src/GUI/gui.cpp" line="790"/>
<source>Error loading POI file:</source> <source>Error loading POI file:</source>
<translation>Soubor POI nelze načíst:</translation> <translation>Soubor POI nelze načíst:</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="921"/> <location filename="../src/GUI/gui.cpp" line="992"/>
<source>Name</source> <source>Name</source>
<translation>Název</translation> <translation>Název</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="925"/> <location filename="../src/GUI/gui.cpp" line="927"/>
<location filename="../src/GUI/gui.cpp" line="996"/>
<source>Tracks</source> <source>Tracks</source>
<translation>Cesty</translation> <translation>Cesty</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="208"/> <location filename="../src/GUI/gui.cpp" line="208"/>
<location filename="../src/GUI/gui.cpp" line="586"/> <location filename="../src/GUI/gui.cpp" line="591"/>
<source>About GPXSee</source> <source>About GPXSee</source>
<translation>O aplikaci GPXSee</translation> <translation>O aplikaci GPXSee</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="523"/> <location filename="../src/GUI/gui.cpp" line="528"/>
<source>Navigation</source> <source>Navigation</source>
<translation>Navigace</translation> <translation>Navigace</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="326"/> <location filename="../src/GUI/gui.cpp" line="330"/>
<location filename="../src/GUI/gui.cpp" line="945"/> <location filename="../src/GUI/gui.cpp" line="950"/>
<location filename="../src/GUI/gui.cpp" line="1016"/>
<source>Distance</source> <source>Distance</source>
<translation>Vzdálenost</translation> <translation>Vzdálenost</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="332"/> <location filename="../src/GUI/gui.cpp" line="336"/>
<location filename="../src/GUI/gui.cpp" line="482"/> <location filename="../src/GUI/gui.cpp" line="487"/>
<location filename="../src/GUI/gui.cpp" line="947"/> <location filename="../src/GUI/gui.cpp" line="953"/>
<location filename="../src/GUI/gui.cpp" line="1018"/>
<source>Time</source> <source>Time</source>
<translation>Čas</translation> <translation>Čas</translation>
</message> </message>

View File

@ -306,47 +306,29 @@
<context> <context>
<name>GUI</name> <name>GUI</name>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="590"/> <location filename="../src/GUI/gui.cpp" line="595"/>
<source>GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at </source> <source>GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at </source>
<translation>GPXSee wird unter der GNU General Public License version 3 vertrieben. Mehr Informationen zu GPXSee auf der Homepage </translation> <translation>GPXSee wird unter der GNU General Public License version 3 vertrieben. Mehr Informationen zu GPXSee auf der Homepage </translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="645"/> <location filename="../src/GUI/gui.cpp" line="650"/>
<location filename="../src/GUI/gui.cpp" line="657"/>
<source>Map directory:</source> <source>Map directory:</source>
<translation>Kartenverzeichnis:</translation> <translation>Kartenverzeichnis:</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="647"/> <location filename="../src/GUI/gui.cpp" line="652"/>
<location filename="../src/GUI/gui.cpp" line="658"/>
<source>POI directory:</source> <source>POI directory:</source>
<translation>POI-Verzeichnis:</translation> <translation>POI-Verzeichnis:</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="649"/> <location filename="../src/GUI/gui.cpp" line="669"/>
<source>GCS file:</source>
<translation>GCS-Datei:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="650"/>
<source>PCS file:</source>
<translation>PCS-Datei:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="652"/>
<source>Ellipsoids file:</source>
<translation>Ellipsoidendatei:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="655"/>
<source>User override directory:</source>
<translation>Benutzerverzeichnis:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="664"/>
<source>Open file</source> <source>Open file</source>
<translation>Datei öffnen</translation> <translation>Datei öffnen</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="769"/> <location filename="../src/GUI/gui.cpp" line="774"/>
<source>Open POI file</source> <source>Open POI file</source>
<translation>POI Datei öffnen</translation> <translation>POI Datei öffnen</translation>
</message> </message>
@ -357,8 +339,8 @@
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="205"/> <location filename="../src/GUI/gui.cpp" line="205"/>
<location filename="../src/GUI/gui.cpp" line="607"/> <location filename="../src/GUI/gui.cpp" line="612"/>
<location filename="../src/GUI/gui.cpp" line="608"/> <location filename="../src/GUI/gui.cpp" line="613"/>
<source>Keyboard controls</source> <source>Keyboard controls</source>
<translation>Tastaturkürzel</translation> <translation>Tastaturkürzel</translation>
</message> </message>
@ -373,42 +355,42 @@
<translation>Neu Laden</translation> <translation>Neu Laden</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="518"/> <location filename="../src/GUI/gui.cpp" line="523"/>
<source>Show</source> <source>Show</source>
<translation>Ansicht</translation> <translation>Ansicht</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="512"/> <location filename="../src/GUI/gui.cpp" line="517"/>
<source>File</source> <source>File</source>
<translation>Datei</translation> <translation>Datei</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="247"/> <location filename="../src/GUI/gui.cpp" line="251"/>
<source>Close POI files</source> <source>Close POI files</source>
<translation>POI-Datei schließen</translation> <translation>POI-Datei schließen</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="249"/> <location filename="../src/GUI/gui.cpp" line="253"/>
<source>Overlap POIs</source> <source>Overlap POIs</source>
<translation>POI überlappen</translation> <translation>POI überlappen</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="253"/> <location filename="../src/GUI/gui.cpp" line="257"/>
<source>Show POI labels</source> <source>Show POI labels</source>
<translation>POI-Labels anzeigen</translation> <translation>POI-Labels anzeigen</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="258"/> <location filename="../src/GUI/gui.cpp" line="262"/>
<source>Show POIs</source> <source>Show POIs</source>
<translation>POIs anzeigen</translation> <translation>POIs anzeigen</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="267"/> <location filename="../src/GUI/gui.cpp" line="271"/>
<source>Show map</source> <source>Show map</source>
<translation>Karte anzeigen</translation> <translation>Karte anzeigen</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="277"/> <location filename="../src/GUI/gui.cpp" line="281"/>
<source>Clear tile cache</source> <source>Clear tile cache</source>
<translation>Tile-Cache bereinigen</translation> <translation>Tile-Cache bereinigen</translation>
</message> </message>
@ -419,221 +401,249 @@
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="203"/> <location filename="../src/GUI/gui.cpp" line="203"/>
<location filename="../src/GUI/gui.cpp" line="641"/> <location filename="../src/GUI/gui.cpp" line="646"/>
<location filename="../src/GUI/gui.cpp" line="642"/> <location filename="../src/GUI/gui.cpp" line="647"/>
<source>Paths</source> <source>Paths</source>
<translation>Pfade</translation> <translation>Pfade</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="244"/> <location filename="../src/GUI/gui.cpp" line="241"/>
<source>Statistics...</source>
<translation>Statistiken...</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="248"/>
<source>Load POI file...</source> <source>Load POI file...</source>
<translation>POI-Datei laden...</translation> <translation>POI-Datei laden...</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="275"/> <location filename="../src/GUI/gui.cpp" line="279"/>
<source>Load map...</source> <source>Load map...</source>
<translation>Karte laden...</translation> <translation>Karte laden...</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="281"/>
<location filename="../src/GUI/gui.cpp" line="285"/> <location filename="../src/GUI/gui.cpp" line="285"/>
<location filename="../src/GUI/gui.cpp" line="624"/> <location filename="../src/GUI/gui.cpp" line="289"/>
<location filename="../src/GUI/gui.cpp" line="629"/>
<source>Next map</source> <source>Next map</source>
<translation>Nächste Karte</translation> <translation>Nächste Karte</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="295"/> <location filename="../src/GUI/gui.cpp" line="299"/>
<source>Show tracks</source> <source>Show tracks</source>
<translation>Strecken anzeigen</translation> <translation>Strecken anzeigen</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="299"/> <location filename="../src/GUI/gui.cpp" line="303"/>
<source>Show routes</source> <source>Show routes</source>
<translation>Routen anzeigen</translation> <translation>Routen anzeigen</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="303"/> <location filename="../src/GUI/gui.cpp" line="307"/>
<source>Show waypoints</source> <source>Show waypoints</source>
<translation>Wegpunkte anzeigen</translation> <translation>Wegpunkte anzeigen</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="307"/> <location filename="../src/GUI/gui.cpp" line="311"/>
<source>Waypoint labels</source> <source>Waypoint labels</source>
<translation>Wegpunkt Labels</translation> <translation>Wegpunkt Labels</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="318"/> <location filename="../src/GUI/gui.cpp" line="322"/>
<source>Show graphs</source> <source>Show graphs</source>
<translation>Graphen anzeigen</translation> <translation>Graphen anzeigen</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="338"/> <location filename="../src/GUI/gui.cpp" line="342"/>
<source>Show grid</source> <source>Show grid</source>
<translation>Gitter anzeigen</translation> <translation>Gitter anzeigen</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="342"/> <location filename="../src/GUI/gui.cpp" line="346"/>
<source>Show slider info</source> <source>Show slider info</source>
<translation>Schieberinfo anzeigen</translation> <translation>Schieberinfo anzeigen</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="348"/> <location filename="../src/GUI/gui.cpp" line="352"/>
<source>Show toolbars</source> <source>Show toolbars</source>
<translation>Toolbars anzeigen</translation> <translation>Toolbars anzeigen</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="354"/> <location filename="../src/GUI/gui.cpp" line="358"/>
<source>Total time</source> <source>Total time</source>
<translation>Gesamtzeit</translation> <translation>Gesamtzeit</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="359"/> <location filename="../src/GUI/gui.cpp" line="363"/>
<location filename="../src/GUI/gui.cpp" line="949"/> <location filename="../src/GUI/gui.cpp" line="955"/>
<location filename="../src/GUI/gui.cpp" line="1020"/>
<source>Moving time</source> <source>Moving time</source>
<translation>Bewegungszeit</translation> <translation>Bewegungszeit</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="366"/> <location filename="../src/GUI/gui.cpp" line="370"/>
<source>Metric</source> <source>Metric</source>
<translation>Metrisch</translation> <translation>Metrisch</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="371"/> <location filename="../src/GUI/gui.cpp" line="375"/>
<source>Imperial</source> <source>Imperial</source>
<translation>Imperial</translation> <translation>Imperial</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="376"/> <location filename="../src/GUI/gui.cpp" line="380"/>
<source>Nautical</source> <source>Nautical</source>
<translation>Nautisch</translation> <translation>Nautisch</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="383"/> <location filename="../src/GUI/gui.cpp" line="387"/>
<source>Decimal degrees (DD)</source> <source>Decimal degrees (DD)</source>
<translation>Dezimalgrad (DD)</translation> <translation>Dezimalgrad (DD)</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="388"/> <location filename="../src/GUI/gui.cpp" line="392"/>
<source>Degrees and decimal minutes (DMM)</source> <source>Degrees and decimal minutes (DMM)</source>
<translation>Grad und Dezimalminuten (DMM)</translation> <translation>Grad und Dezimalminuten (DMM)</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="394"/> <location filename="../src/GUI/gui.cpp" line="398"/>
<source>Degrees, minutes, seconds (DMS)</source> <source>Degrees, minutes, seconds (DMS)</source>
<translation>Grad, Minuten, Sekunden (DMS)</translation> <translation>Grad, Minuten, Sekunden (DMS)</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="399"/> <location filename="../src/GUI/gui.cpp" line="403"/>
<source>Fullscreen mode</source> <source>Fullscreen mode</source>
<translation>Vollbildmodus</translation> <translation>Vollbildmodus</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="405"/> <location filename="../src/GUI/gui.cpp" line="409"/>
<source>Options...</source> <source>Options...</source>
<translation>Einstellungen...</translation> <translation>Einstellungen...</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="411"/> <location filename="../src/GUI/gui.cpp" line="415"/>
<source>Next</source> <source>Next</source>
<translation>Nächste</translation> <translation>Nächste</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="414"/> <location filename="../src/GUI/gui.cpp" line="418"/>
<source>Previous</source> <source>Previous</source>
<translation>Vorherige</translation> <translation>Vorherige</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="418"/> <location filename="../src/GUI/gui.cpp" line="422"/>
<source>Last</source> <source>Last</source>
<translation>Letzte</translation> <translation>Letzte</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="421"/> <location filename="../src/GUI/gui.cpp" line="425"/>
<source>First</source> <source>First</source>
<translation>Erste</translation> <translation>Erste</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="461"/> <location filename="../src/GUI/gui.cpp" line="466"/>
<source>POI files</source> <source>POI files</source>
<translation>POI-Dateien</translation> <translation>POI-Dateien</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="473"/> <location filename="../src/GUI/gui.cpp" line="478"/>
<source>Display</source> <source>Display</source>
<translation>Anzeige</translation> <translation>Anzeige</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="485"/> <location filename="../src/GUI/gui.cpp" line="490"/>
<source>Units</source> <source>Units</source>
<translation>Einheiten</translation> <translation>Einheiten</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="489"/> <location filename="../src/GUI/gui.cpp" line="494"/>
<source>Coordinates format</source> <source>Coordinates format</source>
<translation>Koordinatenformate</translation> <translation>Koordinatenformate</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="617"/> <location filename="../src/GUI/gui.cpp" line="622"/>
<source>Append file</source> <source>Append file</source>
<translation>An Datei anhängen</translation> <translation>An Datei anhängen</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="618"/> <location filename="../src/GUI/gui.cpp" line="623"/>
<source>Next/Previous</source> <source>Next/Previous</source>
<translation>Nächste/Vorherige</translation> <translation>Nächste/Vorherige</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="620"/> <location filename="../src/GUI/gui.cpp" line="625"/>
<source>Toggle graph type</source> <source>Toggle graph type</source>
<translation>Graphtyp umschalten</translation> <translation>Graphtyp umschalten</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="622"/> <location filename="../src/GUI/gui.cpp" line="627"/>
<source>Toggle time type</source> <source>Toggle time type</source>
<translation>Zeittyp umschalten</translation> <translation>Zeittyp umschalten</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="626"/> <location filename="../src/GUI/gui.cpp" line="631"/>
<source>Previous map</source> <source>Previous map</source>
<translation>Vorherige Karte</translation> <translation>Vorherige Karte</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="627"/> <location filename="../src/GUI/gui.cpp" line="632"/>
<source>Zoom in</source> <source>Zoom in</source>
<translation>Hineinzoomen</translation> <translation>Hineinzoomen</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="629"/> <location filename="../src/GUI/gui.cpp" line="634"/>
<source>Zoom out</source> <source>Zoom out</source>
<translation>Herauszoomen</translation> <translation>Herauszoomen</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="631"/> <location filename="../src/GUI/gui.cpp" line="636"/>
<source>Digital zoom</source> <source>Digital zoom</source>
<translation>Digitaler Zoom</translation> <translation>Digitaler Zoom</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="632"/> <location filename="../src/GUI/gui.cpp" line="637"/>
<source>Zoom</source> <source>Zoom</source>
<translation>Zoom</translation> <translation>Zoom</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="1148"/> <location filename="../src/GUI/gui.cpp" line="650"/>
<source>Global</source>
<translation>Global</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="654"/>
<location filename="../src/GUI/gui.cpp" line="660"/>
<source>GCS/PCS directory:</source>
<translation>GCS/PCS-Verzeichnis:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="656"/>
<source>User-specific</source>
<translation>Benutzerspezifisch</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="976"/>
<location filename="../src/GUI/gui.cpp" line="977"/>
<source>Statistics</source>
<translation>Statistiken</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="1219"/>
<source>Open map file</source> <source>Open map file</source>
<translation>Karte Datei öffnen</translation> <translation>Karte Datei öffnen</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="1177"/> <location filename="../src/GUI/gui.cpp" line="1248"/>
<source>Error loading map:</source> <source>Error loading map:</source>
<translation>Fehler beim Laden der Karte-Datei:</translation> <translation>Fehler beim Laden der Karte-Datei:</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="1188"/> <location filename="../src/GUI/gui.cpp" line="1259"/>
<source>No files loaded</source> <source>No files loaded</source>
<translation>Keine Dateien geladen</translation> <translation>Keine Dateien geladen</translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<location filename="../src/GUI/gui.cpp" line="1192"/> <location filename="../src/GUI/gui.cpp" line="1263"/>
<source>%n files</source> <source>%n files</source>
<translation> <translation>
<numerusform>%n Datei</numerusform> <numerusform>%n Datei</numerusform>
@ -641,23 +651,26 @@
</translation> </translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="935"/> <location filename="../src/GUI/gui.cpp" line="939"/>
<location filename="../src/GUI/gui.cpp" line="938"/> <location filename="../src/GUI/gui.cpp" line="943"/>
<location filename="../src/GUI/gui.cpp" line="1006"/>
<location filename="../src/GUI/gui.cpp" line="1009"/>
<source>Date</source> <source>Date</source>
<translation>Datum</translation> <translation>Datum</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="927"/> <location filename="../src/GUI/gui.cpp" line="930"/>
<location filename="../src/GUI/gui.cpp" line="998"/>
<source>Routes</source> <source>Routes</source>
<translation>Routen</translation> <translation>Routen</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="611"/> <location filename="../src/GUI/gui.cpp" line="616"/>
<source>Next file</source> <source>Next file</source>
<translation>Nächste Datei</translation> <translation>Nächste Datei</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="587"/> <location filename="../src/GUI/gui.cpp" line="592"/>
<source>Version </source> <source>Version </source>
<translation>Version </translation> <translation>Version </translation>
</message> </message>
@ -672,112 +685,116 @@
<translation>Als PDF exportieren...</translation> <translation>Als PDF exportieren...</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="929"/> <location filename="../src/GUI/gui.cpp" line="933"/>
<location filename="../src/GUI/gui.cpp" line="1000"/>
<source>Waypoints</source> <source>Waypoints</source>
<translation>Wegpunkte</translation> <translation>Wegpunkte</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="612"/> <location filename="../src/GUI/gui.cpp" line="617"/>
<source>Previous file</source> <source>Previous file</source>
<translation>Vorherige Datei</translation> <translation>Vorherige Datei</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="311"/> <location filename="../src/GUI/gui.cpp" line="315"/>
<source>Route waypoints</source> <source>Route waypoints</source>
<translation>Routen Wegpunkte</translation> <translation>Routen Wegpunkte</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="429"/> <location filename="../src/GUI/gui.cpp" line="433"/>
<source>&amp;File</source> <source>&amp;File</source>
<translation>&amp;Datei</translation> <translation>&amp;Datei</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="443"/> <location filename="../src/GUI/gui.cpp" line="448"/>
<source>&amp;Map</source> <source>&amp;Map</source>
<translation>&amp;Karte</translation> <translation>&amp;Karte</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="451"/> <location filename="../src/GUI/gui.cpp" line="456"/>
<source>&amp;Graph</source> <source>&amp;Graph</source>
<translation>&amp;Graph</translation> <translation>&amp;Graph</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="460"/> <location filename="../src/GUI/gui.cpp" line="465"/>
<source>&amp;POI</source> <source>&amp;POI</source>
<translation>&amp;POI</translation> <translation>&amp;POI</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="472"/> <location filename="../src/GUI/gui.cpp" line="477"/>
<source>&amp;Data</source> <source>&amp;Data</source>
<translation>D&amp;ata</translation> <translation>D&amp;ata</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="481"/> <location filename="../src/GUI/gui.cpp" line="486"/>
<source>&amp;Settings</source> <source>&amp;Settings</source>
<translation>&amp;Einstellungen</translation> <translation>&amp;Einstellungen</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="499"/> <location filename="../src/GUI/gui.cpp" line="504"/>
<source>&amp;Help</source> <source>&amp;Help</source>
<translation>&amp;Hilfe</translation> <translation>&amp;Hilfe</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="614"/> <location filename="../src/GUI/gui.cpp" line="619"/>
<source>First file</source> <source>First file</source>
<translation>Erste Datei</translation> <translation>Erste Datei</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="616"/> <location filename="../src/GUI/gui.cpp" line="621"/>
<source>Last file</source> <source>Last file</source>
<translation>Letzte Datei</translation> <translation>Letzte Datei</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="758"/> <location filename="../src/GUI/gui.cpp" line="763"/>
<source>Error loading data file:</source> <source>Error loading data file:</source>
<translation>Fehler beim Laden der Datei:</translation> <translation>Fehler beim Laden der Datei:</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="761"/> <location filename="../src/GUI/gui.cpp" line="766"/>
<location filename="../src/GUI/gui.cpp" line="788"/> <location filename="../src/GUI/gui.cpp" line="793"/>
<source>Line: %1</source> <source>Line: %1</source>
<translation>Linie: %1</translation> <translation>Linie: %1</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="785"/> <location filename="../src/GUI/gui.cpp" line="790"/>
<source>Error loading POI file:</source> <source>Error loading POI file:</source>
<translation>Fehler beim Laden der POI-Datei:</translation> <translation>Fehler beim Laden der POI-Datei:</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="921"/> <location filename="../src/GUI/gui.cpp" line="992"/>
<source>Name</source> <source>Name</source>
<translation>Name</translation> <translation>Name</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="925"/> <location filename="../src/GUI/gui.cpp" line="927"/>
<location filename="../src/GUI/gui.cpp" line="996"/>
<source>Tracks</source> <source>Tracks</source>
<translation>Strecken</translation> <translation>Strecken</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="208"/> <location filename="../src/GUI/gui.cpp" line="208"/>
<location filename="../src/GUI/gui.cpp" line="586"/> <location filename="../src/GUI/gui.cpp" line="591"/>
<source>About GPXSee</source> <source>About GPXSee</source>
<translation>Über GPXSee</translation> <translation>Über GPXSee</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="523"/> <location filename="../src/GUI/gui.cpp" line="528"/>
<source>Navigation</source> <source>Navigation</source>
<translation>Navigation</translation> <translation>Navigation</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="326"/> <location filename="../src/GUI/gui.cpp" line="330"/>
<location filename="../src/GUI/gui.cpp" line="945"/> <location filename="../src/GUI/gui.cpp" line="950"/>
<location filename="../src/GUI/gui.cpp" line="1016"/>
<source>Distance</source> <source>Distance</source>
<translation>Distanz</translation> <translation>Distanz</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="332"/> <location filename="../src/GUI/gui.cpp" line="336"/>
<location filename="../src/GUI/gui.cpp" line="482"/> <location filename="../src/GUI/gui.cpp" line="487"/>
<location filename="../src/GUI/gui.cpp" line="947"/> <location filename="../src/GUI/gui.cpp" line="953"/>
<location filename="../src/GUI/gui.cpp" line="1018"/>
<source>Time</source> <source>Time</source>
<translation>Zeit</translation> <translation>Zeit</translation>
</message> </message>
@ -788,22 +805,22 @@
<location filename="../src/GUI/gearratiograph.cpp" line="11"/> <location filename="../src/GUI/gearratiograph.cpp" line="11"/>
<location filename="../src/GUI/gearratiograph.h" line="14"/> <location filename="../src/GUI/gearratiograph.h" line="14"/>
<source>Gear ratio</source> <source>Gear ratio</source>
<translation type="unfinished"></translation> <translation>Übersetzungsverhältnis</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gearratiograph.cpp" line="19"/> <location filename="../src/GUI/gearratiograph.cpp" line="19"/>
<source>Most used</source> <source>Most used</source>
<translation type="unfinished"></translation> <translation>Meist genutzt</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gearratiograph.cpp" line="21"/> <location filename="../src/GUI/gearratiograph.cpp" line="21"/>
<source>Minimum</source> <source>Minimum</source>
<translation type="unfinished">Minimum</translation> <translation>Minimum</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gearratiograph.cpp" line="23"/> <location filename="../src/GUI/gearratiograph.cpp" line="23"/>
<source>Maximum</source> <source>Maximum</source>
<translation type="unfinished">Maximum</translation> <translation>Maximum</translation>
</message> </message>
</context> </context>
<context> <context>
@ -811,17 +828,17 @@
<message> <message>
<location filename="../src/GUI/gearratiographitem.cpp" line="34"/> <location filename="../src/GUI/gearratiographitem.cpp" line="34"/>
<source>Minimum</source> <source>Minimum</source>
<translation type="unfinished">Minimum</translation> <translation>Minimum</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gearratiographitem.cpp" line="35"/> <location filename="../src/GUI/gearratiographitem.cpp" line="35"/>
<source>Maximum</source> <source>Maximum</source>
<translation type="unfinished">Maximum</translation> <translation>Maximum</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gearratiographitem.cpp" line="36"/> <location filename="../src/GUI/gearratiographitem.cpp" line="36"/>
<source>Most used</source> <source>Most used</source>
<translation type="unfinished"></translation> <translation>Meist genutzt</translation>
</message> </message>
</context> </context>
<context> <context>

View File

@ -306,17 +306,17 @@
<context> <context>
<name>GUI</name> <name>GUI</name>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="590"/> <location filename="../src/GUI/gui.cpp" line="595"/>
<source>GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at </source> <source>GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at </source>
<translation>GPXSee levitetään GNU yleisen lisenssin version 3 alaisena. Voit katsoa lisätietoja GPXSee:stä projektin kotisivulla </translation> <translation>GPXSee levitetään GNU yleisen lisenssin version 3 alaisena. Voit katsoa lisätietoja GPXSee:stä projektin kotisivulla </translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="664"/> <location filename="../src/GUI/gui.cpp" line="669"/>
<source>Open file</source> <source>Open file</source>
<translation>Avaa tiedosto</translation> <translation>Avaa tiedosto</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="769"/> <location filename="../src/GUI/gui.cpp" line="774"/>
<source>Open POI file</source> <source>Open POI file</source>
<translation>Avaa POI-tiedosto</translation> <translation>Avaa POI-tiedosto</translation>
</message> </message>
@ -327,8 +327,8 @@
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="205"/> <location filename="../src/GUI/gui.cpp" line="205"/>
<location filename="../src/GUI/gui.cpp" line="607"/> <location filename="../src/GUI/gui.cpp" line="612"/>
<location filename="../src/GUI/gui.cpp" line="608"/> <location filename="../src/GUI/gui.cpp" line="613"/>
<source>Keyboard controls</source> <source>Keyboard controls</source>
<translation>Näppäimistön säätimet</translation> <translation>Näppäimistön säätimet</translation>
</message> </message>
@ -343,42 +343,42 @@
<translation>Lataa uudelleen</translation> <translation>Lataa uudelleen</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="518"/> <location filename="../src/GUI/gui.cpp" line="523"/>
<source>Show</source> <source>Show</source>
<translation>Näytä</translation> <translation>Näytä</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="512"/> <location filename="../src/GUI/gui.cpp" line="517"/>
<source>File</source> <source>File</source>
<translation>Tiedosto</translation> <translation>Tiedosto</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="247"/> <location filename="../src/GUI/gui.cpp" line="251"/>
<source>Close POI files</source> <source>Close POI files</source>
<translation>Sulje POI-tiedostot</translation> <translation>Sulje POI-tiedostot</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="249"/> <location filename="../src/GUI/gui.cpp" line="253"/>
<source>Overlap POIs</source> <source>Overlap POIs</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="253"/> <location filename="../src/GUI/gui.cpp" line="257"/>
<source>Show POI labels</source> <source>Show POI labels</source>
<translation>Näytä POI:n nimiöt</translation> <translation>Näytä POI:n nimiöt</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="258"/> <location filename="../src/GUI/gui.cpp" line="262"/>
<source>Show POIs</source> <source>Show POIs</source>
<translation>Näytä POI:t</translation> <translation>Näytä POI:t</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="267"/> <location filename="../src/GUI/gui.cpp" line="271"/>
<source>Show map</source> <source>Show map</source>
<translation>Näytä kartta</translation> <translation>Näytä kartta</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="277"/> <location filename="../src/GUI/gui.cpp" line="281"/>
<source>Clear tile cache</source> <source>Clear tile cache</source>
<translation>Tyhjennä välimuisti</translation> <translation>Tyhjennä välimuisti</translation>
</message> </message>
@ -389,297 +389,310 @@
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="203"/> <location filename="../src/GUI/gui.cpp" line="203"/>
<location filename="../src/GUI/gui.cpp" line="641"/> <location filename="../src/GUI/gui.cpp" line="646"/>
<location filename="../src/GUI/gui.cpp" line="642"/> <location filename="../src/GUI/gui.cpp" line="647"/>
<source>Paths</source> <source>Paths</source>
<translation>Tiedostopolut</translation> <translation>Tiedostopolut</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="244"/> <location filename="../src/GUI/gui.cpp" line="241"/>
<source>Statistics...</source>
<translation>Tilasto...</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="248"/>
<source>Load POI file...</source> <source>Load POI file...</source>
<translation>Lataa POI-tiedosto...</translation> <translation>Lataa POI-tiedosto...</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="275"/> <location filename="../src/GUI/gui.cpp" line="279"/>
<source>Load map...</source> <source>Load map...</source>
<translation>Lataa kartta...</translation> <translation>Lataa kartta...</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="281"/>
<location filename="../src/GUI/gui.cpp" line="285"/> <location filename="../src/GUI/gui.cpp" line="285"/>
<location filename="../src/GUI/gui.cpp" line="624"/> <location filename="../src/GUI/gui.cpp" line="289"/>
<location filename="../src/GUI/gui.cpp" line="629"/>
<source>Next map</source> <source>Next map</source>
<translation>Seuraava kartta</translation> <translation>Seuraava kartta</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="295"/> <location filename="../src/GUI/gui.cpp" line="299"/>
<source>Show tracks</source> <source>Show tracks</source>
<translation>Näytä jäljet</translation> <translation>Näytä jäljet</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="299"/> <location filename="../src/GUI/gui.cpp" line="303"/>
<source>Show routes</source> <source>Show routes</source>
<translation>Näytä reitit</translation> <translation>Näytä reitit</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="303"/> <location filename="../src/GUI/gui.cpp" line="307"/>
<source>Show waypoints</source> <source>Show waypoints</source>
<translation>Näytä reittipisteet</translation> <translation>Näytä reittipisteet</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="307"/> <location filename="../src/GUI/gui.cpp" line="311"/>
<source>Waypoint labels</source> <source>Waypoint labels</source>
<translation>Reittipisteen nimiöt</translation> <translation>Reittipisteen nimiöt</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="318"/> <location filename="../src/GUI/gui.cpp" line="322"/>
<source>Show graphs</source> <source>Show graphs</source>
<translation>Näytä kaaviokuvat</translation> <translation>Näytä kaaviokuvat</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="338"/> <location filename="../src/GUI/gui.cpp" line="342"/>
<source>Show grid</source> <source>Show grid</source>
<translation>Näytä ruudukko</translation> <translation>Näytä ruudukko</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="342"/> <location filename="../src/GUI/gui.cpp" line="346"/>
<source>Show slider info</source> <source>Show slider info</source>
<translation>Näytä liukusäätimen arvo</translation> <translation>Näytä liukusäätimen arvo</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="348"/> <location filename="../src/GUI/gui.cpp" line="352"/>
<source>Show toolbars</source> <source>Show toolbars</source>
<translation>Näytä työkalupalkit</translation> <translation>Näytä työkalupalkit</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="354"/> <location filename="../src/GUI/gui.cpp" line="358"/>
<source>Total time</source> <source>Total time</source>
<translation>Kokonaisaika</translation> <translation>Kokonaisaika</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="359"/> <location filename="../src/GUI/gui.cpp" line="363"/>
<location filename="../src/GUI/gui.cpp" line="949"/> <location filename="../src/GUI/gui.cpp" line="955"/>
<location filename="../src/GUI/gui.cpp" line="1020"/>
<source>Moving time</source> <source>Moving time</source>
<translation>Liikkumisaika</translation> <translation>Liikkumisaika</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="366"/> <location filename="../src/GUI/gui.cpp" line="370"/>
<source>Metric</source> <source>Metric</source>
<translation>Metriset</translation> <translation>Metriset</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="371"/> <location filename="../src/GUI/gui.cpp" line="375"/>
<source>Imperial</source> <source>Imperial</source>
<translation>Brittiläiset</translation> <translation>Brittiläiset</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="376"/> <location filename="../src/GUI/gui.cpp" line="380"/>
<source>Nautical</source> <source>Nautical</source>
<translation>Merelliset</translation> <translation>Merelliset</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="383"/> <location filename="../src/GUI/gui.cpp" line="387"/>
<source>Decimal degrees (DD)</source> <source>Decimal degrees (DD)</source>
<translation>Desimaaliasteet (DD)</translation> <translation>Desimaaliasteet (DD)</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="388"/> <location filename="../src/GUI/gui.cpp" line="392"/>
<source>Degrees and decimal minutes (DMM)</source> <source>Degrees and decimal minutes (DMM)</source>
<translation>Asteet, desimaaliminuutit (DMM)</translation> <translation>Asteet, desimaaliminuutit (DMM)</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="394"/> <location filename="../src/GUI/gui.cpp" line="398"/>
<source>Degrees, minutes, seconds (DMS)</source> <source>Degrees, minutes, seconds (DMS)</source>
<translation>Asteet, minuutit, sekunnit (DMS)</translation> <translation>Asteet, minuutit, sekunnit (DMS)</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="399"/> <location filename="../src/GUI/gui.cpp" line="403"/>
<source>Fullscreen mode</source> <source>Fullscreen mode</source>
<translation>Kokoruututila</translation> <translation>Kokoruututila</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="405"/> <location filename="../src/GUI/gui.cpp" line="409"/>
<source>Options...</source> <source>Options...</source>
<translation>Valinnat...</translation> <translation>Valinnat...</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="411"/> <location filename="../src/GUI/gui.cpp" line="415"/>
<source>Next</source> <source>Next</source>
<translation>Seuraava</translation> <translation>Seuraava</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="414"/> <location filename="../src/GUI/gui.cpp" line="418"/>
<source>Previous</source> <source>Previous</source>
<translation>Edellinen</translation> <translation>Edellinen</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="418"/> <location filename="../src/GUI/gui.cpp" line="422"/>
<source>Last</source> <source>Last</source>
<translation>Viimeinen</translation> <translation>Viimeinen</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="421"/> <location filename="../src/GUI/gui.cpp" line="425"/>
<source>First</source> <source>First</source>
<translation>Ensimmäinen</translation> <translation>Ensimmäinen</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="461"/> <location filename="../src/GUI/gui.cpp" line="466"/>
<source>POI files</source> <source>POI files</source>
<translation>POI-tiedostot</translation> <translation>POI-tiedostot</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="473"/> <location filename="../src/GUI/gui.cpp" line="478"/>
<source>Display</source> <source>Display</source>
<translation>Näytä</translation> <translation>Näytä</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="485"/> <location filename="../src/GUI/gui.cpp" line="490"/>
<source>Units</source> <source>Units</source>
<translation>Yksiköt</translation> <translation>Yksiköt</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="489"/> <location filename="../src/GUI/gui.cpp" line="494"/>
<source>Coordinates format</source> <source>Coordinates format</source>
<translation>Koordinaattien muoto</translation> <translation>Koordinaattien muoto</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="617"/> <location filename="../src/GUI/gui.cpp" line="622"/>
<source>Append file</source> <source>Append file</source>
<translation>Lisää tiedosto</translation> <translation>Lisää tiedosto</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="618"/> <location filename="../src/GUI/gui.cpp" line="623"/>
<source>Next/Previous</source> <source>Next/Previous</source>
<translation>Next/Previous</translation> <translation>Next/Previous</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="620"/> <location filename="../src/GUI/gui.cpp" line="625"/>
<source>Toggle graph type</source> <source>Toggle graph type</source>
<translation>Vaihda kaaviokuvan tyyppi</translation> <translation>Vaihda kaaviokuvan tyyppi</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="622"/> <location filename="../src/GUI/gui.cpp" line="627"/>
<source>Toggle time type</source> <source>Toggle time type</source>
<translation>Vaihda ajan tyyppi</translation> <translation>Vaihda ajan tyyppi</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="626"/> <location filename="../src/GUI/gui.cpp" line="631"/>
<source>Previous map</source> <source>Previous map</source>
<translation>Edellinen kartta</translation> <translation>Edellinen kartta</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="627"/> <location filename="../src/GUI/gui.cpp" line="632"/>
<source>Zoom in</source> <source>Zoom in</source>
<translation>Lähennä</translation> <translation>Lähennä</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="629"/> <location filename="../src/GUI/gui.cpp" line="634"/>
<source>Zoom out</source> <source>Zoom out</source>
<translation>Loitonna</translation> <translation>Loitonna</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="631"/> <location filename="../src/GUI/gui.cpp" line="636"/>
<source>Digital zoom</source> <source>Digital zoom</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="632"/> <location filename="../src/GUI/gui.cpp" line="637"/>
<source>Zoom</source> <source>Zoom</source>
<translation>Zoom</translation> <translation>Zoom</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="1148"/> <location filename="../src/GUI/gui.cpp" line="650"/>
<source>Global</source>
<translation>Globaaliset</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="654"/>
<location filename="../src/GUI/gui.cpp" line="660"/>
<source>GCS/PCS directory:</source>
<translation>GCS/PCS:n hakemisto:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="656"/>
<source>User-specific</source>
<translation>Käyttäjäkohtaiset</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="976"/>
<location filename="../src/GUI/gui.cpp" line="977"/>
<source>Statistics</source>
<translation>Tilasto</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="1219"/>
<source>Open map file</source> <source>Open map file</source>
<translation>Avaa karttatiedosto</translation> <translation>Avaa karttatiedosto</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="1188"/> <location filename="../src/GUI/gui.cpp" line="1259"/>
<source>No files loaded</source> <source>No files loaded</source>
<translation>Yhtään tiedostoja ei ladattu</translation> <translation>Yhtään tiedostoja ei ladattu</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="935"/> <location filename="../src/GUI/gui.cpp" line="939"/>
<location filename="../src/GUI/gui.cpp" line="938"/> <location filename="../src/GUI/gui.cpp" line="943"/>
<location filename="../src/GUI/gui.cpp" line="1006"/>
<location filename="../src/GUI/gui.cpp" line="1009"/>
<source>Date</source> <source>Date</source>
<translation>Päivämäärä</translation> <translation>Päivämäärä</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="429"/> <location filename="../src/GUI/gui.cpp" line="433"/>
<source>&amp;File</source> <source>&amp;File</source>
<translation>&amp;Tiedosto</translation> <translation>&amp;Tiedosto</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="443"/> <location filename="../src/GUI/gui.cpp" line="448"/>
<source>&amp;Map</source> <source>&amp;Map</source>
<translation>&amp;Kartat</translation> <translation>&amp;Kartat</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="451"/> <location filename="../src/GUI/gui.cpp" line="456"/>
<source>&amp;Graph</source> <source>&amp;Graph</source>
<translation>Kaa&amp;viokuva</translation> <translation>Kaa&amp;viokuva</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="460"/> <location filename="../src/GUI/gui.cpp" line="465"/>
<source>&amp;POI</source> <source>&amp;POI</source>
<translation>&amp;POI</translation> <translation>&amp;POI</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="472"/> <location filename="../src/GUI/gui.cpp" line="477"/>
<source>&amp;Data</source> <source>&amp;Data</source>
<translation>Tie&amp;dot</translation> <translation>Tie&amp;dot</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="481"/> <location filename="../src/GUI/gui.cpp" line="486"/>
<source>&amp;Settings</source> <source>&amp;Settings</source>
<translation>&amp;Asetukset</translation> <translation>&amp;Asetukset</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="499"/> <location filename="../src/GUI/gui.cpp" line="504"/>
<source>&amp;Help</source> <source>&amp;Help</source>
<translation>&amp;Ohje</translation> <translation>&amp;Ohje</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="645"/> <location filename="../src/GUI/gui.cpp" line="650"/>
<location filename="../src/GUI/gui.cpp" line="657"/>
<source>Map directory:</source> <source>Map directory:</source>
<translation>Karttojen hakemisto:</translation> <translation>Karttojen hakemisto:</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="647"/> <location filename="../src/GUI/gui.cpp" line="652"/>
<location filename="../src/GUI/gui.cpp" line="658"/>
<source>POI directory:</source> <source>POI directory:</source>
<translation>POI:n hakemisto:</translation> <translation>POI:n hakemisto:</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="649"/> <location filename="../src/GUI/gui.cpp" line="930"/>
<source>GCS file:</source> <location filename="../src/GUI/gui.cpp" line="998"/>
<translation>GCS-tiedosto:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="650"/>
<source>PCS file:</source>
<translation>PCS-tiedosto:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="652"/>
<source>Ellipsoids file:</source>
<translation>Ellipsoids-tiedosto:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="655"/>
<source>User override directory:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="927"/>
<source>Routes</source> <source>Routes</source>
<translation>Reitit</translation> <translation>Reitit</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="1177"/> <location filename="../src/GUI/gui.cpp" line="1248"/>
<source>Error loading map:</source> <source>Error loading map:</source>
<translation>Virhe ladattaessa karttaa:</translation> <translation>Virhe ladattaessa karttaa:</translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<location filename="../src/GUI/gui.cpp" line="1192"/> <location filename="../src/GUI/gui.cpp" line="1263"/>
<source>%n files</source> <source>%n files</source>
<translation> <translation>
<numerusform>%n tiedosto</numerusform> <numerusform>%n tiedosto</numerusform>
@ -687,12 +700,12 @@
</translation> </translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="611"/> <location filename="../src/GUI/gui.cpp" line="616"/>
<source>Next file</source> <source>Next file</source>
<translation>Seuraava tiedosto</translation> <translation>Seuraava tiedosto</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="587"/> <location filename="../src/GUI/gui.cpp" line="592"/>
<source>Version </source> <source>Version </source>
<translation>Versio </translation> <translation>Versio </translation>
</message> </message>
@ -707,77 +720,81 @@
<translation>Vie PDF:ksi...</translation> <translation>Vie PDF:ksi...</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="929"/> <location filename="../src/GUI/gui.cpp" line="933"/>
<location filename="../src/GUI/gui.cpp" line="1000"/>
<source>Waypoints</source> <source>Waypoints</source>
<translation>Reittipisteet</translation> <translation>Reittipisteet</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="612"/> <location filename="../src/GUI/gui.cpp" line="617"/>
<source>Previous file</source> <source>Previous file</source>
<translation>Edellinen tiedosto</translation> <translation>Edellinen tiedosto</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="311"/> <location filename="../src/GUI/gui.cpp" line="315"/>
<source>Route waypoints</source> <source>Route waypoints</source>
<translation>Reittipisteet</translation> <translation>Reittipisteet</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="614"/> <location filename="../src/GUI/gui.cpp" line="619"/>
<source>First file</source> <source>First file</source>
<translation>Ensimmäinen tiedosto</translation> <translation>Ensimmäinen tiedosto</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="616"/> <location filename="../src/GUI/gui.cpp" line="621"/>
<source>Last file</source> <source>Last file</source>
<translation>Viimeinen tiedosto</translation> <translation>Viimeinen tiedosto</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="758"/> <location filename="../src/GUI/gui.cpp" line="763"/>
<source>Error loading data file:</source> <source>Error loading data file:</source>
<translation>Virhe ladattaessa datatiedostoa:</translation> <translation>Virhe ladattaessa datatiedostoa:</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="761"/> <location filename="../src/GUI/gui.cpp" line="766"/>
<location filename="../src/GUI/gui.cpp" line="788"/> <location filename="../src/GUI/gui.cpp" line="793"/>
<source>Line: %1</source> <source>Line: %1</source>
<translation>Rivi: %1</translation> <translation>Rivi: %1</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="785"/> <location filename="../src/GUI/gui.cpp" line="790"/>
<source>Error loading POI file:</source> <source>Error loading POI file:</source>
<translation>Virhe ladattaessa POI-tiedostoa:</translation> <translation>Virhe ladattaessa POI-tiedostoa:</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="921"/> <location filename="../src/GUI/gui.cpp" line="992"/>
<source>Name</source> <source>Name</source>
<translation>Nimi</translation> <translation>Nimi</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="925"/> <location filename="../src/GUI/gui.cpp" line="927"/>
<location filename="../src/GUI/gui.cpp" line="996"/>
<source>Tracks</source> <source>Tracks</source>
<translation>Jäljet</translation> <translation>Jäljet</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="208"/> <location filename="../src/GUI/gui.cpp" line="208"/>
<location filename="../src/GUI/gui.cpp" line="586"/> <location filename="../src/GUI/gui.cpp" line="591"/>
<source>About GPXSee</source> <source>About GPXSee</source>
<translation>Tietoja GPXSee:stä</translation> <translation>Tietoja GPXSee:stä</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="523"/> <location filename="../src/GUI/gui.cpp" line="528"/>
<source>Navigation</source> <source>Navigation</source>
<translation>Navigointi</translation> <translation>Navigointi</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="326"/> <location filename="../src/GUI/gui.cpp" line="330"/>
<location filename="../src/GUI/gui.cpp" line="945"/> <location filename="../src/GUI/gui.cpp" line="950"/>
<location filename="../src/GUI/gui.cpp" line="1016"/>
<source>Distance</source> <source>Distance</source>
<translation>Etäisyys</translation> <translation>Etäisyys</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="332"/> <location filename="../src/GUI/gui.cpp" line="336"/>
<location filename="../src/GUI/gui.cpp" line="482"/> <location filename="../src/GUI/gui.cpp" line="487"/>
<location filename="../src/GUI/gui.cpp" line="947"/> <location filename="../src/GUI/gui.cpp" line="953"/>
<location filename="../src/GUI/gui.cpp" line="1018"/>
<source>Time</source> <source>Time</source>
<translation>Aika</translation> <translation>Aika</translation>
</message> </message>

View File

@ -306,47 +306,29 @@
<context> <context>
<name>GUI</name> <name>GUI</name>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="590"/> <location filename="../src/GUI/gui.cpp" line="595"/>
<source>GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at </source> <source>GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at </source>
<translation>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 sur </translation> <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 sur </translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="645"/> <location filename="../src/GUI/gui.cpp" line="650"/>
<location filename="../src/GUI/gui.cpp" line="657"/>
<source>Map directory:</source> <source>Map directory:</source>
<translation>Dossier des cartes :</translation> <translation>Dossier des cartes :</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="647"/> <location filename="../src/GUI/gui.cpp" line="652"/>
<location filename="../src/GUI/gui.cpp" line="658"/>
<source>POI directory:</source> <source>POI directory:</source>
<translation>Dossier des POI:</translation> <translation>Dossier des POI:</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="649"/> <location filename="../src/GUI/gui.cpp" line="669"/>
<source>GCS file:</source>
<translation>Fichier GCS :</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="650"/>
<source>PCS file:</source>
<translation>Fichier PCS :</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="652"/>
<source>Ellipsoids file:</source>
<translation>Fichier des ellipsoïdes :</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="655"/>
<source>User override directory:</source>
<translation>Dossier de l&apos;utilisateur :</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="664"/>
<source>Open file</source> <source>Open file</source>
<translation>Ouvrir un fichier</translation> <translation>Ouvrir un fichier</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="769"/> <location filename="../src/GUI/gui.cpp" line="774"/>
<source>Open POI file</source> <source>Open POI file</source>
<translation>Ouvrir un fichier POI</translation> <translation>Ouvrir un fichier POI</translation>
</message> </message>
@ -357,8 +339,8 @@
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="205"/> <location filename="../src/GUI/gui.cpp" line="205"/>
<location filename="../src/GUI/gui.cpp" line="607"/> <location filename="../src/GUI/gui.cpp" line="612"/>
<location filename="../src/GUI/gui.cpp" line="608"/> <location filename="../src/GUI/gui.cpp" line="613"/>
<source>Keyboard controls</source> <source>Keyboard controls</source>
<translation>Raccourcis clavier</translation> <translation>Raccourcis clavier</translation>
</message> </message>
@ -373,42 +355,42 @@
<translation>Actualiser</translation> <translation>Actualiser</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="518"/> <location filename="../src/GUI/gui.cpp" line="523"/>
<source>Show</source> <source>Show</source>
<translation>Afficher</translation> <translation>Afficher</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="512"/> <location filename="../src/GUI/gui.cpp" line="517"/>
<source>File</source> <source>File</source>
<translation>Fichier</translation> <translation>Fichier</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="247"/> <location filename="../src/GUI/gui.cpp" line="251"/>
<source>Close POI files</source> <source>Close POI files</source>
<translation>Fermer les fichiers POI</translation> <translation>Fermer les fichiers POI</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="249"/> <location filename="../src/GUI/gui.cpp" line="253"/>
<source>Overlap POIs</source> <source>Overlap POIs</source>
<translation>Superposer les POI</translation> <translation>Superposer les POI</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="253"/> <location filename="../src/GUI/gui.cpp" line="257"/>
<source>Show POI labels</source> <source>Show POI labels</source>
<translation>Afficher les notes des POI</translation> <translation>Afficher les notes des POI</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="258"/> <location filename="../src/GUI/gui.cpp" line="262"/>
<source>Show POIs</source> <source>Show POIs</source>
<translation>Afficher les POI</translation> <translation>Afficher les POI</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="267"/> <location filename="../src/GUI/gui.cpp" line="271"/>
<source>Show map</source> <source>Show map</source>
<translation>Afficher la carte</translation> <translation>Afficher la carte</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="277"/> <location filename="../src/GUI/gui.cpp" line="281"/>
<source>Clear tile cache</source> <source>Clear tile cache</source>
<translation>Effacer les tuiles en cache</translation> <translation>Effacer les tuiles en cache</translation>
</message> </message>
@ -419,221 +401,249 @@
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="203"/> <location filename="../src/GUI/gui.cpp" line="203"/>
<location filename="../src/GUI/gui.cpp" line="641"/> <location filename="../src/GUI/gui.cpp" line="646"/>
<location filename="../src/GUI/gui.cpp" line="642"/> <location filename="../src/GUI/gui.cpp" line="647"/>
<source>Paths</source> <source>Paths</source>
<translation>Chemin d&apos;accès</translation> <translation>Chemin d&apos;accès</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="244"/> <location filename="../src/GUI/gui.cpp" line="241"/>
<source>Statistics...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="248"/>
<source>Load POI file...</source> <source>Load POI file...</source>
<translation>Charger un fichier POI...</translation> <translation>Charger un fichier POI...</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="275"/> <location filename="../src/GUI/gui.cpp" line="279"/>
<source>Load map...</source> <source>Load map...</source>
<translation>Charger une carte...</translation> <translation>Charger une carte...</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="281"/>
<location filename="../src/GUI/gui.cpp" line="285"/> <location filename="../src/GUI/gui.cpp" line="285"/>
<location filename="../src/GUI/gui.cpp" line="624"/> <location filename="../src/GUI/gui.cpp" line="289"/>
<location filename="../src/GUI/gui.cpp" line="629"/>
<source>Next map</source> <source>Next map</source>
<translation>Carte suivante</translation> <translation>Carte suivante</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="295"/> <location filename="../src/GUI/gui.cpp" line="299"/>
<source>Show tracks</source> <source>Show tracks</source>
<translation>Afficher la trace</translation> <translation>Afficher la trace</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="299"/> <location filename="../src/GUI/gui.cpp" line="303"/>
<source>Show routes</source> <source>Show routes</source>
<translation>Afficher la route</translation> <translation>Afficher la route</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="303"/> <location filename="../src/GUI/gui.cpp" line="307"/>
<source>Show waypoints</source> <source>Show waypoints</source>
<translation>Afficher les points de jalonnement</translation> <translation>Afficher les points de jalonnement</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="307"/> <location filename="../src/GUI/gui.cpp" line="311"/>
<source>Waypoint labels</source> <source>Waypoint labels</source>
<translation>Étiquettes des jalons</translation> <translation>Étiquettes des jalons</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="318"/> <location filename="../src/GUI/gui.cpp" line="322"/>
<source>Show graphs</source> <source>Show graphs</source>
<translation>Afficher les graphes</translation> <translation>Afficher les graphes</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="338"/> <location filename="../src/GUI/gui.cpp" line="342"/>
<source>Show grid</source> <source>Show grid</source>
<translation>Afficher la grille</translation> <translation>Afficher la grille</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="342"/> <location filename="../src/GUI/gui.cpp" line="346"/>
<source>Show slider info</source> <source>Show slider info</source>
<translation>Afficher les infos du curseur</translation> <translation>Afficher les infos du curseur</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="348"/> <location filename="../src/GUI/gui.cpp" line="352"/>
<source>Show toolbars</source> <source>Show toolbars</source>
<translation>Afficher la barre d&apos;outils</translation> <translation>Afficher la barre d&apos;outils</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="354"/> <location filename="../src/GUI/gui.cpp" line="358"/>
<source>Total time</source> <source>Total time</source>
<translation>Durée totale</translation> <translation>Durée totale</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="359"/> <location filename="../src/GUI/gui.cpp" line="363"/>
<location filename="../src/GUI/gui.cpp" line="949"/> <location filename="../src/GUI/gui.cpp" line="955"/>
<location filename="../src/GUI/gui.cpp" line="1020"/>
<source>Moving time</source> <source>Moving time</source>
<translation>Durée en déplacement</translation> <translation>Durée en déplacement</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="366"/> <location filename="../src/GUI/gui.cpp" line="370"/>
<source>Metric</source> <source>Metric</source>
<translation>Métrique</translation> <translation>Métrique</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="371"/> <location filename="../src/GUI/gui.cpp" line="375"/>
<source>Imperial</source> <source>Imperial</source>
<translation>Impérial</translation> <translation>Impérial</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="376"/> <location filename="../src/GUI/gui.cpp" line="380"/>
<source>Nautical</source> <source>Nautical</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="383"/> <location filename="../src/GUI/gui.cpp" line="387"/>
<source>Decimal degrees (DD)</source> <source>Decimal degrees (DD)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="388"/> <location filename="../src/GUI/gui.cpp" line="392"/>
<source>Degrees and decimal minutes (DMM)</source> <source>Degrees and decimal minutes (DMM)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="394"/> <location filename="../src/GUI/gui.cpp" line="398"/>
<source>Degrees, minutes, seconds (DMS)</source> <source>Degrees, minutes, seconds (DMS)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="399"/> <location filename="../src/GUI/gui.cpp" line="403"/>
<source>Fullscreen mode</source> <source>Fullscreen mode</source>
<translation>Mode plein écran</translation> <translation>Mode plein écran</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="405"/> <location filename="../src/GUI/gui.cpp" line="409"/>
<source>Options...</source> <source>Options...</source>
<translation>Options...</translation> <translation>Options...</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="411"/> <location filename="../src/GUI/gui.cpp" line="415"/>
<source>Next</source> <source>Next</source>
<translation>Suivant</translation> <translation>Suivant</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="414"/> <location filename="../src/GUI/gui.cpp" line="418"/>
<source>Previous</source> <source>Previous</source>
<translation>Précèdant</translation> <translation>Précèdant</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="418"/> <location filename="../src/GUI/gui.cpp" line="422"/>
<source>Last</source> <source>Last</source>
<translation>Dernier</translation> <translation>Dernier</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="421"/> <location filename="../src/GUI/gui.cpp" line="425"/>
<source>First</source> <source>First</source>
<translation>Premier</translation> <translation>Premier</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="461"/> <location filename="../src/GUI/gui.cpp" line="466"/>
<source>POI files</source> <source>POI files</source>
<translation>Fichiers POI</translation> <translation>Fichiers POI</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="473"/> <location filename="../src/GUI/gui.cpp" line="478"/>
<source>Display</source> <source>Display</source>
<translation>Affichage</translation> <translation>Affichage</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="485"/> <location filename="../src/GUI/gui.cpp" line="490"/>
<source>Units</source> <source>Units</source>
<translation>Système d&apos;unités</translation> <translation>Système d&apos;unités</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="489"/> <location filename="../src/GUI/gui.cpp" line="494"/>
<source>Coordinates format</source> <source>Coordinates format</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="617"/> <location filename="../src/GUI/gui.cpp" line="622"/>
<source>Append file</source> <source>Append file</source>
<translation>Joindre un fichier</translation> <translation>Joindre un fichier</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="618"/> <location filename="../src/GUI/gui.cpp" line="623"/>
<source>Next/Previous</source> <source>Next/Previous</source>
<translation>Suivant/Précèdant</translation> <translation>Suivant/Précèdant</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="620"/> <location filename="../src/GUI/gui.cpp" line="625"/>
<source>Toggle graph type</source> <source>Toggle graph type</source>
<translation>Controler le type de graphe</translation> <translation>Controler le type de graphe</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="622"/> <location filename="../src/GUI/gui.cpp" line="627"/>
<source>Toggle time type</source> <source>Toggle time type</source>
<translation>Controler le type de durée</translation> <translation>Controler le type de durée</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="626"/> <location filename="../src/GUI/gui.cpp" line="631"/>
<source>Previous map</source> <source>Previous map</source>
<translation>Carte précèdente</translation> <translation>Carte précèdente</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="627"/> <location filename="../src/GUI/gui.cpp" line="632"/>
<source>Zoom in</source> <source>Zoom in</source>
<translation>Zoomer</translation> <translation>Zoomer</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="629"/> <location filename="../src/GUI/gui.cpp" line="634"/>
<source>Zoom out</source> <source>Zoom out</source>
<translation>Dézoomer</translation> <translation>Dézoomer</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="631"/> <location filename="../src/GUI/gui.cpp" line="636"/>
<source>Digital zoom</source> <source>Digital zoom</source>
<translation>Zoom numérique</translation> <translation>Zoom numérique</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="632"/> <location filename="../src/GUI/gui.cpp" line="637"/>
<source>Zoom</source> <source>Zoom</source>
<translation>Zoom</translation> <translation>Zoom</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="1148"/> <location filename="../src/GUI/gui.cpp" line="650"/>
<source>Global</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="654"/>
<location filename="../src/GUI/gui.cpp" line="660"/>
<source>GCS/PCS directory:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="656"/>
<source>User-specific</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="976"/>
<location filename="../src/GUI/gui.cpp" line="977"/>
<source>Statistics</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="1219"/>
<source>Open map file</source> <source>Open map file</source>
<translation>Ouvrir un fichier de carte</translation> <translation>Ouvrir un fichier de carte</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="1177"/> <location filename="../src/GUI/gui.cpp" line="1248"/>
<source>Error loading map:</source> <source>Error loading map:</source>
<translation>Erreur lors du chargement de la carte :</translation> <translation>Erreur lors du chargement de la carte :</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="1188"/> <location filename="../src/GUI/gui.cpp" line="1259"/>
<source>No files loaded</source> <source>No files loaded</source>
<translation>Aucun fichier chargé</translation> <translation>Aucun fichier chargé</translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<location filename="../src/GUI/gui.cpp" line="1192"/> <location filename="../src/GUI/gui.cpp" line="1263"/>
<source>%n files</source> <source>%n files</source>
<translation> <translation>
<numerusform>%n fichier</numerusform> <numerusform>%n fichier</numerusform>
@ -641,23 +651,26 @@
</translation> </translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="935"/> <location filename="../src/GUI/gui.cpp" line="939"/>
<location filename="../src/GUI/gui.cpp" line="938"/> <location filename="../src/GUI/gui.cpp" line="943"/>
<location filename="../src/GUI/gui.cpp" line="1006"/>
<location filename="../src/GUI/gui.cpp" line="1009"/>
<source>Date</source> <source>Date</source>
<translation>Date</translation> <translation>Date</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="927"/> <location filename="../src/GUI/gui.cpp" line="930"/>
<location filename="../src/GUI/gui.cpp" line="998"/>
<source>Routes</source> <source>Routes</source>
<translation>Routes</translation> <translation>Routes</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="611"/> <location filename="../src/GUI/gui.cpp" line="616"/>
<source>Next file</source> <source>Next file</source>
<translation>Fichier suivant</translation> <translation>Fichier suivant</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="587"/> <location filename="../src/GUI/gui.cpp" line="592"/>
<source>Version </source> <source>Version </source>
<translation>Version </translation> <translation>Version </translation>
</message> </message>
@ -672,112 +685,116 @@
<translation>Exporter au format PDF...</translation> <translation>Exporter au format PDF...</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="929"/> <location filename="../src/GUI/gui.cpp" line="933"/>
<location filename="../src/GUI/gui.cpp" line="1000"/>
<source>Waypoints</source> <source>Waypoints</source>
<translation>Points de jalonnement</translation> <translation>Points de jalonnement</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="612"/> <location filename="../src/GUI/gui.cpp" line="617"/>
<source>Previous file</source> <source>Previous file</source>
<translation>Fichier précédent</translation> <translation>Fichier précédent</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="311"/> <location filename="../src/GUI/gui.cpp" line="315"/>
<source>Route waypoints</source> <source>Route waypoints</source>
<translation>Jalons de route</translation> <translation>Jalons de route</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="429"/> <location filename="../src/GUI/gui.cpp" line="433"/>
<source>&amp;File</source> <source>&amp;File</source>
<translation>&amp;Fichier</translation> <translation>&amp;Fichier</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="443"/> <location filename="../src/GUI/gui.cpp" line="448"/>
<source>&amp;Map</source> <source>&amp;Map</source>
<translation>&amp;Carte</translation> <translation>&amp;Carte</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="451"/> <location filename="../src/GUI/gui.cpp" line="456"/>
<source>&amp;Graph</source> <source>&amp;Graph</source>
<translation>&amp;Graphe</translation> <translation>&amp;Graphe</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="460"/> <location filename="../src/GUI/gui.cpp" line="465"/>
<source>&amp;POI</source> <source>&amp;POI</source>
<translation>&amp;POI</translation> <translation>&amp;POI</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="472"/> <location filename="../src/GUI/gui.cpp" line="477"/>
<source>&amp;Data</source> <source>&amp;Data</source>
<translation>&amp;Données</translation> <translation>&amp;Données</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="481"/> <location filename="../src/GUI/gui.cpp" line="486"/>
<source>&amp;Settings</source> <source>&amp;Settings</source>
<translation>Pa&amp;ramètres</translation> <translation>Pa&amp;ramètres</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="499"/> <location filename="../src/GUI/gui.cpp" line="504"/>
<source>&amp;Help</source> <source>&amp;Help</source>
<translation>&amp;Aide</translation> <translation>&amp;Aide</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="614"/> <location filename="../src/GUI/gui.cpp" line="619"/>
<source>First file</source> <source>First file</source>
<translation>Premier fichier</translation> <translation>Premier fichier</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="616"/> <location filename="../src/GUI/gui.cpp" line="621"/>
<source>Last file</source> <source>Last file</source>
<translation>Dernier fichier</translation> <translation>Dernier fichier</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="758"/> <location filename="../src/GUI/gui.cpp" line="763"/>
<source>Error loading data file:</source> <source>Error loading data file:</source>
<translation>Erreur lors du chargement des données:</translation> <translation>Erreur lors du chargement des données:</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="761"/> <location filename="../src/GUI/gui.cpp" line="766"/>
<location filename="../src/GUI/gui.cpp" line="788"/> <location filename="../src/GUI/gui.cpp" line="793"/>
<source>Line: %1</source> <source>Line: %1</source>
<translation>Ligne : %1</translation> <translation>Ligne : %1</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="785"/> <location filename="../src/GUI/gui.cpp" line="790"/>
<source>Error loading POI file:</source> <source>Error loading POI file:</source>
<translation>Erreur lors du chargement du fichier POI :</translation> <translation>Erreur lors du chargement du fichier POI :</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="921"/> <location filename="../src/GUI/gui.cpp" line="992"/>
<source>Name</source> <source>Name</source>
<translation>Nom</translation> <translation>Nom</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="925"/> <location filename="../src/GUI/gui.cpp" line="927"/>
<location filename="../src/GUI/gui.cpp" line="996"/>
<source>Tracks</source> <source>Tracks</source>
<translation>Traces</translation> <translation>Traces</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="208"/> <location filename="../src/GUI/gui.cpp" line="208"/>
<location filename="../src/GUI/gui.cpp" line="586"/> <location filename="../src/GUI/gui.cpp" line="591"/>
<source>About GPXSee</source> <source>About GPXSee</source>
<translation>À propos de GPXSee</translation> <translation>À propos de GPXSee</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="523"/> <location filename="../src/GUI/gui.cpp" line="528"/>
<source>Navigation</source> <source>Navigation</source>
<translation>Navigation</translation> <translation>Navigation</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="326"/> <location filename="../src/GUI/gui.cpp" line="330"/>
<location filename="../src/GUI/gui.cpp" line="945"/> <location filename="../src/GUI/gui.cpp" line="950"/>
<location filename="../src/GUI/gui.cpp" line="1016"/>
<source>Distance</source> <source>Distance</source>
<translation>Distance</translation> <translation>Distance</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="332"/> <location filename="../src/GUI/gui.cpp" line="336"/>
<location filename="../src/GUI/gui.cpp" line="482"/> <location filename="../src/GUI/gui.cpp" line="487"/>
<location filename="../src/GUI/gui.cpp" line="947"/> <location filename="../src/GUI/gui.cpp" line="953"/>
<location filename="../src/GUI/gui.cpp" line="1018"/>
<source>Time</source> <source>Time</source>
<translation>Temps</translation> <translation>Temps</translation>
</message> </message>

View File

@ -306,17 +306,17 @@
<context> <context>
<name>GUI</name> <name>GUI</name>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="590"/> <location filename="../src/GUI/gui.cpp" line="595"/>
<source>GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at </source> <source>GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at </source>
<translation>Program GPXSee 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 </translation> <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 </translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="664"/> <location filename="../src/GUI/gui.cpp" line="669"/>
<source>Open file</source> <source>Open file</source>
<translation>Otwórz plik</translation> <translation>Otwórz plik</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="769"/> <location filename="../src/GUI/gui.cpp" line="774"/>
<source>Open POI file</source> <source>Open POI file</source>
<translation>Otwórz plik POI</translation> <translation>Otwórz plik POI</translation>
</message> </message>
@ -327,8 +327,8 @@
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="205"/> <location filename="../src/GUI/gui.cpp" line="205"/>
<location filename="../src/GUI/gui.cpp" line="607"/> <location filename="../src/GUI/gui.cpp" line="612"/>
<location filename="../src/GUI/gui.cpp" line="608"/> <location filename="../src/GUI/gui.cpp" line="613"/>
<source>Keyboard controls</source> <source>Keyboard controls</source>
<translation>Elementy sterujące klawiatury</translation> <translation>Elementy sterujące klawiatury</translation>
</message> </message>
@ -343,42 +343,42 @@
<translation>Odśwież</translation> <translation>Odśwież</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="518"/> <location filename="../src/GUI/gui.cpp" line="523"/>
<source>Show</source> <source>Show</source>
<translation>Pokaż</translation> <translation>Pokaż</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="512"/> <location filename="../src/GUI/gui.cpp" line="517"/>
<source>File</source> <source>File</source>
<translation>Plik</translation> <translation>Plik</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="247"/> <location filename="../src/GUI/gui.cpp" line="251"/>
<source>Close POI files</source> <source>Close POI files</source>
<translation>Zamknij pliki POI</translation> <translation>Zamknij pliki POI</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="249"/> <location filename="../src/GUI/gui.cpp" line="253"/>
<source>Overlap POIs</source> <source>Overlap POIs</source>
<translation>Nakładka POI</translation> <translation>Nakładka POI</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="253"/> <location filename="../src/GUI/gui.cpp" line="257"/>
<source>Show POI labels</source> <source>Show POI labels</source>
<translation>Pokaż etykiety POI</translation> <translation>Pokaż etykiety POI</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="258"/> <location filename="../src/GUI/gui.cpp" line="262"/>
<source>Show POIs</source> <source>Show POIs</source>
<translation>Pokaż punkty POI</translation> <translation>Pokaż punkty POI</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="267"/> <location filename="../src/GUI/gui.cpp" line="271"/>
<source>Show map</source> <source>Show map</source>
<translation>Pokaż mapę</translation> <translation>Pokaż mapę</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="277"/> <location filename="../src/GUI/gui.cpp" line="281"/>
<source>Clear tile cache</source> <source>Clear tile cache</source>
<translation>Wyczyść pamięć podręczną kafelków</translation> <translation>Wyczyść pamięć podręczną kafelków</translation>
</message> </message>
@ -389,297 +389,310 @@
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="203"/> <location filename="../src/GUI/gui.cpp" line="203"/>
<location filename="../src/GUI/gui.cpp" line="641"/> <location filename="../src/GUI/gui.cpp" line="646"/>
<location filename="../src/GUI/gui.cpp" line="642"/> <location filename="../src/GUI/gui.cpp" line="647"/>
<source>Paths</source> <source>Paths</source>
<translation>Ścieżki</translation> <translation>Ścieżki</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="244"/> <location filename="../src/GUI/gui.cpp" line="241"/>
<source>Statistics...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="248"/>
<source>Load POI file...</source> <source>Load POI file...</source>
<translation>Załaduj plik POI...</translation> <translation>Załaduj plik POI...</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="275"/> <location filename="../src/GUI/gui.cpp" line="279"/>
<source>Load map...</source> <source>Load map...</source>
<translation>Załaduj mapę...</translation> <translation>Załaduj mapę...</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="281"/>
<location filename="../src/GUI/gui.cpp" line="285"/> <location filename="../src/GUI/gui.cpp" line="285"/>
<location filename="../src/GUI/gui.cpp" line="624"/> <location filename="../src/GUI/gui.cpp" line="289"/>
<location filename="../src/GUI/gui.cpp" line="629"/>
<source>Next map</source> <source>Next map</source>
<translation>Następna mapa</translation> <translation>Następna mapa</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="295"/> <location filename="../src/GUI/gui.cpp" line="299"/>
<source>Show tracks</source> <source>Show tracks</source>
<translation>Pokaż ślady</translation> <translation>Pokaż ślady</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="299"/> <location filename="../src/GUI/gui.cpp" line="303"/>
<source>Show routes</source> <source>Show routes</source>
<translation>Pokaż trasy</translation> <translation>Pokaż trasy</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="303"/> <location filename="../src/GUI/gui.cpp" line="307"/>
<source>Show waypoints</source> <source>Show waypoints</source>
<translation>Pokaż punkty nawigacyjne</translation> <translation>Pokaż punkty nawigacyjne</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="307"/> <location filename="../src/GUI/gui.cpp" line="311"/>
<source>Waypoint labels</source> <source>Waypoint labels</source>
<translation>Etykiety punktów nawigacyjnych</translation> <translation>Etykiety punktów nawigacyjnych</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="318"/> <location filename="../src/GUI/gui.cpp" line="322"/>
<source>Show graphs</source> <source>Show graphs</source>
<translation>Pokaż wykresy</translation> <translation>Pokaż wykresy</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="338"/> <location filename="../src/GUI/gui.cpp" line="342"/>
<source>Show grid</source> <source>Show grid</source>
<translation>Pokaż siatkę</translation> <translation>Pokaż siatkę</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="342"/> <location filename="../src/GUI/gui.cpp" line="346"/>
<source>Show slider info</source> <source>Show slider info</source>
<translation>Pokaż informację o suwaku</translation> <translation>Pokaż informację o suwaku</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="348"/> <location filename="../src/GUI/gui.cpp" line="352"/>
<source>Show toolbars</source> <source>Show toolbars</source>
<translation>Pokaż paski narzędzi</translation> <translation>Pokaż paski narzędzi</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="354"/> <location filename="../src/GUI/gui.cpp" line="358"/>
<source>Total time</source> <source>Total time</source>
<translation>Całkowity czas</translation> <translation>Całkowity czas</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="359"/> <location filename="../src/GUI/gui.cpp" line="363"/>
<location filename="../src/GUI/gui.cpp" line="949"/> <location filename="../src/GUI/gui.cpp" line="955"/>
<location filename="../src/GUI/gui.cpp" line="1020"/>
<source>Moving time</source> <source>Moving time</source>
<translation>Czas ruchu</translation> <translation>Czas ruchu</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="366"/> <location filename="../src/GUI/gui.cpp" line="370"/>
<source>Metric</source> <source>Metric</source>
<translation>Metryczne</translation> <translation>Metryczne</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="371"/> <location filename="../src/GUI/gui.cpp" line="375"/>
<source>Imperial</source> <source>Imperial</source>
<translation>Imperialne</translation> <translation>Imperialne</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="376"/> <location filename="../src/GUI/gui.cpp" line="380"/>
<source>Nautical</source> <source>Nautical</source>
<translation>Morskie</translation> <translation>Morskie</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="383"/> <location filename="../src/GUI/gui.cpp" line="387"/>
<source>Decimal degrees (DD)</source> <source>Decimal degrees (DD)</source>
<translation>Stopnie dziesiętne (DD)</translation> <translation>Stopnie dziesiętne (DD)</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="388"/> <location filename="../src/GUI/gui.cpp" line="392"/>
<source>Degrees and decimal minutes (DMM)</source> <source>Degrees and decimal minutes (DMM)</source>
<translation>Stopnie i minuty dziesiętne (DMM)</translation> <translation>Stopnie i minuty dziesiętne (DMM)</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="394"/> <location filename="../src/GUI/gui.cpp" line="398"/>
<source>Degrees, minutes, seconds (DMS)</source> <source>Degrees, minutes, seconds (DMS)</source>
<translation>Stopnie, minuty, sekundy (DMS)</translation> <translation>Stopnie, minuty, sekundy (DMS)</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="399"/> <location filename="../src/GUI/gui.cpp" line="403"/>
<source>Fullscreen mode</source> <source>Fullscreen mode</source>
<translation>Tryb pełnoekranowy</translation> <translation>Tryb pełnoekranowy</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="405"/> <location filename="../src/GUI/gui.cpp" line="409"/>
<source>Options...</source> <source>Options...</source>
<translation>Opcje...</translation> <translation>Opcje...</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="411"/> <location filename="../src/GUI/gui.cpp" line="415"/>
<source>Next</source> <source>Next</source>
<translation>Następny</translation> <translation>Następny</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="414"/> <location filename="../src/GUI/gui.cpp" line="418"/>
<source>Previous</source> <source>Previous</source>
<translation>Poprzedni</translation> <translation>Poprzedni</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="418"/> <location filename="../src/GUI/gui.cpp" line="422"/>
<source>Last</source> <source>Last</source>
<translation>Ostatni</translation> <translation>Ostatni</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="421"/> <location filename="../src/GUI/gui.cpp" line="425"/>
<source>First</source> <source>First</source>
<translation>Pierwszy</translation> <translation>Pierwszy</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="461"/> <location filename="../src/GUI/gui.cpp" line="466"/>
<source>POI files</source> <source>POI files</source>
<translation>Pliki POI</translation> <translation>Pliki POI</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="473"/> <location filename="../src/GUI/gui.cpp" line="478"/>
<source>Display</source> <source>Display</source>
<translation>Wyświetlanie</translation> <translation>Wyświetlanie</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="485"/> <location filename="../src/GUI/gui.cpp" line="490"/>
<source>Units</source> <source>Units</source>
<translation>Jednostki</translation> <translation>Jednostki</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="489"/> <location filename="../src/GUI/gui.cpp" line="494"/>
<source>Coordinates format</source> <source>Coordinates format</source>
<translation>Format współrzędnych</translation> <translation>Format współrzędnych</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="617"/> <location filename="../src/GUI/gui.cpp" line="622"/>
<source>Append file</source> <source>Append file</source>
<translation>Dołącz plik</translation> <translation>Dołącz plik</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="618"/> <location filename="../src/GUI/gui.cpp" line="623"/>
<source>Next/Previous</source> <source>Next/Previous</source>
<translation>Następny/Poprzedni</translation> <translation>Następny/Poprzedni</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="620"/> <location filename="../src/GUI/gui.cpp" line="625"/>
<source>Toggle graph type</source> <source>Toggle graph type</source>
<translation>Zmień typ wykresu</translation> <translation>Zmień typ wykresu</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="622"/> <location filename="../src/GUI/gui.cpp" line="627"/>
<source>Toggle time type</source> <source>Toggle time type</source>
<translation>Zmień typ czasu</translation> <translation>Zmień typ czasu</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="626"/> <location filename="../src/GUI/gui.cpp" line="631"/>
<source>Previous map</source> <source>Previous map</source>
<translation>Poprzednia mapa</translation> <translation>Poprzednia mapa</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="627"/> <location filename="../src/GUI/gui.cpp" line="632"/>
<source>Zoom in</source> <source>Zoom in</source>
<translation>Przybliż</translation> <translation>Przybliż</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="629"/> <location filename="../src/GUI/gui.cpp" line="634"/>
<source>Zoom out</source> <source>Zoom out</source>
<translation>Oddal</translation> <translation>Oddal</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="631"/> <location filename="../src/GUI/gui.cpp" line="636"/>
<source>Digital zoom</source> <source>Digital zoom</source>
<translation>Zoom cyfrowy</translation> <translation>Zoom cyfrowy</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="632"/> <location filename="../src/GUI/gui.cpp" line="637"/>
<source>Zoom</source> <source>Zoom</source>
<translation>Zoom</translation> <translation>Zoom</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="1148"/> <location filename="../src/GUI/gui.cpp" line="650"/>
<source>Global</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="654"/>
<location filename="../src/GUI/gui.cpp" line="660"/>
<source>GCS/PCS directory:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="656"/>
<source>User-specific</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="976"/>
<location filename="../src/GUI/gui.cpp" line="977"/>
<source>Statistics</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="1219"/>
<source>Open map file</source> <source>Open map file</source>
<translation>Otwórz plik mapy</translation> <translation>Otwórz plik mapy</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="1188"/> <location filename="../src/GUI/gui.cpp" line="1259"/>
<source>No files loaded</source> <source>No files loaded</source>
<translation>Nie załadowano żadnych plików</translation> <translation>Nie załadowano żadnych plików</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="935"/> <location filename="../src/GUI/gui.cpp" line="939"/>
<location filename="../src/GUI/gui.cpp" line="938"/> <location filename="../src/GUI/gui.cpp" line="943"/>
<location filename="../src/GUI/gui.cpp" line="1006"/>
<location filename="../src/GUI/gui.cpp" line="1009"/>
<source>Date</source> <source>Date</source>
<translation>Data</translation> <translation>Data</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="429"/> <location filename="../src/GUI/gui.cpp" line="433"/>
<source>&amp;File</source> <source>&amp;File</source>
<translation>&amp;Plik</translation> <translation>&amp;Plik</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="443"/> <location filename="../src/GUI/gui.cpp" line="448"/>
<source>&amp;Map</source> <source>&amp;Map</source>
<translation>&amp;Mapa</translation> <translation>&amp;Mapa</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="451"/> <location filename="../src/GUI/gui.cpp" line="456"/>
<source>&amp;Graph</source> <source>&amp;Graph</source>
<translation>&amp;Wykres</translation> <translation>&amp;Wykres</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="460"/> <location filename="../src/GUI/gui.cpp" line="465"/>
<source>&amp;POI</source> <source>&amp;POI</source>
<translation>P&amp;OI</translation> <translation>P&amp;OI</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="472"/> <location filename="../src/GUI/gui.cpp" line="477"/>
<source>&amp;Data</source> <source>&amp;Data</source>
<translation>&amp;Dane</translation> <translation>&amp;Dane</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="481"/> <location filename="../src/GUI/gui.cpp" line="486"/>
<source>&amp;Settings</source> <source>&amp;Settings</source>
<translation>&amp;Ustawienia</translation> <translation>&amp;Ustawienia</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="499"/> <location filename="../src/GUI/gui.cpp" line="504"/>
<source>&amp;Help</source> <source>&amp;Help</source>
<translation>Pomo&amp;c</translation> <translation>Pomo&amp;c</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="645"/> <location filename="../src/GUI/gui.cpp" line="650"/>
<location filename="../src/GUI/gui.cpp" line="657"/>
<source>Map directory:</source> <source>Map directory:</source>
<translation>Katalog z mapami:</translation> <translation>Katalog z mapami:</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="647"/> <location filename="../src/GUI/gui.cpp" line="652"/>
<location filename="../src/GUI/gui.cpp" line="658"/>
<source>POI directory:</source> <source>POI directory:</source>
<translation>Katalog z POI:</translation> <translation>Katalog z POI:</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="649"/> <location filename="../src/GUI/gui.cpp" line="930"/>
<source>GCS file:</source> <location filename="../src/GUI/gui.cpp" line="998"/>
<translation>Plik GCS:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="650"/>
<source>PCS file:</source>
<translation>Plik PCS:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="652"/>
<source>Ellipsoids file:</source>
<translation>Plik elipsoid:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="655"/>
<source>User override directory:</source>
<translation>Katalog użytkownika:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="927"/>
<source>Routes</source> <source>Routes</source>
<translation>Trasy</translation> <translation>Trasy</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="1177"/> <location filename="../src/GUI/gui.cpp" line="1248"/>
<source>Error loading map:</source> <source>Error loading map:</source>
<translation>Wystąpił błąd podczas ładowania mapy:</translation> <translation>Wystąpił błąd podczas ładowania mapy:</translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<location filename="../src/GUI/gui.cpp" line="1192"/> <location filename="../src/GUI/gui.cpp" line="1263"/>
<source>%n files</source> <source>%n files</source>
<translation> <translation>
<numerusform>%n plik</numerusform> <numerusform>%n plik</numerusform>
@ -688,12 +701,12 @@
</translation> </translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="611"/> <location filename="../src/GUI/gui.cpp" line="616"/>
<source>Next file</source> <source>Next file</source>
<translation>Następny plik</translation> <translation>Następny plik</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="587"/> <location filename="../src/GUI/gui.cpp" line="592"/>
<source>Version </source> <source>Version </source>
<translation>Wersja </translation> <translation>Wersja </translation>
</message> </message>
@ -708,77 +721,81 @@
<translation>Eksportuj do PDF...</translation> <translation>Eksportuj do PDF...</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="929"/> <location filename="../src/GUI/gui.cpp" line="933"/>
<location filename="../src/GUI/gui.cpp" line="1000"/>
<source>Waypoints</source> <source>Waypoints</source>
<translation>Punkty nawigacyjne</translation> <translation>Punkty nawigacyjne</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="612"/> <location filename="../src/GUI/gui.cpp" line="617"/>
<source>Previous file</source> <source>Previous file</source>
<translation>Poprzedni plik</translation> <translation>Poprzedni plik</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="311"/> <location filename="../src/GUI/gui.cpp" line="315"/>
<source>Route waypoints</source> <source>Route waypoints</source>
<translation>Punkty trasy</translation> <translation>Punkty trasy</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="614"/> <location filename="../src/GUI/gui.cpp" line="619"/>
<source>First file</source> <source>First file</source>
<translation>Pierwszy plik</translation> <translation>Pierwszy plik</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="616"/> <location filename="../src/GUI/gui.cpp" line="621"/>
<source>Last file</source> <source>Last file</source>
<translation>Ostatni plik</translation> <translation>Ostatni plik</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="758"/> <location filename="../src/GUI/gui.cpp" line="763"/>
<source>Error loading data file:</source> <source>Error loading data file:</source>
<translation>Błąd podczas ładowania pliku danych:</translation> <translation>Błąd podczas ładowania pliku danych:</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="761"/> <location filename="../src/GUI/gui.cpp" line="766"/>
<location filename="../src/GUI/gui.cpp" line="788"/> <location filename="../src/GUI/gui.cpp" line="793"/>
<source>Line: %1</source> <source>Line: %1</source>
<translation>Linia: %1</translation> <translation>Linia: %1</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="785"/> <location filename="../src/GUI/gui.cpp" line="790"/>
<source>Error loading POI file:</source> <source>Error loading POI file:</source>
<translation>Błąd podczas ładowania pliku POI:</translation> <translation>Błąd podczas ładowania pliku POI:</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="921"/> <location filename="../src/GUI/gui.cpp" line="992"/>
<source>Name</source> <source>Name</source>
<translation>Nazwa</translation> <translation>Nazwa</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="925"/> <location filename="../src/GUI/gui.cpp" line="927"/>
<location filename="../src/GUI/gui.cpp" line="996"/>
<source>Tracks</source> <source>Tracks</source>
<translation>Ślady</translation> <translation>Ślady</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="208"/> <location filename="../src/GUI/gui.cpp" line="208"/>
<location filename="../src/GUI/gui.cpp" line="586"/> <location filename="../src/GUI/gui.cpp" line="591"/>
<source>About GPXSee</source> <source>About GPXSee</source>
<translation>O programie GPXSee</translation> <translation>O programie GPXSee</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="523"/> <location filename="../src/GUI/gui.cpp" line="528"/>
<source>Navigation</source> <source>Navigation</source>
<translation>Nawigacja</translation> <translation>Nawigacja</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="326"/> <location filename="../src/GUI/gui.cpp" line="330"/>
<location filename="../src/GUI/gui.cpp" line="945"/> <location filename="../src/GUI/gui.cpp" line="950"/>
<location filename="../src/GUI/gui.cpp" line="1016"/>
<source>Distance</source> <source>Distance</source>
<translation>Dystans</translation> <translation>Dystans</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="332"/> <location filename="../src/GUI/gui.cpp" line="336"/>
<location filename="../src/GUI/gui.cpp" line="482"/> <location filename="../src/GUI/gui.cpp" line="487"/>
<location filename="../src/GUI/gui.cpp" line="947"/> <location filename="../src/GUI/gui.cpp" line="953"/>
<location filename="../src/GUI/gui.cpp" line="1018"/>
<source>Time</source> <source>Time</source>
<translation>Czas</translation> <translation>Czas</translation>
</message> </message>

View File

@ -306,17 +306,17 @@
<context> <context>
<name>GUI</name> <name>GUI</name>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="590"/> <location filename="../src/GUI/gui.cpp" line="595"/>
<source>GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at </source> <source>GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at </source>
<translation>GPXSee распространяется в соответствиями с условиями версии 3 Стандартной Общественной Лицензии GNU. Для получения дополнительной информации о GPXSee посетите страницу проекта </translation> <translation>GPXSee распространяется в соответствиями с условиями версии 3 Стандартной Общественной Лицензии GNU. Для получения дополнительной информации о GPXSee посетите страницу проекта </translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="664"/> <location filename="../src/GUI/gui.cpp" line="669"/>
<source>Open file</source> <source>Open file</source>
<translation>Открыть файл</translation> <translation>Открыть файл</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="769"/> <location filename="../src/GUI/gui.cpp" line="774"/>
<source>Open POI file</source> <source>Open POI file</source>
<translation>Открыть файл с точками POI</translation> <translation>Открыть файл с точками POI</translation>
</message> </message>
@ -327,8 +327,8 @@
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="205"/> <location filename="../src/GUI/gui.cpp" line="205"/>
<location filename="../src/GUI/gui.cpp" line="607"/> <location filename="../src/GUI/gui.cpp" line="612"/>
<location filename="../src/GUI/gui.cpp" line="608"/> <location filename="../src/GUI/gui.cpp" line="613"/>
<source>Keyboard controls</source> <source>Keyboard controls</source>
<translation>Управление с помощью клавиатуры</translation> <translation>Управление с помощью клавиатуры</translation>
</message> </message>
@ -343,42 +343,42 @@
<translation>Обновить</translation> <translation>Обновить</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="518"/> <location filename="../src/GUI/gui.cpp" line="523"/>
<source>Show</source> <source>Show</source>
<translation>Показать</translation> <translation>Показать</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="512"/> <location filename="../src/GUI/gui.cpp" line="517"/>
<source>File</source> <source>File</source>
<translation>Файл</translation> <translation>Файл</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="247"/> <location filename="../src/GUI/gui.cpp" line="251"/>
<source>Close POI files</source> <source>Close POI files</source>
<translation>Закрыть файлы с точками POI</translation> <translation>Закрыть файлы с точками POI</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="249"/> <location filename="../src/GUI/gui.cpp" line="253"/>
<source>Overlap POIs</source> <source>Overlap POIs</source>
<translation>Наложение точек POI</translation> <translation>Наложение точек POI</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="253"/> <location filename="../src/GUI/gui.cpp" line="257"/>
<source>Show POI labels</source> <source>Show POI labels</source>
<translation>Показать подписи к точкам POI</translation> <translation>Показать подписи к точкам POI</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="258"/> <location filename="../src/GUI/gui.cpp" line="262"/>
<source>Show POIs</source> <source>Show POIs</source>
<translation>Показать точки POI</translation> <translation>Показать точки POI</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="267"/> <location filename="../src/GUI/gui.cpp" line="271"/>
<source>Show map</source> <source>Show map</source>
<translation>Показать карту</translation> <translation>Показать карту</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="277"/> <location filename="../src/GUI/gui.cpp" line="281"/>
<source>Clear tile cache</source> <source>Clear tile cache</source>
<translation>Очистить кэш</translation> <translation>Очистить кэш</translation>
</message> </message>
@ -389,297 +389,310 @@
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="203"/> <location filename="../src/GUI/gui.cpp" line="203"/>
<location filename="../src/GUI/gui.cpp" line="641"/> <location filename="../src/GUI/gui.cpp" line="646"/>
<location filename="../src/GUI/gui.cpp" line="642"/> <location filename="../src/GUI/gui.cpp" line="647"/>
<source>Paths</source> <source>Paths</source>
<translation>Пути</translation> <translation>Пути</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="244"/> <location filename="../src/GUI/gui.cpp" line="241"/>
<source>Statistics...</source>
<translation>Статистика...</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="248"/>
<source>Load POI file...</source> <source>Load POI file...</source>
<translation>Загрузить файл с точками POI...</translation> <translation>Загрузить файл с точками POI...</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="275"/> <location filename="../src/GUI/gui.cpp" line="279"/>
<source>Load map...</source> <source>Load map...</source>
<translation>Загрузить карту...</translation> <translation>Загрузить карту...</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="281"/>
<location filename="../src/GUI/gui.cpp" line="285"/> <location filename="../src/GUI/gui.cpp" line="285"/>
<location filename="../src/GUI/gui.cpp" line="624"/> <location filename="../src/GUI/gui.cpp" line="289"/>
<location filename="../src/GUI/gui.cpp" line="629"/>
<source>Next map</source> <source>Next map</source>
<translation>Следующая карта</translation> <translation>Следующая карта</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="295"/> <location filename="../src/GUI/gui.cpp" line="299"/>
<source>Show tracks</source> <source>Show tracks</source>
<translation>Показать треки</translation> <translation>Показать треки</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="299"/> <location filename="../src/GUI/gui.cpp" line="303"/>
<source>Show routes</source> <source>Show routes</source>
<translation>Показать маршруты</translation> <translation>Показать маршруты</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="303"/> <location filename="../src/GUI/gui.cpp" line="307"/>
<source>Show waypoints</source> <source>Show waypoints</source>
<translation>Показать точки</translation> <translation>Показать точки</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="307"/> <location filename="../src/GUI/gui.cpp" line="311"/>
<source>Waypoint labels</source> <source>Waypoint labels</source>
<translation>Подписи точек</translation> <translation>Подписи точек</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="318"/> <location filename="../src/GUI/gui.cpp" line="322"/>
<source>Show graphs</source> <source>Show graphs</source>
<translation>Показать графики</translation> <translation>Показать графики</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="338"/> <location filename="../src/GUI/gui.cpp" line="342"/>
<source>Show grid</source> <source>Show grid</source>
<translation>Показать сетку</translation> <translation>Показать сетку</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="342"/> <location filename="../src/GUI/gui.cpp" line="346"/>
<source>Show slider info</source> <source>Show slider info</source>
<translation>Показать значение на слайдере</translation> <translation>Показать значение на слайдере</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="348"/> <location filename="../src/GUI/gui.cpp" line="352"/>
<source>Show toolbars</source> <source>Show toolbars</source>
<translation>Показывать панели инструментов</translation> <translation>Показывать панели инструментов</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="354"/> <location filename="../src/GUI/gui.cpp" line="358"/>
<source>Total time</source> <source>Total time</source>
<translation>Общее время</translation> <translation>Общее время</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="359"/> <location filename="../src/GUI/gui.cpp" line="363"/>
<location filename="../src/GUI/gui.cpp" line="949"/> <location filename="../src/GUI/gui.cpp" line="955"/>
<location filename="../src/GUI/gui.cpp" line="1020"/>
<source>Moving time</source> <source>Moving time</source>
<translation>Время движения</translation> <translation>Время движения</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="366"/> <location filename="../src/GUI/gui.cpp" line="370"/>
<source>Metric</source> <source>Metric</source>
<translation>Метрические</translation> <translation>Метрические</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="371"/> <location filename="../src/GUI/gui.cpp" line="375"/>
<source>Imperial</source> <source>Imperial</source>
<translation>Британские</translation> <translation>Британские</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="376"/> <location filename="../src/GUI/gui.cpp" line="380"/>
<source>Nautical</source> <source>Nautical</source>
<translation>Морские</translation> <translation>Морские</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="383"/> <location filename="../src/GUI/gui.cpp" line="387"/>
<source>Decimal degrees (DD)</source> <source>Decimal degrees (DD)</source>
<translation>Десятичные градусы (DD)</translation> <translation>Десятичные градусы (DD)</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="388"/> <location filename="../src/GUI/gui.cpp" line="392"/>
<source>Degrees and decimal minutes (DMM)</source> <source>Degrees and decimal minutes (DMM)</source>
<translation>Градусы, десятичные минуты (DMM)</translation> <translation>Градусы, десятичные минуты (DMM)</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="394"/> <location filename="../src/GUI/gui.cpp" line="398"/>
<source>Degrees, minutes, seconds (DMS)</source> <source>Degrees, minutes, seconds (DMS)</source>
<translation>Градусы, минуты, секунды (DMS)</translation> <translation>Градусы, минуты, секунды (DMS)</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="399"/> <location filename="../src/GUI/gui.cpp" line="403"/>
<source>Fullscreen mode</source> <source>Fullscreen mode</source>
<translation>Полноэкранный режим</translation> <translation>Полноэкранный режим</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="405"/> <location filename="../src/GUI/gui.cpp" line="409"/>
<source>Options...</source> <source>Options...</source>
<translation>Параметры...</translation> <translation>Параметры...</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="411"/> <location filename="../src/GUI/gui.cpp" line="415"/>
<source>Next</source> <source>Next</source>
<translation>Следующий</translation> <translation>Следующий</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="414"/> <location filename="../src/GUI/gui.cpp" line="418"/>
<source>Previous</source> <source>Previous</source>
<translation>Предыдущий</translation> <translation>Предыдущий</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="418"/> <location filename="../src/GUI/gui.cpp" line="422"/>
<source>Last</source> <source>Last</source>
<translation>Последний</translation> <translation>Последний</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="421"/> <location filename="../src/GUI/gui.cpp" line="425"/>
<source>First</source> <source>First</source>
<translation>Первый</translation> <translation>Первый</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="461"/> <location filename="../src/GUI/gui.cpp" line="466"/>
<source>POI files</source> <source>POI files</source>
<translation>Файлы с точками POI</translation> <translation>Файлы с точками POI</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="473"/> <location filename="../src/GUI/gui.cpp" line="478"/>
<source>Display</source> <source>Display</source>
<translation>Отображать</translation> <translation>Отображать</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="485"/> <location filename="../src/GUI/gui.cpp" line="490"/>
<source>Units</source> <source>Units</source>
<translation>Единицы</translation> <translation>Единицы</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="489"/> <location filename="../src/GUI/gui.cpp" line="494"/>
<source>Coordinates format</source> <source>Coordinates format</source>
<translation>Формат координат</translation> <translation>Формат координат</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="617"/> <location filename="../src/GUI/gui.cpp" line="622"/>
<source>Append file</source> <source>Append file</source>
<translation>Добавить файл</translation> <translation>Добавить файл</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="618"/> <location filename="../src/GUI/gui.cpp" line="623"/>
<source>Next/Previous</source> <source>Next/Previous</source>
<translation>Next/Previous</translation> <translation>Next/Previous</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="620"/> <location filename="../src/GUI/gui.cpp" line="625"/>
<source>Toggle graph type</source> <source>Toggle graph type</source>
<translation>Переключить тип графика</translation> <translation>Переключить тип графика</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="622"/> <location filename="../src/GUI/gui.cpp" line="627"/>
<source>Toggle time type</source> <source>Toggle time type</source>
<translation>Переключить тип времени</translation> <translation>Переключить тип времени</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="626"/> <location filename="../src/GUI/gui.cpp" line="631"/>
<source>Previous map</source> <source>Previous map</source>
<translation>Предыдущая карта</translation> <translation>Предыдущая карта</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="627"/> <location filename="../src/GUI/gui.cpp" line="632"/>
<source>Zoom in</source> <source>Zoom in</source>
<translation>Увеличить</translation> <translation>Увеличить</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="629"/> <location filename="../src/GUI/gui.cpp" line="634"/>
<source>Zoom out</source> <source>Zoom out</source>
<translation>Уменьшить</translation> <translation>Уменьшить</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="631"/> <location filename="../src/GUI/gui.cpp" line="636"/>
<source>Digital zoom</source> <source>Digital zoom</source>
<translation>Цифровой зум</translation> <translation>Цифровой зум</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="632"/> <location filename="../src/GUI/gui.cpp" line="637"/>
<source>Zoom</source> <source>Zoom</source>
<translation>Zoom</translation> <translation>Zoom</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="1148"/> <location filename="../src/GUI/gui.cpp" line="650"/>
<source>Global</source>
<translation>Глобальные</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="654"/>
<location filename="../src/GUI/gui.cpp" line="660"/>
<source>GCS/PCS directory:</source>
<translation>Директория с GCS/PCS:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="656"/>
<source>User-specific</source>
<translation>Пользовательские</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="976"/>
<location filename="../src/GUI/gui.cpp" line="977"/>
<source>Statistics</source>
<translation>Статистика</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="1219"/>
<source>Open map file</source> <source>Open map file</source>
<translation>Открыть файл карты</translation> <translation>Открыть файл карты</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="1188"/> <location filename="../src/GUI/gui.cpp" line="1259"/>
<source>No files loaded</source> <source>No files loaded</source>
<translation>Нет загруженных файлов</translation> <translation>Нет загруженных файлов</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="935"/> <location filename="../src/GUI/gui.cpp" line="939"/>
<location filename="../src/GUI/gui.cpp" line="938"/> <location filename="../src/GUI/gui.cpp" line="943"/>
<location filename="../src/GUI/gui.cpp" line="1006"/>
<location filename="../src/GUI/gui.cpp" line="1009"/>
<source>Date</source> <source>Date</source>
<translation>Дата</translation> <translation>Дата</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="429"/> <location filename="../src/GUI/gui.cpp" line="433"/>
<source>&amp;File</source> <source>&amp;File</source>
<translation>&amp;Файл</translation> <translation>&amp;Файл</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="443"/> <location filename="../src/GUI/gui.cpp" line="448"/>
<source>&amp;Map</source> <source>&amp;Map</source>
<translation>&amp;Карты</translation> <translation>&amp;Карты</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="451"/> <location filename="../src/GUI/gui.cpp" line="456"/>
<source>&amp;Graph</source> <source>&amp;Graph</source>
<translation>&amp;График</translation> <translation>&amp;График</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="460"/> <location filename="../src/GUI/gui.cpp" line="465"/>
<source>&amp;POI</source> <source>&amp;POI</source>
<translation>&amp;Точки POI</translation> <translation>&amp;Точки POI</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="472"/> <location filename="../src/GUI/gui.cpp" line="477"/>
<source>&amp;Data</source> <source>&amp;Data</source>
<translation>&amp;Данные</translation> <translation>&amp;Данные</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="481"/> <location filename="../src/GUI/gui.cpp" line="486"/>
<source>&amp;Settings</source> <source>&amp;Settings</source>
<translation>&amp;Параметры</translation> <translation>&amp;Параметры</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="499"/> <location filename="../src/GUI/gui.cpp" line="504"/>
<source>&amp;Help</source> <source>&amp;Help</source>
<translation>&amp;Справка</translation> <translation>&amp;Справка</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="645"/> <location filename="../src/GUI/gui.cpp" line="650"/>
<location filename="../src/GUI/gui.cpp" line="657"/>
<source>Map directory:</source> <source>Map directory:</source>
<translation>Директория с картами:</translation> <translation>Директория с картами:</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="647"/> <location filename="../src/GUI/gui.cpp" line="652"/>
<location filename="../src/GUI/gui.cpp" line="658"/>
<source>POI directory:</source> <source>POI directory:</source>
<translation>Директория с POI:</translation> <translation>Директория с POI:</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="649"/> <location filename="../src/GUI/gui.cpp" line="930"/>
<source>GCS file:</source> <location filename="../src/GUI/gui.cpp" line="998"/>
<translation>GCS файл:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="650"/>
<source>PCS file:</source>
<translation>PCS файл:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="652"/>
<source>Ellipsoids file:</source>
<translation>Ellipsoids файл:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="655"/>
<source>User override directory:</source>
<translation>Каталог пользовательских настроек:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="927"/>
<source>Routes</source> <source>Routes</source>
<translation>Маршруты</translation> <translation>Маршруты</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="1177"/> <location filename="../src/GUI/gui.cpp" line="1248"/>
<source>Error loading map:</source> <source>Error loading map:</source>
<translation>Ошибка загрузки карты:</translation> <translation>Ошибка загрузки карты:</translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<location filename="../src/GUI/gui.cpp" line="1192"/> <location filename="../src/GUI/gui.cpp" line="1263"/>
<source>%n files</source> <source>%n files</source>
<translation> <translation>
<numerusform>%n файл</numerusform> <numerusform>%n файл</numerusform>
@ -688,12 +701,12 @@
</translation> </translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="611"/> <location filename="../src/GUI/gui.cpp" line="616"/>
<source>Next file</source> <source>Next file</source>
<translation>Следующий файл</translation> <translation>Следующий файл</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="587"/> <location filename="../src/GUI/gui.cpp" line="592"/>
<source>Version </source> <source>Version </source>
<translation>Версия </translation> <translation>Версия </translation>
</message> </message>
@ -708,77 +721,81 @@
<translation>Экспорт в PDF...</translation> <translation>Экспорт в PDF...</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="929"/> <location filename="../src/GUI/gui.cpp" line="933"/>
<location filename="../src/GUI/gui.cpp" line="1000"/>
<source>Waypoints</source> <source>Waypoints</source>
<translation>Точки</translation> <translation>Точки</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="612"/> <location filename="../src/GUI/gui.cpp" line="617"/>
<source>Previous file</source> <source>Previous file</source>
<translation>Предыдущий файл</translation> <translation>Предыдущий файл</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="311"/> <location filename="../src/GUI/gui.cpp" line="315"/>
<source>Route waypoints</source> <source>Route waypoints</source>
<translation>Маршрутные точки</translation> <translation>Маршрутные точки</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="614"/> <location filename="../src/GUI/gui.cpp" line="619"/>
<source>First file</source> <source>First file</source>
<translation>Первый файл</translation> <translation>Первый файл</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="616"/> <location filename="../src/GUI/gui.cpp" line="621"/>
<source>Last file</source> <source>Last file</source>
<translation>Последний файл</translation> <translation>Последний файл</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="758"/> <location filename="../src/GUI/gui.cpp" line="763"/>
<source>Error loading data file:</source> <source>Error loading data file:</source>
<translation>Ошибка загрузки файла данных:</translation> <translation>Ошибка загрузки файла данных:</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="761"/> <location filename="../src/GUI/gui.cpp" line="766"/>
<location filename="../src/GUI/gui.cpp" line="788"/> <location filename="../src/GUI/gui.cpp" line="793"/>
<source>Line: %1</source> <source>Line: %1</source>
<translation>Строка: %1</translation> <translation>Строка: %1</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="785"/> <location filename="../src/GUI/gui.cpp" line="790"/>
<source>Error loading POI file:</source> <source>Error loading POI file:</source>
<translation>Ошибка загрузки файла с точками POI:</translation> <translation>Ошибка загрузки файла с точками POI:</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="921"/> <location filename="../src/GUI/gui.cpp" line="992"/>
<source>Name</source> <source>Name</source>
<translation>Имя</translation> <translation>Имя</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="925"/> <location filename="../src/GUI/gui.cpp" line="927"/>
<location filename="../src/GUI/gui.cpp" line="996"/>
<source>Tracks</source> <source>Tracks</source>
<translation>Треки</translation> <translation>Треки</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="208"/> <location filename="../src/GUI/gui.cpp" line="208"/>
<location filename="../src/GUI/gui.cpp" line="586"/> <location filename="../src/GUI/gui.cpp" line="591"/>
<source>About GPXSee</source> <source>About GPXSee</source>
<translation>О GPXSee</translation> <translation>О GPXSee</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="523"/> <location filename="../src/GUI/gui.cpp" line="528"/>
<source>Navigation</source> <source>Navigation</source>
<translation>Навигация</translation> <translation>Навигация</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="326"/> <location filename="../src/GUI/gui.cpp" line="330"/>
<location filename="../src/GUI/gui.cpp" line="945"/> <location filename="../src/GUI/gui.cpp" line="950"/>
<location filename="../src/GUI/gui.cpp" line="1016"/>
<source>Distance</source> <source>Distance</source>
<translation>Расстояние</translation> <translation>Расстояние</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="332"/> <location filename="../src/GUI/gui.cpp" line="336"/>
<location filename="../src/GUI/gui.cpp" line="482"/> <location filename="../src/GUI/gui.cpp" line="487"/>
<location filename="../src/GUI/gui.cpp" line="947"/> <location filename="../src/GUI/gui.cpp" line="953"/>
<location filename="../src/GUI/gui.cpp" line="1018"/>
<source>Time</source> <source>Time</source>
<translation>Время</translation> <translation>Время</translation>
</message> </message>

View File

@ -306,47 +306,29 @@
<context> <context>
<name>GUI</name> <name>GUI</name>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="590"/> <location filename="../src/GUI/gui.cpp" line="595"/>
<source>GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at </source> <source>GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at </source>
<translation>GPXSee distribueras under vilkoren för GNU General Public License version 3. För mer info om GPXSee, besök hemsidan </translation> <translation>GPXSee distribueras under vilkoren för GNU General Public License version 3. För mer info om GPXSee, besök hemsidan </translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="645"/> <location filename="../src/GUI/gui.cpp" line="650"/>
<location filename="../src/GUI/gui.cpp" line="657"/>
<source>Map directory:</source> <source>Map directory:</source>
<translation>Kartmapp:</translation> <translation>Kartmapp:</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="647"/> <location filename="../src/GUI/gui.cpp" line="652"/>
<location filename="../src/GUI/gui.cpp" line="658"/>
<source>POI directory:</source> <source>POI directory:</source>
<translation>POI-mapp:</translation> <translation>POI-mapp:</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="649"/> <location filename="../src/GUI/gui.cpp" line="669"/>
<source>GCS file:</source>
<translation>GCS-fil:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="650"/>
<source>PCS file:</source>
<translation>PCS-fil:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="652"/>
<source>Ellipsoids file:</source>
<translation>Ellipsoids-fil:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="655"/>
<source>User override directory:</source>
<translation>Användarspecificerad mapp:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="664"/>
<source>Open file</source> <source>Open file</source>
<translation>Öppna fil</translation> <translation>Öppna fil</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="769"/> <location filename="../src/GUI/gui.cpp" line="774"/>
<source>Open POI file</source> <source>Open POI file</source>
<translation>Öppna POI-fil</translation> <translation>Öppna POI-fil</translation>
</message> </message>
@ -357,8 +339,8 @@
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="205"/> <location filename="../src/GUI/gui.cpp" line="205"/>
<location filename="../src/GUI/gui.cpp" line="607"/> <location filename="../src/GUI/gui.cpp" line="612"/>
<location filename="../src/GUI/gui.cpp" line="608"/> <location filename="../src/GUI/gui.cpp" line="613"/>
<source>Keyboard controls</source> <source>Keyboard controls</source>
<translation>Snabbtangenter</translation> <translation>Snabbtangenter</translation>
</message> </message>
@ -373,42 +355,42 @@
<translation>Uppdatera</translation> <translation>Uppdatera</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="518"/> <location filename="../src/GUI/gui.cpp" line="523"/>
<source>Show</source> <source>Show</source>
<translation>Visa</translation> <translation>Visa</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="512"/> <location filename="../src/GUI/gui.cpp" line="517"/>
<source>File</source> <source>File</source>
<translation>Arkiv</translation> <translation>Arkiv</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="247"/> <location filename="../src/GUI/gui.cpp" line="251"/>
<source>Close POI files</source> <source>Close POI files</source>
<translation>Stäng POI-filer</translation> <translation>Stäng POI-filer</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="249"/> <location filename="../src/GUI/gui.cpp" line="253"/>
<source>Overlap POIs</source> <source>Overlap POIs</source>
<translation>Överlappa POI:er</translation> <translation>Överlappa POI:er</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="253"/> <location filename="../src/GUI/gui.cpp" line="257"/>
<source>Show POI labels</source> <source>Show POI labels</source>
<translation>Visa POI-namn</translation> <translation>Visa POI-namn</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="258"/> <location filename="../src/GUI/gui.cpp" line="262"/>
<source>Show POIs</source> <source>Show POIs</source>
<translation>Visa POI:er</translation> <translation>Visa POI:er</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="267"/> <location filename="../src/GUI/gui.cpp" line="271"/>
<source>Show map</source> <source>Show map</source>
<translation>Visa karta</translation> <translation>Visa karta</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="277"/> <location filename="../src/GUI/gui.cpp" line="281"/>
<source>Clear tile cache</source> <source>Clear tile cache</source>
<translation>Rensa kart-cache</translation> <translation>Rensa kart-cache</translation>
</message> </message>
@ -419,221 +401,249 @@
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="203"/> <location filename="../src/GUI/gui.cpp" line="203"/>
<location filename="../src/GUI/gui.cpp" line="641"/> <location filename="../src/GUI/gui.cpp" line="646"/>
<location filename="../src/GUI/gui.cpp" line="642"/> <location filename="../src/GUI/gui.cpp" line="647"/>
<source>Paths</source> <source>Paths</source>
<translation>Sökvägar</translation> <translation>Sökvägar</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="244"/> <location filename="../src/GUI/gui.cpp" line="241"/>
<source>Statistics...</source>
<translation>Statistik...</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="248"/>
<source>Load POI file...</source> <source>Load POI file...</source>
<translation>Läs in POI-fil...</translation> <translation>Läs in POI-fil...</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="275"/> <location filename="../src/GUI/gui.cpp" line="279"/>
<source>Load map...</source> <source>Load map...</source>
<translation>Läs in karta...</translation> <translation>Läs in karta...</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="281"/>
<location filename="../src/GUI/gui.cpp" line="285"/> <location filename="../src/GUI/gui.cpp" line="285"/>
<location filename="../src/GUI/gui.cpp" line="624"/> <location filename="../src/GUI/gui.cpp" line="289"/>
<location filename="../src/GUI/gui.cpp" line="629"/>
<source>Next map</source> <source>Next map</source>
<translation>Nästa karta</translation> <translation>Nästa karta</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="295"/> <location filename="../src/GUI/gui.cpp" line="299"/>
<source>Show tracks</source> <source>Show tracks</source>
<translation>Visa spår</translation> <translation>Visa spår</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="299"/> <location filename="../src/GUI/gui.cpp" line="303"/>
<source>Show routes</source> <source>Show routes</source>
<translation>Visa rutter</translation> <translation>Visa rutter</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="303"/> <location filename="../src/GUI/gui.cpp" line="307"/>
<source>Show waypoints</source> <source>Show waypoints</source>
<translation>Visa vägpunkter</translation> <translation>Visa vägpunkter</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="307"/> <location filename="../src/GUI/gui.cpp" line="311"/>
<source>Waypoint labels</source> <source>Waypoint labels</source>
<translation>Vägpunktsnamn</translation> <translation>Vägpunktsnamn</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="318"/> <location filename="../src/GUI/gui.cpp" line="322"/>
<source>Show graphs</source> <source>Show graphs</source>
<translation>Visa diagram</translation> <translation>Visa diagram</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="338"/> <location filename="../src/GUI/gui.cpp" line="342"/>
<source>Show grid</source> <source>Show grid</source>
<translation>Visa stödlinjer</translation> <translation>Visa stödlinjer</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="342"/> <location filename="../src/GUI/gui.cpp" line="346"/>
<source>Show slider info</source> <source>Show slider info</source>
<translation>Visa reglageinfo</translation> <translation>Visa reglageinfo</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="348"/> <location filename="../src/GUI/gui.cpp" line="352"/>
<source>Show toolbars</source> <source>Show toolbars</source>
<translation>Visa verktygsfält</translation> <translation>Visa verktygsfält</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="354"/> <location filename="../src/GUI/gui.cpp" line="358"/>
<source>Total time</source> <source>Total time</source>
<translation>Total tid</translation> <translation>Total tid</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="359"/> <location filename="../src/GUI/gui.cpp" line="363"/>
<location filename="../src/GUI/gui.cpp" line="949"/> <location filename="../src/GUI/gui.cpp" line="955"/>
<location filename="../src/GUI/gui.cpp" line="1020"/>
<source>Moving time</source> <source>Moving time</source>
<translation>Förflyttningstid</translation> <translation>Förflyttningstid</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="366"/> <location filename="../src/GUI/gui.cpp" line="370"/>
<source>Metric</source> <source>Metric</source>
<translation>Meter</translation> <translation>Meter</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="371"/> <location filename="../src/GUI/gui.cpp" line="375"/>
<source>Imperial</source> <source>Imperial</source>
<translation>Imperial</translation> <translation>Imperial</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="376"/> <location filename="../src/GUI/gui.cpp" line="380"/>
<source>Nautical</source> <source>Nautical</source>
<translation>Nautiska</translation> <translation>Nautiska</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="383"/> <location filename="../src/GUI/gui.cpp" line="387"/>
<source>Decimal degrees (DD)</source> <source>Decimal degrees (DD)</source>
<translation>Decimala grader (DD)</translation> <translation>Decimala grader (DD)</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="388"/> <location filename="../src/GUI/gui.cpp" line="392"/>
<source>Degrees and decimal minutes (DMM)</source> <source>Degrees and decimal minutes (DMM)</source>
<translation>Grader och decimala minuter (DMM)</translation> <translation>Grader och decimala minuter (DMM)</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="394"/> <location filename="../src/GUI/gui.cpp" line="398"/>
<source>Degrees, minutes, seconds (DMS)</source> <source>Degrees, minutes, seconds (DMS)</source>
<translation>Grader, minuter, sekunder (DMS)</translation> <translation>Grader, minuter, sekunder (DMS)</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="399"/> <location filename="../src/GUI/gui.cpp" line="403"/>
<source>Fullscreen mode</source> <source>Fullscreen mode</source>
<translation>Helskärmsläge</translation> <translation>Helskärmsläge</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="405"/> <location filename="../src/GUI/gui.cpp" line="409"/>
<source>Options...</source> <source>Options...</source>
<translation>Alternativ...</translation> <translation>Alternativ...</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="411"/> <location filename="../src/GUI/gui.cpp" line="415"/>
<source>Next</source> <source>Next</source>
<translation>Nästa</translation> <translation>Nästa</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="414"/> <location filename="../src/GUI/gui.cpp" line="418"/>
<source>Previous</source> <source>Previous</source>
<translation>Föregående</translation> <translation>Föregående</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="418"/> <location filename="../src/GUI/gui.cpp" line="422"/>
<source>Last</source> <source>Last</source>
<translation>Sista</translation> <translation>Sista</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="421"/> <location filename="../src/GUI/gui.cpp" line="425"/>
<source>First</source> <source>First</source>
<translation>Första</translation> <translation>Första</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="461"/> <location filename="../src/GUI/gui.cpp" line="466"/>
<source>POI files</source> <source>POI files</source>
<translation>POI-filer</translation> <translation>POI-filer</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="473"/> <location filename="../src/GUI/gui.cpp" line="478"/>
<source>Display</source> <source>Display</source>
<translation>Visa</translation> <translation>Visa</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="485"/> <location filename="../src/GUI/gui.cpp" line="490"/>
<source>Units</source> <source>Units</source>
<translation>Enhet</translation> <translation>Enhet</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="489"/> <location filename="../src/GUI/gui.cpp" line="494"/>
<source>Coordinates format</source> <source>Coordinates format</source>
<translation>Koordinatformat</translation> <translation>Koordinatformat</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="617"/> <location filename="../src/GUI/gui.cpp" line="622"/>
<source>Append file</source> <source>Append file</source>
<translation>Lägg till fil</translation> <translation>Lägg till fil</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="618"/> <location filename="../src/GUI/gui.cpp" line="623"/>
<source>Next/Previous</source> <source>Next/Previous</source>
<translation>Nästa/Föregående</translation> <translation>Nästa/Föregående</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="620"/> <location filename="../src/GUI/gui.cpp" line="625"/>
<source>Toggle graph type</source> <source>Toggle graph type</source>
<translation>Växla diagramtyp</translation> <translation>Växla diagramtyp</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="622"/> <location filename="../src/GUI/gui.cpp" line="627"/>
<source>Toggle time type</source> <source>Toggle time type</source>
<translation>Växla tidstyp</translation> <translation>Växla tidstyp</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="626"/> <location filename="../src/GUI/gui.cpp" line="631"/>
<source>Previous map</source> <source>Previous map</source>
<translation>Föregående karta</translation> <translation>Föregående karta</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="627"/> <location filename="../src/GUI/gui.cpp" line="632"/>
<source>Zoom in</source> <source>Zoom in</source>
<translation>Zooma in</translation> <translation>Zooma in</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="629"/> <location filename="../src/GUI/gui.cpp" line="634"/>
<source>Zoom out</source> <source>Zoom out</source>
<translation>Zooma ut</translation> <translation>Zooma ut</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="631"/> <location filename="../src/GUI/gui.cpp" line="636"/>
<source>Digital zoom</source> <source>Digital zoom</source>
<translation>Digital zoom</translation> <translation>Digital zoom</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="632"/> <location filename="../src/GUI/gui.cpp" line="637"/>
<source>Zoom</source> <source>Zoom</source>
<translation>Zoom</translation> <translation>Zoom</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="1148"/> <location filename="../src/GUI/gui.cpp" line="650"/>
<source>Global</source>
<translation>Övergripande</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="654"/>
<location filename="../src/GUI/gui.cpp" line="660"/>
<source>GCS/PCS directory:</source>
<translation>GCS-/PCS-mapp:</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="656"/>
<source>User-specific</source>
<translation>Användarspecifik</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="976"/>
<location filename="../src/GUI/gui.cpp" line="977"/>
<source>Statistics</source>
<translation>Statistik</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="1219"/>
<source>Open map file</source> <source>Open map file</source>
<translation>Öppna kartfil</translation> <translation>Öppna kartfil</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="1177"/> <location filename="../src/GUI/gui.cpp" line="1248"/>
<source>Error loading map:</source> <source>Error loading map:</source>
<translation>Fel vid inläsning av karta:</translation> <translation>Fel vid inläsning av karta:</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="1188"/> <location filename="../src/GUI/gui.cpp" line="1259"/>
<source>No files loaded</source> <source>No files loaded</source>
<translation>Inga filer inlästa</translation> <translation>Inga filer inlästa</translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<location filename="../src/GUI/gui.cpp" line="1192"/> <location filename="../src/GUI/gui.cpp" line="1263"/>
<source>%n files</source> <source>%n files</source>
<translation> <translation>
<numerusform>%n filer</numerusform> <numerusform>%n filer</numerusform>
@ -641,23 +651,26 @@
</translation> </translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="935"/> <location filename="../src/GUI/gui.cpp" line="939"/>
<location filename="../src/GUI/gui.cpp" line="938"/> <location filename="../src/GUI/gui.cpp" line="943"/>
<location filename="../src/GUI/gui.cpp" line="1006"/>
<location filename="../src/GUI/gui.cpp" line="1009"/>
<source>Date</source> <source>Date</source>
<translation>Datum</translation> <translation>Datum</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="927"/> <location filename="../src/GUI/gui.cpp" line="930"/>
<location filename="../src/GUI/gui.cpp" line="998"/>
<source>Routes</source> <source>Routes</source>
<translation>Rutter</translation> <translation>Rutter</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="611"/> <location filename="../src/GUI/gui.cpp" line="616"/>
<source>Next file</source> <source>Next file</source>
<translation>Nästa fil</translation> <translation>Nästa fil</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="587"/> <location filename="../src/GUI/gui.cpp" line="592"/>
<source>Version </source> <source>Version </source>
<translation>Version </translation> <translation>Version </translation>
</message> </message>
@ -672,112 +685,116 @@
<translation>Exportera till PDF...</translation> <translation>Exportera till PDF...</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="929"/> <location filename="../src/GUI/gui.cpp" line="933"/>
<location filename="../src/GUI/gui.cpp" line="1000"/>
<source>Waypoints</source> <source>Waypoints</source>
<translation>Vägpunkter</translation> <translation>Vägpunkter</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="612"/> <location filename="../src/GUI/gui.cpp" line="617"/>
<source>Previous file</source> <source>Previous file</source>
<translation>Föregående fil</translation> <translation>Föregående fil</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="311"/> <location filename="../src/GUI/gui.cpp" line="315"/>
<source>Route waypoints</source> <source>Route waypoints</source>
<translation>Ruttvägpunkter</translation> <translation>Ruttvägpunkter</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="429"/> <location filename="../src/GUI/gui.cpp" line="433"/>
<source>&amp;File</source> <source>&amp;File</source>
<translation>&amp;Arkiv</translation> <translation>&amp;Arkiv</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="443"/> <location filename="../src/GUI/gui.cpp" line="448"/>
<source>&amp;Map</source> <source>&amp;Map</source>
<translation>&amp;Karta</translation> <translation>&amp;Karta</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="451"/> <location filename="../src/GUI/gui.cpp" line="456"/>
<source>&amp;Graph</source> <source>&amp;Graph</source>
<translation>&amp;Diagram</translation> <translation>&amp;Diagram</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="460"/> <location filename="../src/GUI/gui.cpp" line="465"/>
<source>&amp;POI</source> <source>&amp;POI</source>
<translation>&amp;POI</translation> <translation>&amp;POI</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="472"/> <location filename="../src/GUI/gui.cpp" line="477"/>
<source>&amp;Data</source> <source>&amp;Data</source>
<translation>Da&amp;ta</translation> <translation>Da&amp;ta</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="481"/> <location filename="../src/GUI/gui.cpp" line="486"/>
<source>&amp;Settings</source> <source>&amp;Settings</source>
<translation>&amp;Inställningar</translation> <translation>&amp;Inställningar</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="499"/> <location filename="../src/GUI/gui.cpp" line="504"/>
<source>&amp;Help</source> <source>&amp;Help</source>
<translation>&amp;Hjälp</translation> <translation>&amp;Hjälp</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="614"/> <location filename="../src/GUI/gui.cpp" line="619"/>
<source>First file</source> <source>First file</source>
<translation>Första filen</translation> <translation>Första filen</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="616"/> <location filename="../src/GUI/gui.cpp" line="621"/>
<source>Last file</source> <source>Last file</source>
<translation>Sista filen</translation> <translation>Sista filen</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="758"/> <location filename="../src/GUI/gui.cpp" line="763"/>
<source>Error loading data file:</source> <source>Error loading data file:</source>
<translation>Fel vid inläsning av datafil:</translation> <translation>Fel vid inläsning av datafil:</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="761"/> <location filename="../src/GUI/gui.cpp" line="766"/>
<location filename="../src/GUI/gui.cpp" line="788"/> <location filename="../src/GUI/gui.cpp" line="793"/>
<source>Line: %1</source> <source>Line: %1</source>
<translation>Rad: %1</translation> <translation>Rad: %1</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="785"/> <location filename="../src/GUI/gui.cpp" line="790"/>
<source>Error loading POI file:</source> <source>Error loading POI file:</source>
<translation>Fel vid inläsning av POI-fil:</translation> <translation>Fel vid inläsning av POI-fil:</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="921"/> <location filename="../src/GUI/gui.cpp" line="992"/>
<source>Name</source> <source>Name</source>
<translation>Namn</translation> <translation>Namn</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="925"/> <location filename="../src/GUI/gui.cpp" line="927"/>
<location filename="../src/GUI/gui.cpp" line="996"/>
<source>Tracks</source> <source>Tracks</source>
<translation>Spår</translation> <translation>Spår</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="208"/> <location filename="../src/GUI/gui.cpp" line="208"/>
<location filename="../src/GUI/gui.cpp" line="586"/> <location filename="../src/GUI/gui.cpp" line="591"/>
<source>About GPXSee</source> <source>About GPXSee</source>
<translation>Om GPXSee</translation> <translation>Om GPXSee</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="523"/> <location filename="../src/GUI/gui.cpp" line="528"/>
<source>Navigation</source> <source>Navigation</source>
<translation>Navigation</translation> <translation>Navigation</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="326"/> <location filename="../src/GUI/gui.cpp" line="330"/>
<location filename="../src/GUI/gui.cpp" line="945"/> <location filename="../src/GUI/gui.cpp" line="950"/>
<location filename="../src/GUI/gui.cpp" line="1016"/>
<source>Distance</source> <source>Distance</source>
<translation>Avstånd</translation> <translation>Avstånd</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="332"/> <location filename="../src/GUI/gui.cpp" line="336"/>
<location filename="../src/GUI/gui.cpp" line="482"/> <location filename="../src/GUI/gui.cpp" line="487"/>
<location filename="../src/GUI/gui.cpp" line="947"/> <location filename="../src/GUI/gui.cpp" line="953"/>
<location filename="../src/GUI/gui.cpp" line="1018"/>
<source>Time</source> <source>Time</source>
<translation>Tid</translation> <translation>Tid</translation>
</message> </message>
@ -788,22 +805,22 @@
<location filename="../src/GUI/gearratiograph.cpp" line="11"/> <location filename="../src/GUI/gearratiograph.cpp" line="11"/>
<location filename="../src/GUI/gearratiograph.h" line="14"/> <location filename="../src/GUI/gearratiograph.h" line="14"/>
<source>Gear ratio</source> <source>Gear ratio</source>
<translation type="unfinished"></translation> <translation>Utväxling</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gearratiograph.cpp" line="19"/> <location filename="../src/GUI/gearratiograph.cpp" line="19"/>
<source>Most used</source> <source>Most used</source>
<translation type="unfinished"></translation> <translation>Mest använd</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gearratiograph.cpp" line="21"/> <location filename="../src/GUI/gearratiograph.cpp" line="21"/>
<source>Minimum</source> <source>Minimum</source>
<translation type="unfinished"></translation> <translation>Minimum</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gearratiograph.cpp" line="23"/> <location filename="../src/GUI/gearratiograph.cpp" line="23"/>
<source>Maximum</source> <source>Maximum</source>
<translation type="unfinished"></translation> <translation>Maximum</translation>
</message> </message>
</context> </context>
<context> <context>
@ -811,17 +828,17 @@
<message> <message>
<location filename="../src/GUI/gearratiographitem.cpp" line="34"/> <location filename="../src/GUI/gearratiographitem.cpp" line="34"/>
<source>Minimum</source> <source>Minimum</source>
<translation type="unfinished"></translation> <translation>Minimum</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gearratiographitem.cpp" line="35"/> <location filename="../src/GUI/gearratiographitem.cpp" line="35"/>
<source>Maximum</source> <source>Maximum</source>
<translation type="unfinished"></translation> <translation>Maximum</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gearratiographitem.cpp" line="36"/> <location filename="../src/GUI/gearratiographitem.cpp" line="36"/>
<source>Most used</source> <source>Most used</source>
<translation type="unfinished"></translation> <translation>Mest använd</translation>
</message> </message>
</context> </context>
<context> <context>

View File

@ -5,7 +5,7 @@
; The name of the installer ; The name of the installer
Name "GPXSee" Name "GPXSee"
; Program version ; Program version
!define VERSION "5.15" !define VERSION "5.16"
; The file to write ; The file to write
OutFile "GPXSee-${VERSION}.exe" OutFile "GPXSee-${VERSION}.exe"
@ -167,6 +167,7 @@ Section "QT framework" SEC_QT
File /r "platforms" File /r "platforms"
File /r "imageformats" File /r "imageformats"
File /r "printsupport" File /r "printsupport"
File /r "styles"
SectionEnd SectionEnd

View File

@ -5,7 +5,7 @@
; The name of the installer ; The name of the installer
Name "GPXSee" Name "GPXSee"
; Program version ; Program version
!define VERSION "5.15" !define VERSION "5.16"
; The file to write ; The file to write
OutFile "GPXSee-${VERSION}_x64.exe" OutFile "GPXSee-${VERSION}_x64.exe"
@ -174,6 +174,7 @@ Section "QT framework" SEC_QT
File /r "platforms" File /r "platforms"
File /r "imageformats" File /r "imageformats"
File /r "printsupport" File /r "printsupport"
File /r "styles"
SectionEnd SectionEnd

View File

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

View File

@ -3,7 +3,7 @@
#include "gearratiographitem.h" #include "gearratiographitem.h"
GearRatioGraphItem::GearRatioGraphItem(const Graph &graph, GraphType type, GearRatioGraphItem::GearRatioGraphItem(const Graph &graph, GraphType type,
QGraphicsItem *parent) : GraphItem(graph, type, parent) QGraphicsItem *parent) : GraphItem(graph, type, parent), _top(NAN)
{ {
qreal val = NAN; qreal val = NAN;

View File

@ -7,12 +7,12 @@
#include "data/graph.h" #include "data/graph.h"
#include "palette.h" #include "palette.h"
#include "units.h" #include "units.h"
#include "infoitem.h"
class AxisItem; class AxisItem;
class SliderItem; class SliderItem;
class SliderInfoItem; class SliderInfoItem;
class InfoItem;
class GraphItem; class GraphItem;
class PathItem; class PathItem;
class GridItem; class GridItem;
@ -27,6 +27,7 @@ public:
~GraphView(); ~GraphView();
bool isEmpty() const {return _graphs.isEmpty();} bool isEmpty() const {return _graphs.isEmpty();}
const QList<KV> &info() const {return _info->info();}
void clear(); void clear();
void plot(QPainter *painter, const QRectF &target, qreal scale); void plot(QPainter *painter, const QRectF &target, qreal scale);

View File

@ -142,6 +142,7 @@ void GUI::createMapActions()
for (int i = 0; i < _ml->maps().count(); i++) { for (int i = 0; i < _ml->maps().count(); i++) {
QAction *a = new QAction(_ml->maps().at(i)->name(), this); QAction *a = new QAction(_ml->maps().at(i)->name(), this);
a->setMenuRole(QAction::NoRole);
a->setCheckable(true); a->setCheckable(true);
a->setActionGroup(_mapsActionGroup); a->setActionGroup(_mapsActionGroup);
@ -170,6 +171,7 @@ QAction *GUI::createPOIFileAction(int index)
{ {
QAction *a = new QAction(QFileInfo(_poi->files().at(index)).fileName(), QAction *a = new QAction(QFileInfo(_poi->files().at(index)).fileName(),
this); this);
a->setMenuRole(QAction::NoRole);
a->setCheckable(true); a->setCheckable(true);
_poiFilesSignalMapper->setMapping(a, index); _poiFilesSignalMapper->setMapping(a, index);
@ -201,8 +203,10 @@ void GUI::createActions()
// Help & About // Help & About
_pathsAction = new QAction(tr("Paths"), this); _pathsAction = new QAction(tr("Paths"), this);
_pathsAction->setMenuRole(QAction::NoRole);
connect(_pathsAction, SIGNAL(triggered()), this, SLOT(paths())); connect(_pathsAction, SIGNAL(triggered()), this, SLOT(paths()));
_keysAction = new QAction(tr("Keyboard controls"), this); _keysAction = new QAction(tr("Keyboard controls"), this);
_keysAction->setMenuRole(QAction::NoRole);
connect(_keysAction, SIGNAL(triggered()), this, SLOT(keys())); connect(_keysAction, SIGNAL(triggered()), this, SLOT(keys()));
_aboutAction = new QAction(QIcon(QPixmap(APP_ICON)), _aboutAction = new QAction(QIcon(QPixmap(APP_ICON)),
tr("About GPXSee"), this); tr("About GPXSee"), this);
@ -212,50 +216,66 @@ void GUI::createActions()
// File actions // File actions
_openFileAction = new QAction(QIcon(QPixmap(OPEN_FILE_ICON)), _openFileAction = new QAction(QIcon(QPixmap(OPEN_FILE_ICON)),
tr("Open..."), this); tr("Open..."), this);
_openFileAction->setMenuRole(QAction::NoRole);
_openFileAction->setShortcut(OPEN_SHORTCUT); _openFileAction->setShortcut(OPEN_SHORTCUT);
connect(_openFileAction, SIGNAL(triggered()), this, SLOT(openFile())); connect(_openFileAction, SIGNAL(triggered()), this, SLOT(openFile()));
addAction(_openFileAction); addAction(_openFileAction);
_printFileAction = new QAction(QIcon(QPixmap(PRINT_FILE_ICON)), _printFileAction = new QAction(QIcon(QPixmap(PRINT_FILE_ICON)),
tr("Print..."), this); tr("Print..."), this);
_printFileAction->setMenuRole(QAction::NoRole);
_printFileAction->setActionGroup(_fileActionGroup); _printFileAction->setActionGroup(_fileActionGroup);
connect(_printFileAction, SIGNAL(triggered()), this, SLOT(printFile())); connect(_printFileAction, SIGNAL(triggered()), this, SLOT(printFile()));
addAction(_printFileAction); addAction(_printFileAction);
_exportFileAction = new QAction(QIcon(QPixmap(EXPORT_FILE_ICON)), _exportFileAction = new QAction(QIcon(QPixmap(EXPORT_FILE_ICON)),
tr("Export to PDF..."), this); tr("Export to PDF..."), this);
_exportFileAction->setMenuRole(QAction::NoRole);
_exportFileAction->setShortcut(EXPORT_SHORTCUT); _exportFileAction->setShortcut(EXPORT_SHORTCUT);
_exportFileAction->setActionGroup(_fileActionGroup); _exportFileAction->setActionGroup(_fileActionGroup);
connect(_exportFileAction, SIGNAL(triggered()), this, SLOT(exportFile())); connect(_exportFileAction, SIGNAL(triggered()), this, SLOT(exportFile()));
addAction(_exportFileAction); addAction(_exportFileAction);
_closeFileAction = new QAction(QIcon(QPixmap(CLOSE_FILE_ICON)), _closeFileAction = new QAction(QIcon(QPixmap(CLOSE_FILE_ICON)),
tr("Close"), this); tr("Close"), this);
_closeFileAction->setMenuRole(QAction::NoRole);
_closeFileAction->setShortcut(CLOSE_SHORTCUT); _closeFileAction->setShortcut(CLOSE_SHORTCUT);
_closeFileAction->setActionGroup(_fileActionGroup); _closeFileAction->setActionGroup(_fileActionGroup);
connect(_closeFileAction, SIGNAL(triggered()), this, SLOT(closeAll())); connect(_closeFileAction, SIGNAL(triggered()), this, SLOT(closeAll()));
addAction(_closeFileAction); addAction(_closeFileAction);
_reloadFileAction = new QAction(QIcon(QPixmap(RELOAD_FILE_ICON)), _reloadFileAction = new QAction(QIcon(QPixmap(RELOAD_FILE_ICON)),
tr("Reload"), this); tr("Reload"), this);
_reloadFileAction->setMenuRole(QAction::NoRole);
_reloadFileAction->setShortcut(RELOAD_SHORTCUT); _reloadFileAction->setShortcut(RELOAD_SHORTCUT);
_reloadFileAction->setActionGroup(_fileActionGroup); _reloadFileAction->setActionGroup(_fileActionGroup);
connect(_reloadFileAction, SIGNAL(triggered()), this, SLOT(reloadFile())); connect(_reloadFileAction, SIGNAL(triggered()), this, SLOT(reloadFile()));
addAction(_reloadFileAction); addAction(_reloadFileAction);
_statisticsAction = new QAction(tr("Statistics..."), this);
_statisticsAction->setMenuRole(QAction::NoRole);
_statisticsAction->setShortcut(STATISTICS_SHORTCUT);
_statisticsAction->setActionGroup(_fileActionGroup);
connect(_statisticsAction, SIGNAL(triggered()), this, SLOT(statistics()));
addAction(_statisticsAction);
// POI actions // POI actions
_openPOIAction = new QAction(QIcon(QPixmap(OPEN_FILE_ICON)), _openPOIAction = new QAction(QIcon(QPixmap(OPEN_FILE_ICON)),
tr("Load POI file..."), this); tr("Load POI file..."), this);
_openPOIAction->setMenuRole(QAction::NoRole);
connect(_openPOIAction, SIGNAL(triggered()), this, SLOT(openPOIFile())); connect(_openPOIAction, SIGNAL(triggered()), this, SLOT(openPOIFile()));
_closePOIAction = new QAction(QIcon(QPixmap(CLOSE_FILE_ICON)), _closePOIAction = new QAction(QIcon(QPixmap(CLOSE_FILE_ICON)),
tr("Close POI files"), this); tr("Close POI files"), this);
_closePOIAction->setMenuRole(QAction::NoRole);
connect(_closePOIAction, SIGNAL(triggered()), this, SLOT(closePOIFiles())); connect(_closePOIAction, SIGNAL(triggered()), this, SLOT(closePOIFiles()));
_overlapPOIAction = new QAction(tr("Overlap POIs"), this); _overlapPOIAction = new QAction(tr("Overlap POIs"), this);
_overlapPOIAction->setMenuRole(QAction::NoRole);
_overlapPOIAction->setCheckable(true); _overlapPOIAction->setCheckable(true);
connect(_overlapPOIAction, SIGNAL(triggered(bool)), _mapView, connect(_overlapPOIAction, SIGNAL(triggered(bool)), _mapView,
SLOT(setPOIOverlap(bool))); SLOT(setPOIOverlap(bool)));
_showPOILabelsAction = new QAction(tr("Show POI labels"), this); _showPOILabelsAction = new QAction(tr("Show POI labels"), this);
_showPOILabelsAction->setMenuRole(QAction::NoRole);
_showPOILabelsAction->setCheckable(true); _showPOILabelsAction->setCheckable(true);
connect(_showPOILabelsAction, SIGNAL(triggered(bool)), _mapView, connect(_showPOILabelsAction, SIGNAL(triggered(bool)), _mapView,
SLOT(showPOILabels(bool))); SLOT(showPOILabels(bool)));
_showPOIAction = new QAction(QIcon(QPixmap(SHOW_POI_ICON)), _showPOIAction = new QAction(QIcon(QPixmap(SHOW_POI_ICON)),
tr("Show POIs"), this); tr("Show POIs"), this);
_showPOIAction->setMenuRole(QAction::NoRole);
_showPOIAction->setCheckable(true); _showPOIAction->setCheckable(true);
_showPOIAction->setShortcut(SHOW_POI_SHORTCUT); _showPOIAction->setShortcut(SHOW_POI_SHORTCUT);
connect(_showPOIAction, SIGNAL(triggered(bool)), _mapView, connect(_showPOIAction, SIGNAL(triggered(bool)), _mapView,
@ -266,6 +286,7 @@ void GUI::createActions()
// Map actions // Map actions
_showMapAction = new QAction(QIcon(QPixmap(SHOW_MAP_ICON)), tr("Show map"), _showMapAction = new QAction(QIcon(QPixmap(SHOW_MAP_ICON)), tr("Show map"),
this); this);
_showMapAction->setMenuRole(QAction::NoRole);
_showMapAction->setCheckable(true); _showMapAction->setCheckable(true);
_showMapAction->setShortcut(SHOW_MAP_SHORTCUT); _showMapAction->setShortcut(SHOW_MAP_SHORTCUT);
connect(_showMapAction, SIGNAL(triggered(bool)), _mapView, connect(_showMapAction, SIGNAL(triggered(bool)), _mapView,
@ -273,16 +294,20 @@ void GUI::createActions()
addAction(_showMapAction); addAction(_showMapAction);
_loadMapAction = new QAction(QIcon(QPixmap(OPEN_FILE_ICON)), _loadMapAction = new QAction(QIcon(QPixmap(OPEN_FILE_ICON)),
tr("Load map..."), this); tr("Load map..."), this);
_loadMapAction->setMenuRole(QAction::NoRole);
connect(_loadMapAction, SIGNAL(triggered()), this, SLOT(loadMap())); connect(_loadMapAction, SIGNAL(triggered()), this, SLOT(loadMap()));
_clearMapCacheAction = new QAction(tr("Clear tile cache"), this); _clearMapCacheAction = new QAction(tr("Clear tile cache"), this);
_clearMapCacheAction->setMenuRole(QAction::NoRole);
connect(_clearMapCacheAction, SIGNAL(triggered()), _mapView, connect(_clearMapCacheAction, SIGNAL(triggered()), _mapView,
SLOT(clearMapCache())); SLOT(clearMapCache()));
createMapActions(); createMapActions();
_nextMapAction = new QAction(tr("Next map"), this); _nextMapAction = new QAction(tr("Next map"), this);
_nextMapAction->setMenuRole(QAction::NoRole);
_nextMapAction->setShortcut(NEXT_MAP_SHORTCUT); _nextMapAction->setShortcut(NEXT_MAP_SHORTCUT);
connect(_nextMapAction, SIGNAL(triggered()), this, SLOT(nextMap())); connect(_nextMapAction, SIGNAL(triggered()), this, SLOT(nextMap()));
addAction(_nextMapAction); addAction(_nextMapAction);
_prevMapAction = new QAction(tr("Next map"), this); _prevMapAction = new QAction(tr("Next map"), this);
_prevMapAction->setMenuRole(QAction::NoRole);
_prevMapAction->setShortcut(PREV_MAP_SHORTCUT); _prevMapAction->setShortcut(PREV_MAP_SHORTCUT);
connect(_prevMapAction, SIGNAL(triggered()), this, SLOT(prevMap())); connect(_prevMapAction, SIGNAL(triggered()), this, SLOT(prevMap()));
addAction(_prevMapAction); addAction(_prevMapAction);
@ -293,22 +318,27 @@ void GUI::createActions()
// Data actions // Data actions
_showTracksAction = new QAction(tr("Show tracks"), this); _showTracksAction = new QAction(tr("Show tracks"), this);
_showTracksAction->setMenuRole(QAction::NoRole);
_showTracksAction->setCheckable(true); _showTracksAction->setCheckable(true);
connect(_showTracksAction, SIGNAL(triggered(bool)), this, connect(_showTracksAction, SIGNAL(triggered(bool)), this,
SLOT(showTracks(bool))); SLOT(showTracks(bool)));
_showRoutesAction = new QAction(tr("Show routes"), this); _showRoutesAction = new QAction(tr("Show routes"), this);
_showRoutesAction->setMenuRole(QAction::NoRole);
_showRoutesAction->setCheckable(true); _showRoutesAction->setCheckable(true);
connect(_showRoutesAction, SIGNAL(triggered(bool)), this, connect(_showRoutesAction, SIGNAL(triggered(bool)), this,
SLOT(showRoutes(bool))); SLOT(showRoutes(bool)));
_showWaypointsAction = new QAction(tr("Show waypoints"), this); _showWaypointsAction = new QAction(tr("Show waypoints"), this);
_showWaypointsAction->setMenuRole(QAction::NoRole);
_showWaypointsAction->setCheckable(true); _showWaypointsAction->setCheckable(true);
connect(_showWaypointsAction, SIGNAL(triggered(bool)), _mapView, connect(_showWaypointsAction, SIGNAL(triggered(bool)), _mapView,
SLOT(showWaypoints(bool))); SLOT(showWaypoints(bool)));
_showWaypointLabelsAction = new QAction(tr("Waypoint labels"), this); _showWaypointLabelsAction = new QAction(tr("Waypoint labels"), this);
_showWaypointLabelsAction->setMenuRole(QAction::NoRole);
_showWaypointLabelsAction->setCheckable(true); _showWaypointLabelsAction->setCheckable(true);
connect(_showWaypointLabelsAction, SIGNAL(triggered(bool)), _mapView, connect(_showWaypointLabelsAction, SIGNAL(triggered(bool)), _mapView,
SLOT(showWaypointLabels(bool))); SLOT(showWaypointLabels(bool)));
_showRouteWaypointsAction = new QAction(tr("Route waypoints"), this); _showRouteWaypointsAction = new QAction(tr("Route waypoints"), this);
_showRouteWaypointsAction->setMenuRole(QAction::NoRole);
_showRouteWaypointsAction->setCheckable(true); _showRouteWaypointsAction->setCheckable(true);
connect(_showRouteWaypointsAction, SIGNAL(triggered(bool)), _mapView, connect(_showRouteWaypointsAction, SIGNAL(triggered(bool)), _mapView,
SLOT(showRouteWaypoints(bool))); SLOT(showRouteWaypoints(bool)));
@ -316,6 +346,7 @@ void GUI::createActions()
// Graph actions // Graph actions
_showGraphsAction = new QAction(QIcon(QPixmap(SHOW_GRAPHS_ICON)), _showGraphsAction = new QAction(QIcon(QPixmap(SHOW_GRAPHS_ICON)),
tr("Show graphs"), this); tr("Show graphs"), this);
_showGraphsAction->setMenuRole(QAction::NoRole);
_showGraphsAction->setCheckable(true); _showGraphsAction->setCheckable(true);
_showGraphsAction->setShortcut(SHOW_GRAPHS_SHORTCUT); _showGraphsAction->setShortcut(SHOW_GRAPHS_SHORTCUT);
connect(_showGraphsAction, SIGNAL(triggered(bool)), this, connect(_showGraphsAction, SIGNAL(triggered(bool)), this,
@ -324,39 +355,46 @@ void GUI::createActions()
ag = new QActionGroup(this); ag = new QActionGroup(this);
ag->setExclusive(true); ag->setExclusive(true);
_distanceGraphAction = new QAction(tr("Distance"), this); _distanceGraphAction = new QAction(tr("Distance"), this);
_distanceGraphAction->setMenuRole(QAction::NoRole);
_distanceGraphAction->setCheckable(true); _distanceGraphAction->setCheckable(true);
_distanceGraphAction->setActionGroup(ag); _distanceGraphAction->setActionGroup(ag);
connect(_distanceGraphAction, SIGNAL(triggered()), this, connect(_distanceGraphAction, SIGNAL(triggered()), this,
SLOT(setDistanceGraph())); SLOT(setDistanceGraph()));
addAction(_distanceGraphAction); addAction(_distanceGraphAction);
_timeGraphAction = new QAction(tr("Time"), this); _timeGraphAction = new QAction(tr("Time"), this);
_timeGraphAction->setMenuRole(QAction::NoRole);
_timeGraphAction->setCheckable(true); _timeGraphAction->setCheckable(true);
_timeGraphAction->setActionGroup(ag); _timeGraphAction->setActionGroup(ag);
connect(_timeGraphAction, SIGNAL(triggered()), this, connect(_timeGraphAction, SIGNAL(triggered()), this,
SLOT(setTimeGraph())); SLOT(setTimeGraph()));
addAction(_timeGraphAction); addAction(_timeGraphAction);
_showGraphGridAction = new QAction(tr("Show grid"), this); _showGraphGridAction = new QAction(tr("Show grid"), this);
_showGraphGridAction->setMenuRole(QAction::NoRole);
_showGraphGridAction->setCheckable(true); _showGraphGridAction->setCheckable(true);
connect(_showGraphGridAction, SIGNAL(triggered(bool)), this, connect(_showGraphGridAction, SIGNAL(triggered(bool)), this,
SLOT(showGraphGrids(bool))); SLOT(showGraphGrids(bool)));
_showGraphSliderInfoAction = new QAction(tr("Show slider info"), this); _showGraphSliderInfoAction = new QAction(tr("Show slider info"), this);
_showGraphSliderInfoAction->setMenuRole(QAction::NoRole);
_showGraphSliderInfoAction->setCheckable(true); _showGraphSliderInfoAction->setCheckable(true);
connect(_showGraphSliderInfoAction, SIGNAL(triggered(bool)), this, connect(_showGraphSliderInfoAction, SIGNAL(triggered(bool)), this,
SLOT(showGraphSliderInfo(bool))); SLOT(showGraphSliderInfo(bool)));
// Settings actions // Settings actions
_showToolbarsAction = new QAction(tr("Show toolbars"), this); _showToolbarsAction = new QAction(tr("Show toolbars"), this);
_showToolbarsAction->setMenuRole(QAction::NoRole);
_showToolbarsAction->setCheckable(true); _showToolbarsAction->setCheckable(true);
connect(_showToolbarsAction, SIGNAL(triggered(bool)), this, connect(_showToolbarsAction, SIGNAL(triggered(bool)), this,
SLOT(showToolbars(bool))); SLOT(showToolbars(bool)));
ag = new QActionGroup(this); ag = new QActionGroup(this);
ag->setExclusive(true); ag->setExclusive(true);
_totalTimeAction = new QAction(tr("Total time"), this); _totalTimeAction = new QAction(tr("Total time"), this);
_totalTimeAction->setMenuRole(QAction::NoRole);
_totalTimeAction->setCheckable(true); _totalTimeAction->setCheckable(true);
_totalTimeAction->setActionGroup(ag); _totalTimeAction->setActionGroup(ag);
connect(_totalTimeAction, SIGNAL(triggered()), this, connect(_totalTimeAction, SIGNAL(triggered()), this,
SLOT(setTotalTime())); SLOT(setTotalTime()));
_movingTimeAction = new QAction(tr("Moving time"), this); _movingTimeAction = new QAction(tr("Moving time"), this);
_movingTimeAction->setMenuRole(QAction::NoRole);
_movingTimeAction->setCheckable(true); _movingTimeAction->setCheckable(true);
_movingTimeAction->setActionGroup(ag); _movingTimeAction->setActionGroup(ag);
connect(_movingTimeAction, SIGNAL(triggered()), this, connect(_movingTimeAction, SIGNAL(triggered()), this,
@ -364,16 +402,19 @@ void GUI::createActions()
ag = new QActionGroup(this); ag = new QActionGroup(this);
ag->setExclusive(true); ag->setExclusive(true);
_metricUnitsAction = new QAction(tr("Metric"), this); _metricUnitsAction = new QAction(tr("Metric"), this);
_metricUnitsAction->setMenuRole(QAction::NoRole);
_metricUnitsAction->setCheckable(true); _metricUnitsAction->setCheckable(true);
_metricUnitsAction->setActionGroup(ag); _metricUnitsAction->setActionGroup(ag);
connect(_metricUnitsAction, SIGNAL(triggered()), this, connect(_metricUnitsAction, SIGNAL(triggered()), this,
SLOT(setMetricUnits())); SLOT(setMetricUnits()));
_imperialUnitsAction = new QAction(tr("Imperial"), this); _imperialUnitsAction = new QAction(tr("Imperial"), this);
_imperialUnitsAction->setMenuRole(QAction::NoRole);
_imperialUnitsAction->setCheckable(true); _imperialUnitsAction->setCheckable(true);
_imperialUnitsAction->setActionGroup(ag); _imperialUnitsAction->setActionGroup(ag);
connect(_imperialUnitsAction, SIGNAL(triggered()), this, connect(_imperialUnitsAction, SIGNAL(triggered()), this,
SLOT(setImperialUnits())); SLOT(setImperialUnits()));
_nauticalUnitsAction = new QAction(tr("Nautical"), this); _nauticalUnitsAction = new QAction(tr("Nautical"), this);
_nauticalUnitsAction->setMenuRole(QAction::NoRole);
_nauticalUnitsAction->setCheckable(true); _nauticalUnitsAction->setCheckable(true);
_nauticalUnitsAction->setActionGroup(ag); _nauticalUnitsAction->setActionGroup(ag);
connect(_nauticalUnitsAction, SIGNAL(triggered()), this, connect(_nauticalUnitsAction, SIGNAL(triggered()), this,
@ -381,22 +422,26 @@ void GUI::createActions()
ag = new QActionGroup(this); ag = new QActionGroup(this);
ag->setExclusive(true); ag->setExclusive(true);
_decimalDegreesAction = new QAction(tr("Decimal degrees (DD)"), this); _decimalDegreesAction = new QAction(tr("Decimal degrees (DD)"), this);
_decimalDegreesAction->setMenuRole(QAction::NoRole);
_decimalDegreesAction->setCheckable(true); _decimalDegreesAction->setCheckable(true);
_decimalDegreesAction->setActionGroup(ag); _decimalDegreesAction->setActionGroup(ag);
connect(_decimalDegreesAction, SIGNAL(triggered()), this, connect(_decimalDegreesAction, SIGNAL(triggered()), this,
SLOT(setDecimalDegrees())); SLOT(setDecimalDegrees()));
_degreesMinutesAction = new QAction(tr("Degrees and decimal minutes (DMM)"), _degreesMinutesAction = new QAction(tr("Degrees and decimal minutes (DMM)"),
this); this);
_degreesMinutesAction->setMenuRole(QAction::NoRole);
_degreesMinutesAction->setCheckable(true); _degreesMinutesAction->setCheckable(true);
_degreesMinutesAction->setActionGroup(ag); _degreesMinutesAction->setActionGroup(ag);
connect(_degreesMinutesAction, SIGNAL(triggered()), this, connect(_degreesMinutesAction, SIGNAL(triggered()), this,
SLOT(setDegreesMinutes())); SLOT(setDegreesMinutes()));
_DMSAction = new QAction(tr("Degrees, minutes, seconds (DMS)"), this); _DMSAction = new QAction(tr("Degrees, minutes, seconds (DMS)"), this);
_DMSAction->setMenuRole(QAction::NoRole);
_DMSAction->setCheckable(true); _DMSAction->setCheckable(true);
_DMSAction->setActionGroup(ag); _DMSAction->setActionGroup(ag);
connect(_DMSAction, SIGNAL(triggered()), this, SLOT(setDMS())); connect(_DMSAction, SIGNAL(triggered()), this, SLOT(setDMS()));
_fullscreenAction = new QAction(QIcon(QPixmap(FULLSCREEN_ICON)), _fullscreenAction = new QAction(QIcon(QPixmap(FULLSCREEN_ICON)),
tr("Fullscreen mode"), this); tr("Fullscreen mode"), this);
_fullscreenAction->setMenuRole(QAction::NoRole);
_fullscreenAction->setCheckable(true); _fullscreenAction->setCheckable(true);
_fullscreenAction->setShortcut(FULLSCREEN_SHORTCUT); _fullscreenAction->setShortcut(FULLSCREEN_SHORTCUT);
connect(_fullscreenAction, SIGNAL(triggered(bool)), this, connect(_fullscreenAction, SIGNAL(triggered(bool)), this,
@ -410,16 +455,20 @@ void GUI::createActions()
// Navigation actions // Navigation actions
_nextAction = new QAction(QIcon(QPixmap(NEXT_FILE_ICON)), tr("Next"), this); _nextAction = new QAction(QIcon(QPixmap(NEXT_FILE_ICON)), tr("Next"), this);
_nextAction->setActionGroup(_navigationActionGroup); _nextAction->setActionGroup(_navigationActionGroup);
_nextAction->setMenuRole(QAction::NoRole);
connect(_nextAction, SIGNAL(triggered()), this, SLOT(next())); connect(_nextAction, SIGNAL(triggered()), this, SLOT(next()));
_prevAction = new QAction(QIcon(QPixmap(PREV_FILE_ICON)), tr("Previous"), _prevAction = new QAction(QIcon(QPixmap(PREV_FILE_ICON)), tr("Previous"),
this); this);
_prevAction->setMenuRole(QAction::NoRole);
_prevAction->setActionGroup(_navigationActionGroup); _prevAction->setActionGroup(_navigationActionGroup);
connect(_prevAction, SIGNAL(triggered()), this, SLOT(prev())); connect(_prevAction, SIGNAL(triggered()), this, SLOT(prev()));
_lastAction = new QAction(QIcon(QPixmap(LAST_FILE_ICON)), tr("Last"), this); _lastAction = new QAction(QIcon(QPixmap(LAST_FILE_ICON)), tr("Last"), this);
_lastAction->setMenuRole(QAction::NoRole);
_lastAction->setActionGroup(_navigationActionGroup); _lastAction->setActionGroup(_navigationActionGroup);
connect(_lastAction, SIGNAL(triggered()), this, SLOT(last())); connect(_lastAction, SIGNAL(triggered()), this, SLOT(last()));
_firstAction = new QAction(QIcon(QPixmap(FIRST_FILE_ICON)), tr("First"), _firstAction = new QAction(QIcon(QPixmap(FIRST_FILE_ICON)), tr("First"),
this); this);
_firstAction->setMenuRole(QAction::NoRole);
_firstAction->setActionGroup(_navigationActionGroup); _firstAction->setActionGroup(_navigationActionGroup);
connect(_firstAction, SIGNAL(triggered()), this, SLOT(first())); connect(_firstAction, SIGNAL(triggered()), this, SLOT(first()));
} }
@ -432,8 +481,9 @@ void GUI::createMenus()
fileMenu->addAction(_printFileAction); fileMenu->addAction(_printFileAction);
fileMenu->addAction(_exportFileAction); fileMenu->addAction(_exportFileAction);
fileMenu->addSeparator(); fileMenu->addSeparator();
fileMenu->addAction(_reloadFileAction); fileMenu->addAction(_statisticsAction);
fileMenu->addSeparator(); fileMenu->addSeparator();
fileMenu->addAction(_reloadFileAction);
fileMenu->addAction(_closeFileAction); fileMenu->addAction(_closeFileAction);
#ifndef Q_OS_MAC #ifndef Q_OS_MAC
fileMenu->addSeparator(); fileMenu->addSeparator();
@ -641,19 +691,19 @@ void GUI::paths()
msgBox.setWindowTitle(tr("Paths")); msgBox.setWindowTitle(tr("Paths"));
msgBox.setText("<h3>" + tr("Paths") + "</h3>"); msgBox.setText("<h3>" + tr("Paths") + "</h3>");
msgBox.setInformativeText( msgBox.setInformativeText(
"<style>td {white-space: pre; padding-right: 1em;}</style>" "<style>td {white-space: pre; padding-right: 1em;}</style><h4>"
"<div><table><tr><td>" + tr("Map directory:") + "</td><td><code>" + tr("Global") + "</h4><table><tr><td>" + tr("Map directory:")
+ QDir::cleanPath(GLOBAL_MAP_DIR) + "</code></td></tr><tr><td>" + "</td><td><code>" + QDir::cleanPath(GLOBAL_MAP_DIR)
+ tr("POI directory:") + "</td><td><code>" + "</code></td></tr><tr><td>" + tr("POI directory:") + "</td><td><code>"
+ QDir::cleanPath(GLOBAL_POI_DIR) + "</code></td></tr><tr><td>" + QDir::cleanPath(GLOBAL_POI_DIR) + "</code></td></tr><tr><td>"
+ tr("GCS file:") + "</td><td><code>" + QDir::cleanPath(GLOBAL_GCS_FILE) + tr("GCS/PCS directory:") + "</td><td><code>"
+ "</code></td></tr><tr><td>" + tr("PCS file:") + "</td><td><code>" + QDir::cleanPath(GLOBAL_CSV_DIR) + "</code></td></tr></table>"
+ QDir::cleanPath(GLOBAL_PCS_FILE) + "</code></td></tr><tr><td>" + "<h4>" + tr("User-specific") + "</h4><table><tr><td>"
+ tr("Ellipsoids file:") + "</td><td><code>" + tr("Map directory:") + "</td><td><code>" + QDir::cleanPath(USER_MAP_DIR)
+ QDir::cleanPath(GLOBAL_ELLIPSOID_FILE) + "</code></td></tr>" + "</code></td></tr><tr><td>" + tr("POI directory:") + "</td><td><code>"
+ "<tr><td></td><td></td></tr></table></div><div><table><tr><td>" + QDir::cleanPath(USER_POI_DIR) + "</code></td></tr><tr><td>"
+ tr("User override directory:") + "</td><td><code>" + tr("GCS/PCS directory:") + "</td><td><code>"
+ QDir::cleanPath(USER_DIR) + "</td></tr></table></div>" + QDir::cleanPath(USER_CSV_DIR) + "</code></td></tr></table>"
); );
msgBox.exec(); msgBox.exec();
@ -870,6 +920,10 @@ void GUI::openOptions()
QPixmapCache::setCacheLimit(options.pixmapCache * 1024); QPixmapCache::setCacheLimit(options.pixmapCache * 1024);
if (options.connectionTimeout != _options.connectionTimeout) if (options.connectionTimeout != _options.connectionTimeout)
Downloader::setTimeout(options.connectionTimeout); Downloader::setTimeout(options.connectionTimeout);
#ifdef ENABLE_HTTP2
if (options.enableHTTP2 != _options.enableHTTP2)
Downloader::enableHTTP2(options.enableHTTP2);
#endif // ENABLE_HTTP2
if (reload) if (reload)
reloadFile(); reloadFile();
@ -908,14 +962,78 @@ void GUI::exportFile()
plot(&printer); plot(&printer);
} }
void GUI::statistics()
{
#ifdef Q_OS_WIN32
QString text = "<style>td {white-space: pre; padding-right: 4em;}"
"th {text-align: left; padding-top: 0.5em;}</style><table>";
#else // Q_OS_WIN32
QString text = "<style>td {white-space: pre; padding-right: 2em;}"
"th {text-align: left; padding-top: 0.5em;}</style><table>";
#endif // Q_OS_WIN32
if (_showTracksAction->isChecked() && _trackCount > 1)
text.append("<tr><td>" + tr("Tracks") + ":</td><td>"
+ QString::number(_trackCount) + "</td></tr>");
if (_showRoutesAction->isChecked() && _routeCount > 1)
text.append("<tr><td>" + tr("Routes") + ":</td><td>"
+ QString::number(_routeCount) + "</td></tr>");
if (_showWaypointsAction->isChecked() && _waypointCount > 1)
text.append("<tr><td>" + tr("Waypoints") + ":</td><td>"
+ QString::number(_waypointCount) + "</td></tr>");
if (_dateRange.first.isValid()) {
if (_dateRange.first == _dateRange.second) {
QString format = QLocale::system().dateFormat(QLocale::LongFormat);
text.append("<tr><td>" + tr("Date") + ":</td><td>"
+ _dateRange.first.toString(format) + "</td></tr>");
} else {
QString format = QLocale::system().dateFormat(QLocale::ShortFormat);
text.append("<tr><td>" + tr("Date") + ":</td><td>"
+ QString("%1 - %2").arg(_dateRange.first.toString(format),
_dateRange.second.toString(format)) + "</td></tr>");
}
}
if (distance() > 0)
text.append("<tr><td>" + tr("Distance") + ":</td><td>"
+ Format::distance(distance(), units()) + "</td></tr>");
if (time() > 0) {
text.append("<tr><td>" + tr("Time") + ":</td><td>"
+ Format::timeSpan(time()) + "</td></tr>");
text.append("<tr><td>" + tr("Moving time") + ":</td><td>"
+ Format::timeSpan(movingTime()) + "</td></tr>");
}
for (int i = 0; i < _tabs.count(); i++) {
const GraphTab *tab = _tabs.at(i);
if (tab->isEmpty())
continue;
text.append("<tr><th colspan=\"2\">" + tab->label() + "</th></tr>");
for (int j = 0; j < tab->info().size(); j++) {
const KV &kv = tab->info().at(j);
text.append("<tr><td>" + kv.key() + ":</td><td>" + kv.value()
+ "</td></tr>");
}
}
text.append("</table>");
QMessageBox msgBox(this);
msgBox.setWindowTitle(tr("Statistics"));
msgBox.setText("<h3>" + tr("Statistics") + "</h3>");
msgBox.setInformativeText(text);
msgBox.exec();
}
void GUI::plot(QPrinter *printer) void GUI::plot(QPrinter *printer)
{ {
QPainter p(printer); QPainter p(printer);
TrackInfo info; TrackInfo info;
qreal ih, gh, mh, ratio; qreal ih, gh, mh, ratio;
qreal d = distance();
qreal t = time();
qreal tm = movingTime();
if (!_pathName.isNull() && _options.printName) if (!_pathName.isNull() && _options.printName)
info.insert(tr("Name"), _pathName); info.insert(tr("Name"), _pathName);
@ -925,7 +1043,7 @@ void GUI::plot(QPrinter *printer)
info.insert(tr("Tracks"), QString::number(_trackCount)); info.insert(tr("Tracks"), QString::number(_trackCount));
if (_showRoutesAction->isChecked() && _routeCount > 1) if (_showRoutesAction->isChecked() && _routeCount > 1)
info.insert(tr("Routes"), QString::number(_routeCount)); info.insert(tr("Routes"), QString::number(_routeCount));
if (_showWaypointsAction->isChecked() && _waypointCount > 2) if (_showWaypointsAction->isChecked() && _waypointCount > 1)
info.insert(tr("Waypoints"), QString::number(_waypointCount)); info.insert(tr("Waypoints"), QString::number(_waypointCount));
} }
@ -941,12 +1059,12 @@ void GUI::plot(QPrinter *printer)
} }
} }
if (d > 0 && _options.printDistance) if (distance() > 0 && _options.printDistance)
info.insert(tr("Distance"), Format::distance(d, units())); info.insert(tr("Distance"), Format::distance(distance(), units()));
if (t > 0 && _options.printTime) if (time() > 0 && _options.printTime)
info.insert(tr("Time"), Format::timeSpan(t)); info.insert(tr("Time"), Format::timeSpan(time()));
if (tm > 0 && _options.printMovingTime) if (movingTime() > 0 && _options.printMovingTime)
info.insert(tr("Moving time"), Format::timeSpan(tm)); info.insert(tr("Moving time"), Format::timeSpan(movingTime()));
qreal fsr = 1085.0 / (qMax(printer->width(), printer->height()) qreal fsr = 1085.0 / (qMax(printer->width(), printer->height())
/ (qreal)printer->resolution()); / (qreal)printer->resolution());
@ -1162,6 +1280,7 @@ bool GUI::loadMap(const QString &fileName)
if (_ml->loadFile(fileName)) { if (_ml->loadFile(fileName)) {
QAction *a = new QAction(_ml->maps().last()->name(), this); QAction *a = new QAction(_ml->maps().last()->name(), this);
a->setMenuRole(QAction::NoRole);
a->setCheckable(true); a->setCheckable(true);
a->setActionGroup(_mapsActionGroup); a->setActionGroup(_mapsActionGroup);
_mapsSignalMapper->setMapping(a, _ml->maps().size() - 1); _mapsSignalMapper->setMapping(a, _ml->maps().size() - 1);
@ -1640,6 +1759,10 @@ void GUI::writeSettings()
settings.setValue(POI_RADIUS_SETTING, _options.poiRadius); settings.setValue(POI_RADIUS_SETTING, _options.poiRadius);
if (_options.useOpenGL != USE_OPENGL_DEFAULT) if (_options.useOpenGL != USE_OPENGL_DEFAULT)
settings.setValue(USE_OPENGL_SETTING, _options.useOpenGL); settings.setValue(USE_OPENGL_SETTING, _options.useOpenGL);
#ifdef ENABLE_HTTP2
if (_options.enableHTTP2 != ENABLE_HTTP2_DEFAULT)
settings.setValue(ENABLE_HTTP2_SETTING, _options.enableHTTP2);
#endif // ENABLE_HTTP2
if (_options.pixmapCache != PIXMAP_CACHE_DEFAULT) if (_options.pixmapCache != PIXMAP_CACHE_DEFAULT)
settings.setValue(PIXMAP_CACHE_SETTING, _options.pixmapCache); settings.setValue(PIXMAP_CACHE_SETTING, _options.pixmapCache);
if (_options.connectionTimeout != CONNECTION_TIMEOUT_DEFAULT) if (_options.connectionTimeout != CONNECTION_TIMEOUT_DEFAULT)
@ -1872,6 +1995,10 @@ void GUI::readSettings()
.toInt(); .toInt();
_options.useOpenGL = settings.value(USE_OPENGL_SETTING, USE_OPENGL_DEFAULT) _options.useOpenGL = settings.value(USE_OPENGL_SETTING, USE_OPENGL_DEFAULT)
.toBool(); .toBool();
#ifdef ENABLE_HTTP2
_options.enableHTTP2 = settings.value(ENABLE_HTTP2_SETTING,
ENABLE_HTTP2_DEFAULT).toBool();
#endif // ENABLE_HTTP2
_options.pixmapCache = settings.value(PIXMAP_CACHE_SETTING, _options.pixmapCache = settings.value(PIXMAP_CACHE_SETTING,
PIXMAP_CACHE_DEFAULT).toInt(); PIXMAP_CACHE_DEFAULT).toInt();
_options.connectionTimeout = settings.value(CONNECTION_TIMEOUT_SETTING, _options.connectionTimeout = settings.value(CONNECTION_TIMEOUT_SETTING,
@ -1937,6 +2064,9 @@ void GUI::readSettings()
QPixmapCache::setCacheLimit(_options.pixmapCache * 1024); QPixmapCache::setCacheLimit(_options.pixmapCache * 1024);
Downloader::setTimeout(_options.connectionTimeout); Downloader::setTimeout(_options.connectionTimeout);
#ifdef ENABLE_HTTP2
Downloader::enableHTTP2(_options.enableHTTP2);
#endif // ENABLE_HTTP2
settings.endGroup(); settings.endGroup();
} }

View File

@ -47,6 +47,7 @@ private slots:
void openFile(); void openFile();
void closeAll(); void closeAll();
void reloadFile(); void reloadFile();
void statistics();
void openPOIFile(); void openPOIFile();
void closePOIFiles(); void closePOIFiles();
void showGraphs(bool show); void showGraphs(bool show);
@ -150,6 +151,7 @@ private:
QAction *_openFileAction; QAction *_openFileAction;
QAction *_closeFileAction; QAction *_closeFileAction;
QAction *_reloadFileAction; QAction *_reloadFileAction;
QAction *_statisticsAction;
QAction *_openPOIAction; QAction *_openPOIAction;
QAction *_closePOIAction; QAction *_closePOIAction;
QAction *_showPOIAction; QAction *_showPOIAction;

View File

@ -22,8 +22,8 @@ void InfoItem::updateBoundingRect()
for (QList<KV>::const_iterator i = _list.constBegin(); for (QList<KV>::const_iterator i = _list.constBegin();
i != _list.constEnd(); i++) { i != _list.constEnd(); i++) {
width += fm.width(i->key + ": "); width += fm.width(i->key() + ": ");
width += fm.width(i->value) + ((i == _list.constEnd() - 1) width += fm.width(i->value()) + ((i == _list.constEnd() - 1)
? 0 : PADDING); ? 0 : PADDING);
} }
@ -43,10 +43,10 @@ void InfoItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
for (QList<KV>::const_iterator i = _list.constBegin(); for (QList<KV>::const_iterator i = _list.constBegin();
i != _list.constEnd(); i++) { i != _list.constEnd(); i++) {
painter->drawText(width, fm.height() - fm.descent(), i->key + ": "); painter->drawText(width, fm.height() - fm.descent(), i->key() + ": ");
width += fm.width(i->key + ": "); width += fm.width(i->key() + ": ");
painter->drawText(width, fm.height() - fm.descent(), i->value); painter->drawText(width, fm.height() - fm.descent(), i->value());
width += fm.width(i->value) + ((i == _list.constEnd() - 1) width += fm.width(i->value()) + ((i == _list.constEnd() - 1)
? 0 : PADDING); ? 0 : PADDING);
if (i != _list.constEnd() - 1) { if (i != _list.constEnd() - 1) {
painter->save(); painter->save();

View File

@ -3,6 +3,7 @@
#include <QGraphicsItem> #include <QGraphicsItem>
#include <QList> #include <QList>
#include "kv.h"
class InfoItem : public QGraphicsItem class InfoItem : public QGraphicsItem
{ {
@ -13,6 +14,8 @@ public:
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
QWidget *widget); QWidget *widget);
const QList<KV> &info() const {return _list;}
void insert(const QString &key, const QString &value); void insert(const QString &key, const QString &value);
void clear(); void clear();
bool isEmpty() {return _list.isEmpty();} bool isEmpty() {return _list.isEmpty();}
@ -20,17 +23,6 @@ public:
private: private:
void updateBoundingRect(); void updateBoundingRect();
class KV {
public:
QString key;
QString value;
KV(const QString &k, const QString &v)
{key = k; value = v;}
bool operator==(const KV &other) const
{return this->key == other.key;}
};
QList<KV> _list; QList<KV> _list;
QRectF _boundingRect; QRectF _boundingRect;
QFont _font; QFont _font;

View File

@ -24,6 +24,7 @@
#define NEXT_MAP_SHORTCUT QKeySequence(QKeySequence::Forward) #define NEXT_MAP_SHORTCUT QKeySequence(QKeySequence::Forward)
#define PREV_MAP_SHORTCUT QKeySequence(QKeySequence::Back) #define PREV_MAP_SHORTCUT QKeySequence(QKeySequence::Back)
#define SHOW_GRAPHS_SHORTCUT QKeySequence(Qt::CTRL + Qt::Key_G) #define SHOW_GRAPHS_SHORTCUT QKeySequence(Qt::CTRL + Qt::Key_G)
#define STATISTICS_SHORTCUT QKeySequence(Qt::CTRL + Qt::Key_S)
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
#define FULLSCREEN_SHORTCUT QKeySequence(Qt::META + Qt::CTRL + Qt::Key_F) #define FULLSCREEN_SHORTCUT QKeySequence(Qt::META + Qt::CTRL + Qt::Key_F)

21
src/GUI/kv.h Normal file
View File

@ -0,0 +1,21 @@
#ifndef KV_H
#define KV_H
#include <QString>
class KV {
public:
KV(const QString &key, const QString &value) : _key(key), _value(value) {}
const QString &key() const {return _key;}
const QString &value() const {return _value;}
bool operator==(const KV &other) const
{return this->key() == other.key();}
private:
QString _key;
QString _value;
};
#endif // KV_H

View File

@ -1,5 +1,5 @@
#include <QtGlobal> #include <QtGlobal>
#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0) || defined(Q_OS_MAC) #if QT_VERSION < QT_VERSION_CHECK(5, 4, 0)
#include <QGLWidget> #include <QGLWidget>
#include <QGLFormat> #include <QGLFormat>
#else #else
@ -7,13 +7,13 @@
#include <QSurfaceFormat> #include <QSurfaceFormat>
#endif #endif
#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0) || defined(Q_OS_MAC) #if QT_VERSION < QT_VERSION_CHECK(5, 4, 0)
#define OPENGL_WIDGET QGLWidget #define OPENGL_WIDGET QGLWidget
#else #else
#define OPENGL_WIDGET QOpenGLWidget #define OPENGL_WIDGET QOpenGLWidget
#endif #endif
#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0) || defined(Q_OS_MAC) #if QT_VERSION < QT_VERSION_CHECK(5, 4, 0)
#define OPENGL_SET_SAMPLES(samples) \ #define OPENGL_SET_SAMPLES(samples) \
{QGLFormat fmt; \ {QGLFormat fmt; \
fmt.setSamples(samples); \ fmt.setSamples(samples); \

View File

@ -12,7 +12,6 @@
#include <QRadioButton> #include <QRadioButton>
#include <QLabel> #include <QLabel>
#include <QSysInfo> #include <QSysInfo>
#include "config.h"
#include "icons.h" #include "icons.h"
#include "colorbox.h" #include "colorbox.h"
#include "stylecombobox.h" #include "stylecombobox.h"
@ -440,6 +439,10 @@ QWidget *OptionsDialog::createSystemPage()
{ {
_useOpenGL = new QCheckBox(tr("Use OpenGL")); _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);
#endif // ENABLE_HTTP2
_pixmapCache = new QSpinBox(); _pixmapCache = new QSpinBox();
_pixmapCache->setMinimum(16); _pixmapCache->setMinimum(16);
@ -458,6 +461,9 @@ QWidget *OptionsDialog::createSystemPage()
formLayout->addRow(tr("Connection timeout:"), _connectionTimeout); formLayout->addRow(tr("Connection timeout:"), _connectionTimeout);
QFormLayout *checkboxLayout = new QFormLayout(); QFormLayout *checkboxLayout = new QFormLayout();
#ifdef ENABLE_HTTP2
checkboxLayout->addWidget(_enableHTTP2);
#endif // ENABLE_HTTP2
checkboxLayout->addWidget(_useOpenGL); checkboxLayout->addWidget(_useOpenGL);
QWidget *systemTab = new QWidget(); QWidget *systemTab = new QWidget();
@ -568,6 +574,9 @@ void OptionsDialog::accept()
_options->poiRadius = poiRadius; _options->poiRadius = poiRadius;
_options->useOpenGL = _useOpenGL->isChecked(); _options->useOpenGL = _useOpenGL->isChecked();
#ifdef ENABLE_HTTP2
_options->enableHTTP2 = _enableHTTP2->isChecked();
#endif // ENABLE_HTTP2
_options->pixmapCache = _pixmapCache->value(); _options->pixmapCache = _pixmapCache->value();
_options->connectionTimeout = _connectionTimeout->value(); _options->connectionTimeout = _connectionTimeout->value();

View File

@ -4,6 +4,8 @@
#include <QDialog> #include <QDialog>
#include "palette.h" #include "palette.h"
#include "units.h" #include "units.h"
#include "config.h"
class ColorBox; class ColorBox;
class StyleComboBox; class StyleComboBox;
@ -48,6 +50,9 @@ struct Options {
int poiRadius; int poiRadius;
// System // System
bool useOpenGL; bool useOpenGL;
#ifdef ENABLE_HTTP2
bool enableHTTP2;
#endif // ENABLE_HTTP2
int pixmapCache; int pixmapCache;
int connectionTimeout; int connectionTimeout;
// Print/Export // Print/Export
@ -119,6 +124,9 @@ private:
QSpinBox *_pixmapCache; QSpinBox *_pixmapCache;
QSpinBox *_connectionTimeout; QSpinBox *_connectionTimeout;
QCheckBox *_useOpenGL; QCheckBox *_useOpenGL;
#ifdef ENABLE_HTTP2
QCheckBox *_enableHTTP2;
#endif // ENABLE_HTTP2
// Print/Export // Print/Export
QRadioButton *_wysiwyg; QRadioButton *_wysiwyg;
QRadioButton *_hires; QRadioButton *_hires;

View File

@ -130,6 +130,8 @@
#define POI_RADIUS_DEFAULT (int)(IMPERIAL_UNITS() ? MIINM : KMINM) #define POI_RADIUS_DEFAULT (int)(IMPERIAL_UNITS() ? MIINM : KMINM)
#define USE_OPENGL_SETTING "useOpenGL" #define USE_OPENGL_SETTING "useOpenGL"
#define USE_OPENGL_DEFAULT false #define USE_OPENGL_DEFAULT false
#define ENABLE_HTTP2_SETTING "enableHTTP2"
#define ENABLE_HTTP2_DEFAULT true
#define PIXMAP_CACHE_SETTING "pixmapCache" #define PIXMAP_CACHE_SETTING "pixmapCache"
#define PIXMAP_CACHE_DEFAULT 64 /* MB */ #define PIXMAP_CACHE_DEFAULT 64 /* MB */
#define CONNECTION_TIMEOUT_SETTING "connectionTimeout" #define CONNECTION_TIMEOUT_SETTING "connectionTimeout"

View File

@ -12,11 +12,12 @@
#define FONT_FAMILY "Arial" #define FONT_FAMILY "Arial"
#define FONT_SIZE 12 // px #define FONT_SIZE 12 // px
#define ELLIPSOID_FILE QString("csv/ellipsoids.csv")
#define GCS_FILE QString("csv/gcs.csv")
#define PCS_FILE QString("csv/pcs.csv")
#define MAP_DIR QString("maps") #define MAP_DIR QString("maps")
#define POI_DIR QString("POI") #define POI_DIR QString("POI")
#define CSV_DIR QString("csv")
#define ELLIPSOID_FILE QString("ellipsoids.csv")
#define GCS_FILE QString("gcs.csv")
#define PCS_FILE QString("pcs.csv")
#if defined(Q_OS_WIN32) #if defined(Q_OS_WIN32)
#define USER_DIR QDir::homePath() + QString("/GPXSee") #define USER_DIR QDir::homePath() + QString("/GPXSee")
@ -30,17 +31,23 @@
#define GLOBAL_DIR QString("/usr/share/gpxsee") #define GLOBAL_DIR QString("/usr/share/gpxsee")
#endif #endif
#define USER_ELLIPSOID_FILE USER_DIR + QString("/") + ELLIPSOID_FILE #define USER_CSV_DIR USER_DIR + QString("/") + CSV_DIR
#define USER_GCS_FILE USER_DIR + QString("/") + GCS_FILE #define USER_ELLIPSOID_FILE USER_CSV_DIR + QString("/") + ELLIPSOID_FILE
#define USER_PCS_FILE USER_DIR + QString("/") + PCS_FILE #define USER_GCS_FILE USER_CSV_DIR + QString("/") + GCS_FILE
#define USER_PCS_FILE USER_CSV_DIR + QString("/") + PCS_FILE
#define USER_MAP_DIR USER_DIR + QString("/") + MAP_DIR #define USER_MAP_DIR USER_DIR + QString("/") + MAP_DIR
#define USER_POI_DIR USER_DIR + QString("/") + POI_DIR #define USER_POI_DIR USER_DIR + QString("/") + POI_DIR
#define GLOBAL_ELLIPSOID_FILE GLOBAL_DIR + QString("/") + ELLIPSOID_FILE #define GLOBAL_CSV_DIR GLOBAL_DIR + QString("/") + CSV_DIR
#define GLOBAL_GCS_FILE GLOBAL_DIR + QString("/") + GCS_FILE #define GLOBAL_ELLIPSOID_FILE GLOBAL_CSV_DIR + QString("/") + ELLIPSOID_FILE
#define GLOBAL_PCS_FILE GLOBAL_DIR + QString("/") + PCS_FILE #define GLOBAL_GCS_FILE GLOBAL_CSV_DIR + QString("/") + GCS_FILE
#define GLOBAL_PCS_FILE GLOBAL_CSV_DIR + QString("/") + PCS_FILE
#define GLOBAL_MAP_DIR GLOBAL_DIR + QString("/") + MAP_DIR #define GLOBAL_MAP_DIR GLOBAL_DIR + QString("/") + MAP_DIR
#define GLOBAL_POI_DIR GLOBAL_DIR + QString("/") + POI_DIR #define GLOBAL_POI_DIR GLOBAL_DIR + QString("/") + POI_DIR
#define TILES_DIR USER_DIR + QString("/tiles") #define TILES_DIR USER_DIR + QString("/tiles")
#define TRANSLATIONS_DIR GLOBAL_DIR + QString("/translations") #define TRANSLATIONS_DIR GLOBAL_DIR + QString("/translations")
#if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 1))
#define ENABLE_HTTP2
#endif // QT >= 5.10.1
#endif /* CONFIG_H */ #endif /* CONFIG_H */

View File

@ -6,6 +6,26 @@ static qint64 delphi2unixMS(double date)
return (qint64)((date - 25569.0) * 86400000); return (qint64)((date - 25569.0) * 86400000);
} }
static bool isASCII(const QByteArray &ba)
{
for (int i = 0; i < ba.size(); i++) {
quint8 c = (quint8)ba.at(i);
if (c > 0x7f && c != 0xD1)
return false;
}
return true;
}
static QByteArray &decode(QByteArray &ba)
{
if (isASCII(ba))
ba.replace('\xD1', ',');
return ba;
}
bool PLTParser::parse(QFile *file, QList<TrackData> &tracks, bool PLTParser::parse(QFile *file, QList<TrackData> &tracks,
QList<RouteData> &routes, QList<Waypoint> &waypoints) QList<RouteData> &routes, QList<Waypoint> &waypoints)
{ {
@ -129,12 +149,14 @@ bool RTEParser::parse(QFile *file, QList<TrackData> &tracks,
routes.append(RouteData()); routes.append(RouteData());
record = true; record = true;
if (list.size() >= 3) if (list.size() >= 3) {
routes.last().setName(list.at(2).trimmed() QByteArray name(list.at(2).trimmed());
.replace('\xD1', ',')); routes.last().setName(decode(name));
if (list.size() >= 4) }
routes.last().setDescription(list.at(3).trimmed() if (list.size() >= 4) {
.replace('\xD1', ',')); QByteArray description(list.at(3).trimmed());
routes.last().setDescription(decode(description));
}
} else if (list.at(0).trimmed() == "W") { } else if (list.at(0).trimmed() == "W") {
if (!record || list.size() < 7) { if (!record || list.size() < 7) {
_errorString = "Parse error"; _errorString = "Parse error";
@ -154,9 +176,9 @@ bool RTEParser::parse(QFile *file, QList<TrackData> &tracks,
Waypoint wp(gcs->toWGS84(Coordinates(lon, lat))); Waypoint wp(gcs->toWGS84(Coordinates(lon, lat)));
QString name(list.at(4).trimmed().replace('\xD1', ',')); QByteArray name(list.at(4).trimmed());
if (!name.isEmpty()) if (!name.isEmpty())
wp.setName(name); wp.setName(decode(name));
if (list.size() >= 8) { if (list.size() >= 8) {
QByteArray field(list.at(7).trimmed()); QByteArray field(list.at(7).trimmed());
if (!field.isEmpty()) { if (!field.isEmpty()) {
@ -170,9 +192,9 @@ bool RTEParser::parse(QFile *file, QList<TrackData> &tracks,
} }
} }
if (list.size() >= 14) { if (list.size() >= 14) {
QString desc(list.at(13).trimmed().replace('\xD1', ',')); QByteArray description(list.at(13).trimmed());
if (!desc.isEmpty()) if (!description.isEmpty())
wp.setDescription(desc); wp.setDescription(decode(description));
} }
routes.last().append(wp); routes.last().append(wp);
@ -233,9 +255,9 @@ bool WPTParser::parse(QFile *file, QList<TrackData> &tracks,
Waypoint wp(gcs->toWGS84(Coordinates(lon, lat))); Waypoint wp(gcs->toWGS84(Coordinates(lon, lat)));
QString name(list.at(1).trimmed().replace('\xD1', ',')); QByteArray name(list.at(1).trimmed());
if (!name.isEmpty()) if (!name.isEmpty())
wp.setName(name); wp.setName(decode(name));
if (list.size() >= 5) { if (list.size() >= 5) {
QByteArray field(list.at(4).trimmed()); QByteArray field(list.at(4).trimmed());
if (!field.isEmpty()) { if (!field.isEmpty()) {
@ -249,9 +271,9 @@ bool WPTParser::parse(QFile *file, QList<TrackData> &tracks,
} }
} }
if (list.size() >= 11) { if (list.size() >= 11) {
QString desc(list.at(10).trimmed().replace('\xD1', ',')); QByteArray description(list.at(10).trimmed());
if (!desc.isEmpty()) if (!description.isEmpty())
wp.setDescription(desc); wp.setDescription(decode(description));
} }
if (list.size() >= 15) { if (list.size() >= 15) {
QByteArray field(list.at(14).trimmed()); QByteArray field(list.at(14).trimmed());

View File

@ -22,12 +22,12 @@ static bool resCmp(OfflineMap *m1, OfflineMap *m2)
return r1 > r2; return r1 > r2;
} }
static bool xCmp(const OfflineMap *m1, const OfflineMap *m2) static bool xCmp(OfflineMap *m1, OfflineMap *m2)
{ {
return TL(m1).x() < TL(m2).x(); return TL(m1).x() < TL(m2).x();
} }
static bool yCmp(const OfflineMap *m1, const OfflineMap *m2) static bool yCmp(OfflineMap *m1, OfflineMap *m2)
{ {
return TL(m1).y() > TL(m2).y(); return TL(m1).y() > TL(m2).y();
} }
@ -147,7 +147,7 @@ Atlas::Atlas(const QString &fileName, QObject *parent)
_valid = true; _valid = true;
} }
QRectF Atlas::bounds() const QRectF Atlas::bounds()
{ {
QSizeF s(0, 0); QSizeF s(0, 0);

View File

@ -13,9 +13,9 @@ class Atlas : public Map
public: public:
Atlas(const QString &fileName, QObject *parent = 0); Atlas(const QString &fileName, QObject *parent = 0);
const QString &name() const {return _name;} QString name() const {return _name;}
QRectF bounds() const; QRectF bounds();
int zoom() const {return _zoom;} int zoom() const {return _zoom;}
void setZoom(int zoom); void setZoom(int zoom);

View File

@ -7,9 +7,6 @@
#define ds2scale(x) (1.0 + (x) * 1e-6) #define ds2scale(x) (1.0 + (x) * 1e-6)
#define scale2ds(x) (((x) - 1.0) / 1e-6) #define scale2ds(x) (((x) - 1.0) / 1e-6)
static Ellipsoid WGS84e = Ellipsoid(WGS84_RADIUS, WGS84_FLATTENING);
static Datum WGS84 = Datum(&WGS84e, 0.0, 0.0, 0.0);
static Coordinates molodensky(const Coordinates &c, const Datum &from, static Coordinates molodensky(const Coordinates &c, const Datum &from,
const Datum &to) const Datum &to)
{ {
@ -46,6 +43,12 @@ static Coordinates molodensky(const Coordinates &c, const Datum &from,
return Coordinates(c.lon() + rad2deg(dlon), c.lat() + rad2deg(dlat)); return Coordinates(c.lon() + rad2deg(dlon), c.lat() + rad2deg(dlat));
} }
const Datum &Datum::WGS84()
{
static Datum d(&Ellipsoid::WGS84(), 0.0, 0.0, 0.0);
return d;
}
Point3D Datum::helmert(const Point3D &p) const Point3D Datum::helmert(const Point3D &p) const
{ {
return Point3D(_scale * (p.x() + _rz * p.y() -_ry * p.z()) + _dx, return Point3D(_scale * (p.x() + _rz * p.y() -_ry * p.z()) + _dx,
@ -92,9 +95,9 @@ Coordinates Datum::toWGS84(const Coordinates &c) const
switch (_transformation) { switch (_transformation) {
case Helmert: case Helmert:
return Geocentric::toGeodetic(helmert(Geocentric::fromGeodetic(c, return Geocentric::toGeodetic(helmert(Geocentric::fromGeodetic(c,
ellipsoid())), WGS84.ellipsoid()); ellipsoid())), WGS84().ellipsoid());
case Molodensky: case Molodensky:
return molodensky(c, *this, WGS84); return molodensky(c, *this, WGS84());
default: default:
return c; return c;
} }
@ -105,9 +108,9 @@ Coordinates Datum::fromWGS84(const Coordinates &c) const
switch (_transformation) { switch (_transformation) {
case Helmert: case Helmert:
return Geocentric::toGeodetic(helmertr(Geocentric::fromGeodetic(c, return Geocentric::toGeodetic(helmertr(Geocentric::fromGeodetic(c,
WGS84.ellipsoid())), ellipsoid()); WGS84().ellipsoid())), ellipsoid());
case Molodensky: case Molodensky:
return molodensky(c, WGS84, *this); return molodensky(c, WGS84(), *this);
default: default:
return c; return c;
} }

View File

@ -35,6 +35,8 @@ public:
Coordinates toWGS84(const Coordinates &c) const; Coordinates toWGS84(const Coordinates &c) const;
Coordinates fromWGS84(const Coordinates &c) const; Coordinates fromWGS84(const Coordinates &c) const;
static const Datum &WGS84();
private: private:
enum TransformationType { enum TransformationType {
None, None,

View File

@ -2,7 +2,6 @@
#include <QFileInfo> #include <QFileInfo>
#include <QNetworkRequest> #include <QNetworkRequest>
#include <QBasicTimer> #include <QBasicTimer>
#include "config.h"
#include "downloader.h" #include "downloader.h"
@ -81,6 +80,9 @@ private:
QNetworkAccessManager *Downloader::_manager = 0; QNetworkAccessManager *Downloader::_manager = 0;
int Downloader::_timeout = 30; int Downloader::_timeout = 30;
#ifdef ENABLE_HTTP2
bool Downloader::_http2 = true;
#endif // ENABLE_HTTP2
bool Downloader::doDownload(const Download &dl, bool Downloader::doDownload(const Download &dl,
const QByteArray &authorization, const Redirect *redirect) const QByteArray &authorization, const Redirect *redirect)
@ -108,6 +110,10 @@ bool Downloader::doDownload(const Download &dl,
request.setRawHeader("User-Agent", USER_AGENT); request.setRawHeader("User-Agent", USER_AGENT);
if (!authorization.isNull()) if (!authorization.isNull())
request.setRawHeader("Authorization", authorization); request.setRawHeader("Authorization", authorization);
#ifdef ENABLE_HTTP2
request.setAttribute(QNetworkRequest::HTTP2AllowedAttribute,
QVariant(_http2));
#endif // ENABLE_HTTP2
QNetworkReply *reply = _manager->get(request); QNetworkReply *reply = _manager->get(request);
if (reply && reply->isRunning()) { if (reply && reply->isRunning()) {

View File

@ -7,6 +7,7 @@
#include <QList> #include <QList>
#include <QSet> #include <QSet>
#include <QHash> #include <QHash>
#include "config.h"
class Download class Download
@ -46,6 +47,9 @@ public:
void clearErrors() {_errorDownloads.clear();} void clearErrors() {_errorDownloads.clear();}
static void setTimeout(int timeout) {_timeout = timeout;} static void setTimeout(int timeout) {_timeout = timeout;}
#ifdef ENABLE_HTTP2
static void enableHTTP2(bool enable) {_http2 = enable;}
#endif // ENABLE_HTTP2
static void setNetworkAccessManager(QNetworkAccessManager *manager) static void setNetworkAccessManager(QNetworkAccessManager *manager)
{_manager = manager;} {_manager = manager;}
@ -69,6 +73,9 @@ private:
QHash<QUrl, int> _errorDownloads; QHash<QUrl, int> _errorDownloads;
static int _timeout; static int _timeout;
#ifdef ENABLE_HTTP2
static bool _http2;
#endif // ENABLE_HTTP2
static QNetworkAccessManager *_manager; static QNetworkAccessManager *_manager;
}; };

View File

@ -46,7 +46,7 @@ EmptyMap::EmptyMap(QObject *parent) : Map(parent)
_zoom = ZOOM_MAX; _zoom = ZOOM_MAX;
} }
QRectF EmptyMap::bounds() const QRectF EmptyMap::bounds()
{ {
return QRectF(ll2xy(Coordinates(-180, 85)), ll2xy(Coordinates(180, -85))); return QRectF(ll2xy(Coordinates(-180, 85)), ll2xy(Coordinates(180, -85)));
} }
@ -92,14 +92,14 @@ void EmptyMap::draw(QPainter *painter, const QRectF &rect, bool block)
Q_UNUSED(block); Q_UNUSED(block);
} }
QPointF EmptyMap::ll2xy(const Coordinates &c) const QPointF EmptyMap::ll2xy(const Coordinates &c)
{ {
qreal scale = zoom2scale(_zoom); qreal scale = zoom2scale(_zoom);
QPointF m = ll2m(c); QPointF m = ll2m(c);
return QPointF(m.x() / scale, m.y() / -scale); return QPointF(m.x() / scale, m.y() / -scale);
} }
Coordinates EmptyMap::xy2ll(const QPointF &p) const Coordinates EmptyMap::xy2ll(const QPointF &p)
{ {
qreal scale = zoom2scale(_zoom); qreal scale = zoom2scale(_zoom);
return m2ll(QPointF(p.x() * scale, -p.y() * scale)); return m2ll(QPointF(p.x() * scale, -p.y() * scale));

View File

@ -10,9 +10,9 @@ class EmptyMap : public Map
public: public:
EmptyMap(QObject *parent = 0); EmptyMap(QObject *parent = 0);
const QString &name() const {return _name;} QString name() const {return QString();}
QRectF bounds() const; QRectF bounds();
qreal resolution(const QRectF &rect); qreal resolution(const QRectF &rect);
int zoom() const {return _zoom;} int zoom() const {return _zoom;}
@ -21,18 +21,12 @@ public:
int zoomIn(); int zoomIn();
int zoomOut(); int zoomOut();
QPointF ll2xy(const Coordinates &c) QPointF ll2xy(const Coordinates &c);
{return static_cast<const EmptyMap &>(*this).ll2xy(c);} Coordinates xy2ll(const QPointF &p);
Coordinates xy2ll(const QPointF &p)
{return static_cast<const EmptyMap &>(*this).xy2ll(p);}
void draw(QPainter *painter, const QRectF &rect, bool block); void draw(QPainter *painter, const QRectF &rect, bool block);
private: private:
QPointF ll2xy(const Coordinates &c) const;
Coordinates xy2ll(const QPointF &p) const;
QString _name;
int _zoom; int _zoom;
}; };

View File

@ -46,8 +46,7 @@ QList<GCS::Entry> GCS::_gcss = defaults();
const GCS &GCS::WGS84() const GCS &GCS::WGS84()
{ {
static Datum d(&Ellipsoid::WGS84(), 0.0, 0.0, 0.0); static GCS g(Datum::WGS84(), 8901, 9122);
static GCS g(d, 8901, 9122);
return g; return g;
} }

View File

@ -31,11 +31,14 @@
#define ProjNatOriginLatGeoKey 3081 #define ProjNatOriginLatGeoKey 3081
#define ProjFalseEastingGeoKey 3082 #define ProjFalseEastingGeoKey 3082
#define ProjFalseNorthingGeoKey 3083 #define ProjFalseNorthingGeoKey 3083
#define ProjFalseOriginLongGeoKey 3084
#define ProjFalseOriginLatGeoKey 3085 #define ProjFalseOriginLatGeoKey 3085
#define ProjFalseOriginEastingGeoKey 3086
#define ProjFalseOriginNorthingGeoKey 3087
#define ProjCenterLongGeoKey 3088 #define ProjCenterLongGeoKey 3088
#define ProjCenterLatGeoKey 3089 #define ProjCenterLatGeoKey 3089
#define ProjCenterEastingGeoKey 3090 #define ProjCenterEastingGeoKey 3090
#define ProjFalseOriginNorthingGeoKey 3091 #define ProjCenterNorthingGeoKey 3091
#define ProjScaleAtNatOriginGeoKey 3092 #define ProjScaleAtNatOriginGeoKey 3092
#define ProjScaleAtCenterGeoKey 3093 #define ProjScaleAtCenterGeoKey 3093
#define ProjAzimuthAngleGeoKey 3094 #define ProjAzimuthAngleGeoKey 3094
@ -252,8 +255,11 @@ bool GeoTIFF::readKeys(TIFFFile &file, Ctx &ctx, QMap<quint16, Value> &kv) const
case ProjScaleAtCenterGeoKey: case ProjScaleAtCenterGeoKey:
case ProjAzimuthAngleGeoKey: case ProjAzimuthAngleGeoKey:
case ProjRectifiedGridAngleGeoKey: case ProjRectifiedGridAngleGeoKey:
case ProjFalseOriginLongGeoKey:
case ProjFalseOriginLatGeoKey: case ProjFalseOriginLatGeoKey:
case ProjCenterEastingGeoKey: case ProjCenterEastingGeoKey:
case ProjCenterNorthingGeoKey:
case ProjFalseOriginEastingGeoKey:
case ProjFalseOriginNorthingGeoKey: case ProjFalseOriginNorthingGeoKey:
if (!readGeoValue(file, ctx.values, entry.ValueOffset, if (!readGeoValue(file, ctx.values, entry.ValueOffset,
value.DOUBLE)) value.DOUBLE))
@ -307,9 +313,7 @@ const GCS *GeoTIFF::gcs(QMap<quint16, Value> &kv)
if (!(gcs = GCS::gcs(gd, pm, au))) if (!(gcs = GCS::gcs(gd, pm, au)))
_errorString = QString("%1+%2: unknown geodetic datum + prime" _errorString = QString("%1+%2: unknown geodetic datum + prime"
" meridian combination") " meridian combination").arg(gd).arg(pm);
.arg(kv.value(GeogGeodeticDatumGeoKey).SHORT)
.arg(kv.value(GeogPrimeMeridianGeoKey).SHORT);
} else } else
_errorString = "Can not determine GCS"; _errorString = "Can not determine GCS";
@ -401,6 +405,8 @@ bool GeoTIFF::projectedModel(QMap<quint16, Value> &kv)
lon0 = au.toDegrees(kv.value(ProjNatOriginLongGeoKey).DOUBLE); lon0 = au.toDegrees(kv.value(ProjNatOriginLongGeoKey).DOUBLE);
else if (kv.contains(ProjCenterLongGeoKey)) else if (kv.contains(ProjCenterLongGeoKey))
lon0 = au.toDegrees(kv.value(ProjCenterLongGeoKey).DOUBLE); lon0 = au.toDegrees(kv.value(ProjCenterLongGeoKey).DOUBLE);
else if (kv.contains(ProjFalseOriginLongGeoKey))
lon0 = au.toDegrees(kv.value(ProjFalseOriginLongGeoKey).DOUBLE);
else else
lon0 = NAN; lon0 = NAN;
if (kv.contains(ProjScaleAtNatOriginGeoKey)) if (kv.contains(ProjScaleAtNatOriginGeoKey))
@ -423,6 +429,8 @@ bool GeoTIFF::projectedModel(QMap<quint16, Value> &kv)
sp2 = NAN; sp2 = NAN;
if (kv.contains(ProjFalseNorthingGeoKey)) if (kv.contains(ProjFalseNorthingGeoKey))
fn = lu.toMeters(kv.value(ProjFalseNorthingGeoKey).DOUBLE); fn = lu.toMeters(kv.value(ProjFalseNorthingGeoKey).DOUBLE);
else if (kv.contains(ProjCenterNorthingGeoKey))
fn = lu.toMeters(kv.value(ProjCenterNorthingGeoKey).DOUBLE);
else if (kv.contains(ProjFalseOriginNorthingGeoKey)) else if (kv.contains(ProjFalseOriginNorthingGeoKey))
fn = lu.toMeters(kv.value(ProjFalseOriginNorthingGeoKey).DOUBLE); fn = lu.toMeters(kv.value(ProjFalseOriginNorthingGeoKey).DOUBLE);
else else
@ -431,6 +439,8 @@ bool GeoTIFF::projectedModel(QMap<quint16, Value> &kv)
fe = lu.toMeters(kv.value(ProjFalseEastingGeoKey).DOUBLE); fe = lu.toMeters(kv.value(ProjFalseEastingGeoKey).DOUBLE);
else if (kv.contains(ProjCenterEastingGeoKey)) else if (kv.contains(ProjCenterEastingGeoKey))
fe = lu.toMeters(kv.value(ProjCenterEastingGeoKey).DOUBLE); fe = lu.toMeters(kv.value(ProjCenterEastingGeoKey).DOUBLE);
else if (kv.contains(ProjFalseOriginEastingGeoKey))
fe = lu.toMeters(kv.value(ProjFalseOriginEastingGeoKey).DOUBLE);
else else
fe = NAN; fe = NAN;

View File

@ -3,6 +3,8 @@
#include <QFileInfo> #include <QFileInfo>
#include <QPixmapCache> #include <QPixmapCache>
#include "rectd.h" #include "rectd.h"
#include "gcs.h"
#include "pcs.h"
#include "jnxmap.h" #include "jnxmap.h"
@ -82,6 +84,15 @@ bool JNXMap::readTiles()
} }
} }
QByteArray guid;
if (!(readValue(dummy) && readString(guid)))
return false;
/* Use WebMercator projection for nakarte.tk maps */
if (guid == "12345678-1234-1234-1234-123456789ABC")
_projection = Projection(PCS::pcs(3857));
else
_projection = Projection(GCS::gcs(4326));
_zooms = QVector<Zoom>(lh.size()); _zooms = QVector<Zoom>(lh.size());
for (int i = 0; i < lh.count(); i++) { for (int i = 0; i < lh.count(); i++) {
Zoom &z = _zooms[i]; Zoom &z = _zooms[i];
@ -102,8 +113,8 @@ bool JNXMap::readTiles()
&& readValue(tile.offset))) && readValue(tile.offset)))
return false; return false;
RectD rect(PointD(ic2dc(left), ic2dc(top)), PointD(ic2dc(right), RectD rect(_projection.ll2xy(Coordinates(ic2dc(left), ic2dc(top))),
ic2dc(bottom))); _projection.ll2xy(Coordinates(ic2dc(right), ic2dc(bottom))));
if (j == 0) { if (j == 0) {
ReferencePoint tl(PointD(0, 0), rect.topLeft()); ReferencePoint tl(PointD(0, 0), rect.topLeft());
@ -147,24 +158,19 @@ JNXMap::JNXMap(const QString &fileName, QObject *parent)
QPointF JNXMap::ll2xy(const Coordinates &c) QPointF JNXMap::ll2xy(const Coordinates &c)
{ {
const Transform &t = _zooms.at(_zoom).transform; const Zoom &z = _zooms.at(_zoom);
return t.proj2img(PointD(c.lon(), c.lat())); return z.transform.proj2img(_projection.ll2xy(c));
} }
Coordinates JNXMap::xy2ll(const QPointF &p) Coordinates JNXMap::xy2ll(const QPointF &p)
{ {
const Transform &t = _zooms.at(_zoom).transform; const Zoom &z = _zooms.at(_zoom);
PointD pp(t.img2proj(p)); return _projection.xy2ll(z.transform.img2proj(p));
return Coordinates(pp.x(), pp.y());
} }
QRectF JNXMap::bounds() const QRectF JNXMap::bounds()
{ {
const Transform &t = _zooms.at(_zoom).transform; return QRectF(ll2xy(_bounds.topLeft()), ll2xy(_bounds.bottomRight()));
return QRectF(t.proj2img(PointD(_bounds.topLeft().lon(),
_bounds.topLeft().lat())), t.proj2img(PointD(_bounds.bottomRight().lon(),
_bounds.bottomRight().lat())));
} }
int JNXMap::zoomFit(const QSize &size, const RectC &rect) int JNXMap::zoomFit(const QSize &size, const RectC &rect)

View File

@ -6,6 +6,7 @@
#include "common/rtree.h" #include "common/rtree.h"
#include "common/rectc.h" #include "common/rectc.h"
#include "transform.h" #include "transform.h"
#include "projection.h"
#include "map.h" #include "map.h"
class JNXMap : public Map class JNXMap : public Map
@ -16,9 +17,9 @@ public:
public: public:
JNXMap(const QString &fileName, QObject *parent = 0); JNXMap(const QString &fileName, QObject *parent = 0);
const QString &name() const {return _name;} QString name() const {return _name;}
QRectF bounds() const; QRectF bounds();
int zoom() const {return _zoom;} int zoom() const {return _zoom;}
void setZoom(int zoom) {_zoom = zoom;} void setZoom(int zoom) {_zoom = zoom;}
@ -59,6 +60,7 @@ private:
QVector<Zoom> _zooms; QVector<Zoom> _zooms;
int _zoom; int _zoom;
RectC _bounds; RectC _bounds;
Projection _projection;
bool _valid; bool _valid;
QString _errorString; QString _errorString;

View File

@ -4,7 +4,6 @@
#include <QObject> #include <QObject>
#include <QString> #include <QString>
#include <QRectF> #include <QRectF>
#include <QColor>
#include "common/coordinates.h" #include "common/coordinates.h"
class QPainter; class QPainter;
@ -18,9 +17,9 @@ public:
Map(QObject *parent = 0) : QObject(parent) {} Map(QObject *parent = 0) : QObject(parent) {}
virtual ~Map() {} virtual ~Map() {}
virtual const QString &name() const = 0; virtual QString name() const = 0;
virtual QRectF bounds() const = 0; virtual QRectF bounds() = 0;
virtual qreal resolution(const QRectF &rect); virtual qreal resolution(const QRectF &rect);
virtual int zoom() const = 0; virtual int zoom() const = 0;

View File

@ -333,7 +333,7 @@ Coordinates OfflineMap::xy2ll(const QPointF &p)
: _projection.xy2ll(_transform.img2proj(p)); : _projection.xy2ll(_transform.img2proj(p));
} }
QRectF OfflineMap::bounds() const QRectF OfflineMap::bounds()
{ {
return _ozf return _ozf
? QRectF(QPointF(0, 0), _ozf->size(_zoom)) ? QRectF(QPointF(0, 0), _ozf->size(_zoom))

View File

@ -18,9 +18,9 @@ public:
OfflineMap(const QString &fileName, Tar &tar, QObject *parent = 0); OfflineMap(const QString &fileName, Tar &tar, QObject *parent = 0);
~OfflineMap(); ~OfflineMap();
const QString &name() const {return _name;} QString name() const {return _name;}
QRectF bounds() const; QRectF bounds();
int zoom() const {return _zoom;} int zoom() const {return _zoom;}
void setZoom(int zoom) {_zoom = zoom;} void setZoom(int zoom) {_zoom = zoom;}

View File

@ -64,7 +64,7 @@ OnlineMap::OnlineMap(const QString &name, const QString &url,
_valid = true; _valid = true;
} }
QRectF OnlineMap::bounds() const QRectF OnlineMap::bounds()
{ {
return QRectF(ll2xy(_bounds.topLeft()), ll2xy(_bounds.bottomRight())); return QRectF(ll2xy(_bounds.topLeft()), ll2xy(_bounds.bottomRight()));
} }
@ -141,14 +141,14 @@ void OnlineMap::draw(QPainter *painter, const QRectF &rect, bool block)
} }
} }
QPointF OnlineMap::ll2xy(const Coordinates &c) const QPointF OnlineMap::ll2xy(const Coordinates &c)
{ {
qreal scale = zoom2scale(_zoom); qreal scale = zoom2scale(_zoom);
QPointF m = ll2m(c); QPointF m = ll2m(c);
return QPointF(m.x() / scale, m.y() / -scale); return QPointF(m.x() / scale, m.y() / -scale);
} }
Coordinates OnlineMap::xy2ll(const QPointF &p) const Coordinates OnlineMap::xy2ll(const QPointF &p)
{ {
qreal scale = zoom2scale(_zoom); qreal scale = zoom2scale(_zoom);
return m2ll(QPointF(p.x() * scale, -p.y() * scale)); return m2ll(QPointF(p.x() * scale, -p.y() * scale));

View File

@ -15,9 +15,9 @@ public:
const RectC &bounds, const Authorization &authorization, const RectC &bounds, const Authorization &authorization,
QObject *parent = 0); QObject *parent = 0);
const QString &name() const {return _name;} QString name() const {return _name;}
QRectF bounds() const; QRectF bounds();
qreal resolution(const QRectF &rect); qreal resolution(const QRectF &rect);
int zoom() const {return _zoom;} int zoom() const {return _zoom;}
@ -26,10 +26,8 @@ public:
int zoomIn(); int zoomIn();
int zoomOut(); int zoomOut();
QPointF ll2xy(const Coordinates &c) QPointF ll2xy(const Coordinates &c);
{return static_cast<const OnlineMap &>(*this).ll2xy(c);} Coordinates xy2ll(const QPointF &p);
Coordinates xy2ll(const QPointF &p)
{return static_cast<const OnlineMap &>(*this).xy2ll(p);}
void draw(QPainter *painter, const QRectF &rect, bool block); void draw(QPainter *painter, const QRectF &rect, bool block);
@ -39,8 +37,6 @@ public:
QString errorString() const {return _errorString;} QString errorString() const {return _errorString;}
private: private:
QPointF ll2xy(const Coordinates &c) const;
Coordinates xy2ll(const QPointF &p) const;
int limitZoom(int zoom) const; int limitZoom(int zoom) const;
TileLoader *_tileLoader; TileLoader *_tileLoader;

View File

@ -102,7 +102,8 @@ bool WMSMap::loadWMS()
} }
WMSMap::WMSMap(const QString &name, const WMS::Setup &setup, QObject *parent) WMSMap::WMSMap(const QString &name, const WMS::Setup &setup, QObject *parent)
: Map(parent), _name(name), _setup(setup), _zoom(0), _valid(false) : Map(parent), _name(name), _setup(setup), _tileLoader(0), _zoom(0),
_valid(false)
{ {
if (!QDir().mkpath(tilesDir())) { if (!QDir().mkpath(tilesDir())) {
_errorString = "Error creating tiles dir"; _errorString = "Error creating tiles dir";
@ -126,7 +127,7 @@ void WMSMap::clearCache()
qWarning("%s: %s\n", qPrintable(_name), qPrintable(_errorString)); qWarning("%s: %s\n", qPrintable(_name), qPrintable(_errorString));
} }
QRectF WMSMap::bounds() const QRectF WMSMap::bounds()
{ {
return QRectF(_transform.proj2img(_bbox.topLeft()), return QRectF(_transform.proj2img(_bbox.topLeft()),
_transform.proj2img(_bbox.bottomRight())); _transform.proj2img(_bbox.bottomRight()));

View File

@ -16,9 +16,9 @@ class WMSMap : public Map
public: public:
WMSMap(const QString &name, const WMS::Setup &setup, QObject *parent = 0); WMSMap(const QString &name, const WMS::Setup &setup, QObject *parent = 0);
const QString &name() const {return _name;} QString name() const {return _name;}
QRectF bounds() const; QRectF bounds();
int zoom() const {return _zoom;} int zoom() const {return _zoom;}
void setZoom(int zoom); void setZoom(int zoom);

View File

@ -36,7 +36,8 @@ bool WMTSMap::loadWMTS()
} }
WMTSMap::WMTSMap(const QString &name, const WMTS::Setup &setup, QObject *parent) WMTSMap::WMTSMap(const QString &name, const WMTS::Setup &setup, QObject *parent)
: Map(parent), _name(name), _setup(setup), _zoom(0), _valid(false) : Map(parent), _name(name), _setup(setup), _tileLoader(0), _zoom(0),
_valid(false)
{ {
if (!QDir().mkpath(tilesDir())) { if (!QDir().mkpath(tilesDir())) {
_errorString = "Error creating tiles dir"; _errorString = "Error creating tiles dir";
@ -90,7 +91,7 @@ void WMTSMap::updateTransform()
_transform = Transform(tl, br); _transform = Transform(tl, br);
} }
QRectF WMTSMap::bounds() const QRectF WMTSMap::bounds()
{ {
const WMTS::Zoom &z = _zooms.at(_zoom); const WMTS::Zoom &z = _zooms.at(_zoom);
QRectF tileBounds, bounds; QRectF tileBounds, bounds;
@ -178,12 +179,12 @@ void WMTSMap::draw(QPainter *painter, const QRectF &rect, bool block)
} }
} }
QPointF WMTSMap::ll2xy(const Coordinates &c) const QPointF WMTSMap::ll2xy(const Coordinates &c)
{ {
return _transform.proj2img(_projection.ll2xy(c)); return _transform.proj2img(_projection.ll2xy(c));
} }
Coordinates WMTSMap::xy2ll(const QPointF &p) const Coordinates WMTSMap::xy2ll(const QPointF &p)
{ {
return _projection.xy2ll(_transform.img2proj(p)); return _projection.xy2ll(_transform.img2proj(p));
} }

View File

@ -15,9 +15,9 @@ class WMTSMap : public Map
public: public:
WMTSMap(const QString &name, const WMTS::Setup &setup, QObject *parent = 0); WMTSMap(const QString &name, const WMTS::Setup &setup, QObject *parent = 0);
const QString &name() const {return _name;} QString name() const {return _name;}
QRectF bounds() const; QRectF bounds();
int zoom() const {return _zoom;} int zoom() const {return _zoom;}
void setZoom(int zoom); void setZoom(int zoom);
@ -25,10 +25,8 @@ public:
int zoomIn(); int zoomIn();
int zoomOut(); int zoomOut();
QPointF ll2xy(const Coordinates &c) QPointF ll2xy(const Coordinates &c);
{return static_cast<const WMTSMap &>(*this).ll2xy(c);} Coordinates xy2ll(const QPointF &p);
Coordinates xy2ll(const QPointF &p)
{return static_cast<const WMTSMap &>(*this).xy2ll(p);}
void draw(QPainter *painter, const QRectF &rect, bool block); void draw(QPainter *painter, const QRectF &rect, bool block);
@ -43,9 +41,6 @@ private:
QString tilesDir() const; QString tilesDir() const;
void updateTransform(); void updateTransform();
QPointF ll2xy(const Coordinates &c) const;
Coordinates xy2ll(const QPointF &p) const;
QString _name; QString _name;
WMTS::Setup _setup; WMTS::Setup _setup;
TileLoader *_tileLoader; TileLoader *_tileLoader;