Desktop: Fix Inconsistencies in Handling of Salinity.

- add correct setting of the water type drop down for the dive shown
  initially after program start;
- change salinity to have 3 decimals in planner, to make it consistency
  with the log.

Fixes #4240.

Reported-by: @ccsieh
Signed-off-by: Michael Keller <github@ike.ch>

.clang-format

@@ -10,7 +10,7 @@ ColumnLimit: 0
 ConstructorInitializerAllOnOneLineOrOnePerLine: true
 ConstructorInitializerIndentWidth: 8
 ContinuationIndentWidth: 8
-ForEachMacros: [ 'foreach', 'for_each_dc', 'for_each_dive', 'for_each_line', 'Q_FOREACH', 'BOOST_FOREACH' ]
+ForEachMacros: [ 'for_each_dc', 'for_each_relevant_dc', 'for_each_dive', 'for_each_line' ]
 IndentFunctionDeclarationAfterType: false #personal taste, good for long methods
 IndentWidth: 8
 MaxEmptyLinesToKeep: 2

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+github: subsurface
+ko_fi: dirkhh

.github/actions/manage-version/action.yml

@@ -0,0 +1,56 @@
+name: Manage the Subsurface CICD versioning
+
+inputs:
+  no-increment:
+    description: 'Only get the current version, do not increment it even for push events (Caution: not actually a boolean)'
+    default: false
+  nightly-builds-secret:
+    description: The secret to access the nightly builds repository
+    default: ''
+
+outputs:
+  version:
+    description: The long form version number
+    value: ${{ steps.version_number.outputs.version }}
+  buildnr:
+    description: The build number
+    value: ${{ steps.version_number.outputs.buildnr }}
+
+runs:
+  using: composite
+  steps:
+    - name: atomically create or retrieve the build number and assemble release notes for a push (i.e. merging of a pull request)
+      if: github.event_name == 'push' && inputs.no-increment == 'false'
+      env:
+        NIGHTLY_BUILDS_SECRET: ${{ inputs.nightly-builds-secret }}
+      shell: bash
+      run: |
+        if [ -z "$NIGHTLY_BUILDS_SECRET" ]; then
+          echo "Need to supply the secret for the nightly-builds repository to increment the version number, aborting."
+          exit 1
+        fi
+        scripts/get-atomic-buildnr.sh $GITHUB_SHA $NIGHTLY_BUILDS_SECRET "CICD-release"
+
+    - name: retrieve the current version number in all other cases
+      if: github.event_name != 'push' || inputs.no-increment != 'false'
+      env:
+        PULL_REQUEST_BRANCH: ${{ github.event.pull_request.head.ref }}
+      shell: bash
+      run: |
+        echo "pull-request-$PULL_REQUEST_BRANCH" > latest-subsurface-buildnumber-extension
+
+    - name: store version number for the build
+      id: version_number
+      env:
+        PULL_REQUEST_HEAD_SHA: ${{ github.event.pull_request.head.sha }}
+      shell: bash
+      run: |
+        git config --global --add safe.directory $GITHUB_WORKSPACE
+        # For a pull request we need the information from the pull request branch
+        # and not from the merge branch on the pull request
+        git checkout $PULL_REQUEST_HEAD_SHA
+        version=$(scripts/get-version.sh)
+        echo "version=$version" >> $GITHUB_OUTPUT
+        buildnr=$(scripts/get-version.sh 1)
+        echo "buildnr=$buildnr" >> $GITHUB_OUTPUT
+        git checkout $GITHUB_SHA

.github/actions/release/Dockerfile

@@ -1,11 +0,0 @@
-FROM alpine:latest
-
-RUN	apk add --no-cache \
-  bash \
-  ca-certificates \
-  curl \
-  jq
-
-COPY upload /usr/bin/upload
-
-ENTRYPOINT ["/usr/bin/upload"]

.github/actions/release/action.yml

@@ -1,4 +0,0 @@
-name: upload to release
-runs:
-  using: docker
-  image: Dockerfile

.github/actions/release/upload

@@ -1,112 +0,0 @@
-#!/bin/bash
-# SPDX
-
-if [[ -z "$GITHUB_TOKEN" ]]; then
-	echo "missing GITHUB_TOKEN"
-	exit 1
-fi
-
-if [[ -z "$GITHUB_REPO" ]] ; then
-	echo "missing GITHUB_REPO"
-	exit 1
-fi
-
-if [[ -z "$REF" ]] ; then
-	echo "missing REF"
-	exit 1
-fi
-
-if [[ -z "$COMMIT" ]] ; then
-	echo "missing COMMIT"
-	exit 1
-fi
-
-TAG="ci-release"
-
-echo $REF
-if [[ $REF = refs/heads/* ]] ; then
-	branch="$(echo $REF | cut -d/ -f 3)"
-	body="CI build of branch $branch. These binaries are for testing purposes. They are not signed and installations on Mac and Android will create warnings and errors without some extra work."
-	branch="-$branch"
-	echo "it's refs/heads with an added $branch"
-	if [[ $REF != refs/heads/master ]] ; then
-		TAG="${TAG}${branch}"
-	fi
-elif [[ $REF = refs/tags/* ]] ; then
-	TAG=$(echo $REF | cut -d/ -f 3)
-	body="Release build ($TAG)"
-fi
-
-# check if there is a tag of that name
-# if it is starts with ci (so this is a continous integration tag) and it's on a different SHA, delete it
-tag_url="https://api.github.com/repos/$GITHUB_REPO/git/refs/tags/$TAG"
-release_url="https://api.github.com/repos/$GITHUB_REPO/releases/tags/$TAG"
-
-echo "get tag infos: curl -XGET --header \"Authorization: token xxxx\" \"${tag_url}\""
-tag_infos=$(curl -XGET --header "Authorization: token ${GITHUB_TOKEN}" "${tag_url}")
-echo "information received for tag $TAG"
-echo $tag_infos
-existing_tag_sha=$(echo $tag_infos | jq --raw-output .object.sha)
-
-need_new_release="0"
-if [[ "$existing_tag_sha" != "null" ]] ; then
-	echo "existing tag on SHA $existing_tag_sha"
-	existing_release=$(curl -XGET --header "Authorization: token ${GITHUB_TOKEN}" "${release_url}")
-	release_id=$(echo $existing_release | jq --raw-output .id )
-	echo "information received for the release with release ID \"$release_id\""
-	echo $existing_release
-	if [[ "$release_id" == "null" ]] ; then
-		need_new_release="1"
-	fi
-
-	if [[ "$existing_tag_sha" != "$COMMIT" ]] ; then
-		need_new_release="1"
-		echo "tag was on different SHA, delete it and the corresponding release (if it exists)"
-		echo "deleting tag $TAG"
-		curl -XDELETE --header "Authorization: token ${GITHUB_TOKEN}" "${tag_url}"
-		if [[ "$release_id" != "null" ]] ; then
-			echo "Delete the release $release_id"
-			delete_url="https://api.github.com/repos/$GITHUB_REPO/releases/$release_id"
-			curl -XDELETE --header "Authorization: token ${GITHUB_TOKEN}" "${delete_url}"
-		fi
-	fi
-else
-	echo "this is a new tag"
-	need_new_release="1"
-fi
-
-if [[ "$need_new_release" = "1" ]] ; then
-	echo "create a new release and implicitly a new tag"
-	release=$(curl -H "Authorization: token ${GITHUB_TOKEN}" --data '{"tag_name": "'"$TAG"'","target_commitish": "'"$COMMIT"'","name": "'"$TAG"'","body": "'"$body"'","draft": false,"prerelease": true}' "https://api.github.com/repos/$GITHUB_REPO/releases")
-	echo "response to release creation"
-	echo "$release"
-fi
-
-# get the upload URL
-release_info=$(curl -XGET --header "Authorization: token ${GITHUB_TOKEN}" "${release_url}")
-echo "release info for $TAG"
-echo $release_info
-upload_url=$(echo $release_info | jq --raw-output .upload_url | cut -d '{' -f 1)
-
-if [[ "$upload_url" = "null" ]] ; then
-	echo "error determining release upload URL, aborting"
-	exit 1
-fi
-
-# accept up to 9 binaries via environment variables
-for FILENAME in $BIN1 $BIN2 $BIN3 $BIN4 $BIN5 $BIN6 $BIN7 $BIN8 $BIN9
-do
-	if [[ -z "$FILENAME" ]] ; then
-		break
-	fi
-	if [[ ! -f $FILENAME ]] ; then
-		echo "Cannot find binary $FILENAME"
-		continue
-	fi
-	echo "upload $FILENAME to release"
-	BASENAME="$(basename $FILENAME)"
-	echo "curl -H \"Authorization: token xxxxx\" -H \"Accept: application/vnd.github.manifold-preview\" -H \"Content-Type: application/octet-stream\" --data-binary @$FILENAME \"$upload_url?name=$BASENAME\""
-	curl -H "Authorization: token ${GITHUB_TOKEN}" -H "Accept: application/vnd.github.manifold-preview" -H "Content-Type: application/octet-stream" --data-binary @$FILENAME "$upload_url?name=$BASENAME"
-done
-
-# vim: tw=0

.github/workflows/android-dockerimage.yml

@@ -2,39 +2,35 @@ name: Android Docker Image CI
 
 on:
   push:
+    branches:
+    - master
     paths:
-    - scripts/docker/android-build-container/Dockerfile
-    - .github/workflows/android-docker*
+    - scripts/docker/android-build-container/**
+    - .github/workflows/android-dockerimage.yml
 
 jobs:
   android-build-container:
     runs-on: ubuntu-latest
     env:
-      VERSION: ${{ '5.13.10' }} # the version numbers here is based on the Qt version, the third digit is the rev of the docker image
+      VERSION: ${{ '5.15.2' }} # the version numbers here is based on the Qt version, the third digit is the rev of the docker image
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v4
 
-    - name: Get our pre-reqs
+    - name: Build the name for the docker image
+      id: build_name
       run: |
-          cd scripts/docker/android-build-container
-          bash download.sh
-          sed -ie 's/^sudo/#sudo/' setup-docker.sh
-          bash setup-docker.sh
-
-    - name: set env
-      run: |
-        v=${{ env.VERSION }}
-        b=${{ github.ref }} # -BRANCH suffix, unless the branch is master
+        v=$VERSION
+        b=$GITHUB_REF # -BRANCH suffix, unless the branch is master
         b=${b/refs\/heads\//}
         b=${b,,} # the name needs to be all lower case
         if [ $b = "master" ] ; then b="" ; else b="-$b" ; fi
-        echo "::set-env name=NAME::subsurface/android-build-container${b}:${v}"
+        echo "NAME=$GITHUB_REPOSITORY_OWNER/android-build${b}:${v}" >> $GITHUB_OUTPUT
 
     - name: Build and Publish Linux Docker image to Dockerhub
-      uses: elgohr/Publish-Docker-Github-Action@master
+      uses: elgohr/Publish-Docker-Github-Action@v5
       with:
-        name:       ${{ env.NAME }}
+        name:       ${{ steps.build_name.outputs.NAME }}
         username:   ${{ secrets.DOCKER_USERNAME }}
         password:   ${{ secrets.DOCKER_PASSWORD }}
         dockerfile: 'Dockerfile'

.github/workflows/android.yml

@@ -1,53 +1,91 @@
 name: Android
+
 on:
   push:
+    paths-ignore:
+    - scripts/docker/**
     branches:
     - master
   pull_request:
+    paths-ignore:
+    - scripts/docker/**
     branches:
     - master
 
 jobs:
-  buildInContainer:
+  build:
+    env:
+      KEYSTORE_FILE: ${{ github.workspace }}/../subsurface.keystore
     runs-on: ubuntu-latest
     container:
-      image: docker://subsurface/android-build-container:5.13.10
+      image: docker://subsurface/android-build:5.15.2
 
     steps:
     - name: checkout sources
-      uses: actions/checkout@v1
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+        submodules: recursive
+
+    - name: set the version information
+      id: version_number
+      uses: ./.github/actions/manage-version
+      with:
+        nightly-builds-secret: ${{ secrets.NIGHTLY_BUILDS }}
+
+    - name: set up the keystore
+      if: github.event_name == 'push'
+      env:
+        ANDROID_KEYSTORE_BASE64: ${{ secrets.ANDROID_KEYSTORE_BASE64 }}
+      run: |
+        echo "$ANDROID_KEYSTORE_BASE64" | base64 -d > $KEYSTORE_FILE
 
     - name: run build
-      run: |
-        cd ..
-        ln -s /android/Qt .
-        ln -s /android/android-ndk-r18b .
-        ln -s /android/android-sdk-linux .
-        ls -l
-        bash -x subsurface/packaging/android/android-build-wrapper.sh
-        cp /__w/subsurface/subsurface-mobile-build-arm64//build/outputs/apk/debug/subsurface-mobile-build-arm64-debug.apk ${GITHUB_WORKSPACE}/Subsurface-mobile.arm64.apk
-        cp /__w/subsurface/subsurface-mobile-build-arm//build/outputs/apk/debug/subsurface-mobile-build-arm-debug.apk ${GITHUB_WORKSPACE}/Subsurface-mobile.apk
-
-    - name: create CI release
-      if: github.event_name == 'push'
-      uses: ./.github/actions/release
+      id: build
       env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        GITHUB_REPO: ${{ github.repository }}
-        REF: ${{ github.ref }}
-        COMMIT: ${{ github.sha }}
-        BIN1: ./Subsurface-mobile.apk
-        BIN2: ./Subsurface-mobile.arm64.apk
-
-    - name: prepare PR artifacts
-      if: github.event_name == 'pull_request'
+        KEYSTORE_PASSWORD: pass:${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
+        KEYSTORE_ALIAS: ${{ secrets.ANDROID_KEYSTORE_ALIAS }}
+        BUILDNR: ${{ steps.version_number.outputs.buildnr }}
       run: |
-        mkdir -p Android-artifacts
-        mv Subsurface-mobile.apk Subsurface-mobile.arm64.apk Android-artifacts
+        # this is rather awkward, but it allows us to use the preinstalled
+        # Android and Qt versions with relative paths
+        cd ..
+        ln -s /android/5.15.* .
+        ln -s /android/build-tools .
+        ln -s /android/cmdline-tools .
+        ln -s /android/ndk .
+        ln -s /android/platform-tools .
+        ln -s /android/platforms .
+        ln -s /android/tools .
+        git config --global user.email "ci@subsurface-divelog.org"
+        git config --global user.name "Subsurface CI"
+        git config --global --add safe.directory $GITHUB_WORKSPACE
+        git config --global --add safe.directory $GITHUB_WORKSPACE/libdivecomputer
+        # get the build number via curl so this works both for a pull request as well as a push
+        export OUTPUT_DIR="$GITHUB_WORKSPACE"
+        bash -x ./subsurface/packaging/android/qmake-build.sh -buildnr $BUILDNR
 
-    - name: PR artifacts
+    - name: delete the keystore
+      if: github.event_name == 'push'
+      run: |
+        rm $KEYSTORE_FILE
+
+    - name: publish pull request artifacts
       if: github.event_name == 'pull_request'
-      uses: actions/upload-artifact@master
+      uses: actions/upload-artifact@v4
       with:
-        name: Android-artifacts
-        path: Android-artifacts
+        name: Subsurface-Android-${{ steps.version_number.outputs.version }}
+        path: Subsurface-mobile-*.apk
+
+    # only publish a 'release' on push events (those include merging a PR)
+    - name: upload binaries
+      if: github.event_name == 'push'
+      uses: softprops/action-gh-release@v2
+      with:
+        tag_name: v${{ steps.version_number.outputs.version }}
+        repository:  ${{ github.repository_owner }}/nightly-builds
+        token: ${{ secrets.NIGHTLY_BUILDS }}
+        prerelease: false
+        fail_on_unmatched_files: true
+        files: |
+          Subsurface-mobile-${{ steps.version_number.outputs.version }}.apk

.github/workflows/artifact-links.yml

@@ -0,0 +1,24 @@
+name: Add artifact links to pull request
+
+on:
+  workflow_run:
+    workflows: ["Ubuntu 16.04 / Qt 5.15-- for AppImage", "Mac", "Windows", "Android", "iOS"]
+    types: [completed]
+
+jobs:
+  artifacts-url-comments:
+    name: Add artifact links to PR and issues
+    runs-on: ubuntu-22.04
+
+    steps:
+    - name: Add artifact links to PR and issues
+      if: github.event.workflow_run.event == 'pull_request'
+      uses: tonyhallett/artifacts-url-comments@v1.1.0
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        prefix: "**Artifacts:**"
+        suffix: "_**WARNING:** Use at your own risk._"
+        format: name
+        addTo: pull
+        errorNoArtifacts: false

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,69 @@
+# Modified from the sample workflow suggested by GitHub/Semmle
+#
+name: "CodeQL"
+
+on:
+  push:
+    # once this works, this should be
+    # branches: [master]
+    branches: [master, codeQL]
+
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [master]
+
+  schedule:
+    - cron: '0 2 * * 6'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        # Override automatic language detection by changing the below list
+        # Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
+        language: ['c-cpp', 'javascript-typescript']
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+        submodules: recursive
+
+    - name: get container ready for build
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y -q \
+        autoconf automake cmake g++ git libcrypto++-dev libcurl4-gnutls-dev \
+        libgit2-dev libqt5qml5 libqt5quick5 libqt5svg5-dev \
+        libqt5webkit5-dev libsqlite3-dev libssh2-1-dev libssl-dev libssl-dev \
+        libtool libusb-1.0-0-dev libxml2-dev libxslt1-dev libzip-dev make \
+        pkg-config qml-module-qtlocation qml-module-qtpositioning \
+        qml-module-qtquick2 qt5-qmake qtchooser qtconnectivity5-dev \
+        qtdeclarative5-dev qtdeclarative5-private-dev qtlocation5-dev \
+        qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools \
+        qtquickcontrols2-5-dev xvfb libbluetooth-dev libmtp-dev
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v3
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    - name: Build
+      run: |
+        cd ..
+        git config --global --add safe.directory $GITHUB_WORKSPACE
+        git config --global --add safe.directory $GITHUB_WORKSPACE/libdivecomputer
+        bash -e -x subsurface/scripts/build.sh -desktop -build-with-webkit
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v3

.github/workflows/coverity-scan.yml

@@ -1,57 +1,56 @@
 name: Coverity Scan Linux Qt 5.9
+
 on:
   schedule:
     - cron: '0 18 * * *' # Daily at 18:00 UTC
 
 jobs:
-  CoverityScanBuildOnBionic:
-    runs-on: ubuntu-18.04
+  CoverityScanBuildOnUbuntu:
+    runs-on: ubuntu-latest
     container:
-      image: ubuntu:18.04 # yes, this looks redundant, but something is messed up with their Ubuntu image that causes our builds to fail
+      image: ubuntu:22.04
 
     steps:
-    - name: checkout sources
-      uses: actions/checkout@v1
-
     - name: add build dependencies
       run: |
-        apt update
-        apt install -y \
+        apt-get update
+        apt-get dist-upgrade -y
+        DEBIAN_FRONTEND=noninteractive apt-get install -y -q \
+        wget curl \
         autoconf automake cmake g++ git libcrypto++-dev libcurl4-gnutls-dev \
         libgit2-dev libqt5qml5 libqt5quick5 libqt5svg5-dev \
         libqt5webkit5-dev libsqlite3-dev libssh2-1-dev libssl-dev libssl-dev \
         libtool libusb-1.0-0-dev libxml2-dev libxslt1-dev libzip-dev make \
         pkg-config qml-module-qtlocation qml-module-qtpositioning \
-        qml-module-qtquick2 qt5-default qt5-qmake qtchooser qtconnectivity5-dev \
+        qml-module-qtquick2 qt5-qmake qtchooser qtconnectivity5-dev \
         qtdeclarative5-dev qtdeclarative5-private-dev qtlocation5-dev \
         qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools \
-        qtquickcontrols2-5-dev wget curl
+        qtquickcontrols2-5-dev libbluetooth-dev libmtp-dev
 
-    - name: Download Coverity Build Tool
-      run: |
-        cd ..
-        wget -q https://scan.coverity.com/download/cxx/linux64 --post-data "token=$TOKEN&project=Subsurface-divelog%2Fsubsurface" -O cov-analysis-linux64.tar.gz
-        mkdir cov-analysis-linux64
-        tar xzf cov-analysis-linux64.tar.gz --strip 1 -C cov-analysis-linux64
-      env:
-        TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }}
+    - name: checkout sources
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+        submodules: recursive
 
-    - name: run build
+    - name: configure environment
       run: |
-        cd ..
-        export PATH=`pwd`/cov-analysis-linux64/bin:$PATH
-        cov-build --dir cov-int bash -x subsurface/scripts/build.sh -desktop -build-with-webkit
+        git config --global --add safe.directory $GITHUB_WORKSPACE
+        git config --global --add safe.directory $GITHUB_WORKSPACE/libdivecomputer
 
-    - name: Submit the result to Coverity Scan
-      run: |
-        cd ..
-        tar czvf subsurface.tgz cov-int
-        curl \
-          --form token=$TOKEN \
-          --form email=glance@acc.umu.se \
-          --form file=@subsurface.tgz \
-          --form version=$(/scripts/get-version linux) \
-          --form description="Automatic scan on github actions" \
-          https://scan.coverity.com/builds?project=Subsurface-divelog%2Fsubsurface
-      env:
-        TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }}
+    - name: get the version information
+      id: version_number
+      uses: ./.github/actions/manage-version
+      with:
+        no-increment: true
+
+    - name: run coverity scan
+      uses: vapier/coverity-scan-action@v1
+      with:
+        project: Subsurface-divelog/subsurface
+        token: ${{ secrets.COVERITY_SCAN_TOKEN }}
+        email: glance@acc.umu.se
+        command: subsurface/scripts/build.sh -desktop -build-with-webkit
+        working-directory: ${{ github.workspace }}/..
+        version: ${{ steps.version_number.outputs.version }}
+        description: Automatic scan on github actions

.github/workflows/documentation.yml

@@ -0,0 +1,36 @@
+name: Documentation
+
+on:
+  push:
+    branches:
+    - master
+    paths:
+    - Documentation
+    - .github/workflows/documentation.yml
+  pull_request:
+    branches:
+    - master
+    paths:
+    - Documentation
+    - .github/workflows/documentation.yml
+
+jobs:
+  documentation:
+    runs-on: ubuntu-22.04
+
+    steps:
+    - name: Install Packages
+      run: |
+        sudo apt-get -y update
+        sudo apt-get -y install asciidoc docbook-xml w3m
+
+    - name: Checkout Sources
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+        submodules: recursive
+
+    - name: Process the Documentation
+      id: process_documentation
+      working-directory: Documentation
+      run: make

.github/workflows/fedora-copr-build.yml

@@ -0,0 +1,59 @@
+name: Fedora Copr Build
+on:
+  push:
+    paths-ignore:
+    - scripts/docker/**
+    branches:
+    - master
+    - current
+
+jobs:
+  setup-build:
+    name: Submit build to Fedora COPR
+    # this seems backwards, but we want to run under Fedora, but Github doesn' support that
+    runs-on: ubuntu-latest
+    container:
+      image: fedora:latest
+
+    steps:
+    - name: Setup build dependencies in the Fedora container
+      run: |
+        dnf -y install @development-tools @rpm-development-tools
+        dnf -y install copr-cli make
+
+    - name: Check out sources
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+        submodules: recursive
+
+    - name: setup git
+      run: |
+        git config --global --add safe.directory /__w/subsurface/subsurface
+        git config --global --add safe.directory /__w/subsurface/subsurface/libdivecomputer
+
+    - name: set the version information
+      id: version_number
+      uses: ./.github/actions/manage-version
+      with:
+        nightly-builds-secret: ${{ secrets.NIGHTLY_BUILDS }}
+
+    - name: Setup API token for copr-cli
+      env:
+        API_TOKEN: ${{ secrets.COPR_TOKEN }}
+        API_LOGIN: ${{ secrets.COPR_LOGIN }}
+      run: |
+        mkdir -p "$HOME/.config"
+        cp packaging/copr/config.copr "$HOME/.config/copr"
+        sed -i "s/API_TOKEN/$API_TOKEN/;s/API_LOGIN/$API_LOGIN/" "$HOME/.config/copr"
+
+    - name: Checkout googlemaps
+      run: |
+        cd ..
+        git clone https://github.com/subsurface/googlemaps
+
+    - name: run the copr build script
+      run: |
+        cd ..
+        bash -x subsurface/packaging/copr/make-package.sh $GITHUB_REF_NAME
+

.github/workflows/ios.yml

@@ -1,33 +1,61 @@
 name: iOS
+
 on:
   push:
+    paths-ignore:
+    - scripts/docker/**
     branches:
     - master
   pull_request:
+    paths-ignore:
+    - scripts/docker/**
     branches:
     - master
 
 jobs:
-  mobileBuild:
-    runs-on: macOS-latest
+  build:
+    runs-on: macOS-11
     steps:
+    - name: switch to Xcode 11
+      run: sudo xcode-select -s "/Applications/Xcode_11.7.app"
+
     - name: checkout sources
-      uses: actions/checkout@v1
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+        submodules: recursive
+
     - name: setup Homebrew
-      run: brew install autoconf automake libtool
-    - name: set our Qt build
-      run: |
-        env
-        curl -L --output Qt-5.14.1-ios.tar.xz https://f002.backblazeb2.com/file/Subsurface-Travis/Qt-5.14.1-ios.tar.xz
-        mkdir -p $HOME/Qt
-        xzcat Qt-5.14.1-ios.tar.xz | tar -x -C $HOME/Qt -f -
+      run: brew install autoconf automake libtool pkg-config
+
+    - name: checkout Qt resources
+      uses: actions/checkout@v4
+      with:
+        repository: subsurface/qt-ios
+        ref: main
+        path: qt-ios
+
+    - name: set the version information
+      id: version_number
+      uses: ./.github/actions/manage-version
+      with:
+        nightly-builds-secret: ${{ secrets.NIGHTLY_BUILDS }}
+
     - name: build Subsurface-mobile for iOS
+      env:
+        VERSION: ${{ steps.version_number.outputs.version }}
       run: |
-        cd packaging/ios
-        ln -s $HOME/Qt Qt
-        echo "build dependencies"
-        bash -x build.sh -simulator
-        echo "Subsurface-mobile for iOS"
-        cd build-Subsurface-mobile-*for_iOS-Release
-        sed -i.bak 's/-Wall/-Wno-everything/' Makefile # make the build far less verbose
-        make -j2
+        cd ..
+        git config --global --add safe.directory $GITHUB_WORKSPACE
+        git config --global --add safe.directory $GITHUB_WORKSPACE/libdivecomputer
+        export IOS_QT=$GITHUB_WORKSPACE/qt-ios
+        echo "build for simulator"
+        bash -x $GITHUB_WORKSPACE/packaging/ios/build.sh -simulator
+        # We need this in order to be able to access the file and publish it
+        mv build-Subsurface-mobile-Qt_5_14_1_for_iOS-Release/Release-iphonesimulator/Subsurface-mobile.app $GITHUB_WORKSPACE/Subsurface-mobile-$VERSION.app
+
+    - name: publish artifacts
+      uses: actions/upload-artifact@v4
+      with:
+        name: Subsurface-iOS-${{ steps.version_number.outputs.version }}
+        path: Subsurface-mobile-*.app

.github/workflows/linux-bionic-5.9.yml

@@ -1,48 +0,0 @@
-name: Ubuntu 18.04 / Qt 5.9
-on:
-  push:
-    branches:
-    - master
-  pull_request:
-    branches:
-    - master
-
-jobs:
-  buildOnBionic:
-    runs-on: ubuntu-18.04
-    container:
-      image: ubuntu:18.04 # yes, this looks redundant, but something is messed up with their Ubuntu image that causes our builds to fail
-
-    steps:
-    - name: checkout sources
-      uses: actions/checkout@v1
-
-    - name: add build dependencies
-      run: |
-        apt update
-        apt install -y \
-        autoconf automake cmake g++ git libcrypto++-dev libcurl4-gnutls-dev \
-        libgit2-dev libqt5qml5 libqt5quick5 libqt5svg5-dev \
-        libqt5webkit5-dev libsqlite3-dev libssh2-1-dev libssl-dev libssl-dev \
-        libtool libusb-1.0-0-dev libxml2-dev libxslt1-dev libzip-dev make \
-        pkg-config qml-module-qtlocation qml-module-qtpositioning \
-        qml-module-qtquick2 qt5-default qt5-qmake qtchooser qtconnectivity5-dev \
-        qtdeclarative5-dev qtdeclarative5-private-dev qtlocation5-dev \
-        qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools \
-        qtquickcontrols2-5-dev xvfb
-
-    - name: build Subsurface
-      run: |
-        cd ..
-        bash -x subsurface/scripts/build.sh -desktop -build-with-webkit
-
-    - name: test desktop build
-      env:
-        SSRF_USER_EMAIL: ssrftest-u18@hohndel.org
-        SSRF_USER_PASSWORD: geheim-u18
-      run: |
-        # and now run the tests - with Qt 5.9 we can only run the desktop flavor
-        echo "------------------------------------"
-        echo "run tests"
-        cd build
-        xvfb-run --auto-servernum make check

.github/workflows/linux-debian-generic.yml

@@ -0,0 +1,100 @@
+name: Generic workflow for Debian and derivatives
+
+on:
+  workflow_call:
+    inputs:
+      container-image:
+        required: true
+        type: string
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ inputs.container-image }}
+
+    steps:
+    - name: get container ready for build
+      run: |
+        echo "--------------------------------------------------------------"
+        echo "update distro and install dependencies"
+
+        apt-get update
+        apt-get dist-upgrade -y
+        DEBIAN_FRONTEND=noninteractive apt-get install -y -q \
+        autoconf automake cmake g++ git libcrypto++-dev libcurl4-gnutls-dev \
+        libgit2-dev libqt5qml5 libqt5quick5 libqt5svg5-dev \
+        libqt5webkit5-dev libsqlite3-dev libssh2-1-dev libssl-dev libssl-dev \
+        libtool libusb-1.0-0-dev libxml2-dev libxslt1-dev libzip-dev make \
+        pkg-config qml-module-qtlocation qml-module-qtpositioning \
+        qml-module-qtquick2 qt5-qmake qtchooser qtconnectivity5-dev \
+        qtdeclarative5-dev qtdeclarative5-private-dev qtlocation5-dev \
+        qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools \
+        qtquickcontrols2-5-dev xvfb libbluetooth-dev libmtp-dev \
+        mdbtools-dev
+
+        git config --global user.email "ci@subsurface-divelog.org"
+        git config --global user.name "Subsurface CI"
+        git config --global --add safe.directory $GITHUB_WORKSPACE
+        git config --global --add safe.directory $GITHUB_WORKSPACE/libdivecomputer
+    # needs git from the previous step
+    - name: checkout sources
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+        submodules: recursive
+
+    - name: set the version information
+      id: version_number
+      uses: ./.github/actions/manage-version
+      with:
+        no-increment: true
+
+    - name: build subsurface-mobile
+      run: |
+        echo "--------------------------------------------------------------"
+        echo "building mobile"
+        cd ..
+        bash -e -x subsurface/scripts/build.sh -mobile
+
+    - name: test mobile build
+      run: |
+        echo "--------------------------------------------------------------"
+        echo "running tests for mobile"
+
+        cd build-mobile/tests
+        # xvfb-run --auto-servernum ./TestGitStorage -v2
+        xvfb-run --auto-servernum make check
+
+    - name: build subsurface
+      run: |
+        echo "--------------------------------------------------------------"
+        echo "building desktop"
+
+        # now build for the desktop version (including WebKit)
+        cd ..
+        bash -e -x subsurface/scripts/build.sh -desktop -build-with-webkit
+
+    - name: test desktop build
+      run: |
+        echo "--------------------------------------------------------------"
+        echo "running tests for desktop"
+        cd build/tests
+        # xvfb-run --auto-servernum ./TestGitStorage -v2
+        xvfb-run --auto-servernum make check
+
+    - name: build subsurface-downloader
+      run: |
+        echo "--------------------------------------------------------------"
+        echo "building downloader"
+        cd ..
+        bash -e -x subsurface/scripts/build.sh -downloader
+
+    - name: build smtk2ssrf
+      run: |
+        echo "--------------------------------------------------------------"
+        echo "building smtk2ssrf"
+
+        # build smtk2ssrf (needs the artefacts generated by the subsurface build
+        cd ..
+        bash -e -x subsurface/scripts/smtk2ssrf-build.sh -y

.github/workflows/linux-debian-trixie-5.15.yml

@@ -0,0 +1,19 @@
+name: Debian trixie / Qt 5.15--
+
+on:
+  push:
+    paths-ignore:
+    - scripts/docker/**
+    branches:
+    - master
+  pull_request:
+    paths-ignore:
+    - scripts/docker/**
+    branches:
+    - master
+
+jobs:
+  do-build-test:
+    uses: ./.github/workflows/linux-debian-generic.yml
+    with:
+      container-image: debian:trixie

.github/workflows/linux-dockerimage.yml

@@ -1,39 +0,0 @@
-name: Linux Qt 5.12 Docker Image CI
-
-on:
-  push:
-    paths:
-    - scripts/docker/trusty-qt512/Dockerfile
-    - .github/workflows/linux-docker*
-
-jobs:
-  trusty-qt512:
-    runs-on: ubuntu-latest
-    env:
-      VERSION: ${{ '1.0' }}    # 'official' images should have a dot-zero version
-
-    steps:
-    - uses: actions/checkout@v1
-
-    - name: Get our pre-reqs
-      run: |
-        cd scripts/docker/trusty-qt512
-        bash getpackages.sh
-
-    - name: set env
-      run: |
-        v=${{ env.VERSION }}
-        b=${{ github.ref }} # -BRANCH suffix, unless the branch is master
-        b=${b/refs\/heads\//}
-        b=${b,,} # the name needs to be all lower case
-        if [ $b = "master" ] ; then b="" ; else b="-$b" ; fi
-        echo "::set-env name=NAME::subsurface/trusty-qt512${b}:${v}"
-
-    - name: Build and Publish Linux Docker image to Dockerhub
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name:       ${{ env.NAME }}
-        username:   ${{ secrets.DOCKER_USERNAME }}
-        password:   ${{ secrets.DOCKER_PASSWORD }}
-        dockerfile: 'Dockerfile'
-        workdir:    './scripts/docker/trusty-qt512/'

.github/workflows/linux-eoan-5.12.yml

@@ -1,75 +0,0 @@
-name: Ubuntu 19.10 / Qt 5.12
-on:
-  push:
-    branches:
-    - master
-  pull_request:
-    branches:
-    - master
-
-jobs:
-  buildInContainer:
-    runs-on: ubuntu-latest
-    container:
-      image: ubuntu:19.10
-
-    steps:
-    - name: checkout sources
-      uses: actions/checkout@v1
-
-    - name: get container ready for build
-      run: |
-        echo "--------------------------------------------------------------"
-        echo "update distro and install dependencies"
-
-        apt-get update
-        apt-get upgrade -y
-        DEBIAN_FRONTEND=noninteractive apt-get install -y -q --force-yes \
-        autoconf automake cmake g++ git libcrypto++-dev libcurl4-gnutls-dev \
-        libgit2-dev libqt5qml5 libqt5quick5 libqt5svg5-dev \
-        libqt5webkit5-dev libsqlite3-dev libssh2-1-dev libssl-dev libssl-dev \
-        libtool libusb-1.0-0-dev libxml2-dev libxslt1-dev libzip-dev make \
-        pkg-config qml-module-qtlocation qml-module-qtpositioning \
-        qml-module-qtquick2 qt5-default qt5-qmake qtchooser qtconnectivity5-dev \
-        qtdeclarative5-dev qtdeclarative5-private-dev qtlocation5-dev \
-        qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools \
-        qtquickcontrols2-5-dev xvfb
-
-    - name: build Subsurface-mobile
-      run: |
-        echo "--------------------------------------------------------------"
-        echo "building mobile"
-
-        cd ..
-        bash -e -x subsurface/scripts/build.sh -mobile
-
-    - name: test mobile build
-      env:
-        SSRF_USER_EMAIL: ssrftest-u19@hohndel.org
-        SSRF_USER_PASSWORD: geheim-u19
-      run: |
-        echo "--------------------------------------------------------------"
-        echo "running tests for mobile"
-
-        cd build-mobile
-        xvfb-run --auto-servernum make check
-
-    - name: build Subsurface
-      run: |
-        echo "--------------------------------------------------------------"
-        echo "building desktop"
-
-        # now build for the desktop version (including WebKit)
-        cd ..
-        bash -e -x subsurface/scripts/build.sh -desktop -build-with-webkit
-
-    - name: test desktop build
-      env:
-        SSRF_USER_EMAIL: ssrftest-u19@hohndel.org
-        SSRF_USER_PASSWORD: geheim-u19
-      run: |
-        echo "--------------------------------------------------------------"
-        echo "running tests for desktop"
-        cd build
-        xvfb-run --auto-servernum make check
-

.github/workflows/linux-fedora-35-qt6.yml

@@ -0,0 +1,68 @@
+name: Fedora 35 / Qt 6--
+
+on:
+  push:
+    paths-ignore:
+    - scripts/docker/**
+    branches:
+    - master
+  pull_request:
+    paths-ignore:
+    - scripts/docker/**
+    branches:
+    - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    container:
+      image: fedora:35
+
+    steps:
+    - name: get container ready for build
+      run: |
+        echo "--------------------------------------------------------------"
+        echo "update distro and install dependencies"
+
+        dnf update -y
+        dnf install -y autoconf automake bluez-libs-devel cmake gcc-c++ git-core \
+        libcurl-devel libsqlite3x-devel libssh2-devel libtool libudev-devel \
+        libusbx-devel libxml2-devel libxslt-devel make \
+        qt6-qtbase-devel qt6-qtconnectivity-devel qt6-qtdeclarative-devel \
+        qt6-qtlocation-devel qt6-qtsvg-devel \
+        qt6-qttools-devel redhat-rpm-config \
+        libxkbcommon-devel qt6-qt5compat-devel \
+        bluez-libs-devel libgit2-devel libzip-devel libmtp-devel \
+        xorg-x11-server-Xvfb
+
+    - name: checkout sources
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+        submodules: recursive
+
+    - name: set the version information
+      id: version_number
+      uses: ./.github/actions/manage-version
+      with:
+        no-increment: true
+
+    - name: build Subsurface
+      run: |
+        echo "--------------------------------------------------------------"
+        echo "building desktop"
+
+        # now build for the desktop version (without WebKit)
+        cd ..
+        git config --global --add safe.directory $GITHUB_WORKSPACE
+        git config --global --add safe.directory $GITHUB_WORKSPACE/libdivecomputer
+        git config --global --get-all safe.directory
+        bash -e -x subsurface/scripts/build.sh -desktop -build-with-qt6
+
+    - name: test desktop build
+      run: |
+        echo "--------------------------------------------------------------"
+        echo "running tests for desktop"
+        cd build/tests
+        xvfb-run --auto-servernum make check
+

.github/workflows/linux-snap.yml

@@ -0,0 +1,80 @@
+name: Snap
+
+on:
+  push:
+    paths-ignore:
+    - scripts/docker/**
+    branches:
+    - master
+  pull_request:
+    paths-ignore:
+    - scripts/docker/**
+    branches:
+    - master
+
+jobs:
+  Snap:
+    runs-on: ubuntu-latest
+
+    timeout-minutes: 60
+    steps:
+    - name: Check out code
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+        submodules: recursive
+
+    - name: set the version information
+      id: version_number
+      uses: ./.github/actions/manage-version
+      with:
+        nightly-builds-secret: ${{ secrets.NIGHTLY_BUILDS }}
+
+    - name: store dummy version and build number for pull request
+      if: github.event_name == 'pull_request'
+      run: |
+        echo "100" > latest-subsurface-buildnumber
+        echo "CICD-pull-request" > latest-subsurface-buildnumber-extension
+
+    - name: Set up LXD
+      uses: canonical/setup-lxd@main
+
+    - name: Set up CCache
+      id: setup-ccache
+      run: |
+        sudo apt-get install ccache
+        mkdir -p ${HOME}/.ccache
+        ccache --max-size=2G
+        /snap/bin/lxc profile device add default ccache disk source=${HOME}/.ccache/ path=/root/.ccache
+
+        # Patch snapcraft.yaml to enable ccache
+        patch -p1 < .github/workflows/scripts/linux-snap.patch
+
+        # Find common base between master and HEAD to use as cache key.
+        git -c protocol.version=2 fetch --no-tags --prune --progress --no-recurse-submodules origin master
+        echo "key=$( git merge-base origin/master $GITHUB_SHA )" >> $GITHUB_OUTPUT
+
+    - name: CCache
+      uses: actions/cache@v3
+      with:
+        key: ccache-${{ runner.os }}-${{ steps.setup-ccache.outputs.key }}
+        restore-keys: |
+          ccache-${{ runner.os }}-
+        path: ~/.ccache/**
+
+    - name: Build and verify the snap
+      uses: canonical/actions/build-snap@release
+      id: build-snap
+      with:
+        setup-lxd: false
+
+    - name: Clear CCache stats
+      run: ccache --show-stats --zero-stats
+
+    - name: Upload the snap
+      if: github.event_name == 'push'
+      uses: actions/upload-artifact@v4
+      with:
+        name: ${{ steps.build-snap.outputs.snap-name }}
+        path: ${{ steps.build-snap.outputs.snap-path }}
+        if-no-files-found: error

.github/workflows/linux-trusty-5.12.yml

@@ -1,47 +0,0 @@
-name: Ubuntu 14.04 / Qt 5.12 for AppImage
-on:
-  push:
-    branches:
-    - master
-  pull_request:
-    branches:
-    - master
-
-jobs:
-  buildInContainer:
-    runs-on: ubuntu-latest
-    container:
-      image: docker://subsurface/trusty-qt512:1.0
-
-    steps:
-    - name: checkout sources
-      uses: actions/checkout@v1
-
-    - name: run build
-      run: |
-        cd ..
-        rm -rf /install-root/include/libdivecomputer
-        bash -x subsurface/.github/workflows/scripts/linux-in-container-build.sh
-
-    - name: create CI release
-      if: github.event_name == 'push'
-      uses: ./.github/actions/release
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        GITHUB_REPO: ${{ github.repository }}
-        REF: ${{ github.ref }}
-        COMMIT: ${{ github.sha }}
-        BIN1: ./Subsurface.AppImage
-
-    - name: prepare PR artifacts
-      if: github.event_name == 'pull_request'
-      run: |
-        mkdir -p Linux-artifacts
-        mv Subsurface.AppImage Linux-artifacts
-
-    - name: PR artifacts
-      if: github.event_name == 'pull_request'
-      uses: actions/upload-artifact@master
-      with:
-        name: Linux-artifacts
-        path: Linux-artifacts

.github/workflows/linux-ubuntu-16.04-5.12-appimage.yml

@@ -0,0 +1,149 @@
+name: Ubuntu 16.04 / Qt 5.15-- for AppImage
+
+on:
+  push:
+    paths-ignore:
+    - scripts/docker/**
+    branches:
+    - master
+  pull_request:
+    paths-ignore:
+    - scripts/docker/**
+    branches:
+    - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    container:
+      image: ubuntu:16.04
+
+    steps:
+    - name: get container ready for build
+      run: |
+        echo "--------------------------------------------------------------"
+        echo "update distro and install dependencies"
+
+        apt-get update
+        DEBIAN_FRONTEND=noninteractive apt-get install -y -q \
+        software-properties-common
+
+        add-apt-repository -y ppa:savoury1/qt-5-15
+        add-apt-repository -y ppa:savoury1/kde-5-80
+        add-apt-repository -y ppa:savoury1/gpg
+        add-apt-repository -y ppa:savoury1/ffmpeg4
+        add-apt-repository -y ppa:savoury1/vlc3
+        add-apt-repository -y ppa:savoury1/gcc-9
+        add-apt-repository -y ppa:savoury1/display
+        add-apt-repository -y ppa:savoury1/apt-xenial
+        add-apt-repository -y ppa:savoury1/gtk-xenial
+        add-apt-repository -y ppa:savoury1/qt-xenial
+        add-apt-repository -y ppa:savoury1/kde-xenial
+        add-apt-repository -y ppa:savoury1/backports
+        add-apt-repository -y ppa:savoury1/build-tools
+        apt-get update
+        apt-get dist-upgrade -y
+        DEBIAN_FRONTEND=noninteractive apt-get install -y -q \
+        autoconf automake cmake g++ g++-9 git libcrypto++-dev libcurl4-gnutls-dev \
+        libgit2-dev libqt5qml5 libqt5quick5 libqt5svg5-dev \
+        libqt5webkit5-dev libsqlite3-dev libssh2-1-dev libssl-dev libssl-dev \
+        libtool libusb-1.0-0-dev libxml2-dev libxslt1-dev libzip-dev make \
+        pkg-config qml-module-qtlocation qml-module-qtpositioning \
+        qml-module-qtquick2 qt5-qmake qtchooser qtconnectivity5-dev \
+        qtdeclarative5-dev qtdeclarative5-private-dev qtlocation5-dev \
+        qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools \
+        qtquickcontrols2-5-dev xvfb libbluetooth-dev libmtp-dev liblzma-dev \
+        curl
+
+        update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 60 \
+        --slave /usr/bin/g++ g++ /usr/bin/g++-9
+
+    - name: checkout sources
+      # We cannot update this as glibc on 16.04 is too old for node 20.
+      uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+        submodules: recursive
+
+    - name: set the version information
+      id: version_number
+      uses: ./.github/actions/manage-version
+      with:
+        nightly-builds-secret: ${{ secrets.NIGHTLY_BUILDS }}
+
+    - name: build Subsurface
+      run: |
+        echo "--------------------------------------------------------------"
+        echo "building desktop"
+
+        # now build the appimage
+        cd ..
+        bash -e -x subsurface/scripts/build.sh -desktop -create-appdir -build-with-webkit
+
+    - name: test desktop build
+      run: |
+        echo "--------------------------------------------------------------"
+        echo "running tests for desktop"
+        cd build/tests
+        # xvfb-run --auto-servernum ./TestGitStorage -v2
+        xvfb-run --auto-servernum make check
+
+    - name: build appimage
+      env:
+        VERSION: ${{ steps.version_number.outputs.version }}
+      run: |
+        echo "--------------------------------------------------------------"
+        echo "assembling AppImage"
+
+        export QT_PLUGIN_PATH=$QT_ROOT/plugins
+        export QT_QPA_PLATFORM_PLUGIN_PATH=$QT_ROOT/plugins
+        export QT_DEBUG_PLUGINS=1
+
+        cd ..
+
+        # set up the appdir
+        mkdir -p appdir/usr/plugins/
+
+        # mv googlemaps plugins into place
+        mv appdir/usr/usr/lib/x86_64-linux-gnu/qt5/plugins/* appdir/usr/plugins  # the usr/usr is not a typo, that's where it ends up
+        rm -rf appdir/usr/home/ appdir/usr/include/ appdir/usr/share/man/ # No need to ship developer and man files as part of the AppImage
+        rm -rf appdir/usr/usr appdir/usr/lib/x86_64-linux-gnu/cmake appdir/usr/lib/pkgconfig
+        cp /usr/lib/x86_64-linux-gnu/libssl.so.1.1 appdir/usr/lib/
+        cp /usr/lib/x86_64-linux-gnu/libcrypto.so.1.1 appdir/usr/lib/
+
+        # get the linuxdeployqt tool and run it to collect the libraries
+        curl -L -O "https://github.com/probonopd/linuxdeployqt/releases/download/7/linuxdeployqt-7-x86_64.AppImage"
+        chmod a+x linuxdeployqt*.AppImage
+        unset QTDIR
+        unset QT_PLUGIN_PATH
+        unset LD_LIBRARY_PATH
+        ./linuxdeployqt*.AppImage --appimage-extract-and-run ./appdir/usr/share/applications/*.desktop -exclude-libs=libdbus-1.so.3 -bundle-non-qt-libs -qmldir=./subsurface/stats -qmldir=./subsurface/map-widget/ -verbose=2
+
+        # create the AppImage
+        ./linuxdeployqt*.AppImage --appimage-extract-and-run ./appdir/usr/share/applications/*.desktop -exclude-libs=libdbus-1.so.3 -appimage -qmldir=./subsurface/stats -qmldir=./subsurface/map-widget/ -verbose=2
+
+        # copy AppImage to the calling VM
+        # with GitHub Actions the $GITHUB_WORKSPACE directory is the current working directory at the start of a step
+        cp Subsurface*.AppImage* $GITHUB_WORKSPACE/Subsurface-$VERSION.AppImage
+
+    - name: PR artifacts
+      if: github.event_name == 'pull_request'
+      # We cannot update this as glibc on 16.04 is too old for node 20.
+      uses: actions/upload-artifact@v3
+      with:
+        name: Subsurface-Linux-AppImage-${{ steps.version_number.outputs.version }}
+        path: Subsurface-*.AppImage
+        compression-level: 0
+
+    # only publish a 'release' on push events (those include merging a PR)
+    - name: upload binaries
+      if: github.event_name == 'push'
+      uses: softprops/action-gh-release@v1
+      with:
+        tag_name: v${{ steps.version_number.outputs.version }}
+        repository: ${{ github.repository_owner }}/nightly-builds
+        token: ${{ secrets.NIGHTLY_BUILDS }}
+        prerelease: false
+        fail_on_unmatched_files: true
+        files: |
+         ./Subsurface-*.AppImage

.github/workflows/linux-ubuntu-20.04-5.15.yml

@@ -0,0 +1,19 @@
+name: Ubuntu 20.04 / Qt 5.12--
+
+on:
+  push:
+    paths-ignore:
+    - scripts/docker/**
+    branches:
+    - master
+  pull_request:
+    paths-ignore:
+    - scripts/docker/**
+    branches:
+    - master
+
+jobs:
+  do-build-test:
+    uses: ./.github/workflows/linux-debian-generic.yml
+    with:
+      container-image: ubuntu:20.04

.github/workflows/linux-ubuntu-22.04-5.15.yml

@@ -0,0 +1,19 @@
+name: Ubuntu 22.04 / Qt 5.15--
+
+on:
+  push:
+    paths-ignore:
+    - scripts/docker/**
+    branches:
+    - master
+  pull_request:
+    paths-ignore:
+    - scripts/docker/**
+    branches:
+    - master
+
+jobs:
+  do-build-test:
+    uses: ./.github/workflows/linux-debian-generic.yml
+    with:
+      container-image: ubuntu:22.04

.github/workflows/linux-ubuntu-24.04-5.15.yml

@@ -0,0 +1,19 @@
+name: Ubuntu 24.04 / Qt 5.15--
+
+on:
+  push:
+    paths-ignore:
+    - scripts/docker/**
+    branches:
+    - master
+  pull_request:
+    paths-ignore:
+    - scripts/docker/**
+    branches:
+    - master
+
+jobs:
+  do-build-test:
+    uses: ./.github/workflows/linux-debian-generic.yml
+    with:
+      container-image: ubuntu:24.04

.github/workflows/mac.yml

@@ -1,123 +1,80 @@
 name: Mac
+
 on:
   push:
+    paths-ignore:
+    - scripts/docker/**
     branches:
     - master
   pull_request:
+    paths-ignore:
+    - scripts/docker/**
     branches:
     - master
 
+
 jobs:
-  desktopBuild:
-    runs-on: macOS-latest
+  build:
+    runs-on: macOS-11
     steps:
     - name: checkout sources
-      uses: actions/checkout@v1
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+        submodules: recursive
+
     - name: setup Homebrew
-      run: brew install autoconf automake libtool xz hidapi libusb libxml2 libxslt libzip openssl pkg-config libgit2 libssh2 libjpg libpng
-    - name: set our Qt build
-      run: |
-        mkdir -p Qt/5.13.0
-        curl --output Qt-5.13.0-mac.tar.xz https://f002.backblazeb2.com/file/Subsurface-Travis/Qt-5.13.0-mac.tar.xz
-        tar -xJ -C Qt/5.13.0 -f Qt-5.13.0-mac.tar.xz
-    - name: build Subsurface-mobile
-      run: |
-        cd ${GITHUB_WORKSPACE}/..
-        export QT_ROOT=${GITHUB_WORKSPACE}/Qt/5.13.0/clang_64
-        export QT_QPA_PLATFORM_PLUGIN_PATH=$QT_ROOT/plugins
-        export PATH=$QT_ROOT/bin:$PATH
-        export CMAKE_PREFIX_PATH=$QT_ROOT/lib/cmake
-        DIR=$(pwd)
+      run: brew install hidapi libxslt libjpg libmtp create-dmg confuse
 
-        # first build Subsurface-mobile to ensure this didn't get broken
-        bash -e -x ./subsurface/scripts/build.sh -mobile
+    - name: checkout Qt resources
+      uses: actions/checkout@v4
+      with:
+        repository: subsurface/qt-mac
+        ref: main
+        path: qt-mac
 
-    - name: test mobile build
-      env:
-        SSRF_USER_EMAIL: ssrftest-mac@hohndel.org
-        SSRF_USER_PASSWORD: geheim-mac
-      run: |
-        echo "------------------------------------"
-        echo "run tests for mobile build"
-        export QT_ROOT=${GITHUB_WORKSPACE}/Qt/5.13.0/clang_64
-        export QT_QPA_PLATFORM_PLUGIN_PATH=$QT_ROOT/plugins
-        cd ${GITHUB_WORKSPACE}/build-mobile/tests
-        make check
+    - name: set the version information
+      id: version_number
+      uses: ./.github/actions/manage-version
+      with:
+        nightly-builds-secret: ${{ secrets.NIGHTLY_BUILDS }}
 
     - name: build Subsurface
+      id: build
       run: |
         cd ${GITHUB_WORKSPACE}/..
-        export QT_ROOT=${GITHUB_WORKSPACE}/Qt/5.13.0/clang_64
+        export QT_ROOT=${GITHUB_WORKSPACE}/qt-mac/Qt5.15.13
         export QT_QPA_PLATFORM_PLUGIN_PATH=$QT_ROOT/plugins
         export PATH=$QT_ROOT/bin:$PATH
         export CMAKE_PREFIX_PATH=$QT_ROOT/lib/cmake
-        DIR=$(pwd)
 
-        # now Subsurface with WebKit
-        bash -e -x ./subsurface/scripts/build.sh -desktop -build-with-webkit -release
+        # now setup Subsurface with WebKit and build the dependencies, using the generic build script
+        bash -e -x ./subsurface/scripts/build.sh -desktop -build-with-webkit -release -build-deps -ftdi -prep-only
 
-        cd ${GITHUB_WORKSPACE}/build
+        echo "finished initial cmake setup of Subsurface - next build the package"
+        cd subsurface/build
+        echo "run the packaging script"
+        bash -e -x ../packaging/macosx/make-package.sh | tee mp.log 2>&1
+        IMG=$(grep ^created: mp.log | tail -1 | cut -b10-)
+        echo "Created $IMG"
+        echo "dmg=$IMG" >> $GITHUB_OUTPUT
 
-        # build export-html to make sure that didn't get broken
-        make export-html
-
-    - name: test desktop build
-      env:
-        SSRF_USER_EMAIL: ssrftest-mac@hohndel.org
-        SSRF_USER_PASSWORD: geheim-mac
-      run: |
-        echo "------------------------------------"
-        echo "run tests for desktop build"
-        export QT_ROOT=${GITHUB_WORKSPACE}/Qt/5.13.0/clang_64
-        export QT_QPA_PLATFORM_PLUGIN_PATH=$QT_ROOT/plugins
-        cd ${GITHUB_WORKSPACE}/build/tests
-        make check
-
-    - name: package Subsurface
-      run: |
-        cd ${GITHUB_WORKSPACE}/build
-        # next build and install Subsurface and then clean up the staging area
-        LIBRARY_PATH=${DIR}/install-root/lib make -j2 install
-
-        # now adjust a few references that macdeployqt appears to miss
-        EXECUTABLE=Subsurface.app/Contents/MacOS/Subsurface
-        for i in libgit2 libGrantlee_TextDocument.dylib libGrantlee_Templates.dylib; do
-                OLD=$(otool -L ${EXECUTABLE} | grep $i | cut -d\  -f1 | tr -d "\t")
-                if [[ ! -z ${OLD} && ! -f Subsurface.app/Contents/Frameworks/$(basename ${OLD}) ]] ; then
-                        # copy the library into the bundle and make sure its id and the reference to it are correct
-                        cp ${DIR}/install-root/lib/$(basename ${OLD}) Subsurface.app/Contents/Frameworks
-                        SONAME=$(basename $OLD)
-                        install_name_tool -change ${OLD} @executable_path/../Frameworks/${SONAME} ${EXECUTABLE}
-                        install_name_tool -id @executable_path/../Frameworks/${SONAME} Subsurface.app/Contents/Frameworks/${SONAME}
-                fi
-        done
-
-        # next, replace @rpath references with @executable_path references in Subsurface
-        RPATH=$(otool -L ${EXECUTABLE} | grep rpath  | cut -d\  -f1 | tr -d "\t" | cut -b 8- )
-        for i in ${RPATH}; do
-                install_name_tool -change @rpath/$i @executable_path/../Frameworks/$i ${EXECUTABLE}
-        done
-
-        # next deal with libGrantlee
-        LIBG=$(ls Subsurface.app/Contents/Frameworks/libGrantlee_Templates*dylib)
-        for i in QtScript.framework/Versions/5/QtScript QtCore.framework/Versions/5/QtCore ; do
-                install_name_tool -change @rpath/$i @executable_path/../Frameworks/$i ${LIBG}
-        done
-
-        # clean up shared library dependency in the Grantlee plugins
-        GRANTLEE_VERSION=$(basename Subsurface.app/Contents/PlugIns/grantlee/5.*)
-        for i in Subsurface.app/Contents/PlugIns/grantlee/${GRANTLEE_VERSION}/*.so; do
-                OLD=$(otool -L $i | grep libGrantlee_Templates | cut -d\  -f1 | tr -d "\t")
-                SONAME=$(basename $OLD )
-                install_name_tool -change ${OLD} @executable_path/../Frameworks/${SONAME} $i;
-                OLD=$(otool -L $i | grep QtCore | cut -d\  -f1 | tr -d "\t")
-                install_name_tool -change ${OLD} @executable_path/../Frameworks/QtCore.framework/QtCore $i;
-                pushd Subsurface.app/Contents/PlugIns/grantlee
-                ln -s ${GRANTLEE_VERSION}/$(basename $i) .
-                popd
-        done
-    - name: store artifact
-      uses: actions/upload-artifact@master
+    - name: publish pull request artifacts
+      if: github.event_name == 'pull_request'
+      uses: actions/upload-artifact@v4
       with:
-        name: Subsurface.app
-        path: build/Subsurface.app
+        name: Subsurface-MacOS-${{ steps.version_number.outputs.version }}
+        path: ${{ steps.build.outputs.dmg }}
+        compression-level: 0
+
+    # only publish a 'release' on push events (those include merging a PR)
+    - name: upload binaries
+      if: github.event_name == 'push'
+      uses: softprops/action-gh-release@v2
+      with:
+        tag_name: v${{ steps.version_number.outputs.version }}
+        repository: ${{ github.repository_owner }}/nightly-builds
+        token: ${{ secrets.NIGHTLY_BUILDS }}
+        prerelease: false
+        fail_on_unmatched_files: true
+        files: ${{ steps.build.outputs.dmg }}

.github/workflows/mxe-dockerimage-stage1.yml

@@ -1,53 +0,0 @@
-name: MXE Docker Image CI
-
-on:
-  push:
-    paths:
-    - scripts/docker/mxe-build-container/*
-    - .github/workflows/mxe-docker*
-
-jobs:
-  mxe-build-container-stage1:
-    runs-on: ubuntu-latest
-    env:
-      # IMPORTANT: use the second digit to test new versions, each new official build should be n.0 with the first one being 1.0
-      #            as you test changes toward a new release, call those 1.1, 1.2, 1.3, etc
-      #            VERSION is just that version presented as a string constant
-      #
-      VERSION: ${{ '1.0' }}
-
-    steps:
-    - uses: actions/checkout@v1
-
-      # Because, reasons, we can't really do anything in YAML, so do this crazy shell callout thingy in order to assemble
-      # sane variables to use later in this job - if someone knows an easier way to do this, please let me know!
-      # This abomination below assembles the docker image NAME and appends ".stage1" to the VERSION
-    - name: set env
-      run: |
-        v=${{ env.VERSION }}
-        s=".stage1"
-        b=${{ github.ref }} # -BRANCH suffix, unless the branch is master
-        b=${b/refs\/heads\//}
-        b=${b,,} # the name needs to be all lower case
-        if [ $b = "master" ] ; then b="" ; else b="-$b" ; fi
-        echo "::set-env name=NAME::subsurface/mxe-build-container${b}:${v}${s}"
-
-    - name: Build and Publish stage 1 Docker image to Dockerhub
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name:       ${{ env.NAME }}
-        username:   ${{ secrets.DOCKER_USERNAME }}
-        password:   ${{ secrets.DOCKER_PASSWORD }}
-        dockerfile: 'Dockerfile-stage1'
-        workdir:    './scripts/docker/mxe-build-container/'
-
-    - name: Trigger stage 2 to run
-      # this triggers a dispatch event in our own repository - this allows us to work around the
-      # 6h runtime max (as on a two core system the total build time of this container is closer to 7h)
-      # we use the event_type to pass the version that we are building to the second stage
-      run: |
-        curl -XPOST -H 'authorization: token ${{ secrets.ACCESS_TOKEN }}' \
-                    -H "Accept: application/vnd.github.everest-preview+json" \
-                    -H "Content-Type: application/json" \
-                    https://api.github.com/repos/subsurface-divelog/subsurface/dispatches \
-                    --data '{"event_type": "${{ env.VERSION }}", "client_payload": { "target_branch": "${{ github.ref }}" } }'

.github/workflows/mxe-dockerimage-stage2.yml

@@ -1,40 +0,0 @@
-name: MXE stage 2 Docker Image CI
-
-# trigger this second stage via a repository dispaych event
-# the version that we are building is passed in via the event type that is available to us here
-# as github.event.action
-
-on: repository_dispatch
-
-jobs:
-  mxe-build-container-stage2:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v1
-      with:
-        ref: ${{ github.event.client_payload.target_branch }}
-
-      # Grab the version from the event name that we were triggered by and add ".stage1" to find the docker image to start FROM
-      # And create the NAME of the final docker image (including the branch if not master)
-    - name: set env
-      run: |
-        v=${{ github.event.action }}
-        s=".stage1"
-        b=${{ github.event.client_payload.target_branch }} # -BRANCH suffix, unless the branch is master
-        b=${b/refs\/heads\//}
-        b=${b,,} # the name needs to be all lower case
-        if [ "$b" = "master" ] || [ "$b" = "" ] ; then b="" ; else b="-$b" ; fi
-        echo "::set-env name=VERSION::${v}${s}"
-        echo "::set-env name=NAME::subsurface/mxe-build-container${b}:${v}"
-
-    - name: Build and Publish stage 2 Docker image to Dockerhub
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name:       ${{ env.NAME }}
-        username:   ${{ secrets.DOCKER_USERNAME }}
-        password:   ${{ secrets.DOCKER_PASSWORD }}
-        dockerfile: 'Dockerfile-stage2'
-        workdir:    './scripts/docker/mxe-build-container/'
-        buildargs:  VERSION
-

.github/workflows/post-releasenotes.yml

@@ -0,0 +1,45 @@
+name: Post Release Notes
+
+on:
+  push:
+    paths-ignore:
+    - scripts/docker/**
+    branches:
+    - master
+
+jobs:
+  postRelease:
+    runs-on: ubuntu-latest
+    steps:
+    - name: checkout sources
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+        submodules: recursive
+
+    - name: set the version information
+      id: version_number
+      uses: ./.github/actions/manage-version
+      with:
+        nightly-builds-secret: ${{ secrets.NIGHTLY_BUILDS }}
+
+    # since we are running this step on a pull request, we will skip build numbers in releases
+    - name: assemble release notes
+      env:
+        EVENT_HEAD_COMMIT_ID: ${{ github.event.head_commit.id }}
+        # Required because we are using the GitHub CLI in 'create-releasenotes.sh'
+        GH_TOKEN: ${{ github.token }}
+      run: |
+        scripts/create-releasenotes.sh $EVENT_HEAD_COMMIT_ID
+
+    # add a file containing the release title so it can be picked up and listed on the release page on our web server
+    - name: publish release
+      if: github.event_name == 'push'
+      uses: softprops/action-gh-release@v2
+      with:
+        tag_name: v${{ steps.version_number.outputs.version }}
+        repository: ${{ github.repository_owner }}/nightly-builds
+        token: ${{ secrets.NIGHTLY_BUILDS }}
+        prerelease: false
+        files: release_content_title.txt
+        body_path: gh_release_notes.md

.github/workflows/scripts/check_usns.py

@@ -0,0 +1,169 @@
+#!/usr/bin/env python3
+# coding: utf-8
+
+import json
+import logging
+import multiprocessing
+import os
+import pathlib
+import pprint
+import sys
+import subprocess
+import tempfile
+
+from launchpadlib import errors as lp_errors  # fades
+from launchpadlib.credentials import RequestTokenAuthorizationEngine, UnencryptedFileCredentialStore
+from launchpadlib.launchpad import Launchpad
+import requests  # fades
+
+
+logger = logging.getLogger("subsurface.check_usns")
+logger.addHandler(logging.StreamHandler())
+logger.setLevel(logging.INFO)
+
+APPLICATION = "subsurface-ci"
+LAUNCHPAD = "production"
+TEAM = "subsurface"
+SOURCE_NAME = "subsurface"
+SNAPS = {
+    "subsurface": {
+        "stable": {"recipe": "subsurface-stable"},
+    },
+}
+
+STORE_URL = "https://api.snapcraft.io/api/v1/snaps" "/details/{snap}?channel={channel}"
+STORE_HEADERS = {"X-Ubuntu-Series": "16", "X-Ubuntu-Architecture": "{arch}"}
+
+CHECK_NOTICES_PATH = "/snap/bin/review-tools.check-notices"
+CHECK_NOTICES_ARGS = ["--ignore-pockets", "esm-apps"]
+
+
+def get_store_snap(processor, snap, channel):
+    logger.debug("Checking for snap %s on %s in channel %s", snap, processor, channel)
+    data = {
+        "snap": snap,
+        "channel": channel,
+        "arch": processor,
+    }
+    resp = requests.get(STORE_URL.format(**data), headers={k: v.format(**data) for k, v in STORE_HEADERS.items()})
+    logger.debug("Got store response: %s", resp)
+
+    try:
+        result = json.loads(resp.content)
+    except json.JSONDecodeError:
+        logger.error("Could not parse store response: %s", resp.content)
+    else:
+        return result
+
+
+def fetch_url(entry):
+    dest, uri = entry
+    r = requests.get(uri, stream=True)
+    logger.debug("Downloading %s to %s…", uri, dest)
+    if r.status_code == 200:
+        with open(dest, "wb") as f:
+            for chunk in r:
+                f.write(chunk)
+    return dest
+
+
+def check_snap_notices(store_snaps):
+    with tempfile.TemporaryDirectory(dir=pathlib.Path.home()) as dir:
+        snaps = multiprocessing.Pool(8).map(
+            fetch_url,
+            (
+                (pathlib.Path(dir) / f"{snap['package_name']}_{snap['revision']}.snap", snap["download_url"])
+                for snap in store_snaps
+            ),
+        )
+
+        try:
+            notices = subprocess.check_output([CHECK_NOTICES_PATH] + CHECK_NOTICES_ARGS + snaps, encoding="UTF-8")
+            logger.debug("Got check_notices output:\n%s", notices)
+        except subprocess.CalledProcessError as e:
+            logger.error("Failed to check notices:\n%s", e.output)
+            sys.exit(2)
+        else:
+            notices = json.loads(notices)
+            return notices
+
+
+if __name__ == "__main__":
+    check_notices = os.path.isfile(CHECK_NOTICES_PATH) and os.access(CHECK_NOTICES_PATH, os.X_OK)
+
+    if not check_notices:
+        raise RuntimeError("`review-tools` not found.")
+
+    try:
+        lp = Launchpad.login_with(
+            APPLICATION,
+            LAUNCHPAD,
+            version="devel",
+            authorization_engine=RequestTokenAuthorizationEngine(LAUNCHPAD, APPLICATION),
+            credential_store=UnencryptedFileCredentialStore(os.path.expanduser(sys.argv[1])),
+        )
+    except NotImplementedError:
+        raise RuntimeError("Invalid credentials.")
+
+    ubuntu = lp.distributions["ubuntu"]
+    logger.debug("Got ubuntu: %s", ubuntu)
+
+    team = lp.people[TEAM]
+    logger.debug("Got team: %s", team)
+
+    errors = []
+
+    for snap, channels in SNAPS.items():
+        for channel, snap_map in channels.items():
+            logger.info("Processing channel %s for snap %s…", channel, snap)
+
+            try:
+                snap_recipe = lp.snaps.getByName(owner=team, name=snap_map["recipe"])
+                logger.debug("Got snap: %s", snap_recipe)
+            except lp_errors.NotFound as ex:
+                logger.error("Snap not found: %s", snap_map["recipe"])
+                errors.append(ex)
+                continue
+
+            if len(snap_recipe.pending_builds) > 0:
+                logger.info("Skipping %s: snap builds pending…", snap_recipe.web_link)
+                continue
+
+            store_snaps = tuple(
+                filter(
+                    lambda snap: snap.get("result") != "error",
+                    (get_store_snap(processor.name, snap, channel) for processor in snap_recipe.processors),
+                )
+            )
+
+            logger.debug("Got store versions: %s", {snap["architecture"][0]: snap["version"] for snap in store_snaps})
+
+            snap_notices = check_snap_notices(store_snaps)[snap]
+
+            for store_snap in store_snaps:
+                if str(store_snap["revision"]) not in snap_notices:
+                    logger.error(
+                        "Revision %s missing in result, see above for any review-tools errors.", store_snap["revision"]
+                    )
+                    errors.append(f"Revision {store_snap['revision']} missing in result:\n{store_snap}")
+
+            if any(snap_notices.values()):
+                logger.info("Found USNs:\n%s", pprint.pformat(snap_notices))
+            else:
+                logger.info("Skipping %s: no USNs found", snap)
+                continue
+
+            logger.info("Triggering %s…", snap_recipe.description or snap_recipe.name)
+
+            snap_recipe.requestBuilds(
+                archive=snap_recipe.auto_build_archive,
+                pocket=snap_recipe.auto_build_pocket,
+                channels=snap_recipe.auto_build_channels,
+            )
+            logger.debug("Triggered builds: %s", snap_recipe.web_link)
+
+    for error in errors:
+        logger.debug(error)
+
+    if errors:
+        sys.exit(1)

.github/workflows/scripts/linux-in-container-build.sh

@@ -1,62 +0,0 @@
-#!/bin/bash
-
-set -x
-set -e
-
-# this gets executed by the GitHub Action when building an AppImage for Linux
-# inside of the trusty-qt512 container
-
-export PATH=$QT_ROOT/bin:$PATH # Make sure correct qmake is found on the $PATH for linuxdeployqt
-export CMAKE_PREFIX_PATH=$QT_ROOT/lib/cmake
-export Grantlee5_ROOT=/__w/subsurface/subsurface/install-root
-
-# the container currently has things under / that need to be under /__w/subsurface/subsurface instead
-cp -a /appdir /__w/subsurface/
-cp -a /install-root /__w/subsurface/
-
-echo "--------------------------------------------------------------"
-echo "building mobile"
-
-# first make sure that no one broke Subsurface-mobile
-bash -e -x subsurface/scripts/build.sh -mobile -quick
-
-echo "--------------------------------------------------------------"
-echo "building desktop"
-
-# now build our AppImage
-bash -e -x subsurface/scripts/build.sh -desktop -create-appdir -build-with-webkit -quick
-
-echo "--------------------------------------------------------------"
-echo "assembling AppImage"
-
-export QT_PLUGIN_PATH=$QT_ROOT/plugins
-export QT_QPA_PLATFORM_PLUGIN_PATH=$QT_ROOT/plugins
-export QT_DEBUG_PLUGINS=1
-
-# set up the appdir
-mkdir -p appdir/usr/plugins/
-
-# mv googlemaps and Grantlee plugins into place
-mv appdir/usr/usr/local/Qt/5.12.4/gcc_64/plugins/* appdir/usr/plugins  # the usr/usr is not a typo, that's where it ends up
-mv appdir/usr/lib/grantlee/ appdir/usr/plugins/
-rm -rf appdir/usr/home/ appdir/usr/include/ appdir/usr/share/man/ # No need to ship developer and man files as part of the AppImage
-rm -rf appdir/usr/usr appdir/usr/lib/cmake appdir/usr/lib/pkgconfig
-cp /ssllibs/libssl.so appdir/usr/lib/libssl.so.1.1
-cp /ssllibs/libcrypto.so appdir/usr/lib/libcrypto.so.1.1
-
-# get the linuxdeployqt tool and run it to collect the libraries
-curl -L -O "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"
-chmod a+x linuxdeployqt*.AppImage
-unset QTDIR
-unset QT_PLUGIN_PATH
-unset LD_LIBRARY_PATH
-./linuxdeployqt*.AppImage --appimage-extract-and-run ./appdir/usr/share/applications/*.desktop -exclude-libs=libdbus-1.so.3 -bundle-non-qt-libs -qmldir=./subsurface/map-widget/ -verbose=2
-
-# create the AppImage
-export VERSION=$(cd subsurface/scripts ; ./get-version linux) # linuxdeployqt uses this for naming the file
-./linuxdeployqt*.AppImage --appimage-extract-and-run ./appdir/usr/share/applications/*.desktop -exclude-libs=libdbus-1.so.3 -appimage -qmldir=./subsurface/map-widget/ -verbose=2
-
-# copy AppImage to the calling VM
-# with GitHub Actions the /${GITHUB_WORKSPACE} directory is the current working directory at the start of a step
-cp Subsurface*.AppImage* /${GITHUB_WORKSPACE}/Subsurface.AppImage
-ls -l /${GITHUB_WORKSPACE}/Subsurface.AppImage

.github/workflows/scripts/linux-snap.patch

@@ -0,0 +1,44 @@
+diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
+index 9f34d0169..0d5a89fd9 100644
+--- a/snap/snapcraft.yaml
++++ b/snap/snapcraft.yaml
+@@ -35,6 +35,7 @@ parts:
+     source: https://github.com/Subsurface/googlemaps.git
+     plugin: make
+     build-packages:
++    - ccache
+     - qtbase5-dev
+     - wget
+     override-pull: |
+@@ -79,6 +80,7 @@ parts:
+     override-build: |
+       qmake \
+         INCLUDEPATH+=${CRAFT_PART_SRC}/QtHeaders \
++        CONFIG+=ccache \
+         ${CRAFT_PART_SRC}
+       craftctl default
+ 
+@@ -111,7 +113,11 @@ parts:
+     source: .
+     source-type: git
+     source-subdir: libdivecomputer
++    autotools-configure-parameters:
++    - CC="ccache gcc"
++    - CXX="ccache g++"
+     build-packages:
++    - ccache
+     - libbluetooth-dev
+     - libhidapi-dev
+     - libusb-dev
+@@ -134,8 +140,11 @@ parts:
+     - -DFTDISUPPORT=ON
+     - -DLIBDIVECOMPUTER_LIBRARIES=../../../stage/usr/local/lib/libdivecomputer.so
+     - -DLIBDIVECOMPUTER_INCLUDE_DIR=../../../stage/usr/local/include
++    - -DCMAKE_C_COMPILER_LAUNCHER=ccache
++    - -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
+     build-packages:
+     - build-essential
++    - ccache
+     - libcurl4-gnutls-dev
+     - libftdi1-dev
+     - libgit2-dev

.github/workflows/scripts/requirements.txt

@@ -0,0 +1,2 @@
+launchpadlib
+requests

.github/workflows/snap_usns.yml

@@ -0,0 +1,37 @@
+name: SnapUSNs
+
+on:
+  workflow_dispatch:
+  schedule:
+  - cron: '0 5 * * *'
+
+jobs:
+  CheckUSNs:
+    runs-on: ubuntu-22.04
+
+    steps:
+    - name: Check out code
+      uses: actions/checkout@v4
+
+    - name: Set up Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.11'
+
+    - name: Install Python dependencies
+      uses: insightsengineering/pip-action@v2.0.0
+      with:
+        requirements: .github/workflows/scripts/requirements.txt
+
+    - name: Install Snap dependencies
+      run: |
+        sudo snap install review-tools --edge
+
+    - name: Set up Launchpad credentials
+      uses: DamianReeves/write-file-action@v1.2
+      with:
+        path: lp_credentials
+        contents: ${{ secrets.LAUNCHPAD_CREDENTIALS }}
+
+    - name: Check for USNs
+      run: .github/workflows/scripts/check_usns.py lp_credentials

.github/workflows/ubuntu-launchpad-build.yml

@@ -0,0 +1,55 @@
+name: Ubuntu Launchpad Build
+on:
+  push:
+    paths-ignore:
+    - scripts/docker/**
+    branches:
+    - master
+    - current
+
+jobs:
+  push-to-ppa:
+
+    name: Submit build to Ubuntu Launchpad
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Check out sources
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+        submodules: recursive
+
+    - name: set the version information
+      id: version_number
+      uses: ./.github/actions/manage-version
+      with:
+        nightly-builds-secret: ${{ secrets.NIGHTLY_BUILDS }}
+
+    - name: Setup build dependencies
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y devscripts dput gpg debhelper qt5-qmake cmake
+
+    - name: Setup gpg key token for launchpad
+      env:
+        GPG_PRIVATE_KEY: ${{ secrets.PPA_SECRET_KEY }}
+      run: |
+        echo "$GPG_PRIVATE_KEY" > ~/.key
+        gpg --import ~/.key
+
+    - name: setup git
+      run: |
+        git config --global --add safe.directory /__w/subsurface/subsurface
+        git config --global --add safe.directory /__w/subsurface/subsurface/libdivecomputer
+
+    - name: Checkout googlemaps
+      run: |
+        cd ..
+        git clone https://github.com/subsurface/googlemaps
+
+    - name: run the launchpad make-package script
+      run: |
+        cd ..
+        bash -x subsurface/packaging/ubuntu/make-package.sh $GITHUB_REF_NAME
+

.github/workflows/windows-mxe-dockerimage.yml

@@ -0,0 +1,38 @@
+name: Windows (MXE) Docker Image
+
+on:
+  push:
+    branches:
+    - master
+    paths:
+    - scripts/docker/mxe-build-container/**
+    - .github/workflows/windows-mxe-dockerimage.yml
+
+jobs:
+  windows-mxe:
+    runs-on: ubuntu-latest
+    env:
+      VERSION: ${{ '3.1.0' }}    # 'official' images should have a dot-zero version
+      mxe_sha: 'c0bfefc57a00fdf6cb5278263e21a478e47b0bf5'
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Build the name for the docker image
+      id: build_name
+      run: |
+        v=$VERSION
+        b=$GITHUB_REF # -BRANCH suffix, unless the branch is master
+        b=${b/refs\/heads\//}
+        b=${b,,} # the name needs to be all lower case
+        if [ $b = "master" ] ; then b="" ; else b="-$b" ; fi
+        echo "NAME=$GITHUB_REPOSITORY_OWNER/mxe-build${b}:${v}" >> $GITHUB_OUTPUT
+
+    - name: Build and Publish Linux Docker image to Dockerhub
+      uses: elgohr/Publish-Docker-Github-Action@v5
+      with:
+        name:       ${{ steps.build_name.outputs.NAME }}
+        username:   ${{ secrets.DOCKER_USERNAME }}
+        password:   ${{ secrets.DOCKER_PASSWORD }}
+        workdir:    './scripts/docker/mxe-build-container/'
+        buildargs:  mxe_sha

.github/workflows/windows.yml

@@ -1,67 +1,73 @@
 name: Windows
+
 on:
   push:
+    paths-ignore:
+    - scripts/docker/**
     branches:
     - master
   pull_request:
+    paths-ignore:
+    - scripts/docker/**
     branches:
     - master
 
 jobs:
-  buildInContainer:
+  build:
     runs-on: ubuntu-latest
     container:
-      image: docker://subsurface/mxe-build-container:1.0
+      image: docker://subsurface/mxe-build:3.1.0
 
     steps:
     - name: checkout sources
-      uses: actions/checkout@v1
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+        submodules: recursive
+
+    - name: set the version information
+      id: version_number
+      uses: ./.github/actions/manage-version
+      with:
+        nightly-builds-secret: ${{ secrets.NIGHTLY_BUILDS }}
 
     - name: get other dependencies
+      env:
+         SUBSURFACE_REPO_PATH: ${{ github.workspace }}
       run: |
-        echo "creating the link from /win/subsurface"
+        echo "Running script to install additional dependancies into container"
+        git config --global --add safe.directory ${SUBSURFACE_REPO_PATH}
+        git config --global --add safe.directory ${SUBSURFACE_REPO_PATH}/libdivecomputer
         cd /win
         ln -s /__w/subsurface/subsurface .
-        ls -l
-        ls -l subsurface/scripts
-        echo "installing missing container components"
-        apt-get install -y ca-certificates libtool
-        echo "downloading sources for fresh build"
-        bash subsurface/scripts/get-dep-lib.sh single . libzip
-        bash subsurface/scripts/get-dep-lib.sh single . hidapi
-        bash subsurface/scripts/get-dep-lib.sh single . googlemaps
-        bash subsurface/scripts/get-dep-lib.sh single . grantlee
-        bash subsurface/scripts/get-dep-lib.sh single . mdbtools
+        bash -x subsurface/packaging/windows/container-prep.sh 2>&1 | tee pre-build.log
 
     - name: run build
       run: |
+        export OUTPUT_DIR="$GITHUB_WORKSPACE"
         cd /win
-        bash -x subsurface/.github/workflows/scripts/windows-in-container-build.sh 2>&1 | tee build.log
+        bash -x subsurface/packaging/windows/in-container-build.sh 2>&1 | tee build.log
         grep "Built target installer" build.log
 
-    - name: create CI release
-      if: github.event_name == 'push'
-      uses: ./.github/actions/release
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        GITHUB_REPO: ${{ github.repository }}
-        REF: ${{ github.ref }}
-        COMMIT: ${{ github.sha }}
-        BIN1: ./subsurface-installer.exe
-        BIN2: ./subsurface.exe
-        BIN3: ./subsurface.exe.debug
-        BIN4: ./smtk2ssrf-installer.exe
-        BIN5: ./smtk2ssrf.exe
-
-    - name: prepare PR artifacts
+    - name: publish pull request artifacts
       if: github.event_name == 'pull_request'
-      run: |
-        mkdir -p Windows-artifacts
-        mv ./subsurface-installer.exe ./subsurface.exe ./subsurface.exe.debug ./smtk2ssrf-installer.exe ./smtk2ssrf.exe Windows-artifacts
-
-    - name: PR artifacts
-      if: github.event_name == 'pull_request'
-      uses: actions/upload-artifact@master
+      uses: actions/upload-artifact@v4
       with:
-        name: Windows-artifacts
-        path: Windows-artifacts
+        name: Subsurface-Windows-${{ steps.version_number.outputs.version }}
+        path: |
+         subsurface*.exe*
+         smtk2ssrf*.exe
+
+    # only publish a 'release' on push events (those include merging a PR)
+    - name: upload binaries
+      if: github.event_name == 'push'
+      uses: softprops/action-gh-release@v2
+      with:
+        tag_name: v${{ steps.version_number.outputs.version }}
+        repository: ${{ github.repository_owner }}/nightly-builds
+        token: ${{ secrets.NIGHTLY_BUILDS }}
+        prerelease: false
+        fail_on_unmatched_files: true
+        files: |
+         ./subsurface*.exe*
+         ./smtk2ssrf*.exe

.gitignore

@@ -35,9 +35,18 @@ Subsurface.app
 .DS_Store
 !android/**/*.xml
 build*
+nightly-builds/
 mobile-widgets/qml/kirigami
+mobile-widgets/3rdparty/ECM/
+mobile-widgets/3rdparty/breeze-icons/
+mobile-widgets/3rdparty/extra-cmake-modules/
+mobile-widgets/3rdparty/kirigami/
 packaging/ios/install-root
 packaging/ios/Info.plist
 packaging/ios/Qt
 packaging/ios/asset_catalog_compiler.Info.plist
 appdata/subsurface.appdata.xml
+android-mobile/Roboto-Regular.ttf
+gh_release_notes.md
+release_content_title.txt
+/output/

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "libdivecomputer"]
 	path = libdivecomputer
-	url = git://github.com/Subsurface-divelog/libdc.git
+	url = https://github.com/Subsurface/libdc.git
 	branch = Subsurface-NG

.mailmap

@@ -4,6 +4,7 @@
 <dirk@hohndel.org> <hohndel@mail.gr8dns.org>
 Dirk Hohndel <dirk@hohndel.org> Dirk Hohndel (Intel) <dhohndel@dhohndel-mac02.jf.intel.com>
 Dirk Hohndel <dirk@hohndel.org> Subsurface <dirk@subsurface-divelog.org>
+Dirk Hohndel <dirk@hohndel.org> Subsurface CI <dirk@hohndel.org>
 <guido.lerch@gmail.com> <glerch@Guidos-MacBook-Air.local>
 <jacco.van.koll@gmail.com> <jko@haringstad.com>
 <jlmulder@xs4all.nl> <jlmulder@planet.nl>

.tx/config

@@ -11,3 +11,4 @@ type = TS
 source_file = terms
 source_lang = en
 type = txt
+

CHANGELOG.md

@@ -1,47 +1,48 @@
-Mobile: fix saving newly applied GPS fixes to storage
-Desktop: add starts-with and exact filter modes for textual search
-Mobile: add option to only show one column in portrait mode
-Mobile: fix potential crash when adding / editing dives
-Mobile: automatically scroll the dive edit screen so that the notes edit cursor stays visible
-Desktop: ignore dive sites without location in proximity search
-Mobile: add personalized option for units
-Mobile: add Dive Summary page
-Mobile: option to reset default cylinder
-Mobile: new layout for Settings page
-Desktop: add the ability to modify dive salinity
-Mobile: add menu item for cloud password reset
-Mobile: add DivePlanner setup, as first part of a mobile diveplanner
-Mobile: secure user selects operational mode, before leaving login
-Mobile: use of qml compiler, smaller footprint and faster UI
-Mobile: support for "upload to divelogs.de"
-mobile: add support for upload to dive-share.com
-Profile: Add current GF to infobox
-Mobile: (desktop only) new switch --testqml, allows to use qml files instead of resources.
-Desktop: increase speed of multi-trip selection
-Mobile: ensure that all BT/BLE flavors of the OSTC are recognized as dive computers [#2358]
-mobile-widgets: Add export function
-Desktop/Linux: fix issue with Linux AppImage failing to communicate with Bluetooth dive computers [#2370]
-Desktop: allow copy&pasting of multiple cylinders [#2386]
-Desktop: don't output random SAC values for cylinders without data [#2376]
-Mobile: add menu entry to start a support email, using native email client
-Mobile: fix subtle potential new data loss bug in first session connecting to a cloud account
-Planner: Add checkbox on considering oxygen narcotic
-Planner: Improve rounding of stop durations in planner notes
-Desktop: register changes when clicking "done" on dive-site edit screen
-Mobile: re-enable GPS location service icon in global drawer
-Core: support dives with no cylinders
-Core: remove restriction on number of cylinders
-Mobile: add support for editing the dive number of a dive
-Desktop: make dive replanning undoable
-Desktop: update statistics tab on undo or redo
-Planner: update dive details when replanning dive [#2280]
-Export: when exporting dive sites in dive site mode, export selected dive sites [#2275]
-Mobile: fix several bugs in the handling of incorrect or unverified cloud credentials
-Mobile: try to adjust the UI for cases with large default font relative to screen size
-libdivecomputer:
-- Add support for the Oceanic Geo 4.0
-- clean up Shearwater tank pressure handling
-- minor fixlets
+statistics: show proper dates in January
+desktop: add country to the fields indexed for full text search
+import: update libdivecomputer version, add support for the Scubapro G3 / Luna and Shearwater Tern
+desktop: add a button linking to the 'Contribute' page
+mobile: fix configuration of decompression ceiling and gradient factors
+desktop: fix gas switches in UDDF exports
+core: allow of up to 6 O2 sensors (and corresponding voting logic)
+desktop: add divemode as a possible dive list column
+profile-widget: Now zomed in profiles can be panned with horizontal scroll.
+desktop: hide only events with the same severity when 'Hide similar events' is used
+equipment: mark gas mixes reported by the dive computer as 'inactive' as 'not used'
+equipment: include unused cylinders in merged dive if the preference is enabled
+equipment: fix bug showing the first diluent in the gas list as 'used' for CCR dives
+desktop: added button to hide the infobox in the dive profile
+desktop: use persisted device information for the dive computer configuration
+core: fix bug using salinity and pressure values in mbar <-> depth conversion
+export: fix bug resulting in invalid CSV for '""' in 'CSV summary dive details'
+desktop: add support for multiple tanks to the profile ruler
+export: change format produced by 'CSV summary dive details' from TSV (tab separated) to CSV
+desktop: add function to merge dive site into site selected in list
+import: add option to synchronise dive computer time when downloading dives
+desktop: fix salinity combo/icon when DC doesnt have salinity info
+core: fix bug when save sea water salinity given by DC
+desktop: add option to force firmware update on OSTC4
+desktop: add column for dive notes to the dive list table
+desktop: Add an option for printing in landscape mode
+desktop: fix bug when printing a dive plan with multiple segments
+desktop: fix remembering of bluetooth address for remembered dive computers (not MacOS)
+desktop: fix bug in bailout gas selection for CCR dives
+desktop: fix crash on cylinder update of multiple dives
+desktop: use dynamic tank use drop down in equipment tab and planner
+desktop: fix brightness configuration for OSTC4
+equipment: Use 'diluent' as default gas use type if the dive mode is 'CCR'
+htmlexport: fix search in HTML export
+htmlexport: fix diveguide display
+statistics: fix value axis for degenerate value ranges
+profile: Show correct gas density when in CCR mode
+statistics: show correct color of selected scatter items when switching to unbinned mode
+statistics: fix display of month number in continuous date axis
+statistics: fix range of continuous date axis
+desktop: fix dive time display in time shift dialog
+libdivecomputer: garmin: relax string parsing sanity checks
+libdivecomputer: add Cressi Donatello, Scubapro G2 TEK, Oceanic Geo Air, Scorpena Alpha
+
 ---
 * Always add new entries at the very top of this file above other existing entries and this note.
 * Use this layout for new entries: `[Area]: [Details about the change] [reference thread / issue]`
+# vim: textwidth=100

CMakeLists.txt

@@ -20,6 +20,7 @@ endif ()
 
 set(CMAKE_MODULE_PATH
 	${${PROJECT_NAME}_SOURCE_DIR}/cmake/Modules
+	${${PROJECT_NAME}_SOURCE_DIR}/../install-root/lib/cmake
 	${CMAKE_MODULE_PATH}
 )
 
@@ -29,13 +30,15 @@ MACRO_ENSURE_OUT_OF_SOURCE_BUILD(
     "We don't support building in source, please create a build folder elsewhere and remember to run git clean -xdf to remove temporary files created by CMake."
 )
 
+#Option for memory debugging
+option(SUBSURFACE_ASAN_BUILD "enable memory debugging of Subsurface binary" OFF)
+
 #Option for profiling
 option(SUBSURFACE_PROFILING_BUILD "enable profiling of Subsurface binary" OFF)
 
 #Options regarding usage of pkgconfig
 option(LIBGIT2_FROM_PKGCONFIG "use pkg-config to retrieve libgit2" OFF)
 option(LIBDC_FROM_PKGCONFIG "use pkg-config to retrieve libdivecomputer" OFF)
-option(LIBGRANTLEE_FROM_PKGCONFIG "use pkg-config to retrieve grantlee" OFF)
 
 #Library Handling
 option(FORCE_LIBSSH "force linking with libssh to workaround libgit2 bug" ON)
@@ -47,14 +50,17 @@ option(NO_PRINTING "disable the printing support" OFF)
 option(NO_USERMANUAL "don't include a viewer for the user manual" OFF)
 
 #Options regarding enabling parts of subsurface
-option(BTSUPPORT "enable support for QtBluetooth (requires Qt5.4 or newer)" ON)
+option(BTSUPPORT "enable support for QtBluetooth" ON)
 option(FTDISUPPORT "enable support for libftdi based serial" OFF)
 
 # Options regarding What should we build on subsurface
 option(MAKE_TESTS "Make the tests" ON)
 
-SET(SUBSURFACE_TARGET_EXECUTABLE "DesktopExecutable" CACHE STRING "The type of application, DesktopExecutable or MobileExecutable")
-LIST(APPEND SUBSURFACE_ACCEPTED_EXECUTABLES  "DesktopExecutable" "MobileExecutable")
+# Option whether we should try to build against Qt6, if it is available
+option(BUILD_WITH_QT6 "try to build against Qt6 (incomplete)" OFF)
+
+SET(SUBSURFACE_TARGET_EXECUTABLE "DesktopExecutable" CACHE STRING "The type of application, DesktopExecutable, MobileExecutable, or DownloaderExecutable")
+LIST(APPEND SUBSURFACE_ACCEPTED_EXECUTABLES  "DesktopExecutable" "MobileExecutable" "DownloaderExecutable")
 SET_PROPERTY(CACHE SUBSURFACE_TARGET_EXECUTABLE PROPERTY STRINGS ${SUBSURFACE_ACCEPTED_EXECUTABLES})
 
 #verify if Platform is correct and warn on wxit with example.
@@ -74,7 +80,7 @@ add_definitions(-DSUBSURFACE_SOURCE="${SUBSURFACE_SOURCE}")
 
 set(CMAKE_C_STANDARD 99)
 set(CMAKE_C_STANDARD_REQUIRED TRUE)
-set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
 
 #
@@ -111,10 +117,15 @@ if (SUBSURFACE_PROFILING_BUILD)
 	SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pg")
 	SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -pg")
 endif()
+# set up ASan
+if (SUBSURFACE_ASAN_BUILD)
+	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address")
+	SET(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address")
+endif()
 
 # every compiler understands -Wall
-set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
+set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Werror=format")
+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror=format")
 
 # by detault optimize with -O2 even for debug builds
 set (GCC_OPTIMIZATION_FLAGS "-O2" CACHE STRING "GCC optimization flags")
@@ -134,10 +145,6 @@ include(pkgconfig_helper)
 # module file.
 include(HandleFindGit2)
 include(HandleFindLibDiveComputer)
-if (SUBSURFACE_TARGET_EXECUTABLE MATCHES "DesktopExecutable")
-        include(HandleFindGrantlee)
-	include(HandleUserManual)
-endif()
 include(HandleFtdiSupport)
 include(HandleVersionGeneration)
 include(RunOnBuildDir)
@@ -145,14 +152,21 @@ include(cmake_variables_helper)
 
 if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
 	include_directories(${CMAKE_OSX_SYSROOT}/usr/include/libxml2)
-	set(SUBSURFACE_LINK_LIBRARIES ${SUBSURFACE_LINK_LIBRARIES} -lxml2 -lxslt -lsqlite3)
+	LIST(APPEND SUBSURFACE_LINK_LIBRARIES -lxml2 -lxslt -lsqlite3)
 else()
 	pkg_config_library(LIBXML libxml-2.0 REQUIRED)
 	pkg_config_library(LIBSQLITE3 sqlite3 REQUIRED)
 	pkg_config_library(LIBXSLT libxslt REQUIRED)
 endif()
 pkg_config_library(LIBZIP libzip REQUIRED)
-pkg_config_library(LIBUSB libusb-1.0 QUIET)
+
+if(NOT ANDROID)
+	if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+		pkg_config_library(BLUEZ bluez REQUIRED)
+	endif()
+	pkg_config_library(LIBUSB libusb-1.0 QUIET)
+	pkg_config_library(LIBMTP libmtp QUIET)
+endif()
 
 include_directories(.
 	${CMAKE_CURRENT_BINARY_DIR}
@@ -160,6 +174,67 @@ include_directories(.
 	${CMAKE_BINARY_DIR}/desktop-widgets
 )
 
+# decide what to do about Qt
+# this is messy because we want to support older Qt5 versions, newer Qt5 versions,
+# and Qt6 when enabled / available.
+if(BUILD_WITH_QT6)
+	set(CHECK_QT6 "Qt6")
+endif()
+
+# figure out which version of Qt we are building against
+# in theory this should get us all the variables set up correctly, but that
+# ended up failing in subtle ways to do what was advertized; in the Qt5 case
+# some of the variables didn't get set up, so we'll immediately call it again
+# for Qt5
+find_package(QT NAMES ${CHECK_QT6} Qt5 REQUIRED COMPONENTS Core Widgets)
+
+# right now there are a few things that don't work with Qt6
+# let's disable them right here and remember our Qt version
+if(QT_VERSION_MAJOR STREQUAL "6")
+	set(USINGQT6 ON)
+	set(QT5OR6 "")
+	# for Qt6 we want the Qt5 compatibility package
+	LIST(APPEND QT_EXTRA_COMPONENTS Core5Compat)
+	LIST(APPEND QT_TEST_LIBRARIES Qt::Core5Compat)
+
+	# QtWebKit doesn't work with Qt6, so no printing, no manual
+	set(NO_PRINTING ON)
+	set(NO_USERMANUAL ON)
+
+	# as of Qt 6.3 by default QtLocation isn't included, but one can
+	# build the module from source; so let's look if the user has installed
+	# it (or if a newer version is out that includes it, anyway)
+	find_package(Qt6 COMPONENTS Location)
+	if(Qt6Location_FOUND)
+		message(STATUS "Found Qt6Location")
+		LIST(APPEND QT_EXTRA_COMPONENTS Location)
+		add_definitions(-DMAP_SUPPORT)
+		set(MAPSUPPORT ON)
+
+		# at least on macOS something goes sideways and we fail to load the
+		# QML files with a weird error about Qml.WorkerScript missing
+		# linking Subsurface against that component appears enough to hack
+		# around that, but that feels... wrong
+		if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+			find_package(Qt6 COMPONENTS QmlWorkerScript)
+			LIST(APPEND SUBSURFACE_LINK_LIBRARIES Qt6::QmlWorkerScript)
+		endif()
+	endif()
+else()
+	# as mentioned above, since some variables appear to fail to populate
+	# on some platforms, simply run this again the 'old' way
+	find_package(Qt5 REQUIRED COMPONENTS Core Widgets)
+	set(USINGQT6 OFF)
+	set(QT5OR6 "5")
+	set(QT_VERSION ${Qt5_VERSION})
+	set(QT_INSTALL_PREFIX ${_qt5Core_install_prefix})
+	# for Qt5 we want the Location component (which is missing so far in Qt6)
+	LIST(APPEND QT_EXTRA_COMPONENTS Location)
+	add_definitions(-DMAP_SUPPORT)
+	set(MAPSUPPORT ON)
+endif()
+message(STATUS "building with Qt ${QT_VERSION}")
+
 # Project Target specific configuration should go here,
 # if the configuration is too big or would disrupt the normal code flux,
 # move it somewhere else (another file) and include it.
@@ -171,6 +246,33 @@ if (SUBSURFACE_TARGET_EXECUTABLE MATCHES "DesktopExecutable")
 	endif()
 	list(APPEND QT_EXTRA_COMPONENTS QuickWidgets)
 	remove_definitions(-DSUBSURFACE_MOBILE)
+	if(NO_USERMANUAL)
+		message(STATUS "building without built-in user manual support")
+		add_definitions(-DNO_USERMANUAL)
+	else()
+		set(REQUEST_WEBKIT ON)
+	endif()
+	if(NO_PRINTING)
+		message(STATUS "building without printing support")
+		add_definitions(-DNO_PRINTING)
+	else()
+		set(REQUEST_WEBKIT ON)
+	endif()
+	if(REQUEST_WEBKIT)
+		# Because Qt5WebKitWidgets isn't a part of the "regular" Qt5, we can't get it the normal way
+		find_package(Qt5WebKitWidgets QUIET)
+		if(Qt5WebKitWidgets_FOUND STREQUAL "1")
+			LIST(APPEND QT_EXTRA_COMPONENTS PrintSupport WebKitWidgets)
+			LIST(APPEND SUBSURFACE_LINK_LIBRARIES Qt5::WebKitWidgets)
+			message(STATUS "building with QtWebKit")
+		else()
+			message(STATUS "didn't find QtWebKit, building without user manual and printing support")
+			add_definitions(-DNO_PRINTING)
+			add_definitions(-DNO_USERMANUAL)
+			set(NO_PRINTING ON)
+			set(NO_USERMANUAL ON)
+		endif()
+	endif()
 elseif (SUBSURFACE_TARGET_EXECUTABLE MATCHES "MobileExecutable")
 	if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
 		set(SUBSURFACE_TARGET Subsurface-mobile)
@@ -178,6 +280,7 @@ elseif (SUBSURFACE_TARGET_EXECUTABLE MATCHES "MobileExecutable")
 		set(SUBSURFACE_TARGET subsurface-mobile)
 	endif()
 	list(APPEND QT_EXTRA_COMPONENTS QuickControls2)
+	list(APPEND QT_EXTRA_COMPONENTS QuickWidgets)
 	add_definitions(-DSUBSURFACE_MOBILE)
 
 	# add definition to seperate mobile for devices and for desktop
@@ -185,38 +288,48 @@ elseif (SUBSURFACE_TARGET_EXECUTABLE MATCHES "MobileExecutable")
 
 	message(STATUS "Building Subsurface-mobile requires BT support")
 	set(BTSUPPORT ON)
+elseif (SUBSURFACE_TARGET_EXECUTABLE MATCHES "DownloaderExecutable")
+	if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+		set(SUBSURFACE_TARGET Subsurface-downloader)
+	else()
+		set(SUBSURFACE_TARGET subsurface-downloader)
+	endif()
+	set(BTSUPPORT ON)
+	add_definitions(-DSUBSURFACE_DOWNLOADER)
+	message(STATUS "building the embedded Subsurface-downloader app")
 endif()
 
 if(ANDROID)
 	set(NO_PRINTING ON)
+	set(NO_USERMANUAL ON)
+	set(MAKE_TESTS OFF)
 	list(APPEND QT_EXTRA_COMPONENTS AndroidExtras)
-	set(SUBSURFACE_LINK_LIBRARIES ${SUBSURFACE_LINK_LIBRARIES} -llog)
+	LIST(APPEND SUBSURFACE_LINK_LIBRARIES -llog)
 elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-        # add pthread to the end of the library list on Linux
-        # this is only needed on Ubuntu
-        # but shouldn't hurt on other Linux versions
-        # in some builds we appear to be missing libz for some strange reason...
-	# Add ssh2 at the end for openSUSE builds (for recent cmake?)
-        set(SUBSURFACE_LINK_LIBRARIES ${SUBSURFACE_LINK_LIBRARIES} -lssh2 -lz -lpthread)
+	# add pthread to the end of the library list on Linux
+	# this is only needed on Ubuntu
+	# but shouldn't hurt on other Linux versions
+	# in some builds we appear to be missing libz for some strange reason...
+	LIST(APPEND SUBSURFACE_LINK_LIBRARIES -lz -lpthread)
 
-        # Test for ARM processor (Raspberry Pi) and add libGLESv2 if found
-        if (CMAKE_SYSTEM_PROCESSOR STREQUAL "armv7l" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "armv6l")
-                message (STATUS "Found ARM processor. Adding libGLESv2")
-                set(SUBSURFACE_LINK_LIBRARIES ${SUBSURFACE_LINK_LIBRARIES} -lGLESv2)
-                set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-        endif()
+	# Test for ARM processor (Raspberry Pi) and add libGLESv2 if found
+	if (CMAKE_SYSTEM_PROCESSOR STREQUAL "armv7l" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "armv6l")
+		message (STATUS "Found ARM processor. Adding libGLESv2")
+		LIST(APPEND SUBSURFACE_LINK_LIBRARIES -lGLESv2)
+		set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+	endif()
 elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-        execute_process(
-                COMMAND sh scripts/get-version linux
-                WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-                OUTPUT_VARIABLE SSRF_VERSION_STRING
-                OUTPUT_STRIP_TRAILING_WHITESPACE
-        )
-        find_library(APP_SERVICES_LIBRARY ApplicationServices)
-        find_library(HID_LIB HidApi)
-        set(SUBSURFACE_LINK_LIBRARIES ${SUBSURFACE_LINK_LIBRARIES} ${HID_LIB})
-        set(EXTRA_LIBS ${APP_SERVICES_LIBRARY})
-        set(ICON_FILE ${CMAKE_SOURCE_DIR}/packaging/macosx/Subsurface.icns)
+	execute_process(
+		COMMAND bash scripts/get-version.sh
+		WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+		OUTPUT_VARIABLE SSRF_VERSION_STRING
+		OUTPUT_STRIP_TRAILING_WHITESPACE
+	)
+	find_library(APP_SERVICES_LIBRARY ApplicationServices)
+	find_library(HID_LIB HidApi)
+	LIST(APPEND SUBSURFACE_LINK_LIBRARIES ${HID_LIB})
+	set(EXTRA_LIBS ${APP_SERVICES_LIBRARY})
+	set(ICON_FILE ${CMAKE_SOURCE_DIR}/packaging/macosx/Subsurface.icns)
 	if (SUBSURFACE_TARGET_EXECUTABLE MATCHES "MobileExecutable")
 		set(MACOSX_BUNDLE_INFO_STRING "Subsurface-mobile")
 		set(MACOSX_BUNDLE_BUNDLE_NAME "Subsurface-mobile")
@@ -226,16 +339,16 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
 	endif()
 	set(MACOSX_BUNDLE_ICON_FILE Subsurface.icns)
 	set(MACOSX_BUNDLE_GUI_IDENTIFIER "org.subsurface-divelog")
-        set(MACOSX_BUNDLE_BUNDLE_VERSION "${SSRF_VERSION_STRING}")
-        set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${SSRF_VERSION_STRING}")
-        set(MACOSX_BUNDLE_LONG_VERSION_STRING "${SSRF_VERSION_STRING}")
-        set(MACOSX_BUNDLE_COPYRIGHT "Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others")
-        set_source_files_properties(${ICON_FILE} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
-        set(SUBSURFACE_PKG MACOSX_BUNDLE ${ICON_FILE})
+	set(MACOSX_BUNDLE_BUNDLE_VERSION "${SSRF_VERSION_STRING}")
+	set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${SSRF_VERSION_STRING}")
+	set(MACOSX_BUNDLE_LONG_VERSION_STRING "${SSRF_VERSION_STRING}")
+	set(MACOSX_BUNDLE_COPYRIGHT "Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, Berthold Stoeger and others")
+	set_source_files_properties(${ICON_FILE} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
+	set(SUBSURFACE_PKG MACOSX_BUNDLE ${ICON_FILE})
 elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-        set(SUBSURFACE_LINK_LIBRARIES ${SUBSURFACE_LINK_LIBRARIES} -lwsock32 -lws2_32)
-        remove_definitions(-DUNICODE)
-        add_definitions(-mwindows -D_WIN32)
+	LIST(APPEND SUBSURFACE_LINK_LIBRARIES -lwsock32 -lws2_32)
+	remove_definitions(-DUNICODE)
+	add_definitions(-mwindows -D_WIN32)
 endif()
 
 if(BTSUPPORT)
@@ -251,35 +364,64 @@ if(ANDROID)
 	# our Qt installation. This is ugly, but it works.
 	set(CMAKE_FIND_ROOT_PATH "/;${CMAKE_FIND_ROOT_PATH}")
 endif()
-set(QT_FIND_COMPONENTS Core Concurrent Widgets Network Svg Positioning Quick Location ${QT_EXTRA_COMPONENTS})
+set(QT_FIND_COMPONENTS Core Concurrent Widgets Network Svg Positioning Quick ${QT_EXTRA_COMPONENTS})
 if (SUBSURFACE_TARGET_EXECUTABLE MATCHES "DesktopExecutable")
-	find_package(Qt5 5.9.1 REQUIRED COMPONENTS ${QT_FIND_COMPONENTS} LinguistTools Test QuickTest)
-else()
+	find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS ${QT_FIND_COMPONENTS} LinguistTools Test QuickTest)
+elseif (SUBSURFACE_TARGET_EXECUTABLE MATCHES "MobileExecutable")
 	# Kirigami 5.62 and newer require at least Qt 5.12
-	find_package(Qt5 5.12 REQUIRED COMPONENTS ${QT_FIND_COMPONENTS} LinguistTools Test QuickTest)
+	if(ANDROID)
+		find_package(Qt${QT_VERSION_MAJOR} 5.12 REQUIRED COMPONENTS ${QT_FIND_COMPONENTS} LinguistTools)
+	else()
+		find_package(Qt${QT_VERSION_MAJOR} 5.12 REQUIRED COMPONENTS ${QT_FIND_COMPONENTS} LinguistTools Test QuickTest)
+	endif()
+elseif (SUBSURFACE_TARGET_EXECUTABLE MATCHES "DownloaderExecutable")
+	# let's pick a version that's not ancient
+	find_package(Qt${QT_VERSION_MAJOR} 5.11 REQUIRED COMPONENTS ${QT_FIND_COMPONENTS})
+	set(MAKE_TESTS OFF)
 endif()
+
 foreach(_QT_COMPONENT ${QT_FIND_COMPONENTS})
-	list(APPEND QT_LIBRARIES Qt5::${_QT_COMPONENT})
+	list(APPEND QT_LIBRARIES Qt${QT5OR6}::${_QT_COMPONENT})
 endforeach()
-set(QT_TEST_LIBRARIES ${QT_LIBRARIES} Qt5::Test Qt5::QuickTest)
+if(NOT ANDROID)
+	LIST(APPEND QT_TEST_LIBRARIES ${QT_LIBRARIES} Qt${QT5OR6}::Test Qt${QT5OR6}::QuickTest)
+endif()
 
 #set up the subsurface_link_libraries variable
-set(SUBSURFACE_LINK_LIBRARIES ${SUBSURFACE_LINK_LIBRARIES} ${LIBDIVECOMPUTER_LIBRARIES} ${LIBGIT2_LIBRARIES} ${LIBUSB_LIBRARIES})
-qt5_add_resources(SUBSURFACE_RESOURCES subsurface.qrc map-widget/qml/map-widget.qrc)
+LIST(APPEND SUBSURFACE_LINK_LIBRARIES ${LIBDIVECOMPUTER_LIBRARIES} ${LIBGIT2_LIBRARIES} ${LIBUSB_LIBRARIES} ${LIBMTP_LIBRARIES})
+if (NOT SUBSURFACE_TARGET_EXECUTABLE MATCHES "DownloaderExecutable")
+	if(USINGQT6)
+		if(MAPSUPPORT)
+			qt_add_resources(SUBSURFACE_RESOURCES map-widget/qml/map-widget.qrc)
+			set(SUBSURFACE_MAPWIDGET subsurface_mapwidget)
+		endif()
+		qt_add_resources(SUBSURFACE_RESOURCES subsurface.qrc profile.qrc stats/statsicons.qrc desktop-widgets/qml/statsview2.qrc)
+	else()
+		qt5_add_resources(SUBSURFACE_RESOURCES subsurface.qrc profile.qrc stats/statsicons.qrc map-widget/qml/map-widget.qrc desktop-widgets/qml/statsview2.qrc)
+		set(SUBSURFACE_MAPWIDGET subsurface_mapwidget)
+	endif()
+endif()
 
 # hack to build successfully on LGTM
 if(DEFINED ENV{LGTM_SRC})
-	set(SUBSURFACE_LINK_LIBRARIES ${SUBSURFACE_LINK_LIBRARIES} -lgssapi_krb5 -lhttp_parser)
+	LIST(APPEND SUBSURFACE_LINK_LIBRARIES -lgssapi_krb5 -lhttp_parser)
 endif()
 
 # include translations
+if (NOT SUBSURFACE_TARGET_EXECUTABLE MATCHES "DownloaderExecutable")
 add_subdirectory(translations)
+endif()
 add_subdirectory(core)
 add_subdirectory(qt-models)
 add_subdirectory(commands)
+if (NOT SUBSURFACE_TARGET_EXECUTABLE MATCHES "DownloaderExecutable")
 add_subdirectory(profile-widget)
+if(MAPSUPPORT)
 add_subdirectory(map-widget)
+endif()
 add_subdirectory(mobile-widgets)
+add_subdirectory(stats)
+endif()
 add_subdirectory(backend-shared)
 
 if (SUBSURFACE_TARGET_EXECUTABLE MATCHES "DesktopExecutable")
@@ -288,33 +430,50 @@ endif()
 
 # create the executables
 if (SUBSURFACE_TARGET_EXECUTABLE MATCHES "MobileExecutable")
+	# set up Kirigami using KDE ECM
+	# that's available as kde-extra-cmake-modules on Homebrew, on all Linux flavors
+	# Android and iOS are built via qmake, Windows build of Subsurface-mobile isn't supported
+	find_package(ECM REQUIRED CONFIG PATHS ${CMAKE_CURRENT_SOURCE_DIR}/mobile-widgets/3rdparty/ECM)
+	set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/ ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH})
+	set(BREEZEICONS_DIR mobile-widgets/3rdparty/breeze-icons/)
+
+	SET(QML_IMPORT_PATH ${QML_IMPORT_PATH} ${CMAKE_SOURCE_DIR}/mobile-widgets/3rdparty/kirigami/src ${CMAKE_SOURCE_DIR}/mobile-widgets/qml)
+	add_subdirectory(mobile-widgets/3rdparty)
+	include_directories(${CMAKE_SOURCE_DIR}/mobile-widgets/3rdparty/kirigami/src)
+	include(${CMAKE_SOURCE_DIR}/mobile-widgets/3rdparty/kirigami/KF5Kirigami2Macros.cmake)
+
 	set(MOBILE_SRC
 		subsurface-mobile-main.cpp
 		subsurface-helper.cpp
 	)
-	include_directories(${CMAKE_SOURCE_DIR}/mobile-widgets/qml/kirigami/src/libkirigami)
-	add_definitions(-DKIRIGAMI_BUILD_TYPE_STATIC)
-	qt5_add_resources(MOBILE_RESOURCES mobile-widgets/qml/mobile-resources.qrc)
-	qt5_add_resources(MOBILE_RESOURCES mobile-widgets/qml/kirigami/kirigami.qrc)
-	# When building the mobile application in Android, link it and Qt will do the rest, when doing the mobile application on Desktop, create an executable.
-	if(ANDROID)
-		qt5_add_resources(MOBILE_RESOURCES android-mobile/font.qrc)
-		add_library(${SUBSURFACE_TARGET} SHARED ${SUBSURFACE_PKG} ${MOBILE_SRC} ${SUBSURFACE_RESOURCES} ${MOBILE_RESOURCES})
+	if(USINGQT6)
+		qt_add_resources(MOBILE_RESOURCES mobile-widgets/qml/mobile-resources.qrc)
+		qt_add_resources(MOBILE_RESOURCES profile.qrc)
+		qt_add_resources(MOBILE_RESOURCES mobile-widgets/3rdparty/icons.qrc)
+		qt_add_resources(MOBILE_RESOURCES mobile-widgets/3rdparty/kirigami/src/scenegraph/shaders/shaders.qrc)
 	else()
-		# the following is split across two commands since in cmake 3.12 this would result
-		# in a non-sensical "no sources given to target" error if done all as one set of
-		# arguments to the add_executable() call
-		add_executable(${SUBSURFACE_TARGET} ${SUBSURFACE_PKG} ${SUBSURFACE_RESOURCES})
-		target_sources(${SUBSURFACE_TARGET} PUBLIC ${MOBILE_SRC} ${MOBILE_RESOURCES})
+		qt5_add_resources(MOBILE_RESOURCES mobile-widgets/qml/mobile-resources.qrc)
+		qt5_add_resources(MOBILE_RESOURCES profile.qrc)
+		qt5_add_resources(MOBILE_RESOURCES mobile-widgets/3rdparty/icons.qrc)
+		qt5_add_resources(MOBILE_RESOURCES mobile-widgets/3rdparty/kirigami/src/scenegraph/shaders/shaders.qrc)
 	endif()
+
+	# the following is split across two commands since in cmake 3.12 this would result
+	# in a non-sensical "no sources given to target" error if done all as one set of
+	# arguments to the add_executable() call
+	add_executable(${SUBSURFACE_TARGET} ${SUBSURFACE_PKG} ${SUBSURFACE_RESOURCES})
+	target_sources(${SUBSURFACE_TARGET} PUBLIC ${MOBILE_SRC} ${MOBILE_RESOURCES})
 	target_link_libraries(
 		${SUBSURFACE_TARGET}
 		subsurface_mobile
 		subsurface_profile
-		subsurface_mapwidget
+		${SUBSURFACE_MAPWIDGET}
 		subsurface_backend_shared
 		subsurface_models_mobile
+		subsurface_commands
 		subsurface_corelib
+		subsurface_stats
+		kirigamiplugin
 		${SUBSURFACE_LINK_LIBRARIES}
 	)
 elseif (SUBSURFACE_TARGET_EXECUTABLE MATCHES "DesktopExecutable")
@@ -323,31 +482,45 @@ elseif (SUBSURFACE_TARGET_EXECUTABLE MATCHES "DesktopExecutable")
 		subsurface-helper.cpp
 	)
 	source_group("Subsurface App" FILES ${SUBSURFACE_APP})
-        if(ANDROID)
-                add_library(${SUBSURFACE_TARGET} SHARED ${SUBSURFACE_PKG} ${SUBSURFACE_APP} ${SUBSURFACE_RESOURCES})
-        else()
-                add_executable(${SUBSURFACE_TARGET} MACOSX_BUNDLE WIN32 ${SUBSURFACE_PKG} ${SUBSURFACE_APP} ${SUBSURFACE_RESOURCES})
-        endif()
+	if(ANDROID)
+		add_library(${SUBSURFACE_TARGET} SHARED ${SUBSURFACE_PKG} ${SUBSURFACE_APP} ${SUBSURFACE_RESOURCES})
+	else()
+		add_executable(${SUBSURFACE_TARGET} MACOSX_BUNDLE WIN32 ${SUBSURFACE_PKG} ${SUBSURFACE_APP} ${SUBSURFACE_RESOURCES})
+	endif()
 
 	target_link_libraries(
 		${SUBSURFACE_TARGET}
 		subsurface_generated_ui
 		subsurface_interface
 		subsurface_profile
-		subsurface_statistics
-		subsurface_mapwidget
+		${SUBSURFACE_MAPWIDGET}
 		subsurface_backend_shared
 		subsurface_models_desktop
-		subsurface_commands_desktop
+		subsurface_commands
 		subsurface_corelib
+		subsurface_stats
 		${SUBSURFACE_LINK_LIBRARIES}
 	)
 	add_dependencies(subsurface_desktop_preferences subsurface_generated_ui)
-	add_dependencies(subsurface_statistics subsurface_generated_ui)
 	add_dependencies(subsurface_interface subsurface_generated_ui)
 	add_dependencies(subsurface_profile subsurface_generated_ui)
 	add_dependencies(subsurface_models_desktop subsurface_generated_ui)
 	add_dependencies(subsurface_generated_ui version)
+elseif (SUBSURFACE_TARGET_EXECUTABLE MATCHES "DownloaderExecutable")
+	set(DOWNLOADER_APP
+		subsurface-downloader-main.cpp
+		cli-downloader.cpp
+	)
+	source_group("Downloader App" FILES ${DOWNLOADER_APP})
+	add_executable(${SUBSURFACE_TARGET} MACOSX_BUNDLE WIN32 ${SUBSURFACE_PKG} ${DOWNLOADER_APP} ${SUBSURFACE_RESOURCES})
+	target_link_libraries(
+		${SUBSURFACE_TARGET}
+		subsurface_backend_shared
+		subsurface_models_downloader
+		subsurface_commands
+		subsurface_corelib
+		${SUBSURFACE_LINK_LIBRARIES}
+	)
 endif()
 
 add_dependencies(subsurface_corelib version)
@@ -372,14 +545,17 @@ set(DOCFILES
 	${CMAKE_BINARY_DIR}/Documentation/user-manual.html
 	${CMAKE_BINARY_DIR}/Documentation/user-manual_es.html
 	${CMAKE_BINARY_DIR}/Documentation/user-manual_fr.html
-	${CMAKE_BINARY_DIR}/Documentation/user-manual_ru.html
 )
 
 # add all the translations that we may need
 FILE(STRINGS "subsurface_enabled_translations" QTTRANSLATIONS_BASE)
 
 if(NOT DEFINED QT_TRANSLATION_DIR OR QT_TRANSLATION_DIR STREQUAL "")
-	set(QT_TRANSLATION_DIR ${Qt5Core_DIR}/../../../translations)
+	if(USINGQT6)
+		set(QT_TRANSLATION_DIR ${QtCore_DIR}/../../../translations)
+	else()
+		set(QT_TRANSLATION_DIR ${Qt5Core_DIR}/../../../translations)
+	endif()
 endif()
 set(QTTRANSLATIONS "")
 foreach(QTTRANSLATION ${QTTRANSLATIONS_BASE})
@@ -406,8 +582,10 @@ if(ANDROID)
 	endif()
 elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
 	set(APP_BUNDLE_DIR "${SUBSURFACE_TARGET}.app")
-	set(EXTRA_MACDEPLOY_ARGS "-qmldir=${APP_BUNDLE_DIR}/Contents/Resources/qml ")
-	set(MACDEPLOY_ARGS "${EXTRA_MACDEPLOY_ARGS}-executable=${APP_BUNDLE_DIR}/Contents/MacOS/${SUBSURFACE_TARGET} -always-overwrite -libpath=${CMAKE_SOURCE_DIR}/../install-root/lib")
+	# macdeployqt simplifies a lot of this process, but still doesn't get everything right
+	# - it misses a couple of resources and frameworks
+	# - it seems to always deploy the SQL plugins (even though they aren't needed)
+	set(MACDEPLOY_ARGS "-qmldir=${APP_BUNDLE_DIR}/Contents/Resources/qml -appstore-compliant -verbose=0 -executable=${APP_BUNDLE_DIR}/Contents/MacOS/${SUBSURFACE_TARGET} -always-overwrite -libpath=${CMAKE_SOURCE_DIR}/../install-root/lib")
 	set(RESOURCEDIR ${CMAKE_BINARY_DIR}/${APP_BUNDLE_DIR}/Contents/Resources)
 	set(PLUGINDIR ${CMAKE_BINARY_DIR}/${APP_BUNDLE_DIR}/Contents/PlugIns)
 	install(DIRECTORY Documentation/images DESTINATION ${RESOURCEDIR}/share/Documentation)
@@ -418,34 +596,58 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
 	install(FILES ${QTTRANSLATIONS} DESTINATION ${RESOURCEDIR}/translations)
 	install(FILES ${CMAKE_SOURCE_DIR}/gpl-2.0.txt DESTINATION ${RESOURCEDIR})
 	install(CODE "execute_process(COMMAND mkdir -p ${RESOURCEDIR}/qml)")
-	# this is a HACK
-	if (SUBSURFACE_TARGET_EXECUTABLE MATCHES "DesktopExecutable" AND NOT NO_PRINTING)
-		install(DIRECTORY ${Grantlee5_DIR}/../../grantlee DESTINATION ${PLUGINDIR})
+	if(USINGQT6)
+		set(QT_INSTALL_PREFIX ${QT6_INSTALL_PREFIX})
+	else()
+		set(QT_INSTALL_PREFIX ${_qt5Core_install_prefix})
 	endif()
-	install(CODE "execute_process(COMMAND mkdir -p ${PLUGINDIR}/geoservices)")
-	install(CODE "execute_process(COMMAND cp ${_qt5Core_install_prefix}/plugins/geoservices/libqtgeoservices_googlemaps.dylib ${PLUGINDIR}/geoservices ERROR_QUIET)")
-	install(CODE "execute_process(COMMAND cp ${CMAKE_SOURCE_DIR}/../install-root/${_qt5Core_install_prefix}/plugins/geoservices/libqtgeoservices_googlemaps.dylib ${PLUGINDIR}/geoservices ERROR_QUIET)")
-	# this is a hack - but I don't know how else to find the macdeployqt program if it's not in the PATH
-	string(REPLACE moc macdeployqt MACDEPLOYQT ${QT_MOC_EXECUTABLE})
-	install(CODE "execute_process(COMMAND ${MACDEPLOYQT} ${APP_BUNDLE_DIR} -no-strip ${MACDEPLOY_ARGS})")
+	if(MAPSUPPORT)
+		install(CODE "execute_process(COMMAND mkdir -p ${PLUGINDIR}/geoservices)")
+		# this is really weird. We first try a plugin that ended up in the Qt install prefix
+		# then we try one that's in that odd broken install location that the qmake file results in (that includes the QT_INSTALL_PREFIX after our INSTALL_ROOT
+		# and finally, for fat binaries, we copy the one that's in the 'logical' spot under the INSTALL_ROOT
+		# this should cover all cases and always get us the correct library
+		install(CODE "execute_process(COMMAND cp ${QT_INSTALL_PREFIX}/plugins/geoservices/libqtgeoservices_googlemaps.dylib ${PLUGINDIR}/geoservices ERROR_QUIET)")
+		install(CODE "execute_process(COMMAND cp ${CMAKE_SOURCE_DIR}/../install-root/${QT_INSTALL_PREFIX}/plugins/geoservices/libqtgeoservices_googlemaps.dylib ${PLUGINDIR}/geoservices ERROR_QUIET)")
+		install(CODE "execute_process(COMMAND cp ${CMAKE_SOURCE_DIR}/../install-root/plugins/geoservices/libqtgeoservices_googlemaps.dylib ${PLUGINDIR}/geoservices ERROR_QUIET)")
+	endif()
+	# this will fail is macdeployqt isn't in the PATH - that seemed to happen in the past, but not recently
+	# also, on M1 macOS systems macdeployqt throws a ton of (apparently harmless) errors. Warn the unsuspecting developer
+	install(CODE "execute_process(COMMAND macdeployqt ${APP_BUNDLE_DIR} -no-strip ${MACDEPLOY_ARGS})")
+	# the next hack is here to delete the sqlite plugin that get's installed even though it isn't needed
+	install(CODE "execute_process(COMMAND rm -rf ${CMAKE_BINARY_DIR}/${APP_BUNDLE_DIR}/Contents/PlugIns/sqldrivers)")
 	# and another hack to get the QML Components in the right place
-	install(CODE "execute_process(COMMAND cp -a ${_qt5Core_install_prefix}/qml/QtQuick.2 ${CMAKE_BINARY_DIR}/${APP_BUNDLE_DIR}/Contents/Resources/qml)")
-	install(CODE "execute_process(COMMAND cp -a ${_qt5Core_install_prefix}/qml/QtLocation ${CMAKE_BINARY_DIR}/${APP_BUNDLE_DIR}/Contents/Resources/qml)")
-	install(CODE "execute_process(COMMAND cp -a ${_qt5Core_install_prefix}/qml/QtPositioning ${CMAKE_BINARY_DIR}/${APP_BUNDLE_DIR}/Contents/Resources/qml)")
-	if(NOT Qt5Core_VERSION VERSION_LESS 5.11.0)
+	if(MAPSUPPORT)
+		if (USINGQT6)
+			install(CODE "execute_process(COMMAND rm -rf ${CMAKE_BINARY_DIR}/${APP_BUNDLE_DIR}/Contents/Resources/qml/{QtQuick,QtLocation,QtPositioning})")
+			install(CODE "execute_process(COMMAND cp -a ${QT_INSTALL_PREFIX}/qml/QtQuick ${CMAKE_BINARY_DIR}/${APP_BUNDLE_DIR}/Contents/Resources/qml)")
+		else()
+			install(CODE "execute_process(COMMAND rm -rf ${CMAKE_BINARY_DIR}/${APP_BUNDLE_DIR}/Contents/Resources/qml/{QtQuick.2,QtLocation,QtPositioning})")
+			install(CODE "execute_process(COMMAND cp -a ${QT_INSTALL_PREFIX}/qml/QtQuick.2 ${CMAKE_BINARY_DIR}/${APP_BUNDLE_DIR}/Contents/Resources/qml)")
+		endif()
+		install(CODE "execute_process(COMMAND cp -a ${QT_INSTALL_PREFIX}/qml/QtLocation ${CMAKE_BINARY_DIR}/${APP_BUNDLE_DIR}/Contents/Resources/qml)")
+	endif()
+	install(CODE "execute_process(COMMAND cp -a ${QT_INSTALL_PREFIX}/qml/QtPositioning ${CMAKE_BINARY_DIR}/${APP_BUNDLE_DIR}/Contents/Resources/qml)")
+	if(NOT QT_VERSION VERSION_LESS 5.11.0)
 		# and with Qt 5.11 we need another library that isn't copied by macdeployqt
-		install(CODE "execute_process(COMMAND cp -a ${_qt5Core_install_prefix}/lib/QtPositioningQuick.framework ${CMAKE_BINARY_DIR}/${APP_BUNDLE_DIR}/Contents/Frameworks)")
+		install(CODE "execute_process(COMMAND rm -rf ${CMAKE_BINARY_DIR}/${APP_BUNDLE_DIR}/Contents/Frameworks/QtPositioningQuick.framework)")
+		install(CODE "execute_process(COMMAND cp -a ${QT_INSTALL_PREFIX}/lib/QtPositioningQuick.framework ${CMAKE_BINARY_DIR}/${APP_BUNDLE_DIR}/Contents/Frameworks)")
+	endif()
+	if(NOT QT_VERSION VERSION_LESS 5.14.0)
+		# and with Qt 5.14 we need another library that isn't always copied by macdeployqt
+		install(CODE "execute_process(COMMAND rm -rf ${CMAKE_BINARY_DIR}/${APP_BUNDLE_DIR}/Contents/Frameworks/QtQmlWorkerScript.framework)")
+		install(CODE "execute_process(COMMAND cp -a ${QT_INSTALL_PREFIX}/lib/QtQmlWorkerScript.framework ${CMAKE_BINARY_DIR}/${APP_BUNDLE_DIR}/Contents/Frameworks)")
 	endif()
 	if (SUBSURFACE_TARGET_EXECUTABLE MATCHES "MobileExecutable")
-		install(CODE "execute_process(COMMAND cp -a ${_qt5Core_install_prefix}/qml/QtQuick ${CMAKE_BINARY_DIR}/${APP_BUNDLE_DIR}/Contents/Resources/qml)")
-		install(CODE "execute_process(COMMAND cp -a ${_qt5Core_install_prefix}/qml/QtGraphicalEffects ${CMAKE_BINARY_DIR}/${APP_BUNDLE_DIR}/Contents/Resources/qml)")
-		install(CODE "execute_process(COMMAND cp -a ${_qt5Core_install_prefix}/qml/QtQml ${CMAKE_BINARY_DIR}/${APP_BUNDLE_DIR}/Contents/Resources/qml)")
-		install(CODE "execute_process(COMMAND cp -a ${_qt5Core_install_prefix}/qml/QtPositioning ${CMAKE_BINARY_DIR}/${APP_BUNDLE_DIR}/Contents/Resources/qml)")
+		install(CODE "execute_process(COMMAND cp -a ${QT_INSTALL_PREFIX}/qml/QtQuick ${CMAKE_BINARY_DIR}/${APP_BUNDLE_DIR}/Contents/Resources/qml)")
+		install(CODE "execute_process(COMMAND cp -a ${QT_INSTALL_PREFIX}/qml/QtGraphicalEffects ${CMAKE_BINARY_DIR}/${APP_BUNDLE_DIR}/Contents/Resources/qml)")
+		install(CODE "execute_process(COMMAND cp -a ${QT_INSTALL_PREFIX}/qml/QtQml ${CMAKE_BINARY_DIR}/${APP_BUNDLE_DIR}/Contents/Resources/qml)")
+		install(CODE "execute_process(COMMAND cp -a ${QT_INSTALL_PREFIX}/qml/QtPositioning ${CMAKE_BINARY_DIR}/${APP_BUNDLE_DIR}/Contents/Resources/qml)")
 	endif()
 elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
 	if (CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
 		if(NOT DEFINED OBJCOPY)
-			set(OBJCOPY i686-w64-mingw32.shared-objcopy)
+			set(OBJCOPY x86_64-w64-mingw32.shared-objcopy)
 		endif()
 		find_program(OBJCOPY_FOUND ${OBJCOPY})
 		if (OBJCOPY_FOUND)
@@ -473,12 +675,11 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
 	install(FILES ${CMAKE_SOURCE_DIR}/gpl-2.0.txt ${CMAKE_SOURCE_DIR}/packaging/windows/subsurface.ico DESTINATION ${WINDOWSSTAGING})
 	install(TARGETS ${SUBSURFACE_TARGET} DESTINATION ${WINDOWSSTAGING})
 	install(FILES ${CMAKE_BINARY_DIR}/qt.conf DESTINATION ${WINDOWSSTAGING})
-	install(DIRECTORY ${CMAKE_INSTALL_PREFIX}/lib/grantlee DESTINATION ${WINDOWSSTAGING})
 
-	if(NOT Qt5Core_VERSION VERSION_LESS 5.11.0)
+	if(NOT QT_VERSION VERSION_LESS 5.11.0)
 		# hack to work around the fact that we don't process the dependencies of plugins
 		# as of Qt 5.11 this additional DLL is needed and it's only referenced in the qml DLLs
-		install(FILES ${_qt5Core_install_prefix}/bin/Qt5PositioningQuick.dll DESTINATION ${WINDOWSSTAGING})
+		install(FILES ${QT_INSTALL_PREFIX}/bin/Qt5PositioningQuick.dll DESTINATION ${WINDOWSSTAGING})
 	endif()
 
 	if(NOT DEFINED MAKENSIS)
@@ -519,15 +720,15 @@ elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux")
 	endif()
 	install(FILES subsurface.debug DESTINATION bin)
 	install(FILES subsurface.desktop DESTINATION share/applications)
-	install(CODE "execute_process(COMMAND sh ${CMAKE_SOURCE_DIR}/scripts/add-version-to-appdata.sh WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})")
-	install(FILES appdata/subsurface.appdata.xml DESTINATION share/metainfo)
+	install(CODE "execute_process(COMMAND sh ${CMAKE_SOURCE_DIR}/scripts/add-version-to-metainfo.sh WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})")
+	install(FILES metainfo/subsurface.metainfo.xml DESTINATION share/metainfo)
 	install(FILES icons/subsurface-icon.svg DESTINATION share/icons/hicolor/scalable/apps)
 	install(DIRECTORY Documentation/images DESTINATION share/subsurface/Documentation)
 	install(FILES ${DOCFILES} DESTINATION share/subsurface/Documentation)
 	install(DIRECTORY theme DESTINATION share/subsurface)
 	install(DIRECTORY printing_templates DESTINATION share/subsurface)
 	install(FILES ${TRANSLATIONS} DESTINATION share/subsurface/translations)
-        install(TARGETS ${SUBSURFACE_TARGET} DESTINATION bin)
+	install(TARGETS ${SUBSURFACE_TARGET} DESTINATION bin)
 endif()
 
 if (MAKE_TESTS)

CODINGSTYLE.md

@@ -6,11 +6,11 @@ not yet fully consistent to these rules, but following these rules will make
 sure that no one yells at you about your patches.
 
 We have a script that can be used to reformat code to be reasonably close
-to these rules; it's in scripts/whitespace.pl - this script requires
+to these rules; it's in `scripts/whitespace.pl` – this script requires
 clang-format to be installed (which sadly isn't installed by default on
 any of our platforms; even on Mac where clang is the default compiler).
 
-At the end of this file are some ideas for your .emacs file (if that's
+At the end of this file are some ideas for your `.emacs` file (if that's
 your editor of choice) as well as for QtCreator. If you have settings for
 other editors that implement this coding style, please add them here.
 
@@ -21,14 +21,14 @@ other editors that implement this coding style, please add them here.
 
 * all keywords followed by a '(' have a space in between
   ```
-	if (condition)
-
-	for (i = 0; i < 5; i++)
+  if (condition)
+  
+  for (i = 0; i < 5; i++)
   ```
 
 * function calls do NOT have a space between their name and argument
   ```
-	i = some_function(argument);
+  i = some_function(argument);
   ```
 
 * usually there is no space on the inside of parenthesis (see examples
@@ -40,69 +40,81 @@ other editors that implement this coding style, please add them here.
 * all other opening curly braces follow at the end of the line, with a
   space separating them:
   ```
-	if (condition) {
-		dosomething();
-		dosomethingelse();
-	}
+  if (condition) {
+  	dosomething();
+  	dosomethingelse();
+  }
   ```
 
-* both sides of an if / else clause either use or do not use curly braces:
+* both sides of an `if` / `else` clause either use or do not use curly braces:
   ```
-	if (condition)
-		i = 4;
-	else
-		j = 6;
-
-	if (condition) {
-		i = 6;
-	} else {
-		i = 4;
-		j = 6;
-	}
+  if (condition)
+  	i = 4;
+  else
+  	j = 6;
+  
+  if (condition) {
+  	i = 6;
+  } else {
+  	i = 4;
+  	j = 6;
+  }
   ```
 
 * use space to make visual separation easier
   ```
-	a = b + 3 + e / 4;
+  a = b + 3 + e / 4;
   ```
 
 * continuation lines have the operator / comma at the end
   ```
-	if (very_long_condition_1 ||
-	    condition_2)
-
-	b = a + (c + d +
-		 f + z);
+  if (very_long_condition_1 ||
+      condition_2)
+  
+  b = a + (c + d +
+  	 f + z);
   ```
 
 * in a C++ constructor initialization list, the colon is on the same line and
   continuation lines are aligned as the rule above:
   ```
-	ClassName::ClassName() : x(1),
-		y(2),
-		z(3)
-	{
-	}
+  ClassName::ClassName() : x(1),
+  	y(2),
+  	z(3)
+  {
+  }
   ```
 
 * unfortunate inconsistency
+
   - C code usually uses underscores to structure names
     ```
-	variable_in_C
+    variable_in_C
     ```
   - In contrast, C++ code usually uses camelCase
     ```
-	variableInCPlusPlus
+    variableInCPlusPlus
     ```
     for variable names and PascalCase
     ```
-	ClassInCPlusPlus
+    ClassInCPlusPlus
     ```
     for names of classes and other types
 
   where the two meet, use your best judgment and go for best consistency
   (i.e., where does the name "originate")
 
+* macro names should be capitalized; e.g., prefer
+  ```
+  #define FROB 17
+  #define FROBULATE(x) (x)+FROB
+  ```
+  to
+  ```
+  #define frob 17
+  #define frobulate(x) (x)+frob
+  ```
+
 * there is a strong preference for lower case file names; sometimes conventions
   or outside requirements make camelCase filenames the better (or only) choice,
   but absent such an outside reason all file names should be lower case
@@ -113,33 +125,34 @@ other editors that implement this coding style, please add them here.
   case. Where it seems appropriate, multiple, closely related classes can be
   in a single file with a more generic name.
 
-* switch statements with blocks are a little bit special (to avoid indenting
+* `switch` statements with blocks are a little bit special (to avoid indenting
   too far)
   ```
-	switch (foo) {
-	case FIRST:
-		whatever();
-		break;
-	case SECOND: {
-		int i;
-		for (i = 0; i < 5; i++)
-			do_something(i);
-	}
-	}
+  switch (foo) {
+  case FIRST:
+  	whatever();
+  	break;
+  case SECOND: {
+  	int i;
+  	for (i = 0; i < 5; i++)
+  		do_something(i);
+  }
+  }
   ```
 
 ## Coding conventions
 
 * variable declarations
+
   In C code we really like them to be at the beginning of a code block,
   not interspersed in the middle.
-  in C++ we are a bit less strict about this - but still, try not to go
+  in C++ we are a bit less strict about this – but still, try not to go
   crazy. Notably, in C++ the lifetime of a variable often coincides with the
   lifetime of a resource (e.g. file) and therefore the variable is defined
   at the place where the resource is needed.
 
 * The `*`, `&` and `&&` declarators are grouped with the name, not the type
- (classical C-style) as in `char *string` instead of `char* string`. This
+  (classical C-style) as in `char *string` instead of `char* string`. This
   reflects the precedence rules of the language: `int &i` means that the name
   `i` stands for a reference [to an object with type `int`], not that
   `i` stands for an object of the type [reference to `int`].
@@ -147,84 +160,85 @@ other editors that implement this coding style, please add them here.
   have the same effect) it is crucial in the
   definition of multiple variables, such
   as
-	```
-	struct dive *next, **pprev;
-	```
+  ```
+  struct dive *next, **pprev;
+  ```
 
 * In C++ code, we generally use explicit types in variable declarations for clarity.
   Use `auto` sparingly and only in cases where code readability improves.
   Two classical examples are:
   - Iterators, whose type names often are verbose:
-	```
-	auto it = m_trackers.find(when);
-	```
-  	is not only distinctly shorter than
-	```
-	QMap<qint64, gpsTracker>::iterator it = m_trackers.find(when);
-	```
-  	it will also continue working if a different data structure is chosen.
+    ```
+    auto it = m_trackers.find(when);
+    ```
+    is not only distinctly shorter than
+    ```
+    QMap<qint64, gpsTracker>::iterator it = m_trackers.find(when);
+    ```
+    it will also continue working if a different data structure is chosen.
   - If the type is given in the same line anyway. Thus,
-	```
-	auto service = qobject_cast<QLowEnergyService*>(sender());
-	```
-  	is easier to read than and conveys the same information as
-	```
-	QLowEnergyService *service = qobject_cast<QLowEnergyService*>(sender());
-	```
+    ```
+    auto service = qobject_cast<QLowEnergyService*>(sender());
+    ```
+    is easier to read than and conveys the same information as
+    ```
+    QLowEnergyService *service = qobject_cast<QLowEnergyService*>(sender());
+    ```
   - If the variable is a container that is only assigned to a local variable to
-	be able to use it in a range-based for loop
-	```
-	const auto l = device.serviceUuids();
-	for (QBluetoothUuid id: serviceUuids) {
-	```
-	The variable has also to be const to avoid that Qt containers will do a
-	deep copy when the range bases for loop will call the begin() method
-	internally.
+    be able to use it in a range-based `for` loop
+    ```
+    const auto serviceUuids = device.serviceUuids();
+    for (QBluetoothUuid id: serviceUuids) {
+    ```
+    The variable has also to be const to avoid that Qt containers will do a
+    deep copy when the range bases `for` loop will call the `begin()` method
+    internally.
 
 * text strings
+
   The default language of subsurface is US English so please use US English
   spelling and terminology.
-  User-visible strings should be passed to the tr() function to enable
+  User-visible strings should be passed to the `tr()` function to enable
   translation into other languages.
   - like this
     ```
-	QString msgTitle = tr("Submit user survey.");
+    QString msgTitle = tr("Check for updates.");
     ```
   - rather than
     ```
-	QString msgTitle = "Submit user survey.";
+    QString msgTitle = "Check for updates.";
     ```
 
-  This works by default in classes (indirectly) derived from QObject. Each
+  This works by default in classes (indirectly) derived from `QObject`. Each
   string to be translated is associated with a context, which corresponds
-  to the class name. Classes that are not derived from QObject can generate
-  the tr() functions by using the `Q_DECLARE_TR_FUNCTIONS` macro:
+  to the class name. Classes that are not derived from `QObject` can generate
+  the `tr()` functions by using the `Q_DECLARE_TR_FUNCTIONS` macro:
   ```
-	#include <QCoreApplication>
-
-	class myClass {
-		Q_DECLARE_TR_FUNCTIONS(gettextfromC)
-		...
-	};
+  #include <QCoreApplication>
+  
+  class myClass {
+  	Q_DECLARE_TR_FUNCTIONS(gettextfromC)
+  	...
+  };
   ```
 
-  As an alternative, which also works outside of class context, the tr()
+  As an alternative, which also works outside of class context, the `tr()`
   function of a different class can be called. This avoids creating multiple
   translations for the same string:
   ```
-	gettextFromC::tr("%1km")
+  gettextFromC::tr("%1km")
   ```
 
-  The gettextFromC class in the above example was created as a catch-all
+  The `gettextFromC` class in the above example was created as a catch-all
   context for translations accessed in C code. But it can also be used
-  from C++ helper functions. To use it from C, include the "core/gettext.h"
-  header and invoke the translate() macro:
+  from C++ helper functions. To use it from C, include the `"core/gettext.h"`
+  header and invoke the `translate()` macro:
   ```
-	#include "core/gettext.h"
-
-	report_error(translate("gettextFromC", "Remote storage and local data diverged"));
+  #include "core/gettext.h"
+  
+  report_error(translate("gettextFromC", "Remote storage and local data diverged"));
   ```
-  It is crucial to pass "gettextFromC" as a first macro argument so that Qt
+  It is crucial to pass `"gettextFromC"` as a first macro argument so that Qt
   is able to associate the string with the correct context.
   The translate macro returns a cached C-style string, which is generated at runtime
   when the particular translation string is encountered for the first time.
@@ -233,19 +247,20 @@ other editors that implement this coding style, please add them here.
   Outside of function context, the `QT_TRANSLATE_NOOP` macro can be used as in
   ```
   struct ws_info_t ws_info[100] = {
-	{ QT_TRANSLATE_NOOP("gettextFromC", "integrated"), 0 },
-	{ QT_TRANSLATE_NOOP("gettextFromC", "belt"), 0 },
-	{ QT_TRANSLATE_NOOP("gettextFromC", "ankle"), 0 },
-	{ QT_TRANSLATE_NOOP("gettextFromC", "backplate"), 0 },
-	{ QT_TRANSLATE_NOOP("gettextFromC", "clip-on"), 0 },
+  	{ QT_TRANSLATE_NOOP("gettextFromC", "integrated"), 0 },
+  	{ QT_TRANSLATE_NOOP("gettextFromC", "belt"), 0 },
+  	{ QT_TRANSLATE_NOOP("gettextFromC", "ankle"), 0 },
+  	{ QT_TRANSLATE_NOOP("gettextFromC", "backplate"), 0 },
+  	{ QT_TRANSLATE_NOOP("gettextFromC", "clip-on"), 0 },
   };
   ```
-  Note that here, the texts will be scheduled for translation with the "gettextFromC"
+  Note that here, the texts will be scheduled for translation with the `"gettextFromC"`
   context, but the array is only initialized with the original text. The actual
   translation has to be performed later in code. For C-code, the `QT_TRANSLATE_NOOP`
-  macro is defined in the "core/gettext.h" header.
+  macro is defined in the `"core/gettext.h"` header.
 
 * UI text style
+
   These guidelines are designed to ensure consistency in presentation within
   Subsurface.
   Only the first word of multi-word text strings should be capitalized unless
@@ -264,10 +279,14 @@ other editors that implement this coding style, please add them here.
 
 
 * string manipulation
+
  * user interface
-    In UI part of the code use of QString methods is preferred, see this pretty
-    good guide in [QString documentation][1]
+
+    In UI part of the code use of `QString` methods is preferred, see this pretty
+    good guide in [`QString` documentation][1]
+
  * core components
+
     In the core part of the code, C-string should be used.
     C-string manipulation is not always straightforward specifically when
     it comes to memory allocation, a set of helper functions has been developed
@@ -278,8 +297,8 @@ other editors that implement this coding style, please add them here.
 
 ### Emacs
 
-These lines in your .emacs file should get you fairly close when it comes
-to indentation - many of the other rules you have to follow manually
+These lines in your `.emacs` file should get you fairly close when it comes
+to indentation – many of the other rules you have to follow manually
 
 ```
 ;; indentation
@@ -374,7 +393,7 @@ style that you can select which should work well for our coding style.
 ### Vim
 
 As everybody knows vim is a way better editor than emacs and thus needs to be
-in this file too. Put this into your .vimrc and this should produce something
+in this file too. Put this into your `.vimrc` and this should produce something
 close to our coding standards.
 
 ```
@@ -402,4 +421,4 @@ match ExtraWhitespace /\s\+$\| \+\ze\t/
 ```
 
 [1]: http://doc.qt.io/qt-5/qstring.html#manipulating-string-data
-[2]: https://github.com/Subsurface-divelog/subsurface/blob/master/core/membuffer.h
+[2]: https://github.com/Subsurface/subsurface/blob/master/core/membuffer.h

CONTRIBUTING.md

@@ -1,68 +1,96 @@
-[Source](https://subsurface-divelog.org/documentation/contributing/ "Permalink to Contributing | Subsurface")
+# Contributing to Subsurface
 
-# Contributing | Subsurface
+## Ways to Contribute
 
-It might be a good idea to join our [mailing list][1]. Conversation there is in English -- even though this site (and Subsurface itself) are available in many languages, the shared language we all communicate in is English. Actually "Broken English" is just fine… :-)
+There are many ways in which you can contribute. We are always looking for testers who are willing to test the code while it is being developed. We especially need people running Windows and Mac (as the majority of the active developers are Linux people). We are also always looking for volunteers who help reviewing and improving the documentation. And very importantly we are looking for translators willing to translate the software into different languages. Our translations are centrally handled at [Transifex][4] – please sign up for an account there and then request to join the [Subsurface Team][5].
 
-We also tend to have some developers hanging out in the `#subsurface` channel on [Freenode][2].
+If you would like to contribute financially to help us cover the cost of running a free cloud synchronisation service for dive logs, you can do so by sponsoring this project.
 
-There are many ways in which you can contribute. We are always looking for testers who are willing to test the code while it is being developed. We especially need people running Windows and Mac (as the majority of the active developers are Linux people). We are also always looking for volunteers who help reviewing and improving the documentation. And very importantly we are looking for translators willing to translate the software into different languages. Our translations are centrally handled at [Transifex][3] \-- please sign up for an account there and then request to join the [Subsurface Team][4].
 
-If you would like to contribute patches that fix bugs or add new features, that is of course especially welcome. If you are looking for places to start, look at the open bugs in our [bug tracker][5].
+## Joining the Subsurface Contributors' Community
 
-Here is a very brief introduction on creating commits that you can either send as [pull requests][6] on our main GitHub repository or send as emails to the mailing list. Much more details on how to use git can be found at the [git user manual][7].
+To get 'into the loop' for what is going on in Subsurface you should join our [mailing list][1], and start watching the [subsurface/subsurface repository on GitHub][2]. Conversation in the mailing list is in English – even though Subsurface itself and the website and documentation are available in many languages, the shared language the contributors communicate in is English. Actually "Broken English" is just fine… :-)
 
-Start with getting the latest source.  
-`cd subsurface`  
-`git checkout master`  
-`git pull`  
-ok, now we know you're on the latest version. Create a working branch to keep your development in:  
-`git checkout -b devel`  
-Edit the code (or documentation), compile, test… then create a commit:  
-`git commit -s -a`  
-Depending on your OS this will open a default editor -- usually you can define which by setting the environment variable `GIT_EDITOR`. Here you enter your commit message. The first line is the title of your commit. Keep it brief and to the point. Then a longer explanation (more on this and the fact that we insist on all contributions containing a Signed-off-by: line below).  
-If you want to change the commit message, "git commit --amend" is the way to go. Feel free to break your changes into multiple smaller commits. Then, when you are done there are two directions to go, which one you find easier depends a bit on how familiar you are with GitHub. You can either push your branch to GitHub and create a [pull requests on GitHub][6], or you run  
-`git format-patch master..devel`  
-Which creates a number of files that have names like 0001-Commit-title.patch, which you can then send to our developer mailing list.
+Of course it is also a good idea to join our [User Forum][3], to be able to see feedback and bug reports from our users.
+
+
+## Tips for Code Contributions
+
+### Code Change Submissions
+
+If you would like to contribute patches that fix bugs or add new features, that is of course especially welcome. If you are looking for places to start, look at the open bugs in our [bug tracker][6].
+
+Here is a very brief introduction on creating commits that you can either send as [pull requests][7] on our main GitHub repository or send as emails to the mailing list. Much more details on how to use Git can be found at the [Git user manual][8].
+
+Start with getting the latest source.
+
+    cd subsurface
+    git checkout master
+    git pull
+
+ok, now we know you're on the latest version. Create a working branch to keep your development in:
+
+    git checkout -b devel
+
+Edit the code (or documentation), compile, test… then create a commit:
+
+    git commit -s -a
+
+Depending on your OS this will open a default editor – usually you can define which by setting the environment variable `GIT_EDITOR`. Here you enter your commit message. The first line is the title of your commit. Keep it brief and to the point. Then a longer explanation (more on this and the fact that we insist on all contributions containing a Signed-off-by: line below).
+
+If you want to change the commit message, `git commit --amend` is the way to go. Feel free to break your changes into multiple smaller commits. Then, when you are done there are two directions to go, which one you find easier depends a bit on how familiar you are with GitHub. You can either push your branch to GitHub and create a [pull requests on GitHub][7], or you run:
+
+    git format-patch master..devel
+
+Which creates a number of files that have names like `0001-Commit-title.patch`, which you can then send to our developer mailing list.
+
+
+### Developer Certificate of Origin (DCO)
 
 When sending code, please either send signed-off patches or a pull request with signed-off commits. If you don't sign off on them, we will not accept them. This means adding a line that says "Signed-off-by: Name \<Email\>" at the end of each commit, indicating that you wrote the code and have the right to pass it on as an open source patch.
 
-See: [Signed-off-by Lines][8]
+See: [Signed-off-by Lines][9]
 
-Also, please write good git commit messages. A good commit message looks like this:
 
-Header line: explaining the commit in one line
+### Commit Messages
 
-Body of commit message is a few lines of text, explaining things  
-in more detail, possibly giving some background about the issue  
-being fixed, etc etc.
+Also, please write good Git commit messages. A good commit message looks like this:
 
-The body of the commit message can be several paragraphs, and  
-please do proper word-wrap and keep columns shorter than about  
-74 characters or so. That way "git log" will show things  
-nicely even when it's indented.
-
-Reported-by: whoever-reported-it  
-Signed-off-by: Your Name \<you@example.com\>
+    Header line: explaining the commit in one line
+    
+    Body of commit message is a few lines of text, explaining things
+    in more detail, possibly giving some background about the issue
+    being fixed, etc etc.
+    
+    The body of the commit message can be several paragraphs, and
+    please do proper word-wrap and keep columns shorter than about
+    74 characters or so. That way "git log" will show things
+    nicely even when it's indented.
+    
+    Reported-by: whoever-reported-it
+    Signed-off-by: Your Name <you@example.com>
 
 That header line really should be meaningful, and really should be just one line. The header line is what is shown by tools like gitk and shortlog, and should summarize the change in one readable line of text, independently of the longer explanation.
 
-The preferred way to write a commit message is using imperative mood, e.g. "Make foo do xyz" instead of "This patch makes foo do xyz" or "I made foo do xyz", as if you are giving commands or requests to the code base.
-https://en.wikipedia.org/wiki/Imperative_mood
+The preferred way to write a commit message is using [imperative mood][12], e.g. "Make foo do xyz" instead of "This patch makes foo do xyz" or "I made foo do xyz", as if you are giving commands or requests to the code base.
 
-![gitk sample][9]
+![gitk sample][10]
 
-Example with gitk
+_Example with gitk_
 
-Additionally when important changes to behaviors, fixes or new feature are introduced an entry must be added to  CHANGELOG.md file. Always add new entries at the very top of the file above other existing entries. Use this layout for new entries:
 
-Area: Details about the change [reference thread / issue]
+### Changelog
+
+Additionally when important changes to behaviors, fixes or new feature are introduced an entry must be added to `CHANGELOG.md` file. Always add new entries at the very top of the file above other existing entries. Use this layout for new entries:
+
+    Area: Details about the change [reference thread / issue]
 
 When multiple areas are affected list the areas separated with a /:
 
-Area1/Area2: Detail about the change [reference thread / issue]
+    Area1/Area2: Detail about the change [reference thread / issue]
 
 Here is a (non exhaustive) list of Areas that can be used:
+
 * Bluetooth
 * Cloud-storage
 * Desktop
@@ -75,15 +103,20 @@ Here is a (non exhaustive) list of Areas that can be used:
 * Printing
 * Profile
 
-In order to make reviews simpler and have contributions merged faster in the code base, please follow Subsurface project's coding style and coding conventions described in the [CodingStyle][10] file.
+
+### Coding Style
+
+In order to make reviews simpler and have contributions merged faster in the code base, please follow Subsurface project's coding style and coding conventions described in the [CodingStyle][11] file.
 
 [1]: http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
-[2]: http://freenode.net/
-[3]: https://www.transifex.com/
-[4]: https://www.transifex.com/projects/p/subsurface/
-[5]: https://github.com/Subsurface-divelog/subsurface/issues
-[6]: https://github.com/Subsurface-divelog/subsurface/pulls
-[7]: https://www.kernel.org/pub/software/scm/git/docs/user-manual.html
-[8]: https://gerrit-review.googlesource.com/Documentation/user-signedoffby.html
-[9]: https://subsurface-divelog.org/wp-content/uploads/2011/10/Screenshot-gitk-subsurface-1.png "Example with gitk"
-[10]: https://github.com/Subsurface-divelog/subsurface/blob/master/CodingStyle
+[2]: https://github.com/subsurface/subsurface
+[3]: https://groups.google.com/g/subsurface-divelog
+[4]: https://www.transifex.com/
+[5]: https://explore.transifex.com/subsurface/subsurface/
+[6]: https://github.com/Subsurface/subsurface/issues
+[7]: https://github.com/Subsurface/subsurface/pulls
+[8]: https://www.kernel.org/pub/software/scm/git/docs/user-manual.html
+[9]: https://gerrit-review.googlesource.com/Documentation/user-signedoffby.html
+[10]: https://github.com/subsurface/subsurface/Documentation/images/Screenshot-gitk-subsurface-1.png "Example with gitk"
+[11]: https://github.com/Subsurface/subsurface/blob/master/CODINGSTYLE.md
+[12]: https://en.wikipedia.org/wiki/Imperative_mood

Documentation/50-pot/subsurface-user-manual.pot

@@ -133,9 +133,9 @@ msgid ""
 "https://subsurface-divelog.org/[_Subsurface_ web site].  Please discuss "
 "issues with this program by sending an email to "
 "mailto:subsurface@subsurface-divelog.org[our mailing list] and report bugs "
-"at https://github.com/Subsurface-divelog/subsurface/issues[our bugtracker].  "
+"at https://github.com/Subsurface/subsurface/issues[our bugtracker].  "
 "For instructions on how to build the software and (if needed) its "
-"dependencies please consult the INSTALL file included with the source code."
+"dependencies please consult the INSTALL.md file included with the source code."
 msgstr ""
 
 #. type: Plain text
@@ -9076,6 +9076,9 @@ msgid ""
 "reconnect it. You can now retry (or start a new download session) and the "
 "download will continue where it stopped previously. You may have to do this "
 "more than once, depending on how many dives are stored on the dive computer."
+"You may define a dive number offset by setting environment variable "
+"UEMIS_DIVE_OFFSET (e.g. export UEMIS_DIVE_OFFSET=300), "
+"if subsurface starts downloading dives that are already synced."
 msgstr ""
 
 #. type: Title ===

Documentation/FAQ.wordpress

@@ -1,163 +0,0 @@
-<!-- when editing please don't break the formatting... WordPress is a bit silly about this
-     - I need the empty lines after the [expand...] and before the [/expand]
-     - Every paragraph is a single line (how stupid is that!) with an empty line in between -->
-<h2>Here are some Frequently Asked Questions by our users</h2>
-<span class="expandall">Expand All</span> --- <span class="collapseall">Collapse All</span>
-[expand title="Which operating system does Subsurface support?"]
-
-Subsurface runs on Windows (32 and 64bit, Windows XP and newer), MacOS (Intel, 10.7 and newer) and many flavors of Linux. We provide Linux packages for Ubuntu, Linux Mint, Debian, openSUSE and Fedora. Details on where to find Subsurface for your OS are on our <a title="Downloads" href="http://subsurface-divelog.org/download/">Downloads</a> page.
-
-[/expand]
-[expand title="How do I install Subsurface on Windows?"]
-
-<a href="http://subsurface-divelog.org/download/">Download the installer</a> and double-click on it. You will get a warning that the installer is from an unknown publisher. Please click Yes to allow installation. Next you are presented with the license for Subsurface, after that you can choose where you would like to install Subsurface (the default should be reasonable in most cases) and the <em>Start Menu Folder</em> where a shortcut to call Subsurface and an entry to uninstall Subsurface will be installed.
-
-[/expand]
-[expand title="How do I install Subsurface on MacOS?"]
-
-<a href="http://subsurface-divelog.org/download/">Download the installer DMG</a> and open it. Drag the Subsurface icon on to the Applications icon.
-
-[/expand]
-[expand title="How do I install Subsurface on Ubuntu?"]
-
-Simply add the following PPA to your system:
-<pre><code style="font-size: 8pt;">ppa:subsurface/subsurface</code></pre>
-[/expand]
-[expand title="How do I install Subsurface on Debian?"]
-
-We currently only support Debian Jessie; you need to add the Ubuntu repository:
-<pre><code style="font-size: 8pt;">echo "deb http://ppa.launchpad.net/subsurface/subsurface/ubuntu trusty main" \
-        | sudo tee /etc/apt/sources.lists.d/subsurface.list
-gpg --keyserver subkeys.pgp.net --recv-keys A8BC9756EE61D9C6
-gpg -a --export A8BC9756EE61D9C6 | sudo apt-key add -
-sudo apt-get update</code></pre>
-Now you can install Subsurface from that repository:
-<pre><code style="font-size: 8pt;">sudo apt-get install subsurface</code></pre>
-Make sure you are getting a current version with all its Qt5 dependencies.
-
-[/expand]
-[expand title="How do I install Subsurface on openSUSE?"]
-
-Go to <a href="http://software.opensuse.org/download.html?project=home:Subsurface-Divelog&amp;package=subsurface">our build service project page</a> and follow the simple instructions there -- it’s as easy as two clicks.
-
-[/expand]
-[expand title="The shortcut keys don't work on Ubuntu"]
-
-Please uninstall <code style="font-size: 9pt;">appmenu-qt5</code> and the shortcuts will work.
-
-[/expand]
-[expand title="How can I post my dive on Facebook?"]
-
-Go to the preferences and select the Facebook section. There you can log in to your Facebook account. You have to do this every time you want to post to Facebook, for privacy reasons Subsurface does not stay logged in to Facebook between sessions.
-
-Once you are logged into Facebook you can close the preferences. You will now see a Facebook button next to the Notes section towards the center of the Subsurface window. Clicking on that opens a dialog that allows you to control which parts of the current dive are posted to your timeline. The post is always "private" - you need to connect to Facebook and change the audience for that post in order for others to see it (we do this so you get to review what is posted before it becomes public).
-
-[/expand]
-[expand title="How can I post my dives on the web?"]
-
-Currently Subsurface integrates with two different online logbooks: <a href="http://divelogs.de">divelogs.de</a> and <a href="http://dive-share.appspot.com/">DiveShare</a>. You can export dives to either of those two services from the File➝Export menu.
-
-[/expand]
-[expand title="How do I use the companion apps?"]
-
-There are companion apps available for both Android and IOS. You can find them in the respective stores. Once you install them on your mobile device you can either mark dive sites and name them (e.g., right before or after a dive), or you can run a "service" in the background that periodically records your position. Don't forget to turn the service off when you are done as it may increase your battery consumption.
-
-Once you have uploaded the dive site data from the companion app to our web service, you can then download the data from within Subsurface. Do this <em>after</em> you have downloaded the dives from that day from your divecomputer (or manually added the dives) so that Subsurface can match the dive data (and their time stamps) with the data stored by the companion app. Subsurface will then add GPS data to those dives that didn't have GPS information and are reasonably close in time to to markers saved by the companion app.
-
-Please note that the companion apps by themselves do <em>not</em> add dives to your dive list. The dive needs to exist before GPS data is added to it.
-
-[/expand]
-[expand title="How can I use more than one tank with the same gas?"]
-
-This is a typical question for side mount divers or some tec divers. Subsurface supports having more than one tank with the same gas, even if some dive computers don't. Simply add a gas change to your second tank of the same gas as both tanks will be included in the gas use calculations. In order to add gas changes simply right-click on the profile at the appropriate spot and you will be offered to add such an event.
-
-[/expand]
-[expand title="Why is Subsurface not able to download my dives?"]
-
-Clean the contacts. Clean the contacts again. Make sure the connector is firmly connected. Wiggle it. Seriously. Make sure the dive computer is in transfer mode (this isn't necessary for all dive computers but for many common ones). Check with other software that the download works in general. Try another cable. See our user manual for pairing with BT and the general use case.
-
-[/expand]
-[expand title="Why is the CSV import failing?"]
-
-The CSV import has a couple of caveats. You should avoid some special characters like ampersand (&), less than (<), greater than (>) and double quotes ("), the latter if quoting text cells. The file should use UTF-8 character set, if having non-ASCII characters. Also the size of the CSV file might cause problems. Importing 100 dives at a time (without dive profile) has worked previously, but larger files might exceed limits of the parser used. When having problems with CSV imports, try first with a smaller sample to make sure everything works.
-
-[/expand]
-[expand title="How can I use Subsurface for multiple users?"]
-
-Store logs of different users to separate log files. From Subsurface, you can open individual files for different divers and multiple users are supported quite well.
-
-[/expand]
-[expand title="How can I load pictures and associate them with my dive?"]
-
-Select the dives you want to load and associate the pictures with. Then right click on one of the selected dives and select "Load images" from the
-popup menu. This will bring in a file selection dialog where you can select one or multiple pictures. When the selection is done and you hit Open, you get a new dialog where you can shift the times of the images. This is described in more detail in our user manual.
-
-If you are having trouble with loading the images, check that you have at least one of the following tags in the Exif headers DateTimeOriginal or
-DateTime. We take the time from these fields to detect if the image was shot during the dive or not. If the picture is edited, you should store the original Exif information on the new/edited image for it to be loaded properly.
-
-[/expand]
-[expand title="Can I import my dives from my old log software?"]
-
-Many common programs are already supported and we are always happy to try to add new ones. If your old log software supports exporting the log book, we might well be able to import that (for example via CSV files or UDDF). However, usually support for importing the native format will help you to get more complete information into Subsurface. To implement support for the log format, we will need a sample log file. It would be great to have also a screenshot from the original log software or description of the dive that is shown on the sample log. Preferably we would like to have a reasonably simple dive to get basic support and another dive that has as many features enabled as possible (e.g. gas changes during the dive). Please post this information to the user forum or send it to the developer mailing list subsurface@subsurface-divelog.org. Unfortunately some of the log formats we have not been able to decipher (as some vendors have decided to encrypt their log files to increase the degree of lock-in of their customers), so there are no guarantees that this will bring support for your old log software, but it is worth a try.
-
-[/expand]
-[expand title="Can you add support for dive computer X?"]
-
-We support a large number of dive computers already and are always happy to add support for more. Please contact us via the user forums so we can try to help. Some vendors have actively helped us in our work and adding support for new models from those vendors is usually easy. Other vendors are more neutral, some are actively hostile. Without help from the vendor it can be rather challenging to reverse engineer the transfer protocol and the dive encoding, but with sufficient help from you it is often possible to do so.
-
-A good starting point is often to send us a libdivecomputer log and dump (you can pick those in the dive computer download dialog) when connecting to the dive computer using a similar existing model (if possible).
-
-[/expand]
-[expand title="Is there a virus in the Subsurface installer?"]
-
-If you get a warning message or if Subsurface is blocked by your anti virus software, that is almost certainly a false positive. Subsurface is not built on a Windows machine, it is cross built from source on Linux on a well maintained and clean server.
-
-Most/all Windows AV software packages support an "add exception" feature, which skips an executable from being scanned. Try adding Subsurface to the list of non-harmful software. If the Subsurface installer download is detected as malware, please temporary disable your AV software until Subsurface is installed
-
-In either case, please inform your AV software vendor of a "false positive" as we assure your that Subsurface is not malware
-
-[/expand]
-[expand title="I cannot download all my dives, only the most recent ones even though my dive computer's manual states that it records history of e.g. 999 dives."]
-
-Dive history is different than the dive profiles on the log. The history only keeps track of the total number of dives and total amount of time spent below surface. The logs, on the other hand, store the dive profile, but they have limited amount of memory to do so. The exact amount of dive profiles that can be stored on the device depend on sample interval and duration of the dives. Once the memory is full the oldest dives get overwritten with new dives. Thus we are only able to download the last 13, 30 or 199 dives.
-
-If you have downloaded your dives to different dive logging software before they were overwritten, there is a high change that Subsurface can import these. However, if the logs are only on your dive computer, they cannot be salvaged after being over written by new dives.
-
-[/expand]
-[expand title="How do I download dives from my Bluetooth dive computer (e.g. Shearwater, OSTC) on Linux?"]
-
-Downloading dives over Bluetooth on all platforms is done using the "Choose Bluetooth download mode" option when downloading dives, and pairing with the detected dive computer. This is further explained in the <a href="https://subsurface-divelog.org/documentation/subsurface-4-user-manual/">Subsurface User Manual</a>.
-
-Previous versions of Subsurface required setting up an RFCOMM connection from the command line before downloading dives from a Bluetooth enabled dive computer. This is no longer the case.
-
-[/expand]
-[expand title="How do I fix permission errors when trying to download from my Atomics Aquatics Cobalt under Linux?"]
-
-Sadly this is a somewhat difficult process on some versions of Linux. By default new devices are sometimes given permissions that prevent a regular user from accessing them. If you get a permission error when trying to download from a Cobalt or Cobalt 2 under Linux, please try these steps.
-
-This should work on most Linux flavors. We'd appreciate feedback if this doesn't work for you. Open a terminal window and cut and paste the following command. It may ask you to enter your password in order to allow access as super user (which is required to set up the udev rule that changes the device permissions as you plug in your Cobalt).
-
-<pre><code style="font-size: 8pt;">(MYGRP=$(id | sed "s/^.*gid=.*(\(.*\)) .*$/\1/") ; \
-echo -n 'SUBSYSTEM=="usb", ATTR{idVendor}=="0471", ATTR{idProduct}=="0888", MODE="0660", GROUP="' ; \
-echo -n $MYGRP ; echo '"') | sudo tee /etc/udev/rules.d/99-cobalt.rules </code></pre>
-
-If you disconnect and reconnect your Cobalt it should now get the correct access permissions.
-
-[/expand]
-[expand title="How do I fix permission errors when trying to download from my Suunto EON Steel under Linux?"]
-
-By default new devices are sometimes given permissions that prevent a regular user from accessing them. If you get a permission error when trying to download from an EON Steel under Linux, please try these steps.
-
-This should work on most Linux flavors. We'd appreciate feedback if this doesn't work for you. Open a terminal window and cut and paste the following command. It may ask you to enter your password in order to allow access as super user (which is required to set up the udev rule that changes the device permissions as you plug in your EON Steel).
-
-<pre><code style="font-size: 8pt;">echo 'SUBSYSTEM=="usb",ATTR{idVendor}=="1493",ATTR{idProduct}=="0030", MODE="0666"' |
-sudo tee /etc/udev/rules.d/99-cobalt.rules </code></pre>
-
-If you disconnect and reconnect your DC it should now get the correct access permissions.
-
-[/expand]
-[expand title="Why is my IRDA based dive computer not working on a MAC?"]
-
-Subsurface on the Mac does not currently support IRDA based dive computers. This is an issue of missing support libraries for us to use - other dive log software may have implemented their own IRDA stack on the Mac, we have not. Subsurface on Windows and Linux does support IRDA based dive computers just fine.
-
-[/expand]

Documentation/Makefile

@@ -7,7 +7,7 @@
 # submitting patches to the user manual, only submit the changes to the .txt
 # file - the maintainer will recreate the .html.git file
 
-DOCNAMES = user-manual user-manual_es user-manual_fr user-manual_ru user-manual_nl mobile-manual
+DOCNAMES = user-manual user-manual_es user-manual_fr user-manual_nl mobile-manual-v3
 
 HTMLDOCS = $(patsubst %,$(OUT)%.html,$(DOCNAMES))
 TEXTDOCS = $(patsubst %,$(OUT)%.text,$(DOCNAMES))
@@ -19,7 +19,7 @@ BROWSER = firefox
 THEME = compact_subsurface
 PWD = $(realpath .)
 
-all: $(HTMLEDOCS) $(TEXTDOCS) $(PDFDOCS)
+all: $(HTMLDOCS) $(TEXTDOCS) $(PDFDOCS)
 
 doc: $(HTMLDOCS)
 
@@ -30,10 +30,21 @@ $(OUT)%.pdf: %.txt
 	-$(A2X) --dblatex-opts "-P latex.output.revhistory=0" -f pdf $<
 
 $(OUT)%.html: %.txt
-	@echo "if asciidoc isn't found the html file included in the sources is copied"
+	$(ASCIIDOC) --version > /dev/null 2>&1 || echo "if asciidoc isn't found the html file included in the sources is copied"
 	$(ASCIIDOC) -a toc -a toclevels=3 -a themedir=$(PWD) -a theme=$(THEME) -o $@ $< || \
 		cp $(<:%.txt=%.html.git) $@
 
+# for the web facing version of the desktop manual, just use the post-processing script
+user-manual.html.wp: user-manual.html
+	bash ../scripts/prep-manual.sh $<
+
+# for the web facing version of the mobile manual, re-create the HTML with only one level in
+# the table of context and then post process
+mobile-manual-v3.html.wp: mobile-manual-v3.txt
+	$(ASCIIDOC) -a toc -a toclevels=1 -a themedir=$(PWD) -a theme=$(THEME) -o $(<:%.txt=%.html.tmp) $< && \
+		bash ../scripts/prep-manual.sh $(<:%.txt=%.html.tmp) && \
+		mv $(<:%.txt=%.html.tmp.wp) $@
+
 # Alternatively::
 $(OUT)$(DOCNAME).xhtml: $(DOCSOURCE)
 	$(A2X) --icons -f xhtml $<

Documentation/compact_subsurface.css

@@ -8,7 +8,7 @@
  */
 
 *   { padding: 0;  margin: 0; }
-img { border: 0; }
+img { border: 0; margin: 15px; max-width:90% }
 
 /*** Layout ***/
 
@@ -69,12 +69,12 @@ body                        { font-family: Verdana, sans-serif; }
 #footer                     { font-size: 0.8em; }
 
 h2, h3, h4, h5, .title      { font-family: Arial,   sans-serif; }
-h2                          { font-size: 1.5em; }
+h2                          { font-size: 160%; }
 .sectionbody                { font-size: 0.85em; }
 .sectionbody .sectionbody   { font-size: inherit; }
-h3                          { font-size: 159%; } /* 1.35em */
-h4                          { font-size: 141%; } /* 1.2em */
-h5                          { font-size: 118%; } /* 1em */
+h3                          { font-size: 150%; } /* 1.35em */
+h4                          { font-size: 140%; } /* 1.2em */
+h5                          { font-size: 130%; } /* 1em */
 .title                      { font-size: 106%;   /* 0.9em */
 			      font-weight: bold;
 			    }

Documentation/fr/po/subsurface-user-manual.fr.po

@@ -175,7 +175,7 @@ msgid ""
 "an email to mailto:subsurface@subsurface-divelog.org[our mailing list] and "
 "report bugs at https://github.com/Subsurface-divelog/subsurface/issues[our "
 "bugtracker].  For instructions on how to build the software and (if needed) "
-"its dependencies please consult the INSTALL file included with the source "
+"its dependencies please consult the INSTALL.md file included with the source "
 "code."
 msgstr ""
 "Ce manuel explique comment utiliser le programme _Subsurface_. Pour "
@@ -184,7 +184,7 @@ msgstr ""
 "pouvez envoyer un e-mail sur mailto:subsurface@subsurface-divelog.org[notre "
 "liste de diffusion] et rapportez les bogues sur http://trac.hohndel."
 "org[notre bugtracker].  Pour des instructions de compilation du logiciel et "
-"(si besoin) de ses dépendances, merci de consulter le fichier INSTALL inclus "
+"(si besoin) de ses dépendances, merci de consulter le fichier INSTALL.md inclus "
 "dans les sources logicielles."
 
 #. type: Plain text

Documentation/make_PO_to_ASCIIDOC.sh

@@ -7,7 +7,7 @@
 # 	- 2015-01-14:	Initial release
 #
 # Known bugs:
-# 	- Some list item indexes are lost during PO to ASCII conversion (see asciidoc warning messages)
+# 	- Some list item indices are lost during PO to ASCII conversion (see asciidoc warning messages)
 #
 # Package deps:	- po4a (for po4a-translate)
 # 		- git (for git sync)