Added missing artifact name

Added missing macdeployqt step
+ use macdeployqt to create the DMG
2025-07-10 01:04:27 +02:00 · 2021-10-31 09:15:18 +01:00 · 2021-10-31 09:06:34 +01:00 · 2021-10-31 08:54:33 +01:00 · 2021-10-31 08:15:27 +01:00 · 2021-10-31 08:04:24 +01:00
246 changed files with 3933 additions and 3751 deletions
--- a/.appveyor.yml
+++ b/.appveyor.yml
@ -1,4 +1,4 @@
-version: 9.7.{build}
+version: 9.11.{build}

 configuration:
  - Release
@ -8,31 +8,16 @@ image:

 environment:
  NSISDIR: C:\Program Files (x86)\NSIS
+  OPENSSLDIR: C:\OpenSSL-v111-Win64\bin
  matrix:
-  - QTDIR: C:\Qt\5.15\msvc2019
-    NSI: gpxsee.nsi
-    VCVARS: vcvars32.bat
-    OPENSSLDIR: C:\OpenSSL-v111-Win32\bin
-    LIBCRYPTO: libssl-1_1.dll
-    LIBSSL: libcrypto-1_1.dll
  - QTDIR: C:\Qt\5.15\msvc2019_64
-    NSI: gpxsee64.nsi
-    VCVARS: vcvars64.bat
-    OPENSSLDIR: C:\OpenSSL-v111-Win64\bin
-    LIBCRYPTO: libssl-1_1-x64.dll
-    LIBSSL: libcrypto-1_1-x64.dll
-  - QTDIR: C:\Qt\6.0\msvc2019_64
-    NSI: gpxsee64.nsi
-    VCVARS: vcvars64.bat
-    OPENSSLDIR: C:\OpenSSL-v111-Win64\bin
-    LIBCRYPTO: libssl-1_1-x64.dll
-    LIBSSL: libcrypto-1_1-x64.dll
+  - QTDIR: C:\Qt\6.2\msvc2019_64
    NSISDEF: /DQT6

 install:
 - cmd: |-
    set PATH=%QTDIR%\bin;%NSISDIR%;%PATH%
-    call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\"%VCVARS%
+    call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat

 build_script:
 - cmd: |-
@ -43,16 +28,16 @@ build_script:
    md installer
    copy release\GPXSee.exe installer
    windeployqt --release installer\GPXSee.exe
-    copy pkg\%NSI% installer
-    copy pkg\macros.nsh installer
+    copy pkg\gpxsee64.nsi installer
    xcopy pkg\csv installer\csv /i
    xcopy pkg\maps installer\maps /i
    xcopy lang\*.qm installer\translations\ /sy
+    xcopy icons\symbols installer\symbols /i
    copy licence.txt installer
-    copy %OPENSSLDIR%\%LIBCRYPTO% installer
-    copy %OPENSSLDIR%\%LIBSSL% installer
+    copy %OPENSSLDIR%\libcrypto-1_1-x64.dll installer
+    copy %OPENSSLDIR%\libssl-1_1-x64.dll installer

-    makensis.exe %NSISDEF% installer\%NSI%
+    makensis.exe %NSISDEF% installer\gpxsee64.nsi

 artifacts:
 - path: installer\GPXSee-*.exe
--- a/.github/workflows/osx.yml
+++ b/.github/workflows/osx.yml
@ -0,0 +1,31 @@
+name: OS X
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+    name: GPXSee
+    runs-on: macos-10.15
+    steps:
+      - name: Set environment variables
+        run: echo "PATH=/usr/local/opt/qt@5/bin:$PATH" >> $GITHUB_ENV
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Install dependencies
+        run: brew install qt5
+      - name: Create localization
+        run: lrelease gpxsee.pro
+      - name: Configure build
+        run: qmake gpxsee.pro
+      - name: Build project
+        run: make -j3
+      - name: Create DMG
+        run: macdeployqt GPXSee.app -dmg
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: GPXSee.dmg
+          path: GPXSee.dmg
--- a/.travis.yml
+++ b/.travis.yml
@ -1,32 +0,0 @@
-language: c++
-
-os:
-  - linux
-  - osx
-
-dist: focal
-osx_image: xcode12.5
-
-cache:
-  directories:
-    - $HOME/Library/Caches/Homebrew
-
-before_cache:
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew cleanup; fi
-
-addons:
-  homebrew:
-    packages:
-    - qt
-  apt:
-    packages:
-    - qtbase5-dev
-    - qtbase5-private-dev
-    - libqt5opengl5-dev
-    - qttools5-dev-tools
-
-script:
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then PATH=/usr/local/opt/qt/bin/:${PATH}; fi
-  - lrelease gpxsee.pro
-  - qmake gpxsee.pro
-  - make
--- a/README.md
+++ b/README.md
@ -18,7 +18,7 @@ GPXSee is a Qt-based GPS log file viewer and analyzer that supports all common G

 ## Build
 Build requirements:
-* Qt5 >= 5.11 or Qt 6.x
+* Qt5 >= 5.11 or Qt 6.x*
 * C++11 or newer compiler (tested: msvc2017, gcc 7.5.0, clang/Apple LLVM version 10.0.0)

 Build steps:
@ -28,6 +28,9 @@ qmake gpxsee.pro
 make # nmake on windows
 ```

+_* Qt6 builds do not support other encodings than UTF-X and iso8859-1 in XML files as support
+for such files was dropped in Qt6._
+
 ## Download
 * [Windows & OS X builds](http://sourceforge.net/projects/gpxsee)
 * [Linux packages](http://software.opensuse.org/download.html?project=home%3Atumic%3AGPXSee&package=gpxsee)
@ -48,7 +51,8 @@ GPXSee uses [Weblate](https://hosted.weblate.org/projects/gpxsee/translations/)
 GPXSee is licensed under GPL-3.0 (only). However, some 3rd party parts are using different, GPL compatible,
 licenses:
 * [Oxygen icons](icons/GUI) - LGPLv3
-* [Mapbox Maki icons](icons/POI) - CC0
+* [Mapbox Maki icons](icons/IMG) - CC0
+* [Map Icons Collection](icons/symbols) - CC BY SA 3.0
 * [RTree implementation](src/common/rtree.h) - Public domain
 * [Albers](src/map/proj/albersequal.cpp), [Geocentric](src/map/geocentric.cpp), [LCC](src/map/proj/lambertconic.cpp),
  [Mercator](src/map/proj/mercator.cpp), [Polar Stereographic](src/map/proj/polarstereographic.cpp),
--- a/gpxsee.pro
+++ b/gpxsee.pro
@ -3,7 +3,7 @@ unix:!macx {
 } else {
    TARGET = GPXSee
 }
-VERSION = 9.7
+VERSION = 9.11

 QT += core \
    gui \
@ -13,7 +13,10 @@ QT += core \
    concurrent \
    widgets \
    printsupport
-greaterThan(QT_MAJOR_VERSION, 5) {QT += openglwidgets}
+greaterThan(QT_MAJOR_VERSION, 5) {
+    QT += openglwidgets \
+          core5compat
+}

 CONFIG += object_parallel_to_source
 INCLUDEPATH += ./src
@ -33,6 +36,7 @@ HEADERS += src/common/config.h \
    src/common/tifffile.h \
    src/common/downloader.h \
    src/common/polygon.h \
+    src/common/color.h \
    src/GUI/authenticationwidget.h \
    src/GUI/axislabelitem.h \
    src/GUI/dirselectwidget.h \
@ -191,7 +195,6 @@ HEADERS += src/common/config.h \
    src/map/osm.h \
    src/map/rmap.h \
    src/map/calibrationpoint.h \
-    src/map/color.h \
    src/map/textitem.h \
    src/map/aqmmap.h \
    src/map/mapsforgemap.h \
@ -226,7 +229,6 @@ HEADERS += src/common/config.h \
    src/data/demloader.h \
    src/data/area.h \
    src/data/exifparser.h \
-    src/data/imageinfo.h \
    src/data/csv.h \
    src/data/cupparser.h \
    src/data/gpiparser.h \
@ -440,58 +442,17 @@ macx {
    ICON = icons/app/gpxsee.icns
    QMAKE_INFO_PLIST = pkg/Info.plist
    locale.path = Contents/Resources/translations
-    locale.files = lang/gpxsee_en.qm \
-        lang/gpxsee_cs.qm \
-        lang/gpxsee_de.qm \
-        lang/gpxsee_fi.qm \
-        lang/gpxsee_fr.qm \
-        lang/gpxsee_ru.qm \
-        lang/gpxsee_sv.qm \
-        lang/gpxsee_pl.qm \
-        lang/gpxsee_nb.qm \
-        lang/gpxsee_da.qm \
-        lang/gpxsee_tr.qm \
-        lang/gpxsee_es.qm \
-        lang/gpxsee_pt_BR.qm \
-        lang/gpxsee_uk.qm \
-        lang/gpxsee_hu.qm \
-        lang/gpxsee_it.qm \
-        lang/gpxsee_eo.qm \
-        lang/gpxsee_zh.qm
+    locale.files = $$files(lang/*.qm)
    csv.path = Contents/Resources
    csv.files = pkg/csv
    maps.path = Contents/Resources
    maps.files = pkg/maps
+    symbols.path = Contents/Resources/symbols
+    symbols.files = $$files(icons/symbols/*.png)
    icons.path = Contents/Resources/icons
-    icons.files = icons/formats/gpx.icns \
-        icons/formats/tcx.icns \
-        icons/formats/kml.icns \
-        icons/formats/fit.icns \
-        icons/formats/igc.icns \
-        icons/formats/nmea.icns \
-        icons/formats/plt.icns \
-        icons/formats/rte.icns \
-        icons/formats/wpt.icns \
-        icons/formats/loc.icns \
-        icons/formats/slf.icns \
-        icons/formats/json.icns \
-        icons/formats/cup.icns \
-        icons/formats/gpi.icns \
-        icons/formats/sml.icns \
-        icons/formats/img.icns \
-        icons/formats/jnx.icns \
-        icons/formats/kap.icns \
-        icons/formats/mbts.icns \
-        icons/formats/rmap.icns \
-        icons/formats/tba.icns \
-        icons/formats/aqm.icns \
-        icons/formats/sqlt.icns \
-        icons/formats/ov2.icns \
-        icons/formats/itn.icns \
-        icons/formats/wld.icns \
-        icons/formats/omd.icns \
-        icons/formats/ghp.icns
-    QMAKE_BUNDLE_DATA += locale maps icons csv
+    icons.files = $$files(icons/formats/*.icns)
+
+    QMAKE_BUNDLE_DATA += locale maps symbols icons csv
 }

 win32 {
@ -532,18 +493,20 @@ win32 {
 unix:!macx {
    isEmpty(PREFIX):PREFIX = /usr/local

-    maps.files = pkg/maps/*
+    maps.files = $$files(pkg/maps/*)
    maps.path = $$PREFIX/share/gpxsee/maps
-    csv.files = pkg/csv/*
+    csv.files = $$files(pkg/csv/*)
    csv.path = $$PREFIX/share/gpxsee/csv
-    locale.files = lang/*.qm
+    symbols.files = $$files(icons/symbols/*.png)
+    symbols.path = $$PREFIX/share/gpxsee/symbols
+    locale.files = $$files(lang/*.qm)
    locale.path = $$PREFIX/share/gpxsee/translations
-    icon.files = icons/app/hicolor/*
+    icon.files = $files(icons/app/hicolor/*)
    icon.path = $$PREFIX/share/icons/hicolor
    desktop.files = pkg/gpxsee.desktop
    desktop.path = $$PREFIX/share/applications
    mime.files = pkg/gpxsee.xml
    mime.path = $$PREFIX/share/mime/packages
    target.path = $$PREFIX/bin
-    INSTALLS += target maps csv locale icon desktop mime
+    INSTALLS += target maps csv symbols locale icon desktop mime
 }
--- a/gpxsee.qrc
+++ b/gpxsee.qrc
@ -51,85 +51,85 @@
 		<file alias="document-encrypt@2x.png">icons/GUI/document-encrypt.png</file>
 	</qresource>

-	<!-- POI icons for default IMG map style -->
-	<qresource prefix="/POI">
-		<file alias="airfield-11.png">icons/POI/airfield-11.png</file>
-		<file alias="airport-11.png">icons/POI/airport-11.png</file>
-		<file alias="amusement-park-11.png">icons/POI/amusement-park-11.png</file>
-		<file alias="bakery-11.png">icons/POI/bakery-11.png</file>
-		<file alias="bank-11.png">icons/POI/bank-11.png</file>
-		<file alias="bar-11.png">icons/POI/bar-11.png</file>
-		<file alias="bbq-11.png">icons/POI/bbq-11.png</file>
-		<file alias="beach-11.png">icons/POI/beach-11.png</file>
-		<file alias="bowling-alley-11.png">icons/POI/bowling-alley-11.png</file>
-		<file alias="building-alt1-11.png">icons/POI/building-alt1-11.png</file>
-		<file alias="bridge-11.png">icons/POI/bridge-11.png</file>
-		<file alias="bus-11.png">icons/POI/bus-11.png</file>
-		<file alias="cafe-11.png">icons/POI/cafe-11.png</file>
-		<file alias="campsite-11.png">icons/POI/campsite-11.png</file>
-		<file alias="car-11.png">icons/POI/car-11.png</file>
-		<file alias="car-rental-11.png">icons/POI/car-rental-11.png</file>
-		<file alias="car-repair-11.png">icons/POI/car-repair-11.png</file>
-		<file alias="casino-11.png">icons/POI/casino-11.png</file>
-		<file alias="cemetery-11.png">icons/POI/cemetery-11.png</file>
-		<file alias="cinema-11.png">icons/POI/cinema-11.png</file>
-		<file alias="clothing-store-11.png">icons/POI/clothing-store-11.png</file>
-		<file alias="communications-tower-11.png">icons/POI/communications-tower-11.png</file>
-		<file alias="convenience-11.png">icons/POI/convenience-11.png</file>
-		<file alias="dam-11.png">icons/POI/dam-11.png</file>
-		<file alias="danger-11.png">icons/POI/danger-11.png</file>
-		<file alias="drinking-water-11.png">icons/POI/drinking-water-11.png</file>
-		<file alias="fast-food-11.png">icons/POI/fast-food-11.png</file>
-		<file alias="entrance-alt1-11.png">icons/POI/entrance-alt1-11.png</file>
-		<file alias="fire-station-11.png">icons/POI/fire-station-11.png</file>
-		<file alias="fitness-centre-11.png">icons/POI/fitness-centre-11.png</file>
-		<file alias="fuel-11.png">icons/POI/fuel-11.png</file>
-		<file alias="furniture-11.png">icons/POI/furniture-11.png</file>
-		<file alias="garden-11.png">icons/POI/garden-11.png</file>
-		<file alias="garden-centre-11.png">icons/POI/garden-centre-11.png</file>
-		<file alias="golf-11.png">icons/POI/golf-11.png</file>
-		<file alias="grocery-11.png">icons/POI/grocery-11.png</file>
-		<file alias="hairdresser-11.png">icons/POI/hairdresser-11.png</file>
-		<file alias="harbor-11.png">icons/POI/harbor-11.png</file>
-		<file alias="hardware-11.png">icons/POI/hardware-11.png</file>
-		<file alias="heliport-11.png">icons/POI/heliport-11.png</file>
-		<file alias="hospital-11.png">icons/POI/hospital-11.png</file>
-		<file alias="information-11.png">icons/POI/information-11.png</file>
-		<file alias="landmark-11.png">icons/POI/landmark-11.png</file>
-		<file alias="library-11.png">icons/POI/library-11.png</file>
-		<file alias="lodging-11.png">icons/POI/lodging-11.png</file>
-		<file alias="mountain-11.png">icons/POI/mountain-11.png</file>
-		<file alias="museum-11.png">icons/POI/museum-11.png</file>
-		<file alias="park-11.png">icons/POI/park-11.png</file>
-		<file alias="parking-11.png">icons/POI/parking-11.png</file>
-		<file alias="pharmacy-11.png">icons/POI/pharmacy-11.png</file>
-		<file alias="picnic-site-11.png">icons/POI/picnic-site-11.png</file>
-		<file alias="place-of-worship-11.png">icons/POI/place-of-worship-11.png</file>
-		<file alias="police-11.png">icons/POI/police-11.png</file>
-		<file alias="post-11.png">icons/POI/post-11.png</file>
-		<file alias="religious-christian-11.png">icons/POI/religious-christian-11.png</file>
-		<file alias="religious-jewish-11.png">icons/POI/religious-jewish-11.png</file>
-		<file alias="religious-muslim-11.png">icons/POI/religious-muslim-11.png</file>
-		<file alias="restaurant-11.png">icons/POI/restaurant-11.png</file>
-		<file alias="restaurant-noodle-11.png">icons/POI/restaurant-noodle-11.png</file>
-		<file alias="restaurant-pizza-11.png">icons/POI/restaurant-pizza-11.png</file>
-		<file alias="restaurant-seafood-11.png">icons/POI/restaurant-seafood-11.png</file>
-		<file alias="roadblock-11.png">icons/POI/roadblock-11.png</file>
-		<file alias="school-11.png">icons/POI/school-11.png</file>
-		<file alias="shelter-11.png">icons/POI/shelter-11.png</file>
-		<file alias="shop-11.png">icons/POI/shop-11.png</file>
-		<file alias="skiing-11.png">icons/POI/skiing-11.png</file>
-		<file alias="soccer-11.png">icons/POI/soccer-11.png</file>
-		<file alias="swimming-11.png">icons/POI/swimming-11.png</file>
-		<file alias="theatre-11.png">icons/POI/theatre-11.png</file>
-		<file alias="telephone-11.png">icons/POI/telephone-11.png</file>
-		<file alias="toilet-11.png">icons/POI/toilet-11.png</file>
-		<file alias="town-hall-11.png">icons/POI/town-hall-11.png</file>
-		<file alias="viewpoint-11.png">icons/POI/viewpoint-11.png</file>
-		<file alias="village-11.png">icons/POI/village-11.png</file>
-		<file alias="waterfall-11.png">icons/POI/waterfall-11.png</file>
-		<file alias="wetland-11.png">icons/POI/wetland-11.png</file>
-		<file alias="zoo-11.png">icons/POI/zoo-11.png</file>
+	<!-- IMG map style -->
+	<qresource prefix="/IMG">
+		<file alias="airfield-11.png">icons/IMG/airfield-11.png</file>
+		<file alias="airport-11.png">icons/IMG/airport-11.png</file>
+		<file alias="amusement-park-11.png">icons/IMG/amusement-park-11.png</file>
+		<file alias="bakery-11.png">icons/IMG/bakery-11.png</file>
+		<file alias="bank-11.png">icons/IMG/bank-11.png</file>
+		<file alias="bar-11.png">icons/IMG/bar-11.png</file>
+		<file alias="bbq-11.png">icons/IMG/bbq-11.png</file>
+		<file alias="beach-11.png">icons/IMG/beach-11.png</file>
+		<file alias="bowling-alley-11.png">icons/IMG/bowling-alley-11.png</file>
+		<file alias="building-alt1-11.png">icons/IMG/building-alt1-11.png</file>
+		<file alias="bridge-11.png">icons/IMG/bridge-11.png</file>
+		<file alias="bus-11.png">icons/IMG/bus-11.png</file>
+		<file alias="cafe-11.png">icons/IMG/cafe-11.png</file>
+		<file alias="campsite-11.png">icons/IMG/campsite-11.png</file>
+		<file alias="car-11.png">icons/IMG/car-11.png</file>
+		<file alias="car-rental-11.png">icons/IMG/car-rental-11.png</file>
+		<file alias="car-repair-11.png">icons/IMG/car-repair-11.png</file>
+		<file alias="casino-11.png">icons/IMG/casino-11.png</file>
+		<file alias="cemetery-11.png">icons/IMG/cemetery-11.png</file>
+		<file alias="cinema-11.png">icons/IMG/cinema-11.png</file>
+		<file alias="clothing-store-11.png">icons/IMG/clothing-store-11.png</file>
+		<file alias="communications-tower-11.png">icons/IMG/communications-tower-11.png</file>
+		<file alias="convenience-11.png">icons/IMG/convenience-11.png</file>
+		<file alias="dam-11.png">icons/IMG/dam-11.png</file>
+		<file alias="danger-11.png">icons/IMG/danger-11.png</file>
+		<file alias="drinking-water-11.png">icons/IMG/drinking-water-11.png</file>
+		<file alias="fast-food-11.png">icons/IMG/fast-food-11.png</file>
+		<file alias="entrance-alt1-11.png">icons/IMG/entrance-alt1-11.png</file>
+		<file alias="fire-station-11.png">icons/IMG/fire-station-11.png</file>
+		<file alias="fitness-centre-11.png">icons/IMG/fitness-centre-11.png</file>
+		<file alias="fuel-11.png">icons/IMG/fuel-11.png</file>
+		<file alias="furniture-11.png">icons/IMG/furniture-11.png</file>
+		<file alias="garden-11.png">icons/IMG/garden-11.png</file>
+		<file alias="garden-centre-11.png">icons/IMG/garden-centre-11.png</file>
+		<file alias="golf-11.png">icons/IMG/golf-11.png</file>
+		<file alias="grocery-11.png">icons/IMG/grocery-11.png</file>
+		<file alias="hairdresser-11.png">icons/IMG/hairdresser-11.png</file>
+		<file alias="harbor-11.png">icons/IMG/harbor-11.png</file>
+		<file alias="hardware-11.png">icons/IMG/hardware-11.png</file>
+		<file alias="heliport-11.png">icons/IMG/heliport-11.png</file>
+		<file alias="hospital-11.png">icons/IMG/hospital-11.png</file>
+		<file alias="information-11.png">icons/IMG/information-11.png</file>
+		<file alias="landmark-11.png">icons/IMG/landmark-11.png</file>
+		<file alias="library-11.png">icons/IMG/library-11.png</file>
+		<file alias="lodging-11.png">icons/IMG/lodging-11.png</file>
+		<file alias="mountain-11.png">icons/IMG/mountain-11.png</file>
+		<file alias="museum-11.png">icons/IMG/museum-11.png</file>
+		<file alias="park-11.png">icons/IMG/park-11.png</file>
+		<file alias="parking-11.png">icons/IMG/parking-11.png</file>
+		<file alias="pharmacy-11.png">icons/IMG/pharmacy-11.png</file>
+		<file alias="picnic-site-11.png">icons/IMG/picnic-site-11.png</file>
+		<file alias="place-of-worship-11.png">icons/IMG/place-of-worship-11.png</file>
+		<file alias="police-11.png">icons/IMG/police-11.png</file>
+		<file alias="post-11.png">icons/IMG/post-11.png</file>
+		<file alias="religious-christian-11.png">icons/IMG/religious-christian-11.png</file>
+		<file alias="religious-jewish-11.png">icons/IMG/religious-jewish-11.png</file>
+		<file alias="religious-muslim-11.png">icons/IMG/religious-muslim-11.png</file>
+		<file alias="restaurant-11.png">icons/IMG/restaurant-11.png</file>
+		<file alias="restaurant-noodle-11.png">icons/IMG/restaurant-noodle-11.png</file>
+		<file alias="restaurant-pizza-11.png">icons/IMG/restaurant-pizza-11.png</file>
+		<file alias="restaurant-seafood-11.png">icons/IMG/restaurant-seafood-11.png</file>
+		<file alias="roadblock-11.png">icons/IMG/roadblock-11.png</file>
+		<file alias="school-11.png">icons/IMG/school-11.png</file>
+		<file alias="shelter-11.png">icons/IMG/shelter-11.png</file>
+		<file alias="shop-11.png">icons/IMG/shop-11.png</file>
+		<file alias="skiing-11.png">icons/IMG/skiing-11.png</file>
+		<file alias="soccer-11.png">icons/IMG/soccer-11.png</file>
+		<file alias="swimming-11.png">icons/IMG/swimming-11.png</file>
+		<file alias="theatre-11.png">icons/IMG/theatre-11.png</file>
+		<file alias="telephone-11.png">icons/IMG/telephone-11.png</file>
+		<file alias="toilet-11.png">icons/IMG/toilet-11.png</file>
+		<file alias="town-hall-11.png">icons/IMG/town-hall-11.png</file>
+		<file alias="viewpoint-11.png">icons/IMG/viewpoint-11.png</file>
+		<file alias="village-11.png">icons/IMG/village-11.png</file>
+		<file alias="waterfall-11.png">icons/IMG/waterfall-11.png</file>
+		<file alias="wetland-11.png">icons/IMG/wetland-11.png</file>
+		<file alias="zoo-11.png">icons/IMG/zoo-11.png</file>
 	</qresource>

 	<!-- Mapsforge rendertheme -->
--- a/icons/IMG/airfield-11.png
+++ b/icons/IMG/airfield-11.png
--- a/icons/IMG/airport-11.png
+++ b/icons/IMG/airport-11.png
--- a/icons/IMG/amusement-park-11.png
+++ b/icons/IMG/amusement-park-11.png
--- a/icons/IMG/bakery-11.png
+++ b/icons/IMG/bakery-11.png
--- a/icons/IMG/bank-11.png
+++ b/icons/IMG/bank-11.png
--- a/icons/IMG/bar-11.png
+++ b/icons/IMG/bar-11.png
--- a/icons/IMG/bbq-11.png
+++ b/icons/IMG/bbq-11.png
--- a/icons/IMG/beach-11.png
+++ b/icons/IMG/beach-11.png
--- a/icons/IMG/bowling-alley-11.png
+++ b/icons/IMG/bowling-alley-11.png
--- a/icons/IMG/bridge-11.png
+++ b/icons/IMG/bridge-11.png
--- a/icons/IMG/building-alt1-11.png
+++ b/icons/IMG/building-alt1-11.png
--- a/icons/IMG/bus-11.png
+++ b/icons/IMG/bus-11.png
--- a/icons/IMG/cafe-11.png
+++ b/icons/IMG/cafe-11.png
--- a/icons/IMG/campsite-11.png
+++ b/icons/IMG/campsite-11.png
--- a/icons/IMG/car-11.png
+++ b/icons/IMG/car-11.png
--- a/icons/IMG/car-rental-11.png
+++ b/icons/IMG/car-rental-11.png
--- a/icons/IMG/car-repair-11.png
+++ b/icons/IMG/car-repair-11.png
--- a/icons/IMG/casino-11.png
+++ b/icons/IMG/casino-11.png
--- a/icons/IMG/cemetery-11.png
+++ b/icons/IMG/cemetery-11.png
--- a/icons/IMG/cinema-11.png
+++ b/icons/IMG/cinema-11.png
--- a/icons/IMG/clothing-store-11.png
+++ b/icons/IMG/clothing-store-11.png
--- a/icons/IMG/communications-tower-11.png
+++ b/icons/IMG/communications-tower-11.png
--- a/icons/IMG/convenience-11.png
+++ b/icons/IMG/convenience-11.png
--- a/icons/IMG/dam-11.png
+++ b/icons/IMG/dam-11.png
--- a/icons/IMG/danger-11.png
+++ b/icons/IMG/danger-11.png
--- a/icons/IMG/drinking-water-11.png
+++ b/icons/IMG/drinking-water-11.png
--- a/icons/IMG/entrance-alt1-11.png
+++ b/icons/IMG/entrance-alt1-11.png
--- a/icons/IMG/fast-food-11.png
+++ b/icons/IMG/fast-food-11.png
--- a/icons/IMG/fire-station-11.png
+++ b/icons/IMG/fire-station-11.png
--- a/icons/IMG/fitness-centre-11.png
+++ b/icons/IMG/fitness-centre-11.png
--- a/icons/IMG/fuel-11.png
+++ b/icons/IMG/fuel-11.png
--- a/icons/IMG/furniture-11.png
+++ b/icons/IMG/furniture-11.png
--- a/icons/IMG/garden-11.png
+++ b/icons/IMG/garden-11.png
--- a/icons/IMG/garden-centre-11.png
+++ b/icons/IMG/garden-centre-11.png
--- a/icons/IMG/golf-11.png
+++ b/icons/IMG/golf-11.png
--- a/icons/IMG/grocery-11.png
+++ b/icons/IMG/grocery-11.png
--- a/icons/IMG/hairdresser-11.png
+++ b/icons/IMG/hairdresser-11.png
--- a/icons/IMG/harbor-11.png
+++ b/icons/IMG/harbor-11.png
--- a/icons/IMG/hardware-11.png
+++ b/icons/IMG/hardware-11.png
--- a/icons/IMG/heliport-11.png
+++ b/icons/IMG/heliport-11.png
--- a/icons/IMG/hospital-11.png
+++ b/icons/IMG/hospital-11.png
--- a/icons/IMG/information-11.png
+++ b/icons/IMG/information-11.png
--- a/icons/IMG/landmark-11.png
+++ b/icons/IMG/landmark-11.png
--- a/icons/IMG/library-11.png
+++ b/icons/IMG/library-11.png
--- a/icons/IMG/licence.txt
+++ b/icons/IMG/licence.txt
@ -1,4 +1,4 @@
-The POI icons are Mapbox Maki icons (https://labs.mapbox.com/maki-icons/)
+The IMG style icons are Mapbox Maki icons (https://labs.mapbox.com/maki-icons/)
 licensed under CC0.

 -----
--- a/icons/IMG/lodging-11.png
+++ b/icons/IMG/lodging-11.png
--- a/icons/IMG/mountain-11.png
+++ b/icons/IMG/mountain-11.png
--- a/icons/IMG/museum-11.png
+++ b/icons/IMG/museum-11.png
--- a/icons/IMG/park-11.png
+++ b/icons/IMG/park-11.png
--- a/icons/IMG/parking-11.png
+++ b/icons/IMG/parking-11.png
--- a/icons/IMG/pharmacy-11.png
+++ b/icons/IMG/pharmacy-11.png
--- a/icons/IMG/picnic-site-11.png
+++ b/icons/IMG/picnic-site-11.png
--- a/icons/IMG/place-of-worship-11.png
+++ b/icons/IMG/place-of-worship-11.png
--- a/icons/IMG/police-11.png
+++ b/icons/IMG/police-11.png
--- a/icons/IMG/post-11.png
+++ b/icons/IMG/post-11.png
--- a/icons/IMG/religious-christian-11.png
+++ b/icons/IMG/religious-christian-11.png
--- a/icons/IMG/religious-jewish-11.png
+++ b/icons/IMG/religious-jewish-11.png
--- a/icons/IMG/religious-muslim-11.png
+++ b/icons/IMG/religious-muslim-11.png
--- a/icons/IMG/restaurant-11.png
+++ b/icons/IMG/restaurant-11.png
--- a/icons/IMG/restaurant-noodle-11.png
+++ b/icons/IMG/restaurant-noodle-11.png
--- a/icons/IMG/restaurant-pizza-11.png
+++ b/icons/IMG/restaurant-pizza-11.png
--- a/icons/IMG/restaurant-seafood-11.png
+++ b/icons/IMG/restaurant-seafood-11.png
--- a/icons/IMG/roadblock-11.png
+++ b/icons/IMG/roadblock-11.png
--- a/icons/IMG/school-11.png
+++ b/icons/IMG/school-11.png
--- a/icons/IMG/shelter-11.png
+++ b/icons/IMG/shelter-11.png
--- a/icons/IMG/shop-11.png
+++ b/icons/IMG/shop-11.png
--- a/icons/IMG/skiing-11.png
+++ b/icons/IMG/skiing-11.png
--- a/icons/IMG/soccer-11.png
+++ b/icons/IMG/soccer-11.png
--- a/icons/IMG/swimming-11.png
+++ b/icons/IMG/swimming-11.png
--- a/icons/IMG/telephone-11.png
+++ b/icons/IMG/telephone-11.png
--- a/icons/IMG/theatre-11.png
+++ b/icons/IMG/theatre-11.png
--- a/icons/IMG/toilet-11.png
+++ b/icons/IMG/toilet-11.png
--- a/icons/IMG/town-hall-11.png
+++ b/icons/IMG/town-hall-11.png
--- a/icons/IMG/viewpoint-11.png
+++ b/icons/IMG/viewpoint-11.png
--- a/icons/IMG/village-11.png
+++ b/icons/IMG/village-11.png
--- a/icons/IMG/waterfall-11.png
+++ b/icons/IMG/waterfall-11.png
--- a/icons/IMG/wetland-11.png
+++ b/icons/IMG/wetland-11.png
--- a/icons/IMG/zoo-11.png
+++ b/icons/IMG/zoo-11.png
--- a/icons/symbols/ATV.png
+++ b/icons/symbols/ATV.png
--- a/icons/symbols/Airport.png
+++ b/icons/symbols/Airport.png
--- a/icons/symbols/Amusement
+++ b/icons/symbols/Amusement
--- a/icons/symbols/Anchor.png
+++ b/icons/symbols/Anchor.png
--- a/icons/symbols/Ballpark.png
+++ b/icons/symbols/Ballpark.png
--- a/icons/symbols/Bank.png
+++ b/icons/symbols/Bank.png
--- a/icons/symbols/Bar.png
+++ b/icons/symbols/Bar.png
--- a/icons/symbols/Beach.png
+++ b/icons/symbols/Beach.png
--- a/icons/symbols/Big
+++ b/icons/symbols/Big
--- a/icons/symbols/Bike
+++ b/icons/symbols/Bike
--- a/icons/symbols/Boat
+++ b/icons/symbols/Boat
--- a/icons/symbols/Bowling.png
+++ b/icons/symbols/Bowling.png
--- a/icons/symbols/Bridge.png
+++ b/icons/symbols/Bridge.png
--- a/icons/symbols/Building.png
+++ b/icons/symbols/Building.png
--- a/icons/symbols/Campground.png
+++ b/icons/symbols/Campground.png
--- a/icons/symbols/Car
+++ b/icons/symbols/Car
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Martin Tůma	531edc4862	Added missing artifact name	2021-10-31 09:15:18 +01:00
Martin Tůma	e0c807beeb	Added missing macdeployqt step + use macdeployqt to create the DMG	2021-10-31 09:06:34 +01:00
Martin Tůma	7d6f70cfd3	Upload OS X build artifacts	2021-10-31 08:54:33 +01:00
Martin Tůma	d2fbe4324b	Code cleanup	2021-10-31 08:15:27 +01:00
Martin Tůma	dcf98ef025	Remove copy of removed nsh file	2021-10-31 08:04:24 +01:00
Martin Tůma	96bf7bd41a	Version++	2021-10-31 07:53:11 +01:00
Martin Tůma	fe3c3dce60	Removed Windows 32b build stuff	2021-10-31 07:53:11 +01:00
Martin Tůma	8d61ed72c6	Reflect the latest encoding-related code changes	2021-10-28 08:55:32 +02:00
Martin Tůma	b23cc0a4cc	Added missing core5compat dll file	2021-10-27 20:42:52 +02:00
Martin Tůma	310a113e25	Switched from fallback encodings to core5compat module in Qt6 builds Archlinux has started to use the Qt6 build, so to support the legacy East Asian encodings use the compat module rather than a "clean" but less functional fallback solution and hope there will be some replacement in Qt6 before the module gets dropped. Non-UTF XML files will however still not work.	2021-10-27 20:29:12 +02:00
Martin Tůma	f83e320f85	Handle the "bell delimiter" in all encodings	2021-10-27 18:01:53 +02:00
Martin Tůma	644c854328	Get rid of TravisCI	2021-10-27 16:13:05 +02:00
Martin Tůma	369b12a406	ENV vars fix	2021-10-27 16:04:03 +02:00
Martin Tůma	fcb3abfc76	Fixed yml syntax error	2021-10-27 15:56:54 +02:00
Martin Tůma	0c7508f759	Added missing QT path setup	2021-10-27 15:54:47 +02:00
Martin Tůma	ad364de7fd	Fixed GitHub actions build file	2021-10-27 15:46:02 +02:00
Martin Tůma	59070c1412	Added GitHub actions OS X build	2021-10-27 15:42:35 +02:00
Martin Tůma	09aefd1cc1	Added Qt6 builds limitations info	2021-10-25 12:58:23 +02:00
Martin Tůma	442625232c	Version++	2021-10-25 11:32:50 +02:00
Martin Tůma	6b70f4a958	Use QTextCodec for conversions to UTF on Qt5 This way we can support East Asian encodings at least on Qt5 in some way (the Qt codecs are not 100% compatible with the CPx encodings, but the result should be much better than a fallback to cp1250...).	2021-10-25 10:30:09 +02:00
Martin Tůma	f810117cbe	Added waypoint icons highlighting	2021-10-24 14:31:31 +02:00
Martin Tůma	7fe82b12fe	Code cleanup	2021-10-24 12:56:09 +02:00
Martin Tůma	94e2d58805	Updated debug stuff	2021-10-24 12:30:31 +02:00
Martin Tůma	8046d06e32	Removed obsolete include/namespace	2021-10-23 23:07:28 +02:00
Martin Tůma	532bd39bc2	Reuse the symbol table decoder in the text decoder	2021-10-23 22:53:10 +02:00
Martin Tůma	c487d9c66b	Make the table pointers const	2021-10-23 17:28:06 +02:00
Martin Tůma	37dddbb18c	Code cleanup	2021-10-23 13:05:06 +02:00
Martin Tůma	37a4f80fbb	Cosmetics	2021-10-23 10:27:41 +02:00
Martin Tůma	a531b7859b	Added basic table data sanity checks + some more code cleanup	2021-10-23 07:41:27 +02:00
Martin Tůma	ccfda7ca7f	Code cleanup	2021-10-22 22:04:46 +02:00
Martin Tůma	8e867851e9	Various GPI symbol handling fixes	2021-10-18 23:10:09 +02:00
Martin Tůma	5e36d564aa	Added workaround for antipode routes Fixes #155	2021-10-16 14:11:22 +02:00
Hosted Weblate	db4ed75757	Merge branch 'origin/master' into Weblate.	2021-10-15 19:27:45 +02:00
Martin Tůma	4eae93e403	Version++	2021-10-15 19:27:23 +02:00
Martin Tůma	6ffeefe9c9	Fixed scroll wheel zooming on devices with "fine-resolution wheels"	2021-10-15 19:24:50 +02:00
Nikolay Korotkiy	4069bfcc6e	Translated using Weblate (Finnish) Currently translated at 98.1% (414 of 422 strings) Translation: GPXSee/Translations Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/fi/	2021-10-14 22:04:18 +02:00
Martin Tůma	5533f1e004	Merge remote-tracking branch 'weblate/master'	2021-10-13 20:48:44 +02:00
Martin Tůma	4e961f7518	Translation update	2021-10-13 20:48:08 +02:00
Martin Tůma	051f3fec58	Fixed error handling	2021-10-13 20:44:34 +02:00
Martin Tůma	9cd3f3c4a3	Fixed broken display of graphs with X-axis not starting at 0	2021-10-13 20:43:42 +02:00
99 efi	2a00b4dd6d	Translated using Weblate (Hungarian) Currently translated at 100.0% (422 of 422 strings) Translation: GPXSee/Translations Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/hu/	2021-10-13 05:21:31 +02:00
Oğuz Ersen	7d9e2585bc	Translated using Weblate (Turkish) Currently translated at 100.0% (422 of 422 strings) Translation: GPXSee/Translations Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/tr/	2021-10-13 05:21:31 +02:00
Artem	67aaf4d232	Translated using Weblate (Russian) Currently translated at 100.0% (422 of 422 strings) Translation: GPXSee/Translations Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/ru/	2021-10-13 05:21:31 +02:00
Åke Engelbrektson	93bcbee75f	Translated using Weblate (Swedish) Currently translated at 100.0% (422 of 422 strings) Translation: GPXSee/Translations Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/sv/	2021-10-12 09:23:24 +02:00
Hosted Weblate	dc3a7b4669	Merge branch 'origin/master' into Weblate.	2021-10-11 22:07:52 +02:00
Nikolay Korotkiy	db2db4749c	Translated using Weblate (Esperanto) Currently translated at 94.5% (398 of 421 strings) Translation: GPXSee/Translations Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/eo/	2021-10-11 22:07:52 +02:00
99 efi	a0c14a5ed0	Translated using Weblate (Hungarian) Currently translated at 100.0% (421 of 421 strings) Translation: GPXSee/Translations Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/hu/	2021-10-11 22:07:52 +02:00
Nikolay Korotkiy	c1041b3690	Translated using Weblate (Ukrainian) Currently translated at 93.3% (393 of 421 strings) Translation: GPXSee/Translations Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/uk/	2021-10-11 22:07:52 +02:00
Nikolay Korotkiy	81d0c6e881	Translated using Weblate (Russian) Currently translated at 100.0% (421 of 421 strings) Translation: GPXSee/Translations Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/ru/	2021-10-11 22:07:51 +02:00
Nikolay Korotkiy	c6b8511701	Translated using Weblate (Finnish) Currently translated at 98.0% (413 of 421 strings) Translation: GPXSee/Translations Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/fi/	2021-10-11 22:07:51 +02:00
Martin Tůma	8d5aa6361f	Localization update	2021-10-11 22:07:33 +02:00
Martin Tůma	7a91e95994	Merge remote-tracking branch 'weblate/master'	2021-10-11 22:06:25 +02:00
Martin Tůma	57a5d4edf5	Added symbol icons path info	2021-10-11 22:05:56 +02:00
Martin Tůma	467e210581	Code cleanup	2021-10-11 22:02:24 +02:00
Åke Engelbrektson	60632bd78c	Translated using Weblate (Swedish) Currently translated at 100.0% (421 of 421 strings) Translation: GPXSee/Translations Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/sv/	2021-10-10 21:18:26 +02:00
Hosted Weblate	39f475516b	Merge branch 'origin/master' into Weblate.	2021-10-10 20:11:26 +02:00
Martin Tůma	9779d91d31	German translation update	2021-10-10 20:10:59 +02:00
Martin Tůma	cd0243524e	Czech translation update	2021-10-10 20:10:27 +02:00
Martin Tůma	af1bdaa822	Added geocache icons	2021-10-10 20:09:45 +02:00
Hosted Weblate	de474303f5	Merge branch 'origin/master' into Weblate.	2021-10-10 19:05:47 +02:00
Oğuz Ersen	4bc1e85502	Translated using Weblate (Turkish) Currently translated at 100.0% (421 of 421 strings) Translation: GPXSee/Translations Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/tr/	2021-10-10 19:05:47 +02:00
Allan Nordhøy	4ab70a0658	Translated using Weblate (Norwegian Bokmål) Currently translated at 96.9% (408 of 421 strings) Translation: GPXSee/Translations Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/nb_NO/	2021-10-10 19:05:46 +02:00
Martin Tůma	9096797938	Windows icons must be in a fixed order that fits the NSIS file!	2021-10-10 19:05:20 +02:00
Hosted Weblate	2b779f6835	Merge branch 'origin/master' into Weblate.	2021-10-10 12:44:51 +02:00
Martin Tůma	0a627feab4	Windows build fixes	2021-10-10 12:44:49 +02:00
Martin Tůma	eb7220f0c8	Version++	2021-10-10 12:36:14 +02:00
Hosted Weblate	13a17604e9	Merge branch 'origin/master' into Weblate.	2021-10-10 12:36:13 +02:00
Hosted Weblate	1430b9bab1	Merge branch 'origin/master' into Weblate.	2021-10-10 12:31:05 +02:00
Martin Tůma	010e630b3b	Localization update	2021-10-10 12:31:02 +02:00
Hosted Weblate	1c418e3732	Merge branch 'origin/master' into Weblate.	2021-10-10 10:49:44 +02:00
Martin Tůma	c56ebccd5c	Fixed OS X build + code cleanup	2021-10-10 10:48:59 +02:00
Hosted Weblate	226de1320c	Merge branch 'origin/master' into Weblate.	2021-10-10 08:39:23 +02:00
Martin Tůma	fb8f0c4372	Added support for waypoint icons	2021-10-10 08:38:38 +02:00
Martin Tůma	5fdbf2e5d6	Code cleanup	2021-10-10 08:14:38 +02:00
Martin Tůma	93c81c01c3	Remove obsolete header include	2021-10-04 21:03:48 +02:00
Martin Tůma	3cfa5456e9	Read the image size only when actually needed	2021-10-04 21:00:29 +02:00
Martin Tůma	06dac47550	Code cleanup	2021-10-04 20:03:39 +02:00
Hosted Weblate	e4c2d6a20a	Merge branch 'origin/master' into Weblate.	2021-10-03 11:08:38 +02:00
Martin Tůma	c364922625	Some more code cleanup	2021-10-03 11:08:26 +02:00
mtriau	4cd55068a2	Translated using Weblate (Chinese (Simplified)) Currently translated at 100.0% (418 of 418 strings) Translation: GPXSee/Translations Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/zh_Hans/	2021-10-03 03:41:13 +02:00
Martin Tůma	3338bfa73f	Code cleanup	2021-10-03 00:16:59 +02:00
Martin Tůma	e1d4c2b532	Removed now obsolete hack	2021-10-02 21:09:30 +02:00
Martin Tůma	b14dd23224	Some more error checking improvements/fixes	2021-10-02 12:57:16 +02:00
Martin Tůma	288aa195c0	Added propper error checking	2021-10-02 12:23:12 +02:00
Martin Tůma	8d92cf6d86	The destructor still needs to be virtual	2021-10-02 11:59:11 +02:00
Martin Tůma	29705b4cdf	Get rid of unnecessary virtual stuff	2021-10-02 09:24:00 +02:00
Martin Tůma	54db2a5a6c	Don't use a map where an array is fully suficient and much faster	2021-09-30 20:26:36 +02:00
Martin Tůma	3d4adba90a	Some more code cleanup	2021-09-30 20:26:16 +02:00
Martin Tůma	505d7271f1	Code cleanup	2021-09-29 19:52:39 +02:00
Martin Tůma	3c2b293deb	Use something more usefull than the tile path as the description	2021-09-28 15:25:56 +02:00
Hosted Weblate	10cc36414a	Merge branch 'origin/master' into Weblate.	2021-09-28 12:47:26 +02:00
Martin Tůma	2d5cf5478a	Code cleanup	2021-09-28 12:47:14 +02:00
Hosted Weblate	fd47d2da05	Merge branch 'origin/master' into Weblate.	2021-09-27 21:46:50 +02:00
Martin Tůma	ce5a924e8f	Fixed formal memory leak	2021-09-27 19:24:02 +02:00
mtriau	8a0cd4f246	Translated using Weblate (Chinese (Simplified)) Currently translated at 100.0% (418 of 418 strings) Translation: GPXSee/Translations Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/zh_Hans/	2021-09-27 17:48:06 +02:00
Nikolay Korotkiy	b67b8c2ba7	Translated using Weblate (Russian) Currently translated at 100.0% (418 of 418 strings) Translation: GPXSee/Translations Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/ru/	2021-09-27 17:48:05 +02:00
Estébastien Robespi	a7c508dd93	Translated using Weblate (French) Currently translated at 100.0% (418 of 418 strings) Translation: GPXSee/Translations Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/fr/	2021-09-27 17:48:05 +02:00
99 efi	8511dd9101	Translated using Weblate (Hungarian) Currently translated at 100.0% (418 of 418 strings) Translation: GPXSee/Translations Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/hu/	2021-09-26 19:07:35 +02:00