mirror of
https://github.com/tumic0/GPXSee.git
synced 2025-07-21 06:14:23 +02:00
Compare commits
10 Commits
12.2
...
152f17f15a
Author | SHA1 | Date | |
---|---|---|---|
152f17f15a | |||
873db27768 | |||
62f3343f75 | |||
07581f027b | |||
b3767e85e1 | |||
4fdeb3169f | |||
18836107af | |||
630fef2143 | |||
00c8d70eab | |||
426490ef4d |
@ -1,4 +1,4 @@
|
|||||||
version: 12.2.{build}
|
version: 12.3.{build}
|
||||||
|
|
||||||
configuration:
|
configuration:
|
||||||
- Release
|
- Release
|
||||||
|
@ -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 \
|
||||||
|
@ -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"/>
|
||||||
|
@ -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"/>
|
||||||
|
@ -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"/>
|
||||||
|
@ -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"/>
|
||||||
|
@ -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"/>
|
||||||
|
@ -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"
|
||||||
|
@ -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"}}
|
||||||
};
|
};
|
||||||
|
@ -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
|
||||||
|
@ -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])
|
||||||
|
@ -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));
|
||||||
|
Reference in New Issue
Block a user