Release v.18.0, with proper win package

fixes https://github.com/deskflow/deskflow/issues/7942

.github/actions/init-python/action.yml

@@ -1,23 +0,0 @@
-# Important: Do not be tempted to cache the .venv dir (Python virtual environment).
-# When the runner environment changes (e.g. Python is upgraded), the venv will need to be
-# re-created. Trying to upgrade a venv can be complex and it's usually more practical re-create it.
-# We don't save much time anyway by caching the venv so it's not worth the added complexity.
-
-name: "Setup Python venv"
-description: "Creates a Python virtual environment (venv)"
-
-runs:
-  using: "composite"
-
-  steps:
-    - name: Setup Python venv
-      run: |
-        if [ "${{ runner.os }}" == "Windows" ]; then
-          python=python
-        else
-          python=python3
-        fi
-
-        echo "Setting up Python venv, bin=$python"
-        $python -m venv .venv
-      shell: bash

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

@@ -95,6 +95,8 @@ runs:
     - name: Install Wix
       if: ${{ runner.os == 'Windows' }}
       run: |
-        dotnet tool install --global wix --version 4.0.4
-        wix extension add --global WixToolset.UI.wixext/4.0.4
+        dotnet tool install --global wix --version 5.0.2
+        wix extension add --global WixToolset.UI.wixext/5.0.2
+        wix extension add --global WixToolset.Util.wixext/5.0.2
+        wix extension add --global WixToolset.Firewall.wixext/5.0.2
       shell: pwsh

.github/actions/lint-check/action.yml

@@ -1,26 +1,21 @@
-name: "Lint error"
+name: "Lint Check"
 description: "Checks for lint errors and posts a helpful comment"
 
-inputs:
-  format-command:
-    description: "The command to run to fix lint errors"
-    required: true
-
-  format-tool:
-    description: "The name of the linting tool"
-    required: true
-
 runs:
   using: "composite"
   steps:
+    - name: Install Dependencies
+      run: pipx install --global clang_format
+      shell: bash
+
     - name: Run format command
-      run: ${{ inputs.format-command }}
+      run: find src/ -regex '.*\.\(cpp\|hpp\|cc\|cxx\|h\|c\|m\|mm\)' -exec clang-format -i {} \;
       shell: bash
 
     - name: Find changes
       id: changes
       run: |
-        file=${{ inputs.format-tool }}.diff
+        file=clang-format.diff
         diff=$(git diff | tee $file)
 
         if [ -z "$diff" ]; then
@@ -43,7 +38,7 @@ runs:
       if: steps.changes.outputs.diff
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ inputs.format-tool }}-diff
+        name: clang-format-diff
         path: ${{ steps.changes.outputs.file }}
         if-no-files-found: error
 
@@ -54,9 +49,9 @@ runs:
         code_block="\`\`\`"
 
         summary=$(cat<<EOF
-        ❌ \`${{ inputs.format-tool }}\`: It looks like your changes don't match our code style.
+        ❌ \`clang-format\`: It looks like your changes don't match our code style.
 
-        🛠️ Please either run \`${{ inputs.format-command }}\` or apply this patch with \`git apply\`:
+        🛠️ Please either run \`clang-format -i\` on the file or apply this patch with \`git apply\`:
 
         [\`${{ steps.changes.outputs.file }}\`](${{ steps.upload.outputs.artifact-url }})
         $code_block diff
@@ -67,7 +62,7 @@ runs:
         echo "$summary" >> $GITHUB_STEP_SUMMARY
 
         file="ci_summary.md"
-        echo "❌🛠️ \`${{ inputs.format-tool }}\`: Lint errors, fix available." >> $file
+        echo "❌🛠️ \`clang-format\`: Lint errors, fix available." >> $file
         echo "file=$file" >> $GITHUB_OUTPUT
       shell: bash
 
@@ -75,7 +70,7 @@ runs:
       if: steps.summary.outputs.file
       uses: actions/upload-artifact@v4
       with:
-        name: summary-${{ inputs.format-tool }}
+        name: summary-clang-format
         path: ${{ steps.summary.outputs.file }}
         if-no-files-found: error
 

.github/actions/lint-clang/action.yml

@@ -1,21 +0,0 @@
-name: "Lint clang"
-description: "Lint with Clang formatter"
-
-runs:
-  using: "composite"
-
-  steps:
-    - name: Setup Python venv
-      uses: ./.github/actions/init-python
-
-    - name: Install dependencies
-      shell: bash
-      run: |
-        source .venv/bin/activate
-        pip install pyyaml clang_format
-
-    - name: Linting with Clang formatter
-      uses: ./.github/actions/lint-error
-      with:
-        format-command: ./scripts/lint_clang.py -f
-        format-tool: "clang-format"

.github/actions/winget-publish/action.yaml

@@ -21,8 +21,8 @@ runs:
         Invoke-WebRequest https://aka.ms/wingetcreate/latest -OutFile wingetcreate.exe
         
         $packageId = "Deskflow.Deskflow"
-        $installerUrl = "https://github.com/deskflow/deskflow/releases/download/v${{ inputs.release-version }}/deskflow-${{ inputs.release-version }}.0_win64.msi"
-        
+        $installerUrl = "https://github.com/deskflow/deskflow/releases/download/v${{ inputs.release-version }}/deskflow-${{ inputs.release-version }}-win-x64.msi"
+
         # Submit package update
         .\wingetcreate.exe update "$packageId" `
           --version "${{ inputs.release-version }}" `

.github/workflows/ci-comment.yml

@@ -11,7 +11,7 @@ name: CI comment
 
 on:
   workflow_run:
-    workflows: ["CI"]
+    workflows: ["Continuous Integration"]
     types:
       - completed
 

.github/workflows/continuous-integration.yml

@@ -2,7 +2,7 @@
 # Runs on all platforms (Windows, macOS, and Linux)
 # for all events (pull request, release, and schedule).
 
-name: CI
+name: Continuous Integration
 
 on:
   push:
@@ -34,7 +34,7 @@ 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
+    needs: lint-check
 
     outputs:
       no-sonar: ${{ steps.check.outputs.no-sonar }}
@@ -61,7 +61,7 @@ jobs:
   # Quality gate to allow PR merge, used in the branch protection rules.
   ci-passed:
     runs-on: ubuntu-latest
-    needs: [test-results, unix]
+    needs: [test-results, unix, flatpak]
 
     steps:
       - run: echo "✅ CI passed" > $GITHUB_STEP_SUMMARY
@@ -82,7 +82,7 @@ jobs:
       - name: Test summary
         uses: ./.github/actions/test-summary
 
-  lint-clang:
+  lint-check:
     runs-on: ubuntu-latest
     timeout-minutes: 5
 
@@ -90,11 +90,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Linting Clang
-        uses: ./.github/actions/lint-clang
+      - name: Lint Checker
+        uses: ./.github/actions/lint-check
 
   analyse-valgrind:
-    needs: lint-clang
+    needs: lint-check
     if: ${{ github.event_name == 'pull_request' }}
     uses: ./.github/workflows/valgrind-analysis.yml
 
@@ -106,7 +106,7 @@ jobs:
       SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
 
   main-build:
-    needs: lint-clang
+    needs: lint-check
     name: ${{ matrix.target.name }}
     runs-on: ${{ matrix.target.runs-on }}
     container: ${{ matrix.target.container }}
@@ -127,42 +127,42 @@ jobs:
             runs-on: "macos-14"
             timeout: 10
             arch: arm64
-            config-args: "-DCMAKE_OSX_ARCHITECTURES=\"arm64\" -DMACOSX_DEPLOYMENT_TARGET=12"
+            config-args: "-DCMAKE_OSX_ARCHITECTURES=\"arm64\""
 
           - name: "macos-13-x64"
             runs-on: macos-13
             timeout: 20
-            config-args: "-DCMAKE_OSX_ARCHITECTURES=\"x86_64\" -DMACOSX_DEPLOYMENT_TARGET=12"
+            config-args: "-DCMAKE_OSX_ARCHITECTURES=\"x86_64\""
 
-          - name: "debian-13-amd64"
+          - name: "debian-13-x86_64"
             runs-on: ubuntu-latest
             container: debian:trixie-slim
             like: "debian"
             timeout: 20
             config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
 
-          - name: "fedora-41-amd64"
+          - name: "fedora-41-x86_64"
             runs-on: ubuntu-latest
             container: fedora:41
             like: "fedora"
             timeout: 20
             config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
 
-          - name: "fedora-40-amd64"
+          - name: "fedora-40-x86_84"
             runs-on: ubuntu-latest
             container: fedora:40
             like: "fedora"
             timeout: 20
             config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
 
-          - name: "opensuse-amd64"
+          - name: "opensuse-x86_84"
             runs-on: ubuntu-latest
             container: opensuse/tumbleweed:latest
             like: "suse"
             timeout: 20
             config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
 
-          - name: "archlinux-amd64"
+          - name: "archlinux-x86_84"
             runs-on: ubuntu-latest
             container: archlinux:latest
             like: "arch"
@@ -205,26 +205,19 @@ jobs:
           mac-qt-version: 6.7.2
           like: ${{ matrix.target.like }}
 
-      - name: Setup Python
-        if: ${{runner.os != 'Linux' }}
-        run: python ./scripts/setup_venv.py
-
       - name: Get version
         uses: ./.github/actions/get-version
 
       - name: Configure
-        run: ${{env.CMAKE_CONFIGURE}} ${{ matrix.target.config-args }} ${{ steps.get-deps.outputs.vcpkg-cmake-config }} -DPACKAGE_VERSION_LABEL=${{env.DESKFLOW_PACKAGE_VERSION}}
+        run: ${{env.CMAKE_CONFIGURE}} ${{ matrix.target.config-args }} ${{ steps.get-deps.outputs.vcpkg-cmake-config }} -DPACKAGE_VERSION_LABEL="${{env.DESKFLOW_PACKAGE_VERSION}}"
 
       - name: Build
         shell: bash
         run: |
-          if [[ "$RUNNER_OS" == "Linux" && "${{matrix.target.like}}" != "arch" ]]; then
-            cmake --build build -j8 --target package
+          if [[ "${{matrix.target.like}}" != "arch" ]]; then
+            cmake --build build --config Release -j8 --target package
           else
-            cmake --build build -j8
-          fi
-
-          if [ ${{ matrix.target.like }} == "arch" ];then
+            cmake --build build --config Release -j8
             useradd -m build
             sudo chown -R build build
             cd build
@@ -241,23 +234,6 @@ jobs:
         with:
           job: ${{ matrix.target.name }}
 
-
-      - name: Package
-        if: ${{ runner.os != 'Linux' }}
-        shell: bash
-        run: |
-          python ./scripts/package.py --package-version ${{env.DESKFLOW_PACKAGE_VERSION}}
-          mv dist/deskflow* build/
-        env:
-          WINDOWS_PFX_CERTIFICATE: ${{ secrets.WINDOWS_PFX }}
-          WINDOWS_PFX_PASSWORD: ${{ secrets.WINDOWS_PFX_PASS }}
-          APPLE_CODESIGN_ID: ${{ secrets.APPLE_CODESIGN_ID }}
-          APPLE_P12_CERTIFICATE: ${{ secrets.APPLE_P12_CERTIFICATE }}
-          APPLE_P12_PASSWORD: ${{ secrets.APPLE_P12_PASSWORD }}
-          APPLE_NOTARY_USER: ${{ secrets.APPLE_NOTARY_USER }}
-          APPLE_NOTARY_PASSWORD: ${{ secrets.APPLE_NOTARY_PASSWORD }}
-          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
-
       - name: Upload
         uses: actions/upload-artifact@v4
         with:
@@ -266,7 +242,7 @@ jobs:
 
   # Technically, "unix" is a misnomer, but we use it here to mean "Unix-like BSD-derived".
   unix:
-    needs: lint-clang
+    needs: lint-check
     name: unix-${{ matrix.distro.name }}
     runs-on: ${{ vars.CI_UNIX_RUNNER || 'ubuntu-24.04' }}
     timeout-minutes: 20
@@ -298,6 +274,34 @@ jobs:
             export QT_QPA_PLATFORM=offscreen
             ./build/bin/unittests
             ./build/bin/integtests || true
+  flatpak:
+    needs: lint-check
+    runs-on: ubuntu-latest
+    container:
+      image: bilelmoussaoui/flatpak-github-actions:kde-6.7
+      options: --privileged
+    steps:
+      - name: Check out repository
+        uses: sithlord48/fancy-checkout@v1.0.0
+
+      - run: git config --global protocol.file.allow always
+
+      - name: Get version
+        uses: ./.github/actions/get-version
+
+      - uses: flatpak/flatpak-github-actions/flatpak-builder@master
+        name: "Build"
+        with:
+          bundle: deskflow-${{env.DESKFLOW_PACKAGE_VERSION}}-linux-x86_64.flatpak
+          manifest-path: deploy/linux/flatpak/org.deskflow.deskflow.yml
+          cache-key: flatpak-builder-${{ github.sha }}
+          upload-artifact: false
+
+      - name: Upload
+        uses: actions/upload-artifact@v4
+        with:
+          name: package-${{ env.PACKAGE_PREFIX }}-flatpak-x86_64
+          path: ${{github.workspace}}/deskflow[-_]*.flatpak
 
   release:
     needs: ci-passed

.github/workflows/test-actions.yml

@@ -1,41 +0,0 @@
-name: Test actions
-
-# Intended to only be run manually for testing actions in isolation.
-on:
-  workflow_dispatch:
-
-jobs:
-  test-summary:
-    runs-on: ubuntu-latest
-    name: Test summary (${{ matrix.message.name }})
-
-    strategy:
-      matrix:
-        message:
-          - name: success
-            text: "|Success|✅|✅|"
-            expect: ""
-          - name: failure
-            text: "|Failure|❌|❌|"
-            expect: "❌🔬 Tests failed: 2"
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Generate
-        shell: bash
-        run: |
-          echo "${{ matrix.message.text }}" > test-result.md
-
-      - name: Upload
-        uses: actions/upload-artifact@v4
-        with:
-          path: test-result.md
-          name: test-result-${{ matrix.message.name }}
-
-      - name: Test
-        uses: ./.github/actions/test-summary
-        with:
-          download-pattern: test-result-${{ matrix.message.name }}
-          upload-name: summary-${{ matrix.message.name }}

.gitignore

@@ -10,7 +10,6 @@
 /tmp
 /vcpkg
 /vcpkg_installed
-/scripts/**/*.pyc
 /.cache
 /.venv
 aqtinstall.log
@@ -34,3 +33,9 @@ CMakeLists.txt.user
 CMakeCache.txt
 CMakeUserPresets.json
 CMakeFiles/*
+
+# vscode folder
+/.vscode
+
+# scripts folder
+/scripts

.vscode/extensions.json

@@ -1,11 +0,0 @@
-{
-  "recommendations": [
-    "ms-vscode.cmake-tools",
-    "twxs.cmake",
-    "llvm-vs-code-extensions.vscode-clangd",
-    "ms-vscode.cpptools",
-    "vadimcn.vscode-lldb",
-    "cheshirekow.cmake-format",
-    "jacqueslucke.gcov-viewer"
-  ]
-}

.vscode/launch.json

@@ -1,135 +0,0 @@
-{
-  "version": "0.2.0",
-  "configurations": [
-    {
-      "name": "unix - gui",
-      "type": "lldb",
-      "cwd": "${workspaceRoot}",
-      "request": "launch",
-      "program": "${workspaceFolder}/build/bin/deskflow",
-      "preLaunchTask": "kill-build"
-    },
-    {
-      "name": "unix - unittests",
-      "type": "lldb",
-      "cwd": "${workspaceRoot}",
-      "request": "launch",
-      "program": "${workspaceFolder}/build/bin/unittests",
-      "args": [ "${input:gtest-args}" ],
-      "preLaunchTask": "build"
-    },
-    {
-      "name": "unix - integtests",
-      "type": "lldb",
-      "cwd": "${workspaceRoot}",
-      "request": "launch",
-      "program": "${workspaceFolder}/build/bin/integtests",
-      "args": [ "${input:gtest-args}" ],
-      "preLaunchTask": "build",
-    },
-    {
-      "name": "unix - server",
-      "type": "lldb",
-      "cwd": "${workspaceRoot}",
-      "request": "launch",
-      "program": "${workspaceFolder}/build/bin/deskflow-server",
-      "args": ["--config-toml", "deskflow-config.toml"],
-      "preLaunchTask": "kill-build"
-    },
-    {
-      "name": "unix - client",
-      "type": "lldb",
-      "cwd": "${workspaceRoot}",
-      "request": "launch",
-      "program": "${workspaceFolder}/build/bin/deskflow-client",
-      "args": ["--config-toml", "deskflow-config.toml"],
-      "preLaunchTask": "kill-build"
-    },
-    {
-      "name": "unix - attach",
-      "type": "lldb",
-      "request": "attach",
-      "pid": "${command:pickProcess}"
-    },
-    {
-      "name": "windows - gui",
-      "type": "cppvsdbg",
-      "cwd": "${workspaceRoot}",
-      "request": "launch",
-      "program": "${workspaceFolder}/build/bin/deskflow",
-      "internalConsoleOptions": "openOnSessionStart",
-      "preLaunchTask": "kill-build"
-    },
-    {
-      "name": "windows - unittests",
-      "type": "cppvsdbg",
-      "cwd": "${workspaceRoot}",
-      "request": "launch",
-      "program": "${workspaceFolder}/build/bin/unittests",
-      "args": [ "${input:gtest-args}" ],
-      "internalConsoleOptions": "openOnSessionStart",
-      "preLaunchTask": "build"
-    },
-    {
-      "name": "windows - integtests",
-      "type": "cppvsdbg",
-      "cwd": "${workspaceRoot}",
-      "request": "launch",
-      "program": "${workspaceFolder}/build/bin/integtests",
-      "args": [ "${input:gtest-args}" ],
-      "internalConsoleOptions": "openOnSessionStart",
-      "preLaunchTask": "build"
-    },
-    {
-      "name": "windows - server",
-      "type": "cppvsdbg",
-      "cwd": "${workspaceRoot}",
-      "request": "launch",
-      "program": "${workspaceFolder}/build/bin/deskflow-server",
-      "args": ["--config-toml", "deskflow-config.toml"],
-      "internalConsoleOptions": "openOnSessionStart",
-      "preLaunchTask": "kill-build"
-    },
-    {
-      "name": "windows - client",
-      "type": "cppvsdbg",
-      "cwd": "${workspaceRoot}",
-      "request": "launch",
-      "program": "${workspaceFolder}/build/bin/deskflow-client",
-      "args": ["--config-toml", "deskflow-config.toml"],
-      "internalConsoleOptions": "openOnSessionStart",
-      "preLaunchTask": "kill-build"
-    },
-    {
-      "name": "windows - daemon",
-      "type": "cppvsdbg",
-      "cwd": "${workspaceRoot}",
-      "request": "launch",
-      "program": "${workspaceFolder}/build/bin/deskflow-daemon",
-      "args": ["-f"],
-      "internalConsoleOptions": "openOnSessionStart",
-      "preLaunchTask": "build"
-    },
-    {
-      "name": "windows - attach",
-      "type": "cppvsdbg",
-      "request": "attach",
-      "processId": "${command:pickProcess}"
-    },
-    {
-      "name": "install_deps.py",
-      "type": "debugpy",
-      "request": "launch",
-      "program": "scripts/install_deps.py",
-      "console": "integratedTerminal"
-    }
-  ],
-  "inputs": [
-    {
-      "id": "gtest-args",
-      "type": "promptString",
-      "description": "Test arguments",
-      "default": "--gtest_filter=*"
-    }
-  ]
-}

.vscode/tasks.json

@@ -1,172 +0,0 @@
-{
-  "version": "2.0.0",
-  "tasks": [
-    {
-      "label": "build",
-      "type": "cmake",
-      "command": "build",
-      "targets": ["all"],
-      "preset": "${command:cmake.activeBuildPresetName}",
-      "group": {
-        "kind": "build",
-        "isDefault": true
-      },
-      "problemMatcher": {
-        "base": "$gcc",
-        "fileLocation": ["absolute"]
-      }
-    },
-    {
-      "label": "clean",
-      "type": "cmake",
-      "command": "build",
-      "targets": ["clean"],
-      "preset": "${command:cmake.activeBuildPresetName}",
-      "group": "build"
-    },
-    {
-      "label": "clean-gcda",
-      "type": "shell",
-      "command": "find . -name '*.gcda' -delete",
-      "windows": {
-        "command": "$null"
-      },
-      "presentation": {
-        "reveal": "silent"
-      }
-    },
-    {
-      "label": "clean-qt",
-      "type": "shell",
-      "command": "rm -r build/src/gui build/src/lib/gui",
-      "windows": {
-        "command": "remove-item -recurse build/src/gui,build/src/lib/gui"
-      }
-    },
-    {
-      "label": "clean-config",
-      "type": "shell",
-      "linux": {
-        "command": "rm -r ~/.config/Deskflow/Deskflow.conf"
-      },
-      "windows": {
-        "command": "remove-item -recurse $env:APPDATA\\Deskflow\\Deskflow"
-      },
-      "osx": {
-        "command": "rm -r ~/Library/Application\\ Support/Deskflow/Deskflow"
-      }
-    },
-    {
-      "label": "tests",
-      "dependsOn": ["integtests", "unittests"],
-      "problemMatcher": []
-    },
-    {
-      "label": "kill",
-      "type": "shell",
-      "command": "killall deskflow; killall deskflow-client; killall deskflow-server || true",
-      "windows": {
-        "command": "taskkill /F /IM deskflow.exe /IM deskflow-client.exe /IM deskflow-client.exe; $true"
-      },
-      "presentation": {
-        "reveal": "silent"
-      }
-    },
-    {
-      "label": "kill-build",
-      "dependsOn": ["kill", "build"],
-      "problemMatcher": []
-    },
-    {
-      "label": "gui",
-      "type": "process",
-      "command": "${workspaceFolder}/build/bin/deskflow",
-      "dependsOn": ["build", "kill"],
-      "problemMatcher": [],
-      "windows": {
-        "command": "${workspaceFolder}/build/bin/deskflow.exe"
-      }
-    },
-    {
-      "label": "restart daemon",
-      "type": "shell",
-      "command": "python scripts/daemon.py --restart",
-      "dependsOn": ["build"]
-    },
-    {
-      "label": "reinstall daemon",
-      "type": "shell",
-      "command": "python scripts/daemon.py --reinstall",
-      "dependsOn": ["build"]
-    },
-    {
-      "label": "stop daemon",
-      "type": "shell",
-      "command": "python scripts/daemon.py --stop"
-    },
-    {
-      "label": "unittests (current)",
-      "type": "shell",
-      "command": "python",
-      "args": [
-        "./scripts/tests.py",
-        "--unit-tests",
-        "--ignore-return-code",
-        "--filter-file=${file}"
-      ],
-      "dependsOn": ["build", "clean-gcda"]
-    },
-    {
-      "label": "integtests (current)",
-      "type": "shell",
-      "command": "python",
-      "args": [
-        "./scripts/tests.py",
-        "--integ-tests",
-        "--ignore-return-code",
-        "--filter-file=${file}"
-      ],
-      "dependsOn": ["build", "clean-gcda"]
-    },
-    {
-      "label": "unittests",
-      "type": "shell",
-      "command": "python",
-      "args": ["./scripts/tests.py", "--unit-tests", "--ignore-return-code"],
-      "dependsOn": ["build", "clean-gcda"]
-    },
-    {
-      "label": "integtests",
-      "type": "shell",
-      "command": "python",
-      "args": ["./scripts/tests.py", "--integ-tests", "--ignore-return-code"],
-      "dependsOn": ["build", "clean-gcda"]
-    },
-    {
-      "label": "unittests (current, valgrind)",
-      "type": "shell",
-      "command": "python",
-      "args": [
-        "./scripts/tests.py",
-        "--unit-tests",
-        "--ignore-return-code",
-        "--filter-file=${file}",
-        "--valgrind"
-      ],
-      "dependsOn": ["build", "clean-gcda"]
-    },
-    {
-      "label": "integtests (current, valgrind)",
-      "type": "shell",
-      "command": "python",
-      "args": [
-        "./scripts/tests.py",
-        "--integ-tests",
-        "--ignore-return-code",
-        "--filter-file=${file}",
-        "--valgrind"
-      ],
-      "dependsOn": ["build", "clean-gcda"]
-    }
-  ]
-}

CMakeLists.txt

@@ -21,10 +21,21 @@
 # > See https://reproducible-builds.org/specs/source-date-epoch/ for details.
 cmake_minimum_required(VERSION 3.24)
 
+# Link items by fill path
+cmake_policy(SET CMP0003 NEW)
+
+# Fix define escaping
+cmake_policy(SET CMP0005 NEW)
+
+# Set CXX Requirements
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_EXTENSIONS OFF)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
 # Fallback for when git can not be found
 set(DESKFLOW_VERSION_MAJOR 1)
-set(DESKFLOW_VERSION_MINOR 17)
-set(DESKFLOW_VERSION_PATCH 1)
+set(DESKFLOW_VERSION_MINOR 18)
+set(DESKFLOW_VERSION_PATCH 0)
 set(DESKFLOW_VERSION_TWEAK 0)
 
 # Get the version from git if it's a git repository
@@ -32,6 +43,12 @@ set(DESKFLOW_VERSION_TWEAK 0)
 if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git)
   find_package(Git)
   if(GIT_FOUND)
+    execute_process(
+      COMMAND ${GIT_EXECUTABLE} rev-parse --short=8 HEAD
+      WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+      OUTPUT_VARIABLE GIT_SHA_SHORT
+      ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
     execute_process(
       COMMAND ${GIT_EXECUTABLE} describe --long --match v* --always
       WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
@@ -64,8 +81,6 @@ set(DESKFLOW_VERSION_MS_CSV
     "${DESKFLOW_VERSION_MAJOR},${DESKFLOW_VERSION_MINOR},${DESKFLOW_VERSION_PATCH},${DESKFLOW_VERSION_TWEAK}"
 )
 
-add_definitions(-DDESKFLOW_VERSION="${DESKFLOW_VERSION}")
-
 #Define our project
 project(
   deskflow
@@ -75,19 +90,55 @@ project(
 
 message(STATUS "Building ${CMAKE_PROJECT_NAME}-${CMAKE_PROJECT_VERSION}")
 
-include(cmake/Definitions.cmake)
-include(cmake/Build.cmake)
-include(cmake/Libraries.cmake)
-include(cmake/Packaging.cmake)
+# Set lib versions
+set(REQUIRED_OPENSSL_VERSION 3.0)
+set(REQUIRED_LIBEI_VERSION 1.3)
+set(REQUIRED_LIBPORTAL_VERSION 0.8)
+set(REQUIRED_QT_VERSION 6.7.0)
 
+# Control debug item visibility
+# When not set logging is forced to DEBUG and show code locations
+# Also exposes a test menu
+if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
+  message(STATUS "Disabling debug build")
+  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")
+
+include(cmake/Libraries.cmake)
 include(GNUInstallDirs)
 
-configure_definitions()
-configure_build()
 configure_libs()
-configure_packaging()
 
 add_subdirectory(doc)
 add_subdirectory(src)
 
-post_config_all()
+# Install License, License is in the App Bundle on mac os (src/gui)
+if(WIN32)
+  install(
+    FILES
+      ${PROJECT_SOURCE_DIR}/LICENSE
+      ${PROJECT_SOURCE_DIR}/LICENSE_EXCEPTION
+    DESTINATION .
+  )
+elseif(UNIX AND NOT APPLE)
+  install(
+    FILES
+      ${PROJECT_SOURCE_DIR}/LICENSE
+      ${PROJECT_SOURCE_DIR}/LICENSE_EXCEPTION
+    DESTINATION share/licenses/deskflow
+  )
+endif()
+
+option(BUILD_INSTALLER "Build installer" ON)
+if(BUILD_INSTALLER)
+    add_subdirectory(deploy)
+endif()

README.md

@@ -15,7 +15,7 @@ and work seamlessly between them.
 It's like a software KVM (but without the video).
 TLS encryption is enabled by default. Wayland is supported. Clipboard sharing is supported.
 
-[![Downloads: Stable Release](https://img.shields.io/github/downloads/deskflow/deskflow/v1.17.0/total?style=for-the-badge&logo=github&label=Download%20Stable)](https://github.com/deskflow/deskflow/releases/tag/v1.17.0)      [![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)
+[![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)
 
 To use Deskflow you can use one of our [packages](https://github.com/deskflow/deskflow/releases), install `deskflow` (if available in your package repository), or [build it](#build-quick-start) yourself from source.
 
@@ -31,7 +31,7 @@ To use Deskflow you can use one of our [packages](https://github.com/deskflow/de
 [![Code Smells](https://sonarcloud.io/api/project_badges/measure?project=deskflow_deskflow&metric=code_smells)](https://sonarcloud.io/summary/new_code?id=deskflow_deskflow)
 [![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=deskflow_deskflow&metric=vulnerabilities)](https://sonarcloud.io/summary/new_code?id=deskflow_deskflow)
 
-[![CI](https://github.com/deskflow/deskflow/actions/workflows/ci.yml/badge.svg)](https://github.com/deskflow/deskflow/actions/workflows/ci.yml)
+[![CI](https://github.com/deskflow/deskflow/actions/workflows/continuous-integration.yml/badge.svg)](https://github.com/deskflow/deskflow/actions/workflows/continuous-integration.yml)
 [![CodeQL Analysis](https://github.com/deskflow/deskflow/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/deskflow/deskflow/actions/workflows/codeql-analysis.yml)
 [![SonarCloud Analysis](https://github.com/deskflow/deskflow/actions/workflows/sonarcloud-analysis.yml/badge.svg)](https://github.com/deskflow/deskflow/actions/workflows/sonarcloud-analysis.yml)
 
@@ -63,6 +63,10 @@ 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.
 
+Windows 10 or higher is required.
+
+macOS 12 or higher is required.
+
 All Linux distributions are supported, primarily focusing on: 
 Debian, Ubuntu, Linux Mint, Fedora, RHEL, AlmaLinux, Rocky Linux, Arch Linux, openSUSE, Gentoo.
 
@@ -96,7 +100,7 @@ To add our tap, run:
 brew tap deskflow/homebrew-tap
 ```
 Then install either:
-- Stable: `brew instal deskflow`
+- Stable: `brew install deskflow`
 - Continuous: `brew install deskflow-dev`
 
 
@@ -136,7 +140,7 @@ Yes, Deskflow has network compatibility with all forks:
 
 ### Is Deskflow compatible with Lan Mouse?
 
-We would love to see compatibility with Lan Mouse. This maybe quite an effort as currently they way they handle the generated input is very different.
+We would love to see compatibility with Lan Mouse. This may be quite an effort as currently the way they handle the generated input is very different.
 
 ### If I want to solve issues in Deskflow do I need to contribute to a fork?
 

cmake/Build.cmake

@@ -1,104 +0,0 @@
-# Deskflow -- mouse and keyboard sharing utility
-# Copyright (C) 2024 Symless Ltd.
-#
-# This package is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# found in the file LICENSE that should have accompanied this file.
-#
-# This package is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-macro(configure_build)
-
-  set(CMAKE_CXX_STANDARD 20)
-  set(CMAKE_CXX_EXTENSIONS OFF)
-  set(CMAKE_CXX_STANDARD_REQUIRED ON)
-  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin")
-  set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib")
-
-  if(APPLE)
-    message(STATUS "Configuring for Apple")
-    set(CMAKE_OSX_DEPLOYMENT_TARGET "12.0")
-  endif()
-
-  set_build_date()
-  configure_file_shared()
-
-endmacro()
-
-macro(set_build_date)
-  # Since CMake 3.8.0, `string(TIMESTAMP ...)` respects `SOURCE_DATE_EPOCH` env var if set,
-  # which allows package maintainers to create reproducible builds.
-  # We require CMake 3.8.0 in the root `CMakeLists.txt` for this reason.
-  string(TIMESTAMP BUILD_DATE "%Y-%m-%d" UTC)
-  message(STATUS "Build date: ${BUILD_DATE}")
-  add_definitions(-DBUILD_DATE="${BUILD_DATE}")
-endmacro()
-
-macro(configure_file_shared)
-  configure_file(${PROJECT_SOURCE_DIR}/src/lib/gui/gui_config.h.in
-                 ${PROJECT_BINARY_DIR}/config/gui_config.h)
-endmacro()
-
-macro(post_config)
-
-  # Build to a temp bin dir on Windows and then copy to the final bin dir
-  # (ignore copy fail). It is neccesary to do this. Since the binary may already
-  # be running and you can't write to a running binary (on Windows). It's common
-  # to use Deskflow to develop Deskflow (i.e. eating your own dog food immediately
-  # making it).
-  if(WIN32)
-
-    if(NOT target)
-      message(FATAL_ERROR "target not set")
-    endif()
-
-    set_target_properties(${target} PROPERTIES RUNTIME_OUTPUT_DIRECTORY
-                                               ${BIN_TEMP_DIR})
-  endif()
-
-endmacro()
-
-macro(post_config_all)
-
-  if(WIN32)
-    # Always try to copy the files to the bin directory after every build and deliberatly ignore
-    # copy errors, usually the error is because a running process has locked the file.
-    #
-    # It is useful to copy every time because the copy may have failed last time due to the file
-    # being in use, and we'll usually want to try again (after killing the process).
-    #
-    # Yes, this looks like a ridiculous thing to do, but it really is necessary to
-    # use a Python script to copy files on Windows. Why? Two reasons:
-    #
-    #   1. Windows file locks (on running processes) creates a very painful development
-    #      experience; you can't overwrite the binary you're running it.
-    #      Why not just stop the process? Windows services are an abject PITA to manage,
-    #      and we don't always care about overwriting all binaries.
-    #
-    #   2. The Windows copy command is limited and gives vague/misleading errors.
-    #      The CMake copy command also has similar shortfalls.
-    #
-    # Patches welcome! :)
-    add_custom_target(
-      run_post_build ALL
-      COMMAND ${Python_EXECUTABLE} ${PROJECT_SOURCE_DIR}/scripts/fancy_copy.py
-              ${BIN_TEMP_DIR} ${PROJECT_BINARY_DIR}/bin --ignore-errors
-      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-      VERBATIM
-      COMMENT "Copying files to bin dir")
-
-    add_dependencies(
-      run_post_build
-      ${GUI_BINARY_NAME}
-      ${CLIENT_BINARY_NAME}
-      ${SERVER_BINARY_NAME}
-      ${DAEMON_BINARY_NAME})
-  endif()
-
-endmacro()

cmake/Definitions.cmake

@@ -1,220 +0,0 @@
-# Deskflow -- mouse and keyboard sharing utility
-# Copyright (C) 2012-2024 Symless Ltd.
-# Copyright (C) 2009-2012 Nick Bolton
-#
-# This package is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# found in the file LICENSE that should have accompanied this file.
-#
-# This package is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-macro(configure_definitions)
-
-  configure_meta()
-  configure_ninja()
-  configure_options()
-
-  set(INTEG_TESTS_BIN integtests)
-  set(UNIT_TESTS_BIN unittests)
-
-  if(NOT "$ENV{GIT_SHA}" STREQUAL "")
-    # Shorten the Git SHA to 8 chars for readability
-    string(SUBSTRING "$ENV{GIT_SHA}" 0 8 GIT_SHA_SHORT)
-    message(STATUS "Short Git SHA: ${GIT_SHA_SHORT}")
-    add_definitions(-DGIT_SHA_SHORT="${GIT_SHA_SHORT}")
-  endif()
-
-  if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
-    message(STATUS "Disabling debug build")
-    add_definitions(-DNDEBUG)
-  endif()
-
-  # TODO: find out why we need these, and remove them if we don't.
-  if(COMMAND cmake_policy)
-    cmake_policy(SET CMP0003 NEW)
-    cmake_policy(SET CMP0005 NEW)
-  endif()
-
-  # TODO: explain why we're adding headers to sources.
-  if(${CMAKE_GENERATOR} STREQUAL "Unix Makefiles")
-    set(ADD_HEADERS_TO_SOURCES FALSE)
-  else()
-    set(ADD_HEADERS_TO_SOURCES TRUE)
-  endif()
-
-  set(BIN_TEMP_DIR ${PROJECT_BINARY_DIR}/temp/bin)
-
-endmacro()
-
-macro(configure_meta)
-
-  set(DESKFLOW_APP_ID
-      "deskflow"
-      CACHE STRING "ID of the app for filenames, etc")
-
-  set(DESKFLOW_DOMAIN
-      "deskflow.org"
-      CACHE STRING "Domain of the app maintainer (not a URL)")
-
-  set(DESKFLOW_APP_NAME
-      "Deskflow"
-      CACHE STRING "App name (used in GUI title bar, etc)")
-
-  set(DESKFLOW_AUTHOR_NAME
-      "Deskflow"
-      CACHE STRING "Author name (also used as organization name)")
-
-  set(DESKFLOW_MAINTAINER
-      "Deskflow <maintainers@deskflow.org>"
-      CACHE STRING "Maintainer email address in RFC 5322 mailbox format")
-
-  set(DESKFLOW_WEBSITE_URL
-      "https://deskflow.org"
-      CACHE STRING "URL of the app website")
-
-  set(DESKFLOW_VERSION_URL
-      "https://api.deskflow.org/version"
-      CACHE STRING "URL to get the latest version")
-
-  set(DESKFLOW_HELP_TEXT
-      "Report a bug"
-      CACHE STRING "Text label for the help menu item")
-
-  set(DESKFLOW_RES_DIR
-      "${PROJECT_SOURCE_DIR}/res"
-      CACHE STRING "Resource directory for images, etc")
-
-  set(DESKFLOW_MAC_BUNDLE_CODE
-      "DFLW"
-      CACHE STRING "Mac bundle code (4 characters)")
-
-  set(DESKFLOW_SHOW_DEV_THANKS
-      true
-      CACHE BOOL "Show developer thanks message")
-
-  message(VERBOSE "App ID: ${DESKFLOW_APP_ID}")
-  message(VERBOSE "App domain: ${DESKFLOW_DOMAIN}")
-  message(VERBOSE "App name: ${DESKFLOW_APP_NAME}")
-  message(VERBOSE "Author name: ${DESKFLOW_AUTHOR_NAME}")
-  message(VERBOSE "Maintainer: ${DESKFLOW_MAINTAINER}")
-  message(VERBOSE "Website URL: ${DESKFLOW_WEBSITE_URL}")
-  message(VERBOSE "Version URL: ${DESKFLOW_VERSION_URL}")
-  message(VERBOSE "Help text: ${DESKFLOW_HELP_TEXT}")
-  message(VERBOSE "Res dir: ${DESKFLOW_RES_DIR}")
-  message(VERBOSE "Mac bundle code: ${DESKFLOW_MAC_BUNDLE_CODE}")
-  message(VERBOSE "Show dev thanks: ${DESKFLOW_SHOW_DEV_THANKS}")
-
-  # TODO: We need to move this to configure_file() in the future, which is much cleaner.
-  add_definitions(-DDESKFLOW_APP_ID="${DESKFLOW_APP_ID}")
-  add_definitions(-DDESKFLOW_DOMAIN="${DESKFLOW_DOMAIN}")
-  add_definitions(-DDESKFLOW_APP_NAME="${DESKFLOW_APP_NAME}")
-  add_definitions(-DDESKFLOW_AUTHOR_NAME="${DESKFLOW_AUTHOR_NAME}")
-  add_definitions(-DDESKFLOW_MAINTAINER="${DESKFLOW_MAINTAINER}")
-  add_definitions(-DDESKFLOW_WEBSITE_URL="${DESKFLOW_WEBSITE_URL}")
-  add_definitions(-DDESKFLOW_VERSION_URL="${DESKFLOW_VERSION_URL}")
-  add_definitions(-DDESKFLOW_HELP_TEXT="${DESKFLOW_HELP_TEXT}")
-  add_definitions(-DDESKFLOW_RES_DIR="${DESKFLOW_RES_DIR}")
-
-  if(DESKFLOW_SHOW_DEV_THANKS)
-    message(VERBOSE "Showing developer thanks message")
-    add_definitions(-DDESKFLOW_SHOW_DEV_THANKS)
-  else()
-    message(VERBOSE "Not showing developer thanks message")
-  endif()
-
-  configure_bin_names()
-
-endmacro()
-
-macro(configure_bin_names)
-
-  set(GUI_BINARY_NAME
-      "deskflow"
-      CACHE STRING "Filename of the GUI binary")
-
-  set(SERVER_BINARY_NAME
-      "deskflow-server"
-      CACHE STRING "Filename of the server binary")
-
-  set(CLIENT_BINARY_NAME
-      "deskflow-client"
-      CACHE STRING "Filename of the client binary")
-
-  set(CORE_BINARY_NAME
-      "deskflow-core"
-      CACHE STRING "Filename of the core binary")
-
-  set(DAEMON_BINARY_NAME
-      "deskflow-daemon"
-      CACHE STRING "Filename of the daemon binary")
-
-
-  message(VERBOSE "GUI binary: ${GUI_BINARY_NAME}")
-  message(VERBOSE "Server binary: ${SERVER_BINARY_NAME}")
-  message(VERBOSE "Client binary: ${CLIENT_BINARY_NAME}")
-  message(VERBOSE "Core binary: ${CORE_BINARY_NAME}")
-  message(VERBOSE "Daemon binary: ${DAEMON_BINARY_NAME}")
-
-
-  add_definitions(-DGUI_BINARY_NAME="${GUI_BINARY_NAME}")
-  add_definitions(-DSERVER_BINARY_NAME="${SERVER_BINARY_NAME}")
-  add_definitions(-DCLIENT_BINARY_NAME="${CLIENT_BINARY_NAME}")
-  add_definitions(-DCORE_BINARY_NAME="${CORE_BINARY_NAME}")
-  add_definitions(-DDAEMON_BINARY_NAME="${DAEMON_BINARY_NAME}")
-
-endmacro()
-
-macro(configure_ninja)
-  # use response files so that ninja can compile on windows, otherwise you get
-  # an error when linking qt: "The input line is too long."
-  set(CMAKE_C_USE_RESPONSE_FILE_FOR_OBJECTS 1)
-  set(CMAKE_CXX_USE_RESPONSE_FILE_FOR_OBJECTS 1)
-  set(CMAKE_C_RESPONSE_FILE_LINK_FLAG "@")
-  set(CMAKE_CXX_RESPONSE_FILE_LINK_FLAG "@")
-  set(CMAKE_NINJA_FORCE_RESPONSE_FILE
-      1
-      CACHE INTERNAL "")
-endmacro()
-
-macro(configure_options)
-
-  set(DEFAULT_BUILD_GUI ON)
-  set(DEFAULT_BUILD_INSTALLER ON)
-  set(DEFAULT_BUILD_TESTS ON)
-
-  # unified binary is off by default for now, for backwards compatibility.
-  set(DEFAULT_BUILD_UNIFIED OFF)
-
-  # coverage is off by default because it's GCC only and a developer preference.
-  set(DEFAULT_ENABLE_COVERAGE OFF)
-
-  if("$ENV{DESKFLOW_BUILD_MINIMAL}" STREQUAL "true")
-    set(DEFAULT_BUILD_GUI OFF)
-    set(DEFAULT_BUILD_INSTALLER OFF)
-  endif()
-
-  if("$ENV{DESKFLOW_BUILD_TESTS}" STREQUAL "false")
-    set(DEFAULT_BUILD_TESTS OFF)
-  endif()
-
-  if("$ENV{DESKFLOW_BUILD_UNIFIED}" STREQUAL "true")
-    set(DEFAULT_BUILD_UNIFIED ON)
-  endif()
-
-  if("$ENV{DESKFLOW_ENABLE_COVERAGE}" STREQUAL "true")
-    set(DEFAULT_ENABLE_COVERAGE ON)
-  endif()
-
-  option(BUILD_GUI "Build GUI" ${DEFAULT_BUILD_GUI})
-  option(BUILD_INSTALLER "Build installer" ${DEFAULT_BUILD_INSTALLER})
-  option(BUILD_TESTS "Build tests" ${DEFAULT_BUILD_TESTS})
-  option(BUILD_UNIFIED "Build unified binary" ${DEFAULT_BUILD_UNIFIED})
-  option(ENABLE_COVERAGE "Enable test coverage" ${DEFAULT_ENABLE_COVERAGE})
-
-endmacro()

cmake/Libraries.cmake

@@ -13,22 +13,80 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-set(LIBEI_MIN_VERSION 1.3)
-set(LIBPORTAL_MIN_VERSION 0.8)
-
 macro(configure_libs)
 
   set(libs)
   if(UNIX)
     configure_unix_libs()
   elseif(WIN32)
-    configure_windows_libs()
     find_package(Python REQUIRED QUIET)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /D _BIND_TO_CURRENT_VCLIBS_VERSION=1")
+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MD /O2 /Ob2")
+    list(APPEND libs Wtsapi32 Userenv Wininet comsuppw Shlwapi)
+    add_definitions(
+      /DWIN32
+      /D_WINDOWS
+      /D_CRT_SECURE_NO_WARNINGS
+      /D_XKEYCHECK_H
+    )
   endif()
 
-  configure_qt()
-  configure_openssl()
-  configure_coverage()
+  find_package(Qt6 ${REQUIRED_QT_VERSION} REQUIRED COMPONENTS Core Widgets Network)
+
+  message(STATUS "Qt version: ${Qt6_VERSION}")
+
+  # TODO SSL check can happen in lib/net when don't have to deploy it any longer on windows
+
+  # Apple has to use static libraries because "Use of the Apple-provided OpenSSL
+  # libraries by apps is strongly discouraged."
+  # https://developer.apple.com/library/archive/documentation/Security/Conceptual/cryptoservices/SecureNetworkCommunicationAPIs/SecureNetworkCommunicationAPIs.html
+  if(APPLE)
+    set(OPENSSL_USE_STATIC_LIBS TRUE)
+  endif()
+
+  find_package(OpenSSL ${REQUIRED_OPENSSL_VERSION} REQUIRED COMPONENTS SSL Crypto)
+  if(WIN32) #Used for dev in TLS and WIX
+    cmake_path(SET OPENSSL_ROOT_DIR NORMALIZE "${OPENSSL_INCLUDE_DIR}/..")
+    message(VERBOSE "Set OPENSSL_ROOT_DIR: ${OPENSSL_ROOT_DIR}")
+    set(OPENSSL_EXE_DIR "${OPENSSL_ROOT_DIR}/tools/openssl")
+    add_definitions(-DOPENSSL_EXE_DIR="${OPENSSL_EXE_DIR}")
+    # HACK Install a copy of openssl on windows
+    install(
+        FILES
+          ${OPENSSL_EXE_DIR}/openssl.exe
+          ${OPENSSL_EXE_DIR}/openssl.cnf
+        DESTINATION .
+    )
+  endif()
+
+
+  option(ENABLE_COVERAGE "Enable test coverage" OFF)
+  if(ENABLE_COVERAGE)
+    message(STATUS "Enabling code coverage")
+    include(cmake/CodeCoverage.cmake)
+    append_coverage_compiler_flags()
+    set(test_exclude subprojects/* build/* src/test/*)
+    set(test_src ${PROJECT_SOURCE_DIR}/src)
+
+    # Apparently solves the bug in gcov where it returns negative counts and confuses gcovr.
+    # > Got negative hit value in gcov line 'branch  2 taken -1' caused by a bug in gcov tool
+    # Bug report: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68080
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-update=atomic")
+
+    setup_target_for_coverage_gcovr_xml(
+      NAME coverage-integtests
+      EXECUTABLE integtests
+      BASE_DIRECTORY ${test_src}
+      EXCLUDE ${test_exclude}
+    )
+
+    setup_target_for_coverage_gcovr_xml(
+      NAME coverage-unittests
+      EXECUTABLE unittests
+      BASE_DIRECTORY ${test_src}
+      EXCLUDE ${test_exclude}
+    )
+  endif()
 
 endmacro()
 
@@ -114,11 +172,35 @@ macro(configure_unix_libs)
   endif()
 
   if(APPLE)
-    configure_mac_libs()
+    set(CMAKE_CXX_FLAGS "--sysroot ${CMAKE_OSX_SYSROOT} ${CMAKE_CXX_FLAGS} -DGTEST_USE_OWN_TR1_TUPLE=1")
+    find_library(lib_ScreenSaver ScreenSaver)
+    find_library(lib_IOKit IOKit)
+    find_library(lib_ApplicationServices ApplicationServices)
+    find_library(lib_Foundation Foundation)
+    find_library(lib_Carbon Carbon)
+    find_library(lib_UserNotifications UserNotifications)
+    list(APPEND libs
+      ${lib_ScreenSaver} ${lib_IOKit} ${lib_ApplicationServices}
+      ${lib_Foundation} ${lib_Carbon} ${lib_UserNotifications}
+    )
+
+    add_definitions(-DWINAPI_CARBON=1 -D_THREAD_SAFE)
   else()
 
     configure_xorg_libs()
-    configure_wayland_libs()
+
+    include(FindPkgConfig)
+
+    if(PKG_CONFIG_FOUND)
+      pkg_check_modules(LIBXKBCOMMON REQUIRED xkbcommon)
+      pkg_check_modules(GLIB2 REQUIRED glib-2.0 gio-2.0)
+      find_library(LIBM m)
+      include_directories(${LIBXKBCOMMON_INCLUDE_DIRS} ${GLIB2_INCLUDE_DIRS}
+                          ${LIBM_INCLUDE_DIRS})
+    else()
+      message(WARNING "pkg-config not found, skipping wayland libraries")
+    endif()
+
 
     find_package(pugixml REQUIRED)
 
@@ -164,53 +246,6 @@ macro(configure_unix_libs)
 
 endmacro()
 
-#
-# Apple macOS
-#
-macro(configure_mac_libs)
-
-  set(CMAKE_CXX_FLAGS
-      "--sysroot ${CMAKE_OSX_SYSROOT} ${CMAKE_CXX_FLAGS} -DGTEST_USE_OWN_TR1_TUPLE=1"
-  )
-
-  find_library(lib_ScreenSaver ScreenSaver)
-  find_library(lib_IOKit IOKit)
-  find_library(lib_ApplicationServices ApplicationServices)
-  find_library(lib_Foundation Foundation)
-  find_library(lib_Carbon Carbon)
-
-  list(
-    APPEND
-    libs
-    ${lib_ScreenSaver}
-    ${lib_IOKit}
-    ${lib_ApplicationServices}
-    ${lib_Foundation}
-    ${lib_Carbon})
-
-  find_library(lib_UserNotifications UserNotifications)
-  list(APPEND libs ${lib_UserNotifications})
-
-  add_definitions(-DWINAPI_CARBON=1 -D_THREAD_SAFE)
-
-endmacro()
-
-macro(configure_wayland_libs)
-
-  include(FindPkgConfig)
-
-  if(PKG_CONFIG_FOUND)
-    pkg_check_modules(LIBXKBCOMMON REQUIRED xkbcommon)
-    pkg_check_modules(GLIB2 REQUIRED glib-2.0 gio-2.0)
-    find_library(LIBM m)
-    include_directories(${LIBXKBCOMMON_INCLUDE_DIRS} ${GLIB2_INCLUDE_DIRS}
-                        ${LIBM_INCLUDE_DIRS})
-  else()
-    message(WARNING "pkg-config not found, skipping wayland libraries")
-  endif()
-
-endmacro()
-
 #
 # X.org/X11 for Linux, BSD, etc
 #
@@ -312,107 +347,3 @@ macro(configure_xorg_libs)
   add_definitions(-DWINAPI_XWINDOWS=1)
 
 endmacro()
-
-#
-# Windows
-#
-macro(configure_windows_libs)
-
-  set(CMAKE_CXX_FLAGS
-      "${CMAKE_CXX_FLAGS} /MP /D _BIND_TO_CURRENT_VCLIBS_VERSION=1")
-  set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MD /O2 /Ob2")
-
-  list(
-    APPEND
-    libs
-    Wtsapi32
-    Userenv
-    Wininet
-    comsuppw
-    Shlwapi)
-
-  add_definitions(
-    /DWIN32
-    /D_WINDOWS
-    /D_CRT_SECURE_NO_WARNINGS
-    /DDESKFLOW_VERSION=\"${DESKFLOW_VERSION}\"
-    /D_XKEYCHECK_H)
-
-  configure_file(${PROJECT_SOURCE_DIR}/res/win/version.rc.in
-                 ${PROJECT_BINARY_DIR}/src/version.rc @ONLY)
-
-  configure_openssl()
-
-endmacro()
-
-macro(configure_qt)
-
-  find_package(
-    Qt6
-    COMPONENTS Core Widgets Network
-    REQUIRED)
-
-  message(STATUS "Qt version: ${Qt6_VERSION}")
-
-  set(GUI_RES_DIR ${DESKFLOW_RES_DIR}/gui)
-  set(GUI_QRC_FILE ${GUI_RES_DIR}/app.qrc)
-
-endmacro()
-
-macro(configure_openssl)
-  # Apple has to use static libraries because "Use of the Apple-provided OpenSSL
-  # libraries by apps is strongly discouraged."
-  # https://developer.apple.com/library/archive/documentation/Security/Conceptual/cryptoservices/SecureNetworkCommunicationAPIs/SecureNetworkCommunicationAPIs.html
-  # TODO: How about bundling the OpenSSL .dylib files with the app so they can be updated?
-  if(APPLE)
-    set(OPENSSL_USE_STATIC_LIBS TRUE)
-  endif()
-
-  find_package(OpenSSL 3.0 REQUIRED COMPONENTS SSL Crypto)
-  if(WIN32) #Used for dev in TLS and WIX
-    cmake_path(SET OPENSSL_ROOT_DIR NORMALIZE "${OPENSSL_INCLUDE_DIR}/..")
-    message(VERBOSE "Set OPENSSL_ROOT_DIR: ${OPENSSL_ROOT_DIR}")
-    set(OPENSSL_EXE_DIR "${OPENSSL_ROOT_DIR}/tools/openssl")
-    add_definitions(-DOPENSSL_EXE_DIR="${OPENSSL_EXE_DIR}")
-  endif()
-
-endmacro()
-
-macro(configure_coverage)
-
-  if(ENABLE_COVERAGE)
-    message(STATUS "Enabling code coverage")
-    include(cmake/CodeCoverage.cmake)
-    append_coverage_compiler_flags()
-    set(test_exclude subprojects/* build/* src/test/*)
-    set(test_src ${PROJECT_SOURCE_DIR}/src)
-
-    # Apparently solves the bug in gcov where it returns negative counts and confuses gcovr.
-    # > Got negative hit value in gcov line 'branch  2 taken -1' caused by a bug in gcov tool
-    # Bug report: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68080
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-update=atomic")
-
-    setup_target_for_coverage_gcovr_xml(
-      NAME
-      coverage-${INTEG_TESTS_BIN}
-      EXECUTABLE
-      ${INTEG_TESTS_BIN}
-      BASE_DIRECTORY
-      ${test_src}
-      EXCLUDE
-      ${test_exclude})
-
-    setup_target_for_coverage_gcovr_xml(
-      NAME
-      coverage-${UNIT_TESTS_BIN}
-      EXECUTABLE
-      ${UNIT_TESTS_BIN}
-      BASE_DIRECTORY
-      ${test_src}
-      EXCLUDE
-      ${test_exclude})
-
-  else()
-    message(STATUS "Code coverage is disabled")
-  endif()
-endmacro()

cmake/Packaging.cmake

@@ -1,259 +0,0 @@
-# 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
-
-
-#
-# If enabled, configure packaging based on OS.
-#
-macro(configure_packaging)
-
-  message(VERBOSE "Configuring Packaging")
-  set(DESKFLOW_PROJECT_RES_DIR ${PROJECT_SOURCE_DIR}/res)
-
-  if(${BUILD_INSTALLER})
-    set(CPACK_PACKAGE_NAME ${DESKFLOW_APP_ID})
-    set(CPACK_PACKAGE_CONTACT ${DESKFLOW_MAINTAINER})
-    set(CPACK_PACKAGE_DESCRIPTION ${CMAKE_PROJECT_DESCRIPTION})
-    set(CPACK_PACKAGE_VENDOR ${DESKFLOW_AUTHOR_NAME})
-    set(CPACK_RESOURCE_FILE_LICENSE ${PROJECT_SOURCE_DIR}/LICENSE)
-
-    set(CPACK_PACKAGE_VERSION ${CMAKE_PROJECT_VERSION})
-
-    #Prevent this override from being written in the package
-    if(NOT PACKAGE_VERSION_LABEL)
-        set (PACKAGE_VERSION_LABEL "${CPACK_PACKAGE_VERSION}")
-    endif()
-
-    if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
-      configure_windows_packaging()
-    elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-      configure_mac_packaging()
-    elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-      configure_linux_packaging()
-    elseif(${CMAKE_SYSTEM_NAME} MATCHES "|.*BSD")
-      message(STATUS "BSD packaging not yet supported")
-      set(OS_STRING ${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR})
-    endif()
-
-    set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${PACKAGE_VERSION_LABEL}-${OS_STRING}")
-    message(STATUS "Package Basename: ${CPACK_PACKAGE_FILE_NAME}")
-
-    include(CPack)
-  else()
-    message(STATUS "Not configuring installer")
-  endif()
-
-endmacro()
-
-#
-# Windows installer
-#
-macro(configure_windows_packaging)
-
-  cmake_path(SET QT_PATH NORMALIZE "${Qt6_DIR}../../")
-
-  set(DESKFLOW_MSI_64_GUID
-      "027D1C8A-E7A5-4754-BB93-B2D45BFDBDC8"
-      CACHE STRING "GUID for 64-bit MSI installer")
-
-  set(DESKFLOW_MSI_32_GUID
-      "8F57C657-BC87-45E6-840E-41242A93511C"
-      CACHE STRING "GUID for 32-bit MSI installer")
-
-  configure_files(${PROJECT_SOURCE_DIR}/res/dist/wix
-                  ${PROJECT_BINARY_DIR}/installer)
-
-  if(CMAKE_SYSTEM_PROCESSOR MATCHES AMD64)
-      set(OS_STRING "win-x64")
-  elseif(CMAKE_SYSTEM_PROCESSOR MATCHES ARM64)
-      set(OS_STRING "win-arm64")
-  else()
-      set(OS_STRING "win-${CMAKE_SYSTEM_PROCESSOR}")
-  endif()
-
-endmacro()
-
-#
-# macOS app bundle
-#
-macro(configure_mac_packaging)
-
-  set(CMAKE_INSTALL_RPATH
-      "@loader_path/../Libraries;@loader_path/../Frameworks")
-  set(DESKFLOW_BUNDLE_SOURCE_DIR
-      ${PROJECT_SOURCE_DIR}/res/dist/mac/bundle
-      CACHE PATH "Path to the macOS app bundle")
-  set(DESKFLOW_BUNDLE_DIR ${PROJECT_BINARY_DIR}/bundle/${DESKFLOW_APP_NAME}.app)
-  set(DESKFLOW_BUNDLE_BINARY_DIR ${DESKFLOW_BUNDLE_DIR}/Contents/MacOS)
-
-  configure_files(${DESKFLOW_BUNDLE_SOURCE_DIR} ${DESKFLOW_BUNDLE_DIR})
-
-  set(OS_STRING "macos-${CMAKE_SYSTEM_PROCESSOR}")
-
-  file(RENAME ${DESKFLOW_BUNDLE_DIR}/Contents/Resources/App.icns
-       ${DESKFLOW_BUNDLE_DIR}/Contents/Resources/${DESKFLOW_APP_NAME}.icns)
-
-endmacro()
-
-#
-# Linux packages
-#
-
-macro(configure_linux_package_name)
-  # Get Distro name information
-  execute_process(
-    COMMAND bash "-c" "cat /etc/os-release | grep ^ID= | sed 's/ID=//g'"
-    OUTPUT_VARIABLE _DISTRO_NAME
-    OUTPUT_STRIP_TRAILING_WHITESPACE)
-  string(REPLACE "\"" "" DISTRO_NAME "${_DISTRO_NAME}")
-  message(STATUS "Distro Name: ${DISTRO_NAME}")
-
-  execute_process(
-    COMMAND bash "-c"
-            "cat /etc/os-release | grep ^ID_LIKE= | sed 's/ID_LIKE=//g'"
-    OUTPUT_VARIABLE _DISTRO_LIKE
-    OUTPUT_STRIP_TRAILING_WHITESPACE)
-  string(REPLACE "\"" "" DISTRO_LIKE "${_DISTRO_LIKE}")
-  message(STATUS "Distro Like: ${DISTRO_LIKE}")
-
-  execute_process(
-    COMMAND
-      bash "-c"
-      "cat /etc/os-release | grep ^VERSION_CODENAME= | sed 's/VERSION_CODENAME=//g'"
-    OUTPUT_VARIABLE _DISTRO_CODENAME
-    OUTPUT_STRIP_TRAILING_WHITESPACE)
-  string(REPLACE "\"" "" DISTRO_CODENAME "${_DISTRO_CODENAME}")
-  message(STATUS "Distro Codename: ${DISTRO_CODENAME}")
-
-  execute_process(
-    COMMAND bash "-c"
-            "cat /etc/os-release | grep ^VERSION_ID= | sed 's/VERSION_ID=//g'"
-    OUTPUT_VARIABLE _DISTRO_VERSION_ID
-    OUTPUT_STRIP_TRAILING_WHITESPACE)
-  string(REPLACE "\"" "" DISTRO_VERSION_ID "${_DISTRO_VERSION_ID}")
-  message(STATUS "Distro ID: ${DISTRO_VERSION_ID}")
-
-  # Check if Debian-link
-  string(REGEX MATCH debian|buntu DEBTYPE "${DISTRO_LIKE}")
-  if((NOT ("${DEBTYPE}" STREQUAL "")) OR ("${DISTRO_NAME}" STREQUAL "debian"))
-    set(CPACK_GENERATOR "DEB")
-  endif()
-
-  # Check if Rpm-like
-  string(REGEX MATCH suse|fedora|rhel RPMTYPE "${DISTRO_LIKE}")
-  string(REGEX MATCH fedora|suse|rhel RPMNAME "${DISTRO_NAME}")
-  if((NOT ("${RPMTYPE}" STREQUAL "")) OR (NOT ("${RPMNAME}" STREQUAL "")))
-      set(CPACK_GENERATOR "RPM")
-  endif()
-
-  # Disto specific name adjustments
-  if("${DISTRO_NAME}" STREQUAL "opensuse-tumbleweed")
-    set(DISTRO_NAME "opensuse")
-    set(DISTRO_CODENAME "tumbleweed")
-  elseif("${DISTRO_NAME}" STREQUAL "arch")
-    # Arch linux is rolling the version id reported is the date of last iso.
-    set(DISTRO_VERSION_ID "")
-  endif()
-
-  # Determain the code name to be used if any
-  if(NOT "${DISTRO_VERSION_ID}" STREQUAL "")
-    set(CN_STRING "${DISTRO_VERSION_ID}-")
-  endif()
-
-  if(NOT "${DISTRO_CODENAME}" STREQUAL "")
-    set(CN_STRING "${DISTRO_CODENAME}-")
-  endif()
-
-  set(OS_STRING "${DISTRO_NAME}-${CN_STRING}${CMAKE_SYSTEM_PROCESSOR}")
-
-endmacro()
-
-macro(configure_linux_packaging)
-
-  # Gather distro info
-  # This is used in package names
-  configure_linux_package_name()
-
-  set(CPACK_DEBIAN_PACKAGE_MAINTAINER ${DESKFLOW_MAINTAINER})
-  set(CPACK_DEBIAN_PACKAGE_SECTION "utils")
-  set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
-
-  set(CPACK_RPM_PACKAGE_LICENSE "GPLv2")
-  set(CPACK_RPM_PACKAGE_GROUP "Applications/System")
-
-  # HACK: The GUI depends on the Qt6 QPA plugins package, but that's not picked
-  # up by shlibdeps on Ubuntu 22 (though not a problem on Ubuntu 24 and Debian
-  # 12), so we must add it manually.
-  set(CPACK_DEBIAN_PACKAGE_DEPENDS "qt6-qpa-plugins")
-
-  set(source_desktop_file ${DESKFLOW_PROJECT_RES_DIR}/dist/linux/app.desktop.in)
-  set(configured_desktop_file ${PROJECT_BINARY_DIR}/app.desktop)
-  set(install_desktop_file ${DESKFLOW_APP_ID}.desktop)
-
-  configure_file(${source_desktop_file} ${configured_desktop_file} @ONLY)
-
-  install(
-    FILES ${configured_desktop_file}
-    DESTINATION share/applications
-    RENAME ${install_desktop_file})
-
-  install(
-    FILES ${DESKFLOW_RES_DIR}/app.png
-    DESTINATION share/pixmaps
-    RENAME ${DESKFLOW_APP_ID}.png)
-
-  # Prepare PKGBUILD for Arch Linux
-  configure_file(${DESKFLOW_PROJECT_RES_DIR}/dist/arch/PKGBUILD.in
-                 ${CMAKE_BINARY_DIR}/PKGBUILD @ONLY)
-
-endmacro()
-
-#
-# Same as the `configure_file` command but for directories recursively.
-#
-macro(configure_files srcDir destDir)
-
-  message(VERBOSE "Configuring directory ${destDir}")
-  make_directory(${destDir})
-
-  file(
-    GLOB_RECURSE sourceFiles
-    RELATIVE ${srcDir}
-    ${srcDir}/*)
-  file(
-    GLOB_RECURSE templateFiles
-    LIST_DIRECTORIES false
-    RELATIVE ${srcDir}
-    ${srcDir}/*.in)
-  list(REMOVE_ITEM sourceFiles ${templateFiles})
-
-  foreach(sourceFile ${sourceFiles})
-    set(sourceFilePath ${srcDir}/${sourceFile})
-    if(IS_DIRECTORY ${sourceFilePath})
-      message(VERBOSE "Copying directory ${sourceFile}")
-      make_directory(${destDir}/${sourceFile})
-    else()
-      message(VERBOSE "Copying file ${sourceFile}")
-      configure_file(${sourceFilePath} ${destDir}/${sourceFile} COPYONLY)
-    endif()
-
-  endforeach(sourceFile)
-
-  foreach(templateFile ${templateFiles})
-
-    set(sourceTemplateFilePath ${srcDir}/${templateFile})
-    string(REGEX REPLACE "\.in$" "" templateFile ${templateFile})
-    message(VERBOSE "Configuring file ${templateFile}")
-    configure_file(${sourceTemplateFilePath} ${destDir}/${templateFile} @ONLY)
-
-  endforeach(templateFile)
-
-endmacro(configure_files)
-
-macro(check_is_rpm)
-  # Check if RPM-like.
-
-endmacro()
-

deploy/CMakeLists.txt

@@ -0,0 +1,41 @@
+# SPDX-FileCopyrightText: 2024 Chris Rizzitello <sithlord48@gmail.com>
+# SPDX-License-Identifier: MIT
+
+# Copy License with txt ext for picky package creation tools
+file(COPY_FILE
+  ${CMAKE_SOURCE_DIR}/LICENSE
+  ${CMAKE_CURRENT_BINARY_DIR}/LICENSE.txt
+  ONLY_IF_DIFFERENT
+)
+
+
+# Generic Package Items
+set(CPACK_STRIP_FILES TRUE)
+set(CPACK_PACKAGE_NAME ${CMAKE_PROJECT_NAME})
+set(CPACK_PACKAGE_CONTACT "Deskflow <maintainers@deskflow.org>")
+set(CPACK_PACKAGE_DESCRIPTION ${CMAKE_PROJECT_DESCRIPTION})
+set(CPACK_PACKAGE_VENDOR "Deskflow")
+set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_CURRENT_BINARY_DIR}/LICENSE.txt)
+
+set(CPACK_PACKAGE_VERSION ${CMAKE_PROJECT_VERSION})
+
+#Prevent this override from being written in the package
+if(NOT PACKAGE_VERSION_LABEL)
+    set (PACKAGE_VERSION_LABEL "${CPACK_PACKAGE_VERSION}")
+endif()
+
+if(WIN32)
+  include(windows/deploy.cmake)
+elseif(UNIX AND NOT APPLE)
+  include(linux/deploy.cmake)
+elseif(APPLE)
+  include(mac/deploy.cmake)
+else()
+  message(STATUS "UNKNOWN System: ${CMAKE_SYSTEM_NAME}")
+endif()
+
+# Always use "deskflow" for start of name
+set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${PACKAGE_VERSION_LABEL}-${OS_STRING}")
+message(STATUS "Package Basename: ${CPACK_PACKAGE_FILE_NAME}")
+
+include(CPack)

deploy/linux/arch/PKGBUILD.in

@@ -1,10 +1,10 @@
-# Maintainer: @DESKFLOW_MAINTAINER@
+# Maintainer: Deskflow Developers
 
-pkgname=@DESKFLOW_APP_ID@
+pkgname=deskflow
 pkgver=@DESKFLOW_VERSION@
 pkgrel=1
 pkgdesc="Mouse and keyboard sharing utility"
-url='@DESKFLOW_WEBSITE_URL@'
+url='https://deskflow.org'
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
 license=('GPL-2.0-only')
 depends=(

deploy/linux/deploy.cmake

@@ -0,0 +1,107 @@
+# SPDX-FileCopyrightText: 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 our desktop file
+install(
+  FILES ${MY_DIR}/org.deskflow.deskflow.desktop
+  DESTINATION share/applications
+)
+
+# Install our icon
+install(
+  FILES ${MY_DIR}/deskflow.png
+  DESTINATION share/icons/hicolor/512x512/apps/
+  RENAME org.deskflow.deskflow.png
+)
+
+# Install our metainfo
+install(
+  FILES ${MY_DIR}/org.deskflow.deskflow.metainfo.xml
+  DESTINATION share/metainfo/
+)
+
+# Prepare PKGBUILD for Arch Linux
+configure_file(
+  ${MY_DIR}/arch/PKGBUILD.in
+  ${CMAKE_BINARY_DIR}/PKGBUILD
+  @ONLY
+)
+
+
+set(CPACK_DEBIAN_PACKAGE_SECTION "utils")
+set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
+set(CPACK_RPM_PACKAGE_LICENSE "GPLv2")
+set(CPACK_RPM_PACKAGE_GROUP "Applications/System")
+
+if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+  # Get Distro name information
+  if(EXISTS "/etc/os-release")
+    FILE(STRINGS "/etc/os-release" RELEASE_FILE_CONTENTS)
+  else()
+    message(FATAL_ERROR "Unable to read file /etc/os-release")
+  endif()
+
+  foreach(LINE IN LISTS RELEASE_FILE_CONTENTS)
+    if( "${LINE}" MATCHES "^ID=")
+      string(REGEX REPLACE "^ID=" "" DISTRO_NAME ${LINE})
+      string(REGEX REPLACE "\"" "" DISTRO_NAME ${DISTRO_NAME})
+      message(DEBUG "Distro Name :${DISTRO_NAME}")
+    elseif( "${LINE}" MATCHES "^ID_LIKE=")
+      string(REGEX REPLACE "^ID_LIKE=" "" DISTRO_LIKE "${LINE}")
+      string(REGEX REPLACE "\"" "" DISTRO_LIKE ${DISTRO_LIKE})
+      message(DEBUG "Distro Like :${DISTRO_LIKE}")
+    elseif( "${LINE}" MATCHES "^VERSION_CODENAME=")
+      string(REGEX REPLACE "^VERSION_CODENAME=" "" DISTRO_CODENAME "${LINE}")
+      string(REGEX REPLACE "\"" "" DISTRO_CODENAME "${DISTRO_CODENAME}")
+      message(DEBUG "Distro Codename:${DISTRO_CODENAME}")
+    elseif( "${LINE}" MATCHES "^VERSION_ID=")
+      string(REGEX REPLACE "^VERSION_ID=" "" DISTRO_VERSION_ID "${LINE}")
+      string(REGEX REPLACE "\"" "" DISTRO_VERSION_ID "${DISTRO_VERSION_ID}")
+      message(DEBUG "Distro VersionID:${DISTRO_VERSION_ID}")
+    endif()
+  endforeach()
+
+  # Check if Debian-link
+  string(REGEX MATCH debian|buntu DEBTYPE "${DISTRO_LIKE}")
+  if((NOT ("${DEBTYPE}" STREQUAL "")) OR ("${DISTRO_NAME}" STREQUAL "debian"))
+    set(CPACK_GENERATOR "DEB")
+  endif()
+
+  # Check if Rpm-like
+  string(REGEX MATCH suse|fedora|rhel RPMTYPE "${DISTRO_LIKE}")
+  string(REGEX MATCH fedora|suse|rhel RPMNAME "${DISTRO_NAME}")
+  if((NOT ("${RPMTYPE}" STREQUAL "")) OR (NOT ("${RPMNAME}" STREQUAL "")))
+      set(CPACK_GENERATOR "RPM")
+  endif()
+
+  # Disto specific name adjustments
+  if("${DISTRO_NAME}" STREQUAL "opensuse-tumbleweed")
+    set(DISTRO_NAME "opensuse")
+    set(DISTRO_CODENAME "tumbleweed")
+  elseif("${DISTRO_NAME}" STREQUAL "arch")
+    # Arch linux is rolling the version id reported is the date of last iso.
+    set(DISTRO_VERSION_ID "")
+  endif()
+
+  # Determain the code name to be used if any
+  if(NOT "${DISTRO_VERSION_ID}" STREQUAL "")
+    set(CN_STRING "${DISTRO_VERSION_ID}-")
+  endif()
+
+  if(NOT "${DISTRO_CODENAME}" STREQUAL "")
+    set(CN_STRING "${DISTRO_CODENAME}-")
+  endif()
+
+  if("${DISTRO_NAME}" STREQUAL "")
+    set(DISTRO_NAME "linux")
+  endif()
+  set(OS_STRING "${DISTRO_NAME}-${CN_STRING}${CMAKE_SYSTEM_PROCESSOR}")
+
+elseif(${CMAKE_SYSTEM_NAME} MATCHES "|.*BSD")
+  message(STATUS "BSD packaging not yet supported")
+  set(OS_STRING ${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR})
+endif()

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

@@ -0,0 +1,114 @@
+app-id: org.deskflow.deskflow
+runtime: org.kde.Platform
+runtime-version: "6.8"
+sdk: org.kde.Sdk
+command: deskflow
+finish-args:
+  - --share=ipc
+  - --socket=wayland
+  - --socket=fallback-x11
+  - --share=network
+  - --device=dri
+  - --talk-name=org.kde.StatusNotifierWatcher
+cleanup:
+  - /include
+  - "*.a"
+  - /bin/ei-debug-events
+  - /lib/cmake
+  - /lib/pkgconfig
+  - /share/pkgconfig
+  - /share/tomlplusplus
+  - /share/cmake
+  - /share/doc
+  - /share/gir-1.0
+  - /lib/girepository-1.0
+modules:
+  - name: python3-attrs
+    buildsystem: simple
+    build-commands:
+      - pip3 install --verbose --exists-action=i --no-index --find-links="file://${PWD}"
+          --prefix=${FLATPAK_DEST} --no-build-isolation attrs
+    sources:
+      - type: file
+        url: https://files.pythonhosted.org/packages/e0/44/827b2a91a5816512fcaf3cc4ebc465ccd5d598c45cefa6703fcf4a79018f/attrs-23.2.0-py3-none-any.whl
+        sha256: 99b87a485a5820b23b879f04c2305b44b951b502fd64be915879d77a7e8fc6f1
+    cleanup:
+      - '*'
+  - name: python3-Jinja2
+    buildsystem: simple
+    build-commands:
+      - pip3 install --verbose --exists-action=i --no-index --find-links="file://${PWD}"
+        --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
+      - type: file
+        url: https://files.pythonhosted.org/packages/87/5b/aae44c6655f3801e81aa3eef09dbbf012431987ba564d7231722f68df02d/MarkupSafe-2.1.5.tar.gz
+        sha256: d283d37a890ba4c1ae73ffadf8046435c76e7bc2247bbb63c00bd1a709c6544b
+    cleanup:
+      - '*'
+  - name: libei
+    buildsystem: meson
+    config-opts:
+        - -Ddocumentation=[]
+        - -Dtests=disabled
+        - -Dliboeffis=disabled
+    sources:
+        - type: git
+          url: https://gitlab.freedesktop.org/libinput/libei
+          tag: 1.3.0
+          commit: 997b7c0f37faea4f8bae59613c8f27370925d5b0
+  - name: libportal
+    buildsystem: meson
+    config-opts:
+      - -Ddocs=false
+      - -Dtests=false
+      - -Dportal-tests=false
+      - -Dvapi=false
+      - -Dbackend-qt6=auto
+    sources:
+      - type: git
+        url: https://github.com/flatpak/libportal.git
+        tag: 0.8.1
+        commit: 26c15008cbe579f57f89468384f8efc033f25f6f
+  - name: puixml
+    buildsystem: cmake-ninja
+    sources:
+      - type: git
+        url: https://github.com/zeux/pugixml
+        tag: v1.14
+        commit: db78afc2b7d8f043b4bc6b185635d949ea2ed2a8
+  - name: cli11
+    buildsystem: cmake-ninja
+    config-opts:
+      - -DCLI11_BUILD_TESTS=OFF
+    sources:
+      - type: git
+        url: https://github.com/CLIUtils/CLI11
+        tag: v2.4.2
+        commit: 6c7b07a878ad834957b98d0f9ce1dbe0cb204fc9
+  - 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
+    cleanup:
+      - '*'
+  - name: deskflow
+    buildsystem: cmake-ninja
+    config-opts:
+      - "-DCMAKE_BUILD_TYPE=Release"
+    sources:
+      - type: dir
+        path: ../../../
+

deploy/linux/org.deskflow.deskflow.desktop

@@ -1,11 +1,10 @@
 [Desktop Entry]
 Type=Application
 Version=1.0
-Name=@DESKFLOW_APP_NAME@
+Name=Deskflow
 Comment=Mouse and keyboard sharing utility
-Path=/usr/bin
-Exec=/usr/bin/@GUI_BINARY_NAME@
-Icon=@DESKFLOW_APP_ID@
+Exec=deskflow
+Icon=org.deskflow.deskflow
 Terminal=false
 Categories=Utility;
 Keywords=keyboard;mouse;sharing;network;share;

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

@@ -0,0 +1,279 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop-application">
+	<id>org.deskflow.deskflow</id>
+	<metadata_license>CC0-1.0</metadata_license>
+	<project_license>GPL-2.0+</project_license>
+	<name>Deskflow</name>
+	<developer_name>Deskflow Developers</developer_name>
+	<summary>Software Keyboard and mouse sharing</summary>
+	<description>
+		<p>
+			Use the keyboard, mouse, or trackpad of one computer to control nearby computers, and work seamlessly between them.
+		</p>
+	</description>
+	<launchable type="desktop-id">org.deskflow.deskflow.desktop</launchable>
+	<url type="homepage">https://deskflow.org</url>
+	<url type="bugtracker">https://github.com/deskflow/deskflow/issues</url>
+	<screenshots>
+		<screenshot type="default">
+			<image>https://github.com/user-attachments/assets/883660dc-f3f5-4b69-8821-a079a58d3882</image>
+		</screenshot>
+	</screenshots>
+	<provides> <id>org.deskflow.deskflow.desktop</id> </provides>
+	<categories>
+		<category>Utility</category>
+	</categories>
+	<keywords>
+		<keyword translate="no">Input</keyword>
+		<keyword translate="no">Sharing</keyword>
+		<keyword translate="no">KVM</keyword>
+		<keyword translate="no">Synergy</keyword>
+	</keywords>
+	<branding>
+		<color type="primary" scheme_preference="light">#dddddd</color>
+		<color type="primary" scheme_preference="dark">#555555</color>
+	</branding>
+	<content_rating type="oars-1.0" />
+	<releases>
+		<release version="1.18.0" date="2024-12-26" urgency="high">
+			<description>
+				<p>This stable Release Fixes a few security issues, additionally fixes several bugs and adds a few new features. For the full changelog see the relase page.</p>
+				<ul>
+					<li>Fix CVE-2021-42075: Close connection on app-level handshake failure</li>
+					<li>Fix CVE-2021-42074: Handle SSL race conditions and segmentation fault</li>
+					<li>Fix CVE-2021-42076: Enforce maximum message length </li>
+					<li>Add a visiblity toggle for the log</li>
+					<li>Fix deskflow will now hide or show when the tray icon is clicked</li>
+					<li>Fix how Utf-16 surrogates are handled</li>
+					<li>Avoid encoding empty data to the clipboard on Windows</li>
+					<li>Create new Tray Icons for windows</li>
+					<li>Always show the tray menu entry for the restore action on macOS</li>
+					<li>Correctly restore window when hidden with command+H on macOS</li>
+					<li>Update the windows clipboard format listener to monitor the clipboard</li>
+				</ul>
+			</description>
+		<url>https://github.com/deskflow/deskflow/releases/tag/v1.18.0</url>
+		</release>
+		<release version="1.17.2" date="2024-11-20" urgency="medium">
+			<description>
+				<p>This stable Release contains alot of internal refactoring.</p>
+				<ul>
+					<li>docs: Update readme to use latest for the stable link and continuous</li>
+					<li>chore: rm unused res/doxygen.cfg.in</li>
+					<li>chore: rm unused res/License.tex</li>
+					<li>chore: rm unused res/License.rtf</li>
+					<li>refactor: mv res/gui/win/app.rc => src/gui/src/app.rc</li>
+					<li>refactor: mv res/app.ico src/gui/src/app.ico</li>
+					<li>refactor: mv src/lib/gui/TrayIcon => src/gui/src/TrayIcon</li>
+					<li>feat: use platform native styles when possible</li>
+					<li>refactor: use theme icon for document open fallback to the folder icon</li>
+					<li>refactor mv: res/gui => src/gui/res</li>
+					<li>chore: alphabetize app.qrc resource file</li>
+					<li>chore rm: unused app.svg</li>
+					<li>refactor: mv res/app.png and res/app.svg => deploy</li>
+					<li>refactor: mv res/dist/linux/app.desktop.in => deploy/org.deskflow.desktop</li>
+					<li>refactor: mv res/dist/arch => deploy/dist/arch</li>
+					<li>chore: rm unneeded res/dist/flatpak/flatpak-desktop.patch</li>
+					<li>refactor: mv res/dist/flatpak => deploy/res/flatpak</li>
+					<li>refactor: mv res/dist/mac => deploy/dist/mac</li>
+					<li>refactor: mv res/dist/wix => deploy/dist/wix</li>
+					<li>build: add metainfo</li>
+					<li>ci: rename ci.yml to => continuous-integration.yml</li>
+					<li>Rename CI badge to match new .yml filename</li>
+					<li>chore: update the deskflow shipped icon to have proper padding</li>
+					<li>chore: adjust branding light / dark colors to dddddd / 555555</li>
+					<li>fix: SettingsDialog ui generating nonsence alignment tags when edited</li>
+					<li>feat: SettingsDialog, Allow user to toggle the check for updates settings</li>
+					<li>fix: MainWindow not saving initial update flag</li>
+					<li>build: rm DESKFLOW_APP_ID define</li>
+					<li>build: rm DESKFLOW_DOMAIN define</li>
+					<li>build: rm DESKFLOW_APP_NAME define</li>
+					<li>build: rm DESKFLOW_AUTHOR_NAME define</li>
+					<li>build: rm DESKFLOW_MAINTAINER define</li>
+					<li>build: rm DESKFLOW_WEBSITE_URL define</li>
+					<li>build: rm DESKFLOW_VERSION_URL define</li>
+					<li>build: rm DESKFLOW_HELP_TEXT define</li>
+					<li>build: rm DESKFLOW_RES_DIR define</li>
+					<li>build: rm DESKFLOW_MAC_BUNDLE_CODE</li>
+					<li>build: rm GUI_BINARY_NAME define</li>
+					<li>build: rm SERVER_BINARY_NAME define</li>
+					<li>build:rm CLIENT_BINARY_NAME define</li>
+					<li>build: rm CORE_BINARY_NAME define</li>
+					<li>build: rm DAEMON_BINARY_NAME</li>
+					<li>build: remove DESKFLOW_SHOW_DEV_THANKS define</li>
+					<li>fix: single typo in README.md</li>
+					<li>feat: fix flatpak recipe</li>
+					<li>ci: build flatpaks</li>
+				</ul>
+			</description>
+		<url>https://github.com/deskflow/deskflow/releases/tag/v1.17.2</url>
+		</release>
+		<release version="1.17.1" date="2024-11-7" urgency="high">
+			<description>
+				<p>This stable Release Has a very long chagelog some notable ones are.</p>
+				<ul>
+					<li>Remove word 'beta' from Wayland message</li>
+					<li>docs: Update `README.md` with Matrix link</li>
+					<li>Make `README.md` more relevant to current repo state</li>
+					<li>Use #pragma once for headers</li>
+					<li>Remove Python `.venv` dir caching to reduce complexity</li>
+					<li>Add discussion value to project values in README.md</li>
+					<li>Use modern Qt connections in GUI</li>
+					<li>chore: rm unused string_utils file</li>
+					<li>build: findSSL via cmake</li>
+					<li>fix: Set correct QGuiApplication::desktopFileName</li>
+					<li>feat: Use native style on KDE Plasma</li>
+					<li>build: Don't force CMAKE_INSTALL_PREFIX</li>
+					<li>CI: Requires Lint to pass before running other jobs. Allow CI to be skipped for non code changes</li>
+					<li>Move res/config.h.in -> src/lib/config.h.in</li>
+					<li>build: Drop warnings_as_errors</li>
+					<li>chore: cmake user files to gitignore</li>
+					<li>chore: add basic .gitattributes</li>
+					<li>Use high res icons and remove unused</li>
+					<li>Coverage for `AboutDialog.cpp`</li>
+					<li>CI cleanup and consolidation</li>
+					<li>Remove dead `test-dist-upload.yml` file</li>
+					<li>fix: align --display explanation in help message</li>
+					<li>Use version from Git tags instead of `VERSION` file</li>
+					<li>Add leading edge philosophy to README.md</li>
+					<li>Fixed minor typos in the bug report template</li>
+					<li>Change TLS dir to same as Qt config</li>
+					<li>Restore `pull_request` trigger for `codeql-analysis.yml`</li>
+					<li>Fixed error count logic for test summary</li>
+					<li>Solve QCheckBox 6.7+ warning and exclude GUI from coverage</li>
+					<li>build: set project description</li>
+					<li>fix: Check for errors before reading version string</li>
+					<li>ci: clearer and cleaner steps</li>
+					<li>Arch package fixup</li>
+					<li>Force LF in gitattributes</li>
+					<li>docs: Add other build type to bug report template</li>
+					<li>Fixed code style in `ci.yml` workflow</li>
+					<li>Remove `cmake-format` linter (more harm than good)</li>
+					<li>Ignore paths for CodeQL Analysis</li>
+					<li>Always run PR comments job</li>
+					<li>docs: Add .editorconfig file</li>
+					<li>Remove Wayland experimental pop</li>
+					<li>build: linux packages with proper names using cpack</li>
+					<li>ci: vcpkg cache working</li>
+					<li>fix: Use `OPENSSL_EXE_DIR` instead of `OPENSSL_ROOT_DIR` on Windows</li>
+					<li>build: Add `gtest-args` for VS Code users</li>
+					<li>chore: Replace assert with warning for screen boundary issue</li>
+					<li>chore: resolve cmake cap nits</li>
+					<li>fix: Let users select version number and build in About Dialog</li>
+					<li>Adjust Clang-format linter rules</li>
+					<li>chore: Update feature request template</li>
+					<li>build: update required ssl to 3.0+</li>
+					<li>ci: Use `cmake` instead of `make` directly for Arch package</li>
+					<li>build: Require cmake 3.24</li>
+					<li>ci: use vcpkg action on ci to cache</li>
+					<li>ci: Remove CMake presets</li>
+					<li>build: get CLI11 via file download if not on system</li>
+					<li>ci: remove unused cache step</li>
+					<li>build: arch package won't install /bin</li>
+					<li>build: use File to dl toml++ if not on system</li>
+					<li>ci: Catch std::exception on toml::parse_file</li>
+					<li>Optional FreeBSD integtests  and reduce CMake arg dupe</li>
+					<li>fix: server config dialog show event</li>
+					<li>docs: Checkbox for continuous build on bug template</li>
+					<li>build: use vcpkg for all depends, vcpkg action on ci to cache</li>
+					<li>Remove `.ui` files from being the base class</li>
+					<li>Protocol interoperability for Input Leap (Barrier) and Synergy</li>
+					<li>build: arch package requires tomlplusplus and cli11</li>
+					<li>build: Use Fetch Content for Gtest</li>
+					<li>fix:#7760 use a proper fedora package name</li>
+					<li>Static cast screen column count for scan alert 559</li>
+					<li>build: remove stale meson parts for wintoast</li>
+					<li>ci: Normalize CI step names, descriptions, etc</li>
+					<li>ci: New macOS CI with Qt action</li>
+					<li>Drop `.ui` file for setup wizard</li>
+					<li>Clazy nits</li>
+					<li>ci: Bump containers for analyze workflows</li>
+					<li>ci: use fancy checkout action</li>
+					<li>Fix the windows installer</li>
+					<li>build: Require libei and libportal on linux</li>
+					<li>Unify Jobs into one matrix</li>
+					<li>docs: Update Readme</li>
+					<li>ci: remove unused libportal check from Librarires.cmake</li>
+					<li>docs: Remove confusing value line in readme</li>
+					<li>Simplify build by using Docker containers directly</li>
+					<li>docs: Remote build containers badge</li>
+					<li>Elaborate on settings dialog help (what's this)</li>
+					<li>Mosty glob free</li>
+					<li>build: update package names for linux to be more unified</li>
+					<li>chore: add link to wayland discussion</li>
+					<li>docs: readme add mac os xattr note</li>
+					<li>Update README.md to restore sponsor link</li>
+					<li>docs: Fixed sponsor link in README</li>
+					<li>User docs</li>
+					<li>chore: settingsDialog rm unused CoreTool include</li>
+					<li>Do not build deskflow legacy</li>
+					<li>build: add deskflow devs to binaries copyright</li>
+					<li>doc: correct target for documents</li>
+					<li>docs: Improve error messages around Doxygen</li>
+					<li>fix: crash on --help arg</li>
+					<li>docs: contributors on readme</li>
+					<li>Clean up scripts directory</li>
+					<li>No UI about dialog</li>
+					<li>chore: add homebrew tap info to readme</li>
+					<li>chore: Replace screen leave/enter asserts with warnings</li>
+					<li>CI: added updated winget package submission</li>
+					<li>ci: Use GITHUB_TOKEN in place of PAT</li>
+					<li>ci: use pre-release for continuous to stop it from grabbing latest tag</li>
+					<li>ci: git-version-action: Always report described version</li>
+					<li>ci: adjust pacakge script to use the names we would like when in cpack</li>
+				</ul>
+			</description>
+		<url>https://github.com/deskflow/deskflow/releases/tag/v1.17.1</url>
+		</release>
+		<release version="1.17.0" date="2024-10-02" urgency="low">
+			<description>
+				<p>This is the first Deskflow Release.</p>
+				<ul>
+					<li>Use Deskflow Name</li>
+					<li>fix: windows build typos</li>
+					<li>Fix broken CI caused by renaming project to Deskflow</li>
+					<li>fix: protocol compatibility with Synergy</li>
+					<li>Remove Google Drive upload and always upload to GitHub</li>
+					<li>fix: stuck keys on leave</li>
+					<li>ci: always upgrade packages on arch</li>
+					<li>ci: option to skip changelog lint in PR</li>
+					<li>docs: fixed link to config.yaml in README.md</li>
+					<li>docs: add sponsor badge and blurb to readme</li>
+					<li>ci: lint and add comment to PR on fail</li>
+					<li>docs: add build type to bug report form</li>
+					<li>docs: add extra badges and fix sponsor link</li>
+					<li>build: default to system tomlplusplus and CLI11</li>
+					<li>ci: give write permission for PR comments</li>
+					<li>build: fixed option name for SYSTEM_TOMLPLUSPLUS</li>
+					<li>build: script to create Python virtual env</li>
+					<li>build: set BUILD_DATE instead of using __DATE__</li>
+					<li>ci: delete ChangeLog because it's redundant</li>
+					<li>feat: use new Deskflow graphics</li>
+					<li>fix: various typos found by unit193</li>
+					<li>docs: add new logo to readme and update screenshot</li>
+					<li>ci: use workflow_run to comment on PRs</li>
+					<li>feat: change most domains to Deskflow</li>
+					<li>feat: ask for permission before update check</li>
+					<li>ci: remove restore-keys for vcpkg and use local bootstrap</li>
+					<li>ci: add pr comment based on ci result</li>
+					<li>ci: add link back to workflow summary in pr comment</li>
+					<li>ci: use github.event.workflow_run.id for CI summary comment</li>
+					<li>ci: check for summaries dir before building message</li>
+					<li>ci: handle files with same name in ci comment workflow</li>
+					<li>ci: fixed syntax error in ci comment workflow</li>
+					<li>ci: use braces block for formatting in ci comment</li>
+					<li>ci: use job summary instead of pr comment</li>
+					<li>ci: lookup pr number by head sha for ci comment</li>
+					<li>fix: Update onMouseMoveSecondary to allow offset adjustments</li>
+					<li>ci: lock qt version to 6.7.2 on win/mac</li>
+					<li>docs: Fixed broken URL in README.md</li>
+					<li>fix: Use library config for Windows OpenSSL</li>
+					<li>Relocate commercial code downstream</li>
+					<li>build: Bump min libei and libportal versions</li>
+					<li>Use sonarsource/sonarcloud-github-c-cpp</li>
+				</ul>
+			</description>
+		<url>https://github.com/deskflow/deskflow/releases/tag/v1.17.0</url>
+		</release>
+	</releases>
+</component>

deploy/mac/deploy.cmake

@@ -0,0 +1,15 @@
+# SPDX-FileCopyrightText: 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})
+
+set(OS_STRING "macos-${CMAKE_SYSTEM_PROCESSOR}")
+set(CMAKE_INSTALL_RPATH "@loader_path/../Libraries;@loader_path/../Frameworks")
+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 "Deskflow")
+set(CPACK_DMG_SLA_USE_RESOURCE_FILE_LICENSE ON)
+set(CPACK_GENERATOR "DragNDrop")

deploy/mac/generate_ds_store.applescript

@@ -0,0 +1,45 @@
+on run argv
+  set image_name to item 1 of argv
+
+  tell application "Finder"
+  tell disk image_name
+
+    -- wait for the image to finish mounting
+    set open_attempts to 0
+    repeat while open_attempts < 5
+      try
+        open
+          delay 5
+          set open_attempts to 5
+        close
+      on error errStr number errorNumber
+        set open_attempts to open_attempts + 1
+        delay 10
+      end try
+    end repeat
+
+    -- open the image the first time and save a DS_Store with just
+    -- background and icon setup
+    open
+      set current view of container window to icon view
+      set theViewOptions to the icon view options of container window
+      set background picture of theViewOptions to file ".background:background.tiff"
+      set arrangement of theViewOptions to not arranged
+      set icon size of theViewOptions to 100
+      set text size of theViewOptions to 16
+    close
+
+    open
+      tell container window
+        set sidebar width to 0
+        set statusbar visible to false
+        set toolbar visible to false
+        set pathbar visible to false
+        set the bounds to { 200, 120, 800, 520 }
+        set position of item "Deskflow.app" to { 144, 190 }
+        set position of item "Applications" to { 455, 190 }
+      end tell
+    close
+  end tell
+end tell
+end run

deploy/windows/deploy.cmake

@@ -0,0 +1,59 @@
+# SPDX-FileCopyrightText: 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})
+
+
+# Configure the windows version rc file
+configure_file(
+  ${MY_DIR}/version.rc.in
+  ${PROJECT_BINARY_DIR}/src/version.rc @ONLY
+)
+
+# Setup OS_STRING
+if(CMAKE_SYSTEM_PROCESSOR MATCHES AMD64)
+  set(OS_STRING "win-x64")
+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES ARM64)
+  set(OS_STRING "win-arm64")
+else()
+  set(OS_STRING "win-${CMAKE_SYSTEM_PROCESSOR}")
+endif()
+
+# If Wix4+ is installed make a package
+find_program(WIX_APP wix)
+if (NOT "${WIX_APP}" STREQUAL "")
+  set(CPACK_WIX_VERSION 4)
+  list(APPEND CPACK_GENERATOR "WIX")
+endif()
+
+set(CPACK_PACKAGE_NAME "Deskflow")
+
+# Menu Entry
+set(CPACK_WIX_PROGRAM_MENU_FOLDER "Deskflow")
+set(CPACK_PACKAGE_EXECUTABLES "deskflow" "Deskflow")
+
+# Default Install Path
+set(CPACK_PACKAGE_INSTALL_DIRECTORY "Deskflow")
+
+# Wix Specific Values
+set(CPACK_WIX_UPGRADE_GUID "027D1C8A-E7A5-4754-BB93-B2D45BFDBDC8")
+set(CPACK_WIX_UI_BANNER "${MY_DIR}/wix-banner.png")
+set(CPACK_WIX_UI_DIALOG "${MY_DIR}/wix-dialog.png")
+
+# Required Extra Extenstions
+list(APPEND CPACK_WIX_EXTENSIONS "WixToolset.Util.wixext" "WixToolset.Firewall.wixext")
+
+# Make sure to also put the xmlns for the ext into the wix block on generated files
+list(APPEND CPACK_WIX_CUSTOM_XMLNS "util=http://wixtoolset.org/schemas/v4/wxs/util" "firewall=http://wixtoolset.org/schemas/v4/wxs/firewall")
+
+# The patch has to know the full path of our msm file
+set(CPACK_WIX_MSM_FILE "${MY_DIR}/Microsoft_VC142_CRT_x64.msm")
+configure_file(
+  ${MY_DIR}/wix-patch.xml.in
+  ${CMAKE_CURRENT_BINARY_DIR}/wix-patch.xml @ONLY
+)
+
+# This patch set ups filewall rules, the service and msm module
+set(CPACK_WIX_PATCH_FILE "${CMAKE_CURRENT_BINARY_DIR}/wix-patch.xml")

deploy/windows/version.rc.in

@@ -12,14 +12,14 @@ https://learn.microsoft.com/en-us/windows/win32/menurc/versioninfo-resource?redi
 #define VER_PRODUCTVERSION          @DESKFLOW_VERSION_MS_CSV@
 #define VER_PRODUCTVERSION_STR      "@DESKFLOW_VERSION@\0"
 
-#define VER_COMPANYNAME_STR         "@DESKFLOW_AUTHOR_NAME@\0"
-#define VER_FILEDESCRIPTION_STR     "@DESKFLOW_APP_NAME@\0"
-#define VER_INTERNALNAME_STR        "@DESKFLOW_APP_NAME@\0"
+#define VER_COMPANYNAME_STR         "Deskflow\0"
+#define VER_FILEDESCRIPTION_STR     "Deskflow\0"
+#define VER_INTERNALNAME_STR        "Deskflow\0"
 #define VER_LEGALCOPYRIGHT_STR      "© 2024 Deskflow Developers\0"
 #define VER_LEGALTRADEMARKS1_STR    "All Rights Reserved\0"
 #define VER_LEGALTRADEMARKS2_STR    "\0"
 #define VER_ORIGINALFILENAME_STR    "\0"
-#define VER_PRODUCTNAME_STR         "@DESKFLOW_APP_NAME@\0"
+#define VER_PRODUCTNAME_STR         "Deskflow\0"
 
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION     VER_FILEVERSION

deploy/windows/wix-patch.xml.in

@@ -0,0 +1,26 @@
+<CPackWiXPatch>
+  <CPackWiXFragment Id="CM_CP_deskflow_daemon.exe">
+    <ServiceInstall Description="Controls the Deskflow foreground processes." DisplayName="Deskflow" ErrorControl="normal" Id="ServiceInstall" Name="Deskflow" Start="auto" Type="ownProcess">
+      <util:ServiceConfig FirstFailureActionType="restart" ResetPeriodInDays="1" RestartServiceDelayInSeconds="1" SecondFailureActionType="restart" ThirdFailureActionType="restart"/>
+    </ServiceInstall>
+    <ServiceControl Id="ServiceControl" Name="Deskflow" Remove="uninstall" Start="install" Stop="both"/>
+  </CPackWiXFragment>
+  <CPackWiXFragment Id="CM_CP_deskflow_server.exe">
+    <firewall:FirewallException Id="ServerFirewallException" Name="Deskflow Server" Program="[INSTALL_ROOT]deskflow-server.exe" Scope="any"/>
+  </CPackWiXFragment>
+  <CPackWiXFragment Id="CM_CP_deskflow_client.exe">
+    <firewall:FirewallException Id="ClientFirewallException" Name="Deskflow Client" Program="[INSTALL_ROOT]deskflow-client.exe" Scope="any"/>
+  </CPackWiXFragment>
+  <CPackWiXFragment Id="#PRODUCT">
+    <StandardDirectory  Id="TARGETDIR">
+      <Merge Id="VCRedist" SourceFile="@CPACK_WIX_MSM_FILE@" DiskId="1" Language="0"/>
+    </StandardDirectory >
+    <Feature Id="VCRedist" Title="Visual C++ Runtime" AllowAbsent="no" AllowAdvertise="yes" Display="hidden" InstallDefault="local" TypicalDefault="install">
+      <MergeRef Id="VCRedist" Primary="yes"/>
+    </Feature>
+    <CustomAction Id="Run_Deskflow" ExeCommand="Deskflow" FileRef="CM_FP_deskflow.exe" Return="asyncNoWait"/>
+    <InstallExecuteSequence>
+      <Custom Action="Run_Deskflow" OnExit="success" Condition="NOT Installed"/>
+    </InstallExecuteSequence>
+  </CPackWiXFragment>
+</CPackWiXPatch>

res/License.rtf

@@ -1,102 +0,0 @@
-{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf460
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\froman\fcharset0 Times-Roman;}
-{\colortbl;\red255\green255\blue255;}
-{\info
-{\title Original file was gpl-2.0.tex}
-{\doccomm Created using latex2rtf 1.9.19a on Sun Jul 12 19:21:22 2009}}\paperw12280\paperh15900\margl2680\margr2700\margb1760\margt2540\vieww12280\viewh15900\viewkind1
-\deftab720
-\pard\pardeftab720\ri0\qj
-
-\f0\fs24 \cf0 \
-\pard\pardeftab720\ri0\qc
-
-\f1\fs30 \cf0 GNU GENERAL PUBLIC LICENSE
-\f0\fs24 \
-\
-\
-\pard\pardeftab720\ri0\qc
-
-\f1 \cf0 Version 2, June 1991\
-\
-\
-Copyright \'a9 1989, 1991 Free Software Foundation, Inc.\
-\pard\pardeftab720\ri0\sb240\qc
-\cf0 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA\
-\pard\pardeftab720\ri0\qc
-\cf0 Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.  \
-\pard\pardeftab720\ri0\qc
-
-\b\fs26 \cf0 Preamble
-\b0\fs24  \
-\pard\pardeftab720\ri0\qj
-\cf0 The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software\'97to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation\'92s software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Library General Public License instead.) You can apply it to your programs, too.\
-When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things.\
-To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it.\
-For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.\
-We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software.\
-Also, for each author\'92s protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors\'92 reputations.\
-Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone\'92s free use or not licensed at all.\
-The precise terms and conditions for copying, distribution and modification follow.\
-\pard\pardeftab720\ri0\qc
-
-\fs31 \cf0 Terms and Conditions For Copying, Distribution and Modification
-\fs24  \
-\pard\pardeftab720\li600\fi-300\ri0\sb50\qj
-\cf0 1.	This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The \'93Program\'94, below, refers to any such program or work, and a \'93work based on the Program\'94 means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term \'93modification\'94.) Each licensee is addressed as \'93you\'94.\
-\pard\pardeftab720\li600\ri0\qj
-\cf0 Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does.\
-\pard\pardeftab720\li600\fi-300\ri0\sb50\qj
-\cf0 2.	You may copy and distribute verbatim copies of the Program\'92s source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program.\
-\pard\pardeftab720\li600\ri0\qj
-\cf0 You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.\
-\pard\pardeftab720\li600\fi-300\ri0\sb50\qj
-\cf0 3.	You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:\
-\pard\pardeftab720\li1200\fi-300\ri0\sb50\qj
-\cf0 (a)	You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.\
-(b)	You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License.\
-(c)	If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.)\
-\pard\pardeftab720\li600\ri0\sb100\qj
-\cf0 These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.\
-\pard\pardeftab720\li600\fi-300\ri0\qj
-\cf0 Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program.\
-In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.\
-\pard\pardeftab720\li600\fi-300\ri0\sb50\qj
-\cf0 4.	You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:\
-\pard\pardeftab720\li1200\fi-300\ri0\sb50\qj
-\cf0 (a)	Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,\
-(b)	Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,\
-(c)	Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.)\
-\pard\pardeftab720\li600\ri0\sb100\qj
-\cf0 The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.\
-\pard\pardeftab720\li600\fi-300\ri0\qj
-\cf0 If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code.\
-\pard\pardeftab720\li600\fi-300\ri0\sb50\qj
-\cf0 5.	You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.\
-6.	You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it.\
-7.	Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients\'92 exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.\
-8.	If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program.\
-\pard\pardeftab720\li600\ri0\qj
-\cf0 If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances.\
-It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.\
-This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.\
-\pard\pardeftab720\li600\fi-300\ri0\sb50\qj
-\cf0 9.	If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.\
-10.	The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.\
-\pard\pardeftab720\li600\ri0\qj
-\cf0 Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and \'93any later version\'94, you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation.\
-\pard\pardeftab720\li600\fi-300\ri0\sb50\qj
-\cf0 11.	If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.\
-\pard\pardeftab720\li600\ri0\qc
-
-\fs31 \cf0 No Warranty 
-\fs24  \
-\pard\pardeftab720\li600\fi-300\ri0\sb50\qj
-\cf0 12.	Because the program is licensed free of charge, there is no warranty for the program, to the extent permitted by applicable law. Except when otherwise stated in writing the copyright holders and/or other parties provide the program \'93as is\'94 without warranty of any kind, either expressed or implied, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose. The entire risk as to the quality and performance of the program is with you. Should the program prove defective, you assume the cost of all necessary servicing, repair or correction.
-\f0 \
-
-\f1 13.	In no event unless required by applicable law or agreed to in writing will any copyright holder, or any other party who may modify and/or redistribute the program as permitted above, be liable to you for damages, including any general, special, incidental or consequential damages arising out of the use or inability to use the program (including but not limited to loss of data or data being rendered inaccurate or losses sustained by you or third parties or a failure of the program to operate with any other programs), even if such holder or other party has been advised of the possibility of such damages.
-\f0 \
-\pard\pardeftab720\ri0\sb100\qc
-
-\f1\fs31 \cf0 End of Terms and Conditions
-\fs24  }

res/License.tex

@@ -1,422 +0,0 @@
-\documentclass[11pt]{article}
-
-\title{GNU GENERAL PUBLIC LICENSE}
-\date{Version 2, June 1991}
-
-\begin{document}
-\maketitle
-
-\begin{center}
-{\parindent 0in
-
-Copyright \copyright\ 1989, 1991 Free Software Foundation, Inc.
-
-\bigskip
-
-51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-
-\bigskip
-
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.
-}
-\end{center}
-
-\begin{center}
-{\bf\large Preamble}
-\end{center}
-
-
-The licenses for most software are designed to take away your freedom to
-share and change it.  By contrast, the GNU General Public License is
-intended to guarantee your freedom to share and change free software---to
-make sure the software is free for all its users.  This General Public
-License applies to most of the Free Software Foundation's software and to
-any other program whose authors commit to using it.  (Some other Free
-Software Foundation software is covered by the GNU Library General Public
-License instead.)  You can apply it to your programs, too.
-
-When we speak of free software, we are referring to freedom, not price.
-Our General Public Licenses are designed to make sure that you have the
-freedom to distribute copies of free software (and charge for this service
-if you wish), that you receive source code or can get it if you want it,
-that you can change the software or use pieces of it in new free programs;
-and that you know you can do these things.
-
-To protect your rights, we need to make restrictions that forbid anyone to
-deny you these rights or to ask you to surrender the rights.  These
-restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-For example, if you distribute copies of such a program, whether gratis or
-for a fee, you must give the recipients all the rights that you have.  You
-must make sure that they, too, receive or can get the source code.  And
-you must show them these terms so they know their rights.
-
-We protect your rights with two steps: (1) copyright the software, and (2)
-offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-Also, for each author's protection and ours, we want to make certain that
-everyone understands that there is no warranty for this free software.  If
-the software is modified by someone else and passed on, we want its
-recipients to know that what they have is not the original, so that any
-problems introduced by others will not reflect on the original authors'
-reputations.
-
-Finally, any free program is threatened constantly by software patents.
-We wish to avoid the danger that redistributors of a free program will
-individually obtain patent licenses, in effect making the program
-proprietary.  To prevent this, we have made it clear that any patent must
-be licensed for everyone's free use or not licensed at all.
-
-The precise terms and conditions for copying, distribution and
-modification follow.
-
-\begin{center}
-{\Large \sc Terms and Conditions For Copying, Distribution and
-  Modification}
-\end{center}
-
-
-%\renewcommand{\theenumi}{\alpha{enumi}}
-\begin{enumerate}
-
-\addtocounter{enumi}{-1}
-
-\item 
-
-This License applies to any program or other work which contains a notice
-placed by the copyright holder saying it may be distributed under the
-terms of this General Public License.  The ``Program'', below, refers to
-any such program or work, and a ``work based on the Program'' means either
-the Program or any derivative work under copyright law: that is to say, a
-work containing the Program or a portion of it, either verbatim or with
-modifications and/or translated into another language.  (Hereinafter,
-translation is included without limitation in the term ``modification''.)
-Each licensee is addressed as ``you''.
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-\item You may copy and distribute verbatim copies of the Program's source
-  code as you receive it, in any medium, provided that you conspicuously
-  and appropriately publish on each copy an appropriate copyright notice
-  and disclaimer of warranty; keep intact all the notices that refer to
-  this License and to the absence of any warranty; and give any other
-  recipients of the Program a copy of this License along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and you
-may at your option offer warranty protection in exchange for a fee.
-
-\item
-
-You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-\begin{enumerate}
-
-\item 
-
-You must cause the modified files to carry prominent notices stating that
-you changed the files and the date of any change.
-
-\item
-
-You must cause any work that you distribute or publish, that in
-whole or in part contains or is derived from the Program or any
-part thereof, to be licensed as a whole at no charge to all third
-parties under the terms of this License.
-
-\item
-If the modified program normally reads commands interactively
-when run, you must cause it, when started running for such
-interactive use in the most ordinary way, to print or display an
-announcement including an appropriate copyright notice and a
-notice that there is no warranty (or else, saying that you provide
-a warranty) and that users may redistribute the program under
-these conditions, and telling the user how to view a copy of this
-License.  (Exception: if the Program itself is interactive but
-does not normally print such an announcement, your work based on
-the Program is not required to print an announcement.)
-
-\end{enumerate}
-
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-\item
-You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-\begin{enumerate}
-
-\item
-
-Accompany it with the complete corresponding machine-readable
-source code, which must be distributed under the terms of Sections
-1 and 2 above on a medium customarily used for software interchange; or,
-
-\item
-
-Accompany it with a written offer, valid for at least three
-years, to give any third party, for a charge no more than your
-cost of physically performing source distribution, a complete
-machine-readable copy of the corresponding source code, to be
-distributed under the terms of Sections 1 and 2 above on a medium
-customarily used for software interchange; or,
-
-\item
-
-Accompany it with the information you received as to the offer
-to distribute corresponding source code.  (This alternative is
-allowed only for noncommercial distribution and only if you
-received the program in object code or executable form with such
-an offer, in accord with Subsection b above.)
-
-\end{enumerate}
-
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-\item
-You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-\item
-You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-\item
-Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-\item
-If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-\item
-If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-\item
-The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and ``any
-later version'', you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-\item
-If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-\begin{center}
-{\Large\sc
-No Warranty
-}
-\end{center}
-
-\item
-{\sc Because the program is licensed free of charge, there is no warranty
-for the program, to the extent permitted by applicable law.  Except when
-otherwise stated in writing the copyright holders and/or other parties
-provide the program ``as is'' without warranty of any kind, either expressed
-or implied, including, but not limited to, the implied warranties of
-merchantability and fitness for a particular purpose.  The entire risk as
-to the quality and performance of the program is with you.  Should the
-program prove defective, you assume the cost of all necessary servicing,
-repair or correction.}
-
-\item
-{\sc In no event unless required by applicable law or agreed to in writing
-will any copyright holder, or any other party who may modify and/or
-redistribute the program as permitted above, be liable to you for damages,
-including any general, special, incidental or consequential damages arising
-out of the use or inability to use the program (including but not limited
-to loss of data or data being rendered inaccurate or losses sustained by
-you or third parties or a failure of the program to operate with any other
-programs), even if such holder or other party has been advised of the
-possibility of such damages.}
-
-\end{enumerate}
-
-
-\begin{center}
-{\Large\sc End of Terms and Conditions}
-\end{center}
-
-
-\pagebreak[2]
-
-\section*{Appendix: How to Apply These Terms to Your New Programs}
-
-If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these
-terms.
-
-  To do so, attach the following notices to the program.  It is safest to
-  attach them to the start of each source file to most effectively convey
-  the exclusion of warranty; and each file should have at least the
-  ``copyright'' line and a pointer to where the full notice is found.
-
-\begin{quote}
-one line to give the program's name and a brief idea of what it does. \\
-Copyright (C) yyyy  name of author \\
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-\end{quote}
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-\begin{quote}
-Gnomovision version 69, Copyright (C) yyyy  name of author \\
-Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. \\
-This is free software, and you are welcome to redistribute it
-under certain conditions; type `show c' for details.
-\end{quote}
-
-
-The hypothetical commands {\tt show w} and {\tt show c} should show the
-appropriate parts of the General Public License.  Of course, the commands
-you use may be called something other than {\tt show w} and {\tt show c};
-they could even be mouse-clicks or menu items---whatever suits your
-program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a ``copyright disclaimer'' for the program, if
-necessary.  Here is a sample; alter the names:
-
-\begin{quote}
-Yoyodyne, Inc., hereby disclaims all copyright interest in the program \\
-`Gnomovision' (which makes passes at compilers) written by James Hacker. \\
-
-signature of Ty Coon, 1 April 1989 \\
-Ty Coon, President of Vice
-\end{quote}
-
-
-This General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications
-with the library.  If this is what you want to do, use the GNU Library
-General Public License instead of this License.
-
-\end{document}

res/app.svg

@@ -1,59 +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"
-   sodipodi:docname="deskflow-icon.svg"
-   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
-   inkscape:export-filename="deskflow.png"
-   inkscape:export-xdpi="4000"
-   inkscape:export-ydpi="4000"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs62" />
-  <sodipodi:namedview
-     id="namedview60"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="0.25"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     showgrid="false"
-     inkscape:zoom="1.4142136"
-     inkscape:cx="140.71425"
-     inkscape:cy="220.61732"
-     inkscape:window-width="1920"
-     inkscape:window-height="1011"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg58" />
-  <g
-     id="g312"
-     transform="matrix(1.0746139,0,0,0.99657266,-596.91134,-9.7327822)"
-     inkscape:label="deskflow">
-    <path
-       style="fill:#3366cc;fill-opacity:1;stroke-width:22.0314"
-       d="m 10822.775,14277.69 c -725.441,-75.758 -1360.4107,-335.408 -2953.399,-1207.698 -1184.4329,-648.572 -1657.2077,-869.797 -2159.0787,-1010.295 -195.3193,-54.679 -239.4632,-58.606 -660.9423,-58.798 -412.4131,-0.187 -465.9968,4.307 -616.8795,51.442 -617.2354,192.932 -1111.1495,547.318 -1705.8871,1223.984 -372.355,423.649 -452.1256,475.865 -726.9905,475.865 -232.6962,0 -389.3132,-114.626 -538.1425,-393.859 -97.6499,-183.208 -136.2498,-354.745 -136.943,-608.569 -0.9871,-361.332 90.7554,-581.303 405.6158,-972.546 454.315,-564.53 1071.3806,-1096.759 1627.0063,-1403.32 574.0763,-316.742 1301.046,-474.5294 1911.1995,-414.8217 877.7976,85.8977 1479.4495,322.5197 3173.8588,1248.2357 1360.4629,743.271 1887.4222,972.691 2357.3612,1026.316 962.745,109.86 1619.788,-234.099 2426.041,-1270.024 265.988,-341.759 440.291,-523.347 538.01,-560.5 85.218,-32.404 353.332,-26.223 440.38,10.151 114.885,48.003 290.277,236.695 363.058,390.589 90.975,192.367 115.643,338.837 106.757,633.906 -7.394,245.557 -11.399,264.246 -91.148,425.591 -151.774,307.052 -552.228,834.715 -929.562,1224.851 -709.182,733.24 -1400.349,1092.826 -2291.735,1192.297 -223.305,24.917 -275.771,24.644 -538.58,-2.799 z"
-       id="path3393"
-       inkscape:label="wave 3" />
-    <path
-       style="fill:#33b2cc;fill-opacity:1;stroke-width:26.9658"
-       d="M 10691.975,9232.2954 C 10023.904,9138.2267 9291.0238,8829.9773 7943.0848,8076.1112 6609.9067,7330.5005 6198.1922,7138.9358 5652.3423,7010.2615 c -243.5381,-57.4099 -347.9813,-65.1846 -698.6764,-52.0098 -350.6523,13.1729 -447.6471,28.2841 -648.4026,101.0161 -564.5998,204.5483 -1088.9878,604.082 -1609.3308,1226.1566 -346.6786,414.4566 -584.4059,525.2808 -885.347,412.7324 -192.604,-72.0329 -433.8052,-423.3421 -490.3134,-714.1418 -38.1396,-196.2741 -16.3788,-517.0343 47.5576,-701.0115 146.4281,-421.345 909.508,-1246.3029 1581.9071,-1710.1823 963.612,-664.7841 1984.7795,-839.4204 3092.0317,-528.7881 635.0677,178.1644 1074.5795,381.1158 2396.9103,1106.8098 963.7205,528.8895 1563.7032,820.226 1945.1742,944.5303 309.63,100.896 861.648,137.9622 1159.223,77.8413 588.657,-118.9268 1115.294,-522.1996 1702.251,-1303.4965 310.762,-413.655 424.656,-516.4984 632.476,-571.1126 312.793,-82.2063 660.875,196.9193 776.17,622.3954 40.112,148.0341 49.106,237.616 42.717,425.5773 -11.234,330.4785 -72.528,487.867 -338.44,868.9363 -740.488,1061.1785 -1618.249,1744.1642 -2516.836,1958.3492 -314.615,74.9868 -841.585,101.7751 -1149.443,58.4277 z"
-       id="path1767"
-       inkscape:label="wave 2" />
-    <path
-       style="fill:#33cc99;fill-opacity:1;stroke-width:26.9658"
-       d="M 10576.744,4172.4544 C 9875.4106,4054.5311 9254.561,3795.6536 8047.1318,3117.6748 6298.7948,2135.9727 5901.1838,1973.7358 5169.1286,1943.3652 c -309.4699,-12.839 -457.2545,-4.6405 -640.2217,35.5164 -623.6823,136.8833 -1265.1525,579.7083 -1843.7689,1272.8049 -261.4251,313.1489 -336.0185,374.0949 -523.4853,427.7108 -333.9533,95.5119 -631.6749,-125.6455 -797.5,-592.4091 -65.1417,-183.3604 -70.0111,-219.3096 -60.5107,-446.7291 15.0698,-360.7299 102.7469,-573.6147 372.566,-904.6099 1271.6034,-1559.91423 2646.1446,-2145.742 4181.6081,-1782.19574 680.9761,161.23227 1320.8731,447.96799 2599.9925,1165.04794 1490.1626,835.3921 2027.4634,1046.8526 2657.2604,1045.7931 824.736,-1.3855 1475.964,-418.6346 2184.35,-1399.53052 316.552,-438.32663 413.046,-512.11801 670.274,-512.57528 154.752,-0.27638 193.077,12.59982 339.34,113.99621 259.074,179.60222 391.048,479.99014 391.048,890.06929 0,346.9967 -62.66,514.2152 -341.533,911.4521 -1108.285,1578.6765 -2362.287,2243.4278 -3781.804,2004.7481 z"
-       id="path970"
-       inkscape:label="wave 1" />
-  </g>
-</svg>

res/dist/flatpak/deskflow.yml

@@ -1,42 +0,0 @@
-app-id: org.deskflow.Deskflow
-runtime: org.kde.Platform
-runtime-version: "5.15-21.08"
-sdk: org.kde.Sdk
-rename-icon: deskflow
-rename-desktop-file: deskflow.desktop
-modules:
-  - name: openssl
-    buildsystem: simple
-    build-commands:
-      - "./config --prefix=/var/run/host/usr/local/ssl"
-      - "make"
-      - "make install_sw"
-    sources:
-      - type: archive
-        url: https://github.com/openssl/openssl/archive/OpenSSL_1_1_1n.tar.gz
-        sha256: 6b2d2440ced8c802aaa61475919f0870ec556694c466ebea460e35ea2b14839e
-  - name: libnotify
-    buildsystem: meson
-    config-opts:
-      - "-Dman=false"
-      - "-Dgtk_doc=false"
-    sources:
-      - type: git
-        url: https://gitlab.gnome.org/GNOME/libnotify.git
-  - name: deskflow
-    buildsystem: cmake-ninja
-    config-opts:
-      - "-DCMAKE_BUILD_TYPE=Release"
-    sources:
-      - type: dir
-        path: ../
-      - type: patch
-        path: flatpak-desktop.patch
-command: deskflow
-finish-args:
-  - "--share=ipc"
-  - "--socket=x11"
-  - "--share=network"
-  - "--device=dri"
-  - "--talk-name=org.a11y.*"
-  - "--filesystem=host"

res/dist/flatpak/flatpak-desktop.patch

@@ -1,14 +0,0 @@
-diff --git a/res/deskflow.desktop b/res/deskflow.desktop
-index fa987bdf..9513dbf3 100644
---- a/res/deskflow.desktop
-+++ b/res/deskflow.desktop
-@@ -3,8 +3,7 @@ Type=Application
- Version=1.0
- Name=Deskflow
- Comment=Keyboard and mouse sharing solution
--Path=/usr/bin
--Exec=/usr/bin/deskflow
-+Exec=
- Icon=deskflow
- Terminal=false
- Categories=Utility;

res/dist/mac/bundle/Contents/Info.plist.in

@@ -1,31 +0,0 @@
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-  <dict>
-    <key>CFBundleDevelopmentRegion</key>
-    <string>English</string>
-    <key>CFBundleDisplayName</key>
-    <string>@DESKFLOW_APP_NAME@</string>
-    <key>CFBundleExecutable</key>
-    <string>@DESKFLOW_APP_ID@</string>
-    <key>CFBundleIconFile</key>
-    <string>@DESKFLOW_APP_NAME@.icns</string>
-    <key>CFBundleIdentifier</key>
-    <string>@DESKFLOW_APP_ID@</string>
-    <key>CFBundleInfoDictionaryVersion</key>
-    <string>6.0</string>
-    <key>CFBundleName</key>
-    <string>@DESKFLOW_APP_NAME@</string>
-    <key>CFBundlePackageType</key>
-    <string>APPL</string>
-    <key>CFBundleSignature</key>
-    <string>@DESKFLOW_MAC_BUNDLE_CODE@</string>
-    <key>CFBundleShortVersionString</key>
-    <string>@DESKFLOW_VERSION@</string>
-    <key>CFBundleVersion</key>
-    <string>@DESKFLOW_VERSION@</string>
-    <key>NSHumanReadableCopyright</key>
-    <string>© 2024 Deskflow Developers</string>
-    <key>LSMinimumSystemVersion</key>
-    <string>10.9.0</string>
-  </dict>
-</plist>

res/dist/mac/bundle/Contents/PkgInfo.in

@@ -1 +0,0 @@
-APPL@DESKFLOW_MAC_BUNDLE_CODE@

res/dist/mac/dmgbuild/settings.py

@@ -1,69 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Example: https://dmgbuild.readthedocs.io/en/latest/example.html
-
-from __future__ import unicode_literals
-
-import os.path
-
-app = defines.get("app")
-app_basename = os.path.basename(app)
-format = defines.get("format", "UDBZ")
-size = defines.get("size", None)
-files = [app]
-symlinks = {"Applications": "/Applications"}
-icon = os.path.join(app, "Contents/Resources/Volume.icns")
-icon_locations = {
-    app_basename: (144, 190),
-    "Applications": (455, 190),
-}
-background = os.path.join(app, "Contents/Resources/Background.tiff")
-show_status_bar = False
-show_tab_view = False
-show_toolbar = False
-show_pathbar = False
-show_sidebar = False
-sidebar_width = 180
-window_rect = ((200, 120), (620, 420))
-default_view = "icon-view"
-show_icon_preview = False
-include_icon_view_settings = "auto"
-include_list_view_settings = "auto"
-arrange_by = None
-grid_offset = (0, 0)
-grid_spacing = 100
-scroll_position = (0, 0)
-label_pos = "bottom"
-text_size = 16
-icon_size = 100
-list_icon_size = 16
-list_text_size = 12
-list_scroll_position = (0, 0)
-list_sort_by = "name"
-list_use_relative_dates = True
-list_calculate_all_sizes = (False,)
-list_columns = ("name", "date-modified", "size", "kind", "date-added")
-list_column_widths = {
-    "name": 300,
-    "date-modified": 181,
-    "date-created": 181,
-    "date-added": 181,
-    "date-last-opened": 181,
-    "size": 97,
-    "kind": 115,
-    "label": 100,
-    "version": 75,
-    "comments": 300,
-}
-list_column_sort_directions = {
-    "name": "ascending",
-    "date-modified": "descending",
-    "date-created": "descending",
-    "date-added": "descending",
-    "date-last-opened": "descending",
-    "size": "descending",
-    "kind": "ascending",
-    "label": "ascending",
-    "version": "ascending",
-    "comments": "ascending",
-}

res/dist/wix/AppBrowseDlg.wxs

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-   <Fragment>
-      <UI>
-         <Dialog Id="AppBrowseDlg" Width="370" Height="270" Title="!(loc.BrowseDlg_Title)">
-            <Control Id="PathEdit" Type="PathEdit" X="25" Y="202" Width="320" Height="18" Property="_BrowseProperty" Indirect="yes" />
-            <Control Id="OK" Type="PushButton" X="240" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUIOK)">
-               <Publish Event="SetTargetPath" Value="[_BrowseProperty]">1</Publish>
-               <Publish Event="EndDialog" Value="Return">1</Publish>
-            </Control>
-            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
-               <Publish Event="Reset" Value="0">1</Publish>
-               <Publish Event="EndDialog" Value="Return">1</Publish>
-            </Control>
-            <Control Id="ComboLabel" Type="Text" X="25" Y="58" Width="44" Height="10" TabSkip="no" Text="!(loc.BrowseDlgComboLabel)" />
-            <Control Id="DirectoryCombo" Type="DirectoryCombo" X="70" Y="55" Width="220" Height="80" Property="_BrowseProperty" Indirect="yes" Fixed="yes" Remote="yes">
-               <Subscribe Event="IgnoreChange" Attribute="IgnoreChange" />
-            </Control>
-            <Control Id="WixUI_Bmp_Up" Type="PushButton" X="298" Y="55" Width="19" Height="19" ToolTip="!(loc.BrowseDlgWixUI_Bmp_UpTooltip)" Icon="yes" FixedSize="yes" IconSize="16" Text="!(loc.BrowseDlgWixUI_Bmp_Up)">
-               <Publish Event="DirectoryListUp" Value="0">1</Publish>
-            </Control>
-            <Control Id="NewFolder" Type="PushButton" X="325" Y="55" Width="19" Height="19" ToolTip="!(loc.BrowseDlgNewFolderTooltip)" Icon="yes" FixedSize="yes" IconSize="16" Text="!(loc.BrowseDlgNewFolder)">
-               <Publish Event="DirectoryListNew" Value="0">1</Publish>
-            </Control>
-            <Control Id="DirectoryList" Type="DirectoryList" X="25" Y="83" Width="320" Height="98" Property="_BrowseProperty" Sunken="yes" Indirect="yes" TabSkip="no" />
-            <Control Id="PathLabel" Type="Text" X="25" Y="190" Width="320" Height="10" TabSkip="no" Text="!(loc.BrowseDlgPathLabel)" />
-            <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.BrowseDlgBannerBitmap)" />
-            <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
-            <Control Id="Title" Type="Text" X="15" Y="15" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.BrowseDlgTitle)" />
-         </Dialog>
-      </UI>
-   </Fragment>
-</Wix>

res/dist/wix/AppDlgSequence.wxs

@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-First-time install dialog sequence:
- - WixUI_WelcomeDlg
- - WixUI_LicenseAgreementDlg
- - WixUI_InstallDirDlg
- - WixUI_VerifyReadyDlg
- - WixUI_DiskCostDlg
-Maintenance dialog sequence:
- - WixUI_MaintenanceWelcomeDlg
- - WixUI_MaintenanceTypeDlg
- - WixUI_InstallDirDlg
- - WixUI_VerifyReadyDlg
-Patch dialog sequence:
- - WixUI_WelcomeDlg
- - WixUI_VerifyReadyDlg
--->
-
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <Fragment>
-        <UI Id="AppDlgSequence">
-            <TextStyle Id="WixUI_Font_Normal" FaceName="Roboto" Size="9" />
-            <TextStyle Id="WixUI_Font_Bigger" FaceName="Roboto" Size="14" />
-            <TextStyle Id="WixUI_Font_Title" FaceName="Roboto" Size="12" Bold="yes"  Blue="255" Red="255" Green="255"/>
-
-            <Property Id="DefaultUIFont" Value="WixUI_Font_Normal" />
-            <Property Id="WixUI_Mode" Value="InstallDir" />
-
-            <DialogRef Id="BrowseDlg" />
-            <DialogRef Id="DiskCostDlg" />
-            <DialogRef Id="ErrorDlg" />
-            <DialogRef Id="FatalError" />
-            <DialogRef Id="FilesInUse" />
-            <DialogRef Id="MsiRMFilesInUse" />
-            <DialogRef Id="PrepareDlg" />
-            <DialogRef Id="ProgressDlg" />
-            <DialogRef Id="ResumeDlg" />
-            <DialogRef Id="UserExit" />
-            
-            <Publish Dialog="AppBrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath" Order="3">1</Publish>
-            <Publish Dialog="AppBrowseDlg" Control="OK" Event="SpawnDialog" Value="InvalidDirDlg" Order="4"><![CDATA[WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
-
-            <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>
-            <Publish Dialog="ExitDialog" Control="Finish" Event="DoAction" Value="StartGui">NOT Installed</Publish>
-
-            <Publish Dialog="AppWelcome" Control="Next" Event="NewDialog" Value="AppInstallDirDlg" Order="1">1</Publish>
-            <Publish Dialog="AppWelcome" Control="Next" Event="NewDialog" Value="AppVerifyReadyDlg">Installed AND PATCH</Publish>
-
-            <Publish Dialog="AppInstallDirDlg" Control="Next" Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
-            <Publish Dialog="AppInstallDirDlg" Control="Next" Event="DoAction" Value="WixUIValidatePath" Order="2">NOT WIXUI_DONTVALIDATEPATH</Publish>
-            <Publish Dialog="AppInstallDirDlg" Control="Next" Event="SpawnDialog" Value="InvalidDirDlg" Order="3"><![CDATA[NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
-            <Publish Dialog="AppInstallDirDlg" Control="Next" Event="NewDialog" Value="AppVerifyReadyDlg" Order="4">WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1"</Publish>
-            <Publish Dialog="AppInstallDirDlg" Control="ChangeFolder" Property="_BrowseProperty" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
-            <Publish Dialog="AppInstallDirDlg" Control="ChangeFolder" Event="SpawnDialog" Value="AppBrowseDlg" Order="2">1</Publish>
-            <Publish Dialog="AppInstallDirDlg" Control="Back" Event="NewDialog" Value="AppWelcome" Order="2">1</Publish>
-            
-            <Publish Dialog="AppVerifyReadyDlg" Control="Back" Event="NewDialog" Value="AppInstallDirDlg" Order="1">NOT Installed</Publish>
-            <Publish Dialog="AppVerifyReadyDlg" Control="Back" Event="NewDialog" Value="AppMaintenanceTypeDlg" Order="2">Installed AND NOT PATCH</Publish>
-            <Publish Dialog="AppVerifyReadyDlg" Control="Back" Event="NewDialog" Value="AppInstallDirDlg" Order="2">Installed AND PATCH</Publish>
-
-            <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="AppMaintenanceTypeDlg">1</Publish>
-
-            <Publish Dialog="AppMaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="AppVerifyReadyDlg">1</Publish>
-            <Publish Dialog="AppMaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="AppVerifyReadyDlg">1</Publish>
-            <Publish Dialog="AppMaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish>
-
-            <Property Id="ARPNOMODIFY" Value="1" />
-        </UI>
-
-        <UIRef Id="WixUI_Common" />
-    </Fragment>
-</Wix>

res/dist/wix/AppInstallDirDlg.wxs

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-   <?include Include.wxi?>
-   <Fragment>
-      <UI Id="AppInstallDirDlg">
-         <Dialog Id="AppInstallDirDlg" Width="370" Height="270" Title="!(loc.InstallDirDlg_Title)">
-            <Control Id="Title" Type="Text" X="15" Y="15" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.InstallDirDlgTitle)" />
-            
-            <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUINext)" />
-            <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" />
-            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
-               <Publish Event="SpawnDialog" Value="CancelDlg" />
-            </Control>
-
-            <Control Id="InstallDirDlgBackground" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="[CommonBackground]" />
-            <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
-
-            <Control Id="FolderLabel" Transparent="yes" Type="Text" X="20" Y="70" Width="290" Height="30" NoPrefix="yes" Text="!(loc.InstallDirDlgFolderLabel)" />
-            <Control Id="Folder" Type="PathEdit" X="20" Y="90" Width="320" Height="18" Property="WIXUI_INSTALLDIR" Indirect="yes" />
-            <Control Id="ChangeFolder" Type="PushButton" X="20" Y="112" Width="56" Height="17" Text="!(loc.InstallDirDlgChange)" />
-         </Dialog>
-      </UI>
-   </Fragment>
-</Wix>

res/dist/wix/AppMaintenanceTypeDlg.wxs

@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Copyright (c) Microsoft Corporation.  All rights reserved.
-    
-    The use and distribution terms for this software are covered by the
-    Common Public License 1.0 (http://opensource.org/licenses/cpl1.0.php)
-    which can be found in the file CPL.TXT at the root of this distribution.
-    By using this software in any fashion, you are agreeing to be bound by
-    the terms of this license.
-    
-    You must not remove this notice, or any other, from this software.
--->
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-   <Fragment>
-      <UI>
-         <Dialog Id="AppMaintenanceTypeDlg" Width="370" Height="270" Title="!(loc.MaintenanceTypeDlg_Title)">
-            <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="[CommonBackground]" />
-            <Control Id="ChangeButton" Type="PushButton" X="40" Y="65" Width="80" Height="17" ToolTip="!(loc.MaintenanceTypeDlgChangeButtonTooltip)" Default="yes" Text="!(loc.MaintenanceTypeDlgChangeButton)">
-               <Publish Property="WixUI_InstallMode" Value="Change">1</Publish>
-               <Condition Action="disable">ARPNOMODIFY</Condition>
-            </Control>
-            <Control Id="ChangeText" Transparent="yes" Type="Text" X="60" Y="85" Width="280" Height="20" Text="!(loc.MaintenanceTypeDlgChangeText)">
-               <Condition Action="hide">ARPNOMODIFY</Condition>
-            </Control>
-            <Control Id="ChangeDisabledText" Transparent="yes" Type="Text" X="60" Y="85" Width="280" Height="20" NoPrefix="yes" Text="!(loc.MaintenanceTypeDlgChangeDisabledText)" Hidden="yes">
-               <Condition Action="show">ARPNOMODIFY</Condition>
-            </Control>
-            <Control Id="RepairButton" Type="PushButton" X="40" Y="118" Width="80" Height="17" ToolTip="!(loc.MaintenanceTypeDlgRepairButtonTooltip)" Text="!(loc.MaintenanceTypeDlgRepairButton)">
-               <Publish Property="WixUI_InstallMode" Value="Repair">1</Publish>
-               <Condition Action="disable">ARPNOREPAIR</Condition>
-            </Control>
-            <Control Id="RepairText" Transparent="yes" Type="Text" X="60" Y="138" Width="280" Height="30" Text="!(loc.MaintenanceTypeDlgRepairText)">
-               <Condition Action="hide">ARPNOREPAIR</Condition>
-            </Control>
-            <Control Id="RepairDisabledText" Transparent="yes" Type="Text" X="60" Y="138" Width="280" Height="30" NoPrefix="yes" Text="!(loc.MaintenanceTypeDlgRepairDisabledText)" Hidden="yes">
-               <Condition Action="show">ARPNOREPAIR</Condition>
-            </Control>
-            <Control Id="RemoveButton" Type="PushButton" X="40" Y="171" Width="80" Height="17" ToolTip="!(loc.MaintenanceTypeDlgRemoveButtonTooltip)" Text="!(loc.MaintenanceTypeDlgRemoveButton)">
-               <Publish Property="WixUI_InstallMode" Value="Remove">1</Publish>
-               <Condition Action="disable">ARPNOREMOVE</Condition>
-            </Control>
-            <Control Id="RemoveText" Transparent="yes" Type="Text" X="60" Y="191" Width="280" Height="20" NoPrefix="yes" Text="!(loc.MaintenanceTypeDlgRemoveText)">
-               <Condition Action="hide">ARPNOREMOVE</Condition>
-            </Control>
-            <Control Id="RemoveDisabledText" Transparent="yes" Type="Text" X="60" Y="191" Width="280" Height="20" NoPrefix="yes" Text="!(loc.MaintenanceTypeDlgRemoveDisabledText)" Hidden="yes">
-               <Condition Action="show">ARPNOREMOVE</Condition>
-            </Control>
-            <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" />
-            <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUINext)" />
-            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
-               <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
-            </Control>
-            <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
-            <Control Id="Title" Type="Text" X="15" Y="15" Width="340" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.MaintenanceTypeDlgTitle)" />
-         </Dialog>
-      </UI>
-   </Fragment>
-</Wix>

res/dist/wix/AppVerifyReadyDlg.wxs

@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-   <?include Include.wxi?>
-   <Fragment>
-      <UI>
-         <Dialog Id="AppVerifyReadyDlg" Width="370" Height="270" Title="!(loc.VerifyReadyDlg_Title)" TrackDiskSpace="yes">
-            <Control Id="Install" Type="PushButton" ElevationShield="yes" X="212" Y="243" Width="80" Height="17" Default="yes" Hidden="yes" Disabled="yes" Text="!(loc.VerifyReadyDlgInstall)">
-               <Condition Action="show">NOT Installed AND ALLUSERS</Condition>
-               <Condition Action="enable">NOT Installed</Condition>
-               <Condition Action="default">NOT Installed</Condition>
-               <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
-               <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish>
-               <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
-               <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
-               <Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
-            </Control>
-            <Control Id="InstallNoShield" Type="PushButton" ElevationShield="no" X="212" Y="243" Width="80" Height="17" Default="yes" Hidden="yes" Disabled="yes" Text="!(loc.VerifyReadyDlgInstall)">
-               <Condition Action="show">NOT Installed AND NOT ALLUSERS</Condition>
-               <Condition Action="enable">NOT Installed</Condition>
-               <Condition Action="default">NOT Installed</Condition>
-               <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
-               <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish>
-               <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
-               <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
-               <Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
-            </Control>
-            <Control Id="Change" Type="PushButton" ElevationShield="yes" X="212" Y="243" Width="80" Height="17" Default="yes" Hidden="yes" Disabled="yes" Text="!(loc.VerifyReadyDlgChange)">
-               <Condition Action="show">WixUI_InstallMode = "Change" AND ALLUSERS AND (ADDLOCAL OR REMOVE)</Condition>
-               <Condition Action="enable">WixUI_InstallMode = "Change"</Condition>
-               <Condition Action="default">WixUI_InstallMode = "Change"</Condition>
-               <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
-               <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish>
-               <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
-               <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
-               <Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
-            </Control>
-            <Control Id="ChangeNoShield" Type="PushButton" ElevationShield="no" X="212" Y="243" Width="80" Height="17" Default="yes" Hidden="yes" Disabled="yes" Text="!(loc.VerifyReadyDlgChange)">
-               <Condition Action="show">WixUI_InstallMode = "Change" AND (NOT ALLUSERS OR (NOT ADDLOCAL AND NOT REMOVE))</Condition>
-               <Condition Action="enable">WixUI_InstallMode = "Change"</Condition>
-               <Condition Action="default">WixUI_InstallMode = "Change"</Condition>
-               <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
-               <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish>
-               <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
-               <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
-               <Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
-            </Control>
-            <Control Id="Repair" Type="PushButton" X="212" Y="243" Width="80" Height="17" Default="yes" Hidden="yes" Disabled="yes" Text="!(loc.VerifyReadyDlgRepair)">
-               <Condition Action="show">WixUI_InstallMode = "Repair"</Condition>
-               <Condition Action="enable">WixUI_InstallMode = "Repair"</Condition>
-               <Condition Action="default">WixUI_InstallMode = "Repair"</Condition>
-               <Publish Event="ReinstallMode" Value="ecmus"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
-               <Publish Event="Reinstall" Value="All"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
-               <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
-               <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish>
-               <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
-               <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
-               <Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
-            </Control>
-            <Control Id="Remove" Type="PushButton" ElevationShield="yes" X="212" Y="243" Width="80" Height="17" Hidden="yes" Disabled="yes" Text="!(loc.VerifyReadyDlgRemove)">
-               <Condition Action="show">WixUI_InstallMode = "Remove" AND ALLUSERS</Condition>
-               <Condition Action="enable">WixUI_InstallMode = "Remove"</Condition>
-               <Publish Event="Remove" Value="All"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
-               <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
-               <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish>
-               <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
-               <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
-               <Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
-            </Control>
-            <Control Id="RemoveNoShield" Type="PushButton" ElevationShield="no" X="212" Y="243" Width="80" Height="17" Hidden="yes" Disabled="yes" Text="!(loc.VerifyReadyDlgRemove)">
-               <Condition Action="show">WixUI_InstallMode = "Remove" AND NOT ALLUSERS</Condition>
-               <Condition Action="enable">WixUI_InstallMode = "Remove"</Condition>
-               <Publish Event="Remove" Value="All"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
-               <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
-               <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish>
-               <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
-               <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
-               <Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
-            </Control>
-            <Control Id="Update" Type="PushButton" ElevationShield="yes" X="212" Y="243" Width="80" Height="17" Hidden="yes" Disabled="yes" Text="!(loc.VerifyReadyDlgUpdate)">
-               <Condition Action="show">WixUI_InstallMode = "Update" AND ALLUSERS</Condition>
-               <Condition Action="enable">WixUI_InstallMode = "Update"</Condition>
-               <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
-               <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish>
-               <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
-               <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
-               <Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
-            </Control>
-            <Control Id="UpdateNoShield" Type="PushButton" ElevationShield="no" X="212" Y="243" Width="80" Height="17" Hidden="yes" Disabled="yes" Text="!(loc.VerifyReadyDlgUpdate)">
-               <Condition Action="show">WixUI_InstallMode = "Update" AND NOT ALLUSERS</Condition>
-               <Condition Action="enable">WixUI_InstallMode = "Update"</Condition>
-               <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
-               <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish>
-               <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
-               <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
-               <Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
-            </Control>
-
-            <Control Id="InstallTitle" Type="Text" X="15" Y="15" Width="300" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="{\WixUI_Font_Title}Ready to install">
-               <Condition Action="show">NOT Installed</Condition>
-            </Control>
-            <Control Id="InstallText" Transparent="yes" Type="Text" X="25" Y="70" Width="320" Height="80" Hidden="yes" Text="!(loc.VerifyReadyDlgInstallText)">
-               <Condition Action="show">NOT Installed</Condition>
-            </Control>
-            <Control Id="ChangeTitle" Type="Text" X="15" Y="15" Width="300" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.VerifyReadyDlgChangeTitle)">
-               <Condition Action="show">WixUI_InstallMode = "Change"</Condition>
-            </Control>
-            <Control Id="ChangeText" Transparent="yes" Type="Text" X="25" Y="70" Width="320" Height="80" Hidden="yes" Text="!(loc.VerifyReadyDlgChangeText)">
-               <Condition Action="show">WixUI_InstallMode = "Change"</Condition>
-            </Control>
-            <Control Id="RepairTitle" Type="Text" X="15" Y="15" Width="300" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.VerifyReadyDlgRepairTitle)">
-               <Condition Action="show">WixUI_InstallMode = "Repair"</Condition>
-            </Control>
-            <Control Id="RepairText" Transparent="yes" Type="Text" X="25" Y="70" Width="320" Height="80" Hidden="yes" NoPrefix="yes" Text="!(loc.VerifyReadyDlgRepairText)">
-               <Condition Action="show">WixUI_InstallMode = "Repair"</Condition>
-            </Control>
-            <Control Id="RemoveTitle" Type="Text" X="15" Y="15" Width="300" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.VerifyReadyDlgRemoveTitle)">
-               <Condition Action="show">WixUI_InstallMode = "Remove"</Condition>
-            </Control>
-            <Control Id="RemoveText" Transparent="yes" Type="Text" X="25" Y="70" Width="320" Height="80" Hidden="yes" NoPrefix="yes" Text="!(loc.VerifyReadyDlgRemoveText)">
-               <Condition Action="show">WixUI_InstallMode = "Remove"</Condition>
-            </Control>
-            <Control Id="UpdateTitle" Type="Text" X="15" Y="15" Width="300" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.VerifyReadyDlgUpdateTitle)">
-               <Condition Action="show">WixUI_InstallMode = "Update"</Condition>
-            </Control>
-            <Control Id="UpdateText" Transparent="yes" Type="Text" X="25" Y="70" Width="320" Height="80" Hidden="yes" NoPrefix="yes" Text="!(loc.VerifyReadyDlgUpdateText)">
-               <Condition Action="show">WixUI_InstallMode = "Update"</Condition>
-            </Control>
-
-            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
-               <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
-            </Control>
-            <Control Id="Back" Type="PushButton" X="156" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)">
-               <Condition Action="default">WixUI_InstallMode = "Remove"</Condition>
-            </Control>
-            <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="[CommonBackground]" />
-            <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
-         </Dialog>
-      </UI>
-   </Fragment>
-</Wix>

res/dist/wix/AppWelcome.wxs

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
-
-
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-   <?include Include.wxi?>
-   <Fragment>
-      <UI Id="AppWelcome">
-         <Property Id="AppWelcomeBackground">welcome_background</Property>
-         <Binary Id="welcome_background" SourceFile="$(var.ResDir)\dist\wix\images\welcome_background.png"/>
-
-         <Dialog Id="AppWelcome" Width="370" Height="270" Title="!(loc.WelcomeDlg_Title)">
-            <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUINext)">
-               <Publish Property="WixUI_InstallMode" Value="Update">Installed AND PATCH</Publish>
-            </Control>
-            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
-               <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
-            </Control>
-            <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="[AppWelcomeBackground]" />
-            <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUIBack)" />
-            <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
-         </Dialog>
-
-         <InstallUISequence>
-            <Show Dialog="AppWelcome" Before="ProgressDlg" Overridable="yes">NOT Installed OR PATCH</Show>
-         </InstallUISequence>
-      </UI>
-   </Fragment>
-</Wix>

res/dist/wix/DeskflowDlgSequence.wxs

@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-First-time install dialog sequence:
- - WixUI_WelcomeDlg
- - WixUI_LicenseAgreementDlg
- - WixUI_InstallDirDlg
- - WixUI_VerifyReadyDlg
- - WixUI_DiskCostDlg
-Maintenance dialog sequence:
- - WixUI_MaintenanceWelcomeDlg
- - WixUI_MaintenanceTypeDlg
- - WixUI_InstallDirDlg
- - WixUI_VerifyReadyDlg
-Patch dialog sequence:
- - WixUI_WelcomeDlg
- - WixUI_VerifyReadyDlg
--->
-
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <Fragment>
-        <UI Id="DeskflowDlgSequence">
-            <TextStyle Id="WixUI_Font_Normal" FaceName="Roboto" Size="9" />
-            <TextStyle Id="WixUI_Font_Bigger" FaceName="Roboto" Size="14" />
-            <TextStyle Id="WixUI_Font_Title" FaceName="Roboto" Size="12" Bold="yes"  Blue="255" Red="255" Green="255"/>
-
-            <Property Id="DefaultUIFont" Value="WixUI_Font_Normal" />
-            <Property Id="WixUI_Mode" Value="InstallDir" />
-
-            <DialogRef Id="BrowseDlg" />
-            <DialogRef Id="DiskCostDlg" />
-            <DialogRef Id="ErrorDlg" />
-            <DialogRef Id="FatalError" />
-            <DialogRef Id="FilesInUse" />
-            <DialogRef Id="MsiRMFilesInUse" />
-            <DialogRef Id="PrepareDlg" />
-            <DialogRef Id="ProgressDlg" />
-            <DialogRef Id="ResumeDlg" />
-            <DialogRef Id="UserExit" />
-            
-            <Publish Dialog="DeskflowBrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath" Order="3">1</Publish>
-            <Publish Dialog="DeskflowBrowseDlg" Control="OK" Event="SpawnDialog" Value="InvalidDirDlg" Order="4"><![CDATA[WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
-
-            <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>
-            <Publish Dialog="ExitDialog" Control="Finish" Event="DoAction" Value="StartGui">NOT Installed</Publish>
-
-            <Publish Dialog="DeskflowWelcome" Control="Next" Event="NewDialog" Value="DeskflowInstallDirDlg" Order="1">1</Publish>
-            <Publish Dialog="DeskflowWelcome" Control="Next" Event="NewDialog" Value="DeskflowVerifyReadyDlg">Installed AND PATCH</Publish>
-
-            <Publish Dialog="DeskflowInstallDirDlg" Control="Next" Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
-            <Publish Dialog="DeskflowInstallDirDlg" Control="Next" Event="DoAction" Value="WixUIValidatePath" Order="2">NOT WIXUI_DONTVALIDATEPATH</Publish>
-            <Publish Dialog="DeskflowInstallDirDlg" Control="Next" Event="SpawnDialog" Value="InvalidDirDlg" Order="3"><![CDATA[NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
-            <Publish Dialog="DeskflowInstallDirDlg" Control="Next" Event="NewDialog" Value="DeskflowVerifyReadyDlg" Order="4">WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1"</Publish>
-            <Publish Dialog="DeskflowInstallDirDlg" Control="ChangeFolder" Property="_BrowseProperty" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
-            <Publish Dialog="DeskflowInstallDirDlg" Control="ChangeFolder" Event="SpawnDialog" Value="DeskflowBrowseDlg" Order="2">1</Publish>
-            <Publish Dialog="DeskflowInstallDirDlg" Control="Back" Event="NewDialog" Value="DeskflowWelcome" Order="2">1</Publish>
-            
-            <Publish Dialog="DeskflowVerifyReadyDlg" Control="Back" Event="NewDialog" Value="DeskflowInstallDirDlg" Order="1">NOT Installed</Publish>
-            <Publish Dialog="DeskflowVerifyReadyDlg" Control="Back" Event="NewDialog" Value="DeskflowMaintenanceTypeDlg" Order="2">Installed AND NOT PATCH</Publish>
-            <Publish Dialog="DeskflowVerifyReadyDlg" Control="Back" Event="NewDialog" Value="DeskflowInstallDirDlg" Order="2">Installed AND PATCH</Publish>
-
-            <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="DeskflowMaintenanceTypeDlg">1</Publish>
-
-            <Publish Dialog="DeskflowMaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="DeskflowVerifyReadyDlg">1</Publish>
-            <Publish Dialog="DeskflowMaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="DeskflowVerifyReadyDlg">1</Publish>
-            <Publish Dialog="DeskflowMaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish>
-
-            <Property Id="ARPNOMODIFY" Value="1" />
-        </UI>
-
-        <UIRef Id="WixUI_Common" />
-    </Fragment>
-</Wix>

res/dist/wix/Include.wxi.in

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Include>
-    <?define AppId="@DESKFLOW_APP_ID@"?>
-    <?define Name="@DESKFLOW_APP_NAME@"?>
-    <?define Version="@DESKFLOW_VERSION@"?>
-    <?define Author="@DESKFLOW_AUTHOR_NAME@"?>
-    <?define BinDir="@CMAKE_RUNTIME_OUTPUT_DIRECTORY@"?>
-    <?define ProjectResDir="@DESKFLOW_PROJECT_RES_DIR@"?>
-    <?define ResDir="@DESKFLOW_RES_DIR@"?>
-    <?define QtDir="@QT_PATH@"?>
-    <?define QtBinDir="$(var.QtDir)\bin"?>
-    <?if $(var.Platform) = "x64"?>
-    <?define ProgramFilesFolder="ProgramFiles64Folder"?>
-    <?define PlatformSimpleName="64-bit"?>
-    <?define UpgradeGuid="@DESKFLOW_MSI_64_GUID@"?>
-    <?else?>
-    <?define ProgramFilesFolder="ProgramFilesFolder"?>
-    <?define PlatformSimpleName="32-bit"?>
-    <?define UpgradeGuid="@DESKFLOW_MSI_32_GUID@"?>
-    <?endif?>
-    <?define QtPluginsPath="$(var.QtDir)\plugins"?>
-    <?define OpenSslExeDir="@OPENSSL_EXE_DIR@"?>
-    <?define OpenSslDllDir="@OPENSSL_ROOT_DIR@/bin"?>
-    <?define GuiBin="@GUI_BINARY_NAME@.exe"?>
-    <?define ServerBin="@SERVER_BINARY_NAME@.exe"?>
-    <?define ClientBin="@CLIENT_BINARY_NAME@.exe"?>
-    <?define CoreBin="@CORE_BINARY_NAME@.exe"?>
-    <?define DaemonBin="@DAEMON_BINARY_NAME@.exe"?>
-</Include>

res/dist/wix/Installer.sln

@@ -1,31 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29411.108
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Installer", "Installer.wixproj", "{D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x86 = Debug|x86
-		Debug|x64 = Debug|x64
-		Release|x86 = Release|x86
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Debug|x86.ActiveCfg = Debug|x86
-		{D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Debug|x86.Build.0 = Debug|x86
-		{D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Debug|x64.ActiveCfg = Debug|x64
-		{D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Debug|x64.Build.0 = Debug|x64
-		{D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Release|x86.ActiveCfg = Release|x86
-		{D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Release|x86.Build.0 = Release|x86
-		{D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Release|x64.ActiveCfg = Release|x64
-		{D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {2E0AA1C9-0F14-4FE4-8F18-430484EFBACE}
-	EndGlobalSection
-EndGlobal

res/dist/wix/Installer.wixproj

@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0"
-  xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProductVersion>3.11</ProductVersion>
-    <ProjectGuid>{d4ba9f39-6a35-4c8f-9cb2-67fcbe5cab17}</ProjectGuid>
-    <SchemaVersion>2.0</SchemaVersion>
-    <OutputName>Installer</OutputName>
-    <OutputType>Package</OutputType>
-    <OutputPath>bin\$(Configuration)\</OutputPath>
-    <IntermediateOutputPath>wix\obj\$(Configuration)\</IntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="$(SolutionDir)/AppWelcome.wxs" />
-    <Compile Include="$(SolutionDir)/AppInstallDirDlg.wxs" />
-    <Compile Include="$(SolutionDir)/AppBrowseDlg.wxs" />
-    <Compile Include="$(SolutionDir)/AppVerifyReadyDlg.wxs" />
-    <Compile Include="$(SolutionDir)/AppMaintenanceTypeDlg.wxs" />
-    <Compile Include="$(SolutionDir)/AppDlgSequence.wxs" />
-    <Compile Include="$(SolutionDir)/Product.wxs" />
-    <Content Include="$(SolutionDir)/Include.wxi" />
-
-  </ItemGroup>
-  <ItemGroup>
-    <WixExtension Include="WixUtilExtension">
-      <HintPath>C:\Program Files (x86)\WiX Toolset v3.11\bin\WixUtilExtension.dll</HintPath>
-      <Name>WixUtilExtension</Name>
-    </WixExtension>
-    <WixExtension Include="WixUIExtension">
-      <HintPath>C:\Program Files (x86)\WiX Toolset v3.11\bin\WixUIExtension.dll</HintPath>
-      <Name>WixUIExtension</Name>
-    </WixExtension>
-    <WixExtension Include="WixFirewallExtension">
-      <HintPath>C:\Program Files (x86)\WiX Toolset v3.11\bin\WixFirewallExtension.dll</HintPath>
-      <Name>WixFirewallExtension</Name>
-    </WixExtension>
-  </ItemGroup>
-  <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets"
-    Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
-</Project>

res/dist/wix/Product.wxs

@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:fire="http://schemas.microsoft.com/wix/FirewallExtension" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-	<?include Include.wxi?>
-	<Product Id="*" Language="1033" Manufacturer="$(var.Author)" Name="$(var.Name) ($(var.PlatformSimpleName))" UpgradeCode="$(var.UpgradeGuid)" Version="$(var.Version)">
-		<Package Compressed="yes" InstallScope="perMachine" InstallerVersion="301"/>
-		<MajorUpgrade DowngradeErrorMessage="A newer version of $(var.Name) is already installed."/>
-		<MediaTemplate EmbedCab="yes"/>
-		<!-- causes ICE61 warning, but stops user from installing many instances from nightly builds. -->
-		<Upgrade Id="$(var.UpgradeGuid)">
-			<UpgradeVersion Minimum="0.0.0.0" Property="UPGRADE"/>
-		</Upgrade>
-		<Feature Id="ProductFeature" Title="$(var.Name)">
-			<ComponentGroupRef Id="ProductComponents"/>
-			<ComponentGroupRef Id="OpenSSLComponents"/>
-			<ComponentGroupRef Id="ProductQtStylesComponents"/>
-			<ComponentGroupRef Id="ProductQtPluginComponents"/>
-			<ComponentRef Id="RegistryEntries"/>
-			<MergeRef Id="VC_Redist"/>
-		</Feature>
-		<DirectoryRef Id="TARGETDIR">
-			<Component Guid="7CF3564D-1F8E-4D3D-9781-E1EE22D5BD67" Id="RegistryEntries">
-				<RegistryKey Id="$(var.AppId)_server" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes" Key="Software\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers" Root="HKLM">
-					<RegistryValue Name="[INSTALLFOLDER]$(var.ServerBin)" Type="string" Value="~ HIGHDPIAWARE WIN7RTM"/>
-				</RegistryKey>
-
-				<RegistryKey Id="$(var.AppId)_client" Root="HKLM"
-					Key="Software\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers"
-					ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes">
-					<RegistryValue Type="string" Name="[INSTALLFOLDER]$(var.ClientBin)" Value="~ HIGHDPIAWARE WIN7RTM"/>
-				</RegistryKey>
-
-				<RegistryKey Id="$(var.AppId)" Root="HKLM"
-					Key="Software\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers"
-					ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes">
-					<RegistryValue Type="string" Name="[INSTALLFOLDER]$(var.GuiBin)" Value="~ HIGHDPIAWARE WIN7RTM"/>
-				</RegistryKey>
-				<!-- Windows 8 and later only -->
-				<Condition><![CDATA[Installed OR (VersionNT >= 602)]]></Condition>
-			</Component>
-			<?if $(var.Platform) = x64 ?>
-				<Merge Id="VC_Redist" SourceFile="$(var.ProjectResDir)\dist\wix\msm\Microsoft_VC142_CRT_x64.msm" DiskId="1" Language="0"/>
-			<?else ?>
-				<Merge Id="VC_Redist" SourceFile="$(var.ProjectResDir)\dist\wix\msm\Microsoft_VC142_CRT_x86.msm" DiskId="1" Language="0"/>
-			<?endif ?>
-		</DirectoryRef>
-		<Property Id="CommonBackground">CommonBackground</Property>
-		<Binary Id="CommonBackground" SourceFile="$(var.ResDir)\dist\wix\images\common_background.png"/>
-		<Icon Id="AppIcon" SourceFile="$(var.ResDir)/app.ico"/>
-		<WixVariable Id="WixUIBannerBmp" Value="$(var.ResDir)\dist\wix\images\banner.png"/>
-		<WixVariable Id="WixUIDialogBmp" Value="$(var.ResDir)\dist\wix\images\dialog.png"/>
-		<Property Id="ARPPRODUCTICON" Value="AppIcon"/>
-		<Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER"/>
-		<Property Id="LEGACY_UNINSTALL_EXISTS">
-			<RegistrySearch Id="LegacyRegistrySearch" Key="SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\$(var.Name)" Name="UninstallString" Root="HKLM" Type="file" Win64="no">
-				<FileSearch Id="LegacyFileSearch" Name="uninstall.exe"/>
-			</RegistrySearch>
-		</Property>
-		<Condition Message="An existing installation of $(var.Name) was detected, please uninstall it before continuing.">NOT LEGACY_UNINSTALL_EXISTS
-		</Condition>
-		<CustomAction ExeCommand="" FileKey="GuiProgram" Id="StartGui" Return="asyncNoWait"/>
-		<UI>
-			<UIRef Id="AppDlgSequence" />
-		</UI>
-	</Product>
-	<Fragment>
-		<Directory Id="TARGETDIR" Name="SourceDir">
-			<Directory Id="$(var.ProgramFilesFolder)">
-				<Directory Id="INSTALLFOLDER" Name="$(var.Name)">
-					<Directory Id="OpenSSLDir" Name="OpenSSL"/>
-					<Directory Id="PlatformsDir" Name="Platforms"/>
-					<Directory Id="QTStylesDir" Name="styles"/>
-				</Directory>
-			</Directory>
-			<Directory Id="ProgramMenuFolder"/>
-		</Directory>
-	</Fragment>
-	<Fragment>
-		<ComponentGroup Directory="INSTALLFOLDER" Id="ProductComponents">
-			<Component Guid="EC9AD3B0-277C-4157-B5C8-5FD5B6A5F4AD" Id="Core">
-				<File KeyPath="yes" Source="$(var.BinDir)/$(var.DaemonBin)"/>
-				<ServiceInstall Description="Controls the $(var.Name) foreground processes." DisplayName="$(var.Name)" ErrorControl="normal" Id="ServiceInstall" Name="$(var.Name)" Start="auto" Type="ownProcess">
-					<util:ServiceConfig FirstFailureActionType="restart" ResetPeriodInDays="1" RestartServiceDelayInSeconds="1" SecondFailureActionType="restart" ThirdFailureActionType="restart"/>
-				</ServiceInstall>
-				<ServiceControl Id="ServiceControl" Name="$(var.Name)" Remove="uninstall" Start="install" Stop="both"/>
-				<File Source="$(var.BinDir)/$(var.ServerBin)">
-					<fire:FirewallException Id="ServerFirewallException" IgnoreFailure="yes" Name="$(var.Name) Server" Scope="any"/>
-				</File>
-				<File Source="$(var.BinDir)/$(var.ClientBin)">
-					<fire:FirewallException Id="ClientFirewallException" IgnoreFailure="yes" Name="$(var.Name) Client" Scope="any"/>
-				</File>
-				<?if $(var.Platform) = x64 ?>
-					<File Source="$(var.OpenSslDllDir)/libssl-3-x64.dll"/>
-					<File Source="$(var.OpenSslDllDir)/libcrypto-3-x64.dll"/>
-				<?else ?>
-					<File Source="$(var.OpenSslDllDir)/libssl-3.dll"/>
-					<File Source="$(var.OpenSslDllDir)/libcrypto-3.dll"/>
-				<?endif ?>
-			</Component>
-			<Component Guid="BAC8149B-6287-45BF-9C27-43D71ED40214" Id="Gui">
-				<File Id="GuiProgram" KeyPath="yes" Source="$(var.BinDir)/$(var.GuiBin)">
-					<Shortcut Advertise="yes" Directory="ProgramMenuFolder" Icon="$(var.GuiBin)" Id="GuiShortcut" Name="$(var.Name)">
-						<Icon Id="$(var.GuiBin)" SourceFile="$(var.ResDir)/app.ico"/>
-					</Shortcut>
-					<fire:FirewallException Id="GuiFirewallException" IgnoreFailure="yes" Name="$(var.Name)" Scope="any"/>
-				</File>
-				<?if $(var.Configuration) = "Debug" ?>
-				<File Source="$(var.BinDir)\Qt6Cored.dll"/>
-				<File Source="$(var.BinDir)\Qt6Guid.dll"/>
-				<File Source="$(var.BinDir)\Qt6Networkd.dll"/>
-				<File Source="$(var.BinDir)\Qt6Svgd.dll"/>
-				<File Source="$(var.BinDir)\Qt6Widgetsd.dll"/>
-				<File Source="$(var.BinDir)\styles\qmodernwindowsstyle.dll"/>
-				<!-- HACK: Normally the C++ redistributable solves this dependency, including it can cause problems -->
-				<File Source="C:\Program Files (x86)\Windows Kits\10\bin\$(var.Platform)\ucrt\ucrtbased.dll"/>
-				<?else ?>
-				<File Source="$(var.BinDir)\brotlicommon.dll"/>
-				<File Source="$(var.BinDir)\brotlidec.dll"/>
-				<File Source="$(var.BinDir)\bz2.dll"/>
-				<File Source="$(var.BinDir)\double-conversion.dll"/>
-				<File Source="$(var.BinDir)\freetype.dll"/>
-				<File Source="$(var.BinDir)\harfbuzz.dll"/>
-				<File Source="$(var.BinDir)\icudt74.dll"/>
-				<File Source="$(var.BinDir)\icuin74.dll"/>
-				<File Source="$(var.BinDir)\icuuc74.dll"/>
-				<File Source="$(var.BinDir)\libpng16.dll"/>
-				<File Source="$(var.BinDir)\pcre2-16.dll"/>
-				<File Source="$(var.BinDir)\Qt6Core.dll"/>
-				<File Source="$(var.BinDir)\Qt6Gui.dll"/>
-				<File Source="$(var.BinDir)\Qt6Network.dll"/>
-				<File Source="$(var.BinDir)\Qt6Svg.dll"/>
-				<File Source="$(var.BinDir)\Qt6Widgets.dll"/>
-				<File Source="$(var.BinDir)\zlib1.dll"/>
-				<File Source="$(var.BinDir)\zstd.dll"/>
-				<File Source="$(var.BinDir)\styles\qmodernwindowsstyle.dll"/>
-				<?endif ?>
-			</Component>
-		</ComponentGroup>
-		<ComponentGroup Directory="QTStylesDir" Id="ProductQtStylesComponents">
-			<Component Guid="96E0F8D8-64FD-4CE8-94D1-F6EDCBBB4995" Id="Styles">
-				<File Id="qmodernwindowsstyle" Source="$(var.BinDir)\styles\qmodernwindowsstyle.dll"/>
-			</Component>
-		</ComponentGroup>
-		<ComponentGroup Directory="PlatformsDir" Id="ProductQtPluginComponents">
-			<Component Guid="684EFA14-856B-440E-A5E6-E90E04E36B41" Id="QtPlatformPlugin">
-				<?if $(var.Configuration) = "Debug" ?>
-				<File Source="$(var.BinDir)\platforms\qwindowsd.dll"/>
-				<?else ?>
-				<File Source="$(var.BinDir)\platforms\qwindows.dll"/>
-				<?endif ?>
-			</Component>
-		</ComponentGroup>
-		<ComponentGroup Directory="OpenSSLDir" Id="OpenSSLComponents">
-			<Component Guid="92648F77-65A6-4B16-AC59-A1F37BD341B1" Id="OpenSSL">
-				<?if $(var.Platform) = x64 ?>
-					<File Id="OpenSSLDll1" Source="$(var.OpenSslDllDir)/libcrypto-3-x64.dll"/>
-					<File Id="OpenSSLDll2" Source="$(var.OpenSslDllDir)/libssl-3-x64.dll"/>
-				<?else ?>
-					<File Id="OpenSSLDll1" Source="$(var.OpenSslDllDir)/libcrypto-3.dll"/>
-					<File Id="OpenSSLDll2" Source="$(var.OpenSslDllDir)/libssl-3.dll"/>
-				<?endif ?>
-				<File Source="$(var.OpenSslExeDir)/openssl.exe"/>			
-				<File Source="$(var.OpenSslExeDir)/openssl.cnf"/>
-			</Component>
-		</ComponentGroup>
-	</Fragment>
-</Wix>

res/gui/win/app.rc

@@ -1 +0,0 @@
-IDI_ICON1 ICON DISCARDABLE "../../app.ico"

scripts/daemon.py

@@ -1,76 +0,0 @@
-#!/usr/bin/env python3
-
-# Deskflow -- mouse and keyboard sharing utility
-# Copyright (C) 2024 Symless Ltd.
-#
-# This package is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# found in the file LICENSE that should have accompanied this file.
-#
-# This package is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import lib.env as env
-
-env.ensure_in_venv(__file__)
-
-import os, sys, argparse
-import lib.windows as windows
-import lib.colors as colors
-
-DEFAULT_SERVICE_ID = "deskflow"
-DEFAULT_BIN_NAME = "deskflow-daemon"
-DEFAULT_SOURCE_DIR = os.path.join("build", "temp", "bin")
-DEFAULT_TARGET_DIR = os.path.join("build", "bin")
-IGNORE_PROCESSES = ["deskflow.exe"]
-
-
-def main():
-    """Entry point for the script."""
-
-    parser = argparse.ArgumentParser()
-    parser.add_argument("--reinstall", action="store_true")
-    parser.add_argument("--stop", action="store_true")
-    parser.add_argument("--restart", action="store_true")
-    parser.add_argument("--pause-on-exit", action="store_true")
-    parser.add_argument("--source-dir", default=DEFAULT_SOURCE_DIR)
-    parser.add_argument("--target-dir", default=DEFAULT_TARGET_DIR)
-    parser.add_argument("--bin-name", default=DEFAULT_BIN_NAME)
-    parser.add_argument("--ignore-processes", nargs="+", default=IGNORE_PROCESSES)
-    parser.add_argument("--service-id", default=DEFAULT_SERVICE_ID)
-    parser.add_argument("--verbose", action="store_true")
-    args = parser.parse_args()
-
-    if not env.is_windows():
-        print(
-            f"{colors.ERROR_TEXT} This script is only supported on Windows",
-            file=sys.stderr,
-        )
-        sys.exit(1)
-
-    service = windows.WindowsService(__file__, args)
-
-    try:
-        if args.reinstall:
-            service.reinstall()
-        elif args.stop:
-            service.stop()
-        elif args.restart:
-            service.restart()
-        else:
-            print("No action specified", file=sys.stderr)
-            exit(1)
-    except Exception as e:
-        print(f"{colors.ERROR_TEXT} {e}", file=sys.stderr)
-
-    if args.pause_on_exit:
-        input("Press enter to continue...")
-
-
-if __name__ == "__main__":
-    main()

scripts/fancy_copy.py

@@ -1,57 +0,0 @@
-#!/usr/bin/env python3
-
-# Deskflow -- mouse and keyboard sharing utility
-# Copyright (C) 2024 Symless Ltd.
-#
-# This package is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# found in the file LICENSE that should have accompanied this file.
-#
-# This package is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import lib.env as env
-
-env.ensure_in_venv(__file__)
-
-import argparse
-import lib.file_utils as file_utils
-import lib.colors as colors
-
-
-def main():
-    """
-    Cross platform script to copy files and directories.
-    This script was mostly created beause the default `copy` command on Windows is too noisy.
-    If this becomes complex it must be replaced with a library.
-    """
-
-    parser = argparse.ArgumentParser()
-    parser.add_argument("source", help="Source pattern to copy from")
-    parser.add_argument("target", help="Destination pattern to copy to")
-    parser.add_argument(
-        "--ignore-errors", action="store_true", help="Ignore errors when copying"
-    )
-    parser.add_argument(
-        "--verbose", action="store_true", help="Print more information to the console"
-    )
-    args = parser.parse_args()
-
-    options = file_utils.CopyOptions(args.ignore_errors, args.verbose)
-
-    try:
-        file_utils.copy(args.source, args.target, options)
-    except Exception as e:
-        if not args.ignore_errors:
-            raise e
-        else:
-            print(f"{colors.ERROR_TEXT} {e}")
-
-
-if __name__ == "__main__":
-    main()

scripts/lib/certificate.py

@@ -1,55 +0,0 @@
-import os, base64
-
-# Deskflow -- mouse and keyboard sharing utility
-# Copyright (C) 2024 Symless Ltd.
-#
-# This package is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# found in the file LICENSE that should have accompanied this file.
-#
-# This package is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-temp_path = "tmp/certificate"
-
-
-class Certificate:
-    """
-    Installs a certificate from a base64 string, and returns the path to the certificate.
-    Once the context is exited, the certificate is removed from the filesystem.
-
-    Example usage:
-    with Certificate(base64) as cert_path:
-        print(f"Certificate path: {cert_path}")
-    """
-
-    def __init__(self, base64, file_ext):
-        self.base64 = base64
-        self.temp_filename = f"{temp_path}.{file_ext}"
-
-    def __enter__(self):
-        print(f"Decoding certificate to temporary path: {self.temp_filename}")
-        try:
-            cert_bytes = base64.b64decode(self.base64)
-        except Exception as e:
-            raise ValueError("Failed to decode certificate base64") from e
-
-        os.makedirs(os.path.dirname(self.temp_filename), exist_ok=True)
-        with open(self.temp_filename, "wb") as cert_file:
-            cert_file.write(cert_bytes)
-
-        return self.temp_filename
-
-    def __exit__(self, _exc_type, _exc_value, _traceback):
-        # not strictly necessary for ci, but when run on a dev machine, it reduces the risk
-        # that private keys are left on the filesystem
-        print(f"Removing temporary certificate file: {self.temp_filename}")
-        os.remove(self.temp_filename)
-
-        # propagate exceptions
-        return False

scripts/lib/cmd_utils.py

@@ -1,156 +0,0 @@
-# Deskflow -- mouse and keyboard sharing utility
-# Copyright (C) 2024 Symless Ltd.
-#
-# This package is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# found in the file LICENSE that should have accompanied this file.
-#
-# This package is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import subprocess
-import sys
-import lib.env as env
-
-try:
-    import colorama  # type: ignore
-    from colorama import Fore  # type: ignore
-
-    colorama.init()
-except ImportError:
-
-    class Fore:
-        RESET = ""
-        YELLOW = ""
-
-
-def has_command(command):
-    platform = sys.platform
-    if platform == "win32":
-        cmd = f"where {command}"
-    else:
-        cmd = f"which {command}"
-    try:
-        subprocess.check_output(cmd, shell=True)
-        return True
-    except subprocess.CalledProcessError:
-        return False
-
-
-def strip_continuation_sequences(command, strip_newlines=True):
-    """
-    Remove the continuation sequences (\\) from a command.
-
-    To spread strings over multiple lines in YAML files, like in bash, a backslash is used at
-    the end of each line as continuation character.
-    """
-
-    if isinstance(command, list):
-        raise ValueError("List commands are not supported")
-
-    cmd_continuation = " \\"
-    command = command.replace(cmd_continuation, "")
-
-    # Some versions of pyyaml will remove the newlines already, so always stripping
-    # makes the output more consistent.
-    if strip_newlines:
-        command = command.replace("\n", " ")
-
-    return command
-
-
-def run(
-    command,
-    check=True,  # true by default to fail fast
-    shell=False,  # false by default for security
-    get_output=False,
-    print_cmd=False,  # false by default for security
-):
-    """
-    Convenience wrapper around `subprocess.run` to:
-    - print the command before running it (if `print_cmd` is True)
-
-    This differs to `subprocess.run` in that by default it:
-    - checks the return code by default
-    - prints list commands as a readable string on failure
-
-    This is the same as `subprocess.run` in that it:
-    - does not use shell by default for security (shell is less secure)
-
-    Args:
-        command (str or list): The command to run.
-        check (bool): Raise an exception if the command fails.
-        shell (bool): Run the command in a shell (false by default for security)
-        get_output (bool): Return the output of the command.
-        print_cmd (bool): Print the command before running it (false by default for security)
-    """
-
-    is_list_cmd = isinstance(command, list)
-
-    # create string version of list command, only for debugging purposes
-    command_str = command
-    if is_list_cmd:
-        command_str = " ".join(command)
-
-    if print_cmd:
-        print(f"Running: {command_str}")
-    else:
-        print("Running command...")
-        command_str = "***"
-
-    # TODO: You can definitely use a list command with shell=True on Windows,
-    # but can you use a string command with shell=False on Windows?
-    #
-    # The `subprocess.run` function has a little gotcha:
-    # - a string command must be used when `shell=True`
-    # - a list command must be used when shell isn't or `shell=False`
-    # however, it allows you to pass a string command when shell isn't used or `shell=False`
-    # then fails with a vague error message. same problem with list commands and `shell=True`
-    if not env.is_windows() and is_list_cmd and shell:
-        raise ValueError("List commands cannot be used when shell=True on Unix systems")
-    elif not is_list_cmd and not shell:
-        raise ValueError("String commands cannot be used when shell=False or not set")
-
-    # Flush the output to ensure the command is printed before the output of the command,
-    # which seems to happen in the GitHub runner logs.
-    sys.stdout.flush()
-    sys.stderr.flush()
-
-    try:
-        if get_output:
-            result = subprocess.run(
-                command,
-                shell=shell,
-                check=check,
-                stdout=subprocess.PIPE,
-                stderr=subprocess.PIPE,
-                text=True,
-            )
-        else:
-            result = subprocess.run(command, check=check, shell=shell)
-
-    except subprocess.CalledProcessError as e:
-        # Take control of how failed commands are printed:
-        # - if `print_cmd` is false, it will print `***` instead of the command
-        # - if the command was a list, the command is printed as a readable string
-        raise RuntimeError(
-            f"Command exited with code {e.returncode}: {command_str}"
-        ) from None
-    except Exception:
-        # Take control of how failed commands are printed:
-        # - if `print_cmd` is false, it will print `***` instead of the command
-        # - if the command was a list, the command is printed as a readable string
-        raise RuntimeError(f"Command failed: {command_str}")
-
-    if result.returncode != 0:
-        print(
-            f"{Fore.YELLOW}Command exited with code {result.returncode}:{Fore.RESET} {command_str}",
-            file=sys.stderr,
-        )
-
-    return result

scripts/lib/colors.py

@@ -1,24 +0,0 @@
-# Deskflow -- mouse and keyboard sharing utility
-# Copyright (C) 2024 Symless Ltd.
-#
-# This package is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# found in the file LICENSE that should have accompanied this file.
-#
-# This package is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import colorama  # type: ignore
-from colorama import Fore  # type: ignore
-
-colorama.init()
-
-SUCCESS_TEXT = f"{Fore.LIGHTGREEN_EX}Success:{Fore.RESET}"
-ERROR_TEXT = f"{Fore.LIGHTRED_EX}Error:{Fore.RESET}"
-WARNING_TEXT = f"{Fore.LIGHTYELLOW_EX}Warning:{Fore.RESET}"
-HINT_TEXT = f"{Fore.LIGHTBLUE_EX}Hint:{Fore.RESET}"

scripts/lib/env.py

@@ -1,269 +0,0 @@
-# Deskflow -- mouse and keyboard sharing utility
-# Copyright (C) 2024 Symless Ltd.
-#
-# This package is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# found in the file LICENSE that should have accompanied this file.
-#
-# This package is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import os, sys, subprocess
-import lib.cmd_utils as cmd_utils
-
-# The `.venv` dir seems to be most common for virtual environments.
-VENV_DIR = ".venv"
-
-
-def check_module(module):
-    try:
-        __import__(module)
-        return True
-    except ImportError:
-        print(f"Python is missing {module} module", file=sys.stderr)
-        return False
-
-
-def get_os():
-    """Detects the operating system."""
-    if sys.platform == "win32":
-        return "windows"
-    elif sys.platform == "darwin":
-        return "mac"
-    elif sys.platform.startswith("linux"):
-        return "linux"
-    else:
-        raise RuntimeError(f"Unsupported platform: {sys.platform}")
-
-
-def is_windows():
-    return get_os() == "windows"
-
-
-def is_mac():
-    return get_os() == "mac"
-
-
-def is_linux():
-    return get_os() == "linux"
-
-
-def get_linux_distro():
-    """Detects the Linux distro."""
-    os_file = "/etc/os-release"
-    name = None
-    name_like = None
-    version_id = None
-    version_codename = None
-
-    if os.path.isfile(os_file):
-        with open(os_file) as f:
-            for line in f:
-                if line.startswith("ID="):
-                    name = line.strip().split("=")[1].strip('"')
-                elif line.startswith("ID_LIKE="):
-                    name_like = line.strip().split("=")[1].strip('"')
-                elif line.startswith("VERSION_ID="):
-                    version_id = line.strip().split("=")[1].strip('"')
-                elif line.startswith("VERSION_CODENAME="):
-                    version_codename = line.strip().split("=")[1].strip('"')
-
-    return name, name_like, version_id or version_codename
-
-
-def get_env(name, required=True, default=None):
-    """
-    Returns an env var (stripped) or optionally raises an error if not set.
-
-    If `default` is set, it will be returned even if `required` is True.
-    """
-    value = os.getenv(name)
-    if value:
-        value = value.strip()
-
-    if not value:
-        if default:
-            return default
-        elif required:
-            raise ValueError(f"Required env var not set: {name}")
-
-    return value
-
-
-def get_env_bool(name, default=False):
-    """Returns a boolean value from an env var (stripped)."""
-    value = os.getenv(name)
-    if value:
-        value = value.strip()
-
-    if value is None:
-        return default
-
-    return value.lower() in ["true", "1", "yes"]
-
-
-def get_venv_executable(binary="python"):
-    if sys.platform == "win32":
-        return os.path.join(VENV_DIR, "Scripts", binary)
-    else:
-        return os.path.join(VENV_DIR, "bin", binary)
-
-
-def in_venv():
-    """Returns True if the script is running in a Python virtual environment."""
-    return sys.prefix != sys.base_prefix
-
-
-def ensure_in_venv(script_file, create_venv=False):
-    """
-    Ensures the script is running in a Python virtual environment (venv).
-    If the script is not running in a venv, it will create one and re-run the script in the venv.
-    """
-
-    check_dependencies(raise_error=True)
-    import venv
-
-    if in_venv():
-        print(f"Running in venv, executable: {sys.executable}", flush=True)
-        return
-
-    if create_venv and not os.path.exists(VENV_DIR):
-        print(f"Creating virtual environment at {VENV_DIR}")
-        venv.create(VENV_DIR, with_pip=True)
-
-    if os.path.exists(VENV_DIR):
-        script_file_abs = os.path.abspath(script_file)
-        print(f"Using virtual environment for: {script_file_abs}", flush=True)
-        python_executable = get_venv_executable()
-        result = subprocess.run([python_executable, script_file_abs] + sys.argv[1:])
-        sys.exit(result.returncode)
-    else:
-        print(
-            "The Python virtual environment (.venv) needs to be created before you can "
-            "run this script.\n"
-            "Please run: scripts/setup_venv.py"
-        )
-        sys.exit(1)
-
-
-def install_requirements():
-    """
-    Uses `pip` to install required Python modules from the `requirements.txt` file.
-    """
-
-    check_dependencies(raise_error=True)
-
-    print("Updating pip...")
-    cmd_utils.run(
-        [sys.executable, "-m", "pip", "install", "--upgrade", "pip"],
-        shell=False,
-        print_cmd=True,
-    )
-
-    print("Installing required modules...")
-    cmd_utils.run(
-        [sys.executable, "-m", "pip", "install", "-e", "scripts"],
-        shell=False,
-        print_cmd=True,
-    )
-
-
-def check_dependencies(raise_error=False):
-    """
-    Returns True if pip and venv are available.
-    """
-
-    has_pip = check_module("pip")
-    has_venv = check_module("venv")
-
-    if raise_error:
-        if not has_pip:
-            raise RuntimeError("Python is missing pip")
-        if not has_venv:
-            raise RuntimeError("Python is missing venv")
-    else:
-        return has_pip and has_venv
-
-
-def ensure_dependencies():
-    """
-    Ensures that pip and venv are available, and installs them if they are not.
-    This is normally only installs on Linux, as Windows and Mac usually come with pip and venv.
-    """
-
-    if check_dependencies():
-        return
-
-    print("Installing Python dependencies...")
-
-    os = get_os()
-    if os != "linux":
-        # should not be a problem, since windows and mac come with pip and venv
-        raise RuntimeError(f"Unable to install Python dependencies on {os}")
-
-    has_sudo = cmd_utils.has_command("sudo")
-    sudo = "sudo" if has_sudo else ""
-
-    distro, distro_like, _version = get_linux_distro()
-    if not distro_like:
-        distro_like = distro
-
-    update_cmd = None
-    install_cmd = None
-    if distro == "rhel" or "rhel" in distro_like:
-        update_cmd = "yum check-update"
-        install_cmd = "yum install -y python3-pip"  # rhel-like has venv already
-    elif "debian" in distro_like:
-        update_cmd = "apt update"
-        install_cmd = "apt install -y python3-pip python3-venv"
-    elif "fedora" in distro_like:
-        update_cmd = "dnf check-update"
-        install_cmd = "dnf install -y python3-pip python3-virtualenv"
-    elif "arch" in distro_like:
-        install_cmd = "pacman -Syu --noconfirm python-pip python-virtualenv"
-    elif "opensuse" in distro_like:
-        update_cmd = "zypper refresh"
-        install_cmd = "zypper install -y python3-pip python3-virtualenv"
-    else:
-        raise RuntimeError(f"Unable to install Python dependencies on {distro}")
-
-    if update_cmd:
-        # don't check the return code, as some package managers return non-zero exit codes
-        # under normal circumstances (e.g. dnf check-update returns 100 when there are
-        # updates available).
-        cmd_utils.run(
-            f"{sudo} {update_cmd}".strip(), check=False, shell=True, print_cmd=True
-        )
-
-    cmd_utils.run(f"{sudo} {install_cmd}".strip(), shell=True, print_cmd=True)
-
-
-def import_colors():
-    import lib.colors as colors
-
-    return colors
-
-
-def persist_lock_file(path):
-    """
-    Persists a lock file and ensures the directory part of the path exists.
-    """
-    dir_path = os.path.dirname(path)
-    if not os.path.exists(dir_path):
-        os.makedirs(dir_path, exist_ok=True)
-
-    with open(path, "w") as f:
-        f.write(str(os.getpid()))
-
-
-def remove_lock_file(path):
-    """
-    Removes a lock file if it exists.
-    """
-    if os.path.exists(path):
-        os.remove(path)

scripts/lib/file_utils.py

@@ -1,104 +0,0 @@
-# Deskflow -- mouse and keyboard sharing utility
-# Copyright (C) 2024 Symless Ltd.
-#
-# This package is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# found in the file LICENSE that should have accompanied this file.
-#
-# This package is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import glob, os, shutil, sys
-import lib.env as env
-import lib.colors as colors
-
-
-class CopyOptions:
-    def __init__(self, ignore_errors, verbose):
-        self.ignore_errors = ignore_errors
-        self.verbose = verbose
-
-
-class CopyContext:
-    def __init__(self):
-        self.errors = 0
-        self.permission_error = False
-
-
-def copy(source, target, options):
-    """Copy files and directories from source to target."""
-
-    context = CopyContext()
-    if options.verbose:
-        print(f"Copying files from {source} to {target}")
-
-    try:
-        for match in glob.glob(source):
-
-            if os.path.isfile(match):
-                copy_file(match, target, options, context)
-            elif os.path.isdir(match):
-                copy_dir(match, target, options, context)
-            else:
-                raise RuntimeError(f"Path {match} is not a file or directory")
-    finally:
-        if context.errors and options.ignore_errors:
-            print(f"{colors.WARNING_TEXT} Ignored {context.errors} copy error(s)")
-
-        if context.permission_error and env.is_windows():
-            print(
-                f"{colors.HINT_TEXT} A Windows file permission error may mean that the file is in use"
-            )
-
-
-def copy_dir(match, target, options, context):
-    if options.verbose:
-        print(f"Copying directory {match} to {target}")
-
-    try:
-        shutil.copytree(match, target, dirs_exist_ok=True)
-    except Exception as e:
-        handle_all_copy_errors(e, options, context)
-
-
-def copy_file(match, target, options, context):
-    if options.verbose:
-        print(f"Copying file {match} to {target}")
-
-    try:
-        shutil.copy(match, target)
-    except Exception as e:
-        handle_all_copy_errors(e, options, context)
-
-
-def handle_all_copy_errors(error, options, context):
-
-    if isinstance(error, shutil.Error):
-        for _, _, file_error in error.args[0]:
-            handle_copy_error(file_error, options, context)
-    else:
-        handle_copy_error(error, options, context)
-
-    if not options.ignore_errors:
-        raise error
-
-
-def handle_copy_error(error, options, context):
-    if isinstance(error, PermissionError):
-        context.permission_error = True
-
-    if isinstance(error, str):
-        context.permission_error = error.startswith("[Errno 13] Permission denied")
-
-    context.errors += 1
-
-    if options.ignore_errors:
-        print(
-            f"{colors.WARNING_TEXT} Copy failed: {error}",
-            file=sys.stderr,
-        )

scripts/lib/fs.py

@@ -1,29 +0,0 @@
-# Deskflow -- mouse and keyboard sharing utility
-# Copyright (C) 2024 Symless Ltd.
-#
-# This package is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# found in the file LICENSE that should have accompanied this file.
-#
-# This package is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import os, fnmatch
-
-
-def find_files(search_dirs, include_files, exclude_dirs=[]):
-    """Recursively find files, excluding specified directories"""
-    matches = []
-    for dir in search_dirs:
-        for root, dirnames, filenames in os.walk(dir):
-            dirnames[:] = [d for d in dirnames if d not in exclude_dirs]
-
-            for pattern in include_files:
-                for filename in fnmatch.filter(filenames, pattern):
-                    matches.append(os.path.join(root, filename))
-    return matches

scripts/lib/mac.py

@@ -1,347 +0,0 @@
-# Deskflow -- mouse and keyboard sharing utility
-# Copyright (C) 2024 Symless Ltd.
-#
-# This package is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# found in the file LICENSE that should have accompanied this file.
-#
-# This package is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import dmgbuild  # type: ignore
-import os, time, json, shutil, sys
-import lib.cmd_utils as cmd_utils
-import lib.env as env
-from lib.certificate import Certificate
-
-CERT_P12_ENV = "APPLE_P12_CERTIFICATE"
-NOTARY_USER_ENV = "APPLE_NOTARY_USER"
-CODESIGN_ENV = "APPLE_CODESIGN_ID"
-SHELL_RC = "~/.zshrc"
-SETTINGS_FILE = "res/dist/mac/dmgbuild/settings.py"
-SECURITY_PATH = "/usr/bin/security"
-SUDO_PATH = "/usr/bin/sudo"
-NOTARYTOOL_PATH = "/usr/bin/notarytool"
-CODESIGN_PATH = "/usr/bin/codesign"
-XCODE_SELECT_PATH = "/usr/bin/xcode-select"
-KEYCHAIN_PATH = "/Library/Keychains/System.keychain"
-
-
-def set_env_var(name, value):
-    """
-    Adds to an environment variable in the shell rc file.
-
-    Returns True if the variable was added, False if it already exists.
-    """
-    text = f'export {name}="{value}:${name}"'
-    file = os.path.expanduser(SHELL_RC)
-    if os.path.exists(file):
-        with open(file, "r") as f:
-            if text in f.read():
-                return False
-
-    print(f"Setting environment variable: {name}={name}")
-    with open(file, "a") as f:
-        f.write(f"\n{text}\n")
-        print(f"Appended to {SHELL_RC}: {text}")
-        return True
-
-
-def package(filename_base, source_dir, build_dir, dist_dir, product_name):
-    """
-    Package the application for macOS.
-    The app bundle must be signed, or an error will occur:
-    > EXC_BAD_ACCESS (SIGKILL (Code Signature Invalid))
-    An "Apple Development" certificate is sufficient for local development.
-    """
-
-    (
-        codesign_id,
-        cert_base64,
-        cert_password,
-        notary_user,
-        notary_password,
-        notary_team_id,
-    ) = package_env_vars()
-
-    if cert_base64:
-        install_certificate(cert_base64, cert_password)
-    else:
-        print(
-            f"Warning: Skipped certificate installation, env var {CERT_P12_ENV} not set",
-            file=sys.stderr,
-        )
-
-    bundle_source_dir = os.path.join(
-        build_dir, os.path.join("bundle", product_name + ".app")
-    )
-    build_bundle(bundle_source_dir)
-
-    if codesign_id:
-        sign_bundle(bundle_source_dir, codesign_id)
-    else:
-        print(
-            f"Warning: Skipped code signing, env var {CODESIGN_ENV} not set",
-            file=sys.stderr,
-        )
-
-    dmg_path = build_dmg(
-        bundle_source_dir, filename_base, source_dir, dist_dir, product_name
-    )
-
-    if notary_user:
-        notarize_package(dmg_path, notary_user, notary_password, notary_team_id)
-    else:
-        print(
-            f"Warning: Skipped notarization, env var {NOTARY_USER_ENV} not set",
-            file=sys.stderr,
-        )
-
-
-def package_env_vars():
-    codesign_id = env.get_env(CODESIGN_ENV, required=False)
-    cert_base64 = env.get_env(CERT_P12_ENV, required=False)
-    notary_user = env.get_env(NOTARY_USER_ENV, required=False)
-
-    if notary_user:
-        notary_password = env.get_env("APPLE_NOTARY_PASSWORD")
-        notary_team_id = env.get_env("APPLE_TEAM_ID")
-    else:
-        notary_password = None
-        notary_team_id = None
-
-    if cert_base64:
-        cert_password = env.get_env("APPLE_P12_PASSWORD")
-    else:
-        cert_password = None
-
-    return (
-        codesign_id,
-        cert_base64,
-        cert_password,
-        notary_user,
-        notary_password,
-        notary_team_id,
-    )
-
-
-def build_bundle(bundle_source_dir):
-
-    # it's important to build a new bundle every time, so that we catch bugs with fresh builds.
-    if os.path.exists(bundle_source_dir):
-        print(f"Bundle already exists, deleting: {bundle_source_dir}")
-        shutil.rmtree(bundle_source_dir)
-
-    print("Building bundle...")
-
-    # cmake build install target should run macdeployqt
-    cmd_utils.run("cmake --build build --target install", shell=True, print_cmd=True)
-
-
-def sign_bundle(bundle_source_dir, codesign_id):
-    print(f"Signing bundle {bundle_source_dir}...")
-
-    assert_certificate_installed(codesign_id)
-    cmd_utils.run(
-        [
-            CODESIGN_PATH,
-            "-f",
-            "--options",
-            "runtime",
-            "--deep",
-            "-s",
-            codesign_id,
-            bundle_source_dir,
-        ]
-    )
-
-
-def assert_certificate_installed(codesign_id):
-    print(f"Checking certificate: {codesign_id}")
-
-    installed = cmd_utils.run(
-        "security find-identity -v -p codesigning",
-        get_output=True,
-        shell=True,
-        print_cmd=True,
-    )
-
-    if codesign_id not in installed.stdout:
-        raise RuntimeError("Code signing certificate not installed or has expired")
-
-
-def build_dmg(bundle_source_dir, filename_base, source_dir, dist_dir, product_name):
-    settings_path = (
-        SETTINGS_FILE if source_dir is None else os.path.join(source_dir, SETTINGS_FILE)
-    )
-    settings_path_abs = os.path.abspath(settings_path)
-    app_path_abs = os.path.abspath(bundle_source_dir)
-
-    # cwd for dmgbuild, since setting the dmg filename to a path (include the dist dir) seems to
-    # make the dmg disappear and never writes to the specified path. the dmgbuild module also
-    # creates a temporary file in cwd, so it makes sense to change to the dist dir.
-    print(f"Changing directory to: {os.path.abspath(dist_dir)}")
-    cwd = os.getcwd()
-    os.makedirs(dist_dir, exist_ok=True)
-    os.chdir(dist_dir)
-
-    try:
-        dmg_filename = f"{filename_base}.dmg"
-        dmg_path = os.path.join(dist_dir, dmg_filename)
-        print(f"Building package {dmg_path}...")
-        dmgbuild.build_dmg(
-            dmg_filename,
-            product_name,
-            settings_file=settings_path_abs,
-            defines={
-                "app": app_path_abs,
-            },
-        )
-    finally:
-        print(f"Changing directory back to: {cwd}")
-        os.chdir(cwd)
-
-    return dmg_path
-
-
-def install_certificate(cert_base64, cert_password):
-    if not cert_base64:
-        raise ValueError("Certificate base 64 not provided")
-
-    if not cert_password:
-        raise ValueError("Certificate password not provided")
-
-    with Certificate(cert_base64, "p12") as cert_path:
-        print(f"Installing certificate: {cert_path}")
-
-        # WARNING: contains private key password, never print this command
-        cmd_utils.run(
-            [
-                SUDO_PATH,
-                SECURITY_PATH,
-                "import",
-                cert_path,
-                "-k",
-                KEYCHAIN_PATH,
-                "-P",
-                cert_password,
-                "-T",
-                CODESIGN_PATH,
-                "-T",
-                SECURITY_PATH,
-            ],
-        )
-
-
-def notarize_package(dmg_path, user, password, team_id):
-    print(f"Notarizing package {dmg_path}...")
-    notary_tool = NotaryTool()
-    notary_tool.store_credentials(user, password, team_id)
-    notary_tool.submit_and_wait(dmg_path)
-
-
-def get_xcode_path():
-    result = cmd_utils.run(
-        [XCODE_SELECT_PATH, "-p"], get_output=True, shell=False, print_cmd=True
-    )
-    return result.stdout.strip()
-
-
-class NotaryTool:
-    """
-    Provides a wrapper around the notarytool command line tool.
-    """
-
-    def __init__(self):
-        self.xcode_path = get_xcode_path()
-
-    def get_path(self):
-        return f"{self.xcode_path}{NOTARYTOOL_PATH}"
-
-    def store_credentials(self, user, password, team_id):
-        print("Storing credentials for notary tool...")
-        notarytool_path = self.get_path()
-
-        # WARNING: contains password, never print this command
-        cmd_utils.run(
-            [
-                notarytool_path,
-                "store-credentials",
-                "notarytool-password",
-                "--team-id",
-                team_id,
-                "--apple-id",
-                user,
-                "--password",
-                password,
-            ]
-        )
-
-    def submit_and_wait(self, dmg_filename):
-        print("Submitting notarization request...")
-        submit_result = self.run_submit_command(dmg_filename)
-        request_id = submit_result["id"]
-
-        print(f"Notary submitted, waiting for request: {request_id}")
-        start = time.time()
-        wait_result = self.run_wait_command(request_id)
-        status = wait_result["status"]
-
-        time_taken = time.time() - start
-        print(f"Notary complete in {time_taken:.2f}s, status: {status}")
-        if status == "Accepted":
-            print("Notarization successful.")
-        elif status == "Invalid" or status == "Rejected":
-            raise ValueError(f"Notarization failed, status: {status}")
-        else:
-            raise ValueError(f"Unknown status: {status}")
-
-    def run_submit_command(self, dmg_filename):
-        if not os.path.exists(dmg_filename):
-            raise FileNotFoundError(f"File not found: {dmg_filename}")
-
-        result = cmd_utils.run(
-            [
-                self.get_path(),
-                "submit",
-                dmg_filename,
-                "--keychain-profile",
-                "notarytool-password",
-                "--output-format",
-                "json",
-            ],
-            get_output=True,
-            shell=False,
-            print_cmd=True,
-        )
-
-        if result.stderr:
-            return json.loads(result.stderr)
-        else:
-            return json.loads(result.stdout)
-
-    def run_wait_command(self, request_id):
-        result = cmd_utils.run(
-            [
-                self.get_path(),
-                "wait",
-                request_id,
-                "--keychain-profile",
-                "notarytool-password",
-                "--output-format",
-                "json",
-            ],
-            get_output=True,
-            shell=False,
-            print_cmd=True,
-        )
-
-        if result.stderr:
-            return json.loads(result.stderr)
-        else:
-            return json.loads(result.stdout)

scripts/lib/windows.py

@@ -1,329 +0,0 @@
-# Deskflow -- mouse and keyboard sharing utility
-# Copyright (C) 2024 Symless Ltd.
-#
-# This package is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# found in the file LICENSE that should have accompanied this file.
-#
-# This package is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import ctypes, sys, os, shutil, time, subprocess
-import xml.etree.ElementTree as ET
-import lib.cmd_utils as cmd_utils
-import lib.env as env
-import psutil  # type: ignore
-from lib.certificate import Certificate
-import lib.colors as colors
-import lib.file_utils as file_utils
-
-LOCK_FILE = "tmp/elevated.lock"
-MSBUILD_CMD = "msbuild"
-SIGNTOOL_CMD = "signtool"
-CERTUTIL_CMD = "certutil"
-RUNNER_TEMP_ENV = "RUNNER_TEMP"
-SERVICE_NOT_RUNNING_ERROR = 2
-ERROR_ACCESS_VIOLATION = 0xC0000005
-
-
-def run_elevated(script, args=None, use_sys_argv=True, wait_for_exit=False):
-    if not args and use_sys_argv:
-        args = " ".join(sys.argv[1:])
-
-    if wait_for_exit:
-        args += f" --lock-file {LOCK_FILE}"
-        env.persist_lock_file(LOCK_FILE)
-
-    command = f"{script} {args} --pause-on-exit"
-    print(f"Running script with elevated privileges: {command}")
-
-    WINDOW_HANDLE = None
-    OPERATION = "runas"
-    DIRECTORY = None
-    SHOW_CMD = 1
-    instance = ctypes.windll.shell32.ShellExecuteW(
-        WINDOW_HANDLE, OPERATION, sys.executable, command, DIRECTORY, SHOW_CMD
-    )
-
-    ERROR_ACCESS_DENIED = 5
-    if instance == ERROR_ACCESS_DENIED:
-        raise RuntimeError(
-            f"Failed to run script with elevated privileges, access denied (code {instance})"
-        )
-
-    ERROR_MAX = 32
-    if instance <= ERROR_MAX:
-        raise RuntimeError(
-            f"Failed to run script with elevated privileges, error code: {instance}"
-        )
-
-    print("Script is running with elevated privileges")
-
-    if wait_for_exit:
-        with open(LOCK_FILE, "r") as f:
-            pid = f.read()
-
-        print(f"Waiting for elevated process to exit: {pid}")
-        while os.path.exists(LOCK_FILE):
-            # Intentionally wait forever, since this code should not run where a developer
-            # has no control, such as in a CI environment.
-            pass
-
-
-def is_admin():
-    """Returns True if the current process has admin privileges."""
-    try:
-        return ctypes.windll.shell32.IsUserAnAdmin()
-    except ctypes.WinError:
-        return False
-
-
-def set_env_var(name, value):
-    """
-    Sets or updates an environment variable. Appends the value if it doesn't already exist.
-
-    Args:
-    name (str): The name of the environment variable.
-    value (str): The value of the environment variable.
-    """
-
-    current_value = os.getenv(name, "")
-
-    if value not in current_value:
-        new_value = f"{current_value}{os.pathsep}{value}" if current_value else value
-        os.environ[name] = new_value
-        print(f"Setting environment variable: {name}={value}")
-        cmd_utils.run(["setx", name, new_value], check=True, shell=True, print_cmd=True)
-
-
-def package(filename_base, build_dir, dist_dir):
-    cert_env_key = "WINDOWS_PFX_CERTIFICATE"
-    cert_base64 = env.get_env(cert_env_key, required=False)
-    packager = WindowsPackager(filename_base, build_dir, dist_dir)
-
-    if cert_base64:
-        cert_password = env.get_env("WINDOWS_PFX_PASSWORD")
-        packager.sign_binaries(cert_base64, cert_password)
-
-    packager.build_msi()
-
-    if cert_base64:
-        packager.sign_msi(cert_base64, cert_password)
-    else:
-        print(f"Skipped code signing, env var not set: {cert_env_key}")
-
-
-def assert_vs_cmd(cmd):
-    has_cmd = cmd_utils.has_command(cmd)
-    if not has_cmd:
-        raise RuntimeError(
-            f"The '{cmd}' command was not found, "
-            "re-run from 'Developer Command Prompt for VS'"
-        )
-
-
-def run_codesign(path, cert_base64, cert_password):
-    time_server = "http://timestamp.digicert.com"
-    hashing_algorithm = "SHA256"
-
-    with Certificate(cert_base64, "pfx") as cert_path:
-        print("Signing MSI installer...")
-        assert_vs_cmd(SIGNTOOL_CMD)
-
-        # WARNING: contains private key password, never print this command
-        cmd_utils.run(
-            [
-                SIGNTOOL_CMD,
-                "sign",
-                "/f",
-                cert_path,
-                "/p",
-                cert_password,
-                "/t",
-                time_server,
-                "/fd",
-                hashing_algorithm,
-                path,
-            ]
-        )
-
-
-class WindowsPackager:
-
-    def __init__(self, filename_base, build_dir, dist_dir):
-        self.filename_base = filename_base
-        self.build_dir = build_dir
-        self.dist_dir = dist_dir
-        self.wix_file = f"{build_dir}/installer/Installer.sln"
-        self.msi_file = f"{build_dir}/installer/bin/Release/Installer.msi"
-
-    def build_msi(self):
-        print("Building MSI installer...")
-        configuration = "Release"
-        platform = "x64"
-
-        assert_vs_cmd(MSBUILD_CMD)
-        cmd_utils.run(
-            [
-                MSBUILD_CMD,
-                self.wix_file,
-                f"/p:Configuration={configuration}",
-                f"/p:Platform={platform}",
-            ],
-            shell=True,
-            print_cmd=True,
-        )
-
-        path = self.get_package_path()
-        print(f"Copying MSI installer to {self.dist_dir}")
-        os.makedirs(self.dist_dir, exist_ok=True)
-        shutil.copy(self.msi_file, path)
-
-    def get_package_path(self):
-        return f"{self.dist_dir}/{self.filename_base}.msi"
-
-    def sign_binaries(self, cert_base64, cert_password):
-        exe_pattern = f"{self.build_dir}/bin/*.exe"
-        run_codesign(exe_pattern, cert_base64, cert_password)
-
-    def sign_msi(self, cert_base64, cert_password):
-        path = self.get_package_path()
-        run_codesign(path, cert_base64, cert_password)
-
-
-class WindowsService:
-    def __init__(self, script, args):
-        self.script = script
-        self.verbose = args.verbose
-        self.bin_name = args.bin_name
-        self.source_dir = os.path.abspath(args.source_dir)
-        self.target_dir = os.path.abspath(args.target_dir)
-        self.service_id = args.service_id
-        self.ignore_processes = args.ignore_processes
-
-    def print_verbose(self, message):
-        if self.verbose:
-            print(message)
-
-    def ensure_admin(self):
-        if not is_admin():
-            run_elevated(self.script)
-            sys.exit()
-
-    def restart(self):
-        """Stops the daemon service, copies files, and restarts the daemon service."""
-
-        self.ensure_admin()
-        self.stop()
-        self.copy_files()
-        self.start()
-
-    def reinstall(self):
-        """Stops and uninstalls daemon service, copies files, and reinstalls the daemon service."""
-
-        self.ensure_admin()
-        self.stop()
-
-        source_bin_path = f"{os.path.join(self.source_dir, self.bin_name)}.exe"
-
-        self.copy_files()
-
-        print("Removing old daemon service")
-        try:
-            subprocess.run([source_bin_path, "/uninstall"], shell=True, check=True)
-        except subprocess.CalledProcessError as e:
-            self.check_access_violation(e.returncode, source_bin_path)
-            if e.returncode != 0:
-                print(
-                    f"{colors.WARNING_TEXT} Uninstall failed, return code: {e.returncode}",
-                    file=sys.stderr,
-                )
-
-        target_bin_path = os.path.join(self.target_dir, self.bin_name + ".exe")
-
-        try:
-            print("Installing daemon service")
-            subprocess.run([target_bin_path, "/install"], shell=True, check=True)
-        except subprocess.CalledProcessError as e:
-            self.check_access_violation(e.returncode, target_bin_path)
-            if e.returncode != 0:
-                print(
-                    f"{colors.WARNING_TEXT} Install failed, return code: {e.returncode}"
-                )
-
-    def copy_files(self):
-        options = file_utils.CopyOptions(ignore_errors=True, verbose=False)
-        print(f"Copying files from {self.source_dir} to {self.target_dir}")
-        file_utils.copy(f"{self.source_dir}/*", self.target_dir, options)
-
-    def stop(self):
-        self.ensure_admin()
-        print("Stopping daemon service")
-        try:
-            subprocess.run(["net", "stop", self.service_id], shell=True, check=True)
-        except subprocess.CalledProcessError as e:
-            if e.returncode == SERVICE_NOT_RUNNING_ERROR:
-                self.print_verbose("Daemon service not running")
-            else:
-                raise e
-
-        # Wait for Windows to release the file handles after process termination.
-        self.wait_for_stop()
-
-    def start(self):
-        self.ensure_admin()
-        print("Starting daemon service")
-        subprocess.run(["net", "start", self.service_id], shell=True, check=True)
-
-    def wait_for_stop(self):
-        if self.is_any_process_running(self.target_dir):
-            print("Waiting for file handles to release...", end="", flush=True)
-            while self.is_any_process_running(self.target_dir):
-                if not self.verbose:
-                    print(".", end="", flush=True)
-                time.sleep(1)
-            if not self.verbose:
-                print()
-
-    def check_access_violation(self, return_code, bin_path):
-        if return_code == ERROR_ACCESS_VIOLATION:
-            print(
-                f"{colors.WARNING_TEXT} Process crashed with memory access violation: {bin_path}",
-                file=sys.stderr,
-            )
-
-    def is_ignored_process(self, exe):
-        for ignore_process in self.ignore_processes:
-            if exe.endswith(ignore_process):
-                return True
-        return False
-
-    def is_any_process_running(self, dir):
-        """Check if there is any running process that contains the given directory."""
-
-        self.print_verbose(f"Checking if any process is running in: {dir}")
-
-        for proc in psutil.process_iter(attrs=["name", "exe"]):
-            exe = proc.info["exe"]
-
-            if not exe:
-                self.print_verbose(f"Skipping process with no exe: {proc}")
-                continue
-
-            if self.is_ignored_process(exe):
-                self.print_verbose(f"Ignoring process: {exe}")
-                continue
-
-            try:
-                if dir.lower() in exe.lower():
-                    self.print_verbose(f"Process found: {exe}")
-                    return True
-            except (psutil.NoSuchProcess, psutil.AccessDenied):
-                pass
-
-        return False

scripts/lint_clang.py

@@ -1,74 +0,0 @@
-#!/usr/bin/env python3
-
-# Deskflow -- mouse and keyboard sharing utility
-# Copyright (C) 2024 Symless Ltd.
-#
-# This package is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# found in the file LICENSE that should have accompanied this file.
-#
-# This package is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import lib.env as env
-
-env.ensure_in_venv(__file__)
-
-import argparse, sys
-import lib.fs as fs
-from clang_format import clang_format  # type: ignore
-
-include_files = [
-    "*.h",
-    "*.c",
-    "*.hpp",
-    "*.cpp",
-]
-
-dirs = ["src"]
-
-
-def main():
-    """
-    Cross-platform equivalent of using find and xargs with clang-format.
-    Lints by performing a dry run (--dry-run) which fails when formatting is needed.
-    """
-    parser = argparse.ArgumentParser()
-    parser.add_argument(
-        "-f",
-        "--format",
-        action="store_true",
-        help="In-place format all files",
-    )
-    args = parser.parse_args()
-
-    cmd_args = ["-i"] if args.format else ["--dry-run", "--Werror"]
-    files_recursive = fs.find_files(dirs, include_files)
-
-    if args.format:
-        print("Formatting files with Clang formatter:")
-    else:
-        print("Checking files with Clang formatter:")
-
-    for file in files_recursive:
-        print(file)
-
-    if files_recursive:
-        sys.argv = [""] + cmd_args + files_recursive
-        result = clang_format()
-        if result == 0:
-            print("Clang lint passed")
-
-        sys.exit(result)
-    else:
-        print("No files for Clang to process", file=sys.stderr)
-        sys.exit(0)
-
-
-if __name__ == "__main__":
-    main()

scripts/package.py

@@ -1,109 +0,0 @@
-#!/usr/bin/env python3
-
-# Deskflow -- mouse and keyboard sharing utility
-# Copyright (C) 2024 Symless Ltd.
-#
-# This package is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# found in the file LICENSE that should have accompanied this file.
-#
-# This package is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import lib.env as env
-
-env.ensure_in_venv(__file__)
-
-import argparse
-import platform
-from dotenv import load_dotenv  # type: ignore
-
-ENV_FILE = ".env"
-DEFAULT_PRODUCT_NAME = "Deskflow"
-DEFAULT_FILENAME_BASE = "deskflow"
-DEFAULT_PROJECT_BUILD_DIR = "build"
-DEFAULT_DIST_DIR = "dist"
-DEFAULT_PACKAGE_NAME = "deskflow"
-
-
-def main():
-    parser = argparse.ArgumentParser()
-    parser.add_argument(
-        "--package-version",
-        help="Set the Package Version",
-        required=True)
-    parser.add_argument(
-        "--leave-test-installed",
-        action="store_true",
-        help="Leave test package installed",
-    )
-    args = parser.parse_args()
-
-    load_dotenv(dotenv_path=ENV_FILE)
-
-    package(
-        DEFAULT_FILENAME_BASE,
-        DEFAULT_PROJECT_BUILD_DIR,
-        DEFAULT_DIST_DIR,
-        DEFAULT_PRODUCT_NAME,
-        version=args.package_version,
-    )
-
-def package(
-    filename_prefix,
-    project_build_dir,
-    dist_dir,
-    product_name,
-    version,
-    source_dir=None,
-):
-    filename_base = get_filename_base(version, filename_prefix)
-    print(f"Package filename base: {filename_base}")
-
-    if env.is_windows():
-        windows_package(filename_base, project_build_dir, dist_dir)
-    elif env.is_mac():
-        mac_package(
-            filename_base, source_dir, project_build_dir, dist_dir, product_name
-        )
-    else:
-        raise RuntimeError(f"Unsupported platform: {env.get_os()}")
-
-
-def get_filename_base(version, prefix):
-    os = env.get_os()
-    machine = platform.machine().lower()
-    os_part = os
-
-    if os == "windows":
-        # Some Windows users get confused by 'amd64' and think it's 'arm64',
-        # so we'll use Intel's 'x64' branding (even though it's wrong).
-        # Also replace 'x86_64' with 'x64' for consistency.
-        os_part= "win"
-        if machine == "amd64" or machine == "x86_64":
-            machine = "x64"
-    elif os == "mac":
-            os_part = "macos"
-    # Add '-' between our name parts we do not want spaces in the filename
-    return f"{prefix}-{version}-{os_part}-{machine}"
-
-
-
-def windows_package(filename_base, project_build_dir, dist_dir):
-    import lib.windows as windows
-
-    windows.package(filename_base, project_build_dir, dist_dir)
-
-
-def mac_package(filename_base, source_dir, project_build_dir, dist_dir, product_name):
-    import lib.mac as mac
-
-    mac.package(filename_base, source_dir, project_build_dir, dist_dir, product_name)
-
-if __name__ == "__main__":
-    main()

scripts/pyproject.toml

@@ -1,14 +0,0 @@
-[project]
-name = "scripts"
-version = "0.0.1"
-description = "Scripts to assist with development of Deskflow"
-requires-python = ">=3.9"
-dependencies = [
-  "clang-format",
-  "python-dotenv",
-  "pyyaml",
-  "dmgbuild; sys_platform == 'darwin'",
-  "colorama",
-  "gitpython",
-  "psutil",
-]

scripts/setup_venv.py

@@ -1,25 +0,0 @@
-#!/usr/bin/env python3
-
-# Deskflow -- mouse and keyboard sharing utility
-# Copyright (C) 2024 Symless Ltd.
-#
-# This package is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# found in the file LICENSE that should have accompanied this file.
-#
-# This package is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import lib.env as env
-
-env.ensure_in_venv(__file__, create_venv=True)
-env.install_requirements()
-
-import lib.colors as colors
-
-print(colors.SUCCESS_TEXT, "Python virtual environment is ready.")

sonar-project.properties

@@ -1,9 +1,9 @@
 sonar.organization=deskflow
 sonar.projectKey=deskflow_deskflow
-sonar.sources=scripts,src/cmd,src/gui,src/lib
+sonar.sources=src/apps,src/lib
 sonar.tests=src/test
 sonar.exclusions=subprojects/**,build/**
-sonar.coverage.exclusions=subprojects/**,scripts/**,src/test/**,src/gui/**
+sonar.coverage.exclusions=subprojects/**,src/test/**,src/apps/deskflow-gui/**,src/apps/res/**
 sonar.cpd.exclusions=**/*Test*.cpp
 sonar.host.url=https://sonarcloud.io
 sonar.coverageReportPaths=${{ steps.coverage-paths.outputs.csv }}

src/CMakeLists.txt

@@ -18,12 +18,9 @@ include_directories(./lib)
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/lib)
 
 add_subdirectory(lib)
-add_subdirectory(cmd)
-
-if(BUILD_GUI)
-  add_subdirectory(gui)
-endif(BUILD_GUI)
+add_subdirectory(apps)
 
+option(BUILD_TESTS "Build tests" ON)
 if(BUILD_TESTS)
   add_subdirectory(test)
 endif()

src/apps/CMakeLists.txt

@@ -14,13 +14,18 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-
+option(BUILD_UNIFIED "Build unified binary" OFF)
 if(BUILD_UNIFIED)
   add_subdirectory(deskflow-core)
 else()
-  add_subdirectory(deskflowc)
-  add_subdirectory(deskflows)
+  add_subdirectory(deskflow-client)
+  add_subdirectory(deskflow-server)
 endif(BUILD_UNIFIED)
 
 ## Only used on windows
-add_subdirectory(deskflowd)
+add_subdirectory(deskflow-daemon)
+
+option(BUILD_GUI "Build GUI" ON)
+if(BUILD_GUI)
+  add_subdirectory(deskflow-gui)
+endif(BUILD_GUI)

src/apps/deskflow-client/CMakeLists.txt

@@ -15,21 +15,19 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-set(client_source_name "deskflowc")
-set(target ${CLIENT_BINARY_NAME})
+set(target deskflow-client)
 
 if(WIN32)
   set(PLATFORM_SOURCES
-    ${client_source_name}.exe.manifest
-    ${client_source_name}.ico
-    ${client_source_name}.rc
+    deskflow-client.exe.manifest
+    deskflow-client.rc
     MSWindowsClientTaskBarReceiver.cpp
     MSWindowsClientTaskBarReceiver.h
     resource.h
-    tb_error.ico
-    tb_idle.ico
-    tb_run.ico
-    tb_wait.ico
+    ${PROJECT_SOURCE_DIR}/src/apps/res/deskflow.ico
+    ${PROJECT_SOURCE_DIR}/src/apps/res/tb_error.ico
+    ${PROJECT_SOURCE_DIR}/src/apps/res/tb_idle.ico
+    ${PROJECT_SOURCE_DIR}/src/apps/res/tb_run.ico
     ${PROJECT_BINARY_DIR}/src/version.rc
   )
 elseif(APPLE)
@@ -44,7 +42,7 @@ elseif(UNIX)
   )
 endif()
 
-add_executable(${target} ${PLATFORM_SOURCES} "${client_source_name}.cpp")
+add_executable(${target} ${PLATFORM_SOURCES} deskflow-client.cpp)
 
 target_link_libraries(
   ${target}
@@ -61,9 +59,23 @@ target_link_libraries(
   ${libs})
 
 if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-  install(TARGETS ${target} DESTINATION ${DESKFLOW_BUNDLE_BINARY_DIR})
+  set_target_properties(${target} PROPERTIES RUNTIME_OUTPUT_DIRECTORY $<TARGET_BUNDLE_CONTENT_DIR:Deskflow>/MacOS)
 elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
   install(TARGETS ${target} DESTINATION bin)
+elseif(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+  install(
+    TARGETS ${target}
+    RUNTIME_DEPENDENCY_SET clientDeps
+    DESTINATION .
+  )
+  install(RUNTIME_DEPENDENCY_SET clientDeps
+    PRE_EXCLUDE_REGEXES
+      "api-ms-win-.*"
+      "ext-ms-.*"
+      "^hvsifiletrust\\.dll$"
+    POST_EXCLUDE_REGEXES
+      ".*system32.*"
+    RUNTIME DESTINATION .
+  )
 endif()
 
-post_config()

src/apps/deskflow-client/MSWindowsClientTaskBarReceiver.cpp

@@ -34,8 +34,7 @@
 //
 
 const UINT MSWindowsClientTaskBarReceiver::s_stateToIconID[kMaxState] = {
-    IDI_TASKBAR_NOT_RUNNING, IDI_TASKBAR_NOT_WORKING, IDI_TASKBAR_NOT_CONNECTED, IDI_TASKBAR_NOT_CONNECTED,
-    IDI_TASKBAR_CONNECTED
+    IDI_TASKBAR_NOT_RUNNING, IDI_TASKBAR_NOT_WORKING, IDI_TASKBAR_NOT_CONNECTED, IDI_TASKBAR_CONNECTED
 };
 
 MSWindowsClientTaskBarReceiver::MSWindowsClientTaskBarReceiver(
@@ -203,7 +202,7 @@ void MSWindowsClientTaskBarReceiver::primaryAction()
   showStatus();
 }
 
-const IArchTaskBarReceiver::Icon MSWindowsClientTaskBarReceiver::getIcon() const
+IArchTaskBarReceiver::Icon MSWindowsClientTaskBarReceiver::getIcon() const
 {
   return static_cast<Icon>(m_icon[getStatus()]);
 }

src/apps/deskflow-client/MSWindowsClientTaskBarReceiver.h

@@ -34,10 +34,10 @@ public:
   virtual ~MSWindowsClientTaskBarReceiver();
 
   // IArchTaskBarReceiver overrides
-  virtual void showStatus();
-  virtual void runMenu(int x, int y);
-  virtual void primaryAction();
-  virtual const Icon getIcon() const;
+  void showStatus() override;
+  void runMenu(int x, int y) override;
+  void primaryAction() override;
+  Icon getIcon() const override;
   void cleanup();
 
 protected:

src/apps/deskflow-client/OSXClientTaskBarReceiver.cpp

@@ -50,9 +50,9 @@ void OSXClientTaskBarReceiver::primaryAction()
   // do nothing
 }
 
-const IArchTaskBarReceiver::Icon OSXClientTaskBarReceiver::getIcon() const
+IArchTaskBarReceiver::Icon OSXClientTaskBarReceiver::getIcon() const
 {
-  return NULL;
+  return nullptr;
 }
 
 IArchTaskBarReceiver *createTaskBarReceiver(const BufferedLogOutputter *logBuffer, IEventQueue *events)

src/apps/deskflow-client/OSXClientTaskBarReceiver.h

@@ -31,8 +31,8 @@ public:
   virtual ~OSXClientTaskBarReceiver();
 
   // IArchTaskBarReceiver overrides
-  virtual void showStatus();
-  virtual void runMenu(int x, int y);
-  virtual void primaryAction();
-  virtual const Icon getIcon() const;
+  void showStatus() override;
+  void runMenu(int x, int y) override;
+  void primaryAction() override;
+  Icon getIcon() const override;
 };

src/apps/deskflow-client/XWindowsClientTaskBarReceiver.cpp

@@ -50,9 +50,9 @@ void CXWindowsClientTaskBarReceiver::primaryAction()
   // do nothing
 }
 
-const IArchTaskBarReceiver::Icon CXWindowsClientTaskBarReceiver::getIcon() const
+IArchTaskBarReceiver::Icon CXWindowsClientTaskBarReceiver::getIcon() const
 {
-  return NULL;
+  return nullptr;
 }
 
 IArchTaskBarReceiver *createTaskBarReceiver(const BufferedLogOutputter *logBuffer, IEventQueue *events)

src/apps/deskflow-client/XWindowsClientTaskBarReceiver.h

@@ -36,8 +36,8 @@ public:
   CXWindowsClientTaskBarReceiver &operator=(CXWindowsClientTaskBarReceiver &&) = delete;
 
   // IArchTaskBarReceiver overrides
-  virtual void showStatus();
-  virtual void runMenu(int x, int y);
-  virtual void primaryAction();
-  virtual const Icon getIcon() const;
+  void showStatus() override;
+  void runMenu(int x, int y) override;
+  void primaryAction() override;
+  Icon getIcon() const override;
 };

src/apps/deskflow-client/deskflow-client.rc

@@ -57,11 +57,11 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDI_DESKFLOW             ICON    DISCARDABLE     "deskflowc.ico"
-IDI_TASKBAR_NOT_RUNNING ICON    DISCARDABLE     "tb_idle.ico"
-IDI_TASKBAR_NOT_WORKING ICON    DISCARDABLE     "tb_error.ico"
-IDI_TASKBAR_NOT_CONNECTED ICON    DISCARDABLE     "tb_wait.ico"
-IDI_TASKBAR_CONNECTED   ICON    DISCARDABLE     "tb_run.ico"
+IDI_DESKFLOW             ICON    DISCARDABLE     "../res/deskflow.ico"
+IDI_TASKBAR_NOT_RUNNING ICON    DISCARDABLE     "../res/tb_idle.ico"
+IDI_TASKBAR_NOT_WORKING ICON    DISCARDABLE     "../res/tb_error.ico"
+IDI_TASKBAR_NOT_CONNECTED ICON    DISCARDABLE     "../res/deskflow.ico"
+IDI_TASKBAR_CONNECTED   ICON    DISCARDABLE     "../res/tb_run.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //

src/apps/deskflow-core/CMakeLists.txt

@@ -15,7 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-set(target ${CORE_BINARY_NAME})
+set(target deskflow-core)
 
 add_executable(${target} "${target}.cpp")
 if(WIN32)
@@ -40,7 +40,22 @@ target_link_libraries(
   ${libs})
 
 if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-  install(TARGETS ${target} DESTINATION ${DESKFLOW_BUNDLE_BINARY_DIR})
+  set_target_properties(${target} PROPERTIES RUNTIME_OUTPUT_DIRECTORY $<TARGET_BUNDLE_CONTENT_DIR:Deskflow>/MacOS)
 elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
   install(TARGETS ${target} DESTINATION bin)
+elseif(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+  install(
+    TARGETS ${target}
+    RUNTIME_DEPENDENCY_SET coreDeps
+    DESTINATION .
+  )
+  install(RUNTIME_DEPENDENCY_SET coreDeps
+    PRE_EXCLUDE_REGEXES
+      "api-ms-win-.*"
+      "ext-ms-.*"
+      "^hvsifiletrust\\.dll$"
+    POST_EXCLUDE_REGEXES
+      ".*system32.*"
+    RUNTIME DESTINATION .
+  )
 endif()

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

@@ -29,9 +29,9 @@
 void showHelp()
 {
   std::cout << "Usage: " CORE_BINARY_NAME " <server | client> [...options]" << std::endl;
-  std::cout << "server - start as a server (" << SERVER_BINARY_NAME << ")" << std::endl;
-  std::cout << "client - start as a client (" << CLIENT_BINARY_NAME << ")" << std::endl;
-  std::cout << "use " CORE_BINARY_NAME " <server|client> --help for more information." << std::endl;
+  std::cout << "server - start as a server ( deskflow-server)" << std::endl;
+  std::cout << "client - start as a client ( deslflow-client)" << std::endl;
+  std::cout << "use deskflow-core <server|client> --help for more information." << std::endl;
 }
 
 bool isServer(int argc, char **argv)

src/apps/deskflow-daemon/CMakeLists.txt

@@ -17,9 +17,9 @@
 
 # Daemon is only needed on Windows for elevating processes to deal with UAC.
 if(WIN32)
-  set(target ${DAEMON_BINARY_NAME})
+  set(target deskflow-daemon)
   add_executable(${target} WIN32
-    deskflowd.cpp
+    deskflow-daemon.cpp
     "${PROJECT_BINARY_DIR}/src/version.rc"
   )
 
@@ -35,6 +35,18 @@ if(WIN32)
     app
     ${libs})
 
-  post_config()
-
+  install(
+    TARGETS ${target}
+    RUNTIME_DEPENDENCY_SET deamonDeps
+    DESTINATION .
+  )
+  install(RUNTIME_DEPENDENCY_SET daemonDeps
+    PRE_EXCLUDE_REGEXES
+      "api-ms-win-.*"
+      "ext-ms-.*"
+      "^hvsifiletrust\\.dll$"
+    POST_EXCLUDE_REGEXES
+      ".*system32.*"
+    RUNTIME DESTINATION .
+  )
 endif()

src/apps/deskflow-gui/Action.cpp

@@ -29,18 +29,6 @@ const char *Action::m_ActionTypeNames[] = {
 const char *Action::m_SwitchDirectionNames[] = {"left", "right", "up", "down"};
 const char *Action::m_LockCursorModeNames[] = {"toggle", "on", "off"};
 
-Action::Action()
-    : m_KeySequence(),
-      m_Type(keystroke),
-      m_TypeScreenNames(),
-      m_SwitchScreenName(),
-      m_SwitchDirection(switchLeft),
-      m_LockCursorMode(lockCursorToggle),
-      m_ActiveOnRelease(false),
-      m_HasScreens(false)
-{
-}
-
 QString Action::text() const
 {
   QString text = QString(m_ActionTypeNames[keySequence().isMouseButton() ? type() + 6 : type()]) + "(";

src/apps/deskflow-gui/Action.h

@@ -62,7 +62,7 @@ public:
   };
 
 public:
-  Action();
+  Action() = default;
 
 public:
   QString text() const;
@@ -151,13 +151,13 @@ protected:
 
 private:
   KeySequence m_KeySequence;
-  int m_Type;
-  QStringList m_TypeScreenNames;
-  QString m_SwitchScreenName;
-  int m_SwitchDirection;
-  int m_LockCursorMode;
-  bool m_ActiveOnRelease;
-  bool m_HasScreens;
+  int m_Type = keystroke;
+  QStringList m_TypeScreenNames = QStringList();
+  QString m_SwitchScreenName = QString();
+  int m_SwitchDirection = switchLeft;
+  int m_LockCursorMode = lockCursorToggle;
+  bool m_ActiveOnRelease = false;
+  bool m_HasScreens = false;
   bool m_restartServer;
 
   static const char *m_ActionTypeNames[];
@@ -165,6 +165,6 @@ private:
   static const char *m_LockCursorModeNames[];
 };
 
-typedef QList<Action> ActionList;
+using ActionList = QList<Action>;
 
 QTextStream &operator<<(QTextStream &outStream, const Action &action);

src/apps/deskflow-gui/AppDelegate.mm

@@ -0,0 +1,38 @@
+#import "AppDelegate.h"
+
+@interface AppDelegate ()
+
+@property(strong) IBOutlet NSWindow *window;
+@end
+
+@implementation AppDelegate {
+}
+
+- (void)applicationDidFinishLaunching:(NSNotification *)aNotification
+{
+  [[NSUserNotificationCenter defaultUserNotificationCenter] setDelegate:self];
+#if OSX_DEPLOYMENT_TARGET >= 1014
+  [[UNUserNotificationCenter currentNotificationCenter] setDelegate:self];
+#endif
+}
+
+- (BOOL)userNotificationCenter:(NSUserNotificationCenter *)center
+     shouldPresentNotification:(NSUserNotification *)notification
+{
+  return YES;
+}
+
+#if OSX_DEPLOYMENT_TARGET >= 1014
+- (void)userNotificationCenter:(UNUserNotificationCenter *)center
+       willPresentNotification:(UNNotification *)notification
+         withCompletionHandler:(void (^)(UNNotificationPresentationOptions options))completionHandler
+{
+  UNNotificationPresentationOptions presentationOptions = UNNotificationPresentationOptionSound |
+                                                          UNNotificationPresentationOptionAlert |
+                                                          UNNotificationPresentationOptionBadge;
+
+  completionHandler(presentationOptions);
+}
+#endif
+
+@end

src/apps/deskflow-gui/CMakeLists.txt

@@ -0,0 +1,110 @@
+# Deskflow -- mouse and keyboard sharing utility
+# Copyright (C) 2024 Symless Ltd.
+#
+# This package is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# found in the file LICENSE that should have accompanied this file.
+#
+# This package is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+if(APPLE)
+  set(target Deskflow)
+else()
+  set(target deskflow)
+endif()
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+file(
+  GLOB
+  sources
+  ../res/deskflow.qrc
+  *.cpp
+  *.h
+  dialogs/*.h
+  dialogs/*.cpp
+  validators/*
+  widgets/*)
+file(GLOB ui_files *.ui dialogs/*.ui)
+
+if(WIN32)
+  set(platform_extra deskflow.rc ${PROJECT_BINARY_DIR}/src/version.rc)
+elseif(APPLE)
+  set(platform_extra Deskflow.icns ${PROJECT_SOURCE_DIR}/LICENSE ${PROJECT_SOURCE_DIR}/LICENSE_EXCEPTION)
+  set_source_files_properties(${platform_extra} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
+endif()
+
+# gui library autogen headers:
+# qt doesn't seem to auto include the autogen headers for libraries.
+include_directories(${PROJECT_BINARY_DIR}/src/lib/gui/gui_autogen/include)
+
+# generated includes
+include_directories(${PROJECT_BINARY_DIR}/config)
+
+add_executable(${target} WIN32 MACOSX_BUNDLE ${sources} ${ui_files} ${platform_extra})
+
+target_link_libraries(
+  ${target}
+  ${DESKFLOW_GUI_HOOK_LIB}
+  gui
+  Qt6::Core
+  Qt6::Widgets
+  Qt6::Network)
+
+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 .
+  )
+  find_program(DEPLOYQT windeployqt6)
+  add_custom_command(
+    TARGET ${target} POST_BUILD
+      COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_BINARY_DIR}/qtDeploy
+      COMMAND ${DEPLOYQT} --no-compiler-runtime --no-system-d3d-compiler --no-quick-import -network --dir ${CMAKE_BINARY_DIR}/qtDeploy $<TARGET_FILE:${target}>
+  )
+  install(
+    DIRECTORY ${CMAKE_BINARY_DIR}/qtDeploy/
+    DESTINATION .
+    FILES_MATCHING PATTERN "*.*"
+  )
+elseif(APPLE)
+  set_target_properties(${target} PROPERTIES
+    MACOSX_BUNDLE_BUNDLE_NAME "Deskflow"
+    MACOSX_BUNDLE_DISPLAY_NAME "Deskflow"
+    MACOSX_BUNDLE_GUI_IDENTIFIER "org.deskflow.deskflow"
+    MACOSX_BUNDLE_ICON_FILE Deskflow.icns
+    MACOSX_BUNDLE_INFO_STRING "${CMAKE_PROJECT_DESCRIPTION}"
+    MACOSX_BUNDLE_COPYRIGHT "© 2024 Deskflow Developers"
+    MACOSX_BUNDLE_BUNDLE_VERSION ${CMAKE_PROJECT_VERSION}
+    MACOSX_BUNDLE_LONG_VERSION_STRING ${CMAKE_PROJECT_VERSION}
+    MACOSX_BUNDLE_SHORT_VERSION_STRING ${CMAKE_PROJECT_VERSION}
+  )
+  find_program(MACDEPLOYQT_BIN macdeployqt6)
+  add_custom_command(
+    TARGET ${target} POST_BUILD
+    COMMAND ${MACDEPLOYQT_BIN} "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${target}.app"
+  )
+  install(TARGETS ${target} BUNDLE DESTINATION .)
+else()
+  install(TARGETS ${target} DESTINATION bin)
+endif()