Release 1.26.0

Apply config should toggle the core mode to ensure the labels and mode is set correctly post config

.github/CODEOWNERS

@@ -0,0 +1,9 @@
+# Apply to all files
+* @nbolton @sithlord48
+
+# Translators
+translations/deskflow_es.ts @sithlord48
+translations/deskflow_it.ts @sithlord48
+translations/deskflow_ja.ts @ykasap
+translations/deskflow_ru.ts @levpr1c
+translations/deskflow_zh_CN.ts @sailordiary

.github/ISSUE_TEMPLATE/config.yml

@@ -1 +1,11 @@
 blank_issues_enabled: false
+contact_links:
+  - name: Ask a question
+    url: https://github.com/deskflow/deskflow/discussions/new?category=q-a
+    about: Where to ask general questions.
+  - name: Show and Tell
+    url: https://github.com/deskflow/deskflow/discussions/new?category=show-and-tell
+    about: Show off things you have done with Deskflow
+  - name: Chat with us
+    url: https://matrix.to/#/#deskflow:matrix.org
+    about: Join us in live chat.

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -14,3 +14,14 @@ body:
         Please describe the feature you have in mind.
     validations:
       required: true
+
+  - type: textarea
+    id: votes
+    attributes:
+      label: Voting Instructions
+      description: Do not modify these instructions
+      value: |
+        React with :+1: or :-1: to vote on this request
+    validations:
+      required: true
+

.github/actions/install-dependencies/action.yml

@@ -38,26 +38,22 @@ runs:
                 xorg-dev libx11-dev libxtst-dev libssl-dev \
                 libglib2.0-dev libxkbfile-dev qt6-base-dev qt6-tools-dev \
                 libgtk-3-dev libgtest-dev libgmock-dev \
-                libei-dev libportal-dev libtomlplusplus-dev libcli11-dev \
-                help2man -y >/dev/null
+                libei-dev libportal-dev help2man -y >/dev/null
             elif [ ${{inputs.like}} == "fedora" ]; then
-              dnf install -y cmake make ninja-build gcc-c++ \
-                rpm-build openssl-devel glib2-devel \
-                libXtst-devel libxkbfile-devel qt6-qtbase-devel qt6-qttools-devel \
-                gtk3-devel gtest-devel gmock-devel \
-                libei-devel libportal-devel tomlplusplus-devel \
-                cli11-devel help2man
+              dnf install -y cmake make ninja-build gcc-c++ rpm-build openssl-devel \
+                glib2-devel libXtst-devel libxkbfile-devel qt6-qtbase-devel qt6-qttools-devel \
+                gtk3-devel gtest-devel gmock-devel libei-devel libportal-devel help2man
             elif [ ${{inputs.like}} == "suse" ]; then
               zypper refresh
               zypper install -y --force-resolution \
                 cmake make ninja gcc-c++ rpm-build libopenssl-devel \
-                glib2-devel libXtst-devel libxkbfile-devel qt6-base-devel qt6-tools-devel gtk3-devel \
-                googletest-devel googlemock-devel libei-devel \
-                libportal-devel tomlplusplus-devel cli11-devel help2man
+                glib2-devel libXtst-devel libxkbfile-devel qt6-base-devel qt6-tools-devel \
+                qt6-linguist-devel gtk3-devel \
+                googletest-devel googlemock-devel libei-devel libportal-devel help2man
             elif [ ${{ inputs.like }} == "arch" ]; then
               pacman -Syu --noconfirm base-devel cmake ninja \
                 gcc openssl glib2 libxtst libxkbfile gtest libei libportal \
-                qt6-base qt6-tools qt6-svg gtk3 tomlplusplus cli11 help2man doxygen graphviz rsync
+                qt6-base qt6-tools qt6-svg qt6-translations qt6-declarative gtk3 help2man doxygen graphviz rsync
             else
               echo "Unknown like"
             fi
@@ -85,6 +81,7 @@ runs:
         extra-args: --classic --host-triplet=${{inputs.vcpkg-triplet}}
         triplet: ${{inputs.vcpkg-triplet}}
         token: ${{ github.token }}
+        revision: master
 
     - name: Install Wix
       if: ${{ runner.os == 'Windows' }}

.github/actions/test-package/action.yml

@@ -0,0 +1,49 @@
+name: "Test Package"
+description: "Installs the built package and verifies the installed binaries can run"
+
+inputs:
+  like:
+    description: "Used only on linux distro type: debian, fedora, suse, arch"
+    required: false
+    default: ""
+
+runs:
+  using: "composite"
+
+  steps:
+    - name: Test package
+      shell: bash
+      run: |
+        if [ "$RUNNER_OS" == "macOS" ]; then
+          dmg=$(ls build/deskflow-*.dmg | head -1)
+          echo "Y" | hdiutil attach "$dmg" -nobrowse -mountpoint /tmp/deskflow-dmg
+          /tmp/deskflow-dmg/Deskflow.app/Contents/MacOS/deskflow-core --version
+          hdiutil detach /tmp/deskflow-dmg
+
+        elif [ "$RUNNER_OS" == "Windows" ]; then
+          7z x build/deskflow-*-portable.7z -otmp/deskflow-pkg
+          exe=$(find tmp/deskflow-pkg -name "deskflow-core.exe" -type f | head -1)
+          exe_dir=$(dirname "$exe")
+          pkg_root=$(dirname "$exe_dir")
+          export PATH="$exe_dir:$pkg_root:$pkg_root/lib:$PATH"
+          "$exe" --version
+
+        elif [ "$RUNNER_OS" == "Linux" ]; then
+          if [ "${{inputs.like}}" == "debian" ]; then
+            apt-get install -y ./build/deskflow-*.deb
+          elif [ "${{inputs.like}}" == "fedora" ]; then
+            dnf install -y build/deskflow-*.rpm
+          elif [ "${{inputs.like}}" == "suse" ]; then
+            zypper install -y --allow-unsigned-rpm build/deskflow-*.rpm
+          elif [ "${{inputs.like}}" == "arch" ]; then
+            pacman -U --noconfirm build/deskflow-*.pkg.tar.zst
+          else
+            echo "Unknown like: ${{inputs.like}}"
+            exit 1
+          fi
+          deskflow-core --version
+
+        else
+          echo "Unknown OS: $RUNNER_OS"
+          exit 1
+        fi

.github/actions/test-summary/action.yml

@@ -60,7 +60,7 @@ runs:
 
         echo "$table" > $GITHUB_STEP_SUMMARY
 
-        count=$(echo "$table" | awk -v RS='' '{gsub(/[^❌]/, ""); print length}')
+        count=$(echo "$table" | { grep -o '❌' || true; } | wc -l)
 
         # Keep at this indentation level for heredoc.
         fail_summary=$(cat <<EOF

.github/pull_request_template.md

@@ -0,0 +1,15 @@
+## Description
+<!--- Describe your what your changes do -->
+
+## Disclosure of AI use
+<!--- Disclouse your use of AI Tools used to make this pr -->
+<!--- If any AI tools were used to crate the code let us know -->
+
+## Related Issue
+<!--- If fixing an issue you must add a `fixes` line for each issues fixed-->
+<!--- Example, if fixing Issues #1234 you would add -->
+<!--- fixes: #1234 -->
+
+## How Has This Been Tested?
+<!--- Please describe how you tested your changes -->
+<!--- Include details of your testing environment -->

.github/workflows/ci-comment.yml

@@ -18,12 +18,15 @@ on:
 jobs:
   summary:
     if: github.event.workflow_run.event == 'pull_request'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-slim
 
     steps:
+      # If the workflow fails before uploading summaries, no artifacts exist and this step fails.
+      # Allow failure so the "Delete PR comment" step still runs to clean up stale comments.
       - name: Download summaries
         id: download
         uses: actions/download-artifact@v4
+        continue-on-error: true
         with:
           run-id: ${{ github.event.workflow_run.id }}
           pattern: summary-*
@@ -54,15 +57,16 @@ jobs:
               console.log("Found PR:", pr.number);
               return pr.number;
             } else {
-              core.setFailed("PR not found");
+              core.warning("PR not found for SHA (maybe removed by force push)");
             }
 
       - name: Merge summaries
+        if: steps.get-pr-number.outputs.result
         id: summary
         run: |
           ls -R
 
-          files=$(find $dir -type f)
+          files=$(find summaries -type f 2>/dev/null || true)
           if [ -z "$files" ]; then
             echo "No files found in dir: $dir"
             exit 0
@@ -85,7 +89,7 @@ jobs:
           } >> $GITHUB_OUTPUT
 
       - name: Set PR comment
-        if: steps.summary.outputs.message
+        if: steps.get-pr-number.outputs.result && steps.summary.outputs.message
         uses: marocchino/sticky-pull-request-comment@v2
         with:
           number: ${{ steps.get-pr-number.outputs.result }}
@@ -93,7 +97,7 @@ jobs:
           message: ${{ steps.summary.outputs.message }}
 
       - name: Delete PR comment
-        if: ${{ !steps.summary.outputs.message }}
+        if: ${{ steps.get-pr-number.outputs.result && !steps.summary.outputs.message }}
         uses: marocchino/sticky-pull-request-comment@v2
         with:
           number: ${{ steps.get-pr-number.outputs.result }}

.github/workflows/codeql-analysis.yml

@@ -1,42 +1,37 @@
 name: "CodeQL Analysis"
 
-# According to the docs, the CodeQL workflow should be triggered directly by push to master
-# and by pull requests (we only run this on open PRs as it's very slow). We also use the
-# `workflow_dispatch` event is also enabled to allow manual triggering of the workflow for testing.
-#
-# We should not trigger this workflow with `workflow_call` as this causes the error:
-#   "1 configuration present on `master` was not found"
-#
-# Sadly, this means we can't roll it into our monolithic CI workflow.
+# This is best run as a standalone workflow, not as part of another workflow like CI
+# because of how GitHub understands the code scanning workflows in it's UI.
 on:
   workflow_dispatch:
   pull_request:
-    types: [opened, synchronize, reopened, ready_for_review]
-    paths-ignore:
-      - '**/*.md'
-      - '.github/ISSUE_TEMPLATE/**'
-      - '.editorconfig'
-      - '.env-example'
-      - '.gitignore'
-      - '.gitattributes'
-      - 'cspell.json'
+    paths:
+      - '.github/workflows/codeql-analysis.yml'
+      - 'cmake/Libraries.cmake'
+      - 'CMakeLists.txt'
+      - 'src/**'
+      - '!src/res/**'
+      - '!src/unittests/**'
   push:
     branches: [master]
+    paths:
+      - '.github/workflows/codeql-analysis.yml'
+      - 'cmake/Libraries.cmake'
+      - 'CMakeLists.txt'
+      - 'src/**'
+      - '!src/res/**'
+      - '!src/unittests/**'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
-  analyze:
-    if: ${{ !github.event.pull_request.draft }}
-
-    name: Analyze
+  codeql:
     runs-on: ubuntu-latest
     container: debian:trixie-slim
     timeout-minutes: 20
 
-    strategy:
-      fail-fast: false
-      matrix:
-        language: ["cpp"]
-
     steps:
       - name: Install container dependencies
         run: |
@@ -44,7 +39,7 @@ jobs:
           apt install -qqq git > /dev/null
 
       - name: Fancy Checkout
-        uses: sithlord48/fancy-checkout@v1
+        uses: sithlord48/fancy-checkout@v2
 
       - name: Install dependencies
         uses: ./.github/actions/install-dependencies
@@ -52,12 +47,12 @@ jobs:
           like: "debian"
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
+        uses: github/codeql-action/init@v4
         with:
-          languages: ${{ matrix.language }}
+          languages: cpp
 
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v3
+        uses: github/codeql-action/autobuild@v4
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3
+        uses: github/codeql-action/analyze@v4

.github/workflows/continuous-integration.yml

@@ -8,21 +8,12 @@ on:
   push:
     branches: [master]
     tags:
-      - 'v*'
+      - "v*"
   pull_request:
-    types:
-      - opened
-      - reopened
-      - synchronize
-      - ready_for_review
-    paths-ignore:
-      - '**/*.md'
-      - '.github/ISSUE_TEMPLATE/**'
-      - '.editorconfig'
-      - '.env-example'
-      - '.gitignore'
-      - '.gitattributes'
-      - 'cspell.json'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 env:
   GIT_SHA: ${{ github.event.pull_request.head.sha || github.sha }}
@@ -31,40 +22,20 @@ env:
   CMAKE_CONFIGURE: "cmake -Bbuild -DCMAKE_BUILD_TYPE=Release -DSKIP_BUILD_TESTS=ON -DCMAKE_COMPILE_WARNING_AS_ERROR=ON"
 
 jobs:
-  # Always run this job, even if not on PR, since other jobs need it.
-  pr-comment-flags:
-    runs-on: ubuntu-latest
-    needs: lint-clang
-
-    outputs:
-      no-sonar: ${{ steps.check.outputs.no-sonar }}
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v5
-
-      - name: Check PR comment for flags
-        if: ${{ github.event_name == 'pull_request' }}
-        id: check
-        env:
-          PR_BODY: ${{ github.event.pull_request.body }}
-        run: |
-          no_sonar="{no-sonar}"
-
-          if echo $PR_BODY | grep -q "$no_sonar"; then
-            echo "Flag $no_sonar found in PR body."
-            echo "no-sonar=true" >> $GITHUB_OUTPUT
-          else
-            echo "No $no_sonar flag found in PR body."
-          fi
-
   # Quality gate to allow PR merge, used in the branch protection rules.
   ci-passed:
     runs-on: ubuntu-latest
-    needs: [test-results, unix, flatpak]
+    needs: [main-build, test-results, unix, flatpak]
+    if: always()
 
     steps:
-      - run: echo "✅ CI passed" > $GITHUB_STEP_SUMMARY
+      - name: Check all steps passed
+        run: |
+          if [[ ${{needs.main-build.result}} == 'success' && ${{needs.test-results.result}} == 'success' && ${{needs.unix.result}} == 'success' && ${{needs.flatpak.result}} == 'success' ]]; then
+            echo "✅ CI passed" > $GITHUB_STEP_SUMMARY
+          else
+            exit 1
+          fi
 
   # Summary of test results, combined from test result artifacts.
   # Runs even if the tests fail to provide a summary of the failures.
@@ -72,7 +43,7 @@ jobs:
     needs: main-build
     if: always() && needs.main-build.result != 'skipped'
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-slim
     timeout-minutes: 5
 
     steps:
@@ -94,7 +65,7 @@ jobs:
 
   lint-clang:
     needs: [lint-reuse]
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-slim
     timeout-minutes: 5
 
     steps:
@@ -104,18 +75,11 @@ jobs:
       - name: Lint Checker
         uses: ./.github/actions/lint-clang
 
-  analyse-valgrind:
+  analyze-valgrind:
     needs: lint-clang
     if: ${{ github.event_name == 'pull_request' }}
     uses: ./.github/workflows/valgrind-analysis.yml
 
-  analyse-sonarcloud:
-    needs: pr-comment-flags
-    if: ${{ needs.pr-comment-flags.outputs.no-sonar != 'true' }}
-    uses: ./.github/workflows/sonarcloud-analysis.yml
-    secrets:
-      SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-
   main-build:
     needs: lint-clang
     name: ${{ matrix.target.name }}
@@ -133,40 +97,54 @@ jobs:
             runs-on: "windows-2022"
             timeout: 30
             config-args: "-G Ninja"
-            qt-version: 6.9.0
             vcpkg-triplet: x64-windows-release
             arch: "amd64"
+            qt-version: 6.10.1
 
           - name: "windows-2022-arm64"
             runs-on: "windows-11-arm"
             timeout: 30
             config-args: "-G Ninja"
-            qt-version: 6.9.1
             vcpkg-triplet: arm64-windows
             arch: "arm64"
+            qt-version: 6.10.1
 
-          - name: "macos-14-arm64"
-            runs-on: "macos-14"
+          - name: "macos-arm64"
+            runs-on: macos-15
             timeout: 10
-            config-args: "-DCMAKE_OSX_ARCHITECTURES=\"arm64\" -DCMAKE_OSX_SYSROOT=/Applications/Xcode_15.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk"
-            qt-version: 6.9.1
+            qt-version: 6.10.1
+            config-args: '-DCMAKE_OSX_ARCHITECTURES="arm64" -DCMAKE_OSX_DEPLOYMENT_TARGET=14 -DCMAKE_OSX_SYSROOT=/Applications/Xcode_16.4.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk'
 
-          - name: "macos-13-x64"
-            runs-on: macos-13
+          - name: "macos-x64"
+            runs-on: macos-15-intel
             timeout: 20
-            config-args: "-DCMAKE_OSX_ARCHITECTURES=\"x86_64\" -DCMAKE_OSX_SYSROOT=/Applications/Xcode_15.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk"
-            qt-version: 6.9.1
+            qt-version: 6.9.3
+            config-args: '-DCMAKE_OSX_ARCHITECTURES="x86_64" -DCMAKE_OSX_DEPLOYMENT_TARGET=12 -DCMAKE_OSX_SYSROOT=/Applications/Xcode_16.4.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk'
 
-          - name: "debian-13-x86_64"
+          - name: "debian-x86_64"
             runs-on: ubuntu-latest
-            container: debian:trixie-slim
+            container: debian:stable-slim
             like: "debian"
             timeout: 20
             config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
 
-          - name: "debian-13-arm64"
+          - name: "debian-arm64"
             runs-on: ubuntu-24.04-arm
-            container: debian:trixie-slim
+            container: debian:stable-slim
+            like: "debian"
+            timeout: 20
+            config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
+
+          - name: "debian-testing-x86_64"
+            runs-on: ubuntu-latest
+            container: debian:testing-slim
+            like: "debian"
+            timeout: 20
+            config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
+
+          - name: "debian-testing-arm64"
+            runs-on: ubuntu-24.04-arm
+            container: debian:testing-slim
             like: "debian"
             timeout: 20
             config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
@@ -185,21 +163,21 @@ jobs:
             timeout: 20
             config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
 
-          - name: "fedora-41-x86_64"
+          - name: "fedora-43-x86_64"
             runs-on: ubuntu-latest
-            container: fedora:41
+            container: fedora:43
             like: "fedora"
             timeout: 20
             config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
 
-          - name: "fedora-41-arm64"
+          - name: "fedora-43-arm64"
             runs-on: ubuntu-24.04-arm
-            container: fedora:41
+            container: fedora:43
             like: "fedora"
             timeout: 20
             config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
 
-          - name: "opensuse-x86_84"
+          - name: "opensuse-x86_64"
             runs-on: ubuntu-latest
             container: opensuse/tumbleweed:latest
             like: "suse"
@@ -213,23 +191,37 @@ jobs:
             timeout: 20
             config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
 
-          - name: "archlinux-x86_84"
+          - name: "archlinux-x86_64"
             runs-on: ubuntu-latest
             container: archlinux:latest
             like: "arch"
             timeout: 20
             config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_DEV_DOCS=ON"
 
-          - name: "ubuntu-25.04-x86_64"
+          - name: "ubuntu-25.10-x86_64"
             runs-on: ubuntu-latest
-            container: ubuntu:25.04
+            container: ubuntu:25.10
             like: "debian"
             timeout: 20
             config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
 
-          - name: "ubuntu-25.04-arm64"
+          - name: "ubuntu-25.10-arm64"
             runs-on: ubuntu-24.04-arm
-            container: ubuntu:25.04
+            container: ubuntu:25.10
+            like: "debian"
+            timeout: 20
+            config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
+
+          - name: "ubuntu-26.04-x86_64"
+            runs-on: ubuntu-latest
+            container: ubuntu:26.04
+            like: "debian"
+            timeout: 20
+            config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
+
+          - name: "ubuntu-26.04-arm64"
+            runs-on: ubuntu-24.04-arm
+            container: ubuntu:26.04
             like: "debian"
             timeout: 20
             config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
@@ -239,23 +231,23 @@ jobs:
       - name: Install Git on Container
         if: ${{ matrix.target.container }}
         shell: bash
-        run : |
-           if [ "${{matrix.target.like}}" == "debian" ]; then
-             apt update -qqq > /dev/null && apt install -qqq git devscripts > /dev/null
-           elif [ "${{matrix.target.like}}" == "fedora" ]; then
-             dnf install -y git
-           elif [ "${{matrix.target.like}}" == "suse" ]; then
-             zypper refresh
-             zypper install -y --force-resolution git
-           elif [ "${{matrix.target.like}}" == "arch" ]; then
-             pacman -Syu --noconfirm git
-           else
-             echo "Unknown: ${{matrix.target.like}}"
-           fi
+        run: |
+          if [ "${{matrix.target.like}}" == "debian" ]; then
+            apt update -qqq > /dev/null && apt install -qqq git devscripts > /dev/null
+          elif [ "${{matrix.target.like}}" == "fedora" ]; then
+            dnf install -y git
+          elif [ "${{matrix.target.like}}" == "suse" ]; then
+            zypper refresh
+            zypper install -y --force-resolution git
+          elif [ "${{matrix.target.like}}" == "arch" ]; then
+            pacman -Syu --noconfirm git
+          else
+            echo "Unknown: ${{matrix.target.like}}"
+          fi
       # Fancy checkout gets all the tags
       # it also makes sure we can use git --describe correctly
       - name: Fancy Checkout
-        uses: sithlord48/fancy-checkout@v1
+        uses: sithlord48/fancy-checkout@v2
 
       # This effectively runs `vcvarsall.bat`, etc. It's not actually installing
       # VC++ as that's already pre-installed on the Windows runner.
@@ -265,12 +257,11 @@ jobs:
         with:
           arch: ${{matrix.target.arch}}
 
-
       - name: Install dependencies
         id: get-deps
         uses: ./.github/actions/install-dependencies
         with:
-          qt-version: ${{ matrix.target.qt-version }}
+          qt-version: ${{matrix.target.qt-version}}
           vcpkg-triplet: ${{matrix.target.vcpkg-triplet}}
           like: ${{ matrix.target.like }}
 
@@ -297,12 +288,25 @@ jobs:
             cd ..
           fi
 
+      - name: Check for unexpected repo changes
+        shell: bash
+        run: |
+          if [[ `git status --porcelain` ]]; then
+            echo "Unexpected changes to the repo, Often caused by forgetting to commit the updated translation files"
+            exit 1
+          fi
+
       - name: Tests
         uses: ./.github/actions/run-tests
         timeout-minutes: 2
         with:
           job: ${{ matrix.target.name }}
 
+      - name: Test package
+        uses: ./.github/actions/test-package
+        with:
+          like: ${{ matrix.target.like }}
+
       - name: Update Development Documentation
         if: matrix.target.like == 'arch' && github.ref == 'refs/heads/master'
         uses: JamesIves/github-pages-deploy-action@v4.7.3
@@ -334,7 +338,7 @@ jobs:
       # Fancy checkout gets all the tags
       # it also makes sure we can use git --describe correctly
       - name: Fancy Checkout
-        uses: sithlord48/fancy-checkout@v1
+        uses: sithlord48/fancy-checkout@v2
       - name: Build on FreeBSD
         if: ${{ matrix.distro.name == 'freebsd' }}
         uses: vmactions/freebsd-vm@v1
@@ -342,8 +346,8 @@ jobs:
           usesh: true
           run: |
             pkg install -y cmake ninja gmake gcc12 openssl glib \
-            libX11 libXtst libxkbfile qt6-base qt6-tools gtk3 googletest \
-            tomlplusplus cli11 pkgconf libei libportal
+            libX11 libXtst libxkbfile qt6-base qt6-tools gtk3 \
+            googletest pkgconf libei libportal
             ${{env.CMAKE_CONFIGURE}} -G Ninja
             cmake --build build -j16
             # Integration tests are flakey by nature, make them optional.
@@ -355,7 +359,7 @@ jobs:
     runs-on: ${{matrix.flatpak.runs-on}}
     timeout-minutes: 60
     container:
-      image: ghcr.io/flathub-infra/flatpak-github-actions:kde-6.8
+      image: ghcr.io/flathub-infra/flatpak-github-actions:kde-6.10
       options: --privileged
     strategy:
       fail-fast: false
@@ -367,7 +371,7 @@ jobs:
             arch: aarch64
     steps:
       - name: Check out repository
-        uses: sithlord48/fancy-checkout@v1
+        uses: sithlord48/fancy-checkout@v2
 
       - run: git config --global protocol.file.allow always
 
@@ -405,7 +409,7 @@ jobs:
 
     steps:
       - name: Fancy Checkout
-        uses: sithlord48/fancy-checkout@v1
+        uses: sithlord48/fancy-checkout@v2
 
       - name: Get version
         uses: ./.github/actions/get-version
@@ -429,7 +433,7 @@ jobs:
           repo_token: "${{ secrets.GITHUB_TOKEN }}"
           automatic_release_tag: "continuous"
           prerelease: true
-          title: 'Continuous Build'
+          title: "Continuous v${{env.DESKFLOW_VERSION}}"
           files: |
             deskflow-*
             sums.txt
@@ -443,14 +447,24 @@ jobs:
           files: |
             deskflow-*
             sums.txt
-            
+
+      - name: Update Homebrewtap
+        shell: bash
+        run: |
+          curl -L -X POST \
+          -H "Accept: application/vnd.github+json" \
+          -H "Authorization: Bearer ${{ secrets.DF_TAP_TOKEN }}" \
+          -H "X-GitHub-Api-Version: 2022-11-28" \
+          https://api.github.com/repos/deskflow/homebrew-tap/dispatches \
+          -d '{"event_type":"update_tap"}'
+
   winget-publish:
     needs: release
     if: contains(github.ref, 'tags/v')
     runs-on: windows-latest
     steps:
       - name: Fancy Checkout
-        uses: sithlord48/fancy-checkout@v1
+        uses: sithlord48/fancy-checkout@v2
 
       - name: Get version
         uses: ./.github/actions/get-version

.github/workflows/issue-check-stale.yml

@@ -5,7 +5,7 @@ on:
 
 jobs:
   stale-issues:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-slim
     timeout-minutes: 10
 
     steps:

.github/workflows/sonarcloud-analysis.yml

@@ -1,14 +1,36 @@
 name: "SonarCloud Analysis"
 
+# This is best run as a standalone workflow, not as part of another workflow like CI
+# because of how GitHub understands the code scanning workflows in it's UI.
 on:
   workflow_dispatch:
-  workflow_call:
-    secrets:
-      SONAR_TOKEN:
-        required: true
+  pull_request:
+    paths:
+      - '.github/workflows/sonarcloud-analysis.yml'
+      - 'sonar-project.properties'
+      - 'cmake/Libraries.cmake'
+      - 'CMakeLists.txt'
+      - 'src/**'
+      - '!src/res/**'
+      - '!src/unittests/**'
+  push:
+    branches: [master]
+    paths:
+      - '.github/workflows/codeql-analysis.yml'
+      - 'cmake/Libraries.cmake'
+      - 'CMakeLists.txt'
+      - 'src/**'
+      - '!src/res/**'
+      - '!src/unittests/**'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
-  sonarcloud-analysis:
+  sonar:
+    # This job would fail for contributors who open PRs as the workflow runs outside of our repo
+    # in this scenario. Having a var that only we set to true prevents this job from running.
     if: ${{ vars.SONAR_SCANNER_ENABLED }}
 
     runs-on: ubuntu-latest
@@ -16,10 +38,7 @@ jobs:
     timeout-minutes: 20
 
     env:
-      SONAR_SCANNER_VERSION: 6.1.0.4477
-      SONAR_SCANNER_OPTS: -server
-      SONAR_SCANNER_URL_BASE: https://binaries.sonarsource.com/Distribution/sonar-scanner-cli
-      CPU_CORE_COUNT: ${{ vars.SONAR_SCANNER_CPU_COUNT || 4 }}
+      CPU_CORE_COUNT: 4
 
     steps:
       - name: Install container dependencies
@@ -28,15 +47,15 @@ jobs:
           apt install -qqq git curl unzip gcovr > /dev/null
 
       - name: Fancy Checkout
-        uses: sithlord48/fancy-checkout@v1
+        uses: sithlord48/fancy-checkout@v2
 
       - name: Install project dependencies
         uses: ./.github/actions/install-dependencies
         with:
           like: "debian"
 
-      - name: Install sonar-scanner and build-wrapper
-        uses: sonarsource/sonarcloud-github-c-cpp@v3
+      - name: Install Build Wrapper
+        uses: SonarSource/sonarqube-scan-action/install-build-wrapper@v6
 
       - name: Configure
         run: |
@@ -71,11 +90,11 @@ jobs:
           fi
           echo "csv=$paths" >> $GITHUB_OUTPUT
 
-      - name: Run SonarScanner
-        run: |
-          export PATH=$HOME/.sonar/sonar-scanner-$SONAR_SCANNER_VERSION-linux-x64/bin:$PATH
-          sonar-scanner \
-            -Dsonar.coverageReportPaths=${{ steps.coverage-paths.outputs.csv }} \
+      - name: SonarQube Scan
+        uses: SonarSource/sonarqube-scan-action@v6
+        with:
+          args: >
+            -Dsonar.coverageReportPaths=${{ steps.coverage-paths.outputs.csv }}
             -Dsonar.cfamily.threads=${{ env.CPU_CORE_COUNT }}
         env:
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.github/workflows/valgrind-analysis.yml

@@ -17,7 +17,7 @@ jobs:
           apt install -qqq git valgrind > /dev/null
 
       - name: Fancy Checkout
-        uses: sithlord48/fancy-checkout@v1
+        uses: sithlord48/fancy-checkout@v2
 
       - name: Install dependencies
         uses: ./.github/actions/install-dependencies

.gitignore

@@ -25,6 +25,9 @@ deskflow-config.toml
 /*.user
 *.ui.autosave
 
+#Qt creator 18 user files
+/.qtcreator
+
 # generated vcpkg file
 vcpkg.json
 
@@ -42,3 +45,7 @@ CMakeFiles/*
 
 # scripts folder
 /scripts
+
+# Ai helperfilers
+**/[cC]laude.[mM][dD]
+**/CLAUDE.[mM][dD]

CMakeLists.txt

@@ -1,6 +1,6 @@
-# SPDX-FileCopyrightText: 2024 - 2025 Deskflow Developers
-# SPDX-FileCopyrightText: 2012 - 2024 Symless Ltd
-# SPDX-FileCopyrightText: 2009 - 2012 Nick Bolton
+# SPDX-FileCopyrightText: (C) 2024 - 2026 Deskflow Developers
+# SPDX-FileCopyrightText: (C) 2012 - 2024 Symless Ltd
+# SPDX-FileCopyrightText: (C) 2009 - 2012 Nick Bolton
 # SPDX-License-Identifier: MIT
 
 cmake_minimum_required(VERSION 3.24)
@@ -11,6 +11,11 @@ cmake_policy(SET CMP0003 NEW)
 # Fix define escaping
 cmake_policy(SET CMP0005 NEW)
 
+# De-duplicate libraries on linker calls
+if(POLICY CMP0156)
+  cmake_policy(SET CMP0156 NEW)
+endif()
+
 # Set CXX Requirements
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_EXTENSIONS OFF)
@@ -18,7 +23,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 # Fallback for when git can not be found
 set(DESKFLOW_VERSION_MAJOR 1)
-set(DESKFLOW_VERSION_MINOR 24)
+set(DESKFLOW_VERSION_MINOR 26)
 set(DESKFLOW_VERSION_PATCH 0)
 set(DESKFLOW_VERSION_TWEAK 0)
 
@@ -33,38 +38,28 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git)
       ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE
     )
     execute_process(
-      COMMAND ${GIT_EXECUTABLE} rev-list --tags --count
+      COMMAND ${GIT_EXECUTABLE} describe --long --match v* --always
       WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
-      OUTPUT_VARIABLE GIT_TAG_COUNT
+      OUTPUT_VARIABLE GITREV
       ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE
     )
-
-    if(${GIT_TAG_COUNT} EQUAL 0)
-      set(DESKFLOW_VERSION_TWEAK "9999")
+    string(FIND "${GITREV}" "v" isRev)
+    if(NOT ${isRev} EQUAL -1)
+      string(REGEX MATCH [0-9]+ MAJOR ${GITREV})
+      string(REGEX MATCH \\.[0-9]+ MINOR ${GITREV})
+      string(REPLACE "." "" MINOR "${MINOR}")
+      string(REGEX MATCH [0-9]+\- PATCH ${GITREV})
+      string(REPLACE "-" "" PATCH "${PATCH}")
+      string(REGEX MATCH \-[0-9]+\- TWEAK ${GITREV})
+      string(REPLACE "-" "" TWEAK "${TWEAK}")
+      set(DESKFLOW_VERSION_MAJOR ${MAJOR})
+      set(DESKFLOW_VERSION_MINOR ${MINOR})
+      set(DESKFLOW_VERSION_PATCH ${PATCH})
+      set(DESKFLOW_VERSION_TWEAK ${TWEAK})
     else()
-      execute_process(
-        COMMAND ${GIT_EXECUTABLE} describe --long --match v* --always
-        WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
-        OUTPUT_VARIABLE GITREV
-        ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE
-      )
-      string(FIND "${GITREV}" "v" isRev)
-      if(NOT ${isRev} EQUAL -1)
-        string(REGEX MATCH [0-9]+ MAJOR ${GITREV})
-        string(REGEX MATCH \\.[0-9]+ MINOR ${GITREV})
-        string(REPLACE "." "" MINOR "${MINOR}")
-        string(REGEX MATCH [0-9]+\- PATCH ${GITREV})
-        string(REPLACE "-" "" PATCH "${PATCH}")
-        string(REGEX MATCH \-[0-9]+\- TWEAK ${GITREV})
-        string(REPLACE "-" "" TWEAK "${TWEAK}")
-        set(DESKFLOW_VERSION_MAJOR ${MAJOR})
-        set(DESKFLOW_VERSION_MINOR ${MINOR})
-        set(DESKFLOW_VERSION_PATCH ${PATCH})
-        set(DESKFLOW_VERSION_TWEAK ${TWEAK})
-      elseif(NOT ${GITREV} STREQUAL "")
-        set(DESKFLOW_VERSION_TWEAK ${GITREV})
-      endif()
+      set(DESKFLOW_VERSION_TWEAK "9999")
     endif()
+    unset(GITREV)
   endif()
 endif()
 
@@ -82,13 +77,16 @@ project(
   deskflow
   VERSION "${DESKFLOW_VERSION_MAJOR}.${DESKFLOW_VERSION_MINOR}.${DESKFLOW_VERSION_PATCH}.${DESKFLOW_VERSION_TWEAK}"
   DESCRIPTION "Keyboard and mouse sharing utility"
-  LANGUAGES C CXX)
+  HOMEPAGE_URL "https://deskflow.org"
+  LANGUAGES C CXX
+)
 
 # Define Additional "PROJECT" vars for packaging and metadata
 set(CMAKE_PROJECT_PROPER_NAME "Deskflow")
 set(CMAKE_PROJECT_VENDOR "${CMAKE_PROJECT_PROPER_NAME} Devs")
-set(CMAKE_PROJECT_COPYRIGHT "(C) 2024-2025 ${CMAKE_PROJECT_VENDOR}")
+set(CMAKE_PROJECT_COPYRIGHT "(C) 2024-2026 ${CMAKE_PROJECT_VENDOR}")
 set(CMAKE_PROJECT_CONTACT "${CMAKE_PROJECT_PROPER_NAME} <maintainers@deskflow.org>")
+set(CMAKE_PROJECT_REV_FQDN "org.deskflow.deskflow")
 
 #Unset the vars used in the project call
 unset(DESKFLOW_VERSION_MAJOR)
@@ -105,6 +103,7 @@ set(REQUIRED_LIBPORTAL_VERSION 0.8)
 set(REQUIRED_QT_VERSION 6.7.0)
 
 if (WIN32)
+  add_definitions(-DSYSAPI_WIN32 -DWINAPI_MSWINDOWS)
   # VSCMD_ARG_TGT_ARCH is set on CI
   if ("$ENV{VSCMD_ARG_TGT_ARCH}" STREQUAL "")
     # NOT on CI
@@ -144,11 +143,6 @@ if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
   add_definitions(-DNDEBUG)
 endif()
 
-# Set required macOS SDK
-if(APPLE)
-  set(CMAKE_OSX_DEPLOYMENT_TARGET 12)
-endif()
-
 # Set Output Folders
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin")
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib")
@@ -157,38 +151,51 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib")
 # Instead use Q_SIGNAL, Q_SLOT and Q_EMIT
 # prevents issues when used with glib for libportal
 add_definitions(-DQT_NO_KEYWORDS)
-include(cmake/Libraries.cmake)
-include(GNUInstallDirs)
 
+#Options for Linux platform support
+if(UNIX AND NOT APPLE)
+  option(BUILD_X11_SUPPORT "Build with x11 support" ON)
+elseif (APPLE)
+  option(BUILD_OSX_BUNDLE "Build mac os bundle" ON)
+endif()
+
+include(cmake/Libraries.cmake)
 configure_libs()
 
-add_subdirectory(doc)
-add_subdirectory(src)
-
-# Install License, License is in the App Bundle on mac os (src/gui)
-if(WIN32)
-  install(
-    FILES ${PROJECT_SOURCE_DIR}/LICENSE
-    DESTINATION .
-  )
-  install(
-    FILES ${PROJECT_SOURCE_DIR}/LICENSES/LicenseRef-OpenSSL-Exception.txt
-    DESTINATION .
-    RENAME LICENSE_EXCEPTION
-  )
-elseif(UNIX AND NOT APPLE)
-  install(
-    FILES ${PROJECT_SOURCE_DIR}/LICENSE
-    DESTINATION share/licenses/deskflow
-  )
-  install(
-    FILES ${PROJECT_SOURCE_DIR}/LICENSES/LicenseRef-OpenSSL-Exception.txt
-    DESTINATION share/licenses/deskflow
-    RENAME LICENSE_EXCEPTION
-  )
+# setup install paths
+include(GNUInstallDirs)
+if (WIN32)
+  set(CMAKE_INSTALL_BINDIR .)
+  set(CMAKE_INSTALL_LIBDIR .)
+  set(CMAKE_INSTALL_LICENSE_DIR .)
+  set(CMAKE_INSTALL_I18N_DIR translations)
+elseif(BUILD_OSX_BUNDLE)
+  set(CMAKE_INSTALL_BINDIR ${CMAKE_PROJECT_PROPER_NAME}.app/Contents/MacOS)
+  set(CMAKE_INSTALL_LICENSE_DIR ${CMAKE_PROJECT_PROPER_NAME}.app/Contents/Resources)
+else()
+  set(CMAKE_INSTALL_LICENSE_DIR ${CMAKE_INSTALL_DATADIR}/licenses/${CMAKE_PROJECT_NAME})
+  set(CMAKE_INSTALL_I18N_DIR ${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME}/translations)
 endif()
 
+add_subdirectory(doc)
+
+# build translations before source, I18N unit tests fail if they are missing
+add_subdirectory(translations)
+
+add_subdirectory(src)
+
 option(BUILD_INSTALLER "Build installer" ON)
 if(BUILD_INSTALLER)
     add_subdirectory(deploy)
 endif()
+
+install(
+  FILES ${PROJECT_SOURCE_DIR}/LICENSE
+  DESTINATION ${CMAKE_INSTALL_LICENSE_DIR}
+)
+
+install(
+  FILES ${PROJECT_SOURCE_DIR}/LICENSES/LicenseRef-OpenSSL-Exception.txt
+  DESTINATION ${CMAKE_INSTALL_LICENSE_DIR}
+  RENAME LICENSE_EXCEPTION
+)

README.md

@@ -22,8 +22,14 @@ TLS encryption is enabled by default. Wayland is supported. Clipboard sharing is
 
 [![Downloads: Stable Release](https://img.shields.io/github/downloads/deskflow/deskflow/latest/total?style=for-the-badge&logo=github&label=Download%20Stable)](https://github.com/deskflow/deskflow/releases/latest)      [![Downloads: Continuous Build](https://img.shields.io/github/downloads/deskflow/deskflow/continuous/total?style=for-the-badge&logo=github&label=Download%20Continuous)](https://github.com/deskflow/deskflow/releases/continuous)      [![Download From Flathub](https://img.shields.io/flathub/downloads/org.deskflow.deskflow?style=for-the-badge&logo=flathub&label=Download%20from%20flathub)](https://flathub.org/apps/org.deskflow.deskflow)
 
+> [!NOTE]
+> On Windows, you will need to install the
+> [Microsoft Visual C++ Redistributable](https://learn.microsoft.com/en-us/cpp/windows/latest-supported-vc-redist?view=msvc-170#latest-microsoft-visual-c-redistributable-version).  
+> Download latest: [`vc_redist.x64.exe`](https://aka.ms/vc14/vc_redist.x64.exe) [`vc_redist.arm64.exe`](https://aka.ms/vc14/vc_redist.arm64.exe)
+
 > [!TIP]
 > For macOS users, the easiest way to install and stay up to date is to use [Homebrew](https://brew.sh) with our [homebrew-tap](https://github.com/deskflow/homebrew-tap).
+> macOS reports unsigned apps as damaged. This occurs because we do not use an Apple certificate for notarization. Clear the quarantine attribute to run the app: `xattr -c Deskflow.app`
 
 To use Deskflow, download one of our [packages](https://github.com/deskflow/deskflow/releases), install `deskflow` (from your package repository), or [build it](https://github.com/deskflow/deskflow/wiki/Building) from source.
 
@@ -45,7 +51,7 @@ To use Deskflow, download one of our [packages](https://github.com/deskflow/desk
 
 ## Contribute
 
-[![Good first issues](https://img.shields.io/github/issues/deskflow/deskflow/good%20first%20issue?label=good%20first%20issues&color=%2344cc11)](https://github.com/deskflow/deskflow/labels/good%20first%20issue) [![Open bounty issues](https://img.shields.io/github/issues/deskflow/deskflow/%F0%9F%92%8E%20bounty?label=💎%20open%20bounty%20issues&color=%2344cc11)](https://github.com/deskflow/deskflow/issues?q=is%3Aissue%20state%3Aopen%20label%3A%22%F0%9F%92%8E%20bounty%22) [![Rewarded bounties](https://img.shields.io/github/issues-search/deskflow/deskflow?query=label%3A%22%F0%9F%92%B0%20rewarded%22&label=%F0%9F%92%B0%20rewarded%20bounties&color=yellow)](https://github.com/deskflow/deskflow/issues?q=label%3A%22%F0%9F%92%B0%20rewarded%22%20sort%3Aupdated-desc)
+[![Good first issues](https://img.shields.io/github/issues/deskflow/deskflow/good%20first%20issue?label=good%20first%20issues&color=%2344cc11)](https://github.com/deskflow/deskflow/labels/good%20first%20issue)
 
 There are many ways to contribute to the Deskflow project.
 
@@ -59,14 +65,9 @@ For instructions on building Deskflow, use the wiki page: [Building](https://git
 
 We support all major operating systems, including Windows, macOS, Linux, and Unix-like BSD-derived.
 
-> [!NOTE]
-> On Windows, you will need to install the
-> [Microsoft Visual C++ Redistributable](https://learn.microsoft.com/en-us/cpp/windows/latest-supported-vc-redist?view=msvc-170#latest-microsoft-visual-c-redistributable-version).  
-> Download latest: [`vc_redist.x64.exe`](https://aka.ms/vs/17/release/vc_redist.x64.exe) [`vc_redist.arm64.exe`](https://aka.ms/vs/17/release/vc_redist.arm64.exe)
+Windows 10 v1809 or higher is required.
 
-Windows 10 or higher is required.
-
-macOS 12 or higher is required.
+macOS 13 or higher is required to use our CI builds for Apple Silicon machines. macOS 12 or higher is required for Intel macs or local builds.
 
 Linux requires libei 1.3+ and libportal 0.8+ for the server/client. Additionally, Qt 6.7+ is required for the GUI.
 Linux users with systems not meeting these requirements should use flatpak in place of a native package.
@@ -80,8 +81,6 @@ versions across them and gathering other information.
 
 [![Repology](https://repology.org/badge/vertical-allrepos/deskflow.svg?exclude_unsupported=1)](https://repology.org/project/deskflow/versions)
 
-**Note:** We are working with package maintainers to have our new package name adopted.
-
 ## Installing on macOS
 
 When you install Deskflow on macOS, you need to allow accessibility access (Privacy & Security) to both the `Deskflow` app and the `deskflow` process.
@@ -94,12 +93,12 @@ on the allowed list you will need to manually remove them before accessibility a
 
 macOS users who download directly from releases may need to run `xattr -c /Applications/Deskflow.app` after copying the app to the `Applications` dir.
 
-It is recommend to install Deskflow using [Homebrew](https://brew.sh) from our [homebrew-tap](https://github.com/deskflow/homebrew-tap)
+It is recommended to install Deskflow using [Homebrew](https://brew.sh) from our [homebrew-tap](https://github.com/deskflow/homebrew-tap)
 
 To add our tap, run:
 
 ```
-brew tap deskflow/homebrew-tap
+brew tap deskflow/tap
 ```
 
 Then install either:
@@ -115,11 +114,10 @@ mouse and keyboard sharing tools. We aim for idea sharing and interoperability.
 - [**Lan Mouse**](https://github.com/feschber/lan-mouse) -
   Rust implementation with the goal of having native front-ends and interoperability with
   Deskflow/Synergy.
-- [**Input Leap**](https://github.com/input-leap/input-leap) -
-  Deskflow/Synergy-derivative with the goal of continuing what Barrier started, after Barrier
-  became a dead fork.
 - [**Synergy**](https://symless.com/synergy) -
   Downstream commercial fork. Synergy sponsors Deskflow with financial support and contributes code ([learn more](https://github.com/deskflow/deskflow/wiki/Relationship-with-Synergy)).
+- [**Input Leap**](https://github.com/input-leap/input-leap) -
+  Inactive Deskflow/Synergy-derivative with the goal continuing Barrier development (now a dead fork).
 
 ## FAQ
 

REUSE.toml

@@ -26,6 +26,8 @@ path = [
  , "src/apps/deskflow-server/deskflow-server.exe.manifest"
  , "src/apps/res/manpage.txt"
  , "src/apps/res/deskflow.plist.in"
+ , "src/apps/res/entitlements-dev.plist"
+ , "translations/*.ts"
 ]
 SPDX-FileCopyrightText = "Deskflow Developers"
 SPDX-License-Identifier = "MIT"
@@ -34,7 +36,7 @@ SPDX-License-Identifier = "MIT"
 path = [
    "deploy/mac/dmg-background.tiff"
  , "deploy/mac/dmg-volume.icns"
- , "deploy/linux/deskflow.png"
+ , "deploy/linux/org.deskflow.deskflow.png"
  , "deploy/windows/wix-banner.png"
  , "deploy/windows/wix-dialog.png"
  , "src/apps/res/icons/deskflow-**/apps/64/deskflow*.svg"

cmake/CodeCoverage.cmake

@@ -1,9 +1,9 @@
 # SOURCE https://github.com/bilke/cmake-modules/blob/master/CodeCoverage.cmake
-# SPDX-FileCopyrightText: 2020 Bob Apthrope
-# SPDX-FileCopyrightText: 2019 Anatolii Kurotych
-# SPDX-FileCopyrightText: 2019 - 2020 Frank Dana
-# SPDX-FileCopyrightText: 2013 Joakim Söderberg
-# SPDX-FileCopyrightText: 2012 - 2017 Lars Bilke
+# SPDX-FileCopyrightText: (C) 2020 Bob Apthrope
+# SPDX-FileCopyrightText: (C) 2019 Anatolii Kurotych
+# SPDX-FileCopyrightText: (C) 2019 - 2020 Frank Dana
+# SPDX-FileCopyrightText: (C) 2013 Joakim Söderberg
+# SPDX-FileCopyrightText: (C) 2012 - 2017 Lars Bilke
 # SPDX-License-Identifier: MIT
 
 # USAGE:

cmake/Libraries.cmake

@@ -1,5 +1,5 @@
-# SPDX-FileCopyrightText: 2024 - 2025 Deskflow Developers
-# SPDX-FileCopyrightText: 2024 Symless Ltd
+# SPDX-FileCopyrightText: (C) 2024 - 2025 Deskflow Developers
+# SPDX-FileCopyrightText: (C) 2024 Symless Ltd
 # SPDX-License-Identifier: MIT
 
 macro(configure_libs)
@@ -49,6 +49,20 @@ macro(configure_libs)
 
   message(STATUS "Qt version: ${Qt6_VERSION}")
 
+  # Check if <format> header is available
+  check_cxx_source_compiles("
+    #include <format>
+    int main() {
+        char buffer[100];
+        std::format_to_n(buffer, 100, \"test {}\", 42);
+        return 0;
+    }
+    " HAVE_FORMAT)
+
+  if(HAVE_FORMAT)
+    add_definitions(-DHAVE_FORMAT)
+  endif()
+
   option(ENABLE_COVERAGE "Enable test coverage" OFF)
   if(ENABLE_COVERAGE)
     message(STATUS "Enabling code coverage")
@@ -89,6 +103,7 @@ macro(configure_unix_libs)
   include(CheckIncludeFileCXX)
   include(CheckSymbolExists)
   include(CheckCSourceCompiles)
+  include(CheckCXXSourceCompiles)
 
   check_include_files(sys/socket.h HAVE_SYS_SOCKET_H)
   if (NOT HAVE_SYS_SOCKET_H)
@@ -102,30 +117,8 @@ macro(configure_unix_libs)
   endif()
 
   check_function_exists(sigwait HAVE_POSIX_SIGWAIT)
-  check_function_exists(inet_aton HAVE_INET_ATON)
-
-  # For some reason, the check_function_exists macro doesn't detect the
-  # inet_aton on some pure Unix platforms (e.g. sunos5). So we need to do a more
-  # detailed check and also include some extra libs.
-  if(NOT HAVE_INET_ATON)
-    set(CMAKE_REQUIRED_LIBRARIES nsl)
-
-    check_c_source_compiles(
-      "#include <arpa/inet.h>\n int main() { inet_aton (0, 0); }"
-      HAVE_INET_ATON_ADV)
-
-    set(CMAKE_REQUIRED_LIBRARIES)
-
-    if(HAVE_INET_ATON_ADV)
-      # Override the previous fail.
-      set(HAVE_INET_ATON 1)
-
-      # Assume that both nsl and socket will be needed, it seems safe to add
-      # socket on the back of nsl, since socket only ever needed when nsl is
-      # needed.
-      list(APPEND libs nsl socket)
-    endif()
-
+  if (NOT HAVE_POSIX_SIGWAIT)
+    message(FATAL_ERROR "Missing posix sigwait")
   endif()
 
   # pthread is used on both Linux and Mac
@@ -149,10 +142,12 @@ macro(configure_unix_libs)
       ${lib_Foundation} ${lib_Carbon} ${lib_UserNotifications}
     )
 
-    add_definitions(-DWINAPI_CARBON=1 -D_THREAD_SAFE)
+    add_definitions(-DWINAPI_CARBON=1)
   else()
 
-    configure_xorg_libs()
+    if (BUILD_X11_SUPPORT)
+      configure_xorg_libs()
+    endif()
 
     include(FindPkgConfig)
     find_package(PkgConfig)
@@ -169,13 +164,7 @@ macro(configure_unix_libs)
     endif()
   endif()
 
-  # Unix only: For config.h, save the results based on a template (config.h.in).
-  # Note that this won't work on Windows because filenames are not case sensitive,
-  # and we have header files named "Config.h" (upper case 'C').
-  configure_file(${CMAKE_SOURCE_DIR}/src/lib/Config.h.in
-                 ${CMAKE_BINARY_DIR}/src/lib/Config.h @ONLY)
-
-  add_definitions(-DSYSAPI_UNIX=1 -DHAVE_CONFIG_H)
+  add_definitions(-DSYSAPI_UNIX=1)
 
 endmacro()
 

cspell.json

@@ -21,6 +21,7 @@
     "dotenv",
     "Evenson",
     "Feder",
+    "Flatpaks",
     "Fourdan",
     "gdrive",
     "Hadzhylov",
@@ -78,6 +79,8 @@
     "Serhii",
     "shemp",
     "SNAPPROCESS",
+    "sonarcloud",
+    "sonarqube",
     "Sorin",
     "subproject",
     "subprojects",

deploy/CMakeLists.txt

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2024 Chris Rizzitello <sithlord48@gmail.com>
+# SPDX-FileCopyrightText: (C) 2024 Chris Rizzitello <sithlord48@gmail.com>
 # SPDX-License-Identifier: MIT
 
 # Copy License with txt ext for picky package creation tools
@@ -8,7 +8,6 @@ file(COPY_FILE
   ONLY_IF_DIFFERENT
 )
 
-
 # Generic Package Items
 set(CPACK_STRIP_FILES TRUE)
 set(CPACK_PACKAGE_NAME ${CMAKE_PROJECT_NAME})

deploy/linux/arch/PKGBUILD.in

@@ -1,16 +1,17 @@
-# SPDX-FileCopyrightText: 2024 Deskflow Developers
+# SPDX-FileCopyrightText: (C) 2024 Deskflow Developers
 # SPDX-License-Identifier: MIT
 # Maintainer: Deskflow Developers
 
-pkgname=deskflow
+_basename=@CMAKE_PROJECT_NAME@
+pkgname=${_basename}-git
 pkgver=@CMAKE_PROJECT_VERSION@
 pkgrel=1
-pkgdesc="Mouse and keyboard sharing utility"
-url='https://deskflow.org'
+pkgdesc="@CMAKE_PROJECT_DESCRIPTION@"
+url="@CMAKE_PROJECT_HOMEPAGE_URL@"
 arch=('i686' 'x86_64' 'armv7h' 'aarch64')
 license=(LicenseRef-GPL-2.0-only-WITH-OpenSSL-Exception)
 conflicts=('synergy-git' 'synergy-1.6' 'synergy1-bin' 'synergy2-bin' 'synergy3-bin' 'synergy3-beta-bin' 'synergy3-stable-bin' 'barrier' 'barrier-git' 'barrier-headless' 'barrier-headless-git' 'input-leap' 'input-leap-git' 'input-leap-headless-git' 'input-leap-headless' 'waynergy' 'waynergy-git' 'qsynergy' 'slim-synergy' 'quicksynergy' 'deskflow')
-provides=("deskflow-git${pkgver}")
+provides=("$_basename")
 depends=(
   gcc-libs
   glib2
@@ -33,7 +34,7 @@ depends=(
   openssl
   qt6-base
   qt6-svg
-  tomlplusplus
+  qt6-translations
 )
 
 options=('!debug')

deploy/linux/deploy.cmake

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2024 Chris Rizzitello <sithlord48@gmail.com>
+# SPDX-FileCopyrightText: (C) 2024 Chris Rizzitello <sithlord48@gmail.com>
 # SPDX-License-Identifier: MIT
 
 # HACK This is set when the files is included so its the real path
@@ -7,21 +7,23 @@ set(MY_DIR ${CMAKE_CURRENT_LIST_DIR})
 
 # Install our desktop file
 install(
-  FILES ${MY_DIR}/org.deskflow.deskflow.desktop
-  DESTINATION share/applications
+  FILES ${MY_DIR}/${CMAKE_PROJECT_REV_FQDN}.desktop
+  DESTINATION ${CMAKE_INSTALL_DATADIR}/applications
 )
 
 # Install our icon
+install(FILES ${MY_DIR}/org.deskflow.deskflow.png DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/512x512/apps/)
+
+# Install our symbolic icon
 install(
-  FILES ${MY_DIR}/deskflow.png
-  DESTINATION share/icons/hicolor/512x512/apps/
-  RENAME org.deskflow.deskflow.png
+  FILES ${CMAKE_SOURCE_DIR}/src/apps/res/icons/deskflow-light/apps/64/org.deskflow.deskflow-symbolic.svg
+  DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/symbolic/apps/
 )
 
 # Install our metainfo
 install(
-  FILES ${MY_DIR}/org.deskflow.deskflow.metainfo.xml
-  DESTINATION share/metainfo/
+  FILES ${MY_DIR}/${CMAKE_PROJECT_REV_FQDN}.metainfo.xml
+  DESTINATION ${CMAKE_INSTALL_DATADIR}/metainfo/
 )
 
 # Prepare PKGBUILD for Arch Linux
@@ -31,9 +33,9 @@ configure_file(
   @ONLY
 )
 
-
 set(CPACK_DEBIAN_PACKAGE_SECTION "utils")
 set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
+set(CPACK_DEBIAN_PACKAGE_RECOMMENDS "qt6-svg-plugins")
 set(CPACK_RPM_PACKAGE_LICENSE "GPLv2")
 set(CPACK_RPM_PACKAGE_GROUP "Applications/System")
 

deploy/linux/flatpak/org.deskflow.deskflow.yml

@@ -1,6 +1,6 @@
 app-id: org.deskflow.deskflow
 runtime: org.kde.Platform
-runtime-version: "6.9"
+runtime-version: "6.10"
 sdk: org.kde.Sdk
 command: deskflow
 finish-args:
@@ -17,7 +17,6 @@ cleanup:
   - /lib/cmake
   - /lib/pkgconfig
   - /share/pkgconfig
-  - /share/tomlplusplus
   - /share/cmake
   - /share/doc
   - /share/gir-1.0
@@ -30,8 +29,12 @@ modules:
         --prefix=${FLATPAK_DEST} --no-build-isolation Jinja2
     sources:
       - type: file
-        url: https://files.pythonhosted.org/packages/30/6d/6de6be2d02603ab56e72997708809e8a5b0fbfee080735109b40a3564843/Jinja2-3.1.3-py3-none-any.whl
-        sha256: 7d6d50dd97d52cbc355597bd845fabfbac3f551e1f99619e39a35ce8c370b5fa
+        url: https://files.pythonhosted.org/packages/62/a1/3d680cbfd5f4b8f15abc1d571870c5fc3e594bb582bc3b64ea099db13e56/jinja2-3.1.6-py3-none-any.whl
+        sha256: 85ece4451f492d0c13c5dd7c13a64681a86afae63a5f347908daf103ce6d2f67
+        x-checker-data:
+          type: pypi
+          name: Jinja2
+          packagetype: bdist_wheel
       - type: file
         url: https://files.pythonhosted.org/packages/87/5b/aae44c6655f3801e81aa3eef09dbbf012431987ba564d7231722f68df02d/MarkupSafe-2.1.5.tar.gz
         sha256: d283d37a890ba4c1ae73ffadf8046435c76e7bc2247bbb63c00bd1a709c6544b
@@ -46,8 +49,11 @@ modules:
     sources:
         - type: git
           url: https://gitlab.freedesktop.org/libinput/libei
-          tag: 1.4.1
-          commit: 9e0413cbc7d3ae6656266890425f152589ddf74d
+          tag: 1.5.0
+          commit: 19b64535408aa47abbc8151bc2c925afd6583851
+          x-checker-data:
+            type: git
+            tag-pattern: ^([\\d.]+)$
   - name: libportal
     buildsystem: meson
     config-opts:
@@ -63,29 +69,16 @@ modules:
         commit: 8f5dc8d192f6e31dafe69e35219e3b707bde71ce
       - type: patch
         path: libportal-qt69.patch
-  - name: cli11
-    buildsystem: cmake-ninja
-    config-opts:
-      - -DCLI11_BUILD_TESTS=OFF
-    sources:
-      - type: git
-        url: https://github.com/CLIUtils/CLI11
-        tag: v2.5.0
-        commit: 4160d259d961cd393fd8d67590a8c7d210207348
-  - name: tomlplusplus
-    buildsystem: cmake-ninja
-    sources:
-      - type: git
-        url: https://github.com/marzer/tomlplusplus
-        tag: v3.4.0
-        commit: 30172438cee64926dc41fdd9c11fb3ba5b2ba9de
   - name: gtest
     buildsystem: cmake-ninja
     sources:
       - type: git
         url: https://github.com/google/googletest.git
-        tag: v1.15.2
-        commit: b514bdc898e2951020cbdca1304b75f5950d1f59
+        tag: v1.17.0
+        commit: 52eb8108c5bdec04579160ae17225d66034bd723
+        x-checker-data:
+          type: git
+          tag-pattern: ^([\\d.]+)$
     cleanup:
       - '*'
   - name: deskflow

deploy/linux/org.deskflow.deskflow.desktop

@@ -11,3 +11,12 @@ Icon=org.deskflow.deskflow
 Terminal=false
 Categories=Utility;
 Keywords=keyboard;mouse;sharing;network;share;
+Name[zh_CN]=Deskflow
+Comment[zh_CN]=键鼠共享工具
+Keywords[zh_CN]=键盘;鼠标;网络;共享;
+Name[ru]=Deskflow
+Comment[ru]=Приложения чтобы использовать одну мышку и клавиатуру с разными устройствами
+Keywords[ru]=Передача;Трансляция;barrier;input-leap;
+Name[ko]=Deskflow
+Comment[ko]=마우스 및 키보드 공유 유틸리티
+Keywords[ko]=키보드;마우스;공유;네트워크;

deploy/linux/org.deskflow.deskflow.metainfo.xml

@@ -8,10 +8,18 @@
 		<name>Deskflow Developers</name>
 	</developer>
 	<summary>Software Keyboard and mouse sharing</summary>
+	<summary xml:lang="zh_CN">用软件共享键鼠</summary>
+	<summary xml:lang="ko">키보드 및 마우스 공유 소프트웨어</summary>
 	<description>
 		<p>
 			Use the keyboard, mouse, or trackpad of one computer to control nearby computers, and work seamlessly between them.
 		</p>
+		<p xml:lang="zh_CN">
+			使用一台计算机的键盘、鼠标或触控板来控制附近的其它计算机，并在它们之间无缝工作。
+		</p>
+		<p xml:lang="ko">
+			한 대의 컴퓨터에 연결된 키보드, 마우스 또는 트랙패드로 주변의 다른 컴퓨터를 제어하고, 컴퓨터 사이를 끊김 없이 오가며 작업할 수 있습니다.
+		</p>
 	</description>
 	<launchable type="desktop-id">org.deskflow.deskflow.desktop</launchable>
 	<url type="homepage">https://deskflow.org</url>
@@ -51,8 +59,12 @@
 		<category>Utility</category>
 	</categories>
 	<keywords>
-		<keyword translate="no">Input</keyword>
-		<keyword translate="no">Sharing</keyword>
+		<keyword>Input</keyword>
+		<keyword xml:lang="zh_CN">输入</keyword>
+		<keyword xml:lang="ko">입력</keyword>
+		<keyword>Sharing</keyword>
+		<keyword xml:lang="zh_CN">共享</keyword>
+		<keyword xml:lang="ko">공유</keyword>
 		<keyword translate="no">KVM</keyword>
 		<keyword translate="no">Synergy</keyword>
 	</keywords>
@@ -62,6 +74,75 @@
 	</branding>
 	<content_rating type="oars-1.0" />
 	<releases>
+		<release version="1.26.0" date="2026-02-16" urgency="high">
+			<description>
+				<p>This stable release fixes known issues and adds a few new features, For the full changelog, see the release page.</p>
+				<ul>
+					<li>New: Korean(ko) translation</li>
+					<li>New: Option to start in the "locked to computer" state</li>
+					<li>New: Option to show the version in the windows title</li>
+					<li>New: Clients can now use a list hostnames or ips for the server address</li>
+					<li>New: Client options are in a new client configuration dialog</li>
+					<li>New: Provide a more accurate suggested IP, Update as network info changes if needed.</li>
+					<li>New: Add a simple search to the log</li>
+					<li>New: Lookup host name with IP4 or IP6</li>
+					<li>New: Replace broken scroll speed with a scroll scaling options</li>
+					<li>Fix: Horizontal scrolling is working again on all platforms</li>
+					<li>Fix: Key repeat events are now sent as repeat not press and release</li>
+					<li>Fix: Deskflow-core correctly blocks new instances when run without the `--new-instance` option</li>
+					<li>Fix: Server Mode, Only use the external config path if the option is enabled</li>
+					<li>Fix: Allow comma and semicolon to be used in the hotkey configuration</li>
+					<li>Fix: Gui can crash when clearing settings in debug mode</li>
+					<li>Fix: Mouse Back and Forward buttons are now working (again) on all platforms</li>
+					<li>Fix: macOS, crash when the log is opened and the gui minimized</li>
+					<li>Fix: macOS, restore Preferences menu entry when the application is using non english language</li>
+					<li>Fix: macOS, try icon was not showing when in `Colorful` mode</li>
+					<li>Fix: macOS, do not allow the os to kill deskflow for memory reasons</li>
+					<li>Fix: macOS, possible server crash when a client disconnects abruptly</li>
+					<li>Fix: macOS, possible crash on screen wake / screen saver activation</li>
+					<li>Fix: macOS, Wrong keys send when using "RIME" input method</li>
+					<li>Fix: Windows, possible crash when the daemon is started for the first time</li>
+					<li>Use `Computer` in place of `Screen` to indicate we work with Computers display layout and not individual screens attached</li>
+					<li>Clean and update the settings when starting up.</li>
+					<li>Do not show client connection error messages dialogs if the gui is hidden</li>
+					<li>Use Qt 6.9.3 for Intel Mac builds.</li>
+					<li>Windows: Use ICU dlls from the host system</li>
+					<li>Code continues to be cleaned of unused methods and updated to modern C++</li>
+					<li>Consolidate Debug levels to remove DEBUG3-5 levels</li>
+				</ul>
+			</description>
+			<url>https://github.com/deskflow/deskflow/releases/tag/v1.26.0</url>
+		</release>
+		<release version="1.25.0" date="2025-11-21" urgency="high">
+			<description>
+				<p>This stable release fixes known issues and adds a few new features. Most notable symbolic icon support, I18N support and experimental support for wl-clipboard to access clipboards on wayland. This release also continues our trend of cleaning up the codebase. For the full changelog, see the release page.</p>
+				<ul>
+					<li>Removed the ability to use toml config and env based config files</li>
+					<li>Set XDG app ID (app_id) on Wayland</li>
+					<li>Support symbolic icon deployment and recoloring</li>
+					<li>Added Spanish translation</li>
+					<li>Added Italian translation</li>
+					<li>Added Japanese translation</li>
+					<li>Added Simplified Chinese translation</li>
+					<li>Added Russian translation</li>
+					<li>Translate the GUI without needed to restart the application</li>
+					<li>Expose setting to adjust clients scroll speed</li>
+					<li>Expose setting to show the GUI debug messages in the log</li>
+					<li>Expose setting to allow use of wl-clipboard backend on Wayland</li>
+					<li>Fixed the port settings not being used from settings</li>
+					<li>Save the geometry info into a state file</li>
+					<li>The Core (deskflow-core) has a new CLI interface</li>
+					<li>Fixed Wayland sleep inhibit on client</li>
+					<li>Fixed XWindowsScreen: properly calculate xrandr/xinerama screens</li>
+					<li>Fixed XWindowsScreen: stop centering panned screens on client when leaving the screen</li>
+					<li>Fixed stop retying to launch the Core if its crashed</li>
+					<li>Fixed various input issues</li>
+					<li>Fixed apply scroll lock setting on initialization</li>
+					<li>Fixed crash caused by hostnames with invalid characters returned default value</li>
+				</ul>
+			</description>
+			<url>https://github.com/deskflow/deskflow/releases/tag/v1.25.0</url>
+		</release>
 		<release version="1.24.0" date="2025-09-11" urgency="high">
 			<description>
 				<p>This stable release fixes issues found in the previous version and adds a few new features. This release also uses more C++20 features. For the full changelog, see the release page.</p>

deploy/mac/deploy.cmake

@@ -1,20 +1,23 @@
-# SPDX-FileCopyrightText: 2024 Chris Rizzitello <sithlord48@gmail.com>
+# SPDX-FileCopyrightText: (C) 2024 Chris Rizzitello <sithlord48@gmail.com>
 # SPDX-License-Identifier: MIT
 
 # HACK This is set when the files is included so its the real path
 # calling CMAKE_CURRENT_LIST_DIR after include would return the wrong scope var
 set(MY_DIR ${CMAKE_CURRENT_LIST_DIR})
-
-install(CODE "execute_process(COMMAND
-  ${DEPLOYQT}
-  \"\${CMAKE_INSTALL_PREFIX}/${CMAKE_PROJECT_PROPER_NAME}.app\"
-  -timestamp -codesign=-
-)")
+set(OSX_BUNDLE ${BUILD_OSX_BUNDLE})
 
 set(OS_STRING "macos-${BUILD_ARCHITECTURE}")
-set(CPACK_PACKAGE_ICON "${MY_DIR}/dmg-volume.icns")
-set(CPACK_DMG_BACKGROUND_IMAGE "${MY_DIR}/dmg-background.tiff")
-set(CPACK_DMG_DS_STORE_SETUP_SCRIPT "${MY_DIR}/generate_ds_store.applescript")
-set(CPACK_DMG_VOLUME_NAME "${CMAKE_PROJECT_PROPER_NAME}")
-set(CPACK_DMG_SLA_USE_RESOURCE_FILE_LICENSE ON)
-set(CPACK_GENERATOR "DragNDrop")
+
+if (OSX_BUNDLE)
+  install(CODE "execute_process(COMMAND
+    ${DEPLOYQT}
+    \"\${CMAKE_INSTALL_PREFIX}/${CMAKE_PROJECT_PROPER_NAME}.app\"
+    -timestamp -codesign=-
+  )")
+  set(CPACK_PACKAGE_ICON "${MY_DIR}/dmg-volume.icns")
+  set(CPACK_DMG_BACKGROUND_IMAGE "${MY_DIR}/dmg-background.tiff")
+  set(CPACK_DMG_DS_STORE_SETUP_SCRIPT "${MY_DIR}/generate_ds_store.applescript")
+  set(CPACK_DMG_VOLUME_NAME "${CMAKE_PROJECT_PROPER_NAME}")
+  set(CPACK_DMG_SLA_USE_RESOURCE_FILE_LICENSE ON)
+  set(CPACK_GENERATOR "DragNDrop")
+endif()

deploy/windows/cpack-options.cmake.in

@@ -1,4 +1,4 @@
-#SPDX-FileCopyrightText: 2025 Chris Rizzitello <sithlord48@gmail.com>
+#SPDX-FileCopyrightText: (C) 2025 Chris Rizzitello <sithlord48@gmail.com>
 #SPDX-License-Identifier: MIT
 
 if(CPACK_GENERATOR MATCHES 7Z|ZIP)

deploy/windows/deploy.cmake

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2024 Chris Rizzitello <sithlord48@gmail.com>
+# SPDX-FileCopyrightText: (C) 2024 Chris Rizzitello <sithlord48@gmail.com>
 # SPDX-License-Identifier: MIT
 
 # HACK This is set when the files is included so its the real path
@@ -6,7 +6,7 @@
 set(MY_DIR ${CMAKE_CURRENT_LIST_DIR})
 
 set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE)
-set(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION .)
+set(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION ${CMAKE_INSTALL_LIBDIR})
 include(InstallRequiredSystemLibraries)
 
 configure_file(${MY_DIR}/pre-cpack.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/pre-cpack.cmake @ONLY)

deploy/windows/pre-cpack.cmake.in

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2025 Chris Rizzitello <sithlord48@gmail.com>
+# SPDX-FileCopyrightText: (C) 2025 Chris Rizzitello <sithlord48@gmail.com>
 # SPDX-License-Identifier: MIT
 
 if(CPACK_GENERATOR MATCHES 7Z|ZIP)

doc/CMakeLists.txt

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2019 - 2025 Chris Rizzitello <sithlord48@gmail.com>
+# SPDX-FileCopyrightText: (C) 2019 - 2025 Chris Rizzitello <sithlord48@gmail.com>
 # SPDX-License-Identifier: MIT
 
 find_package(Doxygen QUIET)
@@ -12,6 +12,8 @@ if (DOXYGEN_FOUND)
   set(DOXYGEN_STRIP_FROM_PATH ${CMAKE_SOURCE_DIR})
   set(DOXYGEN_QUIET YES)
   set(DOXYGEN_PROJECT_NAME ${CMAKE_PROJECT_PROPER_NAME})
+  set(DOXYGEN_PROJECT_ICON "${CMAKE_CURRENT_SOURCE_DIR}/deskflow-logo.png")
+  set(DOXYGEN_PROJECT_LOGO "${CMAKE_CURRENT_SOURCE_DIR}/deskflow-logo.png")
 
   if (BUILD_USER_DOCS)
     add_subdirectory(user)

doc/dev/CMakeLists.txt

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2025 Chris Rizzitello <sithlord48@gmail.com>
+# SPDX-FileCopyrightText: (C) 2025 Chris Rizzitello <sithlord48@gmail.com>
 # SPDX-License-Identifier: MIT
 
 set(DOXYGEN_USE_MDFILE_AS_MAINPAGE mainpage.md)

doc/dev/build.md

@@ -7,76 +7,104 @@ To build Deskflow you will a minimum of:
     - [libportal] 0.8+ (linux, bsd)
     - [libei] 1.3+ (linux, bsd)
     - [google_test] ^
-    - [tomlplusplus] ^
-    - [cli11] ^
 
 > ^ Will be fetched if not found on the host system.
 
 By default a build of Deskflow will: 
-     - The GUI application deskflow
-     - The Core application deskflow-core
+     - The GUI application `deskflow`
+     - The Core application `deskflow-core`
      - Documentation if [doxygen] was found on your system
-     - Tests that will be run as part of the build process.
+     - Tests that will be run as part of the build process
 
 ## Configuration
-Deskflow supports the following build options
 
-CMake options:
+Deskflow supports the following CMake options:
+
 |         Option           |            Description                  |   Default Value    | Additional requirements |
 :-------------------------:|:---------------------------------------:|:------------------:|:-----------------------:|
-| BUILD_GUI                | Build GUI                               | ON                 | |
 | BUILD_USER_DOCS          | Build user documentation                | DOXYGEN_FOUND      | `Doxygen` |
 | BUILD_DEV_DOCS           | Build development documentation         | OFF                | `Doxygen` |
 | BUILD_INSTALLER          | Build installers/packages               | ON                 | |
 | BUILD_TESTS              | Build unit tests and legacy tests       | ON                 | `gtest`|
+| BUILD_X11_SUPPORT        | Build X11 backend (Linux and BSD only)  | ON                 | `x11 libs`|
+| BUILD_OSX_BUNDLE         | Build an app bundle (macOS only)        | ON                 | |
 | ENABLE_COVERAGE          | Enable test coverage                    | OFF                | `gcov` |
 | SKIP_BUILD_TESTS         | Skip running of tests at build time     | OFF                | |
-| VCPKG_QT                 | Build Qt w/ vcpkg (windows only)        | OFF                | |
+| VCPKG_QT                 | Build Qt w/ vcpkg (Windows only)        | OFF                | |
+| CLEAN_TRS                | Remove obsolete strings from tr files   | OFF                | |
+| APPLE_CODESIGN_DEV       | Apple codesign cert ID for development  | Not set            | | 
 
-Example cmake configuration.
+Example cmake configuration:
 `cmake -S. -Bbuild -DCMAKE_INSTALL_PREFIX=<INSTALLPREFIX>`
 
 ### Windows Configuration
+
  It is recommended to use vcpkg to install the dependencies. The first time you configure Deskflow, all dependencies other than Qt will be built. If you don't want to use vcpkg, you must manually setup the dependencies. However, that will not be covered by this document.
  
 #### Windows and Qt
+
  There are two ways you can install [Qt] on Windows (vcpkg or Qt online installer). The default configuration expects you to use the Qt online installer. You should not install Qt in both ways, as having both can cause some weird things to happen, like Qt getting libs from one install and plugins from the other. When switching between them, remove the previous install first.
  
 ##### System Qt
 
  1. Download and install the [Qt] online installer from their website.
- 2. Add the path of Qt's cmake files to your system path. (Skipping this may require you provide this path to cmake via `Qt6_DIR` at configure time)
-   - Often `C:\Qt\<version>\<msvcinfo>\lib\cmake`
+ 2. Add the path of Qt's cmake files to your system path (skipping this may require you provide this path to cmake via `Qt6_DIR` at configure time).
+   - Often: `C:\Qt\<version>\<msvcinfo>\lib\cmake`
  3. Add the path of Qt's binary tools to your system path.
-   - Often `C:\Qt\<version>\<msvcinfo>\bin`
+   - Often: `C:\Qt\<version>\<msvcinfo>\bin`
+
+##### vcpkg managed Qt
 
-##### Vcpkg managed Qt
  1. Add the option `-DVCPKG_QT=ON` to your cmake configuration command (i.e `cmake -S. -Bbuild -DVCPKG_QT=ON ...`) or if using an IDE, look for the option where you configure the project, have the IDE run cmake again.
  2. Once the configuration starts, you should see a lot more packages vcpkg will build. Building Qt takes a long time (potentially hours), so go find something else to do for a while.
  3. If you want to use the system Qt again, you must delete the `vcpkg.json` generated in the project root and the `build` folder and reconfigure the project from scratch.
 
+
+### macOS codesign
+
+The code signing option `APPLE_CODESIGN_DEV` is only for local development and not intended for distributed bundles. 
+
+Signing for local development and signing for the distribution bundle must be different because of development entitlements which are unlikely to be safe for use in production. It is impractical (i.e. very slow and cumbersome) to use the distribution bundle for local development. When developing locally, the app bundle is partial and does not contain dependencies and uses external libs, e.g. installed with Homebrew; the entitlements allow those external libs to be loaded which is not allowed by default.
+
+For development codesign:
+
+1. Install Xcode
+2. Go to Settings -> Accounts
+3. Add your account (requires a free Apple Developer ID)
+4. Manage certificates -> Add -> Apple Development
+5. To get your ID, run: `security find-identity -v -p codesigning login.keychain-db`
+6. Pass the ID to CMake, e.g. `-DAPPLE_CODESIGN_DEV=Apple Development: bob@exmaple.com (KLGSJHLFXY)`
+7. Configure and build
+8. To verify, run: `codesign -d -r- build/bin/Deskflow.app`
+
 ## Build
+
 After configuring you should be able to run make to build all targets.
 
 `cmake --build build`
 
 ## Install
- To test installation run `DESTDIR=<installDIR> cmake --install build` to install into `<installDir>/<CMAKE_INSTALL_PREFIX>` <br>
+
+ To test installation run `DESTDIR=<installDIR> cmake --install build` to install into `<installDir>/<CMAKE_INSTALL_PREFIX>`
+
  Running `cmake --install build` will install to the `CMAKE_INSTALL_PREFIX`
 
 ## Making Deskflow packages
- Deskflow can generate several packages using cpack.
- To generate packages build the `package` or `package_source` target.
- Example: ` cmake --build build --target package package_source` would generate both package and package source packages.
- Deskflow can generate several package types depending on the system. Archive-based packages should work on all platforms. On Linux deb and rpm info is set up, flatpaks can be generated from the included file in deploy/linux and a PKGBUILD for Arch linux is generated in the build folder. On macos a dmg file will be created and signed. For windows wix can be used to create an installer.
 
+ Deskflow can generate several packages using `cpack`.
+ 
+ To generate packages build the `package` or `package_source` target.
+
+ Example: ` cmake --build build --target package package_source` would generate both package and package source packages.
+ 
+ Deskflow can generate several package types depending on the system. 
+ 
+ Archive-based packages should work on all platforms. On Linux deb and rpm info is set up, Flatpaks can be generated from the included file in deploy/linux and a `PKGBUILD` for Arch linux is generated in the build folder. On macos a dmg file will be created and signed. For windows WiX can be used to create an installer.
  
 [Qt]:https://www.qt.io
 [doxygen]:http://www.stack.nl/~dimitri/doxygen/
 [cmake]:https://cmake.org/
 [openssl]:https://www.openssl.org/
 [google_test]:https://github.com/google/googletest
-[tomlplusplus]:https://github.com/marzer/tomlplusplus
-[cli11]:https://github.com/CLIUtils/CLI11
 [libei]:https://gitlab.freedesktop.org/libinput/libei
 [libportal]:https://github.com/flatpak/libportal

doc/user/CMakeLists.txt

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2025 Chris Rizzitello <sithlord48@gmail.com>
+# SPDX-FileCopyrightText: (C) 2025 Chris Rizzitello <sithlord48@gmail.com>
 # SPDX-License-Identifier: MIT
 
 set(DOXYGEN_USE_MDFILE_AS_MAINPAGE mainpage.md)

doc/user/configuration.md

@@ -56,24 +56,27 @@ It will begin with `[client]`
 | binary                | Filename           | The filename of the binary to call for client mode. This binary exists in the same path as the GUI |
 | invertScrollDirection | `true` or `false`  | Invert scroll on this client [default: false] |
 | languageSync          | `true` or `false`  | Sync to server language [default: true] |
-| remoteHost            | `IP` or `hostname` | The remote host last connected to | 
+| remoteHost            | `IP` or `hostname` | The remote host(s) to connect to. Use a comma seperated list when you want to try severial hosts |
+| yScrollScale          | Double 0.1 - 10.0  | Mouse scrolling will be scaled by this amount on the client [default: 1.0] |
 | xdpRestoreToken       | UUID               | Restore token provided by XDG portals |
 
-
 ### Core
+
 This section contains general options it will begin with `[core]`
 
 |Option         | Valid Values|Description|
 |:--------------|:-----------:|:-----------|
 | coreMode      | `0` or `1` or `2` | The mode to start in 0: None, 1: Client, 2: Server [default: 0]|
+| display       |  int              | The XWindow display to use [default: autodetected] |
 | interface     | IP Address        | Preferred IP to use for network communication. By default the server board casts on any available address |
 | lastVersion   | M.m.p.t           | The version last run used for checking for updates |
 | port          | port #            | Port to use when connecting [default: 24800 |
 | preventSleep  | `true` or `false` | Prevent sleep when Deskflow is active [default: false] |
 | processMode   | `1` or `0`        | The mode we use to start the process Service or Desktop |
-| screenName    | string            | Name used to identify the screen [default: machine's hostname] |
-| startedBefore | `true` or `false `| Have we started client or server before. Used in logic when deciding to show some dialogs.
-| updateUrl     | URL               | The URL to use when checking for a new version number, it should return a version [default: https://api.deskflow.org/version]|
+| computerName  | string            | Name used to identify the computer [default: machine's hostname] |
+| useHooks      | `true` or `false` | If Windows uses hooks or not [default: true] |
+| language      | 639 language      | The language to display the GUI in [default: en] |
+| wlClipboard   | `true` or `false` | When true the wl-clipboard backend will be enabled [default: false] |
 
 ### Daemon
 
@@ -90,25 +93,32 @@ This section contains options used by the daemon on windows it will begin with `
 
 This section contains options used by the GUI it will begin with `[gui]`
 
-|Option             | Valid Values      |Description|
-|:------------------|:-----------------:|:-----------|
-| autoHide          | `true` or `false` | When true the app will hide itself on start up [default: false] |
-| enableUpdateCheck | `true` or `false` | When true check the update URL to see if a new version was released on start up [default: false] |
-| closeReminder     | `true` or `false` | Used to track if we have shown the reminder that when you close the app it remain running in the background  [default: true]|
-| logExpanded       | `true` or `false` | Should the log section of the GUI be opened [default: false] |
-| symbolicTrayIcon  | `true` or `false` | When true use the monocolor (symbolic) icon false uses a colorful icon for the tray |
-| windowGeometry    | QRect             | Geometry of the window used to restore the window geometry after exiting the app |
+|Option                          | Valid Values      |Description|
+|:-------------------------------|:-----------------:|:-----------|
+| autoHide                       | `true` or `false` | When true the app will hide itself on start up [default: false] |
+| enableUpdateCheck              | `true` or `false` | When true check the update URL to see if a new version was released on start up [default: false] |
+| closeReminder                  | `true` or `false` | Used to track if we have shown the reminder that when you close the app it remain running in the background  [default: true]|
+| closeToTray                    | `true` or `false` | When `true` the gui will run in the systemTray when its closed [default: true] |
+| logExpanded                    | `true` or `false` | Should the log section of the GUI be opened [default: false] |
+| symbolicTrayIcon               | `true` or `false` | When true use the monocolor (symbolic) icon false uses a colorful icon for the tray [default: true] |
+| windowGeometry                 | QRect             | Geometry of the window used to restore the window geometry after exiting the app |
+| showGenericClientFailureDialog | `true` or `false` | When `true` client connection errors will not show popup error messages [default: true] |
+| shownFirstConnectedMessage     | `true` or `false` | When `true` GUI has shown the user the message for connecting the first time [default: false] |
+| shownServerFirstStartMessage   | `true` or `false` | When `true` GUI has shown the user the Deskflow server is now running message [default: false] |
+| shownVerionInTitle             | `true` or `false` | When `true` GUI will include the version in the window title [default: false] |
+| startCoreWithGui               | `true` or `false` | When true the Core will be started with the GUI. It is set to the Core's state on exit. |
+| updateCheckUrl                 | URL               | The URL to use when checking for a new version number, it should return a version [default: https://api.deskflow.org/version]|
 
 ### Log
 
 This section contains options used by the application logging it will begin with `[log]`
 
-|Option |    Valid Values   |Description|
-|:------|:-----------------:|:-----------|
-| file   | Filepath          | The file to write the log into |
-| level  | Valid log level   | Log level to use |
-| toFile | `true` or `false` | When true the log will be written to the value of the `file` option |
-
+|Option    |    Valid Values   |Description|
+|:---------|:-----------------:|:-----------|
+| file     | Filepath          | The file to write the log into |
+| level    | Valid log level   | Log level to use |
+| toFile   | `true` or `false` | When true the log will be written to the value of the `file` option |
+| guiDebug | `true` or `false` | When true the log will show the Gui's internal debug messages |
 
 ### Security
 
@@ -127,8 +137,6 @@ This section contains options used when in server mode it will begin with `[serv
 
 |Option              |    Valid Values   |Description|
 |:-------------------|:-----------------:|:-----------|
-| binary             | Filename          | The name of the binary to call for client mode. This binary exists in same path as the Deskflow GUI |
-| configVisible      | `true` or `false` | Used internally to track when the severs has a configuration dialog showing.|
 | externalConfig     | `true` or `false` | When true use the external config path |
 | externalConfigFile | Filepath          | Path the server config file if it does not exist the GUI will it generated based on the `internalConfig` section.|
 
@@ -141,6 +149,7 @@ block of a server config file as seen below. This section is used by the GUI to
 [internalConfig]
 clipboardSharing=true
 clipboardSharingSize=@Variant(\0\0\0\x84\0\0\0\0\0\0<\0)
+defaultLockToScreenState=false
 disableLockToScreen=false
 hasHeartbeat=false
 hasSwitchDelay=false
@@ -290,7 +299,7 @@ The file is parsed top to bottom and names cannot be used before they've been de
 
 ### The screens section
 
-''args'' is a list of screen names, one name per line, each followed by a colon. Names are arbitrary strings but they must be unique. The hostname of each computer is recommended. (This is the computer's network name on win32 and the name reported by the program hostname on Unix and OS X. Note that OS X may append .local to the name you gave your computer; e.g. somehost.local.) There must be a screen name for the server and each client. Each screen can specify a number of options. Options have the form name = value and are listed one per line after the screen name.
+''args'' is a list of computer names, one name per line, each followed by a colon. Names are arbitrary strings but they must be unique. The hostname of each computer is recommended. (This is the computer's network name on win32 and the name reported by the program hostname on Unix and OS X. Note that OS X may append .local to the name you gave your computer; e.g. somehost.local.) There must be a computer name for the server and each client. Each computer can specify a number of options. Options have the form name = value and are listed one per line after the computer name.
 
 ```
 section: screens
@@ -303,29 +312,29 @@ section: screens
 end
 ```
 
-This declares three screens named ''moe'', ''larry'', and ''curly''. Screen ''larry'' has half-duplex ''Caps Lock'' and ''Num Lock'' keys (see below) and screen ''curly'' converts the ''Meta'' modifier key to the ''Alt'' modifier key.
+This declares three computers named ''moe'', ''larry'', and ''curly''. Computer ''larry'' has half-duplex ''Caps Lock'' and ''Num Lock'' keys (see below) and computer ''curly'' converts the ''Meta'' modifier key to the ''Alt'' modifier key.
 
 #### screen options
 
-A screen can have the following options:
+A computer can have the following options:
 |Option | Valid Values| Description|
 |:----------|:-----------:|:-----------|
-|halfDuplexCapsLock| `true` or `false` | This computer has a ''Caps Lock'' key that doesn't report a press and a release event when the user presses it but instead reports a press event when it's turned on and a release event when it's turned off. If ''Caps Lock'' acts strangely on all screens then you may need to set this option to true on the server screen. If it acts strangely on one screen then that screen may need the option set to true.|
-|halfDuplexNumLock | `true` or `false` | This computer has a ''Num Lock'' key that doesn't report a press and a release event when the user presses it but instead reports a press event when it's turned on and a release event when it's turned off. If ''Num Lock'' acts strangely on all screens then you may need to set this option to true on the server screen. If it acts strangely on one screen then that screen may need the option set to true.|
-|halfDuplexScrollLock| `true` or `false`| This computer has a ''Scroll Lock'' key that doesn't report a press and a release event when the user presses it but instead reports a press event when it's turned on and a release event when it's turned off. If ''Scroll Lock'' acts strangely on all screens then you may need to set this option to true on the server screen. If it acts strangely on one screen then that screen may need the option set to true.|
+|halfDuplexCapsLock| `true` or `false` | This computer has a ''Caps Lock'' key that doesn't report a press and a release event when the user presses it but instead reports a press event when it's turned on and a release event when it's turned off. If ''Caps Lock'' acts strangely on all computers then you may need to set this option to true on the server. If it acts strangely on one computer then that computer may need the option set to true.|
+|halfDuplexNumLock | `true` or `false` | This computer has a ''Num Lock'' key that doesn't report a press and a release event when the user presses it but instead reports a press event when it's turned on and a release event when it's turned off. If ''Num Lock'' acts strangely on all computers then you may need to set this option to true on the server. If it acts strangely on one computer then that computer may need the option set to true.|
+|halfDuplexScrollLock| `true` or `false`| This computer has a ''Scroll Lock'' key that doesn't report a press and a release event when the user presses it but instead reports a press event when it's turned on and a release event when it's turned off. If ''Scroll Lock'' acts strangely on all computers then you may need to set this option to true on the server. If it acts strangely on one computer then that computer may need the option set to true.|
 |xtestIsXineramaUnaware| `true` or `false`| This option works around a bug in the XTest extension when used in combination with Xinerama. It affects X11 clients only. Not all versions of the XTest extension are aware of the Xinerama extension. As a result, they do not move the mouse correctly when using multiple Xinerama screens. This option is currently ''true'' by default. If you know your XTest extension is Xinerama aware then set this option to ''false''.|
-|preserveFocus| `true` or `false` | When true don't drop focus when switching screens
+|preserveFocus| `true` or `false` | When true don't drop focus when switching computers
 |switchCorners| corners |See <a href="#switch-corners">switchCorners</a> below.|
 |switchCornerSize | integer | see switchCornerSize below.|
-|shift | shift ctrl alt meta super none | Map the server's shift modifer to different key on a client screen|
-|ctrl  | shift ctrl alt meta super none | Map the server's ctrl modifer to different key on a client screen|
-|alt | shift ctrl alt meta super none | Map the server's alt modifer to different key on a client screen|
-|meta|  shift ctrl alt meta super none | Map the server's meta modifer to different key on a client screen|
-|super|  shift ctrl alt meta super none | Map the server's super modifer to different key on a client screen|
+|shift | shift ctrl alt meta super none | Map the server's shift modifer to different key on a client computer|
+|ctrl  | shift ctrl alt meta super none | Map the server's ctrl modifer to different key on a client computer|
+|alt | shift ctrl alt meta super none | Map the server's alt modifer to different key on a client computer|
+|meta|  shift ctrl alt meta super none | Map the server's meta modifer to different key on a client computer|
+|super|  shift ctrl alt meta super none | Map the server's super modifer to different key on a client computer|
 
 ### aliases section
 
-''args'' is a list of screen names just like in the ''screens'' section except each screen is followed by a list of aliases, one per line, not followed by a colon. An ''alias'' is a screen name and must be unique. During screen name lookup each alias is equivalent to the screen name it aliases. So a client can connect using its canonical screen name or any of its aliases.
+''args'' is a list of computer names just like in the ''screens'' section except each computer is followed by a list of aliases, one per line, not followed by a colon. An ''alias'' is a computer name and must be unique. When searching for computers each alias is equivalent to the computer name it aliases. So a client can connect using its canonical computer name or any of its aliases.
 
 ```
 section: aliases
@@ -336,20 +345,20 @@ section: aliases
 end
 ```
 
-Screen ''larry'' is also known as ''larry.stooges.com'' and can connect as either name. Screen ''curly'' is also known as ''shemp'' (hey, it's just an example).
+Computer ''larry'' is also known as ''larry.stooges.com'' and can connect as either name. Computer ''curly'' is also known as ''shemp'' (hey, it's just an example).
 
 ### links secion
 
-''args'' is a list of screen names just like in the ''screens'' section except each screen is followed by a list of links, one per line. Each link has the form:
+''args'' is a list of computer names just like in the ''screens'' section except each computer is followed by a list of links, one per line. Each link has the form:
 ```
  {left|right|up|down}[<range>] = name[<range>]
 ```
 
-A link indicates which screen is adjacent in the given direction.
+A link indicates which computer is adjacent in the given direction.
 
-Each side of a link can specify a range which defines a portion of an edge. A range on the direction is the portion of edge you can leave from while a range on the screen is the portion of edge you'll enter into. Ranges are optional and default to the entire edge. All ranges on a particular direction of a particular screen must not overlap.
+Each side of a link can specify a range which defines a portion of an edge. A range on the direction is the portion of edge you can leave from while a range on the computer is the portion of edge you'll enter into. Ranges are optional and default to the entire edge. All ranges on a particular direction of a particular computer must not overlap.
 
-A ''range'' is written as <code>(start,end)</code>. Both ''start'' and ''end'' are percentages in the range 0 to 100, inclusive. The start must be less than the end. 0 is the left or top of an edge and 100 is the right or bottom.
+A ''range'' is written as <code>(start,end)</code>. Both ''start'' and ''end'' are percentages in the range 0 to 100, inclusive. The start must be less than the end. 0 is the left or top of an edge and 100 is the right or bottom. 
 
 ```
 section: links
@@ -365,9 +374,9 @@ section: links
 end
 ```
 
-This indicates that screen ''larry'' is to the right of screen ''moe'' (so moving the cursor off the right edge of ''moe'' would make it appear at the left edge of ''larry''), the left half of curly is above the right half of ''moe'', ''moe'' is to the left of ''larry'' (edges are not necessarily symmetric so you have to provide both directions), the right half of curly is above the left half of ''larry'', all of ''moe'' is below the left half of ''curly'', and the left half of ''larry'' is below the right half of ''curly''.
+This indicates that computer ''larry'' is to the right of computer ''moe'' (so moving the cursor off the right edge of ''moe'' would make it appear at the left edge of ''larry''), the left half of curly is above the right half of ''moe'', ''moe'' is to the left of ''larry'' (edges are not necessarily symmetric so you have to provide both directions), the right half of curly is above the left half of ''larry'', all of ''moe'' is below the left half of ''curly'', and the left half of ''larry'' is below the right half of ''curly''.
 
-Note that links do not have to be symmetrical; for instance, here the edge between ''moe'' and ''curly'' maps to different ranges depending on if you're going up or down. In fact links don't have to be bidirectional. You can configure the right of ''moe'' to go to ''larry'' without a link from the left of ''larry'' to ''moe''. It's possible to configure a screen with no outgoing links; the cursor will get stuck on that screen unless you have a hot key configured to switch off of that screen.
+Note that links do not have to be symmetrical; for instance, here the edge between ''moe'' and ''curly'' maps to different ranges depending on if you're going up or down. In fact links don't have to be bidirectional. You can configure the right of ''moe'' to go to ''larry'' without a link from the left of ''larry'' to ''moe''. It's possible to configure a computer with no outgoing links; the cursor will get stuck on that computer unless you have a hot key configured to switch off of that computer.
 
 ### options section
 
@@ -387,17 +396,17 @@ end
 |:--------|:-----------:|:-----------|
 |protocol | barrier or synergy| The protocol to use when saying hello to clients. Can be set to barrier or synergy. If not set barrier is used as the default |
 |heartbeat| integer (N) | The server will expect each client to send a message no less than every `N` milliseconds. If no message arrives from a client within `3N` seconds the server forces that client to disconnect. If deskflow fails to detect clients disconnecting while the server is sleeping or vice versa, try using this option. |
-|switchCorners | none top-left top-right bottom-left bottom-right left right top bottom all | Deskflow won't switch screens when the mouse reaches the edge of the screen if it's in a listed corner. The size of all corners is given by the `switchCornerSize` option. The first name in the list is one of the above names and defines the initial set of corners. Subsequent names are prefixed with + or - to add the corner to or remove the corner from the set, respectively. For example: `all -left +top-left` starts will all corners, removes the left corners (top and bottom) then adds the top-left back in, resulting in the top-left, bottom-left and bottom-right corners.|
+|switchCorners | none top-left top-right bottom-left bottom-right left right top bottom all | Deskflow won't switch computers when the mouse reaches the edge of the computer if it's in a listed corner. The size of all corners is given by the `switchCornerSize` option. The first name in the list is one of the above names and defines the initial set of corners. Subsequent names are prefixed with + or - to add the corner to or remove the corner from the set, respectively. For example: `all -left +top-left` starts will all corners, removes the left corners (top and bottom) then adds the top-left back in, resulting in the top-left, bottom-left and bottom-right corners.|
 |switchCornerSize | integer (N) | Sets the size of all corners in pixels. The cursor must be within `N` pixels of the corner to be considered to be in the corner.|
-|switchDelay | integer| Deskflow won't switch screens when the mouse reaches the edge of a screen unless it stays on the edge for `N` milliseconds. This helps prevent unintentional switching when working near the edge of a screen.|
-|switchDoubleTap| integer(N) | Deskflow won't switch screens when the mouse reaches the edge of a screen unless it's moved away from the edge and then back to the edge within `N` milliseconds. With the option you have to quickly tap the edge twice to switch. This helps prevent unintentional switching when working near the edge of a screen.|
-|screenSaverSync| `true` or `false`| ''Note: Removed in v1.14.1'' If set to ''false'' then Deskflow won't synchronize screen savers. Client screen savers will start according to their individual configurations. The server screen saver won't start if there is input, even if that input is directed toward a client screen.|
-|relativeMouseMoves| `true` or `false`| If set to ''true'' then secondary screens move the mouse using relative rather than absolute mouse moves when and only when the cursor is locked to the screen (by ''Scroll Lock'' or a configured hot key). This is intended to make Deskflow work better with certain games. If set to ''false'' or not set then all mouse moves are absolute.|
+|switchDelay | integer| Deskflow won't switch computers when the mouse reaches edge of a computer unless it stays on the edge for `N` milliseconds. This helps prevent unintentional switching when working near an edge.|
+|switchDoubleTap| integer(N) | Deskflow won't switch computers when the mouse reaches the edge of a computer unless it's moved away from the edge and then back to the edge within `N` milliseconds. With the option you have to quickly tap the edge twice to switch. This helps prevent unintentional switching when working near the edge.|
+|screenSaverSync| `true` or `false`| ''Note: Removed in v1.14.1'' If set to ''false'' then Deskflow won't synchronize screen savers. Client screen savers will start according to their individual configurations. The server screen saver won't start if there is input, even if that input is directed toward a client computer.|
+|relativeMouseMoves| `true` or `false`| If set to ''true'' then secondary computers move the mouse using relative rather than absolute mouse moves when and only when the cursor is locked to the computer (by ''Scroll Lock'' or a configured hot key). This is intended to make Deskflow work better with certain games. If set to ''false'' or not set then all mouse moves are absolute.|
 |clipboardSharing| `true` or `false`|If set to ''true'' then clipboard sharing will be enabled and the ''clipboardSharingSize'' setting will be used. If set to false, then clipboard sharing will be disabled and the the ''clipboardSharingSize'' setting will be ignored.|
 |clipboardSharingSize| integer (N)| Deskflow will send a maximum of `N` kilobytes of clipboard data to another computer when the mouse transitions to that computer.|
 |win32KeepForeground | `true` or `false`| If set to ''true'' (the default), Deskflow will grab the foreground focus on a Windows server (thereby putting all other windows in the background) upon switching to a client. If set to ''false'', it will leave the currently foreground window in the foreground. Deskflow grabs the focus to avoid issues with other apps interfering with Deskflow's ability to read the hardware inputs. |
-|keystroke(key) | actions | Binds the ''key'' combination key to the given ''actions''. ''key'' is an optional list of modifiers (''shift'', ''control'', ''alt'', ''meta'' or ''super'') optionally followed by a character or a key name, all separated by + (plus signs). You must have either modifiers or a character/key name or both. See below for `valid key names` and `actions`. Keyboard hot keys are handled while the cursor is on the primary screen and secondary screens. Separate actions can be assigned to press and release.|
-|mousebutton(button) | actions| Binds the modifier and mouse button combination ''button'' to the given ''actions''. ''button'' is an optional list of modifiers (''shift'', ''control'', ''alt'', ''meta'' or ''super'') followed by a button number. The primary button (the left button for right handed users) is button 1, the middle button is 2, etc. Actions can be found below. Mouse button actions are not handled while the cursor is on the primary screen. You cannot use these to perform an action while on the primary screen. Separate actions can be assigned to press and release.|
+|keystroke(key) | actions | Binds the ''key'' combination key to the given ''actions''. ''key'' is an optional list of modifiers (''shift'', ''control'', ''alt'', ''meta'' or ''super'') optionally followed by a character or a key name, all separated by + (plus signs). You must have either modifiers or a character/key name or both. See below for `valid key names` and `actions`. Keyboard hot keys are handled while the cursor any computer. Separate actions can be assigned to press and release.|
+|mousebutton(button) | actions| Binds the modifier and mouse button combination ''button'' to the given ''actions''. ''button'' is an optional list of modifiers (''shift'', ''control'', ''alt'', ''meta'' or ''super'') followed by a button number. The primary button (the left button for right handed users) is button 1, the middle button is 2, etc. Actions can be found below. Mouse button actions are not handled while the cursor is on the server. You cannot use these to perform an action while on the server. Separate actions can be assigned to press and release.|
 
 
 You can use both the ''switchDelay'' and ''switchDoubleTap'' options at the same time. Deskflow will switch when either requirement is satisfied.
@@ -406,16 +415,16 @@ You can use both the ''switchDelay'' and ''switchDoubleTap'' options at the same
 
 Actions are two lists of individual actions separated by commas. The two lists are separated by a '';'' (semicolon). Either list can be empty and if the second list is empty then the semicolon is optional. The first list lists actions to take when the condition becomes true (e.g. the hot key or mouse button is pressed) and the second lists actions to take when the condition becomes false (e.g. the hot key or button is released). The condition becoming true is called activation and becoming false is called deactivation. Allowed individual actions are:
 
-* `keystroke(key[,screens])`
+* `keystroke(key[,computers])`
 
-* `keyDown(key[,screens])`
+* `keyDown(key[,computers])`
 
-* `keyUp(key[,screens])`
+* `keyUp(key[,computers])`
 
 
-: Synthesizes the modifiers and key given in ''key'' which has the same form as described in the ''keystroke'' option. If given, ''screens'' lists the screen or screens to direct the event to, regardless of the active screen. If not given then the event is directed to the active screen only.
+: Synthesizes the modifiers and key given in ''key'' which has the same form as described in the ''keystroke'' option. If given, ''computers'' lists the computer or computers to direct the event to, regardless of the active computer. If not given then the event is directed to the active computer only.
 : ''keyDown'' synthesizes a key press and ''keyUp'' synthesizes a key release. ''keystroke'' synthesizes a key press on activation and a release on deactivation and is equivalent to a ''keyDown'' on activation and ''keyUp'' on deactivation.
-: ''screens'' is either ''*'' (asterisk) to indicate all screens or a '':'' (colon) separated list of screen names. (Note that the screen name must have already been encountered in the configuration file so you'll probably want to put ''actions'' at the bottom of the file.)
+: ''computers'' is either ''*'' (asterisk) to indicate all computers or a '':'' (colon) separated list of computer names. (Note that the computer name must have already been encountered in the configuration file so you'll probably want to put ''actions'' at the bottom of the file.)
 
 * `mousebutton(button)`
 * `mouseDown(button)`
@@ -424,16 +433,16 @@ Actions are two lists of individual actions separated by commas. The two lists a
 : ''mouseDown'' synthesizes a mouse press and ''mouseUp'' synthesizes a mouse release. ''mousebutton'' synthesizes a mouse press on activation and a release on deactivation and is equivalent to a ''mouseDown'' on activation and ''mouseUp'' on deactivation.
 
 * `lockCursorToScreen(mode)`
-: Locks the cursor to or unlocks the cursor from the active screen. ''mode'' can be ''off'' to unlock the cursor, ''on'' to lock the cursor, or ''toggle'' to toggle the current state. The default is ''toggle''. If the configuration has no ''lockCursorToScreen'' action and ''Scroll Lock'' is not used as a hot key then ''Scroll Lock'' toggles cursor locking.
+: Locks the cursor to or unlocks the cursor from the active computer. ''mode'' can be ''off'' to unlock the cursor, ''on'' to lock the cursor, or ''toggle'' to toggle the current state. The default is ''toggle''. If the configuration has no ''lockCursorToScreen'' action and ''Scroll Lock'' is not used as a hot key then ''Scroll Lock'' toggles cursor locking.
 
-* `switchToScreen(screen)`
-: Jump to screen with name or alias ''screen''.
+* `switchToScreen(computerName)`
+: Jump to computer with name or alias ''computerName''.
 
 * `switchInDirection(dir)`
-: Switch to the screen in the direction ''dir'', which may be one of ''left'', ''right'', ''up'' or ''down''.
+: Switch to the computer in the direction ''dir'', which may be one of ''left'', ''right'', ''up'' or ''down''.
 
 * `switchToNextScreen()`
-: Cycle to the next screen in the configuration order. If at the last screen, cycles back to the first screen.
+: Cycle to the next computer in the configuration order. If at the last computer, cycles back to the first computer.
 
 ##### Keynames
 Valid key names are:
@@ -627,7 +636,7 @@ section: links
 	# iMac is to the right of Desktop1
 	# Laptop is to the left of Desktop1
 	Desktop1:
-		right(0,100) = iMac # the numbers in parentheses indicate the percentage of the screen's edge to be considered active for switching)
+	        right(0,100) = iMac # the numbers in parentheses indicate the percentage of the computer's edge to be considered active for switching)
 		left  = Laptop
 		shift = shift (shift, alt, super, meta can be mapped to any of the others)
 	# Desktop1 is to the right of Laptop
@@ -648,7 +657,7 @@ end
 
 #### Cursor Wrapping
 
-The text config allows screens to be wrapped around. For example, with two machines (a server and a client), the mouse can go off the right of the server onto the left side of the client, then off the right side of the client back onto the left side of server. This config also uses ''Ctrl''+''Super''+(''left arrow''/''right arrow'') to switch between machines on keypress.
+The text config allows computers to be wrapped around. For example, with two machines (a server and a client), the mouse can go off the right of the server onto the left side of the client, then off the right side of the client back onto the left side of server. This config also uses ''Ctrl''+''Super''+(''left arrow''/''right arrow'') to switch between machines on keypress.
 
 ```
 # Physical monitor arrangement, with machine names as used by Deskflow.
@@ -670,7 +679,7 @@ section: links
 		right = syn-serv   # "wrapping"
 end
 section: options
-		keystroke(control+super+right) = switchInDirection(right) # Switch screens on keypress 
+                keystroke(control+super+right) = switchInDirection(right) # Switch computers on keypress 
 <!--		keystroke(control+super+left) = switchInDirection(left) -->
 end
 ```
@@ -689,7 +698,7 @@ See also: the man page for ''deskflow-core''.
 
 ### Stacked Example
 
-Stack one computer's screen on top of another's.
+Stack one computer on top of another's.
 
 ```
 #           +-------+
@@ -733,7 +742,7 @@ end
 
 ### Horizontal Example
 
-Align all screens horizontally.
+Align all computers horizontally.
 
 ```
 # +-------+ +-------+ +-------+
@@ -767,7 +776,7 @@ end
 
 ### Span Example
 
-Span two screens on one computer across the screens of two computers.
+Span one computer across the two other computers.
 
 ```
 # +-------+ +-------+
@@ -802,43 +811,3 @@ section: links
 		down  = larry
 end
 ```
-
-# Example file for `--config-toml` arg
-
-```
-[server.args]
-no-daemon = true
-no-tray = true
-debug = "DEBUG"
-name = "moe"
-address = ":24800"
-
-[client.args]
-no-daemon = true
-no-tray = true
-debug = "DEBUG2"
-name = "larry"
-_last = "moe:24800"
-```
-
-
-# Example  `.env` file
-
-
-```
-#
-# App
-#
-
-# Shows the test menu in the GUI (on by default in debug mode)
-# DESKFLOW_TEST_MENU=true
-
-# Version checker URL to use (useful for testing)
-# DESKFLOW_VERSION_URL="https://api.deskflow.org/version?fake=1.100.0"
-
-# Enable debug logging in the GUI (on by default in debug mode)
-# DESKFLOW_GUI_DEBUG=true
-
-# Enable verbose logging in the GUI (always off by default)
-# DESKFLOW_GUI_VERBOSE=true
-```

doc/user/mainpage.md

@@ -1,5 +1,3 @@
-![Deskflow](https://github.com/user-attachments/assets/f005b958-24df-4f4a-9bfd-4f834dae59d6)
-
 **Deskflow** is a free and open source keyboard and mouse sharing app.
 Use the keyboard, mouse, or trackpad of one computer to control nearby computers,
 and work seamlessly between them.

sonar-project.properties

@@ -2,8 +2,8 @@ sonar.organization=deskflow
 sonar.projectKey=deskflow_deskflow
 sonar.sources=src/apps,src/lib
 sonar.tests=src/unittests
-sonar.exclusions=subprojects/**,build/**
-sonar.coverage.exclusions=subprojects/**,src/unittests/**,src/apps/deskflow-gui/**,src/apps/res/**
+sonar.exclusions=subprojects/**,build/**,translations/**
+sonar.coverage.exclusions=subprojects/**,src/unittests/**,src/apps/deskflow-gui/**,src/apps/res/**,translations/**
 sonar.cpd.exclusions=**/*Test*.cpp
 sonar.host.url=https://sonarcloud.io
 sonar.cfamily.compile-commands=build/compile_commands.json

src/CMakeLists.txt

@@ -1,10 +1,9 @@
-# SPDX-FileCopyrightText: 2024 Deskflow Developers
-# SPDX-FileCopyrightText: 2012 - 2024 Symless Ltd
-# SPDX-FileCopyrightText: 2009 - 2012 Nick Bolton
+# SPDX-FileCopyrightText: (C) 2024 Deskflow Developers
+# SPDX-FileCopyrightText: (C) 2012 - 2024 Symless Ltd
+# SPDX-FileCopyrightText: (C) 2009 - 2012 Nick Bolton
 # SPDX-License-Identifier: MIT
 
-include_directories(./lib)
-include_directories(${CMAKE_CURRENT_BINARY_DIR}/lib)
+include_directories(./lib "${CMAKE_CURRENT_BINARY_DIR}/lib")
 
 add_subdirectory(lib)
 add_subdirectory(apps)

src/apps/CMakeLists.txt

@@ -1,6 +1,6 @@
-# SPDX-FileCopyrightText: 2024 Deskflow Developers
-# SPDX-FileCopyrightText: 2012 - 2024 Symless Ltd
-# SPDX-FileCopyrightText: 2009 - 2012 Nick Bolton
+# SPDX-FileCopyrightText: (C) 2024 Deskflow Developers
+# SPDX-FileCopyrightText: (C) 2012 - 2024 Symless Ltd
+# SPDX-FileCopyrightText: (C) 2009 - 2012 Nick Bolton
 # SPDX-License-Identifier: MIT
 
 if(UNIX AND NOT APPLE)
@@ -28,12 +28,15 @@ function(generate_app_man TARGET NAME)
   endif()
 endfunction()
 
+set(WIN32_PRE_EXCLUDE_REGEXES
+  "api-ms-win-.*"
+  "ext-ms-.*"
+  "^hvsifiletrust\\.dll$"
+  "^icu.*\\.dll$"
+)
+
+set(WIN32_POST_EXCLUDE_REGEXES ".*system32.*")
+
 add_subdirectory(deskflow-core)
-
-## Only used on windows
-add_subdirectory(deskflow-daemon)
-
-option(BUILD_GUI "Build GUI" ON)
-if(BUILD_GUI)
-  add_subdirectory(deskflow-gui)
-endif(BUILD_GUI)
+add_subdirectory(deskflow-daemon) #Only used on windows
+add_subdirectory(deskflow-gui)

src/apps/deskflow-core/CMakeLists.txt

@@ -1,11 +1,17 @@
-# SPDX-FileCopyrightText: 2024 - 2025 Chris Rizzitello <sithlord48@gmail.com>
-# SPDX-FileCopyrightText: 2012 - 2024 Symless Ltd
-# SPDX-FileCopyrightText: 2009 - 2012 Nick Bolton
+# SPDX-FileCopyrightText: (C) 2024 - 2025 Chris Rizzitello <sithlord48@gmail.com>
+# SPDX-FileCopyrightText: (C) 2012 - 2024 Symless Ltd
+# SPDX-FileCopyrightText: (C) 2009 - 2012 Nick Bolton
 # SPDX-License-Identifier: MIT
 
 set(target ${CMAKE_PROJECT_NAME}-core)
 
-add_executable(${target} "${target}.cpp")
+add_executable(${target}
+  "${target}.cpp"
+  CoreArgs.h
+  CoreArgParser.h
+  CoreArgParser.cpp
+)
+
 if(WIN32)
   # Generate rc file
   set(EXE_DESCRIPTION "${CMAKE_PROJECT_PROPER_NAME} combined server and client application")
@@ -32,28 +38,24 @@ target_link_libraries(
   app
   ${libs})
 
-if(APPLE)
+install(
+  TARGETS ${target}
+  RUNTIME_DEPENDENCY_SET coreDeps
+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+)
+
+if(BUILD_OSX_BUNDLE)
   set_target_properties(${target} PROPERTIES
     BUILD_WITH_INSTALL_RPATH TRUE
     INSTALL_RPATH "@loader_path/../Libraries;@loader_path/../Frameworks"
     RUNTIME_OUTPUT_DIRECTORY $<TARGET_BUNDLE_CONTENT_DIR:${CMAKE_PROJECT_PROPER_NAME}>/MacOS
   )
-elseif(UNIX)
-  install(TARGETS ${target} DESTINATION bin)
-  generate_app_man(${target} "${CMAKE_PROJECT_DESCRIPTION}")
-elseif(WIN32)
-  install(
-    TARGETS ${target}
-    RUNTIME_DEPENDENCY_SET coreDeps
-    DESTINATION .
-  )
+elseif (WIN32)
   install(RUNTIME_DEPENDENCY_SET coreDeps
-    PRE_EXCLUDE_REGEXES
-      "api-ms-win-.*"
-      "ext-ms-.*"
-      "^hvsifiletrust\\.dll$"
-    POST_EXCLUDE_REGEXES
-      ".*system32.*"
-    RUNTIME DESTINATION .
+    PRE_EXCLUDE_REGEXES ${WIN32_PRE_EXCLUDE_REGEXES}
+    POST_EXCLUDE_REGEXES ${WIN32_POST_EXCLUDE_REGEXES}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
   )
+else()
+  generate_app_man(${target} "${CMAKE_PROJECT_DESCRIPTION}")
 endif()

src/apps/deskflow-core/CoreArgParser.cpp

@@ -0,0 +1,104 @@
+/*
+ * Deskflow -- mouse and keyboard sharing utility
+ * SPDX-FileCopyrightText: (C) 2025 Chris Rizzitello <sithlord48@gmail.com>
+ * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
+ */
+
+#include "CoreArgParser.h"
+#include "CoreArgs.h"
+
+#include "common/Constants.h"
+#include "common/ExitCodes.h"
+#include "common/Settings.h"
+#include "common/VersionInfo.h"
+#include "deskflow/ProtocolTypes.h"
+
+const QString CoreArgParser::s_headerText = QStringLiteral("%1: %2\n").arg(kCoreBinName, kDisplayVersion);
+
+CoreArgParser::CoreArgParser(const QStringList &args)
+{
+  m_parser.setApplicationDescription(kAppDescription);
+  m_parser.addPositionalArgument("coremode", "The mode to start in either: server or client", "coremode");
+
+  m_parser.addOptions(CoreArgs::options);
+  m_parser.setSingleDashWordOptionMode(QCommandLineParser::ParseAsLongOptions);
+  m_parser.setOptionsAfterPositionalArgumentsMode(QCommandLineParser::ParseAsOptions);
+  m_parser.parse(args);
+
+  m_helpText = m_parser.helpText().replace("<executable_name>", kCoreBinName);
+  m_helpText.replace("[options] coremode", "coremode [options]");
+
+  m_singleInstance = !m_parser.isSet(CoreArgs::multiInstanceOption);
+}
+
+void CoreArgParser::parse()
+{
+  auto posArgs = m_parser.positionalArguments();
+  if (posArgs.isEmpty()) {
+    showHelpText();
+    exit(s_exitSuccess);
+  }
+
+  const QString mode = posArgs.takeFirst();
+  m_serverMode = (mode.compare("server", Qt::CaseInsensitive) == 0);
+  m_clientMode = (mode.compare("client", Qt::CaseInsensitive) == 0);
+
+  if ((!m_clientMode && !m_serverMode) || mode.isEmpty()) {
+    showHelpText();
+    exit(s_exitSuccess);
+  }
+
+  if (m_parser.isSet(CoreArgs::configOption)) {
+    Settings::setSettingsFile(m_parser.value(CoreArgs::configOption));
+  }
+}
+
+[[noreturn]] void CoreArgParser::showHelpText() const
+{
+  QTextStream(stdout) << helpText();
+  exit(s_exitSuccess);
+}
+
+QString CoreArgParser::helpText() const
+{
+  return QStringLiteral("%1%2").arg(s_headerText, m_helpText);
+}
+
+QString CoreArgParser::versionText() const
+{
+  const static auto vString = QStringLiteral("%1 v%2, protocol v%3.%4\n%5\n");
+  return vString.arg(
+      kCoreBinName, kDisplayVersion, QString::number(kProtocolMajorVersion), QString::number(kProtocolMinorVersion),
+      kCopyright
+  );
+}
+
+QString CoreArgParser::errorText() const
+{
+  return m_parser.errorText();
+}
+
+bool CoreArgParser::help() const
+{
+  return m_parser.isSet(CoreArgs::helpOption);
+}
+
+bool CoreArgParser::version() const
+{
+  return m_parser.isSet(CoreArgs::versionOption);
+}
+
+bool CoreArgParser::serverMode() const
+{
+  return m_serverMode;
+}
+
+bool CoreArgParser::clientMode() const
+{
+  return m_clientMode;
+}
+
+bool CoreArgParser::singleInstanceOnly() const
+{
+  return m_singleInstance;
+}

src/apps/deskflow-core/CoreArgParser.h

@@ -0,0 +1,46 @@
+/*
+ * Deskflow -- mouse and keyboard sharing utility
+ * SPDX-FileCopyrightText: (C) 2025 Chris Rizzitello <sithlord48@gmail.com>
+ * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
+ */
+
+#pragma once
+#include <QCommandLineParser>
+
+/**
+ * @brief The CoreArgParser class
+ * This class processes the argments for the "core" app
+ */
+class CoreArgParser
+{
+public:
+  /**
+   * @brief CoreArgParser calling this funciton will parse apps and set the setting and version options
+   * For any other settings to be set you must call parse();
+   * @sa parse();
+   * @param args List of args to parse
+   */
+  explicit CoreArgParser(const QStringList &args = {});
+  /**
+   * @brief parse
+   * This method will parse all options other then help and version
+   */
+  void parse();
+  QString helpText() const;
+  QString versionText() const;
+  QString errorText() const;
+  bool help() const;
+  bool version() const;
+  bool serverMode() const;
+  bool clientMode() const;
+  bool singleInstanceOnly() const;
+
+private:
+  [[noreturn]] void showHelpText() const;
+  QCommandLineParser m_parser;
+  QString m_helpText;
+  bool m_clientMode = false;
+  bool m_serverMode = false;
+  bool m_singleInstance = true;
+  static const QString s_headerText;
+};

src/apps/deskflow-core/CoreArgs.h

@@ -0,0 +1,24 @@
+/*
+ * Deskflow -- mouse and keyboard sharing utility
+ * SPDX-FileCopyrightText: (C) 2025 Chris Rizzitello <sithlord48@gmail.com>
+ * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
+ */
+
+#pragma once
+
+#include <QCommandLineOption>
+/**
+ * @brief The CoreArgs class
+ * This class contains args for the CoreArgParser
+ */
+struct CoreArgs
+{
+  inline static const auto helpOption = QCommandLineOption({"h", "help"}, "Display Help on the command line");
+  inline static const auto versionOption = QCommandLineOption({"v", "version"}, "Display version information");
+  inline static const auto multiInstanceOption =
+      QCommandLineOption("new-instance", "Skip the check for a running instance, always makes a new instance");
+  inline static const auto configOption =
+      QCommandLineOption({"s", "settings"}, "override configuration file to use", "configFile");
+
+  inline static const auto options = {helpOption, versionOption, multiInstanceOption, configOption};
+};

src/apps/deskflow-core/deskflow-core.cpp

@@ -6,10 +6,12 @@
  * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
  */
 
-#include "VersionInfo.h"
+#include "CoreArgParser.h"
+
 #include "arch/Arch.h"
 #include "base/EventQueue.h"
 #include "base/Log.h"
+#include "common/Constants.h"
 #include "common/ExitCodes.h"
 #include "deskflow/ClientApp.h"
 #include "deskflow/ServerApp.h"
@@ -19,89 +21,17 @@
 #include <QCoreApplication>
 #endif
 
+#include <QFileInfo>
 #include <QSharedMemory>
-#include <iostream>
+#include <QTextStream>
 
-const static auto kHeader = QStringLiteral("%1-core: %2\n").arg(kAppId, kDisplayVersion);
-
-void showHelp()
+void showHelp(const CoreArgParser &parser)
 {
-  std::cout << qPrintable(kHeader) << qPrintable(kAppDescription) << "\n\n";
-  std::cout << "Usage: deskflow-core <server | client> [...options]" << std::endl;
-  std::cout << "server - start as a server (deskflow-server)" << std::endl;
-  std::cout << "client - start as a client (deskflow-client)" << std::endl;
-
-  ServerApp sApp(nullptr);
-  sApp.help();
-
-  ClientApp cApp(nullptr);
-  cApp.help();
-}
-
-bool isHelp(int argc, char **argv)
-{
-  for (int i = 0; i < argc; ++i) {
-    if (argv[i] == std::string("--help") || argv[i] == std::string("-h"))
-      return true;
-  }
-  return false;
-}
-
-void showVersion()
-{
-  std::cout << qPrintable(kHeader) << qPrintable(kCopyright) << std::endl;
-}
-
-bool isVersion(int argc, char **argv)
-{
-  for (int i = 0; i < argc; ++i) {
-    if (argv[i] == std::string("--version") || argv[i] == std::string("-v"))
-      return true;
-  }
-  return false;
-}
-
-bool isServer(int argc, char **argv)
-{
-  return (argc > 1 && argv[1] == std::string("server"));
-}
-
-bool isClient(int argc, char **argv)
-{
-  return (argc > 1 && argv[1] == std::string("client"));
+  QTextStream(stdout) << parser.helpText();
 }
 
 int main(int argc, char **argv)
 {
-  Arch arch;
-  arch.init();
-
-  Log log;
-
-  if (isHelp(argc, argv)) {
-    showHelp();
-    return s_exitSuccess;
-  }
-
-  if (isVersion(argc, argv)) {
-    showVersion();
-    return s_exitSuccess;
-  }
-
-  // Create a shared memory segment with a unique key
-  // This is to prevent a new instance from running if one is already running
-  QSharedMemory sharedMemory("deskflow-core");
-
-  // Attempt to attach first and detach in order to clean up stale shm chunks
-  // This can happen if the previous instance was killed or crashed
-  if (sharedMemory.attach())
-    sharedMemory.detach();
-
-  // If we can create 1 byte of SHM we are the only instance
-  if (!sharedMemory.create(1)) {
-    LOG_WARN("an instance of deskflow core is already running");
-    return s_exitDuplicate;
-  }
 #if SYSAPI_WIN32
   // HACK to make sure settings gets the correct qApp path
   QCoreApplication m(argc, argv);
@@ -110,16 +40,58 @@ int main(int argc, char **argv)
   ArchMiscWindows::setInstanceWin32(GetModuleHandle(nullptr));
 #endif
 
-  EventQueue events;
+  Arch arch;
+  arch.init();
 
-  if (isServer(argc, argv)) {
-    ServerApp app(&events);
-    return app.run(argc, argv);
-  } else if (isClient(argc, argv)) {
-    ClientApp app(&events);
-    return app.run(argc, argv);
-  } else {
-    showHelp();
+  Log log;
+
+  QStringList args;
+  for (int i = 0; i < argc; i++)
+    args.append(argv[i]);
+
+  CoreArgParser parser(args);
+
+  // Print any parser errors
+  if (!parser.errorText().isEmpty()) {
+    QTextStream(stdout) << parser.errorText() << "\n";
+  }
+
+  if (parser.help()) {
+    showHelp(parser);
+    return s_exitSuccess;
+  }
+
+  if (parser.version()) {
+    QTextStream(stdout) << parser.versionText();
+    return s_exitSuccess;
+  }
+
+  // Before we check any more args we need to check for a duplicate process.
+  // Create a shared memory segment with a unique key
+  // This is to prevent a new instance from running if one is already running
+  QSharedMemory sharedMemory(kCoreBinName);
+
+  // Attempt to attach first and detach in order to clean up stale shm chunks
+  // This can happen if the previous instance was killed or crashed
+  if (sharedMemory.attach())
+    sharedMemory.detach();
+
+  if (!sharedMemory.create(1) && parser.singleInstanceOnly()) {
+    LOG_WARN("an instance of deskflow core is already running");
+    return s_exitDuplicate;
+  }
+
+  parser.parse();
+
+  EventQueue events;
+  const auto processName = QFileInfo(argv[0]).fileName();
+
+  if (parser.serverMode()) {
+    ServerApp app(&events, processName);
+    return app.run();
+  } else if (parser.clientMode()) {
+    ClientApp app(&events, processName);
+    return app.run();
   }
 
   return s_exitSuccess;

src/apps/deskflow-daemon/CMakeLists.txt

@@ -1,6 +1,6 @@
-# SPDX-FileCopyrightText: 2024 Chris Rizzitello <sithlord48@gmail.com>
-# SPDX-FileCopyrightText: 2012 - 2024 Symless Ltd
-# SPDX-FileCopyrightText: 2009 - 2012 Nick Bolton
+# SPDX-FileCopyrightText: (C) 2024 Chris Rizzitello <sithlord48@gmail.com>
+# SPDX-FileCopyrightText: (C) 2012 - 2024 Symless Ltd
+# SPDX-FileCopyrightText: (C) 2009 - 2012 Nick Bolton
 # SPDX-License-Identifier: MIT
 
 # Daemon is only needed on Windows for elevating processes to deal with UAC.
@@ -12,7 +12,12 @@ if(WIN32)
   set(EXE_ICON "IDI_DESKFLOW ICON DISCARDABLE \"${CMAKE_SOURCE_DIR}/src/apps/res/deskflow.ico\"")
   configure_file(${CMAKE_SOURCE_DIR}/src/apps/res/windows.rc.in ${target}.rc)
 
-  add_executable(${target} WIN32 ${target}.cpp ${CMAKE_CURRENT_BINARY_DIR}/${target}.rc)
+  add_executable(
+    ${target} WIN32
+    ${target}.cpp
+    DaemonApp.cpp
+    DaemonApp.h
+    ${CMAKE_CURRENT_BINARY_DIR}/${target}.rc)
 
   target_link_libraries(
     ${target}
@@ -29,16 +34,12 @@ if(WIN32)
 
   install(
     TARGETS ${target}
-    RUNTIME_DEPENDENCY_SET deamonDeps
-    DESTINATION .
+    RUNTIME_DEPENDENCY_SET daemonDeps
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
   )
   install(RUNTIME_DEPENDENCY_SET daemonDeps
-    PRE_EXCLUDE_REGEXES
-      "api-ms-win-.*"
-      "ext-ms-.*"
-      "^hvsifiletrust\\.dll$"
-    POST_EXCLUDE_REGEXES
-      ".*system32.*"
-    RUNTIME DESTINATION .
+    PRE_EXCLUDE_REGEXES ${WIN32_PRE_EXCLUDE_REGEXES}
+    POST_EXCLUDE_REGEXES ${WIN32_POST_EXCLUDE_REGEXES}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
   )
 endif()

src/apps/deskflow-daemon/DaemonApp.cpp

@@ -1,22 +1,23 @@
 /*
  * Deskflow -- mouse and keyboard sharing utility
+ * SPDX-FileCopyrightText: (C) 2026 Deskflow Developers
  * SPDX-FileCopyrightText: (C) 2012 - 2025 Symless Ltd.
  * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
  */
 
-#include "deskflow/DaemonApp.h"
+#include "DaemonApp.h"
 
+#include "arch/Arch.h"
 #include "base/IEventQueue.h"
 #include "base/Log.h"
 #include "base/LogOutputters.h"
 #include "common/ExitCodes.h"
 #include "common/Settings.h"
-#include "deskflow/App.h"
 #include "deskflow/ipc/DaemonIpcServer.h"
 
 #if SYSAPI_WIN32
 
-#include "arch/win32/ArchMiscWindows.h" // IWYU pragma: keep
+#include "arch/win32/ArchDaemonWindows.h"
 #include "deskflow/Screen.h"
 #include "platform/MSWindowsDebugOutputter.h"
 #include "platform/MSWindowsEventQueueBuffer.h"
@@ -27,19 +28,10 @@
 
 #endif
 
-#include <filesystem>
-#include <iostream>
 #include <string>
 
-using namespace std;
 using namespace deskflow::core;
 
-void showHelp(int argc, char **argv) // NOSONAR - CLI args
-{
-  const auto binName = argc > 0 ? std::filesystem::path(argv[0]).filename().string() : kDaemonBinName;
-  std::cout << "Usage: " << binName << " [-f|--foreground] [--install] [--uninstall]" << std::endl;
-}
-
 DaemonApp::DaemonApp(IEventQueue &events) : m_events(events)
 {
   // do nothing
@@ -96,10 +88,10 @@ void DaemonApp::clearWatchdogCommand()
 void DaemonApp::clearSettings() const
 {
   LOG_INFO("clearing daemon settings");
-  Settings::setValue(Settings::Daemon::Command, QVariant());
-  Settings::setValue(Settings::Daemon::Elevate, QVariant());
-  Settings::setValue(Settings::Daemon::LogFile, QVariant());
-  Settings::setValue(Settings::Daemon::LogLevel, QVariant());
+  Settings::setValue(Settings::Daemon::Command);
+  Settings::setValue(Settings::Daemon::Elevate);
+  Settings::setValue(Settings::Daemon::LogFile);
+  Settings::setValue(Settings::Daemon::LogLevel);
 }
 
 void DaemonApp::connectIpcServer(const ipc::DaemonIpcServer *ipcServer) const
@@ -138,7 +130,7 @@ void DaemonApp::run(QThread &daemonThread)
       mainLoop();
     } else {
       LOG_DEBUG("running daemon in background (daemonizing)");
-      ARCH->daemonize(kAppName, [this](int, const char **) { return daemonLoop(); });
+      ARCH->daemonize([this] { return daemonLoop(); });
     }
 
     daemonThread.quit();
@@ -164,7 +156,7 @@ int DaemonApp::daemonLoop()
 {
 #if SYSAPI_WIN32
   // Runs the daemon through the Windows service controller, which controls the program lifecycle.
-  return ArchMiscWindows::runDaemon([this]() { return mainLoop(); });
+  return ArchDaemonWindows::runDaemon([this]() { return mainLoop(); });
 #elif SYSAPI_UNIX
   return mainLoop();
 #endif
@@ -177,10 +169,9 @@ int DaemonApp::mainLoop()
     LOG_ERR("watchdog not initialized");
     return s_exitFailed;
   }
+  ArchDaemonWindows::daemonRunning(true);
 #endif
 
-  DAEMON_RUNNING(true);
-
   try {
 #if SYSAPI_WIN32
     // Install the platform event queue to handle service stop events.
@@ -211,9 +202,9 @@ int DaemonApp::mainLoop()
   } catch (...) { // NOSONAR - Catching remaining exceptions
     LOG_CRIT("daemon stop watchdog unknown error");
   }
+  ArchDaemonWindows::daemonRunning(false);
 #endif
 
-  DAEMON_RUNNING(false);
   return s_exitSuccess;
 }
 

src/apps/deskflow-daemon/DaemonApp.h

@@ -6,8 +6,6 @@
 
 #pragma once
 
-#include "common/Common.h"
-
 #include <string>
 
 #include <QObject>
@@ -34,20 +32,9 @@ class DaemonApp : public QObject
   Q_OBJECT
 
 public:
-  enum class InitResult
-  {
-    Installed,
-    Uninstalled,
-    StartDaemon,
-    ShowHelp,
-    ArgsError,
-    FatalError,
-  };
-
   explicit DaemonApp(IEventQueue &events);
   ~DaemonApp() override;
 
-  InitResult init(int argc, char **argv);
   void run(QThread &daemonThread);
   void setForeground();
   void initLogging();

src/apps/deskflow-daemon/deskflow-daemon.cpp

@@ -5,13 +5,14 @@
  * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
  */
 
-#include "VersionInfo.h"
+#include "DaemonApp.h"
+
 #include "arch/Arch.h"
 #include "base/EventQueue.h"
 #include "base/Log.h"
 #include "common/ExitCodes.h"
 #include "common/Settings.h"
-#include "deskflow/DaemonApp.h"
+#include "common/VersionInfo.h"
 #include "deskflow/ipc/DaemonIpcServer.h"
 
 #if SYSAPI_WIN32

src/apps/deskflow-gui/CMakeLists.txt

@@ -1,5 +1,5 @@
-# SPDX-FileCopyrightText: 2024 - 2025 Chris Rizzitello <sithlord48@gmail.com>
-# SPDX-FileCopyrightText: 2024 Symless Ltd
+# SPDX-FileCopyrightText: (C) 2024 - 2025 Chris Rizzitello <sithlord48@gmail.com>
+# SPDX-FileCopyrightText: (C) 2024 Symless Ltd
 # SPDX-License-Identifier: MIT
 
 if(APPLE)
@@ -15,12 +15,12 @@ if(WIN32)
   set(EXE_ICON "IDI_ICON1 ICON DISCARDABLE \"${CMAKE_SOURCE_DIR}/src/apps/res/deskflow.ico\" ")
   configure_file(${CMAKE_SOURCE_DIR}/src/apps/res/windows.rc.in deskflow.rc)
   set(platform_extra deskflow.rc)
-elseif(APPLE)
+elseif(BUILD_OSX_BUNDLE)
   #setup our bundle plist file
   set(BUNDLE_EXECUTABLE_NAME "${target}")
   set(BUNDLE_BUNDLE_NAME "${target}")
   set(BUNDLE_DISPLAY_NAME "${target}")
-  set(BUNDLE_GUI_IDENTIFIER "org.deskflow.deskflow")
+  set(BUNDLE_GUI_IDENTIFIER "${CMAKE_PROJECT_REV_FQDN}")
   set(BUNDLE_ICON_FILE ${target}.icns)
   set(BUNDLE_INFO_STRING "${CMAKE_PROJECT_DESCRIPTION}")
   set(BUNDLE_COPYRIGHT "${CMAKE_PROJECT_COPYRIGHT}")
@@ -31,13 +31,7 @@ elseif(APPLE)
     @ONLY
   )
 
-  file(COPY_FILE
-    ${PROJECT_SOURCE_DIR}/LICENSES/LicenseRef-OpenSSL-Exception.txt
-    ${CMAKE_CURRENT_BINARY_DIR}/LICENSE_EXCEPTION
-    ONLY_IF_DIFFERENT
-  )
-
-  set(platform_extra ../res/Deskflow.icns ${CMAKE_SOURCE_DIR}/LICENSE ${CMAKE_CURRENT_BINARY_DIR}/LICENSE_EXCEPTION)
+  set(platform_extra ../res/Deskflow.icns)
   set_source_files_properties(${platform_extra} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
 endif()
 
@@ -55,21 +49,20 @@ target_link_libraries(
   Qt6::Widgets
   Qt6::Network)
 
+install(
+  TARGETS ${target}
+  RUNTIME_DEPENDENCY_SET guiDeps
+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+  BUNDLE DESTINATION .
+)
+
 if(WIN32)
   set_target_properties(${target} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:LIBCMT")
-  install(
-    TARGETS ${target}
-    RUNTIME_DEPENDENCY_SET guiDeps
-    DESTINATION .
-  )
+
   install(RUNTIME_DEPENDENCY_SET guiDeps
-    PRE_EXCLUDE_REGEXES
-      "api-ms-win-.*"
-      "ext-ms-.*"
-      "^hvsifiletrust\\.dll$"
-    POST_EXCLUDE_REGEXES
-      ".*system32.*"
-    RUNTIME DESTINATION .
+    PRE_EXCLUDE_REGEXES ${WIN32_PRE_EXCLUDE_REGEXES}
+    POST_EXCLUDE_REGEXES ${WIN32_POST_EXCLUDE_REGEXES}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
   )
 
   set(QT_DEPENDS_DIR ${CMAKE_BINARY_DIR}/qt-depends)
@@ -91,17 +84,47 @@ if(WIN32)
 
   install(
     DIRECTORY ${QT_DEPENDS_DIR}/
-    DESTINATION .
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
     PATTERN "dx*.dll" EXCLUDE
+    PATTERN "icu*.dll" EXCLUDE
   )
 
 elseif(APPLE)
-  set_target_properties(${target} PROPERTIES
-    INSTALL_RPATH "@loader_path/../Libraries;@loader_path/../Frameworks"
-    MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_BINARY_DIR}/deskflow.plist"
-  )
-  install(TARGETS ${target} BUNDLE DESTINATION .)
+  if (BUILD_OSX_BUNDLE)
+    set_target_properties(${target} PROPERTIES
+      INSTALL_RPATH "@loader_path/../Libraries;@loader_path/../Frameworks"
+      MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_BINARY_DIR}/deskflow.plist"
+    )
+
+    # Warning: Do not use for CI/production, as the `entitlements-dev.plist` file adds special
+    # entitlements that are only appropriate for local development.
+    #
+    # macOS made TCC stricter so that if you don't sign your local dev builds properly, macOS will
+    # nag you to remove and re-approve the app every time you make a change to the binary which is
+    # extremely annoying during development.
+    #
+    # If you were to use ad-hoc signing (i.e. not specify a certificate), TCC would still nag you
+    # because the binary identity is anchored not on the app ID, but on the CD hash (which changes
+    # based on the binary contents).
+    #
+    # To use, simply generate a personal certificate for free with Xcode and pass the ID to CMake.
+    # Full instructions are in the docs.
+    if (NOT "${APPLE_CODESIGN_DEV}" STREQUAL "")
+      message(STATUS "Apple codesign ID for development only: ${APPLE_CODESIGN_DEV}")
+      add_custom_command(
+        TARGET ${target} POST_BUILD
+        COMMAND /usr/bin/codesign
+                --force
+                --options runtime
+                --entitlements "$<SHELL_PATH:${CMAKE_SOURCE_DIR}/src/apps/res/entitlements-dev.plist>"
+                --sign "${APPLE_CODESIGN_DEV}"
+                "$<TARGET_BUNDLE_DIR:${target}>"
+        VERBATIM
+      )
+    endif()
+  else()
+    set_target_properties(${target} PROPERTIES MACOSX_BUNDLE FALSE)
+  endif()
 else()
-  install(TARGETS ${target} DESTINATION bin)
   generate_app_man(${target} "${CMAKE_PROJECT_DESCRIPTION} \\(GUI\\)")
 endif()

src/apps/deskflow-gui/deskflow-gui.cpp

@@ -6,13 +6,13 @@
  * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
  */
 
-#include "VersionInfo.h"
 #include "common/Constants.h"
 #include "common/ExitCodes.h"
+#include "common/I18N.h"
+#include "common/PlatformInfo.h"
 #include "common/UrlConstants.h"
+#include "common/VersionInfo.h"
 #include "gui/Diagnostic.h"
-#include "gui/DotEnv.h"
-#include "gui/Logger.h"
 #include "gui/MainWindow.h"
 #include "gui/Messages.h"
 #include "gui/StyleUtils.h"
@@ -23,7 +23,7 @@
 #include <QMessageBox>
 #include <QSharedMemory>
 
-#if defined(Q_OS_MAC)
+#if defined(Q_OS_MACOS)
 #include <Carbon/Carbon.h>
 #include <cstdlib>
 #endif
@@ -32,9 +32,13 @@
 #include <QLoggingCategory>
 #endif
 
+#if defined(WINAPI_XWINDOWS) or defined(WINAPI_LIBEI)
+#include "platform/XDGPortalRegistry.h"
+#endif
+
 using namespace deskflow::gui;
 
-#if defined(Q_OS_MAC)
+#if defined(Q_OS_MACOS)
 bool checkMacAssistiveDevices();
 #endif
 
@@ -47,14 +51,21 @@ int main(int argc, char *argv[])
   QLoggingCategory::setFilterRules(QStringLiteral("*.debug=true\nqt.*=false"));
 #endif
 
+#if defined(WINAPI_XWINDOWS) or defined(WINAPI_LIBEI)
+  deskflow::platform::setAppId();
+#endif
+
   QCoreApplication::setApplicationName(kAppName);
   QCoreApplication::setOrganizationName(kAppName);
   QCoreApplication::setApplicationVersion(kVersion);
   QCoreApplication::setOrganizationDomain(kOrgDomain); // used in prefix, can't be a url
-  QGuiApplication::setDesktopFileName(QStringLiteral("org.deskflow.deskflow"));
+  QGuiApplication::setDesktopFileName(kRevFqdnName);
 
   QApplication app(argc, argv);
 
+  // Ensure the I18N object is made before strings
+  QTextStream(stdout) << "initial language: " << I18N::currentLanguage() << '\n';
+
   // Add Command Line Options
   auto helpOption = QCommandLineOption({"h", "help"}, "Display Help on the command line");
   auto versionOption = QCommandLineOption({"v", "version"}, "Display version information");
@@ -83,9 +94,10 @@ int main(int argc, char *argv[])
     return s_exitSuccess;
   }
 
+  const auto shmId = QStringLiteral("%1-gui").arg(kAppId);
   // Create a shared memory segment with a unique key
   // This is to prevent a new instance from running if one is already running
-  QSharedMemory sharedMemory("deskflow-gui");
+  QSharedMemory sharedMemory(shmId);
 
   // Attempt to attach first and detach in order to clean up stale shm chunks
   // This can happen if the previous instance was killed or crashed
@@ -96,38 +108,27 @@ int main(int argc, char *argv[])
   if (!sharedMemory.create(1)) {
     // Ping the running instance to have it show itself
     QLocalSocket socket;
-    socket.connectToServer("deskflow-gui", QLocalSocket::ReadOnly);
+    socket.connectToServer(shmId, QLocalSocket::ReadOnly);
     if (!socket.waitForConnected()) {
       // If we can't connect to the other instance tell the user its running.
       // This should never happen but just incase we should show something
-      QMessageBox::information(nullptr, QObject::tr("Deskflow"), QObject::tr("Deskflow is already running"));
+      QMessageBox::information(nullptr, kAppName, QObject::tr("%1 is already running").arg(kAppName));
     }
     socket.disconnectFromServer();
     return s_exitDuplicate;
   }
 
-#if !defined(Q_OS_MAC)
-  // causes dark mode to be used on some DE's
-  if (qEnvironmentVariable("XDG_CURRENT_DESKTOP") != QLatin1String("KDE")) {
+  if (!deskflow::platform::isMac() && qEnvironmentVariable("XDG_CURRENT_DESKTOP") != QLatin1String("KDE")) {
     QApplication::setStyle("fusion");
   }
-#endif
 
   // Sets the fallback icon path and fallback theme
-  const auto themeName = QStringLiteral("deskflow-%1").arg(iconMode());
-  if (QIcon::themeName().isEmpty())
-    QIcon::setThemeName(themeName);
-  else
-    QIcon::setFallbackThemeName(themeName);
-  QIcon::setFallbackSearchPaths({QStringLiteral(":/icons/%1").arg(themeName)});
+  updateIconTheme();
 
   qInstallMessageHandler(deskflow::gui::messages::messageHandler);
   qInfo("%s v%s", kAppName, kDisplayVersion);
 
-  dotenv();
-  Logger::instance().loadEnvVars();
-
-#if defined(Q_OS_MAC)
+#if defined(Q_OS_MACOS)
 
   if (app.applicationDirPath().startsWith("/Volumes/")) {
     QString msgBody = QStringLiteral(
@@ -154,7 +155,7 @@ int main(int argc, char *argv[])
   return QApplication::exec();
 }
 
-#if defined(Q_OS_MAC)
+#if defined(Q_OS_MACOS)
 bool checkMacAssistiveDevices()
 {
   // new in mavericks, applications are trusted individually

src/apps/res/deskflow.plist.in

@@ -30,8 +30,12 @@
 	<true/>
 	<key>NSHumanReadableCopyright</key>
 	<string>@BUNDLE_COPYRIGHT@</string>
+	<key>LSApplicationCategoryType</key>
+	<string>public.app-category.utilities</string>
 
-	<!-- Don't Allow Os to kill for memory -->
+	<!-- Prevent macOS from terminating during memory pressure -->
+	<key>NSSupportsAutomaticTermination</key>
+	<false/>
 	<key>NSSupportsSuddenTermination</key>
 	<false/>
 

src/apps/res/deskflow.qrc

@@ -5,11 +5,14 @@
         <file>icons/deskflow-dark/actions/16/document-edit.svg</file>
         <file>icons/deskflow-dark/actions/16/document-open.svg</file>
         <file>icons/deskflow-dark/actions/16/document-save-as.svg</file>
+        <file>icons/deskflow-dark/actions/16/go-down.svg</file>
+        <file>icons/deskflow-dark/actions/16/go-up.svg</file>
         <file>icons/deskflow-dark/actions/16/help-about.svg</file>
         <file>icons/deskflow-dark/actions/16/network-connect.svg</file>
         <file>icons/deskflow-dark/actions/16/network-disconnect.svg</file>
         <file>icons/deskflow-dark/actions/16/process-stop.svg</file>
         <file>icons/deskflow-dark/actions/16/system-run.svg</file>
+        <file>icons/deskflow-dark/actions/16/system-search.svg</file>
         <file>icons/deskflow-dark/actions/16/tools-report-bug.svg</file>
         <file>icons/deskflow-dark/actions/16/view-close.svg</file>
         <file>icons/deskflow-dark/actions/16/view-refresh.svg</file>
@@ -21,11 +24,14 @@
         <file>icons/deskflow-dark/actions/22/document-open.svg</file>
         <file>icons/deskflow-dark/actions/22/document-save-as.svg</file>
         <file>icons/deskflow-dark/actions/22/fingerprint.svg</file>
+        <file>icons/deskflow-dark/actions/22/go-down.svg</file>
+        <file>icons/deskflow-dark/actions/22/go-up.svg</file>
         <file>icons/deskflow-dark/actions/22/help-about.svg</file>
         <file>icons/deskflow-dark/actions/22/network-connect.svg</file>
         <file>icons/deskflow-dark/actions/22/network-disconnect.svg</file>
         <file>icons/deskflow-dark/actions/22/process-stop.svg</file>
         <file>icons/deskflow-dark/actions/22/system-run.svg</file>
+        <file>icons/deskflow-dark/actions/22/system-search.svg</file>
         <file>icons/deskflow-dark/actions/22/tools-report-bug.svg</file>
         <file>icons/deskflow-dark/actions/22/view-close.svg</file>
         <file>icons/deskflow-dark/actions/22/view-refresh.svg</file>
@@ -36,6 +42,8 @@
         <file>icons/deskflow-dark/actions/24/document-edit.svg</file>
         <file>icons/deskflow-dark/actions/24/document-open.svg</file>
         <file>icons/deskflow-dark/actions/24/document-save-as.svg</file>
+        <file>icons/deskflow-dark/actions/24/go-down.svg</file>
+        <file>icons/deskflow-dark/actions/24/go-up.svg</file>
         <file>icons/deskflow-dark/actions/24/edit-clear-all.svg</file>
         <file>icons/deskflow-dark/actions/24/fingerprint.svg</file>
         <file>icons/deskflow-dark/actions/24/help-about.svg</file>
@@ -43,6 +51,7 @@
         <file>icons/deskflow-dark/actions/24/network-disconnect.svg</file>
         <file>icons/deskflow-dark/actions/24/process-stop.svg</file>
         <file>icons/deskflow-dark/actions/24/system-run.svg</file>
+        <file>icons/deskflow-dark/actions/24/system-search.svg</file>
         <file>icons/deskflow-dark/actions/24/tools-report-bug.svg</file>
         <file>icons/deskflow-dark/actions/24/view-close.svg</file>
         <file>icons/deskflow-dark/actions/24/view-refresh.svg</file>
@@ -55,10 +64,13 @@
         <file>icons/deskflow-dark/actions/32/dialog-ok-apply.svg</file>
         <file>icons/deskflow-dark/actions/32/document-open.svg</file>
         <file>icons/deskflow-dark/actions/32/document-save-as.svg</file>
+        <file>icons/deskflow-dark/actions/32/go-down.svg</file>
+        <file>icons/deskflow-dark/actions/32/go-up.svg</file>
         <file>icons/deskflow-dark/actions/32/help-about.svg</file>
         <file>icons/deskflow-dark/actions/32/view-refresh.svg</file>
-        <file>icons/deskflow-dark/apps/64/deskflow.svg</file>
-        <file>icons/deskflow-dark/apps/64/deskflow-symbolic.svg</file>
+        <file>icons/deskflow-dark/actions/32/system-search.svg</file>
+        <file>icons/deskflow-dark/apps/64/org.deskflow.deskflow.svg</file>
+        <file>icons/deskflow-dark/apps/64/org.deskflow.deskflow-symbolic.svg</file>
         <file>icons/deskflow-dark/devices/64/video-display.svg</file>
         <file>icons/deskflow-dark/places/64/user-trash.svg</file>
         <file>icons/deskflow-dark/status/32/software-updates-release.svg</file>
@@ -77,11 +89,14 @@
         <file>icons/deskflow-light/actions/16/document-edit.svg</file>
         <file>icons/deskflow-light/actions/16/document-open.svg</file>
         <file>icons/deskflow-light/actions/16/document-save-as.svg</file>
+        <file>icons/deskflow-light/actions/16/go-down.svg</file>
+        <file>icons/deskflow-light/actions/16/go-up.svg</file>
         <file>icons/deskflow-light/actions/16/help-about.svg</file>
         <file>icons/deskflow-light/actions/16/network-connect.svg</file>
         <file>icons/deskflow-light/actions/16/network-disconnect.svg</file>
         <file>icons/deskflow-light/actions/16/process-stop.svg</file>
         <file>icons/deskflow-light/actions/16/system-run.svg</file>
+        <file>icons/deskflow-light/actions/16/system-search.svg</file>
         <file>icons/deskflow-light/actions/16/tools-report-bug.svg</file>
         <file>icons/deskflow-light/actions/16/view-close.svg</file>
         <file>icons/deskflow-light/actions/16/view-refresh.svg</file>
@@ -94,11 +109,14 @@
         <file>icons/deskflow-light/actions/22/document-open.svg</file>
         <file>icons/deskflow-light/actions/22/document-save-as.svg</file>
         <file>icons/deskflow-light/actions/22/fingerprint.svg</file>
+        <file>icons/deskflow-light/actions/22/go-down.svg</file>
+        <file>icons/deskflow-light/actions/22/go-up.svg</file>
         <file>icons/deskflow-light/actions/22/network-connect.svg</file>
         <file>icons/deskflow-light/actions/22/network-disconnect.svg</file>
         <file>icons/deskflow-light/actions/22/help-about.svg</file>
         <file>icons/deskflow-light/actions/22/process-stop.svg</file>
         <file>icons/deskflow-light/actions/22/system-run.svg</file>
+        <file>icons/deskflow-light/actions/22/system-search.svg</file>
         <file>icons/deskflow-light/actions/22/tools-report-bug.svg</file>
         <file>icons/deskflow-light/actions/22/view-close.svg</file>
         <file>icons/deskflow-light/actions/22/view-refresh.svg</file>
@@ -111,11 +129,14 @@
         <file>icons/deskflow-light/actions/24/document-edit.svg</file>
         <file>icons/deskflow-light/actions/24/document-open.svg</file>
         <file>icons/deskflow-light/actions/24/document-save-as.svg</file>
+        <file>icons/deskflow-light/actions/24/go-down.svg</file>
+        <file>icons/deskflow-light/actions/24/go-up.svg</file>
         <file>icons/deskflow-light/actions/24/help-about.svg</file>
         <file>icons/deskflow-light/actions/24/network-connect.svg</file>
         <file>icons/deskflow-light/actions/24/network-disconnect.svg</file>
         <file>icons/deskflow-light/actions/24/process-stop.svg</file>
         <file>icons/deskflow-light/actions/24/system-run.svg</file>
+        <file>icons/deskflow-light/actions/24/system-search.svg</file>
         <file>icons/deskflow-light/actions/24/tools-report-bug.svg</file>
         <file>icons/deskflow-light/actions/24/view-close.svg</file>
         <file>icons/deskflow-light/actions/24/view-refresh.svg</file>
@@ -128,10 +149,13 @@
         <file>icons/deskflow-light/actions/32/dialog-ok-apply.svg</file>
         <file>icons/deskflow-light/actions/32/document-open.svg</file>
         <file>icons/deskflow-light/actions/32/document-save-as.svg</file>
+        <file>icons/deskflow-light/actions/32/go-down.svg</file>
+        <file>icons/deskflow-light/actions/32/go-up.svg</file>
         <file>icons/deskflow-light/actions/32/help-about.svg</file>
         <file>icons/deskflow-light/actions/32/view-refresh.svg</file>
-        <file>icons/deskflow-light/apps/64/deskflow.svg</file>
-        <file>icons/deskflow-light/apps/64/deskflow-symbolic.svg</file>
+        <file>icons/deskflow-light/actions/32/system-search.svg</file>
+        <file>icons/deskflow-light/apps/64/org.deskflow.deskflow.svg</file>
+        <file>icons/deskflow-light/apps/64/org.deskflow.deskflow-symbolic.svg</file>
         <file>icons/deskflow-light/devices/64/video-display.svg</file>
         <file>icons/deskflow-light/status/32/software-updates-release.svg</file>
         <file>icons/deskflow-light/status/64/dialog-error.svg</file>

src/apps/res/entitlements-dev.plist

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0"><dict>
+  <key>com.apple.security.cs.disable-library-validation</key><true/>
+  <key>com.apple.security.get-task-allow</key><true/>
+  <key>com.apple.security.cs.allow-jit</key><true/>
+</dict></plist>

src/apps/res/icons/deskflow-dark/actions/16/go-down.svg

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+    <style type="text/css" id="current-color-scheme">.ColorScheme-Text { color: #fcfcfc; } </style>
+    <path d="M8 11.707l-6-6L2.707 5 8 10.293 13.293 5l.707.707-6 6z" class="ColorScheme-Text" fill="currentColor"/>
+</svg>

src/apps/res/icons/deskflow-dark/actions/16/go-up.svg

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+    <style type="text/css" id="current-color-scheme">.ColorScheme-Text { color: #fcfcfc; } </style>
+    <path d="M8 4.293l-6 6 .707.707L8 5.707 13.293 11l.707-.707-6-6z" class="ColorScheme-Text" fill="currentColor"/>
+</svg>

src/apps/res/icons/deskflow-dark/actions/16/system-search.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">.ColorScheme-Text { color: #fcfcfc; } </style>
+  </defs>
+ <path style="fill:currentColor;fill-opacity:1;stroke:none" d="M 6.5 2 C 4.007 2 2 4.01 2 6.5 C 2 8.993 4.01 11 6.5 11 C 7.5636432 11 8.5263409 10.618801 9.2949219 10.005859 L 13.292969 14.003906 L 14 13.296875 L 10.001953 9.2988281 C 10.617604 8.529048 11 7.565338 11 6.5 C 11 4.007 8.99 2 6.5 2 z M 6.5 3 C 8.439 3 10 4.561 10 6.5 C 10 8.439 8.439 10 6.5 10 C 4.561 10 3 8.439 3 6.5 C 3 4.561 4.561 3 6.5 3 z " class="ColorScheme-Text"/>
+</svg>

src/apps/res/icons/deskflow-dark/actions/22/go-down.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">.ColorScheme-Text { color: #fcfcfc; } </style>
+  </defs>
+ <path style="fill:currentColor;fill-opacity:1;stroke:none" d="m3.707031 7l-.707031.707031 6.125 6.125 1.875 1.875 1.875-1.875 6.125-6.125-.707031-.707031-6.125 6.125-1.167969 1.167969-1.167969-1.167969-6.125-6.125" class="ColorScheme-Text"/>  
+</svg>

src/apps/res/icons/deskflow-dark/actions/22/go-up.svg

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
+    <style type="text/css" id="current-color-scheme">.ColorScheme-Text { color: #fcfcfc; } </style>
+    <path d="M3.707 15L3 14.293l6.125-6.125L11 6.293l1.875 1.875L19 14.293l-.707.707-6.125-6.125L11 7.707 9.832 8.875 3.707 15" class="ColorScheme-Text" fill="currentColor"/>
+</svg>

src/apps/res/icons/deskflow-dark/actions/22/system-search.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">.ColorScheme-Text { color: #fcfcfc; } </style>
+  </defs>
+ <path style="fill:currentColor;fill-opacity:1;stroke:none" d="M 9 3 C 5.6759952 3 3 5.6759952 3 9 C 3 12.324005 5.6759952 15 9 15 C 10.481205 15 11.830584 14.465318 12.875 13.582031 L 18.292969 19 L 19 18.292969 L 13.582031 12.875 C 14.465318 11.830584 15 10.481205 15 9 C 15 5.6759952 12.324005 3 9 3 z M 9 4 C 11.770005 4 14 6.2299952 14 9 C 14 11.770005 11.770005 14 9 14 C 6.2299952 14 4 11.770005 4 9 C 4 6.2299952 6.2299952 4 9 4 z " class="ColorScheme-Text"/>  
+</svg>

src/apps/res/icons/deskflow-dark/actions/24/go-down.svg

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">.ColorScheme-Text { color: #fcfcfc; } </style>
+  </defs>
+  <g transform="translate(1,1)">
+    <path style="fill:currentColor;fill-opacity:1;stroke:none" d="m3.707031 7l-.707031.707031 6.125 6.125 1.875 1.875 1.875-1.875 6.125-6.125-.707031-.707031-6.125 6.125-1.167969 1.167969-1.167969-1.167969-6.125-6.125" class="ColorScheme-Text"/>
+  </g>
+</svg>

src/apps/res/icons/deskflow-dark/actions/24/go-up.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24">
+  <style type="text/css" id="current-color-scheme">.ColorScheme-Text { color: #fcfcfc; } </style>
+  <g transform="translate(1,1)">
+    <path d="M3.707 15L3 14.293l6.125-6.125L11 6.293l1.875 1.875L19 14.293l-.707.707-6.125-6.125L11 7.707 9.832 8.875 3.707 15" class="ColorScheme-Text" fill="currentColor"/>
+  </g>
+</svg>

src/apps/res/icons/deskflow-dark/actions/24/system-search.svg

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">.ColorScheme-Text { color: #fcfcfc; } </style>
+  </defs>
+  <g transform="translate(1,1)">
+    <path style="fill:currentColor;fill-opacity:1;stroke:none" d="M 9 3 C 5.6759952 3 3 5.6759952 3 9 C 3 12.324005 5.6759952 15 9 15 C 10.481205 15 11.830584 14.465318 12.875 13.582031 L 18.292969 19 L 19 18.292969 L 13.582031 12.875 C 14.465318 11.830584 15 10.481205 15 9 C 15 5.6759952 12.324005 3 9 3 z M 9 4 C 11.770005 4 14 6.2299952 14 9 C 14 11.770005 11.770005 14 9 14 C 6.2299952 14 4 11.770005 4 9 C 4 6.2299952 6.2299952 4 9 4 z " class="ColorScheme-Text"/>
+  </g>
+</svg>

src/apps/res/icons/deskflow-dark/actions/32/go-down.svg

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
+    <style type="text/css" id="current-color-scheme">.ColorScheme-Text { color: #fcfcfc; } </style>
+    <path d="M16 23.707l-14-14L2.707 9 16 22.293 29.293 9l.707.707z" class="ColorScheme-Text" fill="currentColor"/>
+</svg>

src/apps/res/icons/deskflow-dark/actions/32/go-up.svg

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
+    <style type="text/css" id="current-color-scheme">.ColorScheme-Text { color: #fcfcfc; } </style>
+    <path d="M16 8.293l-14 14 .707.707L16 9.707 29.293 23l.707-.707z" class="ColorScheme-Text" fill="currentColor"/>
+</svg>

src/apps/res/icons/deskflow-dark/actions/32/system-search.svg

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" width="32" height="32">
+    <style type="text/css" id="current-color-scheme">.ColorScheme-Text { color: #fcfcfc; } </style>
+    <g id="system-search" transform="translate(0 -32) translate(-22,32)">
+        <path id="path66" class="ColorScheme-Text" d="m35 4a9 9 0 0 0-9 9 9 9 0 0 0 9 9 9 9 0 0 0 5.994141-2.298828l8.298828 8.298828 0.707031-0.707031-8.300781-8.300782a9 9 0 0 0 2.300781-5.992187 9 9 0 0 0-9-9zm0 1a8 8 0 0 1 8 8 8 8 0 0 1-8 8 8 8 0 0 1-8-8 8 8 0 0 1 8-8z" fill="currentColor"/>
+        <path id="path68" d="m22 0v32h32v-32z" fill="none"/>
+    </g>
+</svg>

src/apps/res/icons/deskflow-dark/apps/64/deskflow-symbolic.svg

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   height="400"
-   viewBox="0 -960 16000 16000"
-   width="400"
-   fill="#e8eaed"
-   version="1.1"
-   id="svg58"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs62" />
-  <g
-     id="g312"
-     transform="matrix(0.95521236,0,0,0.88584237,358.301,773.57086)">
-    <path
-       style="fill:#f2f2f2;fill-opacity:1;stroke-width:22.0314"
-       d="m 10822.775,14277.69 c -1480.6355,-205.266 -2703.2156,-1149.093 -4024.7185,-1775.333 -745.9215,-412.95 -1640.7516,-671.66 -2479.9222,-411.91 -844.9777,264.031 -1378.4045,1001.612 -1991.5999,1582.679 -747.0662,380.92 -732.8666,-1875.959 -957.1362,-1286.712 396.2288,-871.302 1186.3232,-1519.256 1987.7363,-2012.518 1172.4366,-680.7295 2625.6591,-459.9056 3774.9177,151.009 1203.0592,540.157 2286.8972,1374.106 3578.5308,1696.524 888.521,187.313 1759.981,-291.864 2291.813,-984.522 293.133,-563.979 1138.577,-1336.7036 1564.647,-433.065 320.451,648.351 -932.467,2288.278 -494.032,1806.312 -768.024,1006.215 -1931.603,1805.177 -3250.236,1667.536 z"
-       id="path3393" />
-    <path
-       style="fill:#f2f2f2;fill-opacity:1;stroke-width:26.9658"
-       d="M 10691.975,9232.2954 C 8846.2487,8912.0018 7433.3401,7506.5916 5652.3423,7010.2615 4761.8774,6790.4246 3822.1342,7124.1431 3186.0428,7766.5861 2779.8147,8179.8677 2076.0345,9244.1299 1514.3929,8423.1235 1079.2106,7830.3042 2354.0198,6103.9484 1854.8774,6562.2615 2749.3313,5511.0149 4101.33,4683.576 5528.9402,4933.985 c 1825.4065,308.1723 3248.3604,1635.6508 4981.4158,2196.167 786.252,212.7419 1654.268,-19.2507 2198.637,-635.8586 489.708,-366.0972 693.581,-1248.5159 1405.833,-1192.9521 749.104,302.2549 726.809,1381.0589 243.424,1914.1731 -761.756,1116.6719 -1965.665,2136.6365 -3401.044,2036.4798 l -140.36,-6.6924 -124.875,-13.0105 z"
-       id="path1767" />
-    <path
-       style="fill:#f2f2f2;fill-opacity:1;stroke-width:26.9658"
-       d="M 10576.744,4172.4544 C 8781.32,3857.6985 7413.9341,2483.8453 5681.7925,2001.6118 4813.0936,1790.1465 3885.6762,2059.0545 3243.5441,2676.9291 2755.2378,3026.8587 2296.4145,4124.678 1601.3049,3504.7347 718.55095,2717.1148 2282.4679,796.203 1795.7242,1592.2603 2696.3129,485.67774 4095.5242,-387.1285 5571.7883,-103.57995 7431.0096,214.26172 8850.9468,1625.9548 10643.731,2118.8133 c 1007.057,248.4056 1967.172,-377.7119 2523.479,-1176.70049 225.605,-637.03713 1128.579,-1020.154865 1434.5,-217.3221 318.499,687.05509 -995.822,2368.70809 -558.726,1862.82939 -805.909,1049.9999 -2097.781,1861.9671 -3466.24,1584.8343 z"
-       id="path970" />
-  </g>
-</svg>

src/apps/res/icons/deskflow-dark/apps/64/deskflow.svg

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="128.00002"
-   height="127.99999"
-   viewBox="0 0 33.866671 33.866665"
-   version="1.1"
-   id="svg1"
-   xml:space="preserve"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"><defs
-     id="defs1" /><g
-     id="layer1"
-     transform="translate(-32.279167,-138.64166)"><g
-       style="fill:#e8eaed"
-       id="g1"
-       transform="matrix(0.00196863,0,0,0.00196863,33.463433,141.71593)"><g
-         id="g312"
-         transform="matrix(1.002973,0,0,0.93013448,-23.783992,460.24941)"><path
-           style="fill:#3366cc;fill-opacity:1;stroke-width:22.0314"
-           d="m 10822.775,14277.69 c -1195.5832,-143.508 -2220.2063,-841.148 -3268.3667,-1379.127 -718.8533,-355.301 -1431.1297,-838.976 -2251.4363,-896.085 -491.0057,-34.634 -993.9142,16.701 -1419.8658,282.946 -632.9097,323.689 -1041.4867,924.538 -1556.5718,1387.702 -543.283,324.938 -1024.416,-324.503 -999.9439,-831.854 -66.7515,-706.46 526.7775,-1215.106 971.4799,-1675.328 796.7042,-788.985 1908.9735,-1339.2985 3051.7899,-1198.3588 1348.2477,151.6528 2490.0786,954.1998 3671.9639,1551.7868 812.8473,430.368 1732.2728,937.309 2680.6698,656.999 865.182,-240.211 1345.317,-1049.536 1918.072,-1669.709 419.319,-369.53 999.56,99.027 1037.303,575.62 144.849,591.439 -228.81,1099.793 -584.858,1527.872 -674.991,878.758 -1646.404,1612.499 -2788.132,1678.492 -153.996,19.794 -308.698,6.257 -462.104,-10.956 z"
-           id="path3393" /><path
-           style="fill:#33b2cc;fill-opacity:1;stroke-width:26.9658"
-           d="M 10691.975,9232.2954 C 9345.1884,8998.8534 8209.7623,8175.6727 7013.3992,7567.553 6317.9006,7189.0731 5542.8247,6853.4818 4732.6528,6969.3648 3791.0852,7073.1473 3096.3863,7808.0894 2511.2819,8487.0616 2153.4997,8962.5979 1492.1857,8662.9151 1369.9995,8151.7319 1161.0166,7603.1278 1417.243,7018.9363 1804.1792,6620.924 2646.9373,5624.9864 3867.0135,4790.8306 5227.0245,4902.123 c 1538.2424,122.1926 2802.7979,1096.8978 4150.0464,1747.2218 689.4831,373.3537 1480.8271,695.5213 2275.6811,498.2159 843.443,-225.4675 1355.155,-986.6873 1874.463,-1625.928 303.839,-429.2412 935.004,-202.6984 1073.134,247.0946 229.503,525.6439 50.159,1127.049 -311.918,1545.1618 -731.881,1031.1947 -1847.889,1971.3437 -3180.435,1938.7364 -138.853,1.6775 -278.273,-1.5834 -416.021,-20.3301 z"
-           id="path1767" /><path
-           style="fill:#33cc99;fill-opacity:1;stroke-width:26.9658"
-           d="M 10576.744,4172.4544 C 8874.8637,3865.0547 7544.5841,2635.7395 5940.4635,2069.4233 5180.2383,1837.8115 4305.6379,1885.6382 3648.4341,2367.3105 c -522.046,315.7633 -870.3773,828.5536 -1307.695,1235.7633 -408.0241,287.6051 -882.8065,-100.3925 -976.5864,-516.0856 -207.011,-566.4578 84.2445,-1166.9024 491.559,-1564.2835 824.1797,-978.84256 2034.8379,-1776.07292 3363.7164,-1666.23087 1553.6459,128.553637 2838.511,1104.93638 4193.6746,1778.01277 748.5153,409.2855 1666.3233,736.8711 2500.3373,374.9559 742.862,-301.9425 1184.93,-1003.6082 1669.344,-1599.36398 390.513,-404.4477409 1011.637,22.50986 1078.781,494.20116 143.129,510.48212 -76.578,1022.79062 -407.346,1408.75032 -715.856,1002.3301 -1795.1,1907.7734 -3088.381,1906.4911 -197.264,2.2737 -394.6,-14.3348 -589.094,-47.0667 z"
-           id="path970" /></g></g></g></svg>

src/apps/res/icons/deskflow-dark/apps/64/org.deskflow.deskflow-symbolic.svg

@@ -0,0 +1,10 @@
+<svg version="1.1" viewBox="0 0 64 64" xmlns="http://www.w3.org/2000/svg">
+    <defs id="defs62">
+      <style type="text/css" id="current-color-scheme">.ColorScheme-Text { color: #fcfcfc; } </style>
+  </defs>
+    <g fill="currentColor" class="ColorScheme-Text">
+        <path transform="matrix(.0035792 0 0 .00332131 3.3640502 8.5103867)" d="m10822.775 14277.69c-1195.5832-143.508-2220.2063-841.148-3268.3667-1379.127-718.8533-355.301-1431.1297-838.976-2251.4363-896.085-491.0057-34.634-993.9142 16.701-1419.8658 282.946-632.9097 323.689-1041.4867 924.538-1556.5718 1387.702-543.283 324.938-1024.416-324.503-999.9439-831.854-66.7515-706.46 526.7775-1215.106 971.4799-1675.328 796.7042-788.985 1908.9735-1339.2985 3051.7899-1198.3588 1348.2477 151.6528 2490.0786 954.1998 3671.9639 1551.7868 812.8473 430.368 1732.2728 937.309 2680.6698 656.999 865.182-240.211 1345.317-1049.536 1918.072-1669.709 419.319-369.53 999.56 99.027 1037.303 575.62 144.849 591.439-228.81 1099.793-584.858 1527.872-674.991 878.758-1646.404 1612.499-2788.132 1678.492-153.996 19.794-308.698 6.257-462.104-10.956z"/>
+        <path transform="matrix(.0035792 0 0 .00332131 3.3640502 8.5103867)" d="m10691.975 9232.2954c-1346.7866-233.442-2482.2127-1056.6227-3678.5758-1664.7424-695.4986-378.4799-1470.5745-714.0712-2280.7464-598.1882-941.5676 103.7825-1636.2665 838.7246-2221.3709 1517.6968-357.7822 475.5363-1019.0962 175.8535-1141.2824-335.3297-208.9829-548.6041 47.2435-1132.7956 434.1797-1530.8079 842.7581-995.9376 2062.8343-1830.0934 3422.8453-1718.801 1538.2424 122.1926 2802.7979 1096.8978 4150.0464 1747.2218 689.4831 373.3537 1480.8271 695.5213 2275.6811 498.2159 843.443-225.4675 1355.155-986.6873 1874.463-1625.928 303.839-429.2412 935.004-202.6984 1073.134 247.0946 229.503 525.6439 50.159 1127.049-311.918 1545.1618-731.881 1031.1947-1847.889 1971.3437-3180.435 1938.7364-138.853 1.6775-278.273-1.5834-416.021-20.3301z"/>
+        <path transform="matrix(.0035792 0 0 .00332131 3.3640502 8.5103867)" d="m10576.744 4172.4544c-1701.8803-307.3997-3032.1599-1536.7149-4636.2805-2103.0311-760.2252-231.6118-1634.8256-183.7851-2292.0294 297.8872-522.046 315.7633-870.3773 828.5536-1307.695 1235.7633-408.0241 287.6051-882.8065-100.3925-976.5864-516.0856-207.011-566.4578 84.2445-1166.9024 491.559-1564.2835 824.1797-978.84256 2034.8379-1776.0729 3363.7164-1666.2309 1553.6459 128.55364 2838.511 1104.9364 4193.6746 1778.0128 748.5153 409.2855 1666.3233 736.8711 2500.3373 374.9559 742.862-301.9425 1184.93-1003.6082 1669.344-1599.364 390.513-404.44774 1011.637 22.50986 1078.781 494.20116 143.129 510.48212-76.578 1022.7906-407.346 1408.7503-715.856 1002.3301-1795.1 1907.7734-3088.381 1906.4911-197.264 2.2737-394.6-14.3348-589.094-47.0667z"/>
+    </g>
+</svg>

src/apps/res/icons/deskflow-dark/apps/64/org.deskflow.deskflow.svg

@@ -0,0 +1,7 @@
+<svg version="1.1" viewBox="0 0 64 64" xmlns="http://www.w3.org/2000/svg">
+    <g>
+        <path transform="matrix(.0035792 0 0 .00332131 3.3640502 8.5103867)" d="m10822.775 14277.69c-1195.5832-143.508-2220.2063-841.148-3268.3667-1379.127-718.8533-355.301-1431.1297-838.976-2251.4363-896.085-491.0057-34.634-993.9142 16.701-1419.8658 282.946-632.9097 323.689-1041.4867 924.538-1556.5718 1387.702-543.283 324.938-1024.416-324.503-999.9439-831.854-66.7515-706.46 526.7775-1215.106 971.4799-1675.328 796.7042-788.985 1908.9735-1339.2985 3051.7899-1198.3588 1348.2477 151.6528 2490.0786 954.1998 3671.9639 1551.7868 812.8473 430.368 1732.2728 937.309 2680.6698 656.999 865.182-240.211 1345.317-1049.536 1918.072-1669.709 419.319-369.53 999.56 99.027 1037.303 575.62 144.849 591.439-228.81 1099.793-584.858 1527.872-674.991 878.758-1646.404 1612.499-2788.132 1678.492-153.996 19.794-308.698 6.257-462.104-10.956z" fill="#36c"/>
+        <path transform="matrix(.0035792 0 0 .00332131 3.3640502 8.5103867)" d="m10691.975 9232.2954c-1346.7866-233.442-2482.2127-1056.6227-3678.5758-1664.7424-695.4986-378.4799-1470.5745-714.0712-2280.7464-598.1882-941.5676 103.7825-1636.2665 838.7246-2221.3709 1517.6968-357.7822 475.5363-1019.0962 175.8535-1141.2824-335.3297-208.9829-548.6041 47.2435-1132.7956 434.1797-1530.8079 842.7581-995.9376 2062.8343-1830.0934 3422.8453-1718.801 1538.2424 122.1926 2802.7979 1096.8978 4150.0464 1747.2218 689.4831 373.3537 1480.8271 695.5213 2275.6811 498.2159 843.443-225.4675 1355.155-986.6873 1874.463-1625.928 303.839-429.2412 935.004-202.6984 1073.134 247.0946 229.503 525.6439 50.159 1127.049-311.918 1545.1618-731.881 1031.1947-1847.889 1971.3437-3180.435 1938.7364-138.853 1.6775-278.273-1.5834-416.021-20.3301z" fill="#33b2cc"/>
+        <path transform="matrix(.0035792 0 0 .00332131 3.3640502 8.5103867)" d="m10576.744 4172.4544c-1701.8803-307.3997-3032.1599-1536.7149-4636.2805-2103.0311-760.2252-231.6118-1634.8256-183.7851-2292.0294 297.8872-522.046 315.7633-870.3773 828.5536-1307.695 1235.7633-408.0241 287.6051-882.8065-100.3925-976.5864-516.0856-207.011-566.4578 84.2445-1166.9024 491.559-1564.2835 824.1797-978.84256 2034.8379-1776.0729 3363.7164-1666.2309 1553.6459 128.55364 2838.511 1104.9364 4193.6746 1778.0128 748.5153 409.2855 1666.3233 736.8711 2500.3373 374.9559 742.862-301.9425 1184.93-1003.6082 1669.344-1599.364 390.513-404.44774 1011.637 22.50986 1078.781 494.20116 143.129 510.48212-76.578 1022.7906-407.346 1408.7503-715.856 1002.3301-1795.1 1907.7734-3088.381 1906.4911-197.264 2.2737-394.6-14.3348-589.094-47.0667z" fill="#3c9"/>
+    </g>
+</svg>

src/apps/res/icons/deskflow-light/actions/16/go-down.svg

@@ -0,0 +1,10 @@
+<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+    <style
+        type="text/css"
+        id="current-color-scheme">
+        .ColorScheme-Text {
+            color:#232629;
+        }
+    </style>
+    <path d="M8 11.707l-6-6L2.707 5 8 10.293 13.293 5l.707.707-6 6z" class="ColorScheme-Text" fill="currentColor"/>
+</svg>

src/apps/res/icons/deskflow-light/actions/16/go-up.svg

@@ -0,0 +1,10 @@
+<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+    <style
+        type="text/css"
+        id="current-color-scheme">
+        .ColorScheme-Text {
+            color:#232629;
+        }
+    </style>
+    <path d="M8 4.293l-6 6 .707.707L8 5.707 13.293 11l.707-.707-6-6z" class="ColorScheme-Text" fill="currentColor"/>
+</svg>

src/apps/res/icons/deskflow-light/actions/16/system-search.svg

@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#232629;
+      }
+      </style>
+  </defs>
+ <path style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 6.5 2 C 4.007 2 2 4.01 2 6.5 C 2 8.993 4.01 11 6.5 11 C 7.5636432 11 8.5263409 10.618801 9.2949219 10.005859 L 13.292969 14.003906 L 14 13.296875 L 10.001953 9.2988281 C 10.617604 8.529048 11 7.565338 11 6.5 C 11 4.007 8.99 2 6.5 2 z M 6.5 3 C 8.439 3 10 4.561 10 6.5 C 10 8.439 8.439 10 6.5 10 C 4.561 10 3 8.439 3 6.5 C 3 4.561 4.561 3 6.5 3 z "
+     class="ColorScheme-Text"
+     />
+</svg>

src/apps/res/icons/deskflow-light/actions/22/go-down.svg

@@ -0,0 +1,14 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#232629;
+      }
+      </style>
+  </defs>
+ <path 
+    style="fill:currentColor;fill-opacity:1;stroke:none" 
+	d="m3.707031 7l-.707031.707031 6.125 6.125 1.875 1.875 1.875-1.875 6.125-6.125-.707031-.707031-6.125 6.125-1.167969 1.167969-1.167969-1.167969-6.125-6.125"
+    class="ColorScheme-Text"
+    />  
+</svg>

src/apps/res/icons/deskflow-light/actions/22/go-up.svg

@@ -0,0 +1,10 @@
+<svg viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
+    <style
+        type="text/css"
+        id="current-color-scheme">
+        .ColorScheme-Text {
+            color:#232629;
+        }
+    </style>
+    <path d="M3.707 15L3 14.293l6.125-6.125L11 6.293l1.875 1.875L19 14.293l-.707.707-6.125-6.125L11 7.707 9.832 8.875 3.707 15" class="ColorScheme-Text" fill="currentColor"/>
+</svg>

src/apps/res/icons/deskflow-light/actions/22/system-search.svg

@@ -0,0 +1,14 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#232629;
+      }
+      </style>
+  </defs>
+ <path 
+    style="fill:currentColor;fill-opacity:1;stroke:none" 
+    d="M 9 3 C 5.6759952 3 3 5.6759952 3 9 C 3 12.324005 5.6759952 15 9 15 C 10.481205 15 11.830584 14.465318 12.875 13.582031 L 18.292969 19 L 19 18.292969 L 13.582031 12.875 C 14.465318 11.830584 15 10.481205 15 9 C 15 5.6759952 12.324005 3 9 3 z M 9 4 C 11.770005 4 14 6.2299952 14 9 C 14 11.770005 11.770005 14 9 14 C 6.2299952 14 4 11.770005 4 9 C 4 6.2299952 6.2299952 4 9 4 z "
+    class="ColorScheme-Text"
+    />  
+</svg>

src/apps/res/icons/deskflow-light/actions/24/go-down.svg

@@ -0,0 +1,12 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#232629;
+      }
+      </style>
+  </defs>
+  <g transform="translate(1,1)">
+    <path style="fill:currentColor;fill-opacity:1;stroke:none" d="m3.707031 7l-.707031.707031 6.125 6.125 1.875 1.875 1.875-1.875 6.125-6.125-.707031-.707031-6.125 6.125-1.167969 1.167969-1.167969-1.167969-6.125-6.125" class="ColorScheme-Text"/>
+  </g>
+</svg>

src/apps/res/icons/deskflow-light/actions/24/go-up.svg

@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24">
+  <style type="text/css" id="current-color-scheme">
+        .ColorScheme-Text {
+            color:#232629;
+        }
+    </style>
+  <g transform="translate(1,1)">
+    <path d="M3.707 15L3 14.293l6.125-6.125L11 6.293l1.875 1.875L19 14.293l-.707.707-6.125-6.125L11 7.707 9.832 8.875 3.707 15" class="ColorScheme-Text" fill="currentColor"/>
+  </g>
+</svg>

src/apps/res/icons/deskflow-light/actions/24/system-search.svg

@@ -0,0 +1,12 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#232629;
+      }
+      </style>
+  </defs>
+  <g transform="translate(1,1)">
+    <path style="fill:currentColor;fill-opacity:1;stroke:none" d="M 9 3 C 5.6759952 3 3 5.6759952 3 9 C 3 12.324005 5.6759952 15 9 15 C 10.481205 15 11.830584 14.465318 12.875 13.582031 L 18.292969 19 L 19 18.292969 L 13.582031 12.875 C 14.465318 11.830584 15 10.481205 15 9 C 15 5.6759952 12.324005 3 9 3 z M 9 4 C 11.770005 4 14 6.2299952 14 9 C 14 11.770005 11.770005 14 9 14 C 6.2299952 14 4 11.770005 4 9 C 4 6.2299952 6.2299952 4 9 4 z " class="ColorScheme-Text"/>
+  </g>
+</svg>

src/apps/res/icons/deskflow-light/actions/32/go-down.svg

@@ -0,0 +1,10 @@
+<svg viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
+    <style
+        type="text/css"
+        id="current-color-scheme">
+        .ColorScheme-Text {
+            color:#232629;
+        }
+    </style>
+    <path d="M16 23.707l-14-14L2.707 9 16 22.293 29.293 9l.707.707z" class="ColorScheme-Text" fill="currentColor"/>
+</svg>

src/apps/res/icons/deskflow-light/actions/32/go-up.svg

@@ -0,0 +1,10 @@
+<svg viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
+    <style
+        type="text/css"
+        id="current-color-scheme">
+        .ColorScheme-Text {
+            color:#232629;
+        }
+    </style>
+    <path d="M16 8.293l-14 14 .707.707L16 9.707 29.293 23l.707-.707z" class="ColorScheme-Text" fill="currentColor"/>
+</svg>

src/apps/res/icons/deskflow-light/actions/32/system-search.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" width="32" height="32">
+    <style type="text/css" id="current-color-scheme">
+        .ColorScheme-Text {
+            color:#232629;
+        }
+    </style>
+    <g id="system-search" transform="translate(0 -32) translate(-22,32)">
+        <path id="path66" class="ColorScheme-Text" d="m35 4a9 9 0 0 0-9 9 9 9 0 0 0 9 9 9 9 0 0 0 5.994141-2.298828l8.298828 8.298828 0.707031-0.707031-8.300781-8.300782a9 9 0 0 0 2.300781-5.992187 9 9 0 0 0-9-9zm0 1a8 8 0 0 1 8 8 8 8 0 0 1-8 8 8 8 0 0 1-8-8 8 8 0 0 1 8-8z" fill="currentColor"/>
+        <path id="path68" d="m22 0v32h32v-32z" fill="none"/>
+    </g>
+</svg>

src/apps/res/icons/deskflow-light/apps/64/deskflow-symbolic.svg

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   height="400"
-   viewBox="0 -960 16000 16000"
-   width="400"
-   fill="#e8eaed"
-   version="1.1"
-   id="svg58"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs62" />
-  <g
-     id="g312"
-     transform="matrix(0.95521236,0,0,0.88584237,358.301,773.57086)">
-    <path
-       style="fill:#1a1a1a;fill-opacity:1;stroke-width:22.0314"
-       d="m 10822.775,14277.69 c -1195.5832,-143.508 -2220.2063,-841.148 -3268.3667,-1379.127 -718.8533,-355.301 -1431.1297,-838.976 -2251.4363,-896.085 -491.0057,-34.634 -993.9142,16.701 -1419.8658,282.946 -632.9097,323.689 -1041.4867,924.538 -1556.5718,1387.702 -543.283,324.938 -1024.416,-324.503 -999.9439,-831.854 -66.7515,-706.46 526.7775,-1215.106 971.4799,-1675.328 796.7042,-788.985 1908.9735,-1339.2985 3051.7899,-1198.3588 1348.2477,151.6528 2490.0786,954.1998 3671.9639,1551.7868 812.8473,430.368 1732.2728,937.309 2680.6698,656.999 865.182,-240.211 1345.317,-1049.536 1918.072,-1669.709 419.319,-369.53 999.56,99.027 1037.303,575.62 144.849,591.439 -228.81,1099.793 -584.858,1527.872 -674.991,878.758 -1646.404,1612.499 -2788.132,1678.492 -153.996,19.794 -308.698,6.257 -462.104,-10.956 z"
-       id="path3393" />
-    <path
-       style="fill:#1a1a1a;fill-opacity:1;stroke-width:26.9658"
-       d="M 10691.975,9232.2954 C 9345.1884,8998.8534 8209.7623,8175.6727 7013.3992,7567.553 6317.9006,7189.0731 5542.8247,6853.4818 4732.6528,6969.3648 3791.0852,7073.1473 3096.3863,7808.0894 2511.2819,8487.0616 2153.4997,8962.5979 1492.1857,8662.9151 1369.9995,8151.7319 1161.0166,7603.1278 1417.243,7018.9363 1804.1792,6620.924 2646.9373,5624.9864 3867.0135,4790.8306 5227.0245,4902.123 c 1538.2424,122.1926 2802.7979,1096.8978 4150.0464,1747.2218 689.4831,373.3537 1480.8271,695.5213 2275.6811,498.2159 843.443,-225.4675 1355.155,-986.6873 1874.463,-1625.928 303.839,-429.2412 935.004,-202.6984 1073.134,247.0946 229.503,525.6439 50.159,1127.049 -311.918,1545.1618 -731.881,1031.1947 -1847.889,1971.3437 -3180.435,1938.7364 -138.853,1.6775 -278.273,-1.5834 -416.021,-20.3301 z"
-       id="path1767" />
-    <path
-       style="fill:#1a1a1a;fill-opacity:1;stroke-width:26.9658"
-       d="M 10576.744,4172.4544 C 8874.8637,3865.0547 7544.5841,2635.7395 5940.4635,2069.4233 5180.2383,1837.8115 4305.6379,1885.6382 3648.4341,2367.3105 c -522.046,315.7633 -870.3773,828.5536 -1307.695,1235.7633 -408.0241,287.6051 -882.8065,-100.3925 -976.5864,-516.0856 -207.011,-566.4578 84.2445,-1166.9024 491.559,-1564.2835 824.1797,-978.84256 2034.8379,-1776.07292 3363.7164,-1666.23087 1553.6459,128.553637 2838.511,1104.93638 4193.6746,1778.01277 748.5153,409.2855 1666.3233,736.8711 2500.3373,374.9559 742.862,-301.9425 1184.93,-1003.6082 1669.344,-1599.36398 390.513,-404.4477409 1011.637,22.50986 1078.781,494.20116 143.129,510.48212 -76.578,1022.79062 -407.346,1408.75032 -715.856,1002.3301 -1795.1,1907.7734 -3088.381,1906.4911 -197.264,2.2737 -394.6,-14.3348 -589.094,-47.0667 z"
-       id="path970" />
-  </g>
-</svg>

src/apps/res/icons/deskflow-light/apps/64/deskflow.svg

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="128.00002"
-   height="127.99999"
-   viewBox="0 0 33.866671 33.866665"
-   version="1.1"
-   id="svg1"
-   xml:space="preserve"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"><defs
-     id="defs1" /><g
-     id="layer1"
-     transform="translate(-32.279167,-138.64166)"><g
-       style="fill:#e8eaed"
-       id="g1"
-       transform="matrix(0.00196863,0,0,0.00196863,33.463433,141.71593)"><g
-         id="g312"
-         transform="matrix(1.002973,0,0,0.93013448,-23.783992,460.24941)"><path
-           style="fill:#3366cc;fill-opacity:1;stroke-width:22.0314"
-           d="m 10822.775,14277.69 c -1195.5832,-143.508 -2220.2063,-841.148 -3268.3667,-1379.127 -718.8533,-355.301 -1431.1297,-838.976 -2251.4363,-896.085 -491.0057,-34.634 -993.9142,16.701 -1419.8658,282.946 -632.9097,323.689 -1041.4867,924.538 -1556.5718,1387.702 -543.283,324.938 -1024.416,-324.503 -999.9439,-831.854 -66.7515,-706.46 526.7775,-1215.106 971.4799,-1675.328 796.7042,-788.985 1908.9735,-1339.2985 3051.7899,-1198.3588 1348.2477,151.6528 2490.0786,954.1998 3671.9639,1551.7868 812.8473,430.368 1732.2728,937.309 2680.6698,656.999 865.182,-240.211 1345.317,-1049.536 1918.072,-1669.709 419.319,-369.53 999.56,99.027 1037.303,575.62 144.849,591.439 -228.81,1099.793 -584.858,1527.872 -674.991,878.758 -1646.404,1612.499 -2788.132,1678.492 -153.996,19.794 -308.698,6.257 -462.104,-10.956 z"
-           id="path3393" /><path
-           style="fill:#33b2cc;fill-opacity:1;stroke-width:26.9658"
-           d="M 10691.975,9232.2954 C 9345.1884,8998.8534 8209.7623,8175.6727 7013.3992,7567.553 6317.9006,7189.0731 5542.8247,6853.4818 4732.6528,6969.3648 3791.0852,7073.1473 3096.3863,7808.0894 2511.2819,8487.0616 2153.4997,8962.5979 1492.1857,8662.9151 1369.9995,8151.7319 1161.0166,7603.1278 1417.243,7018.9363 1804.1792,6620.924 2646.9373,5624.9864 3867.0135,4790.8306 5227.0245,4902.123 c 1538.2424,122.1926 2802.7979,1096.8978 4150.0464,1747.2218 689.4831,373.3537 1480.8271,695.5213 2275.6811,498.2159 843.443,-225.4675 1355.155,-986.6873 1874.463,-1625.928 303.839,-429.2412 935.004,-202.6984 1073.134,247.0946 229.503,525.6439 50.159,1127.049 -311.918,1545.1618 -731.881,1031.1947 -1847.889,1971.3437 -3180.435,1938.7364 -138.853,1.6775 -278.273,-1.5834 -416.021,-20.3301 z"
-           id="path1767" /><path
-           style="fill:#33cc99;fill-opacity:1;stroke-width:26.9658"
-           d="M 10576.744,4172.4544 C 8874.8637,3865.0547 7544.5841,2635.7395 5940.4635,2069.4233 5180.2383,1837.8115 4305.6379,1885.6382 3648.4341,2367.3105 c -522.046,315.7633 -870.3773,828.5536 -1307.695,1235.7633 -408.0241,287.6051 -882.8065,-100.3925 -976.5864,-516.0856 -207.011,-566.4578 84.2445,-1166.9024 491.559,-1564.2835 824.1797,-978.84256 2034.8379,-1776.07292 3363.7164,-1666.23087 1553.6459,128.553637 2838.511,1104.93638 4193.6746,1778.01277 748.5153,409.2855 1666.3233,736.8711 2500.3373,374.9559 742.862,-301.9425 1184.93,-1003.6082 1669.344,-1599.36398 390.513,-404.4477409 1011.637,22.50986 1078.781,494.20116 143.129,510.48212 -76.578,1022.79062 -407.346,1408.75032 -715.856,1002.3301 -1795.1,1907.7734 -3088.381,1906.4911 -197.264,2.2737 -394.6,-14.3348 -589.094,-47.0667 z"
-           id="path970" /></g></g></g></svg>

src/apps/res/icons/deskflow-light/apps/64/org.deskflow.deskflow-symbolic.svg

@@ -0,0 +1,10 @@
+<svg version="1.1" viewBox="0 0 64 64" xmlns="http://www.w3.org/2000/svg">
+    <defs id="defs62">
+      <style type="text/css" id="current-color-scheme">.ColorScheme-Text { color: #232629; } </style>
+  </defs>
+    <g fill="currentColor" class="ColorScheme-Text">
+        <path transform="matrix(.0035792 0 0 .00332131 3.3640502 8.5103867)" d="m10822.775 14277.69c-1195.5832-143.508-2220.2063-841.148-3268.3667-1379.127-718.8533-355.301-1431.1297-838.976-2251.4363-896.085-491.0057-34.634-993.9142 16.701-1419.8658 282.946-632.9097 323.689-1041.4867 924.538-1556.5718 1387.702-543.283 324.938-1024.416-324.503-999.9439-831.854-66.7515-706.46 526.7775-1215.106 971.4799-1675.328 796.7042-788.985 1908.9735-1339.2985 3051.7899-1198.3588 1348.2477 151.6528 2490.0786 954.1998 3671.9639 1551.7868 812.8473 430.368 1732.2728 937.309 2680.6698 656.999 865.182-240.211 1345.317-1049.536 1918.072-1669.709 419.319-369.53 999.56 99.027 1037.303 575.62 144.849 591.439-228.81 1099.793-584.858 1527.872-674.991 878.758-1646.404 1612.499-2788.132 1678.492-153.996 19.794-308.698 6.257-462.104-10.956z"/>
+        <path transform="matrix(.0035792 0 0 .00332131 3.3640502 8.5103867)" d="m10691.975 9232.2954c-1346.7866-233.442-2482.2127-1056.6227-3678.5758-1664.7424-695.4986-378.4799-1470.5745-714.0712-2280.7464-598.1882-941.5676 103.7825-1636.2665 838.7246-2221.3709 1517.6968-357.7822 475.5363-1019.0962 175.8535-1141.2824-335.3297-208.9829-548.6041 47.2435-1132.7956 434.1797-1530.8079 842.7581-995.9376 2062.8343-1830.0934 3422.8453-1718.801 1538.2424 122.1926 2802.7979 1096.8978 4150.0464 1747.2218 689.4831 373.3537 1480.8271 695.5213 2275.6811 498.2159 843.443-225.4675 1355.155-986.6873 1874.463-1625.928 303.839-429.2412 935.004-202.6984 1073.134 247.0946 229.503 525.6439 50.159 1127.049-311.918 1545.1618-731.881 1031.1947-1847.889 1971.3437-3180.435 1938.7364-138.853 1.6775-278.273-1.5834-416.021-20.3301z"/>
+        <path transform="matrix(.0035792 0 0 .00332131 3.3640502 8.5103867)" d="m10576.744 4172.4544c-1701.8803-307.3997-3032.1599-1536.7149-4636.2805-2103.0311-760.2252-231.6118-1634.8256-183.7851-2292.0294 297.8872-522.046 315.7633-870.3773 828.5536-1307.695 1235.7633-408.0241 287.6051-882.8065-100.3925-976.5864-516.0856-207.011-566.4578 84.2445-1166.9024 491.559-1564.2835 824.1797-978.84256 2034.8379-1776.0729 3363.7164-1666.2309 1553.6459 128.55364 2838.511 1104.9364 4193.6746 1778.0128 748.5153 409.2855 1666.3233 736.8711 2500.3373 374.9559 742.862-301.9425 1184.93-1003.6082 1669.344-1599.364 390.513-404.44774 1011.637 22.50986 1078.781 494.20116 143.129 510.48212-76.578 1022.7906-407.346 1408.7503-715.856 1002.3301-1795.1 1907.7734-3088.381 1906.4911-197.264 2.2737-394.6-14.3348-589.094-47.0667z"/>
+    </g>
+</svg>

src/apps/res/icons/deskflow-light/apps/64/org.deskflow.deskflow.svg

@@ -0,0 +1,7 @@
+<svg version="1.1" viewBox="0 0 64 64" xmlns="http://www.w3.org/2000/svg">
+    <g>
+        <path transform="matrix(.0035792 0 0 .00332131 3.3640502 8.5103867)" d="m10822.775 14277.69c-1195.5832-143.508-2220.2063-841.148-3268.3667-1379.127-718.8533-355.301-1431.1297-838.976-2251.4363-896.085-491.0057-34.634-993.9142 16.701-1419.8658 282.946-632.9097 323.689-1041.4867 924.538-1556.5718 1387.702-543.283 324.938-1024.416-324.503-999.9439-831.854-66.7515-706.46 526.7775-1215.106 971.4799-1675.328 796.7042-788.985 1908.9735-1339.2985 3051.7899-1198.3588 1348.2477 151.6528 2490.0786 954.1998 3671.9639 1551.7868 812.8473 430.368 1732.2728 937.309 2680.6698 656.999 865.182-240.211 1345.317-1049.536 1918.072-1669.709 419.319-369.53 999.56 99.027 1037.303 575.62 144.849 591.439-228.81 1099.793-584.858 1527.872-674.991 878.758-1646.404 1612.499-2788.132 1678.492-153.996 19.794-308.698 6.257-462.104-10.956z" fill="#36c"/>
+        <path transform="matrix(.0035792 0 0 .00332131 3.3640502 8.5103867)" d="m10691.975 9232.2954c-1346.7866-233.442-2482.2127-1056.6227-3678.5758-1664.7424-695.4986-378.4799-1470.5745-714.0712-2280.7464-598.1882-941.5676 103.7825-1636.2665 838.7246-2221.3709 1517.6968-357.7822 475.5363-1019.0962 175.8535-1141.2824-335.3297-208.9829-548.6041 47.2435-1132.7956 434.1797-1530.8079 842.7581-995.9376 2062.8343-1830.0934 3422.8453-1718.801 1538.2424 122.1926 2802.7979 1096.8978 4150.0464 1747.2218 689.4831 373.3537 1480.8271 695.5213 2275.6811 498.2159 843.443-225.4675 1355.155-986.6873 1874.463-1625.928 303.839-429.2412 935.004-202.6984 1073.134 247.0946 229.503 525.6439 50.159 1127.049-311.918 1545.1618-731.881 1031.1947-1847.889 1971.3437-3180.435 1938.7364-138.853 1.6775-278.273-1.5834-416.021-20.3301z" fill="#33b2cc"/>
+        <path transform="matrix(.0035792 0 0 .00332131 3.3640502 8.5103867)" d="m10576.744 4172.4544c-1701.8803-307.3997-3032.1599-1536.7149-4636.2805-2103.0311-760.2252-231.6118-1634.8256-183.7851-2292.0294 297.8872-522.046 315.7633-870.3773 828.5536-1307.695 1235.7633-408.0241 287.6051-882.8065-100.3925-976.5864-516.0856-207.011-566.4578 84.2445-1166.9024 491.559-1564.2835 824.1797-978.84256 2034.8379-1776.0729 3363.7164-1666.2309 1553.6459 128.55364 2838.511 1104.9364 4193.6746 1778.0128 748.5153 409.2855 1666.3233 736.8711 2500.3373 374.9559 742.862-301.9425 1184.93-1003.6082 1669.344-1599.364 390.513-404.44774 1011.637 22.50986 1078.781 494.20116 143.129 510.48212-76.578 1022.7906-407.346 1408.7503-715.856 1002.3301-1795.1 1907.7734-3088.381 1906.4911-197.264 2.2737-394.6-14.3348-589.094-47.0667z" fill="#3c9"/>
+    </g>
+</svg>

src/apps/res/windows.rc.in

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2025 Chris Rizzitello <sithlord48@gmail.com>
+// SPDX-FileCopyrightText: (C) 2025 Chris Rizzitello <sithlord48@gmail.com>
 // SPDX-License-Identifier: MIT
 // Generic Template for rc files in deskflow
 #include <windows.h>

src/lib/CMakeLists.txt

@@ -1,10 +1,8 @@
-# SPDX-FileCopyrightText: 2024 Deskflow Developers
-# SPDX-FileCopyrightText: 2012 - 2024 Symless Ltd
-# SPDX-FileCopyrightText: 2009 - 2012 Nick Bolton
+# SPDX-FileCopyrightText: (C) 2024 Deskflow Developers
+# SPDX-FileCopyrightText: (C) 2012 - 2024 Symless Ltd
+# SPDX-FileCopyrightText: (C) 2009 - 2012 Nick Bolton
 # SPDX-License-Identifier: MIT
 
-configure_file(VersionInfo.h.in VersionInfo.h @ONLY)
-
 add_subdirectory(arch)
 add_subdirectory(base)
 add_subdirectory(client)

src/lib/arch/Arch.cpp

@@ -26,11 +26,6 @@ Arch::Arch()
   s_instance = this;
 }
 
-Arch::Arch(Arch *arch)
-{
-  s_instance = arch;
-}
-
 #if SYSAPI_WIN32
 void Arch::init()
 {

src/lib/arch/Arch.h

@@ -25,8 +25,6 @@
 
 #pragma once
 
-#include "common/Common.h"
-
 #if SYSAPI_WIN32
 
 #include "arch/win32/ArchDaemonWindows.h"
@@ -36,7 +34,7 @@
 
 #elif SYSAPI_UNIX
 
-#include "arch/unix/ArchDaemonUnix.h"
+#include "arch/ArchDaemonNone.h"
 #include "arch/unix/ArchLogUnix.h"
 #include "arch/unix/ArchMultithreadPosix.h"
 #include "arch/unix/ArchNetworkBSD.h"
@@ -63,7 +61,6 @@ class Arch : public ARCH_DAEMON, public ARCH_LOG, public ARCH_MULTITHREAD, publi
 {
 public:
   Arch();
-  explicit Arch(Arch *arch);
   ~Arch() override = default;
 
 #if SYSAPI_WIN32
@@ -86,11 +83,6 @@ public:
   */
   static Arch *getInstance();
 
-  static void setInstance(Arch *s)
-  {
-    s_instance = s;
-  }
-
   /**
    * @brief blocks calling thread for timout seconds
    * @param timeout - blocking time in seconds. if < 0 not blocked if == 0 then caller yields the CPU

src/lib/arch/ArchDaemonNone.cpp

@@ -1,27 +0,0 @@
-/*
- * Deskflow -- mouse and keyboard sharing utility
- * SPDX-FileCopyrightText: (C) 2012 - 2016 Symless Ltd.
- * SPDX-FileCopyrightText: (C) 2002 Chris Schoeneman
- * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
- */
-
-#include "arch/ArchDaemonNone.h"
-#include <QString>
-
-//
-// ArchDaemonNone
-//
-
-int ArchDaemonNone::daemonize(const QString &name, DaemonFunc const &func)
-{
-  // simply forward the call to func.  obviously, this doesn't
-  // do any daemonizing.
-  auto t = name.toStdString();
-  const char *n = t.c_str();
-  return func(1, &n);
-}
-
-QString ArchDaemonNone::commandLine() const
-{
-  return {};
-}

src/lib/arch/ArchDaemonNone.h

@@ -1,5 +1,6 @@
 /*
  * Deskflow -- mouse and keyboard sharing utility
+ * SPDX-FileCopyrightText: (C) 2025 Deskflow Developers.
  * SPDX-FileCopyrightText: (C) 2012 - 2016 Symless Ltd.
  * SPDX-FileCopyrightText: (C) 2002 Chris Schoeneman
  * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
@@ -24,6 +25,14 @@ public:
   ~ArchDaemonNone() override = default;
 
   // IArchDaemon overrides
-  int daemonize(const QString &name, DaemonFunc const &func) override;
-  QString commandLine() const override;
+  int daemonize(DaemonFunc const &func) override
+  {
+    // simply forward the call to func.  obviously, this doesn't
+    // do any daemonizing.
+    return func();
+  }
+  QString commandLine() const override
+  {
+    return {};
+  }
 };

src/lib/arch/CMakeLists.txt

@@ -1,6 +1,6 @@
-# SPDX-FileCopyrightText: 2024 - 2025 Chris Rizzitello <sithlord48@gmail.com>
-# SPDX-FileCopyrightText: 2012 - 2024 Symless Ltd
-# SPDX-FileCopyrightText: 2009 - 2012 Nick Bolton
+# SPDX-FileCopyrightText: (C) 2024 - 2025 Chris Rizzitello <sithlord48@gmail.com>
+# SPDX-FileCopyrightText: (C) 2012 - 2024 Symless Ltd
+# SPDX-FileCopyrightText: (C) 2009 - 2012 Nick Bolton
 # SPDX-License-Identifier: MIT
 
 # Platform Specific Code
@@ -22,8 +22,6 @@ if(WIN32)
 
 elseif(UNIX)
   set(PLATFORM_CODE
-    unix/ArchDaemonUnix.cpp
-    unix/ArchDaemonUnix.h
     unix/ArchLogUnix.cpp
     unix/ArchLogUnix.h
     unix/ArchMultithreadPosix.cpp
@@ -38,7 +36,6 @@ endif()
 add_library(arch STATIC ${PLATFORM_CODE}
   Arch.cpp
   Arch.h
-  ArchDaemonNone.cpp
   ArchDaemonNone.h
   ArchException.h
   IArchDaemon.h

src/lib/arch/IArchDaemon.h

@@ -1,6 +1,6 @@
 /*
  * Deskflow -- mouse and keyboard sharing utility
- * SPDX-FileCopyrightText: (C) 2025 Deskflow Developers
+ * SPDX-FileCopyrightText: (C) 2025 - 2026 Deskflow Developers
  * SPDX-FileCopyrightText: (C) 2012 - 2016 Symless Ltd.
  * SPDX-FileCopyrightText: (C) 2002 Chris Schoeneman
  * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
@@ -20,7 +20,7 @@ implement this interface.
 class IArchDaemon
 {
 public:
-  using DaemonFunc = std::function<int(int, const char **)>;
+  using DaemonFunc = std::function<int()>;
 
   virtual ~IArchDaemon() = default;
   //! @name manipulators
@@ -41,19 +41,19 @@ public:
     Becomes a service.  Argument 0 is the name of the service
     and the rest are the arguments passed to StartService().
     \c func is only called when the service is actually started.
-    \c func must call \c ArchMiscWindows::runDaemon() to finally
+    \c func must call \c ArchDaemonWindows::runDaemon() to finally
     becoming a service.  The \c runFunc function passed to \c runDaemon()
-    must call \c ArchMiscWindows::daemonRunning(true) when it
+    must call \c ArchDaemonWindows::daemonRunning(true) when it
     enters the main loop (i.e. after initialization) and
-    \c ArchMiscWindows::daemonRunning(false) when it leaves
+    \c ArchDaemonWindows::daemonRunning(false) when it leaves
     the main loop.  The \c stopFunc function passed to \c runDaemon()
     is called when the daemon must exit the main loop and it must cause
     \c runFunc to return.  \c func should return what \c runDaemon()
     returns.  \c func or \c runFunc can call
-    \c ArchMiscWindows::daemonFailed() to indicate startup failure.
+    \c ArchDaemonWindows::daemonFailed() to indicate startup failure.
   </ul>
   */
-  virtual int daemonize(const QString &name, DaemonFunc const &func) = 0;
+  virtual int daemonize(DaemonFunc const &func) = 0;
 
   //@}
 

src/lib/arch/IArchLog.h

@@ -37,15 +37,6 @@ public:
   */
   virtual void closeLog() = 0;
 
-  //! Show the log
-  /*!
-  Causes the log to become visible.  This generally only makes sense
-  for a log in a graphical user interface.  Other implementations
-  will do nothing.  Iff \p showIfEmpty is \c false then the implementation
-  may optionally only show the log if it's not empty.
-  */
-  virtual void showLog(bool showIfEmpty) = 0;
-
   //! Write to the log
   /*!
   Writes the given string to the log with the given level.

src/lib/arch/unix/ArchDaemonUnix.cpp

@@ -1,115 +0,0 @@
-/*
- * Deskflow -- mouse and keyboard sharing utility
- * SPDX-FileCopyrightText: (C) 2025 Deskflow Developers
- * SPDX-FileCopyrightText: (C) 2012 - 2016 Symless Ltd.
- * SPDX-FileCopyrightText: (C) 2002 Chris Schoeneman
- * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
- */
-
-#include "arch/unix/ArchDaemonUnix.h"
-
-#include "arch/ArchException.h"
-#include "arch/unix/XArchUnix.h"
-#include "base/Log.h"
-
-#include <cstdlib>
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-#include <QString>
-//
-// ArchDaemonUnix
-//
-
-#ifdef __APPLE__
-
-// In Mac OS X, fork()'d child processes can't use most APIs (the frameworks
-// that Deskflow uses in fact prevent it and make the process just up and die),
-// so need to exec a copy of the program that doesn't fork so isn't limited.
-int execSelfNonDaemonized()
-{
-  extern char **NXArgv;
-  char **selfArgv = NXArgv;
-
-  setenv("_DESKFLOW_DAEMONIZED", "", 1);
-
-  execvp(selfArgv[0], selfArgv);
-  return 0;
-}
-
-bool alreadyDaemonized()
-{
-  return std::getenv("_DESKFLOW_DAEMONIZED") != nullptr;
-}
-
-#endif
-
-int ArchDaemonUnix::daemonize(const QString &name, DaemonFunc const &func)
-{
-#ifdef __APPLE__
-  if (alreadyDaemonized()) {
-    auto t = name.toStdString();
-    const char *n = t.c_str();
-    return func(1, &n);
-  }
-#endif
-
-  // fork so shell thinks we're done and so we're not a process
-  // group leader
-  switch (fork()) {
-  case -1:
-    // failed
-    throw ArchDaemonFailedException(errorToString(errno));
-
-  case 0:
-    // child
-    break;
-
-  default:
-    // parent exits
-    exit(0);
-  }
-
-  // become leader of a new session
-  setsid();
-
-#ifndef __APPLE__
-  // NB: don't run chdir on apple; causes strange behaviour.
-  // chdir to root so we don't keep mounted filesystems points busy
-  // TODO: this is a bit of a hack - can we find a better solution?
-  if (int chdirErr = chdir("/"); chdirErr)
-    // NB: file logging actually isn't working at this point!
-    LOG_ERR("chdir error: %i", chdirErr);
-#endif
-
-  // mask off permissions for any but owner
-  umask(077);
-
-  // close open files.  we only expect stdin, stdout, stderr to be open.
-  close(0);
-  close(1);
-  close(2);
-
-  // attach file descriptors 0, 1, 2 to /dev/null so inadvertent use
-  // of standard I/O safely goes in the bit bucket.
-  open("/dev/null", O_RDONLY);
-  open("/dev/null", O_RDWR);
-
-  if (int dupErr = dup(1); dupErr < 0) {
-    // NB: file logging actually isn't working at this point!
-    LOG_ERR("dup error: %i", dupErr);
-  }
-
-#ifdef __APPLE__
-  return execSelfNonDaemonized();
-#endif
-
-  // invoke function
-
-  auto t = name.toStdString();
-  const char *n = t.c_str();
-  return func(1, &n);
-}

src/lib/arch/unix/ArchDaemonUnix.h

@@ -1,24 +0,0 @@
-/*
- * Deskflow -- mouse and keyboard sharing utility
- * SPDX-FileCopyrightText: (C) 2012 - 2016 Symless Ltd.
- * SPDX-FileCopyrightText: (C) 2002 Chris Schoeneman
- * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
- */
-
-#pragma once
-
-#include "arch/ArchDaemonNone.h"
-
-#undef ARCH_DAEMON
-#define ARCH_DAEMON ArchDaemonUnix
-
-//! Unix implementation of IArchDaemon
-class ArchDaemonUnix : public ArchDaemonNone
-{
-public:
-  ArchDaemonUnix() = default;
-  ~ArchDaemonUnix() override = default;
-
-  // IArchDaemon overrides
-  int daemonize(const QString &name, DaemonFunc const &func) override;
-};

src/lib/arch/unix/ArchLogUnix.cpp

@@ -23,11 +23,6 @@ void ArchLogUnix::closeLog()
   closelog();
 }
 
-void ArchLogUnix::showLog(bool)
-{
-  // do nothing
-}
-
 void ArchLogUnix::writeLog(LogLevel level, const QString &msg)
 {
   // convert level