1
0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-07-21 06:14:23 +02:00

Compare commits

...

10 Commits

Author SHA1 Message Date
152f17f15a Do not try to load the style when it does not exist 2023-03-18 09:04:55 +01:00
873db27768 Version++ 2023-03-16 23:42:57 +01:00
62f3343f75 Render international border lines 2023-03-16 21:37:27 +01:00
07581f027b Fixed header length check 2023-03-16 20:58:28 +01:00
b3767e85e1 Added missing nmea serial port baudrate setting 2023-03-16 02:03:40 +01:00
4fdeb3169f Translated using Weblate (Esperanto)
Currently translated at 93.1% (435 of 467 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/eo/
2023-03-12 23:00:19 +01:00
18836107af Translated using Weblate (Ukrainian)
Currently translated at 99.5% (465 of 467 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/uk/
2023-03-12 23:00:19 +01:00
630fef2143 Translated using Weblate (Russian)
Currently translated at 100.0% (467 of 467 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/ru/
2023-03-12 23:00:19 +01:00
00c8d70eab Translated using Weblate (Finnish)
Currently translated at 97.4% (455 of 467 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/fi/
2023-03-12 23:00:18 +01:00
426490ef4d Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (467 of 467 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/zh_Hans/
2023-03-07 01:50:18 +01:00
12 changed files with 13 additions and 11 deletions

View File

@ -1,4 +1,4 @@
version: 12.2.{build} version: 12.3.{build}
configuration: configuration:
- Release - Release

View File

@ -3,7 +3,7 @@ unix:!macx:!android {
} else { } else {
TARGET = GPXSee TARGET = GPXSee
} }
VERSION = 12.2 VERSION = 12.3
QT += core \ QT += core \
gui \ gui \

View File

@ -1912,7 +1912,7 @@
<message> <message>
<location filename="../src/GUI/optionsdialog.cpp" line="749"/> <location filename="../src/GUI/optionsdialog.cpp" line="749"/>
<source>DEM cache size:</source> <source>DEM cache size:</source>
<translation type="unfinished"></translation> <translation>DEM-kaŝmemora grandeco:</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/optionsdialog.cpp" line="769"/> <location filename="../src/GUI/optionsdialog.cpp" line="769"/>

View File

@ -1912,7 +1912,7 @@
<message> <message>
<location filename="../src/GUI/optionsdialog.cpp" line="749"/> <location filename="../src/GUI/optionsdialog.cpp" line="749"/>
<source>DEM cache size:</source> <source>DEM cache size:</source>
<translation type="unfinished"></translation> <translation>DEM-välimuistin koko:</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/optionsdialog.cpp" line="769"/> <location filename="../src/GUI/optionsdialog.cpp" line="769"/>

View File

@ -1913,7 +1913,7 @@
<message> <message>
<location filename="../src/GUI/optionsdialog.cpp" line="749"/> <location filename="../src/GUI/optionsdialog.cpp" line="749"/>
<source>DEM cache size:</source> <source>DEM cache size:</source>
<translation type="unfinished"></translation> <translation>Размер кэша DEM:</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/optionsdialog.cpp" line="769"/> <location filename="../src/GUI/optionsdialog.cpp" line="769"/>

View File

@ -1913,7 +1913,7 @@
<message> <message>
<location filename="../src/GUI/optionsdialog.cpp" line="749"/> <location filename="../src/GUI/optionsdialog.cpp" line="749"/>
<source>DEM cache size:</source> <source>DEM cache size:</source>
<translation type="unfinished"></translation> <translation>Розмір кешу DEM:</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/optionsdialog.cpp" line="769"/> <location filename="../src/GUI/optionsdialog.cpp" line="769"/>

View File

@ -1911,7 +1911,7 @@
<message> <message>
<location filename="../src/GUI/optionsdialog.cpp" line="749"/> <location filename="../src/GUI/optionsdialog.cpp" line="749"/>
<source>DEM cache size:</source> <source>DEM cache size:</source>
<translation type="unfinished"></translation> <translation>DEM </translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/optionsdialog.cpp" line="769"/> <location filename="../src/GUI/optionsdialog.cpp" line="769"/>

View File

@ -37,7 +37,7 @@ Unicode true
; The name of the installer ; The name of the installer
Name "GPXSee" Name "GPXSee"
; Program version ; Program version
!define VERSION "12.2" !define VERSION "12.3"
; The file to write ; The file to write
OutFile "GPXSee-${VERSION}_x64.exe" OutFile "GPXSee-${VERSION}_x64.exe"

View File

@ -3,7 +3,7 @@
#include "pluginparameters.h" #include "pluginparameters.h"
static const QMap<QString, QStringList> pluginParams = { static const QMap<QString, QStringList> pluginParams = {
{"nmea", {"nmea.source"}}, {"nmea", {"nmea.source", "nmea.baudrate"}},
{"serialnmea", {"serialnmea.serial_port"}}, {"serialnmea", {"serialnmea.serial_port"}},
{"geoclue2", {"desktopId"}} {"geoclue2", {"desktopId"}}
}; };

View File

@ -1,3 +1,4 @@
#include <QFileInfo>
#include "common/programpaths.h" #include "common/programpaths.h"
#include "vectortile.h" #include "vectortile.h"
#include "style.h" #include "style.h"
@ -76,7 +77,7 @@ void MapData::load()
_style = new Style(_typ); _style = new Style(_typ);
else { else {
QString typFile(ProgramPaths::typFile()); QString typFile(ProgramPaths::typFile());
if (!typFile.isEmpty()) { if (QFileInfo::exists(typFile)) {
SubFile typ(&typFile); SubFile typ(&typFile);
_style = new Style(&typ); _style = new Style(&typ);
} else } else

View File

@ -217,7 +217,7 @@ bool RGNFile::load(Handle &hdl)
&& readUInt32(hdl, _base.size))) && readUInt32(hdl, _base.size)))
return false; return false;
if (hdrLen >= 0x68) { if (hdrLen >= 0x71) {
if (!(readUInt32(hdl, _polygons.offset) && readUInt32(hdl, _polygons.size) if (!(readUInt32(hdl, _polygons.offset) && readUInt32(hdl, _polygons.size)
&& seek(hdl, _gmpOffset + 0x29) && readUInt32(hdl, _polygonsGblFlags) && seek(hdl, _gmpOffset + 0x29) && readUInt32(hdl, _polygonsGblFlags)
&& readUInt32(hdl, _polygonsLclFlags[0]) && readUInt32(hdl, _polygonsLclFlags[0])

View File

@ -392,6 +392,7 @@ void Style::defaultLineStyle()
_lines[0x10505] = Line(QImage(":/marine/safety-zone-line.png")); _lines[0x10505] = Line(QImage(":/marine/safety-zone-line.png"));
_lines[0x10507] = Line(QPen(QColor("#e728e7"), 1, Qt::DashLine)); _lines[0x10507] = Line(QPen(QColor("#e728e7"), 1, Qt::DashLine));
_lines[0x10601] = Line(QPen(QColor("#000000"), 1, Qt::SolidLine)); _lines[0x10601] = Line(QPen(QColor("#000000"), 1, Qt::SolidLine));
_lines[0x10603] = Line(QPen(QColor("#e728e7"), 2, Qt::DashDotLine));
_lines[0x10606] = Line(QImage(":/marine/anchor-line.png")); _lines[0x10606] = Line(QImage(":/marine/anchor-line.png"));
_lines[0x1060c] = Line(QPen(QColor("#e728e7"), 1, Qt::SolidLine)); _lines[0x1060c] = Line(QPen(QColor("#e728e7"), 1, Qt::SolidLine));
_lines[0x1060d] = Line(QPen(QColor("#eb49eb"), 1, Qt::DashLine)); _lines[0x1060d] = Line(QPen(QColor("#eb49eb"), 1, Qt::DashLine));