Merge branch 'origin/master' into Weblate.

Added Windows & Linux GEMF files desktop integration
Create translation files in android CI build
2024-11-27 21:24:47 +01:00 · 2022-07-22 20:35:17 +02:00 · 2022-07-22 20:34:33 +02:00 · 2022-07-22 19:06:45 +02:00 · 2022-07-22 19:06:11 +02:00 · 2022-07-20 18:19:31 +02:00
7 changed files with 23 additions and 9 deletions
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@ -37,6 +37,8 @@ jobs:
          modules: qtpositioning qt5compat
      - name: Install Android OpenSSL
        run:  git clone https://github.com/KDAB/android_openssl.git
+      - name: Create localization
+        run:  lrelease gpxsee.pro
      - name: Configure build
        run:  qmake gpxsee.pro OPENSSL_PATH=android_openssl
      - name: Build project
--- a/icons/formats/gemf.ico
+++ b/icons/formats/gemf.ico
--- a/icons/formats/scripts/extensions
+++ b/icons/formats/scripts/extensions
@ -29,3 +29,4 @@ omd:#ed09cb
 ghp:#ed09cb
 qct:#370642
 trk:#cccccc
+gemf:#147085
--- a/lang/gpxsee_zh.ts
+++ b/lang/gpxsee_zh.ts
@ -1229,7 +1229,7 @@
    <message>
        <location filename="../src/map/maplist.cpp" line="159"/>
        <source>GEMF maps</source>
-        <translation type="unfinished"></translation>
+        <translation>GEMF 地图</translation>
    </message>
    <message>
        <location filename="../src/map/maplist.cpp" line="160"/>
--- a/pkg/gpxsee.desktop
+++ b/pkg/gpxsee.desktop
@ -15,4 +15,4 @@ Icon=gpxsee
 Terminal=false
 Type=Application
 Categories=Graphics;Viewer;Education;Geography;Maps;Sports;Qt
-MimeType=application/gpx+xml;application/vnd.garmin.tcx+xml;application/vnd.ant.fit;application/vnd.google-earth.kml+xml;application/vnd.fai.igc;application/vnd.nmea.nmea;application/vnd.oziexplorer.plt;application/vnd.oziexplorer.rte;application/vnd.oziexplorer.wpt;application/vnd.groundspeak.loc+xml;application/vnd.sigma.slf+xml;application/geo+json;application/vnd.naviter.seeyou.cup;application/vnd.garmin.gpi;application/vnd.suunto.sml+xml;image/jpeg;text/csv;application/vnd.garmin.img;application/vnd.garmin.jnx;application/vnd.garmin.gmap+xml;image/vnd.maptech.kap;application/vnd.oziexplorer.map;application/vnd.mapbox.mbtiles;application/vnd.twonav.rmap;application/vnd.trekbuddy.tba;application/vnd.gpxsee.map+xml;application/x-tar;image/tiff;application/vnd.google-earth.kmz;application/vnd.alpinequest.aqm;application/vnd.rmaps.sqlite;application/vnd.osmdroid.sqlite;application/vnd.mapsforge.map;application/vnd.tomtom.ov2;application/vnd.tomtom.itn;application/vnd.esri.wld;application/vnd.onmove.omd;application/vnd.onmove.ghp;application/vnd.memory-map.qct;application/vnd.twonav.trk;application/vnd.twonav.rte;application/vnd.twonav.wpt
+MimeType=application/gpx+xml;application/vnd.garmin.tcx+xml;application/vnd.ant.fit;application/vnd.google-earth.kml+xml;application/vnd.fai.igc;application/vnd.nmea.nmea;application/vnd.oziexplorer.plt;application/vnd.oziexplorer.rte;application/vnd.oziexplorer.wpt;application/vnd.groundspeak.loc+xml;application/vnd.sigma.slf+xml;application/geo+json;application/vnd.naviter.seeyou.cup;application/vnd.garmin.gpi;application/vnd.suunto.sml+xml;image/jpeg;text/csv;application/vnd.garmin.img;application/vnd.garmin.jnx;application/vnd.garmin.gmap+xml;image/vnd.maptech.kap;application/vnd.oziexplorer.map;application/vnd.mapbox.mbtiles;application/vnd.twonav.rmap;application/vnd.trekbuddy.tba;application/vnd.gpxsee.map+xml;application/x-tar;image/tiff;application/vnd.google-earth.kmz;application/vnd.alpinequest.aqm;application/vnd.cgtk.gemf;application/vnd.rmaps.sqlite;application/vnd.osmdroid.sqlite;application/vnd.mapsforge.map;application/vnd.tomtom.ov2;application/vnd.tomtom.itn;application/vnd.esri.wld;application/vnd.onmove.omd;application/vnd.onmove.ghp;application/vnd.memory-map.qct;application/vnd.twonav.trk;application/vnd.twonav.rte;application/vnd.twonav.wpt
--- a/pkg/gpxsee.xml
+++ b/pkg/gpxsee.xml
@ -279,6 +279,13 @@
 		<glob pattern="*.aqm"/>
 	</mime-type>

+	<mime-type type="application/vnd.cgtk.gemf">
+		<comment>GEMF Map File</comment>
+		<sub-class-of type="application/octet-stream"/>
+		<generic-icon name="application/octet-stream"/>
+		<glob pattern="*.gemf"/>
+	</mime-type>
+
 	<mime-type type="application/vnd.rmaps.sqlite">
 		<comment>RMaps SQLite Map File</comment>
 		<sub-class-of type="application/vnd.sqlite3"/>
--- a/pkg/gpxsee64.nsi
+++ b/pkg/gpxsee64.nsi
@ -180,13 +180,14 @@ Section "GPXSee" SEC_APP
  !insertmacro FILE_ASSOCIATION_ADD "ghp" "ONmove Log File" 23
  !insertmacro FILE_ASSOCIATION_ADD "qct" "QuickChart Map File" 24
  !insertmacro FILE_ASSOCIATION_ADD "trk" "TwoNav Track File" 25
-  !insertmacro FILE_ASSOCIATION_ADD "kml" "Keyhole Markup Language" 26
-  !insertmacro FILE_ASSOCIATION_ADD "kmz" "KML geographic compressed data" 26
-  !insertmacro FILE_ASSOCIATION_ADD "fit" "Flexible and Interoperable Data Transfer" 27
-  !insertmacro FILE_ASSOCIATION_ADD "igc" "Flight Recorder Data Format" 28
-  !insertmacro FILE_ASSOCIATION_ADD "nmea" "NMEA 0183 Data" 29
-  !insertmacro FILE_ASSOCIATION_ADD "plt" "OziExplorer Track File" 30
-  !insertmacro FILE_ASSOCIATION_ADD "rte" "OziExplorer Route File" 31
+  !insertmacro FILE_ASSOCIATION_ADD "gemf" "GEMF Map File" 26
+  !insertmacro FILE_ASSOCIATION_ADD "kml" "Keyhole Markup Language" 27
+  !insertmacro FILE_ASSOCIATION_ADD "kmz" "KML geographic compressed data" 27
+  !insertmacro FILE_ASSOCIATION_ADD "fit" "Flexible and Interoperable Data Transfer" 28
+  !insertmacro FILE_ASSOCIATION_ADD "igc" "Flight Recorder Data Format" 29
+  !insertmacro FILE_ASSOCIATION_ADD "nmea" "NMEA 0183 Data" 30
+  !insertmacro FILE_ASSOCIATION_ADD "plt" "OziExplorer Track File" 31
+  !insertmacro FILE_ASSOCIATION_ADD "rte" "OziExplorer Route File" 32

  WriteRegStr HKCR "Applications\GPXSee.exe\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
  WriteRegStr HKCR ".gpx\OpenWithList" "GPXSee.exe" ""
@ -235,6 +236,7 @@ Section "GPXSee" SEC_APP
  WriteRegStr HKCR ".ghp\OpenWithList" "GPXSee.exe" ""
  WriteRegStr HKCR ".qct\OpenWithList" "GPXSee.exe" ""
  WriteRegStr HKCR ".trk\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".gemf\OpenWithList" "GPXSee.exe" ""

  System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'

@ -388,6 +390,7 @@ Section "Uninstall"
  !insertmacro FILE_ASSOCIATION_REMOVE "ghp"
  !insertmacro FILE_ASSOCIATION_REMOVE "qct"
  !insertmacro FILE_ASSOCIATION_REMOVE "trk"
+  !insertmacro FILE_ASSOCIATION_REMOVE "gemf"

  DeleteRegValue HKCR ".gpx\OpenWithList" "GPXSee.exe"
  DeleteRegValue HKCR ".tcx\OpenWithList" "GPXSee.exe"
@ -435,6 +438,7 @@ Section "Uninstall"
  DeleteRegValue HKCR ".ghp\OpenWithList" "GPXSee.exe"
  DeleteRegValue HKCR ".qct\OpenWithList" "GPXSee.exe"
  DeleteRegValue HKCR ".trk\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".gemf\OpenWithList" "GPXSee.exe"
  DeleteRegKey HKCR "Applications\GPXSee.exe"   
  
  System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
Author	SHA1	Message	Date
Hosted Weblate	cae25ba2db	Merge branch 'origin/master' into Weblate.	2022-07-22 20:35:17 +02:00
Martin Tůma	a0c52069c3	Added Windows & Linux GEMF files desktop integration	2022-07-22 20:34:33 +02:00
Martin Tůma	475ca98527	Create translation files in android CI build	2022-07-22 19:06:45 +02:00
Hosted Weblate	529aefdb46	Merge branch 'origin/master' into Weblate.	2022-07-22 19:06:11 +02:00
mtriau	312eb127c4	Translated using Weblate (Chinese (Simplified)) Currently translated at 100.0% (463 of 463 strings) Translation: GPXSee/Translations Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/zh_Hans/	2022-07-20 18:19:31 +02:00