Use a password for the codesigning certificate

Currently translated at 99.7% (492 of 493 strings)

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

.appveyor.yml

@@ -1,4 +1,4 @@
-version: 13.41.{build}
+version: 13.45.{build}
 
 configuration:
   - Release
@@ -10,10 +10,12 @@ environment:
   NSISDIR: C:\Program Files (x86)\NSIS
   JOMDIR: C:\Qt\Tools\QtCreator\bin\jom
   matrix:
-  - QTDIR: C:\Qt\5.15\msvc2019_64
+  - job_name: Qt5
+    QTDIR: C:\Qt\5.15\msvc2019_64
     OPENSSLDIR: C:\OpenSSL-v111-Win64\bin
     NSISDEF: /DOPENSSL /DANGLE
-  - QTDIR: C:\Qt\6.8\msvc2022_64
+  - job_name: Qt6
+    QTDIR: C:\Qt\6.8\msvc2022_64
     NSISDEF: /DQT6
 
 install:
@@ -27,9 +29,12 @@ build_script:
     qmake gpxsee.pro
     jom release
 
+after_build:
+- cmd: |-
     md installer
     copy release\GPXSee.exe installer
     windeployqt --release installer\GPXSee.exe
+    curl -L -o installer\imageformats\pbf4.dll https://ci.appveyor.com/api/projects/tumic0/QtPBFImagePlugin/artifacts/release/pbf4.dll?job=%APPVEYOR_JOB_NAME%
     copy pkg\windows\gpxsee64.nsi installer
     xcopy data\CRS installer\CRS /i
     xcopy data\maps installer\maps /i
@@ -38,7 +43,6 @@ build_script:
     copy licence.txt installer
     IF DEFINED OPENSSLDIR (copy %OPENSSLDIR%\libcrypto-*-x64.dll installer)
     IF DEFINED OPENSSLDIR (copy %OPENSSLDIR%\libssl-*-x64.dll installer)
-
     makensis.exe %NSISDEF% installer\gpxsee64.nsi
 
 artifacts:

.github/workflows/android.yml

@@ -38,10 +38,26 @@ jobs:
           modules: qtimageformats qtpositioning qtserialport qt5compat
       - name: Install Android OpenSSL
         run:  git clone https://github.com/KDAB/android_openssl.git
+      - name: Get latest QtPBFImagePlugin run-id
+        id: runid
+        run: echo "runid=$(gh run list --repo tumic0/QtPBFImagePlugin --workflow 'Android' --limit 1 --json databaseId -q '.[0].databaseId')" >> $GITHUB_OUTPUT
+        env:
+          GH_TOKEN: ${{ github.token }}
+      - name: Create the plugins dir
+        run: mkdir plugins
+      - name: Download QtPBFImagePlugin
+        uses: actions/download-artifact@v4
+        with:
+          name: libplugins_imageformats_libpbf_arm64-v8a.so
+          github-token: ${{ github.token }}
+          repository: tumic0/QtPBFImagePlugin
+          path: plugins
+          merge-multiple: true
+          run-id: ${{steps.runid.outputs.runid}}
       - name: Create localization
         run:  lrelease gpxsee.pro
       - name: Configure build
-        run:  qmake gpxsee.pro OPENSSL_PATH=android_openssl 
+        run:  qmake gpxsee.pro OPENSSL_PATH=android_openssl ANDROID_EXTRA_PLUGINS=${{ github.workspace }}/plugins
       - name: Build project
         run:  make -j4 apk
       - name: Upload artifacts

.github/workflows/osx.yml

@@ -15,7 +15,7 @@ jobs:
       - name: Install Qt
         uses: jurplel/install-qt-action@v4
         with:
-          version: '6.8.2'
+          version: '6.9.1'
           modules: qtpositioning qtserialport qtimageformats
       - name: Create localization
         run: lrelease gpxsee.pro
@@ -23,8 +23,35 @@ jobs:
         run: qmake gpxsee.pro QMAKE_APPLE_DEVICE_ARCHS="x86_64h arm64"
       - name: Build project
         run: make -j3
+      - name: Get latest QtPBFImagePlugin run-id
+        id: runid
+        run: echo "runid=$(gh run list --repo tumic0/QtPBFImagePlugin --workflow 'OS X' --limit 1 --json databaseId -q '.[0].databaseId')" >> $GITHUB_OUTPUT
+        env:
+          GH_TOKEN: ${{ github.token }}
+      - name: Download QtPBFImagePlugin
+        uses: actions/download-artifact@v4
+        with:
+          name: libpbf.dylib
+          github-token: ${{ github.token }}
+          repository: tumic0/QtPBFImagePlugin
+          path: GPXSee.app/Contents/Plugins/imageformats
+          merge-multiple: true
+          run-id: ${{ steps.runid.outputs.runid }}
+      - name: Install codesigning certificate
+        env:
+          MACOS_CERTIFICATE: ${{ secrets.CODESIGN_CERT }}
+          MACOS_CERTIFICATE_PWD: ${{ secrets.CODESIGN_PWD }}
+          KEYCHAIN_NAME: gpxsee
+          KEYCHAIN_PWD: password
+        run: |
+          echo $MACOS_CERTIFICATE | base64 --decode > certificate.p12
+          security create-keychain -p $KEYCHAIN_PWD $KEYCHAIN_NAME
+          security default-keychain -s $KEYCHAIN_NAME
+          security unlock-keychain -p $KEYCHAIN_PWD $KEYCHAIN_NAME
+          security import certificate.p12 -k $KEYCHAIN_NAME -P $MACOS_CERTIFICATE_PWD -T /usr/bin/codesign
+          security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k $KEYCHAIN_PWD $KEYCHAIN_NAME
       - name: Create DMG
-        run: macdeployqt GPXSee.app -dmg -appstore-compliant
+        run: macdeployqt GPXSee.app -dmg -appstore-compliant -codesign=GPXSee
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:

data/maps/OpenFreeMap.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map xmlns="http://www.gpxsee.org/map/1.4">
+	<name>OpenFreeMap</name>
+	<url>https://tiles.openfreemap.org/planet/latest/$z/$x/$y.pbf</url>
+	<tile type="vector" size="512"/>
+	<zoom max="14"/>
+	<copyright>© OpenFreeMap © OpenMapTiles © OpenStreetMap contributors</copyright>
+</map>

data/style/style.xml

@@ -42,7 +42,7 @@
     <rule e="way" closed="yes" k="landuse" v="comercial|residential|retail" zoom-min="10">
         <area fill="#e6e2d9"/>
     </rule>
-    <rule e="way" closed="yes" k="landuse" v="forest|wood" zoom-min="10">
+    <rule e="way" closed="yes" k="landuse" v="forest|wood" zoom-min="9">
         <area fill="#cadfaf"/>
     </rule>
     <rule e="way" closed="yes" k="landuse" v="meadow|grass|greenfield|village_green" zoom-min="10">
@@ -56,7 +56,7 @@
     </rule>
 
     <!-- Hillshading -->
-    <hillshading zoom-min="10" zoom-max="15"/>
+    <hillshading zoom-min="9" zoom-max="15"/>
 
     <!-- Contour lines -->
     <rule e="way" k="contour_ext" v="*">
@@ -198,13 +198,13 @@
     </rule>
 
     <!-- Area overlays -->
-    <rule e="way" k="landuse" v="military" zoom-min="10">
+    <rule e="way" closed="yes" k="landuse" v="military" zoom-min="9">
         <area src=":/patterns/military-area.svg" symbol-height="4"/>
         <rule e="way" k="*" v="*" zoom-min="16">
             <caption fill="#ff4040" font-size="10" font-style="italic" text-transform="uppercase" k="name" stroke="#ffffff" stroke-width="2"/>
         </rule>
     </rule>
-    <rule e="way" k="boundary" v="protected_area|national_park" zoom-min="10" zoom-max="14">
+    <rule e="way" closed="yes" k="boundary" v="protected_area|national_park" zoom-min="9" zoom-max="14">
         <rule e="way" k="protect_class" v="pr_2">
             <area src=":/patterns/nature-reserve.svg" symbol-height="4"/>
             <rule e="way" k="*" v="*" zoom-max="11">
@@ -214,17 +214,17 @@
     </rule>
 
     <!-- Buildings -->
-    <rule e="way" k="building" v="-|civic|office|cathedral|church|basilica">
+    <rule e="way" closed="yes" k="building" v="-|civic|office|cathedral|church|basilica">
         <area fill="#dbd0b6" stroke="#cdccc4" stroke-width="0.1"/>
     </rule>
 
-    <rule e="way" k="building" v="civic|office">
+    <rule e="way" closed="yes" k="building" v="civic|office">
         <area fill="#cfc4b3" stroke="#cdccc4" stroke-width="0.1"/>
         <rule e="way" k="*" v="*" zoom-min="16">
             <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" priority="-10"/>
         </rule>
     </rule>
-    <rule e="way" k="building" v="cathedral|church|basilica">
+    <rule e="way" closed="yes" k="building" v="cathedral|church|basilica">
         <area fill="#a19d96" stroke="#cdccc4" stroke-width="0.1"/>
         <rule e="way" k="*" v="*" zoom-min="16">
             <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2"/>

gpxsee.pro

@@ -3,7 +3,7 @@ unix:!macx:!android {
 } else {
     TARGET = GPXSee
 }
-VERSION = 13.41
+VERSION = 13.45
 
 QT += core \
     gui \
@@ -23,6 +23,8 @@ greaterThan(QT_MAJOR_VERSION, 5) {
 CONFIG += object_parallel_to_source
 INCLUDEPATH += ./src
 HEADERS += src/common/config.h \
+    src/GUI/legendentryitem.h \
+    src/GUI/legenditem.h \
     src/common/garmin.h \
     src/common/coordinates.h \
     src/common/hash.h \
@@ -276,6 +278,8 @@ HEADERS += src/common/config.h \
     src/data/geojsonparser.h
 
 SOURCES += src/main.cpp \
+    src/GUI/legendentryitem.cpp \
+    src/GUI/legenditem.cpp \
     src/common/coordinates.cpp \
     src/common/rectc.cpp \
     src/common/range.cpp \

gpxsee.qrc

@@ -139,7 +139,115 @@
 	<qresource prefix="/marine">
 		<file alias="light-major.png">icons/map/marine/light-major.png</file>
 		<file alias="buoy.png">icons/map/marine/buoy.png</file>
+		<file alias="buoy-white.png">icons/map/marine/buoy-white.png</file>
+		<file alias="buoy-white-black.png">icons/map/marine/buoy-white-black.png</file>
+		<file alias="buoy-white-green.png">icons/map/marine/buoy-white-green.png</file>
+		<file alias="buoy-white-red.png">icons/map/marine/buoy-white-red.png</file>
+		<file alias="buoy-white-yellow.png">icons/map/marine/buoy-white-yellow.png</file>
+		<file alias="buoy-white-orange.png">icons/map/marine/buoy-white-orange.png</file>
+		<file alias="buoy-white-yellow-white.png">icons/map/marine/buoy-white-yellow-white.png</file>
+		<file alias="buoy-white-orange-white.png">icons/map/marine/buoy-white-orange-white.png</file>
+		<file alias="buoy-green.png">icons/map/marine/buoy-green.png</file>
+		<file alias="buoy-green-white.png">icons/map/marine/buoy-green-white.png</file>
+		<file alias="buoy-green-white-green-white.png">icons/map/marine/buoy-green-white-green-white.png</file>
+		<file alias="buoy-green-black.png">icons/map/marine/buoy-green-black.png</file>
+		<file alias="buoy-green-red.png">icons/map/marine/buoy-green-red.png</file>
+		<file alias="buoy-green-red-green.png">icons/map/marine/buoy-green-red-green.png</file>
+		<file alias="buoy-green-red-green-red.png">icons/map/marine/buoy-green-red-green-red.png</file>
+		<file alias="buoy-red.png">icons/map/marine/buoy-red.png</file>
+		<file alias="buoy-red-white.png">icons/map/marine/buoy-red-white.png</file>
+		<file alias="buoy-red-white-red-white.png">icons/map/marine/buoy-red-white-red-white.png</file>
+		<file alias="buoy-red-black.png">icons/map/marine/buoy-red-black.png</file>
+		<file alias="buoy-red-green.png">icons/map/marine/buoy-red-green.png</file>
+		<file alias="buoy-red-yellow.png">icons/map/marine/buoy-red-yellow.png</file>
+		<file alias="buoy-red-green-red.png">icons/map/marine/buoy-red-green-red.png</file>
+		<file alias="buoy-red-green-red-green.png">icons/map/marine/buoy-red-green-red-green.png</file>
+		<file alias="buoy-yellow.png">icons/map/marine/buoy-yellow.png</file>
+		<file alias="buoy-yellow-white.png">icons/map/marine/buoy-yellow-white.png</file>
+		<file alias="buoy-yellow-white-yellow.png">icons/map/marine/buoy-yellow-white-yellow.png</file>
+		<file alias="buoy-yellow-black.png">icons/map/marine/buoy-yellow-black.png</file>
+		<file alias="buoy-yellow-black-yellow.png">icons/map/marine/buoy-yellow-black-yellow.png</file>
+		<file alias="buoy-yellow-red-yellow.png">icons/map/marine/buoy-yellow-red-yellow.png</file>
+		<file alias="buoy-black-white.png">icons/map/marine/buoy-black-white.png</file>
+		<file alias="buoy-black-red.png">icons/map/marine/buoy-black-red.png</file>
+		<file alias="buoy-black-white-black.png">icons/map/marine/buoy-black-white-black.png</file>
+		<file alias="buoy-black-red-black.png">icons/map/marine/buoy-black-red-black.png</file>
+		<file alias="buoy-black-green.png">icons/map/marine/buoy-black-green.png</file>
+		<file alias="buoy-black-yellow.png">icons/map/marine/buoy-black-yellow.png</file>
+		<file alias="buoy-black-orange.png">icons/map/marine/buoy-black-orange.png</file>
+		<file alias="buoy-black-yellow-black.png">icons/map/marine/buoy-black-yellow-black.png</file>
+		<file alias="buoy-orange.png">icons/map/marine/buoy-orange.png</file>
+		<file alias="buoy-orange-white.png">icons/map/marine/buoy-orange-white.png</file>
+		<file alias="buoy-orange-black.png">icons/map/marine/buoy-orange-black.png</file>
+		<file alias="buoy-grey.png">icons/map/marine/buoy-grey.png</file>
 		<file alias="beacon.png">icons/map/marine/beacon.png</file>
+		<file alias="beacon-white.png">icons/map/marine/beacon-white.png</file>
+		<file alias="beacon-white-black.png">icons/map/marine/beacon-white-black.png</file>
+		<file alias="beacon-white-green.png">icons/map/marine/beacon-white-green.png</file>
+		<file alias="beacon-white-red.png">icons/map/marine/beacon-white-red.png</file>
+		<file alias="beacon-white-yellow.png">icons/map/marine/beacon-white-yellow.png</file>
+		<file alias="beacon-white-orange.png">icons/map/marine/beacon-white-orange.png</file>
+		<file alias="beacon-white-yellow-white.png">icons/map/marine/beacon-white-yellow-white.png</file>
+		<file alias="beacon-white-orange-white.png">icons/map/marine/beacon-white-orange-white.png</file>
+		<file alias="beacon-green.png">icons/map/marine/beacon-green.png</file>
+		<file alias="beacon-green-white.png">icons/map/marine/beacon-green-white.png</file>
+		<file alias="beacon-green-white-green-white.png">icons/map/marine/beacon-green-white-green-white.png</file>
+		<file alias="beacon-green-black.png">icons/map/marine/beacon-green-black.png</file>
+		<file alias="beacon-green-red.png">icons/map/marine/beacon-green-red.png</file>
+		<file alias="beacon-green-red-green.png">icons/map/marine/beacon-green-red-green.png</file>
+		<file alias="beacon-green-red-green-red.png">icons/map/marine/beacon-green-red-green-red.png</file>
+		<file alias="beacon-red.png">icons/map/marine/beacon-red.png</file>
+		<file alias="beacon-red-white.png">icons/map/marine/beacon-red-white.png</file>
+		<file alias="beacon-red-white-red-white.png">icons/map/marine/beacon-red-white-red-white.png</file>
+		<file alias="beacon-red-black.png">icons/map/marine/beacon-red-black.png</file>
+		<file alias="beacon-red-green.png">icons/map/marine/beacon-red-green.png</file>
+		<file alias="beacon-red-yellow.png">icons/map/marine/beacon-red-yellow.png</file>
+		<file alias="beacon-red-green-red.png">icons/map/marine/beacon-red-green-red.png</file>
+		<file alias="beacon-red-green-red-green.png">icons/map/marine/beacon-red-green-red-green.png</file>
+		<file alias="beacon-yellow.png">icons/map/marine/beacon-yellow.png</file>
+		<file alias="beacon-yellow-white.png">icons/map/marine/beacon-yellow-white.png</file>
+		<file alias="beacon-yellow-white-yellow.png">icons/map/marine/beacon-yellow-white-yellow.png</file>
+		<file alias="beacon-yellow-black.png">icons/map/marine/beacon-yellow-black.png</file>
+		<file alias="beacon-yellow-black-yellow.png">icons/map/marine/beacon-yellow-black-yellow.png</file>
+		<file alias="beacon-yellow-red-yellow.png">icons/map/marine/beacon-yellow-red-yellow.png</file>
+		<file alias="beacon-black-white.png">icons/map/marine/beacon-black-white.png</file>
+		<file alias="beacon-black-white-black.png">icons/map/marine/beacon-black-white-black.png</file>
+		<file alias="beacon-black-red.png">icons/map/marine/beacon-black-red.png</file>
+		<file alias="beacon-black-red-black.png">icons/map/marine/beacon-black-red-black.png</file>
+		<file alias="beacon-black-green.png">icons/map/marine/beacon-black-green.png</file>
+		<file alias="beacon-black-yellow.png">icons/map/marine/beacon-black-yellow.png</file>
+		<file alias="beacon-black-orange.png">icons/map/marine/beacon-black-orange.png</file>
+		<file alias="beacon-black-yellow-black.png">icons/map/marine/beacon-black-yellow-black.png</file>
+		<file alias="beacon-orange.png">icons/map/marine/beacon-orange.png</file>
+		<file alias="beacon-orange-white.png">icons/map/marine/beacon-orange-white.png</file>
+		<file alias="beacon-orange-black.png">icons/map/marine/beacon-orange-black.png</file>
+		<file alias="beacon-grey.png">icons/map/marine/beacon-grey.png</file>
+		<file alias="spar-buoy.png">icons/map/marine/spar-buoy.png</file>
+		<file alias="spar-buoy-red.png">icons/map/marine/spar-buoy-red.png</file>
+		<file alias="spar-buoy-green.png">icons/map/marine/spar-buoy-green.png</file>
+		<file alias="spar-buoy-yellow.png">icons/map/marine/spar-buoy-yellow.png</file>
+		<file alias="spar-buoy-white.png">icons/map/marine/spar-buoy-white.png</file>
+		<file alias="spar-buoy-black-yellow.png">icons/map/marine/spar-buoy-black-yellow.png</file>
+		<file alias="spar-buoy-white-red.png">icons/map/marine/spar-buoy-white-red.png</file>
+		<file alias="spar-buoy-black-red.png">icons/map/marine/spar-buoy-black-red.png</file>
+		<file alias="spar-buoy-white-green.png">icons/map/marine/spar-buoy-white-green.png</file>
+		<file alias="spar-buoy-red-yellow.png">icons/map/marine/spar-buoy-red-yellow.png</file>
+		<file alias="spar-buoy-red-green.png">icons/map/marine/spar-buoy-red-green.png</file>
+		<file alias="spar-buoy-black-yellow-black.png">icons/map/marine/spar-buoy-black-yellow-black.png</file>
+		<file alias="spar-buoy-yellow-black.png">icons/map/marine/spar-buoy-yellow-black.png</file>
+		<file alias="spar-buoy-yellow-black-yellow.png">icons/map/marine/spar-buoy-yellow-black-yellow.png</file>
+		<file alias="spar-buoy-red-white.png">icons/map/marine/spar-buoy-red-white.png</file>
+		<file alias="spar-buoy-green-red-green.png">icons/map/marine/spar-buoy-green-red-green.png</file>
+		<file alias="spar-buoy-red-green-red.png">icons/map/marine/spar-buoy-red-green-red.png</file>
+		<file alias="spar-buoy-black-red-black.png">icons/map/marine/spar-buoy-black-red-black.png</file>
+		<file alias="spar-buoy-yellow-red-yellow.png">icons/map/marine/spar-buoy-yellow-red-yellow.png</file>
+		<file alias="spar-buoy-green-red.png">icons/map/marine/spar-buoy-green-red.png</file>
+		<file alias="spar-buoy-black-white.png">icons/map/marine/spar-buoy-black-white.png</file>
+		<file alias="spar-buoy-white-yellow.png">icons/map/marine/spar-buoy-white-yellow.png</file>
+		<file alias="spar-buoy-yellow-white.png">icons/map/marine/spar-buoy-yellow-white.png</file>
+		<file alias="spar-buoy-green-white.png">icons/map/marine/spar-buoy-green-white.png</file>
+		<file alias="mooring-buoy.png">icons/map/marine/mooring-buoy.png</file>
+		<file alias="platform.png">icons/map/marine/platform.png</file>
 		<file alias="rock-exposed.png">icons/map/marine/rock-exposed.png</file>
 		<file alias="rock-dangerous.png">icons/map/marine/rock-dangerous.png</file>
 		<file alias="wreck.png">icons/map/marine/wreck.png</file>
@@ -159,11 +267,8 @@
 		<file alias="yacht-harbor.png">icons/map/marine/yacht-harbor.png</file>
 		<file alias="fishing-harbor.png">icons/map/marine/fishing-harbor.png</file>
 		<file alias="pile.png">icons/map/marine/pile.png</file>
-		<file alias="spar-buoy.png">icons/map/marine/spar-buoy.png</file>
-		<file alias="mooring-buoy.png">icons/map/marine/mooring-buoy.png</file>
 		<file alias="tower.png">icons/map/marine/tower.png</file>
 		<file alias="chimney.png">icons/map/marine/chimney.png</file>
-		<file alias="platform.png">icons/map/marine/platform.png</file>
 		<file alias="ferry-line.png">icons/map/marine/ferry-line.png</file>
 		<file alias="dw-route-line.png">icons/map/marine/dw-route-line.png</file>
 		<file alias="fence-line.png">icons/map/marine/fence-line.png</file>
@@ -218,6 +323,18 @@
 		<file alias="nature-reserve-line.png">icons/map/marine/nature-reserve-line.png</file>
 		<file alias="sanctuary-line.png">icons/map/marine/sanctuary-line.png</file>
 		<file alias="fishing-farm.png">icons/map/marine/fishing-farm.png</file>
+		<file alias="shellfish-farm-line.png">icons/map/marine/shellfish-farm-line.png</file>
+		<file alias="degaussing-line.png">icons/map/marine/degaussing-line.png</file>
+		<file alias="nofishing-line.png">icons/map/marine/nofishing-line.png</file>
+		<file alias="fishing-line.png">icons/map/marine/fishing-line.png</file>
+		<file alias="minefield-line.png">icons/map/marine/minefield-line.png</file>
+		<file alias="international-maritime-boundary.png">icons/map/marine/international-maritime-boundary.png</file>
+		<file alias="straight-territorial-sea-baseline.png">icons/map/marine/straight-territorial-sea-baseline.png</file>
+		<file alias="seaward-limit-of-territorial-sea.png">icons/map/marine/seaward-limit-of-territorial-sea.png</file>
+		<file alias="seaward-limit-of-contiguous-zone.png">icons/map/marine/seaward-limit-of-contiguous-zone.png</file>
+		<file alias="foul.png">icons/map/marine/foul.png</file>
+		<file alias="dumping-ground-line.png">icons/map/marine/dumping-ground-line.png</file>
+		<file alias="radio-call-garmin.png">icons/map/marine/radio-call-garmin.png</file>
 	</qresource>
 
 	<!-- Patterns (Mapsforge) -->