mirror of
https://github.com/tumic0/GPXSee.git
synced 2024-11-27 21:24:47 +01:00
Compare commits
No commits in common. "d577eab66e0568e87ca8d17760dcb853ca15f2c4" and "3658c0940320389a9e06d5fc0c2136e5c899e9af" have entirely different histories.
d577eab66e
...
3658c09403
32
.github/workflows/osx.yml
vendored
32
.github/workflows/osx.yml
vendored
@ -6,8 +6,32 @@ on:
|
||||
- master
|
||||
|
||||
jobs:
|
||||
build:
|
||||
name: GPXSee
|
||||
qt5:
|
||||
name: GPXSee Qt5 build
|
||||
runs-on: macos-12
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
- name: Install Qt
|
||||
uses: jurplel/install-qt-action@v4
|
||||
with:
|
||||
version: '5.15.2'
|
||||
- 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 -appstore-compliant
|
||||
- name: Upload artifacts
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: GPXSee-qt5.dmg
|
||||
path: GPXSee.dmg
|
||||
|
||||
qt6:
|
||||
name: GPXSee Qt6 build
|
||||
runs-on: macos-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
@ -15,7 +39,7 @@ jobs:
|
||||
- name: Install Qt
|
||||
uses: jurplel/install-qt-action@v4
|
||||
with:
|
||||
version: '6.8.0'
|
||||
version: '6.7.2'
|
||||
modules: qtpositioning qtserialport qtimageformats
|
||||
- name: Create localization
|
||||
run: lrelease gpxsee.pro
|
||||
@ -28,5 +52,5 @@ jobs:
|
||||
- name: Upload artifacts
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: GPXSee-qt6.dmg
|
||||
path: GPXSee.dmg
|
||||
name: GPXSee.dmg
|
||||
|
||||
@ -547,44 +547,38 @@
|
||||
<!-- Nature POIs -->
|
||||
<rule e="node" k="natural" v="peak" zoom-min="13">
|
||||
<rule e="node" k="name" v="*">
|
||||
<symbol id="peak" src=":/POI/mountain-11.svg" symbol-width="11" priority="10"/>
|
||||
<caption fill="#000000" font-size="10" font-family="serif" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="peak"/>
|
||||
</rule>
|
||||
</rule>
|
||||
<rule e="node" k="natural" v="saddle" zoom-min="13">
|
||||
<rule e="node" k="name" v="*">
|
||||
<symbol id="saddle" src=":/symbols/saddle.svg" symbol-width="9" symbol-height="11" priority="9"/>
|
||||
<caption fill="#000000" font-size="10" font-family="serif" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="saddle"/>
|
||||
</rule>
|
||||
</rule>
|
||||
<rule e="node" k="natural" v="volcano" zoom-min="13">
|
||||
<rule e="node" k="name" v="*">
|
||||
<symbol id="volcano" src=":/POI/volcano-11.svg" symbol-width="11" priority="10"/>
|
||||
<caption fill="#000000" font-size="10" font-family="serif" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="volcano"/>
|
||||
</rule>
|
||||
</rule>
|
||||
<rule e="node" k="waterway" v="waterfall" zoom-min="15">
|
||||
<rule e="any" k="name" v="*">
|
||||
<symbol id="waterfall" src=":/POI/waterfall-11.svg" symbol-width="11" priority="8"/>
|
||||
<rule e="any" k="*" v="*" zoom-min="16">
|
||||
<caption fill="#000000" font-size="10" font-family="serif" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="waterfall"/>
|
||||
<symbol id="peak" src=":/POI/mountain-11.svg" symbol-width="11"/>
|
||||
<caption fill="#000000" font-size="10" font-family="serif" font-style="italic" k="name" priority="10" stroke="#FFFFFF" stroke-width="2" symbol-id="peak"/>
|
||||
<rule e="any" k="*" v="*" zoom-min="17">
|
||||
<caption fill="#000000" font-size="10" font-family="serif" font-style="italic" k="ele" priority="9" stroke="#FFFFFF" stroke-width="2" symbol-id="peak"/>
|
||||
</rule>
|
||||
</rule>
|
||||
</rule>
|
||||
<rule e="node" k="natural" v="spring|hot_spring" zoom-min="15">
|
||||
<rule e="node" k="natural" v="volcano" zoom-min="13">
|
||||
<symbol id="volcano" src=":/POI/volcano-11.svg" symbol-width="11"/>
|
||||
<caption fill="#000000" font-size="10" font-family="serif" font-style="italic" k="name" priority="10" stroke="#FFFFFF" stroke-width="2" symbol-id="volcano"/>
|
||||
<rule e="any" k="*" v="*" zoom-min="17">
|
||||
<caption fill="#000000" font-size="10" font-family="serif" font-style="italic" k="ele" priority="9" stroke="#FFFFFF" stroke-width="2" symbol-id="volcano"/>
|
||||
</rule>
|
||||
</rule>
|
||||
<rule e="node" k="waterway" v="waterfall" zoom-min="15">
|
||||
<symbol id="waterfall" src=":/POI/waterfall-11.svg" symbol-width="11"/>
|
||||
<rule e="any" k="*" v="*" zoom-min="16">
|
||||
<caption fill="#000000" font-size="10" font-family="serif" font-style="italic" k="name" priority="10" stroke="#FFFFFF" stroke-width="2" symbol-id="waterfall"/>
|
||||
</rule>
|
||||
</rule>
|
||||
<rule e="node" k="natural" v="spring" zoom-min="15">
|
||||
<rule e="any" k="name" v="*">
|
||||
<symbol id="spring" src=":/POI/water-11.svg" symbol-width="11" priority="7"/>
|
||||
<symbol id="spring" src=":/POI/water-11.svg" symbol-width="11"/>
|
||||
<rule e="any" k="*" v="*" zoom-min="16">
|
||||
<caption fill="#000000" font-size="10" font-family="serif" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="spring"/>
|
||||
<caption fill="#000000" font-size="10" font-family="serif" font-style="italic" k="name" priority="10" stroke="#FFFFFF" stroke-width="2" symbol-id="spring"/>
|
||||
</rule>
|
||||
</rule>
|
||||
</rule>
|
||||
<rule e="node" k="tourism" v="viewpoint" zoom-min="15">
|
||||
<rule e="node" k="name" v="*">
|
||||
<symbol id="viewpoint" src=":/POI/viewpoint-11.svg" symbol-width="11"/>
|
||||
<rule e="any" k="*" v="*" zoom-min="16">
|
||||
<caption fill="#000000" font-size="10" font-family="serif" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="viewpoint"/>
|
||||
</rule>
|
||||
<caption fill="#000000" font-size="10" font-family="serif" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="viewpoint"/>
|
||||
</rule>
|
||||
</rule>
|
||||
|
||||
|
||||
@ -10,7 +10,6 @@
|
||||
<file alias="exit.svg">icons/map/symbols/exit.svg</file>
|
||||
<file alias="flow.svg">icons/map/symbols/flow.svg</file>
|
||||
<file alias="oneway.svg">icons/map/symbols/oneway.svg</file>
|
||||
<file alias="saddle.svg">icons/map/symbols/saddle.svg</file>
|
||||
</qresource>
|
||||
|
||||
<!-- POIs (IMG, Mapsforge & ENC style) -->
|
||||
|
||||
@ -1,7 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg viewBox="0 0 9 11" height="11" width="9" version="1.1">
|
||||
<g>
|
||||
<path d="M 1.5,1.5 L3,3 L 3,8 L 1.5,9.5" stroke-width="1" stroke="#000000" fill="none"/>
|
||||
<path d="M 7.5,1.5 L6,3 L 6,8 L 7.5,9.5" stroke-width="1" stroke="#000000" fill="none"/>
|
||||
</g>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 300 B |
Loading…
Reference in New Issue
Block a user