diff --git a/.forgejo/workflows/appstream-check.yaml b/.forgejo/workflows/appstream-check.yaml index 1b422ff34..35f40e124 100644 --- a/.forgejo/workflows/appstream-check.yaml +++ b/.forgejo/workflows/appstream-check.yaml @@ -3,8 +3,8 @@ on: workflow_dispatch: # Manual trigger pull_request: paths: - - packaging/app.comaps.desktop.metainfo.xml - - .forgejo/workflows/appstream-check.yaml # Run check on self change + - packaging/app.comaps.qt.metainfo.xml + - .forgejo/workflows/appstream-check.yaml # Run check on self change jobs: validate-appstream: @@ -16,7 +16,7 @@ jobs: with: fetch-depth: 1 sparse-checkout: | - packaging/app.comaps.desktop.metainfo.xml + packaging/app.comaps.qt.metainfo.xml - name: Install appstream validator and flatpak Builder shell: bash @@ -29,8 +29,8 @@ jobs: - name: Lint appstream data with flatpak Builder shell: bash - run: flatpak run --command=flatpak-builder-lint org.flatpak.Builder appstream packaging/app.comaps.desktop.metainfo.xml + run: flatpak run --command=flatpak-builder-lint org.flatpak.Builder appstream packaging/app.comaps.qt.metainfo.xml - name: Run appstreamcli in pedantic mode shell: bash - run: flatpak run --command=appstreamcli org.flatpak.Builder validate --pedantic packaging/app.comaps.desktop.metainfo.xml + run: flatpak run --command=appstreamcli org.flatpak.Builder validate --pedantic packaging/app.comaps.qt.metainfo.xml diff --git a/.forgejo/workflows/desktop-file-check.yaml b/.forgejo/workflows/desktop-file-check.yaml index 9f795d18d..75eb77e06 100644 --- a/.forgejo/workflows/desktop-file-check.yaml +++ b/.forgejo/workflows/desktop-file-check.yaml @@ -3,8 +3,8 @@ on: workflow_dispatch: # Manual trigger pull_request: paths: - - qt/res/app.comaps.desktop.desktop - - .forgejo/workflows/desktop-file-check.yaml # Run check on self change + - qt/res/app.comaps.qt.desktop + - .forgejo/workflows/desktop-file-check.yaml # Run check on self change jobs: validate-desktop-file: @@ -16,7 +16,7 @@ jobs: with: fetch-depth: 1 sparse-checkout: | - qt/res/app.comaps.desktop.desktop + qt/res/app.comaps.qt.desktop - name: Install desktop-file-validate tool shell: bash @@ -27,4 +27,4 @@ jobs: - name: Validate desktop file shell: bash - run: desktop-file-validate qt/res/app.comaps.desktop.desktop && echo "Successfully validated .desktop file" + run: desktop-file-validate qt/res/app.comaps.qt.desktop && echo "Successfully validated .desktop file" diff --git a/data/welcome.html b/data/welcome.html index 71555580b..43e7da2e1 100644 --- a/data/welcome.html +++ b/data/welcome.html @@ -10,9 +10,10 @@

Offline World Map in your computer

-

Congratulations! You're just one step away from seeing your favourite cities and countries!

-

Download them once and use everywhere - no internet access is needed.

-

We'll try to keep you updated when new application versions and new map data become available.

-

And of course, you always can check latest news on our website: https://organicmaps.app

+

As CoMaps is an offline-first software, you'll need to download some regions.

+

Once they are downloaded, no internet access is needed.

+

And of course, you always can check project updates on Codeberg: https://codeberg.org/comaps/comaps

+

Or you can check our website: https://comaps.app

+ diff --git a/packaging/app.comaps.desktop.metainfo.xml b/packaging/app.comaps.qt.metainfo.xml similarity index 87% rename from packaging/app.comaps.desktop.metainfo.xml rename to packaging/app.comaps.qt.metainfo.xml index 2fdbed55a..fbf7a145d 100644 --- a/packaging/app.comaps.desktop.metainfo.xml +++ b/packaging/app.comaps.qt.metainfo.xml @@ -1,15 +1,18 @@ + - app.comaps.desktop + app.comaps.qt + CC0-1.0 + Apache-2.0 + CoMaps + Free offline maps for everyone The CoMaps Community - Free offline maps for everyone - CC0-1.0 - Apache-2.0 + app.comaps.qt.desktop pointing @@ -17,15 +20,12 @@ touch - -

CoMaps is a free Android & iOS offline maps app for travellers, tourists, hikers, drivers and cyclists. It uses crowd-sourced OpenStreetMap data.

-

## Features

The Linux version of CoMaps does not have feature parity with the Android and iPhone versions, and has not yet been @@ -33,6 +33,11 @@

+ + #456644 + #375237 + + https://comaps.app https://codeberg.org/comaps/comaps/issues https://www.comaps.app/support/ @@ -43,7 +48,6 @@ https://codeberg.org/comaps/comaps https://codeberg.org/comaps/comaps/src/branch/main/docs/CONTRIBUTING.md - app.comaps.desktop.desktop https://www.comaps.app/images/screenshots/Desktop_light_routing.png @@ -64,7 +68,7 @@ - +

CoMaps is now on Linux!

 diff --git a/platform/location_service/qt_location_service.cpp b/platform/location_service/qt_location_service.cpp index 889117d26..67b039c99 100644 --- a/platform/location_service/qt_location_service.cpp +++ b/platform/location_service/qt_location_service.cpp @@ -61,7 +61,7 @@ static location::TLocationSource qStringToTLocationSource(QString const & source QtLocationService::QtLocationService(location::LocationObserver & observer, std::string const & sourceName) : LocationService(observer) { QVariantMap params; - params["desktopId"] = "app.organicmaps.desktop"; + params["desktopId"] = "app.comaps.qt"; m_positionSource = QGeoPositionInfoSource::createSource(QString::fromStdString(sourceName), params, this); if (!m_positionSource) diff --git a/qt/CMakeLists.txt b/qt/CMakeLists.txt index 5a5dbd7d3..e13a3a760 100644 --- a/qt/CMakeLists.txt +++ b/qt/CMakeLists.txt @@ -137,8 +137,8 @@ install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/) install(DIRECTORY ${OMIM_ROOT}/data DESTINATION ${CMAKE_INSTALL_PREFIX}/share/comaps/) if (PLATFORM_LINUX) - install(FILES ${OMIM_ROOT}/packaging/app.comaps.desktop.metainfo.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/metainfo/) - install(FILES ${OMIM_ROOT}/qt/res/app.comaps.desktop.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications/) + install(FILES ${OMIM_ROOT}/packaging/app.comaps.qt.metainfo.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/metainfo/) + install(FILES ${OMIM_ROOT}/qt/res/app.comaps.qt.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications/) install(FILES ${OMIM_ROOT}/qt/res/logo.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/512x512/apps/ RENAME comaps.png) endif() diff --git a/qt/main.cpp b/qt/main.cpp index 192e0c58b..3e3f02ffd 100644 --- a/qt/main.cpp +++ b/qt/main.cpp @@ -133,7 +133,7 @@ int main(int argc, char * argv[]) UNUSED_VALUE(mainGuard); QApplication app(argc, argv); - app.setDesktopFileName("app.comaps.desktop"); + app.setDesktopFileName("app.comaps.qt"); platform.SetupMeasurementSystem(); diff --git a/qt/res/Info.plist.in b/qt/res/Info.plist.in index 5ec8b8e9a..1b510396d 100644 --- a/qt/res/Info.plist.in +++ b/qt/res/Info.plist.in @@ -24,7 +24,7 @@ @BUNDLE_EXECUTABLE@ CFBundleIdentifier - app.organicmaps.desktop + app.comaps.qt NSPrincipalClass NSApplication diff --git a/qt/res/app.comaps.desktop.desktop b/qt/res/app.comaps.qt.desktop similarity index 100% rename from qt/res/app.comaps.desktop.desktop rename to qt/res/app.comaps.qt.desktop