root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-07-08 00:04:27 +02:00
Code Issues Projects Releases Activity

Compare commits

base: root:4.11
Branches Tags
root:master root:android-latest root:gh-pages
root:13.44 root:13.43 root:13.42 root:13.41 root:13.40 root:13.39 root:13.38 root:13.37 root:13.36 root:13.35 root:13.34 root:13.33 root:13.32 root:13.31 root:13.30 root:13.29 root:13.28 root:13.27 root:13.26 root:13.25 root:13.24 root:13.23 root:13.22 root:13.21 root:13.20 root:13.19 root:13.18 root:13.17 root:13.16 root:13.15 root:13.14 root:13.13 root:13.12 root:13.11 root:13.10 root:13.9 root:13.8 root:13.7 root:13.6 root:13.5 root:13.4 root:13.3 root:13.2 root:13.1 root:13.0 root:12.4 root:12.3 root:12.2 root:12.1 root:12.0 root:11.12 root:11.11 root:11.10 root:11.9 root:11.8 root:11.7 root:11.6 root:11.5 root:11.4 root:11.3 root:11.2 root:11.1 root:11.0 root:10.7 root:10.6 root:10.5 root:10.4 root:10.3 root:10.2 root:10.1 root:10.0 root:9.12 root:9.11 root:9.10 root:9.9 root:9.8 root:9.7 root:9.6 root:9.5 root:9.4 root:9.3 root:9.2 root:9.1 root:9.0 root:8.9 root:8.8 root:8.7 root:8.6 root:8.5 root:8.4 root:8.3 root:8.2 root:8.1 root:8.0 root:7.38 root:7.37 root:7.36 root:7.35 root:7.34 root:7.33 root:7.32 root:7.31 root:7.30 root:7.29 root:7.28 root:7.27 root:7.26 root:7.25 root:7.24 root:7.23 root:7.22 root:7.21 root:7.20 root:7.19 root:7.18 root:7.17 root:7.16 root:7.15 root:7.14 root:7.13 root:7.12 root:7.11 root:7.10 root:7.9 root:7.8 root:7.7 root:7.6 root:7.5 root:7.4 root:7.3 root:7.2 root:7.1 root:7.0 root:6.3 root:6.2 root:6.1 root:6.0 root:5.18 root:5.17 root:5.16 root:5.15 root:5.14 root:5.13 root:5.12 root:5.11 root:5.10 root:5.9 root:5.8 root:5.7 root:5.6 root:5.5 root:5.4 root:5.3 root:5.2 root:5.1 root:5.0 root:4.19 root:4.18 root:4.17 root:4.16 root:4.15 root:4.14 root:4.13 root:4.12 root:4.11 root:4.10 root:4.9 root:4.8 root:4.7 root:4.6 root:4.5 root:4.4 root:4.3 root:4.2 root:4.1 root:4.0 root:3.10 root:3.9 root:3.8 root:3.7 root:3.6 root:3.5 root:3.4 root:3.3 root:3.2 root:3.1 root:3.0 root:2.20 root:2.19 root:2.18 root:2.17 root:2.16 root:2.15 root:2.14 root:2.13 root:2.12 root:2.11 root:2.10 root:2.9 root:2.8 root:2.7 root:2.6 root:2.5 root:2.4 root:2.3 root:2.2 root:2.1 root:2.0 root:1.1 root:1.0
...
compare: root:4.12
Branches Tags
root:master root:android-latest root:gh-pages
root:13.44 root:13.43 root:13.42 root:13.41 root:13.40 root:13.39 root:13.38 root:13.37 root:13.36 root:13.35 root:13.34 root:13.33 root:13.32 root:13.31 root:13.30 root:13.29 root:13.28 root:13.27 root:13.26 root:13.25 root:13.24 root:13.23 root:13.22 root:13.21 root:13.20 root:13.19 root:13.18 root:13.17 root:13.16 root:13.15 root:13.14 root:13.13 root:13.12 root:13.11 root:13.10 root:13.9 root:13.8 root:13.7 root:13.6 root:13.5 root:13.4 root:13.3 root:13.2 root:13.1 root:13.0 root:12.4 root:12.3 root:12.2 root:12.1 root:12.0 root:11.12 root:11.11 root:11.10 root:11.9 root:11.8 root:11.7 root:11.6 root:11.5 root:11.4 root:11.3 root:11.2 root:11.1 root:11.0 root:10.7 root:10.6 root:10.5 root:10.4 root:10.3 root:10.2 root:10.1 root:10.0 root:9.12 root:9.11 root:9.10 root:9.9 root:9.8 root:9.7 root:9.6 root:9.5 root:9.4 root:9.3 root:9.2 root:9.1 root:9.0 root:8.9 root:8.8 root:8.7 root:8.6 root:8.5 root:8.4 root:8.3 root:8.2 root:8.1 root:8.0 root:7.38 root:7.37 root:7.36 root:7.35 root:7.34 root:7.33 root:7.32 root:7.31 root:7.30 root:7.29 root:7.28 root:7.27 root:7.26 root:7.25 root:7.24 root:7.23 root:7.22 root:7.21 root:7.20 root:7.19 root:7.18 root:7.17 root:7.16 root:7.15 root:7.14 root:7.13 root:7.12 root:7.11 root:7.10 root:7.9 root:7.8 root:7.7 root:7.6 root:7.5 root:7.4 root:7.3 root:7.2 root:7.1 root:7.0 root:6.3 root:6.2 root:6.1 root:6.0 root:5.18 root:5.17 root:5.16 root:5.15 root:5.14 root:5.13 root:5.12 root:5.11 root:5.10 root:5.9 root:5.8 root:5.7 root:5.6 root:5.5 root:5.4 root:5.3 root:5.2 root:5.1 root:5.0 root:4.19 root:4.18 root:4.17 root:4.16 root:4.15 root:4.14 root:4.13 root:4.12 root:4.11 root:4.10 root:4.9 root:4.8 root:4.7 root:4.6 root:4.5 root:4.4 root:4.3 root:4.2 root:4.1 root:4.0 root:3.10 root:3.9 root:3.8 root:3.7 root:3.6 root:3.5 root:3.4 root:3.3 root:3.2 root:3.1 root:3.0 root:2.20 root:2.19 root:2.18 root:2.17 root:2.16 root:2.15 root:2.14 root:2.13 root:2.12 root:2.11 root:2.10 root:2.9 root:2.8 root:2.7 root:2.6 root:2.5 root:2.4 root:2.3 root:2.2 root:2.1 root:2.0 root:1.1 root:1.0

15 Commits
4.11 ... 4.12

Author SHA1 Message Date
Martin Tůma
ef3da2e156 Removed obsolete Windows XP bug workaround 2017-08-24 21:04:01 +02:00
Martin Tůma
6e13c2b704 Translations update 2017-08-24 19:40:52 +02:00
Martin Tůma
f3e4719439 Added map opacity (brightness) settings 2017-08-24 17:29:59 +02:00
Martin Tůma
7b6789e78d Version++ 2017-08-23 15:42:00 +02:00
Martin Tůma
95442461fc Added 4UMaps to map sources 2017-08-23 15:41:23 +02:00
Martin Tůma
729cbd641c Added support for the VICGRID and VICGRID94 projections 2017-08-23 10:46:28 +02:00
Martin Tůma
2e2dad8d04 Fixed broken xy2ll computation on southern hemispheres 2017-08-23 10:45:23 +02:00
Martin Tůma
4e3b6c2eb2 Added missing error check 2017-08-22 23:14:32 +02:00
Martin Tůma
6430933a96 Use the (incorrect) scale factor of 1 in France zone projections like OziExplorer does 2017-08-22 22:59:59 +02:00
Martin Tůma
3e14d4afda Added France Zone I-IV projections support 2017-08-22 19:03:35 +02:00
Martin Tůma
ebb30a3fca Made OZF3 files parsing more robust. 2017-08-22 15:57:37 +02:00
Martin Tůma
bd20d40ba7 Fixed content margin computation. 
Code cleanup.
 2017-08-20 10:49:58 +02:00
Martin Tůma
77823fba14 Added missing newlines 2017-08-15 15:58:23 +02:00
Martin Tůma
dcc5cbe9bc Added appveyor build config 2017-08-15 15:49:28 +02:00
Martin Tůma
cd3c99b065 Added QT4 Travis CI build config 2017-08-15 15:42:47 +02:00
21 changed files with 478 additions and 253 deletions
Expand all files Collapse all files

52
.appveyor.yml Normal file
View File

@ -0,0 +1,52 @@
version: 4.12.{build}
configuration: Release
platform: Any CPU
environment:
NSISDIR: C:\Program Files (x86)\NSIS
matrix:
- QTDIR: C:\Qt\5.9\msvc2015
PLATFORM: x86
NSI: gpxsee.nsi
OPENSSLDIR: C:\OpenSSL-Win32\bin
- QTDIR: C:\Qt\5.9\msvc2015_64
PLATFORM: x86_amd64
NSI: gpxsee64.nsi
OPENSSLDIR: C:\OpenSSL-Win64\bin
install:
- cmd: >-
set PATH=%QTDIR%\bin;%NSISDIR%;%PATH%
call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %PLATFORM%
build_script:
- cmd: >-
lrelease gpxsee.pro
qmake gpxsee.pro
nmake release
md installer
copy release\GPXSee.exe installer
windeployqt --no-svg --release installer\GPXSee.exe
copy pkg\%NSI% installer
copy pkg\datums.csv installer
copy pkg\ellipsoids.csv installer
copy pkg\maps.txt installer
copy licence.txt installer
copy %OPENSSLDIR%\libeay32.dll installer
copy %OPENSSLDIR%\ssleay32.dll installer
makensis.exe installer\%NSI%
artifacts:
- path: installer\GPXSee-*.exe

9
.travis.yml Normal file
View File

@ -0,0 +1,9 @@
language: c++
install:
- sudo apt-get install libqt4-dev
script:
- lrelease gpxsee.pro
- qmake gpxsee.pro
- make

8
gpxsee.pro
View File

@ -1,5 +1,5 @@
TARGET = GPXSee TARGET = GPXSee
VERSION = 4.11 VERSION = 4.12
QT += core \ QT += core \
gui \ gui \
network network
@ -96,7 +96,8 @@ HEADERS += src/config.h \
src/albersequal.h \ src/albersequal.h \
src/oddspinbox.h \ src/oddspinbox.h \
src/rectc.h \ src/rectc.h \
src/searchpointer.h src/searchpointer.h \
src/percentslider.h
SOURCES += src/main.cpp \ SOURCES += src/main.cpp \
src/gui.cpp \ src/gui.cpp \
src/poi.cpp \ src/poi.cpp \
@ -165,7 +166,8 @@ SOURCES += src/main.cpp \
src/maplist.cpp \ src/maplist.cpp \
src/albersequal.cpp \ src/albersequal.cpp \
src/oddspinbox.cpp \ src/oddspinbox.cpp \
src/rectc.cpp src/rectc.cpp \
src/percentslider.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 \

141
lang/gpxsee_cs.ts
View File

@ -386,7 +386,7 @@
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="443"/> <location filename="../src/gui.cpp" line="443"/>
<location filename="../src/gui.cpp" line="1006"/> <location filename="../src/gui.cpp" line="1008"/>
<source>Moving time</source> <source>Moving time</source>
<translation>Čistý čas</translation> <translation>Čistý čas</translation>
</message> </message>
@ -526,33 +526,33 @@
<translation>Offline mapy jsou načítány při startu aplikace z následujícího adresáře:</translation> <translation>Offline mapy jsou načítány při startu aplikace z následujícího adresáře:</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="1197"/> <location filename="../src/gui.cpp" line="1199"/>
<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.cpp" line="1233"/> <location filename="../src/gui.cpp" line="1235"/>
<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.cpp" line="992"/> <location filename="../src/gui.cpp" line="994"/>
<location filename="../src/gui.cpp" line="995"/> <location filename="../src/gui.cpp" line="997"/>
<source>Date</source> <source>Date</source>
<translation>Datum</translation> <translation>Datum</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="984"/> <location filename="../src/gui.cpp" line="986"/>
<source>Routes</source> <source>Routes</source>
<translation>Trasy</translation> <translation>Trasy</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="1218"/> <location filename="../src/gui.cpp" line="1220"/>
<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.cpp" line="1237"/> <location filename="../src/gui.cpp" line="1239"/>
<source>%n files</source> <source>%n files</source>
<translation> <translation>
<numerusform>%n soubor</numerusform> <numerusform>%n soubor</numerusform>
@ -581,7 +581,7 @@
<translation>Exportovat do PDF...</translation> <translation>Exportovat do PDF...</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="986"/> <location filename="../src/gui.cpp" line="988"/>
<source>Waypoints</source> <source>Waypoints</source>
<translation>Navigační body</translation> <translation>Navigační body</translation>
</message> </message>
@ -642,12 +642,12 @@
<translation>Soubor POI nelze načíst:</translation> <translation>Soubor POI nelze načíst:</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="978"/> <location filename="../src/gui.cpp" line="980"/>
<source>Name</source> <source>Name</source>
<translation>Název</translation> <translation>Název</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="982"/> <location filename="../src/gui.cpp" line="984"/>
<source>Tracks</source> <source>Tracks</source>
<translation>Cesty</translation> <translation>Cesty</translation>
</message> </message>
@ -669,14 +669,14 @@
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="412"/> <location filename="../src/gui.cpp" line="412"/>
<location filename="../src/gui.cpp" line="1002"/> <location filename="../src/gui.cpp" line="1004"/>
<source>Distance</source> <source>Distance</source>
<translation>Vzdálenost</translation> <translation>Vzdálenost</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="419"/> <location filename="../src/gui.cpp" line="419"/>
<location filename="../src/gui.cpp" line="543"/> <location filename="../src/gui.cpp" line="543"/>
<location filename="../src/gui.cpp" line="1004"/> <location filename="../src/gui.cpp" line="1006"/>
<source>Time</source> <source>Time</source>
<translation>Čas</translation> <translation>Čas</translation>
</message> </message>
@ -780,246 +780,257 @@
<translation>Posun palety:</translation> <translation>Posun palety:</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="49"/> <location filename="../src/optionsdialog.cpp" line="75"/>
<source>Track width:</source> <source>Track width:</source>
<translation>Šířka cest:</translation> <translation>Šířka cest:</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="50"/> <location filename="../src/optionsdialog.cpp" line="76"/>
<source>Track style:</source> <source>Track style:</source>
<translation>Styl cest:</translation> <translation>Styl cest:</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="52"/> <location filename="../src/optionsdialog.cpp" line="78"/>
<source>Tracks</source> <source>Tracks</source>
<translation>Cesty</translation> <translation>Cesty</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="62"/> <location filename="../src/optionsdialog.cpp" line="88"/>
<source>Route width:</source> <source>Route width:</source>
<translation>Šířka tras:</translation> <translation>Šířka tras:</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="63"/> <location filename="../src/optionsdialog.cpp" line="89"/>
<source>Route style:</source> <source>Route style:</source>
<translation>Styl tras:</translation> <translation>Styl tras:</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="65"/> <location filename="../src/optionsdialog.cpp" line="91"/>
<source>Routes</source> <source>Routes</source>
<translation>Trasy</translation> <translation>Trasy</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="69"/> <location filename="../src/optionsdialog.cpp" line="95"/>
<location filename="../src/optionsdialog.cpp" line="102"/> <location filename="../src/optionsdialog.cpp" line="128"/>
<source>Use anti-aliasing</source> <source>Use anti-aliasing</source>
<translation>Vyhlazovat hrany</translation> <translation>Vyhlazovat hrany</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="100"/> <location filename="../src/optionsdialog.cpp" line="126"/>
<source>Line width:</source> <source>Line width:</source>
<translation>Šířka čar:</translation> <translation>Šířka čar:</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="116"/> <location filename="../src/optionsdialog.cpp" line="142"/>
<source>Colors</source> <source>Colors</source>
<translation>Barvy</translation> <translation>Barvy</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="117"/> <location filename="../src/optionsdialog.cpp" line="39"/>
<location filename="../src/optionsdialog.cpp" line="143"/>
<source>Paths</source> <source>Paths</source>
<translation>Trasy</translation> <translation>Trasy</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="118"/> <location filename="../src/optionsdialog.cpp" line="46"/>
<location filename="../src/optionsdialog.cpp" line="278"/> <source>Map opacity:</source>
<translation>Neprůhlednost mapy:</translation>
</message>
<message>
<location filename="../src/optionsdialog.cpp" line="48"/>
<source>Map</source>
<translation>Mapa</translation>
</message>
<message>
<location filename="../src/optionsdialog.cpp" line="144"/>
<location filename="../src/optionsdialog.cpp" line="304"/>
<source>Graphs</source> <source>Graphs</source>
<translation>Grafy</translation> <translation>Grafy</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="125"/> <location filename="../src/optionsdialog.cpp" line="151"/>
<source>Moving average window size</source> <source>Moving average window size</source>
<translation>Velikost okna klouzavého průměru</translation> <translation>Velikost okna klouzavého průměru</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="144"/> <location filename="../src/optionsdialog.cpp" line="170"/>
<source>Elevation:</source> <source>Elevation:</source>
<translation>Výška:</translation> <translation>Výška:</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="145"/> <location filename="../src/optionsdialog.cpp" line="171"/>
<source>Speed:</source> <source>Speed:</source>
<translation>Rychlost:</translation> <translation>Rychlost:</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="146"/> <location filename="../src/optionsdialog.cpp" line="172"/>
<source>Heart rate:</source> <source>Heart rate:</source>
<translation>Tep:</translation> <translation>Tep:</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="147"/> <location filename="../src/optionsdialog.cpp" line="173"/>
<source>Cadence:</source> <source>Cadence:</source>
<translation>Kadence:</translation> <translation>Kadence:</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="148"/> <location filename="../src/optionsdialog.cpp" line="174"/>
<source>Power:</source> <source>Power:</source>
<translation>Výkon:</translation> <translation>Výkon:</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="150"/> <location filename="../src/optionsdialog.cpp" line="176"/>
<source>Smoothing</source> <source>Smoothing</source>
<translation>Vyhlazování</translation> <translation>Vyhlazování</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="154"/> <location filename="../src/optionsdialog.cpp" line="180"/>
<source>Eliminate GPS outliers</source> <source>Eliminate GPS outliers</source>
<translation>Odstarnit odlehlé GPS záznamy</translation> <translation>Odstarnit odlehlé GPS záznamy</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="160"/> <location filename="../src/optionsdialog.cpp" line="186"/>
<source>Outlier elimination</source> <source>Outlier elimination</source>
<translation>Odstranění odlehlých hodnot</translation> <translation>Odstranění odlehlých hodnot</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="167"/> <location filename="../src/optionsdialog.cpp" line="193"/>
<source>Smoothing:</source> <source>Smoothing:</source>
<translation>Vyhlazování:</translation> <translation>Vyhlazování:</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="190"/> <location filename="../src/optionsdialog.cpp" line="216"/>
<source>mi/h</source> <source>mi/h</source>
<translation>mi/h</translation> <translation>mi/h</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="193"/> <location filename="../src/optionsdialog.cpp" line="219"/>
<source>km/h</source> <source>km/h</source>
<translation>km/h</translation> <translation>km/h</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="197"/> <location filename="../src/optionsdialog.cpp" line="223"/>
<source>s</source> <source>s</source>
<translation>s</translation> <translation>s</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="201"/> <location filename="../src/optionsdialog.cpp" line="227"/>
<source>Minimal speed:</source> <source>Minimal speed:</source>
<translation>Minimální rychlost:</translation> <translation>Minimální rychlost:</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="202"/> <location filename="../src/optionsdialog.cpp" line="228"/>
<source>Minimal duration:</source> <source>Minimal duration:</source>
<translation>Minimální doba trvání:</translation> <translation>Minimální doba trvání:</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="209"/> <location filename="../src/optionsdialog.cpp" line="235"/>
<source>Filtering</source> <source>Filtering</source>
<translation>Filtrování</translation> <translation>Filtrování</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="210"/> <location filename="../src/optionsdialog.cpp" line="236"/>
<source>Pause detection</source> <source>Pause detection</source>
<translation>Detekce přestávek</translation> <translation>Detekce přestávek</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="222"/> <location filename="../src/optionsdialog.cpp" line="248"/>
<source>mi</source> <source>mi</source>
<translation>mi</translation> <translation>mi</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="225"/> <location filename="../src/optionsdialog.cpp" line="251"/>
<source>km</source> <source>km</source>
<translation>km</translation> <translation>km</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="229"/> <location filename="../src/optionsdialog.cpp" line="255"/>
<source>POI radius:</source> <source>POI radius:</source>
<translation>POI radius:</translation> <translation>POI radius:</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="235"/> <location filename="../src/optionsdialog.cpp" line="261"/>
<location filename="../src/optionsdialog.cpp" line="334"/> <location filename="../src/optionsdialog.cpp" line="360"/>
<source>POI</source> <source>POI</source>
<translation>POI</translation> <translation>POI</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="242"/> <location filename="../src/optionsdialog.cpp" line="268"/>
<source>Name</source> <source>Name</source>
<translation>Název</translation> <translation>Název</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="244"/> <location filename="../src/optionsdialog.cpp" line="270"/>
<source>Date</source> <source>Date</source>
<translation>Datum</translation> <translation>Datum</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="246"/> <location filename="../src/optionsdialog.cpp" line="272"/>
<source>Distance</source> <source>Distance</source>
<translation>Vzdálenost</translation> <translation>Vzdálenost</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="248"/> <location filename="../src/optionsdialog.cpp" line="274"/>
<source>Time</source> <source>Time</source>
<translation>Čas</translation> <translation>Čas</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="250"/> <location filename="../src/optionsdialog.cpp" line="276"/>
<source>Moving time</source> <source>Moving time</source>
<translation>Čistý čas</translation> <translation>Čistý čas</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="252"/> <location filename="../src/optionsdialog.cpp" line="278"/>
<source>Item count (&gt;1)</source> <source>Item count (&gt;1)</source>
<translation>Počet objektů (&gt;1)</translation> <translation>Počet objektů (&gt;1)</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="267"/> <location filename="../src/optionsdialog.cpp" line="293"/>
<source>Separate graph page</source> <source>Separate graph page</source>
<translation>Samostatná stránka s grafy</translation> <translation>Samostatná stránka s grafy</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="277"/> <location filename="../src/optionsdialog.cpp" line="303"/>
<source>Header</source> <source>Header</source>
<translation>Záhlaví</translation> <translation>Záhlaví</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="285"/> <location filename="../src/optionsdialog.cpp" line="311"/>
<source>Use OpenGL</source> <source>Use OpenGL</source>
<translation>Používat OpenGL</translation> <translation>Používat OpenGL</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="297"/> <location filename="../src/optionsdialog.cpp" line="323"/>
<source>MB</source> <source>MB</source>
<translation>MB</translation> <translation>MB</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="301"/> <location filename="../src/optionsdialog.cpp" line="327"/>
<source>Image cache size:</source> <source>Image cache size:</source>
<translation>Mezipaměť obrázků:</translation> <translation>Mezipaměť obrázků:</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="314"/> <location filename="../src/optionsdialog.cpp" line="340"/>
<location filename="../src/optionsdialog.cpp" line="337"/> <location filename="../src/optionsdialog.cpp" line="363"/>
<source>System</source> <source>System</source>
<translation>Systém</translation> <translation>Systém</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="331"/> <location filename="../src/optionsdialog.cpp" line="357"/>
<source>Appearance</source> <source>Appearance</source>
<translation>Vzhled</translation> <translation>Vzhled</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="333"/> <location filename="../src/optionsdialog.cpp" line="359"/>
<source>Data</source> <source>Data</source>
<translation>Data</translation> <translation>Data</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="335"/> <location filename="../src/optionsdialog.cpp" line="361"/>
<source>Print &amp; Export</source> <source>Print &amp; Export</source>
<translation>Tisk a export</translation> <translation>Tisk a export</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="364"/> <location filename="../src/optionsdialog.cpp" line="390"/>
<source>Options</source> <source>Options</source>
<translation>Nastavení</translation> <translation>Nastavení</translation>
</message> </message>

143
lang/gpxsee_de.ts
View File

@ -386,7 +386,7 @@
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="443"/> <location filename="../src/gui.cpp" line="443"/>
<location filename="../src/gui.cpp" line="1006"/> <location filename="../src/gui.cpp" line="1008"/>
<source>Moving time</source> <source>Moving time</source>
<translation>Bewegungszeit</translation> <translation>Bewegungszeit</translation>
</message> </message>
@ -531,22 +531,22 @@
<translation>Offlinekarten werden zu Programmstart aus dem folgenden Verzeichnis geladen:</translation> <translation>Offlinekarten werden zu Programmstart aus dem folgenden Verzeichnis geladen:</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="1197"/> <location filename="../src/gui.cpp" line="1199"/>
<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.cpp" line="1218"/> <location filename="../src/gui.cpp" line="1220"/>
<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.cpp" line="1233"/> <location filename="../src/gui.cpp" line="1235"/>
<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.cpp" line="1237"/> <location filename="../src/gui.cpp" line="1239"/>
<source>%n files</source> <source>%n files</source>
<translation> <translation>
<numerusform>%n Datei</numerusform> <numerusform>%n Datei</numerusform>
@ -554,13 +554,13 @@
</translation> </translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="992"/> <location filename="../src/gui.cpp" line="994"/>
<location filename="../src/gui.cpp" line="995"/> <location filename="../src/gui.cpp" line="997"/>
<source>Date</source> <source>Date</source>
<translation>Datum</translation> <translation>Datum</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="984"/> <location filename="../src/gui.cpp" line="986"/>
<source>Routes</source> <source>Routes</source>
<translation>Routen</translation> <translation>Routen</translation>
</message> </message>
@ -585,7 +585,7 @@
<translation>Als PDF exportieren...</translation> <translation>Als PDF exportieren...</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="986"/> <location filename="../src/gui.cpp" line="988"/>
<source>Waypoints</source> <source>Waypoints</source>
<translation>Wegpunkte</translation> <translation>Wegpunkte</translation>
</message> </message>
@ -641,12 +641,12 @@
<translation>Fehler beim Laden der POI-Datei:</translation> <translation>Fehler beim Laden der POI-Datei:</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="978"/> <location filename="../src/gui.cpp" line="980"/>
<source>Name</source> <source>Name</source>
<translation>Name</translation> <translation>Name</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="982"/> <location filename="../src/gui.cpp" line="984"/>
<source>Tracks</source> <source>Tracks</source>
<translation>Strecken</translation> <translation>Strecken</translation>
</message> </message>
@ -668,14 +668,14 @@
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="412"/> <location filename="../src/gui.cpp" line="412"/>
<location filename="../src/gui.cpp" line="1002"/> <location filename="../src/gui.cpp" line="1004"/>
<source>Distance</source> <source>Distance</source>
<translation>Distanz</translation> <translation>Distanz</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="419"/> <location filename="../src/gui.cpp" line="419"/>
<location filename="../src/gui.cpp" line="543"/> <location filename="../src/gui.cpp" line="543"/>
<location filename="../src/gui.cpp" line="1004"/> <location filename="../src/gui.cpp" line="1006"/>
<source>Time</source> <source>Time</source>
<translation>Zeit</translation> <translation>Zeit</translation>
</message> </message>
@ -763,7 +763,7 @@
<message> <message>
<location filename="../src/maplist.cpp" line="128"/> <location filename="../src/maplist.cpp" line="128"/>
<source>URL list files (*.txt)</source> <source>URL list files (*.txt)</source>
<translation type="unfinished"></translation> <translation>URL-Liste Dateien (*.txt)</translation>
</message> </message>
</context> </context>
<context> <context>
@ -779,246 +779,257 @@
<translation>Palettenverschiebung:</translation> <translation>Palettenverschiebung:</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="49"/> <location filename="../src/optionsdialog.cpp" line="75"/>
<source>Track width:</source> <source>Track width:</source>
<translation>Streckenbreite:</translation> <translation>Streckenbreite:</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="50"/> <location filename="../src/optionsdialog.cpp" line="76"/>
<source>Track style:</source> <source>Track style:</source>
<translation>Streckenstil:</translation> <translation>Streckenstil:</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="52"/> <location filename="../src/optionsdialog.cpp" line="78"/>
<source>Tracks</source> <source>Tracks</source>
<translation>Strecken</translation> <translation>Strecken</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="62"/> <location filename="../src/optionsdialog.cpp" line="88"/>
<source>Route width:</source> <source>Route width:</source>
<translation>Routenbreite:</translation> <translation>Routenbreite:</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="63"/> <location filename="../src/optionsdialog.cpp" line="89"/>
<source>Route style:</source> <source>Route style:</source>
<translation>Routenstil:</translation> <translation>Routenstil:</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="65"/> <location filename="../src/optionsdialog.cpp" line="91"/>
<source>Routes</source> <source>Routes</source>
<translation>Routen</translation> <translation>Routen</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="69"/> <location filename="../src/optionsdialog.cpp" line="95"/>
<location filename="../src/optionsdialog.cpp" line="102"/> <location filename="../src/optionsdialog.cpp" line="128"/>
<source>Use anti-aliasing</source> <source>Use anti-aliasing</source>
<translation>Anti-Aliasing verwenden</translation> <translation>Anti-Aliasing verwenden</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="100"/> <location filename="../src/optionsdialog.cpp" line="126"/>
<source>Line width:</source> <source>Line width:</source>
<translation>Linienbreite:</translation> <translation>Linienbreite:</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="116"/> <location filename="../src/optionsdialog.cpp" line="142"/>
<source>Colors</source> <source>Colors</source>
<translation>Farben</translation> <translation>Farben</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="117"/> <location filename="../src/optionsdialog.cpp" line="39"/>
<location filename="../src/optionsdialog.cpp" line="143"/>
<source>Paths</source> <source>Paths</source>
<translation>Pfade</translation> <translation>Pfade</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="118"/> <location filename="../src/optionsdialog.cpp" line="46"/>
<location filename="../src/optionsdialog.cpp" line="278"/> <source>Map opacity:</source>
<translation>Karte Deckkraft:</translation>
</message>
<message>
<location filename="../src/optionsdialog.cpp" line="48"/>
<source>Map</source>
<translation>Karte</translation>
</message>
<message>
<location filename="../src/optionsdialog.cpp" line="144"/>
<location filename="../src/optionsdialog.cpp" line="304"/>
<source>Graphs</source> <source>Graphs</source>
<translation>Graphen</translation> <translation>Graphen</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="125"/> <location filename="../src/optionsdialog.cpp" line="151"/>
<source>Moving average window size</source> <source>Moving average window size</source>
<translation>Fensterbreite des gleitenden Mittelwerts</translation> <translation>Fensterbreite des gleitenden Mittelwerts</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="144"/> <location filename="../src/optionsdialog.cpp" line="170"/>
<source>Elevation:</source> <source>Elevation:</source>
<translation>Höhe:</translation> <translation>Höhe:</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="145"/> <location filename="../src/optionsdialog.cpp" line="171"/>
<source>Speed:</source> <source>Speed:</source>
<translation>Geschwindigkeit:</translation> <translation>Geschwindigkeit:</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="146"/> <location filename="../src/optionsdialog.cpp" line="172"/>
<source>Heart rate:</source> <source>Heart rate:</source>
<translation>Herzfrequenz:</translation> <translation>Herzfrequenz:</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="147"/> <location filename="../src/optionsdialog.cpp" line="173"/>
<source>Cadence:</source> <source>Cadence:</source>
<translation>Frequenz:</translation> <translation>Frequenz:</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="148"/> <location filename="../src/optionsdialog.cpp" line="174"/>
<source>Power:</source> <source>Power:</source>
<translation>Leistung:</translation> <translation>Leistung:</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="150"/> <location filename="../src/optionsdialog.cpp" line="176"/>
<source>Smoothing</source> <source>Smoothing</source>
<translation>Glätten</translation> <translation>Glätten</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="154"/> <location filename="../src/optionsdialog.cpp" line="180"/>
<source>Eliminate GPS outliers</source> <source>Eliminate GPS outliers</source>
<translation>GPS Ausreißer entfernen</translation> <translation>GPS Ausreißer entfernen</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="160"/> <location filename="../src/optionsdialog.cpp" line="186"/>
<source>Outlier elimination</source> <source>Outlier elimination</source>
<translation>Ausreißer Entfernung</translation> <translation>Ausreißer Entfernung</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="167"/> <location filename="../src/optionsdialog.cpp" line="193"/>
<source>Smoothing:</source> <source>Smoothing:</source>
<translation>Glätten:</translation> <translation>Glätten:</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="190"/> <location filename="../src/optionsdialog.cpp" line="216"/>
<source>mi/h</source> <source>mi/h</source>
<translation>mi/h</translation> <translation>mi/h</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="193"/> <location filename="../src/optionsdialog.cpp" line="219"/>
<source>km/h</source> <source>km/h</source>
<translation>km/h</translation> <translation>km/h</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="197"/> <location filename="../src/optionsdialog.cpp" line="223"/>
<source>s</source> <source>s</source>
<translation>sek</translation> <translation>sek</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="201"/> <location filename="../src/optionsdialog.cpp" line="227"/>
<source>Minimal speed:</source> <source>Minimal speed:</source>
<translation>Minimale Geschwindigkeit:</translation> <translation>Minimale Geschwindigkeit:</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="202"/> <location filename="../src/optionsdialog.cpp" line="228"/>
<source>Minimal duration:</source> <source>Minimal duration:</source>
<translation>Minimale Dauer:</translation> <translation>Minimale Dauer:</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="209"/> <location filename="../src/optionsdialog.cpp" line="235"/>
<source>Filtering</source> <source>Filtering</source>
<translation>Datenfilterung</translation> <translation>Datenfilterung</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="210"/> <location filename="../src/optionsdialog.cpp" line="236"/>
<source>Pause detection</source> <source>Pause detection</source>
<translation>Pausenerkennung</translation> <translation>Pausenerkennung</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="222"/> <location filename="../src/optionsdialog.cpp" line="248"/>
<source>mi</source> <source>mi</source>
<translation>mi</translation> <translation>mi</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="225"/> <location filename="../src/optionsdialog.cpp" line="251"/>
<source>km</source> <source>km</source>
<translation>km</translation> <translation>km</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="229"/> <location filename="../src/optionsdialog.cpp" line="255"/>
<source>POI radius:</source> <source>POI radius:</source>
<translation>POI-Radius:</translation> <translation>POI-Radius:</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="235"/> <location filename="../src/optionsdialog.cpp" line="261"/>
<location filename="../src/optionsdialog.cpp" line="334"/> <location filename="../src/optionsdialog.cpp" line="360"/>
<source>POI</source> <source>POI</source>
<translation>POI</translation> <translation>POI</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="242"/> <location filename="../src/optionsdialog.cpp" line="268"/>
<source>Name</source> <source>Name</source>
<translation>Name</translation> <translation>Name</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="244"/> <location filename="../src/optionsdialog.cpp" line="270"/>
<source>Date</source> <source>Date</source>
<translation>Datum</translation> <translation>Datum</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="246"/> <location filename="../src/optionsdialog.cpp" line="272"/>
<source>Distance</source> <source>Distance</source>
<translation>Distanz</translation> <translation>Distanz</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="248"/> <location filename="../src/optionsdialog.cpp" line="274"/>
<source>Time</source> <source>Time</source>
<translation>Zeit</translation> <translation>Zeit</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="250"/> <location filename="../src/optionsdialog.cpp" line="276"/>
<source>Moving time</source> <source>Moving time</source>
<translation>Bewegungszeit</translation> <translation>Bewegungszeit</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="252"/> <location filename="../src/optionsdialog.cpp" line="278"/>
<source>Item count (&gt;1)</source> <source>Item count (&gt;1)</source>
<translation>Elementanzahl (&gt;1)</translation> <translation>Elementanzahl (&gt;1)</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="267"/> <location filename="../src/optionsdialog.cpp" line="293"/>
<source>Separate graph page</source> <source>Separate graph page</source>
<translation>Separate Seite für Graphen</translation> <translation>Separate Seite für Graphen</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="277"/> <location filename="../src/optionsdialog.cpp" line="303"/>
<source>Header</source> <source>Header</source>
<translation>Kopfzeile</translation> <translation>Kopfzeile</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="285"/> <location filename="../src/optionsdialog.cpp" line="311"/>
<source>Use OpenGL</source> <source>Use OpenGL</source>
<translation>OpenGL verwenden</translation> <translation>OpenGL verwenden</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="297"/> <location filename="../src/optionsdialog.cpp" line="323"/>
<source>MB</source> <source>MB</source>
<translation>MB</translation> <translation>MB</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="301"/> <location filename="../src/optionsdialog.cpp" line="327"/>
<source>Image cache size:</source> <source>Image cache size:</source>
<translation>Bild-Cache größe:</translation> <translation>Bild-Cache größe:</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="314"/> <location filename="../src/optionsdialog.cpp" line="340"/>
<location filename="../src/optionsdialog.cpp" line="337"/> <location filename="../src/optionsdialog.cpp" line="363"/>
<source>System</source> <source>System</source>
<translation>System</translation> <translation>System</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="331"/> <location filename="../src/optionsdialog.cpp" line="357"/>
<source>Appearance</source> <source>Appearance</source>
<translation>Erscheinungsbild</translation> <translation>Erscheinungsbild</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="333"/> <location filename="../src/optionsdialog.cpp" line="359"/>
<source>Data</source> <source>Data</source>
<translation>Daten</translation> <translation>Daten</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="335"/> <location filename="../src/optionsdialog.cpp" line="361"/>
<source>Print &amp; Export</source> <source>Print &amp; Export</source>
<translation>Druck &amp; Export</translation> <translation>Druck &amp; Export</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="364"/> <location filename="../src/optionsdialog.cpp" line="390"/>
<source>Options</source> <source>Options</source>
<translation>Einstellungen</translation> <translation>Einstellungen</translation>
</message> </message>

141
lang/gpxsee_sv.ts
View File

@ -386,7 +386,7 @@
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="443"/> <location filename="../src/gui.cpp" line="443"/>
<location filename="../src/gui.cpp" line="1006"/> <location filename="../src/gui.cpp" line="1008"/>
<source>Moving time</source> <source>Moving time</source>
<translation>Förflyttningstid</translation> <translation>Förflyttningstid</translation>
</message> </message>
@ -531,22 +531,22 @@
<translation>Offline-kartor läses in från följande mapp vid programstart:</translation> <translation>Offline-kartor läses in från följande mapp vid programstart:</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="1197"/> <location filename="../src/gui.cpp" line="1199"/>
<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.cpp" line="1218"/> <location filename="../src/gui.cpp" line="1220"/>
<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.cpp" line="1233"/> <location filename="../src/gui.cpp" line="1235"/>
<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.cpp" line="1237"/> <location filename="../src/gui.cpp" line="1239"/>
<source>%n files</source> <source>%n files</source>
<translation> <translation>
<numerusform>%n filer</numerusform> <numerusform>%n filer</numerusform>
@ -554,13 +554,13 @@
</translation> </translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="992"/> <location filename="../src/gui.cpp" line="994"/>
<location filename="../src/gui.cpp" line="995"/> <location filename="../src/gui.cpp" line="997"/>
<source>Date</source> <source>Date</source>
<translation>Datum</translation> <translation>Datum</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="984"/> <location filename="../src/gui.cpp" line="986"/>
<source>Routes</source> <source>Routes</source>
<translation>Rutter</translation> <translation>Rutter</translation>
</message> </message>
@ -585,7 +585,7 @@
<translation>Exportera till PDF...</translation> <translation>Exportera till PDF...</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="986"/> <location filename="../src/gui.cpp" line="988"/>
<source>Waypoints</source> <source>Waypoints</source>
<translation>Vägpunkter</translation> <translation>Vägpunkter</translation>
</message> </message>
@ -641,12 +641,12 @@
<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.cpp" line="978"/> <location filename="../src/gui.cpp" line="980"/>
<source>Name</source> <source>Name</source>
<translation>Namn</translation> <translation>Namn</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="982"/> <location filename="../src/gui.cpp" line="984"/>
<source>Tracks</source> <source>Tracks</source>
<translation>Spår</translation> <translation>Spår</translation>
</message> </message>
@ -668,14 +668,14 @@
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="412"/> <location filename="../src/gui.cpp" line="412"/>
<location filename="../src/gui.cpp" line="1002"/> <location filename="../src/gui.cpp" line="1004"/>
<source>Distance</source> <source>Distance</source>
<translation>Avstånd</translation> <translation>Avstånd</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="419"/> <location filename="../src/gui.cpp" line="419"/>
<location filename="../src/gui.cpp" line="543"/> <location filename="../src/gui.cpp" line="543"/>
<location filename="../src/gui.cpp" line="1004"/> <location filename="../src/gui.cpp" line="1006"/>
<source>Time</source> <source>Time</source>
<translation>Tid</translation> <translation>Tid</translation>
</message> </message>
@ -779,246 +779,257 @@
<translation>Palettskiftning:</translation> <translation>Palettskiftning:</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="49"/> <location filename="../src/optionsdialog.cpp" line="75"/>
<source>Track width:</source> <source>Track width:</source>
<translation>Spårtjocklek:</translation> <translation>Spårtjocklek:</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="50"/> <location filename="../src/optionsdialog.cpp" line="76"/>
<source>Track style:</source> <source>Track style:</source>
<translation>Spårstil:</translation> <translation>Spårstil:</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="52"/> <location filename="../src/optionsdialog.cpp" line="78"/>
<source>Tracks</source> <source>Tracks</source>
<translation>Spår</translation> <translation>Spår</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="62"/> <location filename="../src/optionsdialog.cpp" line="88"/>
<source>Route width:</source> <source>Route width:</source>
<translation>Ruttjocklek:</translation> <translation>Ruttjocklek:</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="63"/> <location filename="../src/optionsdialog.cpp" line="89"/>
<source>Route style:</source> <source>Route style:</source>
<translation>Ruttstil:</translation> <translation>Ruttstil:</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="65"/> <location filename="../src/optionsdialog.cpp" line="91"/>
<source>Routes</source> <source>Routes</source>
<translation>Rutter</translation> <translation>Rutter</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="69"/> <location filename="../src/optionsdialog.cpp" line="95"/>
<location filename="../src/optionsdialog.cpp" line="102"/> <location filename="../src/optionsdialog.cpp" line="128"/>
<source>Use anti-aliasing</source> <source>Use anti-aliasing</source>
<translation>Använd kantutjämning</translation> <translation>Använd kantutjämning</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="100"/> <location filename="../src/optionsdialog.cpp" line="126"/>
<source>Line width:</source> <source>Line width:</source>
<translation>Linjetjocklek:</translation> <translation>Linjetjocklek:</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="116"/> <location filename="../src/optionsdialog.cpp" line="142"/>
<source>Colors</source> <source>Colors</source>
<translation>Färger</translation> <translation>Färger</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="117"/> <location filename="../src/optionsdialog.cpp" line="39"/>
<location filename="../src/optionsdialog.cpp" line="143"/>
<source>Paths</source> <source>Paths</source>
<translation>Sökvägar</translation> <translation>Sökvägar</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="118"/> <location filename="../src/optionsdialog.cpp" line="46"/>
<location filename="../src/optionsdialog.cpp" line="278"/> <source>Map opacity:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/optionsdialog.cpp" line="48"/>
<source>Map</source>
<translation>Karta</translation>
</message>
<message>
<location filename="../src/optionsdialog.cpp" line="144"/>
<location filename="../src/optionsdialog.cpp" line="304"/>
<source>Graphs</source> <source>Graphs</source>
<translation>Diagram</translation> <translation>Diagram</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="125"/> <location filename="../src/optionsdialog.cpp" line="151"/>
<source>Moving average window size</source> <source>Moving average window size</source>
<translation>Flyttar vanlig fönsterstorlek</translation> <translation>Flyttar vanlig fönsterstorlek</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="144"/> <location filename="../src/optionsdialog.cpp" line="170"/>
<source>Elevation:</source> <source>Elevation:</source>
<translation>Höjd:</translation> <translation>Höjd:</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="145"/> <location filename="../src/optionsdialog.cpp" line="171"/>
<source>Speed:</source> <source>Speed:</source>
<translation>Hastighet:</translation> <translation>Hastighet:</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="146"/> <location filename="../src/optionsdialog.cpp" line="172"/>
<source>Heart rate:</source> <source>Heart rate:</source>
<translation>Hjärtfrekvens:</translation> <translation>Hjärtfrekvens:</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="147"/> <location filename="../src/optionsdialog.cpp" line="173"/>
<source>Cadence:</source> <source>Cadence:</source>
<translation>Stegfrekvens:</translation> <translation>Stegfrekvens:</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="148"/> <location filename="../src/optionsdialog.cpp" line="174"/>
<source>Power:</source> <source>Power:</source>
<translation>Kraft:</translation> <translation>Kraft:</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="150"/> <location filename="../src/optionsdialog.cpp" line="176"/>
<source>Smoothing</source> <source>Smoothing</source>
<translation>Utjämning</translation> <translation>Utjämning</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="154"/> <location filename="../src/optionsdialog.cpp" line="180"/>
<source>Eliminate GPS outliers</source> <source>Eliminate GPS outliers</source>
<translation>Eliminera GPS-extremvärden</translation> <translation>Eliminera GPS-extremvärden</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="160"/> <location filename="../src/optionsdialog.cpp" line="186"/>
<source>Outlier elimination</source> <source>Outlier elimination</source>
<translation>Extremvärdeseliminering</translation> <translation>Extremvärdeseliminering</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="167"/> <location filename="../src/optionsdialog.cpp" line="193"/>
<source>Smoothing:</source> <source>Smoothing:</source>
<translation>Utjämning:</translation> <translation>Utjämning:</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="190"/> <location filename="../src/optionsdialog.cpp" line="216"/>
<source>mi/h</source> <source>mi/h</source>
<translation>mi/h</translation> <translation>mi/h</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="193"/> <location filename="../src/optionsdialog.cpp" line="219"/>
<source>km/h</source> <source>km/h</source>
<translation>km/h</translation> <translation>km/h</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="197"/> <location filename="../src/optionsdialog.cpp" line="223"/>
<source>s</source> <source>s</source>
<translation>sek</translation> <translation>sek</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="201"/> <location filename="../src/optionsdialog.cpp" line="227"/>
<source>Minimal speed:</source> <source>Minimal speed:</source>
<translation>Minsta hastighet:</translation> <translation>Minsta hastighet:</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="202"/> <location filename="../src/optionsdialog.cpp" line="228"/>
<source>Minimal duration:</source> <source>Minimal duration:</source>
<translation>Kortast varaktighet:</translation> <translation>Kortast varaktighet:</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="209"/> <location filename="../src/optionsdialog.cpp" line="235"/>
<source>Filtering</source> <source>Filtering</source>
<translation>Filtrerar</translation> <translation>Filtrerar</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="210"/> <location filename="../src/optionsdialog.cpp" line="236"/>
<source>Pause detection</source> <source>Pause detection</source>
<translation>Pausa identifiering</translation> <translation>Pausa identifiering</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="222"/> <location filename="../src/optionsdialog.cpp" line="248"/>
<source>mi</source> <source>mi</source>
<translation>mi</translation> <translation>mi</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="225"/> <location filename="../src/optionsdialog.cpp" line="251"/>
<source>km</source> <source>km</source>
<translation>km</translation> <translation>km</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="229"/> <location filename="../src/optionsdialog.cpp" line="255"/>
<source>POI radius:</source> <source>POI radius:</source>
<translation>POI-radie:</translation> <translation>POI-radie:</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="235"/> <location filename="../src/optionsdialog.cpp" line="261"/>
<location filename="../src/optionsdialog.cpp" line="334"/> <location filename="../src/optionsdialog.cpp" line="360"/>
<source>POI</source> <source>POI</source>
<translation>POI</translation> <translation>POI</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="242"/> <location filename="../src/optionsdialog.cpp" line="268"/>
<source>Name</source> <source>Name</source>
<translation>Namn</translation> <translation>Namn</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="244"/> <location filename="../src/optionsdialog.cpp" line="270"/>
<source>Date</source> <source>Date</source>
<translation>Datum</translation> <translation>Datum</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="246"/> <location filename="../src/optionsdialog.cpp" line="272"/>
<source>Distance</source> <source>Distance</source>
<translation>Avstånd</translation> <translation>Avstånd</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="248"/> <location filename="../src/optionsdialog.cpp" line="274"/>
<source>Time</source> <source>Time</source>
<translation>Tid</translation> <translation>Tid</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="250"/> <location filename="../src/optionsdialog.cpp" line="276"/>
<source>Moving time</source> <source>Moving time</source>
<translation>Förflyttningstid</translation> <translation>Förflyttningstid</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="252"/> <location filename="../src/optionsdialog.cpp" line="278"/>
<source>Item count (&gt;1)</source> <source>Item count (&gt;1)</source>
<translation>Objektantal (&gt;1)</translation> <translation>Objektantal (&gt;1)</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="267"/> <location filename="../src/optionsdialog.cpp" line="293"/>
<source>Separate graph page</source> <source>Separate graph page</source>
<translation>Separat diagramsida</translation> <translation>Separat diagramsida</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="277"/> <location filename="../src/optionsdialog.cpp" line="303"/>
<source>Header</source> <source>Header</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="285"/> <location filename="../src/optionsdialog.cpp" line="311"/>
<source>Use OpenGL</source> <source>Use OpenGL</source>
<translation>Använd OpenGL</translation> <translation>Använd OpenGL</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="297"/> <location filename="../src/optionsdialog.cpp" line="323"/>
<source>MB</source> <source>MB</source>
<translation>MB</translation> <translation>MB</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="301"/> <location filename="../src/optionsdialog.cpp" line="327"/>
<source>Image cache size:</source> <source>Image cache size:</source>
<translation>Cashe-storlek för bilder:</translation> <translation>Cashe-storlek för bilder:</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="314"/> <location filename="../src/optionsdialog.cpp" line="340"/>
<location filename="../src/optionsdialog.cpp" line="337"/> <location filename="../src/optionsdialog.cpp" line="363"/>
<source>System</source> <source>System</source>
<translation>System</translation> <translation>System</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="331"/> <location filename="../src/optionsdialog.cpp" line="357"/>
<source>Appearance</source> <source>Appearance</source>
<translation>Utseende</translation> <translation>Utseende</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="333"/> <location filename="../src/optionsdialog.cpp" line="359"/>
<source>Data</source> <source>Data</source>
<translation>Data</translation> <translation>Data</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="335"/> <location filename="../src/optionsdialog.cpp" line="361"/>
<source>Print &amp; Export</source> <source>Print &amp; Export</source>
<translation>Utskrift &amp; Export</translation> <translation>Utskrift &amp; Export</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="364"/> <location filename="../src/optionsdialog.cpp" line="390"/>
<source>Options</source> <source>Options</source>
<translation>Alternativ</translation> <translation>Alternativ</translation>
</message> </message>

2
pkg/gpxsee.nsi
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 "4.11" !define VERSION "4.12"
; The file to write ; The file to write
OutFile "GPXSee-${VERSION}.exe" OutFile "GPXSee-${VERSION}.exe"

2
pkg/gpxsee64.nsi
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 "4.11" !define VERSION "4.12"
; The file to write ; The file to write
OutFile "GPXSee-${VERSION}_x64.exe" OutFile "GPXSee-${VERSION}_x64.exe"

1
pkg/maps.txt
View File

@ -1,4 +1,5 @@
Open Topo Map https://a.tile.opentopomap.org/$z/$x/$y.png Open Topo Map https://a.tile.opentopomap.org/$z/$x/$y.png
4UMaps http://4umaps.eu/$z/$x/$y.png
Open Street Map http://tile.openstreetmap.org/$z/$x/$y.png Open Street Map http://tile.openstreetmap.org/$z/$x/$y.png
USGS Topo https://navigator.er.usgs.gov/tiles/tcr.cgi/$z/$x/$y.png USGS Topo https://navigator.er.usgs.gov/tiles/tcr.cgi/$z/$x/$y.png
USGS Imagery https://navigator.er.usgs.gov/tiles/aerial_Imagery.cgi/$z/$x/$y USGS Imagery https://navigator.er.usgs.gov/tiles/aerial_Imagery.cgi/$z/$x/$y

7
src/gui.cpp
View File

@ -877,6 +877,8 @@ void GUI::openOptions()
for (int i = 0; i < _tabs.count(); i++) for (int i = 0; i < _tabs.count(); i++)
_tabs.at(i)->setPalette(options.palette); _tabs.at(i)->setPalette(options.palette);
} }
if (options.mapOpacity != _options.mapOpacity)
_pathView->setMapOpacity(options.mapOpacity);
if (options.trackWidth != _options.trackWidth) if (options.trackWidth != _options.trackWidth)
_pathView->setTrackWidth(options.trackWidth); _pathView->setTrackWidth(options.trackWidth);
if (options.routeWidth != _options.routeWidth) if (options.routeWidth != _options.routeWidth)
@ -1598,6 +1600,8 @@ void GUI::writeSettings()
settings.setValue(PALETTE_COLOR_SETTING, _options.palette.color()); settings.setValue(PALETTE_COLOR_SETTING, _options.palette.color());
if (_options.palette.shift() != PALETTE_SHIFT_DEFAULT) if (_options.palette.shift() != PALETTE_SHIFT_DEFAULT)
settings.setValue(PALETTE_SHIFT_SETTING, _options.palette.shift()); settings.setValue(PALETTE_SHIFT_SETTING, _options.palette.shift());
if (_options.mapOpacity != MAP_OPACITY_DEFAULT)
settings.setValue(MAP_OPACITY_SETTING, _options.mapOpacity);
if (_options.trackWidth != TRACK_WIDTH_DEFAULT) if (_options.trackWidth != TRACK_WIDTH_DEFAULT)
settings.setValue(TRACK_WIDTH_SETTING, _options.trackWidth); settings.setValue(TRACK_WIDTH_SETTING, _options.trackWidth);
if (_options.routeWidth != ROUTE_WIDTH_DEFAULT) if (_options.routeWidth != ROUTE_WIDTH_DEFAULT)
@ -1793,6 +1797,8 @@ void GUI::readSettings()
qreal ps = settings.value(PALETTE_SHIFT_SETTING, PALETTE_SHIFT_DEFAULT) qreal ps = settings.value(PALETTE_SHIFT_SETTING, PALETTE_SHIFT_DEFAULT)
.toDouble(); .toDouble();
_options.palette = Palette(pc, ps); _options.palette = Palette(pc, ps);
_options.mapOpacity = settings.value(MAP_OPACITY_SETTING,
MAP_OPACITY_DEFAULT).toInt();
_options.trackWidth = settings.value(TRACK_WIDTH_SETTING, _options.trackWidth = settings.value(TRACK_WIDTH_SETTING,
TRACK_WIDTH_DEFAULT).toInt(); TRACK_WIDTH_DEFAULT).toInt();
_options.routeWidth = settings.value(ROUTE_WIDTH_SETTING, _options.routeWidth = settings.value(ROUTE_WIDTH_SETTING,
@ -1845,6 +1851,7 @@ void GUI::readSettings()
SEPARATE_GRAPH_PAGE_DEFAULT).toBool(); SEPARATE_GRAPH_PAGE_DEFAULT).toBool();
_pathView->setPalette(_options.palette); _pathView->setPalette(_options.palette);
_pathView->setMapOpacity(_options.mapOpacity);
_pathView->setTrackWidth(_options.trackWidth); _pathView->setTrackWidth(_options.trackWidth);
_pathView->setRouteWidth(_options.routeWidth); _pathView->setRouteWidth(_options.routeWidth);
_pathView->setTrackStyle(_options.trackStyle); _pathView->setTrackStyle(_options.trackStyle);

2
src/lambertconic.cpp
View File

@ -75,7 +75,7 @@ Coordinates LambertConic::xy2ll(const QPointF &p) const
double dx = p.x() - _fe; double dx = p.x() - _fe;
double dy = p.y() - _fn - _R0; double dy = p.y() - _fn - _R0;
double R = sqrt(dx * dx + dy * dy); double R = sqrt(dx * dx + dy * dy);
double q = _q0 - log(R / _R0) / _n; double q = _q0 - log(fabs(R / _R0)) / _n;
return Coordinates(rad2deg(deg2rad(_cm) + dl / _n), rad2deg(iq(_e, q))); return Coordinates(rad2deg(deg2rad(_cm) + dl / _n), rad2deg(iq(_e, q)));
} }

18
src/offlinemap.cpp
View File

@ -229,6 +229,24 @@ bool OfflineMap::createProjection(const QString &datum,
else if (projection == "(SG) Swedish Grid") else if (projection == "(SG) Swedish Grid")
_projection = new TransverseMercator(d.ellipsoid(), 0, 15.808278, 1, _projection = new TransverseMercator(d.ellipsoid(), 0, 15.808278, 1,
1500000, 0); 1500000, 0);
else if (projection == "(I) France Zone I")
_projection = new LambertConic(d.ellipsoid(), 48.598523, 50.395912,
49.5, 2.337229, 1 /*0.99987734*/, 600000, 1200000);
else if (projection == "(II) France Zone II")
_projection = new LambertConic(d.ellipsoid(), 45.898919, 47.696014,
46.8, 2.337229, 1 /*0.99987742*/, 600000, 2200000);
else if (projection == "(III) France Zone III")
_projection = new LambertConic(d.ellipsoid(), 43.199291, 44.996094,
44.1, 2.337229, 1 /*0.99987750*/, 600000, 3200000);
else if (projection == "(IV) France Zone IV")
_projection = new LambertConic(d.ellipsoid(), 41.560388, 42.767663,
42.165, 2.337229, 1 /*0.99994471*/, 234.358, 4185861.369);
else if (projection == "(VICGRID) Victoria Australia")
_projection = new LambertConic(d.ellipsoid(), -36, -38, -37, 145, 1,
2500000, 4500000);
else if (projection == "(VG94) VICGRID94 Victoria Australia")
_projection = new LambertConic(d.ellipsoid(), -36, -38, -37, 145, 1,
2500000, 2500000);
else { else {
_errorString = QString("%1: Unknown map projection").arg(projection); _errorString = QString("%1: Unknown map projection").arg(projection);
return false; return false;

33
src/optionsdialog.cpp
View File

@ -16,12 +16,13 @@
#include "colorbox.h" #include "colorbox.h"
#include "stylecombobox.h" #include "stylecombobox.h"
#include "oddspinbox.h" #include "oddspinbox.h"
#include "percentslider.h"
#include "optionsdialog.h" #include "optionsdialog.h"
#define MENU_MARGIN 20 #define MENU_MARGIN 20
#define MENU_ICON_SIZE 32 #define MENU_ICON_SIZE 32
QWidget *OptionsDialog::createAppearancePage() QWidget *OptionsDialog::createAppearancePage()
{ {
_baseColor = new ColorBox(); _baseColor = new ColorBox();
@ -31,14 +32,39 @@ QWidget *OptionsDialog::createAppearancePage()
_colorOffset->setMaximum(1.0); _colorOffset->setMaximum(1.0);
_colorOffset->setSingleStep(0.01); _colorOffset->setSingleStep(0.01);
_colorOffset->setValue(_options->palette.shift()); _colorOffset->setValue(_options->palette.shift());
QFormLayout *paletteLayout = new QFormLayout(); QFormLayout *paletteLayout = new QFormLayout();
paletteLayout->addRow(tr("Base color:"), _baseColor); paletteLayout->addRow(tr("Base color:"), _baseColor);
paletteLayout->addRow(tr("Palette shift:"), _colorOffset); paletteLayout->addRow(tr("Palette shift:"), _colorOffset);
#ifndef Q_OS_MAC
QGroupBox *pathsBox = new QGroupBox(tr("Paths"));
pathsBox->setLayout(paletteLayout);
#endif
_mapOpacity = new PercentSlider();
_mapOpacity->setValue(_options->mapOpacity);
QFormLayout *mapLayout = new QFormLayout();
mapLayout->addRow(tr("Map opacity:"), _mapOpacity);
#ifndef Q_OS_MAC
QGroupBox *mapBox = new QGroupBox(tr("Map"));
mapBox->setLayout(mapLayout);
#endif
QWidget *colorTab = new QWidget(); QWidget *colorTab = new QWidget();
colorTab->setLayout(paletteLayout); QVBoxLayout *colorTabLayout = new QVBoxLayout();
#ifdef Q_OS_MAC
QFrame *l0 = new QFrame();
l0->setFrameShape(QFrame::HLine);
l0->setFrameShadow(QFrame::Sunken);
colorTabLayout->addLayout(paletteLayout);
colorTabLayout->addWidget(l0);
colorTabLayout->addLayout(mapLayout);
#else // Q_OS_MAC
colorTabLayout->addWidget(pathsBox);
colorTabLayout->addWidget(mapBox);
#endif // O_OS_MAC
colorTabLayout->addStretch();
colorTab->setLayout(colorTabLayout);
_trackWidth = new QSpinBox(); _trackWidth = new QSpinBox();
_trackWidth->setValue(_options->trackWidth); _trackWidth->setValue(_options->trackWidth);
@ -369,6 +395,7 @@ void OptionsDialog::accept()
{ {
_options->palette.setColor(_baseColor->color()); _options->palette.setColor(_baseColor->color());
_options->palette.setShift(_colorOffset->value()); _options->palette.setShift(_colorOffset->value());
_options->mapOpacity = _mapOpacity->value();
_options->trackWidth = _trackWidth->value(); _options->trackWidth = _trackWidth->value();
_options->trackStyle = (Qt::PenStyle) _trackStyle->itemData( _options->trackStyle = (Qt::PenStyle) _trackStyle->itemData(
_trackStyle->currentIndex()).toInt(); _trackStyle->currentIndex()).toInt();

3
src/optionsdialog.h
View File

@ -12,10 +12,12 @@ class QSpinBox;
class QDoubleSpinBox; class QDoubleSpinBox;
class QComboBox; class QComboBox;
class QCheckBox; class QCheckBox;
class PercentSlider;
struct Options { struct Options {
// Appearance // Appearance
Palette palette; Palette palette;
int mapOpacity;
int trackWidth; int trackWidth;
int routeWidth; int routeWidth;
Qt::PenStyle trackStyle; Qt::PenStyle trackStyle;
@ -71,6 +73,7 @@ private:
// Appearance // Appearance
ColorBox *_baseColor; ColorBox *_baseColor;
QDoubleSpinBox *_colorOffset; QDoubleSpinBox *_colorOffset;
PercentSlider *_mapOpacity;
QSpinBox *_trackWidth; QSpinBox *_trackWidth;
StyleComboBox *_trackStyle; StyleComboBox *_trackStyle;
QSpinBox *_routeWidth; QSpinBox *_routeWidth;

55
src/ozf.cpp
View File

@ -1,3 +1,4 @@
#include <cstring>
#include <QtEndian> #include <QtEndian>
#include <QFile> #include <QFile>
#include "ozf.h" #include "ozf.h"
@ -52,8 +53,8 @@ bool OZF::read(void *data, size_t size, size_t decryptSize)
bool OZF::initOZF3() bool OZF::initOZF3()
{ {
quint8 randomNumber, initial; quint8 randomNumber, initial;
quint32 keyblock;
quint8 h1[8]; quint8 h1[8];
quint8 h2[16], h2d[16];
if (!_file.seek(14)) if (!_file.seek(14))
@ -75,41 +76,23 @@ bool OZF::initOZF3()
return false; return false;
_tileSize = *(h1 + 6); _tileSize = *(h1 + 6);
if (!_file.seek(15 + randomNumber)) if (!_file.seek(15 + randomNumber + 4))
return false; return false;
if (!readValue(keyblock)) if (_file.read((char*)h2, sizeof(h2)) != (qint64)sizeof(h2))
return false; return false;
switch (keyblock & 0xFF) { for (int i = 0; i < 256; i++) {
case 0xf1: memcpy(h2d, h2, sizeof(h2d));
initial += 0x8a; decrypt(h2d, sizeof(h2d), (quint8)i);
break;
case 0x18: if ((quint32)*h2d == 40 && (quint16)*(h2d + 12) == 1
case 0x54: && (quint16)*(h2d + 14) == 8) {
initial += 0xa0; _key = (quint8)i;
break; return true;
case 0x56: }
initial += 0xb9;
break;
case 0x43:
initial += 0x6a;
break;
case 0x83:
initial += 0xa4;
break;
case 0xc5:
initial += 0x7e;
break;
case 0x38:
initial += 0xc1;
break;
default:
break;
} }
_key = initial; return false;
return true;
} }
bool OZF::initOZF2() bool OZF::initOZF2()
@ -135,8 +118,10 @@ bool OZF::readHeaders()
} else if (magic == OZF3_MAGIC) { } else if (magic == OZF3_MAGIC) {
if (!initOZF3()) if (!initOZF3())
return false; return false;
} else } else {
qWarning("%s: not a OZF2/OZF3 file", qPrintable(_file.fileName()));
return false; return false;
}
return true; return true;
} }
@ -196,7 +181,7 @@ bool OZF::readTileTable()
_zooms.append(zoom); _zooms.append(zoom);
} }
return true; return _zooms.isEmpty() ? false : true;
} }
bool OZF::load(const QString &path) bool OZF::load(const QString &path)
@ -209,13 +194,13 @@ bool OZF::load(const QString &path)
return false; return false;
if (!readHeaders()) { if (!readHeaders()) {
qWarning("%s: not a OZF2/OZF3 file", qPrintable(_file.fileName())); qWarning("%s: Invalid header", qPrintable(_file.fileName()));
_file.close(); _file.close();
return false; return false;
} }
if (!readTileTable()) { if (!readTileTable()) {
qWarning("%s: file format error", qPrintable(_file.fileName())); qWarning("%s: Invalid tile table", qPrintable(_file.fileName()));
_file.close(); _file.close();
return false; return false;
} }

27
src/pathview.cpp
View File

@ -46,6 +46,7 @@ PathView::PathView(Map *map, POI *poi, QWidget *parent)
connect(_poi, SIGNAL(pointsChanged()), this, SLOT(updatePOI())); connect(_poi, SIGNAL(pointsChanged()), this, SLOT(updatePOI()));
_units = Metric; _units = Metric;
_opacity = 1.0;
_showMap = true; _showMap = true;
_showTracks = true; _showTracks = true;
@ -144,7 +145,7 @@ void PathView::addWaypoints(const QList<Waypoint> &waypoints)
QList<PathItem *> PathView::loadData(const Data &data) QList<PathItem *> PathView::loadData(const Data &data)
{ {
QList<PathItem *> paths; QList<PathItem *> paths;
qreal scale = _map->zoom(); qreal zoom = _map->zoom();
for (int i = 0; i < data.tracks().count(); i++) for (int i = 0; i < data.tracks().count(); i++)
paths.append(addTrack(*(data.tracks().at(i)))); paths.append(addTrack(*(data.tracks().at(i))));
@ -155,7 +156,7 @@ QList<PathItem *> PathView::loadData(const Data &data)
if (_tracks.empty() && _routes.empty() && _waypoints.empty()) if (_tracks.empty() && _routes.empty() && _waypoints.empty())
return paths; return paths;
if (mapScale() != scale) if (mapZoom() != zoom)
rescale(); rescale();
else else
updatePOIVisibility(); updatePOIVisibility();
@ -179,11 +180,11 @@ void PathView::updateWaypointsBoundingRect(const Coordinates &wp)
_wr.unite(wp); _wr.unite(wp);
} }
qreal PathView::mapScale() const qreal PathView::mapZoom() const
{ {
RectC br = _tr | _rr | _wr; RectC br = _tr | _rr | _wr;
return _map->zoomFit(viewport()->size() - QSize(MARGIN/2, MARGIN/2), br); return _map->zoomFit(viewport()->size() - QSize(2*MARGIN, 2*MARGIN), br);
} }
QPointF PathView::contentCenter() const QPointF PathView::contentCenter() const
@ -637,18 +638,28 @@ void PathView::setRouteStyle(Qt::PenStyle style)
_routes.at(i)->setStyle(style); _routes.at(i)->setStyle(style);
} }
void PathView::setMapOpacity(int opacity)
{
_opacity = opacity / 100.0;
resetCachedContent();
}
void PathView::drawBackground(QPainter *painter, const QRectF &rect) void PathView::drawBackground(QPainter *painter, const QRectF &rect)
{ {
if (_showMap) if (_showMap) {
if (_opacity < 1.0) {
painter->fillRect(rect, Qt::white);
painter->setOpacity(_opacity);
}
_map->draw(painter, rect); _map->draw(painter, rect);
else } else
painter->fillRect(rect, Qt::white); painter->fillRect(rect, Qt::white);
} }
void PathView::resizeEvent(QResizeEvent *event) void PathView::resizeEvent(QResizeEvent *event)
{ {
qreal scale = _map->zoom(); qreal zoom = _map->zoom();
if (mapScale() != scale) if (mapZoom() != zoom)
rescale(); rescale();
QPointF center = contentCenter(); QPointF center = contentCenter();

4
src/pathview.h
View File

@ -63,6 +63,7 @@ public slots:
void setRouteWidth(int width); void setRouteWidth(int width);
void setTrackStyle(Qt::PenStyle style); void setTrackStyle(Qt::PenStyle style);
void setRouteStyle(Qt::PenStyle style); void setRouteStyle(Qt::PenStyle style);
void setMapOpacity(int opacity);
private slots: private slots:
void updatePOI(); void updatePOI();
@ -75,7 +76,7 @@ private:
void loadPOI(); void loadPOI();
void clearPOI(); void clearPOI();
qreal mapScale() const; qreal mapZoom() const;
QPointF contentCenter() const; QPointF contentCenter() const;
void rescale(); void rescale();
void zoom(int zoom, const QPoint &pos, const Coordinates &c); void zoom(int zoom, const QPoint &pos, const Coordinates &c);
@ -106,6 +107,7 @@ private:
POI *_poi; POI *_poi;
Palette _palette; Palette _palette;
Units _units; Units _units;
qreal _opacity;
bool _showMap; bool _showMap;
bool _showTracks; bool _showTracks;

48
src/percentslider.cpp Normal file
View File

@ -0,0 +1,48 @@
#include <QSlider>
#include <QLabel>
#include <QHBoxLayout>
#include "units.h"
#include "percentslider.h"
static QString format(int value)
{
return QString::number(value) + UNIT_SPACE + QString("%");
}
PercentSlider::PercentSlider(QWidget *parent) : QWidget(parent)
{
_slider = new QSlider(Qt::Horizontal);
_label = new QLabel();
_slider->setMinimum(0);
_slider->setMaximum(100);
QFontMetrics fm(_label->font());
_label->setFixedWidth(fm.boundingRect(format(_slider->maximum())).width());
_label->setAlignment(Qt::AlignRight);
connect(_slider, SIGNAL(sliderMoved(int)), this, SLOT(updateLabel(int)));
QHBoxLayout *layout = new QHBoxLayout();
layout->addWidget(_slider);
layout->addWidget(_label);
setLayout(layout);
}
void PercentSlider::updateLabel(int value)
{
_label->setText(format(value));
}
int PercentSlider::value() const
{
return _slider->value();
}
void PercentSlider::setValue(int value)
{
_slider->setValue(value);
_label->setText(format(value));
}

29
src/percentslider.h Normal file
View File

@ -0,0 +1,29 @@
#ifndef PERCENTSLIDER_H
#define PERCENTSLIDER_H
#include <QWidget>
class QSlider;
class QLabel;
class PercentSlider : public QWidget
{
Q_OBJECT
public:
PercentSlider(QWidget *parent = 0);
int value() const;
public slots:
void setValue(int value);
private slots:
void updateLabel(int value);
private:
QSlider *_slider;
QLabel *_label;
};
#endif // PERCENTSLIDER_H

2
src/settings.h
View File

@ -76,6 +76,8 @@
#define PALETTE_COLOR_DEFAULT QColor(Qt::blue) #define PALETTE_COLOR_DEFAULT QColor(Qt::blue)
#define PALETTE_SHIFT_SETTING "paletteShift" #define PALETTE_SHIFT_SETTING "paletteShift"
#define PALETTE_SHIFT_DEFAULT 0.62 #define PALETTE_SHIFT_DEFAULT 0.62
#define MAP_OPACITY_SETTING "mapOpacity"
#define MAP_OPACITY_DEFAULT 100
#define TRACK_WIDTH_SETTING "trackWidth" #define TRACK_WIDTH_SETTING "trackWidth"
#define TRACK_WIDTH_DEFAULT 3 #define TRACK_WIDTH_DEFAULT 3
#define ROUTE_WIDTH_SETTING "routeWidth" #define ROUTE_WIDTH_SETTING "routeWidth"

4
src/units.h
View File

@ -25,10 +25,6 @@ enum Units {
#define C2FS 1.8 // Celsius to Farenheit - scale #define C2FS 1.8 // Celsius to Farenheit - scale
#define C2FO 32.0 // Celsius to Farenheit - offset #define C2FO 32.0 // Celsius to Farenheit - offset
#ifdef Q_OS_WIN32
#define UNIT_SPACE QString(" ")
#else // Q_OS_WIN32
#define UNIT_SPACE QString::fromUtf8("\xE2\x80\x89") #define UNIT_SPACE QString::fromUtf8("\xE2\x80\x89")
#endif // Q_OS_WIN32
#endif // UNITS_H #endif // UNITS_H