Change the form layout to fit the page

Currently translated at 100.0% (484 of 484 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/ca/

.appveyor.yml

@@ -1,4 +1,4 @@
-version: 13.18.{build}
+version: 13.24.{build}
 
 configuration:
   - Release
@@ -12,8 +12,8 @@ environment:
   - QTDIR: C:\Qt\5.15\msvc2019_64
     OPENSSLDIR: C:\OpenSSL-v111-Win64\bin
     NSISDEF: /DOPENSSL /DANGLE
-  - QTDIR: C:\Qt\6.5\msvc2019_64
-    OPENSSLDIR: C:\OpenSSL-v30-Win64\bin
+  - QTDIR: C:\Qt\6.7\msvc2019_64
+    OPENSSLDIR: C:\OpenSSL-v32-Win64\bin
     NSISDEF: /DQT6 /DOPENSSL
 
 install:

.github/workflows/codeql.yml

@@ -18,7 +18,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Install dependencies
       run: |
@@ -26,7 +26,7 @@ jobs:
           sudo apt-get install qtbase5-dev qtbase5-private-dev qtbase5-dev-tools qt5-qmake qttools5-dev-tools libqt5opengl5-dev qtpositioning5-dev libqt5svg5-dev libqt5serialport5-dev
 
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -37,9 +37,9 @@ jobs:
         # queries: security-extended,security-and-quality
 
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3
       with:
         category: "/language:${{matrix.language}}"

.github/workflows/osx.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   qt5:
     name: GPXSee Qt5 build
-    runs-on: macos-latest
+    runs-on: macos-12
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -39,7 +39,7 @@ jobs:
       - name: Install Qt
         uses: jurplel/install-qt-action@v3
         with:
-          version: '6.6.1'
+          version: '6.7.1'
           modules: qtpositioning qtserialport qtimageformats
       - name: Create localization
         run: lrelease gpxsee.pro

CONTRIBUTING.md

@@ -1,4 +1,4 @@
-Only localization contributions are accepted at the moment, code pull requests will be rejected.
+__Only localization contributions are accepted at the moment, code pull requests will be rejected.__
 
 The rationale is, that I want leave the possibility to distribute GPXsee builds in the OS X/Windows
 stores under a non-GPL licence open. In the future, code pull requests under a

gpxsee.pro

@@ -3,7 +3,7 @@ unix:!macx:!android {
 } else {
     TARGET = GPXSee
 }
-VERSION = 13.18
+VERSION = 13.24
 
 
 QT += core \
@@ -27,7 +27,6 @@ HEADERS += src/common/config.h \
     src/common/garmin.h \
     src/common/coordinates.h \
     src/common/hash.h \
-    src/common/linec.h \
     src/common/range.h \
     src/common/rectc.h \
     src/common/textcodec.h \
@@ -39,12 +38,9 @@ HEADERS += src/common/config.h \
     src/common/greatcircle.h \
     src/common/programpaths.h \
     src/common/tifffile.h \
-    src/common/downloader.h \
     src/common/polygon.h \
     src/common/color.h \
     src/common/csv.h \
-    src/common/dem.h \
-    src/common/demloader.h \
     src/GUI/crosshairitem.h \
     src/GUI/motioninfoitem.h \
     src/GUI/pluginparameters.h \
@@ -122,12 +118,18 @@ HEADERS += src/common/config.h \
     src/data/gpsdumpparser.h \
     src/data/style.h \
     src/data/twonavparser.h \
+    src/map/downloader.h \
+    src/map/demloader.h \
     src/map/ENC/attributes.h \
     src/map/ENC/mapdata.h \
     src/map/ENC/atlasdata.h \
     src/map/ENC/objects.h \
     src/map/ENC/rastertile.h \
     src/map/ENC/style.h \
+    src/map/IMG/demfile.h \
+    src/map/IMG/demtile.h \
+    src/map/IMG/demtree.h \
+    src/map/IMG/jls.h \
     src/map/IMG/section.h \
     src/map/IMG/zoom.h \
     src/map/conversion.h \
@@ -135,8 +137,10 @@ HEADERS += src/common/config.h \
     src/map/encjob.h \
     src/map/encmap.h \
     src/map/ENC/iso8211.h \
+    src/map/filter.h \
     src/map/gemfmap.h \
     src/map/gmifile.h \
+    src/map/metatype.h \
     src/map/oruxmap.h \
     src/map/osmdroidmap.h \
     src/map/proj/polyconic.h \
@@ -190,6 +194,7 @@ HEADERS += src/common/config.h \
     src/map/sqlitemap.h \
     src/map/utm.h \
     src/map/map.h \
+    src/map/dem.h \
     src/map/maplist.h \
     src/map/onlinemap.h \
     src/map/tile.h \
@@ -275,10 +280,7 @@ SOURCES += src/main.cpp \
     src/common/greatcircle.cpp \
     src/common/programpaths.cpp \
     src/common/tifffile.cpp \
-    src/common/downloader.cpp \
     src/common/csv.cpp \
-    src/common/dem.cpp \
-    src/common/demloader.cpp \
     src/GUI/crosshairitem.cpp \
     src/GUI/motioninfoitem.cpp \
     src/GUI/pluginparameters.cpp \
@@ -341,14 +343,20 @@ SOURCES += src/main.cpp \
     src/GUI/pngexportdialog.cpp \
     src/GUI/projectioncombobox.cpp \
     src/GUI/passwordedit.cpp \
+    src/map/downloader.cpp \
+    src/map/demloader.cpp \
     src/map/ENC/atlasdata.cpp \
     src/map/ENC/mapdata.cpp \
     src/map/ENC/rastertile.cpp \
     src/map/ENC/style.cpp \
+    src/map/IMG/demfile.cpp \
+    src/map/IMG/demtree.cpp \
+    src/map/IMG/jls.cpp \
     src/map/conversion.cpp \
     src/map/encatlas.cpp \
     src/map/encmap.cpp \
     src/map/ENC/iso8211.cpp \
+    src/map/filter.cpp \
     src/map/gemfmap.cpp \
     src/map/gmifile.cpp \
     src/map/oruxmap.cpp \
@@ -426,6 +434,7 @@ SOURCES += src/main.cpp \
     src/map/geocentric.cpp \
     src/map/jnxmap.cpp \
     src/map/map.cpp \
+    src/map/dem.cpp \
     src/map/geotiffmap.cpp \
     src/map/image.cpp \
     src/map/mbtilesmap.cpp \
@@ -465,8 +474,7 @@ SOURCES += src/main.cpp \
     src/data/smlparser.cpp \
     src/data/geojsonparser.cpp
 
-DEFINES += APP_VERSION=\\\"$$VERSION\\\" \
-    QT_NO_DEPRECATED_WARNINGS
+DEFINES += APP_VERSION=\\\"$$VERSION\\\"
 
 RESOURCES += gpxsee.qrc
 TRANSLATIONS = lang/gpxsee_en.ts \

gpxsee.qrc

@@ -165,6 +165,10 @@
 		<file alias="rescue-station.png">icons/map/marine/rescue-station.png</file>
 		<file alias="windmill.png">icons/map/marine/windmill.png</file>
 		<file alias="flagstaff.png">icons/map/marine/flagstaff.png</file>
+		<file alias="deviation-dolphin.png">icons/map/marine/deviation-dolphin.png</file>
+		<file alias="kelp.png">icons/map/marine/kelp.png</file>
+		<file alias="eddies.png">icons/map/marine/eddies.png</file>
+		<file alias="dome.png">icons/map/marine/dome.png</file>
 	</qresource>
 
 	<!-- Mapsforge rendertheme -->

icons/formats/scripts/icns.sh

@@ -4,7 +4,7 @@ while read e; do
 	IFS=":"; set $e
 
 	EXT=`echo $1 | tr /a-z/ /A-Z/`
-	sed -e "s/\$EXTENSION/$EXT/" -e "s/\$COLOR/$2/" icon-template.svg > $1.svg
+	sed -e "s/\$EXT/$EXT/" -e "s/\$COLOR/$2/" icon-template.svg > $1.svg
 
 	ICONSET=$1.iconset
 	mkdir $ICONSET

icons/formats/scripts/ico.sh

@@ -4,7 +4,7 @@ while read e; do
 	IFS=":"; set $e
 
 	EXT=`echo $1 | tr /a-z/ /A-Z/`
-	sed -e "s/\$EXTENSION/$EXT/" -e "s/\$COLOR/$2/" icon-template.svg > $1.svg
+	sed -e "s/\$EXT/$EXT/" -e "s/\$COLOR/$2/" icon-template.svg > $1.svg
 	convert -density 400 -background none $1.svg -define icon:auto-resize $1.ico
 	rm $1.svg
 done < extensions

icons/formats/scripts/icon-template.svg

@@ -13,8 +13,8 @@
   <g transform="translate(16.573463,124.9782)">
     <rect y="0" x="0" id="textrect" height="50" width="120" style="fill:$COLOR;fill-opacity:1;stroke:none;"/>
 <!--
-    <text y="28" x="60" dominant-baseline="central" text-anchor="middle" style="fill:#FFFFFF;font-size:39px;font-family:Helvetica;font-weight:bold;">$EXTENSION</text>
+    <text y="28" x="60" dominant-baseline="central" text-anchor="middle" style="fill:#FFFFFF;font-size:39px;font-family:Helvetica;font-weight:bold;">$EXT</text>
 -->
-    <text y="25" x="60" dy="0.36em" text-anchor="middle" style="fill:#FFFFFF;font-size:39px;font-family:Helvetica;font-weight:bold;">$EXTENSION</text>
+    <text y="25" x="60" dy="0.36em" text-anchor="middle" style="fill:#FFFFFF;font-size:39px;font-family:Helvetica;font-weight:bold;">$EXT</text>
   </g>
 </svg>

pkg/linux/gpxsee.xml

@@ -269,6 +269,7 @@
 		<root-XML namespaceURI="http://www.gpxsee.org/map/1.2" localName="map"/>
 		<root-XML namespaceURI="http://www.gpxsee.org/map/1.3" localName="map"/>
 		<root-XML namespaceURI="http://www.gpxsee.org/map/1.4" localName="map"/>
+		<root-XML namespaceURI="http://www.gpxsee.org/map/1.5" localName="map"/>
 		<glob pattern="*.xml"/>
 	</mime-type>
 

pkg/mac/Info.plist

@@ -1712,7 +1712,7 @@
 			<key>UTTypeIdentifier</key>
 			<string>org.gpxsee.map</string>
 			<key>UTTypeReferenceURL</key>
-			<string>http://www.gpxsee.org/map/1.4/</string>
+			<string>http://www.gpxsee.org/map/1.5/</string>
 			<key>UTTypeDescription</key>
 			<string>GPXSee Map Definition File</string>
 			<key>UTTypeConformsTo</key>

pkg/windows/gpxsee64.nsi

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

src/GUI/app.cpp

@@ -13,8 +13,8 @@
 #endif // Q_OS_ANDROID
 #include "common/programpaths.h"
 #include "common/config.h"
-#include "common/downloader.h"
-#include "common/dem.h"
+#include "map/downloader.h"
+#include "map/dem.h"
 #include "map/ellipsoid.h"
 #include "map/gcs.h"
 #include "map/conversion.h"
@@ -29,9 +29,9 @@ App::App(int &argc, char **argv) : QApplication(argc, argv)
 {
 #if defined(Q_OS_WIN32) || defined(Q_OS_MAC)
 	setApplicationName(APP_NAME);
-#else
+#else // Q_OS_WIN32 || Q_OS_MAC
 	setApplicationName(QString(APP_NAME).toLower());
-#endif
+#endif // Q_OS_WIN32 || Q_OS_MAC
 	setApplicationVersion(APP_VERSION);
 
 	QTranslator *app = new QTranslator(this);
@@ -43,8 +43,13 @@ App::App(int &argc, char **argv) : QApplication(argc, argv)
 #if defined(Q_OS_WIN32) || defined(Q_OS_MAC)
 	if (qt->load(QLocale::system(), "qt", "_", ProgramPaths::translationsDir()))
 #else // Q_OS_WIN32 || Q_OS_MAC
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 	if (qt->load(QLocale::system(), "qt", "_", QLibraryInfo::location(
 	  QLibraryInfo::TranslationsPath)))
+#else // QT 6
+	if (qt->load(QLocale::system(), "qt", "_", QLibraryInfo::path(
+	  QLibraryInfo::TranslationsPath)))
+#endif // QT 6
 #endif // Q_OS_WIN32 || Q_OS_MAC
 		installTranslator(qt);
 
@@ -65,6 +70,9 @@ App::App(int &argc, char **argv) : QApplication(argc, argv)
 	loadPCSs();
 	Waypoint::loadSymbolIcons(ProgramPaths::symbolsDir());
 
+#if defined(Q_OS_WIN32) || defined(Q_OS_MAC)
+	QIcon::setThemeName(APP_NAME);
+#endif // Q_OS_WIN32 || Q_OS_MAC
 #if QT_VERSION >= QT_VERSION_CHECK(5, 12, 0)
 	QIcon::setFallbackThemeName(APP_NAME);
 #endif // QT 5.12

src/GUI/areaitem.cpp

@@ -9,8 +9,9 @@
 #include "areaitem.h"
 
 
-ToolTip AreaItem::info() const
+ToolTip AreaItem::info(bool extended) const
 {
+	Q_UNUSED(extended);
 	ToolTip tt;
 
 	if (!_area.name().isEmpty())

src/GUI/areaitem.h

@@ -26,7 +26,7 @@ public:
 	void setDigitalZoom(int zoom);
 	void updateStyle();
 
-	ToolTip info() const;
+	ToolTip info(bool extended) const;
 
 protected:
 	void hoverEnterEvent(QGraphicsSceneHoverEvent *event);