Release 1.21.2

move no-reset to the QCommandLineProcessor

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,6 +1,6 @@
 name: Bug report
 description: If you find a bug in Deskflow, please let us know so we can fix it.
-labels: ["bug", "triage", "unanswered"]
+type: "Triage [bug]"
 body:
   - type: markdown
     attributes:
@@ -22,12 +22,16 @@ body:
     validations:
       required: true
 
-  - type: input
+  - type: textarea
     id: version
     attributes:
-      label: Deskflow version number
-      description: You can find the Deskflow version number on the about screen.
-      placeholder: 1.2.3.4
+      label: Deskflow version info
+      description: You can find the Deskflow version number on the About screen.
+      placeholder: |
+        Deskflow: 1.2.3.4 (deadc0de)
+        Qt: 3.2.1
+        System: Hannah Montana Linux (Workstation Edition)
+        Session: Unity (Compiz)
     validations:
       required: true
 
@@ -51,7 +55,7 @@ body:
     id: os
     attributes:
       label: Operating systems (OS)
-      description: Which operating systems (OS) are you using?
+      description: Operating systems (OS) in use for all servers and clients
       options:
         - label: Windows
         - label: macOS
@@ -110,8 +114,7 @@ body:
       label: Deskflow configuration
       description: |
         Please provide a very brief description of your configuration.
-        Let us know the OS of the server/host/primary and the OS of the client/guest/secondary.
-        This will help us understand how you're using Deskflow.
+        Let us know what OS your server and client are running.
       placeholder: |
         - Windows 11 server, macOS 15 client
         - Each computer has a single monitor
@@ -122,9 +125,8 @@ body:
     attributes:
       label: What steps will reproduce the problem?
       description: |
-        Please list the steps to reproduce the issue.
+        Please list the _numbered steps_ to reproduce the issue.
         If you're not sure, please provide as much detail as possible.
-        This will help us understand the problem.
       placeholder: |
         1. Start Deskflow
         2. Click 'Configure Server'

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,6 +1,6 @@
 name: Feature request
 description: Had an idea how to improve Deskflow? Share it with us.
-labels: ["enhancement", "triage", "unanswered"]
+type: "Triage [feature]"
 body:
   - type: markdown
     attributes:

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

@@ -9,8 +9,12 @@ inputs:
     description: "Used only on linux distro type: debian, fedora, suse, arch"
     required: false
 
-  mac-qt-version:
-    description: "The verison of Qt to install on mac os"
+  qt-version:
+    description: "The version of Qt to install (Windows & macOS)"
+    required: false
+
+  qt-install-dir:
+    description: "The path to install Qt into (Windows & macOS)"
     required: false
 
 outputs:
@@ -33,31 +37,28 @@ runs:
               apt update -qqq > /dev/null
               apt install -qqq cmake build-essential ninja-build \
                 xorg-dev libx11-dev libxtst-dev libssl-dev \
-                libglib2.0-dev libgdk-pixbuf-2.0-dev libnotify-dev \
-                libxkbfile-dev qt6-base-dev qt6-tools-dev \
-                libgtk-3-dev libgtest-dev libgmock-dev libpugixml-dev \
-                libei-dev libportal-dev libtomlplusplus-dev libcli11-dev -y >/dev/null
+                libglib2.0-dev libxkbfile-dev qt6-base-dev qt6-tools-dev \
+                libgtk-3-dev libgtest-dev libgmock-dev \
+                libei-dev libportal-dev libtomlplusplus-dev libcli11-dev \
+                help2man -y >/dev/null
             elif [ ${{inputs.like}} == "fedora" ]; then
               dnf install -y cmake make ninja-build gcc-c++ \
                 rpm-build openssl-devel glib2-devel \
-                gdk-pixbuf2-devel libXtst-devel libnotify-devel \
-                libxkbfile-devel qt6-qtbase-devel qt6-qttools-devel \
-                gtk3-devel gtest-devel gmock-devel pugixml-devel \
+                libXtst-devel libxkbfile-devel qt6-qtbase-devel qt6-qttools-devel \
+                gtk3-devel gtest-devel gmock-devel \
                 libei-devel libportal-devel tomlplusplus-devel \
-                cli11-devel
+                cli11-devel help2man
             elif [ ${{inputs.like}} == "suse" ]; then
               zypper refresh
               zypper install -y --force-resolution \
                 cmake make ninja gcc-c++ rpm-build libopenssl-devel \
-                glib2-devel gdk-pixbuf-devel libXtst-devel libnotify-devel \
-                libxkbfile-devel qt6-base-devel qt6-tools-devel gtk3-devel \
-                googletest-devel googlemock-devel pugixml-devel libei-devel \
-                libportal-devel tomlplusplus-devel cli11-devel
+                glib2-devel libXtst-devel libxkbfile-devel qt6-base-devel qt6-tools-devel gtk3-devel \
+                googletest-devel googlemock-devel libei-devel \
+                libportal-devel tomlplusplus-devel cli11-devel help2man
             elif [ ${{ inputs.like }} == "arch" ]; then
               pacman -Syu --noconfirm base-devel cmake ninja \
-                gcc openssl glib2 gdk-pixbuf2 libxtst libnotify \
-                libxkbfile gtest pugixml libei libportal \
-                qt6-base qt6-tools gtk3 tomlplusplus cli11
+                gcc openssl glib2 libxtst libxkbfile gtest libei libportal \
+                qt6-base qt6-tools gtk3 tomlplusplus cli11 help2man
             else
               echo "Unknown like"
             fi
@@ -67,13 +68,13 @@ runs:
       shell: bash
 
     - name: Install Qt
-      if: ${{runner.os == 'macOS' }}
+      if: ${{runner.os != 'Linux' }}
       uses: jurplel/install-qt-action@v4
       with:
-        dir: "/Users/runner"
-        version: ${{inputs.mac-qt-version}}
+        dir: ${{inputs.qt-install-dir}}
+        version: ${{inputs.qt-version}}
         cache: true
-        cache-key-prefix: ${{matrix.target.os}}-${{env.qt-version}}
+        cache-key-prefix: ${{matrix.target.os}}-${{inputs.qt-version}}
 
     # Install Ninja with an action instead of using Chocolatey, as it's more
     # reliable and faster. The Ninja install action is pretty good as it
@@ -87,7 +88,8 @@ runs:
       id: vcpkg
       uses: johnwason/vcpkg-action@v6
       with:
-        manifest-dir: ${{ github.workspace }}
+        pkgs: gtest openssl
+        extra-args: --classic
         triplet: x64-windows-release
         token: ${{ github.token }}
         github-binarycache: true

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

@@ -5,7 +5,7 @@ runs:
   using: "composite"
   steps:
     - name: Install Dependencies
-      run: pipx install --global clang_format
+      run: pipx install --global clang-format==20.1.0
       shell: bash
 
     - name: Run format command

.github/workflows/codeql-analysis.yml

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

.github/workflows/continuous-integration.yml

@@ -131,19 +131,22 @@ jobs:
         target:
           - name: "windows-2022-x64"
             runs-on: "windows-2022"
-            timeout: 120 #Windows can take while if it has to build vcpkg cache
+            timeout: 30
             config-args: "-G Ninja"
+            qt-install-dir: "C:"
 
           - name: "macos-14-arm64"
             runs-on: "macos-14"
             timeout: 10
             arch: arm64
             config-args: "-DCMAKE_OSX_ARCHITECTURES=\"arm64\""
+            qt-install-dir: "/Users/runner"
 
           - name: "macos-13-x64"
             runs-on: macos-13
             timeout: 20
             config-args: "-DCMAKE_OSX_ARCHITECTURES=\"x86_64\""
+            qt-install-dir: "/Users/runner"
 
           - name: "debian-13-x86_64"
             runs-on: ubuntu-latest
@@ -243,7 +246,7 @@ jobs:
       # Fancy checkout gets all the tags
       # it also makes sure we can use git --describe correctly
       - name: Fancy Checkout
-        uses: sithlord48/fancy-checkout@v1.0.0
+        uses: sithlord48/fancy-checkout@v1
 
       # This effectively runs `vcvarsall.bat`, etc. It's not actually installing
       # VC++ as that's already pre-installed on the Windows runner.
@@ -255,7 +258,8 @@ jobs:
         id: get-deps
         uses: ./.github/actions/install-dependencies
         with:
-          mac-qt-version: 6.7.3
+          qt-version: 6.9.0
+          qt-install-dir: ${{matrix.target.qt-install-dir}}
           like: ${{ matrix.target.like }}
 
       - name: Get version
@@ -311,18 +315,18 @@ jobs:
       # Fancy checkout gets all the tags
       # it also makes sure we can use git --describe correctly
       - name: Fancy Checkout
-        uses: sithlord48/fancy-checkout@v1.0.0
-
+        uses: sithlord48/fancy-checkout@v1
       - name: Build on FreeBSD
         if: ${{ matrix.distro.name == 'freebsd' }}
         uses: vmactions/freebsd-vm@v1
         with:
           usesh: true
           run: |
-            ./scripts/install_deps.sh
+            pkg install -y cmake ninja gmake gcc12 openssl glib \
+            libX11 libXtst libxkbfile qt6-base qt6-tools gtk3 googletest \
+            tomlplusplus cli11 pkgconf libei libportal
             ${{env.CMAKE_CONFIGURE}} -G Ninja
             cmake --build build -j16
-            
             # Integration tests are flakey by nature, make them optional.
             export QT_QPA_PLATFORM=offscreen
             ./build/bin/unittests
@@ -331,36 +335,45 @@ jobs:
     needs: lint-check
     name: flatpak-${{matrix.flatpak.arch}}
     runs-on: ${{matrix.flatpak.runs-on}}
+    timeout-minutes: 60
+    container:
+      image: ghcr.io/flathub-infra/flatpak-github-actions:kde-6.8
+      options: --privileged
     strategy:
       fail-fast: false
       matrix:
         flatpak:
           - runs-on: ubuntu-latest
             arch: x86_64
-# TODO: Action does not yet provide arm image; re-enable when available
-#          - runs-on: ubuntu-24.04-arm
-#            arch: aarch64
-    container:
-      image: bilelmoussaoui/flatpak-github-actions:kde-6.7
-      options: --privileged
+          - runs-on: ubuntu-24.04-arm
+            arch: aarch64
     steps:
       - name: Check out repository
-        uses: sithlord48/fancy-checkout@v1.0.0
+        uses: sithlord48/fancy-checkout@v1
 
       - 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"
+      - name: Lint appsteam
+        run: flatpak-builder-lint appstream deploy/linux/org.deskflow.deskflow.metainfo.xml
+
+      - name: Lint manifest
+        run: flatpak-builder-lint manifest deploy/linux/flatpak/org.deskflow.deskflow.yml
+
+      - name: Build
+        uses: flathub-infra/flatpak-github-actions/flatpak-builder@53987ffa5f687586936d85fdce3f440848bea04d
         with:
           bundle: deskflow-${{env.DESKFLOW_PACKAGE_VERSION}}-linux-${{matrix.flatpak.arch}}.flatpak
           manifest-path: deploy/linux/flatpak/org.deskflow.deskflow.yml
-          cache-key: flatpak-builder-${{matrix.flatpak.arch}}-1.0
+          cache-key: flatpak-builder-${{matrix.flatpak.arch}}-2.0
           arch: ${{matrix.flatpak.arch}}
           upload-artifact: false
 
+      - name: Validate build
+        run: flatpak-builder-lint --exceptions --user-exceptions deploy/linux/flatpak/ci-build-lint-exceptions.json repo repo
+
       - name: Upload
         uses: actions/upload-artifact@v4
         with:
@@ -374,7 +387,7 @@ jobs:
 
     steps:
       - name: Fancy Checkout
-        uses: sithlord48/fancy-checkout@v1.0.0
+        uses: sithlord48/fancy-checkout@v1
 
       - name: Get version
         uses: ./.github/actions/get-version
@@ -419,7 +432,7 @@ jobs:
     runs-on: windows-latest
     steps:
       - name: Fancy Checkout
-        uses: sithlord48/fancy-checkout@v1.0.0
+        uses: sithlord48/fancy-checkout@v1
 
       - name: Get version
         uses: ./.github/actions/get-version

.github/workflows/sonarcloud-analysis.yml

@@ -28,7 +28,7 @@ jobs:
           apt install -qqq git curl unzip gcovr > /dev/null
 
       - name: Fancy Checkout
-        uses: sithlord48/fancy-checkout@v1.0.0
+        uses: sithlord48/fancy-checkout@v1
 
       - name: Install project dependencies
         uses: ./.github/actions/install-dependencies

.github/workflows/valgrind-analysis.yml

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

CMakeLists.txt

@@ -18,8 +18,8 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 # Fallback for when git can not be found
 set(DESKFLOW_VERSION_MAJOR 1)
-set(DESKFLOW_VERSION_MINOR 19)
-set(DESKFLOW_VERSION_PATCH 0)
+set(DESKFLOW_VERSION_MINOR 21)
+set(DESKFLOW_VERSION_PATCH 2)
 set(DESKFLOW_VERSION_TWEAK 0)
 
 # Get the version from git if it's a git repository
@@ -72,7 +72,7 @@ endif()
 project(
   deskflow
   VERSION "${DESKFLOW_VERSION_MAJOR}.${DESKFLOW_VERSION_MINOR}.${DESKFLOW_VERSION_PATCH}.${DESKFLOW_VERSION_TWEAK}"
-  DESCRIPTION "Mouse and keyboard sharing utility"
+  DESCRIPTION "Keyboard and mouse sharing utility"
   LANGUAGES C CXX)
 
 # Define Additional "PROJECT" vars for packaging and metadata
@@ -95,6 +95,22 @@ set(REQUIRED_LIBEI_VERSION 1.3)
 set(REQUIRED_LIBPORTAL_VERSION 0.8)
 set(REQUIRED_QT_VERSION 6.7.0)
 
+if (MSVC)
+  # On Windows, require that the same MSVC runtime is used as on the host.
+  # Mitigates things like access violations caused by accidental ABI-compatibility breakage.
+  set(REQUIRED_MSVC_RUNTIME_MAJOR 14)
+  cmake_host_system_information(
+    RESULT REQUIRED_MSVC_RUNTIME_MINOR
+    QUERY WINDOWS_REGISTRY
+    "HKLM/SOFTWARE/Microsoft/VisualStudio/${REQUIRED_MSVC_RUNTIME_MAJOR}.0/VC/Runtimes/x64"
+    VALUE "Minor")
+  if (REQUIRED_MSVC_RUNTIME_MINOR)
+    message(STATUS "MSVC runtime: ${REQUIRED_MSVC_RUNTIME_MAJOR}.${REQUIRED_MSVC_RUNTIME_MINOR}")
+  else()
+    message(FATAL_ERROR "MSVC runtime registry entry not found")
+  endif()
+endif()
+
 # Control debug item visibility
 # When not set logging is forced to DEBUG and show code locations
 # Also exposes a test menu

LICENSES/LicenseRef-Microsoft-vc-redist.txt

@@ -1,61 +0,0 @@
-MICROSOFT SOFTWARE LICENSE TERMS
-
-MICROSOFT VISUAL C++ 2015 - 2022 RUNTIME
-
-These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. They apply to the software named above. The terms also apply to any Microsoft services or updates for the software, except to the extent those have different terms.
-
-IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE RIGHTS BELOW.
-
-1. INSTALLATION AND USE RIGHTS.
-
-You may install and use any number of copies of the software.
-
-2. TERMS FOR SPECIFIC COMPONENTS.
-
-a. Microsoft Platforms. The software may include components from Microsoft Windows; Microsoft Windows Server; Microsoft SQL Server; Microsoft Exchange; Microsoft Office; and Microsoft SharePoint. These components are governed by separate agreements and their own product support policies, as described in the Microsoft “Licenses” folder accompanying the software, except that, if license terms for those components are also included in the associated installation directory, those license terms control.
-
-b. Third Party Components. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the notices file(s) accompanying the software.
-
-3. SCOPE OF LICENSE. The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not
-
-· work around any technical limitations in the software;
-
-· reverse engineer, decompile or disassemble the software, or otherwise attempt to derive the source code for the software except, and only to the extent required by third party licensing terms governing the use of certain open source components that may be included in the software;
-
-· remove, minimize, block or modify any notices of Microsoft or its suppliers in the software;
-
-· use the software in any way that is against the law;
-
-· share, publish, rent or lease the software; or
-
-· provide the software as a stand-alone offering or combined with any of your applications for others to use, or transfer the software or this agreement to any third party.
-
-4. EXPORT RESTRICTIONS. You must comply with all domestic and international export laws and regulations that apply to the software, which include restrictions on destinations, end users, and end use. For further information on export restrictions, visit www.microsoft.com/exporting.
-
-5. SUPPORT SERVICES. Because this software is “as is,” we may not provide support services for it.
-
-6. ENTIRE AGREEMENT. This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.
-
-7. APPLICABLE LAW. If you acquired the software in the United States, Washington law applies to interpretation of and claims for breach of this agreement, and the laws of the state where you live apply to all other claims. If you acquired the software in any other country, its laws apply.
-
-8. CONSUMER RIGHTS; REGIONAL VARIATIONS. This agreement describes certain legal rights. You may have other rights, including consumer rights, under the laws of your state or country. Separate and apart from your relationship with Microsoft, you may also have rights with respect to the party from which you acquired the software. This agreement does not change those other rights if the laws of your state or country do not permit it to do so. For example, if you acquired the software in one of the below regions, or mandatory country law applies, then the following provisions apply to you:
-
-a. Australia. You have statutory guarantees under the Australian Consumer Law and nothing in this agreement is intended to affect those rights.
-
-b. Canada. If you acquired this software in Canada, you may stop receiving updates by turning off the automatic update feature, disconnecting your device from the Internet (if and when you re-connect to the Internet, however, the software will resume checking for and installing updates), or uninstalling the software. The product documentation, if any, may also specify how to turn off updates for your specific device or software.
-
-c. Germany and Austria.
-
-(i) Warranty. The properly licensed software will perform substantially as described in any Microsoft materials that accompany the software. However, Microsoft gives no contractual guarantee in relation to the licensed software.
-
-(ii) Limitation of Liability. In case of intentional conduct, gross negligence, claims based on the Product Liability Act, as well as, in case of death or personal or physical injury, Microsoft is liable according to the statutory law.
-
-Subject to the foregoing clause (ii), Microsoft will only be liable for slight negligence if Microsoft is in breach of such material contractual obligations, the fulfillment of which facilitate the due performance of this agreement, the breach of which would endanger the purpose of this agreement and the compliance with which a party may constantly trust in (so-called "cardinal obligations"). In other cases of slight negligence, Microsoft will not be liable for slight negligence.
-
-9. DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED “AS-IS.” YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-
-10. LIMITATION ON AND EXCLUSION OF DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.
-
-This limitation applies to (a) anything related to the software, services, content (including code) on third party Internet sites, or third party applications; and (b) claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.
-
-It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.

README.md

@@ -64,7 +64,12 @@ 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.
+> [!NOTE]
+> On Windows, you will need to install the 
+> [Microsoft Visual C++ Redistributable](https://learn.microsoft.com/en-us/cpp/windows/latest-supported-vc-redist?view=msvc-170#latest-microsoft-visual-c-redistributable-version).  
+> Download latest: [`vc_redist.x64.exe`](https://aka.ms/vs/17/release/vc_redist.x64.exe)
+
+Windows 10 or higher is required. 
 
 macOS 12 or higher is required.
 
@@ -167,6 +172,8 @@ who is the author of `libei`, a major contributor to `libportal`, and the author
 implementation in Deskflow. Others such as Olivier Fourdan and Povilas Kanapickas helped with the
 Wayland implementation.
 
+Some features _may_ be unavailable or broken on Wayland. Please see the [known Wayland issues](https://github.com/deskflow/deskflow/discussions/7499).
+
 ### Where did it all start?
 
 Deskflow was first created as Synergy in 2001 by Chris Schoeneman.

REUSE.toml

@@ -48,6 +48,12 @@ precedence = "override"
 SPDX-FileCopyrightText = "Deskflow Developers"
 SPDX-License-Identifier = "MIT"
 
+[[annotations]]
+path = "SECURITY.md"
+precedence = "override"
+SPDX-FileCopyrightText = "Deskflow Developers"
+SPDX-License-Identifier = "MIT"
+
 [[annotations]]
 path = "sonar-project.properties"
 precedence = "override"
@@ -91,7 +97,7 @@ SPDX-FileCopyrightText = "Deskflow Developers"
 SPDX-License-Identifier = "GPL-2.0-only"
 
 [[annotations]]
-path = "deploy/linux/flatpak/org.deskflow.deskflow.yml"
+path = "deploy/linux/flatpak/**"
 precedence = "override"
 SPDX-FileCopyrightText = "Deskflow Developers"
 SPDX-License-Identifier = "MIT"
@@ -121,12 +127,6 @@ precedence = "override"
 SPDX-FileCopyrightText = "Deskflow Developers"
 SPDX-License-Identifier = "MIT"
 
-[[annotations]]
-path = "deploy/windows/Microsoft_VC142_CRT_x64.msm"
-precedence = "override"
-SPDX-FileCopyrightText = "Microsoft"
-SPDX-License-Identifier = "LicenseRef-Microsoft-vc-redist"
-
 [[annotations]]
 path = "src/apps/deskflow-client/deskflow-client.exe.manifest"
 precedence = "override"
@@ -145,6 +145,12 @@ precedence = "override"
 SPDX-FileCopyrightText = "Deskflow Developers"
 SPDX-License-Identifier = "MIT"
 
+[[annotations]]
+path = "src/apps/res/manpage.txt"
+precedence = "override"
+SPDX-FileCopyrightText = "Deskflow Developers"
+SPDX-License-Identifier = "MIT"
+
 [[annotations]]
 path = "src/apps/res/icons/deskflow-**/**/**/**.svg"
 precedence = "override"
@@ -194,13 +200,13 @@ SPDX-FileCopyrightText = "Chris Rizzitello <sithlord48@gmail.com>"
 SPDX-License-Identifier = "LGPL-2.1-only"
 
 [[annotations]]
-path = "src/apps/deskflow-gui/MainWindow.ui"
+path = "src/lib/gui/MainWindow.ui"
 precedence = "override"
 SPDX-FileCopyrightText = "Deskflow Developers"
 SPDX-License-Identifier = "GPL-2.0-only WITH LicenseRef-OpenSSL-Exception"
 
 [[annotations]]
-path = "src/apps/deskflow-gui/dialogs/*.ui"
+path = "src/lib/gui/dialogs/*.ui"
 precedence = "override"
 SPDX-FileCopyrightText = "Deskflow Developers"
 SPDX-License-Identifier = "GPL-2.0-only WITH LicenseRef-OpenSSL-Exception"

SECURITY.md

@@ -0,0 +1,11 @@
+# Security Policy
+
+## Supported Versions
+
+The latest minor release is supported and receives security updates:
+https://github.com/deskflow/deskflow/releases
+
+## Reporting a Vulnerability
+
+Please report vulnerabilities on our issue tracker as bugs:
+https://github.com/deskflow/deskflow/issues

cmake/Libraries.cmake

@@ -8,10 +8,9 @@ macro(configure_libs)
   if(UNIX)
     configure_unix_libs()
   elseif(WIN32)
-    find_package(Python REQUIRED QUIET)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /D _BIND_TO_CURRENT_VCLIBS_VERSION=1")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
     set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MD /O2 /Ob2")
-    list(APPEND libs Wtsapi32 Userenv Wininet comsuppw Shlwapi)
+    list(APPEND libs Wtsapi32 Userenv Wininet comsuppw Shlwapi version)
     add_definitions(
       /DWIN32
       /D_WINDOWS
@@ -21,6 +20,9 @@ macro(configure_libs)
   endif()
 
   find_package(Qt6 ${REQUIRED_QT_VERSION} REQUIRED COMPONENTS Core Widgets Network)
+  if(UNIX AND NOT APPLE)
+      find_package(Qt6 ${REQUIRED_QT_VERSION} REQUIRED COMPONENTS DBus Xml)
+  endif()
 
   # Define the location of Qt deployment tool
   if(WIN32)
@@ -33,33 +35,12 @@ macro(configure_libs)
       find_program(DEPLOYQT macdeployqt)
   endif()
 
+  set(CMAKE_AUTOMOC ON)
+  set(CMAKE_AUTOUIC ON)
+  set(CMAKE_AUTORCC ON)
+
   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")
@@ -108,20 +89,11 @@ macro(configure_unix_libs)
   include(CheckSymbolExists)
   include(CheckCSourceCompiles)
 
-  check_include_file_cxx(istream HAVE_ISTREAM)
-  check_include_file_cxx(ostream HAVE_OSTREAM)
-  check_include_file_cxx(sstream HAVE_SSTREAM)
-
-  check_include_files(locale.h HAVE_LOCALE_H)
   check_include_files(sys/select.h HAVE_SYS_SELECT_H)
   check_include_files(sys/socket.h HAVE_SYS_SOCKET_H)
   check_include_files(sys/time.h HAVE_SYS_TIME_H)
-  check_include_files(sys/utsname.h HAVE_SYS_UTSNAME_H)
   check_include_files(unistd.h HAVE_UNISTD_H)
-  check_include_files(wchar.h HAVE_WCHAR_H)
 
-  check_function_exists(getpwuid_r HAVE_GETPWUID_R)
-  check_function_exists(gmtime_r HAVE_GMTIME_R)
   check_function_exists(nanosleep HAVE_NANOSLEEP)
   check_function_exists(sigwait HAVE_POSIX_SIGWAIT)
   check_function_exists(inet_aton HAVE_INET_ATON)
@@ -177,34 +149,16 @@ macro(configure_unix_libs)
     configure_xorg_libs()
 
     include(FindPkgConfig)
-
+    find_package(PkgConfig)
     if(PKG_CONFIG_FOUND)
       pkg_check_modules(LIBXKBCOMMON REQUIRED xkbcommon)
-      pkg_check_modules(GLIB2 REQUIRED glib-2.0 gio-2.0)
+      pkg_check_modules(GLIB2 REQUIRED glib-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)
-
-    find_package(PkgConfig)
-    if(PKG_CONFIG_FOUND)
-      pkg_check_modules(lib_glib REQUIRED IMPORTED_TARGET glib-2.0)
-      pkg_search_module(PC_GDKPIXBUF gdk-pixbuf-2.0)
-
-      include_directories(${PC_GDKPIXBUF_INCLUDE_DIRS})
-
-      pkg_check_modules(lib_gdkpixbuf REQUIRED IMPORTED_TARGET gdk-pixbuf-2.0)
-      pkg_check_modules(lib_notify REQUIRED IMPORTED_TARGET libnotify)
-
-      add_definitions(-DHAVE_GDK_PIXBUF=1 -DHAVE_LIBNOTIFY=1)
-    else()
-      message(WARNING "pkg-config not found, skipping libnotify and gdk-pixbuf")
-    endif()
   endif()
 
   # For config.h, set some static values; it may be a good idea to make these
@@ -219,8 +173,8 @@ macro(configure_unix_libs)
   # Unix only: For config.h, save the results based on a template (config.h.in).
   # Note that this won't work on Windows because filenames are not case sensitive,
   # and we have header files named "Config.h" (upper case 'C').
-  configure_file(${CMAKE_SOURCE_DIR}/src/lib/config.h.in
-                 ${CMAKE_BINARY_DIR}/src/lib/config.h @ONLY)
+  configure_file(${CMAKE_SOURCE_DIR}/src/lib/Config.h.in
+                 ${CMAKE_BINARY_DIR}/src/lib/Config.h @ONLY)
 
   add_definitions(-DSYSAPI_UNIX=1 -DHAVE_CONFIG_H)
 

cspell.json

@@ -11,9 +11,10 @@
     "codesigning",
     "Compat",
     "contribs",
+    "daemonized",
     "Daun",
-    "Devs",
     "Deskflow",
+    "Devs",
     "distro",
     "distros",
     "dmgbuild",
@@ -24,6 +25,8 @@
     "gdrive",
     "Hadzhylov",
     "Hetu",
+    "HINSTANCE",
+    "HKLM",
     "hotspots",
     "Hutterer",
     "ifdef",
@@ -39,6 +42,7 @@
     "Libera",
     "libportal",
     "LLDB",
+    "logonui",
     "Lysytsia",
     "macdeployqt",
     "msvc",
@@ -48,6 +52,8 @@
     "Oleksandr",
     "Olena",
     "outputdir",
+    "outputter",
+    "outputters",
     "pacman",
     "Petroules",
     "Pixmap",
@@ -57,8 +63,10 @@
     "Priddy",
     "psutil",
     "pyproject",
+    "qobject",
     "qputenv",
     "readf",
+    "Redist",
     "Regen",
     "Repology",
     "Rizzitello",
@@ -67,9 +75,11 @@
     "Schoeneman",
     "Serhii",
     "shemp",
+    "SNAPPROCESS",
     "Sorin",
     "subproject",
     "subprojects",
+    "Toolhelp",
     "trackpad",
     "Trixie",
     "unittests",

deploy/linux/arch/PKGBUILD.in

@@ -22,9 +22,7 @@ depends=(
   'libxtst'
   'libxinerama'
   'libxkbcommon-x11'
-  'libnotify'
   'hicolor-icon-theme'
-  'pugixml'
   'qt6-base'
   'qt6-tools'
   'libei'

deploy/linux/flatpak/ci-build-lint-exceptions.json

@@ -0,0 +1,6 @@
+{
+    "org.deskflow.deskflow": [
+        "appstream-external-screenshot-url",
+        "appstream-screenshots-not-mirrored-in-ostree"
+    ]
+}

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

@@ -23,17 +23,6 @@ cleanup:
   - /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:
@@ -57,8 +46,8 @@ modules:
     sources:
         - type: git
           url: https://gitlab.freedesktop.org/libinput/libei
-          tag: 1.3.0
-          commit: 997b7c0f37faea4f8bae59613c8f27370925d5b0
+          tag: 1.4.0
+          commit: 5d6d8e6590df210b75559a889baa9459c68d9366
   - name: libportal
     buildsystem: meson
     config-opts:
@@ -70,15 +59,8 @@ modules:
     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
+        tag: 0.9.1
+        commit: 8f5dc8d192f6e31dafe69e35219e3b707bde71ce
   - name: cli11
     buildsystem: cmake-ninja
     config-opts:

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

@@ -4,7 +4,9 @@
 	<metadata_license>CC0-1.0</metadata_license>
 	<project_license>GPL-2.0+</project_license>
 	<name>Deskflow</name>
-	<developer_name>Deskflow Developers</developer_name>
+	<developer id="org.deskflow">
+		<name>Deskflow Developers</name>
+	</developer>
 	<summary>Software Keyboard and mouse sharing</summary>
 	<description>
 		<p>
@@ -16,7 +18,12 @@
 	<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>
+			<image>https://deskflow.org/screenshots/deskflow.png</image>
+			<caption>Deskflow's mainwindow on KDE</caption>
+		</screenshot>
+		<screenshot>
+			<image>https://deskflow.org/screenshots/deskflow-dark.png</image>
+			<caption>Deskflow's mainwindow on KDE (dark mode)</caption>
 		</screenshot>
 	</screenshots>
 	<provides> <id>org.deskflow.deskflow.desktop</id> </provides>
@@ -35,9 +42,73 @@
 	</branding>
 	<content_rating type="oars-1.0" />
 	<releases>
-		<release version="1.19.0" date="2025-1-31" urgency="high">
+			<release version="1.21.2" date="2025-04-07" urgency="high">
 			<description>
-				<p>This stable Release fixes several bugs and adds a few new features. For the full changelog see the release page.</p>
+				<p>This stable release fixes a few critical bugs in 1.21.1. For the full changelog see the release page.</p>
+				<ul>
+					<li>Fix: Crash with Qt 6.9</li>
+					<li>Fix: Windows settings in wrong locations</li>
+				</ul>
+			</description>
+			<url>https://github.com/deskflow/deskflow/releases/tag/v1.21.2</url>
+		</release>
+		<release version="1.21.1" date="2025-03-31" urgency="high">
+			<description>
+				<p>This stable release fixes a few critical bugs in 1.21.0. For the full changelog see the release page.</p>
+				<ul>
+					<li>Fix: Flatpak can't save settings'</li>
+					<li>Fix: Crash on localfingerprint dialog</li>
+					<li>Fix: Check for updates settings reading from wrong value</li>
+					<li>Fix: Windows settings saving blocked for non admin users </li>
+				</ul>
+			</description>
+			<url>https://github.com/deskflow/deskflow/releases/tag/v1.21.1</url>
+		</release>
+		<release version="1.21.0" date="2025-03-27" urgency="high">
+			<description>
+				<p>This stable release removes some dependencies, additionally fixes several bugs. For the full changelog see the release page.</p>
+				<ul>
+					<li>Cleanup unused classes</li>
+					<li>New Settings class</li>
+					<li>Remove need for pugixml</li>
+					<li>Remove need for libNotify</li>
+					<li>Remove need for gio</li>
+					<li>Remove need for gitkpixbuf</li>
+					<li>Fix issues with windows installer when msvc is missing</li>
+				</ul>
+			</description>
+			<url>https://github.com/deskflow/deskflow/releases/tag/v1.21.0</url>
+		</release>
+		<release version="1.20.1" date="2025-03-07" urgency="low">
+			<description>
+				<p>This stable release introduces a Windows dependency requirement and fixes a macOS bug.</p>
+				<ul>
+					<li>Fix: macOS menu bar icon invisible when menu bar is light</li>
+					<li>Feature: Add Windows installer check for Visual C++ Redistributable</li>
+					<li>Feature: Prevent Windows binaries running if MSVC runtime too old</li>
+				</ul>
+			</description>
+			<url>https://github.com/deskflow/deskflow/releases/tag/v1.20.1</url>
+		</release>
+		<release version="1.20.0" date="2025-03-03" 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 release page.</p>
+				<ul>
+					<li>Feature: Peer Id Checking - Fixes CVE-2021-42072 and CVE-2021-42073</li>
+					<li>Feature: Use Sha256 fingerprints</li>
+					<li>Feature: Gui cleanup and improvements</li>
+					<li>Remove: Inverse connection option</li>
+					<li>Fix: Screen Corner option</li>
+					<li>Fix: Show new client dialog</li>
+					<li>Win32: Daemon Improvements</li>
+					<li>Win32: Fix clear settings</li>
+				</ul>
+			</description>
+			<url>https://github.com/deskflow/deskflow/releases/tag/v1.20.0</url>
+		</release>
+		<release version="1.19.0" date="2025-01-31" urgency="high">
+			<description>
+				<p>This stable release fixes several bugs and adds a few new features. For the full changelog see the release page.</p>
 				<ul>
 					<li>Feature: New Fallback icon theme</li>
 					<li>Feature: Allow only one gui instance</li>
@@ -53,11 +124,11 @@
 					<li>Lots of Internal Cleanup</li>
 				</ul>
 			</description>
-		<url>https://github.com/deskflow/deskflow/releases/tag/v1.19.0</url>
+			<url>https://github.com/deskflow/deskflow/releases/tag/v1.19.0</url>
 		</release>
 		<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 release page.</p>
+				<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 release 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>
@@ -72,7 +143,7 @@
 					<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>
+			<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>
@@ -126,11 +197,11 @@
 					<li>ci: build flatpaks</li>
 				</ul>
 			</description>
-		<url>https://github.com/deskflow/deskflow/releases/tag/v1.17.2</url>
+			<url>https://github.com/deskflow/deskflow/releases/tag/v1.17.2</url>
 		</release>
-		<release version="1.17.1" date="2024-11-7" urgency="high">
+		<release version="1.17.1" date="2024-11-07" urgency="high">
 			<description>
-				<p>This stable Release Has a very long chagelog some notable ones are.</p>
+				<p>This stable release has a very long changelog some notable ones are.</p>
 				<ul>
 					<li>Remove word 'beta' from Wayland message</li>
 					<li>docs: Update `README.md` with Matrix link</li>
@@ -243,11 +314,11 @@
 					<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>
+			<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>
+				<p>This is the first Deskflow release.</p>
 				<ul>
 					<li>Use Deskflow Name</li>
 					<li>fix: windows build typos</li>
@@ -293,7 +364,7 @@
 					<li>Use sonarsource/sonarcloud-github-c-cpp</li>
 				</ul>
 			</description>
-		<url>https://github.com/deskflow/deskflow/releases/tag/v1.17.0</url>
+			<url>https://github.com/deskflow/deskflow/releases/tag/v1.17.0</url>
 		</release>
 	</releases>
 </component>

deploy/windows/cpack-options.cmake.in

@@ -0,0 +1,6 @@
+#SPDX-FileCopyrightText: 2025 Chris Rizzitello <sithlord48@gmail.com>
+#SPDX-License-Identifier: MIT
+
+if(CPACK_GENERATOR MATCHES 7Z|ZIP)
+  set(CPACK_PACKAGE_FILE_NAME ${CPACK_PACKAGE_FILE_NAME}-portable)
+endif()

deploy/windows/deploy.cmake

@@ -5,10 +5,20 @@
 # calling CMAKE_CURRENT_LIST_DIR after include would return the wrong scope var
 set(MY_DIR ${CMAKE_CURRENT_LIST_DIR})
 
+set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE)
+set(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION .)
+include(InstallRequiredSystemLibraries)
+
 install(CODE "execute_process(
   COMMAND ${DEPLOYQT} --no-compiler-runtime --no-system-d3d-compiler --no-quick-import -network \"\${CMAKE_INSTALL_PREFIX}/deskflow.exe\"
 )")
 
+configure_file(${MY_DIR}/pre-cpack.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/pre-cpack.cmake @ONLY)
+set(CPACK_PRE_BUILD_SCRIPTS ${CMAKE_CURRENT_BINARY_DIR}/pre-cpack.cmake)
+
+configure_file(${MY_DIR}/cpack-options.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/cpack-options.cmake @ONLY)
+set(CPACK_PROJECT_CONFIG_FILE ${CMAKE_CURRENT_BINARY_DIR}/cpack-options.cmake)
+
 # Setup OS_STRING
 if(CMAKE_SYSTEM_PROCESSOR MATCHES AMD64)
   set(OS_STRING "win-x64")
@@ -18,6 +28,8 @@ else()
   set(OS_STRING "win-${CMAKE_SYSTEM_PROCESSOR}")
 endif()
 
+list(APPEND CPACK_GENERATOR "7Z")
+
 # If Wix4+ is installed make a package
 find_program(WIX_APP wix)
 if (NOT "${WIX_APP}" STREQUAL "")
@@ -46,7 +58,6 @@ list(APPEND CPACK_WIX_EXTENSIONS "WixToolset.Util.wixext" "WixToolset.Firewall.w
 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
@@ -54,3 +65,18 @@ configure_file(
 
 # This patch set ups filewall rules, the service and msm module
 set(CPACK_WIX_PATCH_FILE "${CMAKE_CURRENT_BINARY_DIR}/wix-patch.xml")
+
+# Creates a DLL that can be used by our MSI for custom actions.
+configure_file(
+  ${MY_DIR}/wix-custom.h.in
+  ${CMAKE_CURRENT_BINARY_DIR}/wix-custom.h @ONLY
+)
+add_library(
+  wix-custom SHARED
+  ${MY_DIR}/wix-custom.cpp
+)
+target_include_directories(wix-custom PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
+set_target_properties(wix-custom PROPERTIES
+  RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
+)
+target_link_libraries(wix-custom PRIVATE Msi)

deploy/windows/pre-cpack.cmake.in

@@ -0,0 +1,19 @@
+# SPDX-FileCopyrightText: 2025 Chris Rizzitello <sithlord48@gmail.com>
+# SPDX-License-Identifier: MIT
+
+if(CPACK_GENERATOR MATCHES 7Z|ZIP)
+  string(REPLACE " " "*" _TEMP_LIST "@CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS@")
+  set(${PORTABLE_LIBS} "")
+  foreach(ITEM ${_TEMP_LIST})
+    string(REPLACE "*" " " _ITEM ${ITEM})
+    file(COPY ${_ITEM} DESTINATION ${CPACK_TEMPORARY_INSTALL_DIRECTORY})
+  endforeach()
+  file(WRITE ${CPACK_TEMPORARY_INSTALL_DIRECTORY}/settings/Deskflow.conf " ")
+  file(REMOVE ${CPACK_TEMPORARY_INSTALL_DIRECTORY}/deskflow-daemon.exe)
+  file(WRITE ${CPACK_TEMPORARY_INSTALL_DIRECTORY}/README.txt
+" Portable Deskflow: @CMAKE_PROJECT_VERSION@
+
+  The portable version must have the settings/Deskflow.conf file to save settings, or it will try to use the system settings location.
+  The portable version does not include the daemon, so the client will not work at UAC prompts or the login screen.
+")
+endif()

deploy/windows/wix-custom.cpp

@@ -0,0 +1,72 @@
+/*
+ * Deskflow -- mouse and keyboard sharing utility
+ * SPDX-FileCopyrightText: (C) 2025 Symless Ltd.
+ * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
+ */
+
+#include "wix-custom.h"
+
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
+
+// Include after Windows.h
+#include <MsiQuery.h>
+
+#include <stdio.h>
+#include <string>
+
+namespace {
+// Warning: DLL will crash with error code 1603 if we exceed this.
+const auto kLogLineMax = 1024;
+
+// Prefixes log messages with the app name so they're easier to find/filter.
+const std::string kLogPrefix = std::string(kAppId) + " installer: ";
+
+// Note: Resized to log line max when used.
+static std::string s_logMessageBuffer; // NOSONAR - Must be mutable.
+} // namespace
+
+// This log output can be viewed by using the DebugView program.
+#define MS_LOG_DEBUG(message, ...)                                                                                     \
+  s_logMessageBuffer.resize(kLogLineMax);                                                                              \
+  sprintf(s_logMessageBuffer.data(), message, __VA_ARGS__);                                                            \
+  OutputDebugStringA((kLogPrefix + s_logMessageBuffer + "\n").c_str())
+
+extern "C" __declspec(dllexport) UINT __stdcall CheckVCRedist(MSIHANDLE hInstall)
+{
+  const auto kKeyName = TEXT("SOFTWARE\\Microsoft\\VisualStudio\\14.0\\VC\\Runtimes\\x64");
+  const auto kValueName = TEXT("Minor");
+  const auto kProperty = "VC_REDIST_VERSION_OK";
+
+  MS_LOG_DEBUG("checking for msvc redist v%d.%d", kWindowsRuntimeMajor, kWindowsRuntimeMinor);
+
+  HKEY hKey;
+  if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, kKeyName, 0, KEY_READ, &hKey) != ERROR_SUCCESS) {
+    MS_LOG_DEBUG("msvc redist registry key not found");
+    return ERROR_FUNCTION_FAILED;
+  }
+
+  MS_LOG_DEBUG("msvc redist registry key found, querying minor version");
+
+  DWORD minorVersion = 0;
+  DWORD size = sizeof(DWORD);
+  RegQueryValueEx(hKey, kValueName, nullptr, nullptr, (LPBYTE)&minorVersion, &size);
+  RegCloseKey(hKey);
+
+  MS_LOG_DEBUG("msvc redist minor version: %lu", minorVersion);
+
+  if (minorVersion < kWindowsRuntimeMinor) {
+    MS_LOG_DEBUG("msvc redist minor version %lu too low, expected >= %d", minorVersion, kWindowsRuntimeMinor);
+    // Returning success allows the installer will show a friendly error message.
+    return ERROR_SUCCESS;
+  }
+
+  MS_LOG_DEBUG("msvc redist version ok, setting: %s", kProperty);
+  if (MsiSetProperty(hInstall, kProperty, "ok") != ERROR_SUCCESS) {
+    MS_LOG_DEBUG("failed to set property: %s", kProperty);
+    return ERROR_FUNCTION_FAILED;
+  }
+
+  MS_LOG_DEBUG("msvc redist version check successful");
+  return ERROR_SUCCESS;
+}

deploy/windows/wix-custom.h.in

@@ -0,0 +1,14 @@
+/*
+ * Deskflow -- mouse and keyboard sharing utility
+ * SPDX-FileCopyrightText: (C) 2025 Symless Ltd.
+ * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
+ */
+
+#pragma once
+
+const auto kAppId = "@CMAKE_PROJECT_NAME@";
+
+// clang-format off
+const auto kWindowsRuntimeMajor = @REQUIRED_MSVC_RUNTIME_MAJOR@;
+const auto kWindowsRuntimeMinor = @REQUIRED_MSVC_RUNTIME_MINOR@;
+// clang-format on

deploy/windows/wix-patch.xml.in

@@ -1,26 +1,78 @@
 <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
+      Id="ServiceInstall"
+      Name="Deskflow"
+      DisplayName="Deskflow"
+      Description="Runs the Core process on secure desktops (UAC prompts, login screen, etc)."
+      ErrorControl="normal"
+      Start="auto"
+      Type="ownProcess">
+      <util:ServiceConfig
+        ResetPeriodInDays="1"
+        RestartServiceDelayInSeconds="1"
+        FirstFailureActionType="restart"
+        SecondFailureActionType="restart"
+        ThirdFailureActionType="none"
+      />
     </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"/>
+    <Property Id="VC_REDIST_INSTALLED">
+      <RegistrySearch
+        Id="FindVCRedist"
+        Root="HKLM"
+        Key="SOFTWARE\Microsoft\VisualStudio\@REQUIRED_MSVC_RUNTIME_MAJOR@.0\VC\Runtimes\x64"
+        Name="Installed"
+        Type="raw" />
+    </Property>
+
+    <Binary Id="CustomDLL" SourceFile="@CMAKE_CURRENT_BINARY_DIR@/wix-custom.dll" />
+
+    <UI>
+       <Publish Dialog="ExitDialog"
+           Control="Finish"
+           Event="DoAction"
+           Value="RunDeskflow"
+           Condition= "NOT Installed" />
+    </UI>
+    <CustomAction
+      Id="CheckVCRedist"
+      BinaryRef="CustomDLL"
+      DllEntry="CheckVCRedist"
+      Execute="immediate" />
+
+    <CustomAction
+      Id="ShowVCRedistError"
+      Error="Microsoft Visual C++ Redistributable v@REQUIRED_MSVC_RUNTIME_MAJOR@.@REQUIRED_MSVC_RUNTIME_MINOR@ or later is required. Please download and install the latest version and then restart the installation. See our documentation for instructions." />
+
+    <CustomAction
+      Id="RunDeskflow"
+      ExeCommand="[INSTALL_ROOT]deskflow.exe"
+      Directory="INSTALL_ROOT"
+      Execute="immediate"
+      Impersonate="yes"
+      Return="asyncNoWait" />
+
     <InstallExecuteSequence>
-      <Custom Action="Run_Deskflow" OnExit="success" Condition="NOT Installed"/>
+      <Custom
+        Action="CheckVCRedist"
+        Before="InstallInitialize"
+        Condition="NOT Installed AND VC_REDIST_INSTALLED" />
+      <Custom
+        Action="ShowVCRedistError"
+        Before="InstallInitialize"
+        Condition="NOT Installed AND (NOT VC_REDIST_INSTALLED OR NOT VC_REDIST_VERSION_OK)" />
     </InstallExecuteSequence>
   </CPackWiXFragment>
 </CPackWiXPatch>

doc/configuration.md

@@ -1,3 +1,36 @@
+# GUI Config
+
+ Deskflow will automaticlly figure out where to save settings and other files.
+
+
+## Unix Systems
+ The search order for a setting file is:
+ 1. `<XDG_CONFIG_HOME>/Deskflow/Deskflow.conf`
+ 1. A user settings file
+ 1. A system settings file
+ 
+ A new settings file will be created in the user path if no settings file is found.
+ The path of the settings file will be used as the base for all other config files.
+
+### Linux
+ - System: `/etc/Deskflow/Deskflow.conf`
+ - User: `~/.config/Deskflow/Deskflow.conf`
+ 
+### macOS
+ - System: `/Library/Deskflow/Deskflow.conf`
+ - User: `~/Library/Deskflow/Deskflow.conf`
+ 
+
+## Windows
+
+ The search order for a setting file is:
+ 1. `<install-path>/settings/Deskflow.conf`
+ 1. Windows Registry `HKCU\Software\Deskflow\Deskflow`
+
+Windows will save to the install dir if settings are loaded from there. If not, it saves any other config files in: `C:\ProgramData\Deskflow\`
+
+When using settings from the install dir, the service mode will not be available.
+
 # Server Config Examples
 
 The `deskflow-server` command accepts the `-c` or `--config` option, which takes one argument,

sonar-project.properties

@@ -6,7 +6,10 @@ sonar.exclusions=subprojects/**,build/**
 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 }}
 sonar.cfamily.compile-commands=build/compile_commands.json
-sonar.cfamily.threads=${{ env.CPU_CORE_COUNT }}
 sonar.python.version=3.10
+
+# Allow use of `new` which is idiomatic for Qt code.
+sonar.issue.ignore.multicriteria=e1
+sonar.issue.ignore.multicriteria.e1.ruleKey=cpp:S5025
+sonar.issue.ignore.multicriteria.e1.resourceKey=**

src/apps/CMakeLists.txt

@@ -3,6 +3,30 @@
 # SPDX-FileCopyrightText: 2009 - 2012 Nick Bolton
 # SPDX-License-Identifier: MIT
 
+if(UNIX AND NOT APPLE)
+  find_program(HELP2MAN help2man)
+  if(NOT HELP2MAN)
+    message(STATUS "Man page tool (help2man) not found, man pages will not be generated")
+  endif()
+endif()
+
+function(generate_app_man TARGET)
+  if(HELP2MAN)
+    add_custom_command(
+      TARGET ${target} POST_BUILD
+        COMMAND QT_QPA_PLATFORM=minimal ${HELP2MAN}
+          --include ${CMAKE_SOURCE_DIR}/src/apps/res/manpage.txt
+          --no-info
+          $<TARGET_FILE:${target}>
+          -o $<TARGET_FILE_DIR:${target}>/${target}.1
+    )
+    install(
+      FILES $<TARGET_FILE_DIR:${target}>/${target}.1
+      DESTINATION ${CMAKE_INSTALL_MANDIR}/man1
+    )
+  endif()
+endfunction()
+
 option(BUILD_UNIFIED "Build unified binary" OFF)
 if(BUILD_UNIFIED)
   add_subdirectory(deskflow-core)

src/apps/deskflow-client/CMakeLists.txt

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2024 Chris Rizzitello <sithlord48@gmail.com>
+# SPDX-FileCopyrightText: 2024 - 2025 Chris Rizzitello <sithlord48@gmail.com>
 # SPDX-FileCopyrightText: 2012 - 2024 Symless Ltd
 # SPDX-FileCopyrightText: 2009 - 2012 Nick Bolton
 # SPDX-License-Identifier: MIT
@@ -7,7 +7,7 @@ set(target ${CMAKE_PROJECT_NAME}-client)
 
 if(WIN32)
   # Generate rc file
-  set(EXE_DESCRIPTION "${CMAKE_PROJECT_DESCRIPTION}\\n CLI client application")
+  set(EXE_DESCRIPTION "${CMAKE_PROJECT_PROPER_NAME} client application")
 
   set(EXE_ICON "
     IDI_DESKFLOW              ICON  DISCARDABLE  \"${CMAKE_SOURCE_DIR}/src/apps/res/deskflow.ico\"
@@ -32,16 +32,20 @@ target_link_libraries(
   io
   mt
   net
-  ipc
   platform
   server
   app
   ${libs})
 
 if(APPLE)
-  set_target_properties(${target} PROPERTIES RUNTIME_OUTPUT_DIRECTORY $<TARGET_BUNDLE_CONTENT_DIR:${CMAKE_PROJECT_PROPER_NAME}>/MacOS)
+  set_target_properties(${target} PROPERTIES
+      BUILD_WITH_INSTALL_RPATH TRUE
+      INSTALL_RPATH "@loader_path/../Libraries;@loader_path/../Frameworks"
+      RUNTIME_OUTPUT_DIRECTORY $<TARGET_BUNDLE_CONTENT_DIR:${CMAKE_PROJECT_PROPER_NAME}>/MacOS
+  )
 elseif(UNIX)
   install(TARGETS ${target} DESTINATION bin)
+  generate_app_man(${target})
 elseif(WIN32)
   install(
     TARGETS ${target}

src/apps/deskflow-client/deskflow-client.cpp

@@ -18,6 +18,8 @@
 int main(int argc, char **argv)
 {
 #if SYSAPI_WIN32
+  ArchMiscWindows::guardRuntimeVersion();
+
   // record window instance for tray icon, etc
   ArchMiscWindows::setInstanceWin32(GetModuleHandle(NULL));
 #endif

src/apps/deskflow-core/CMakeLists.txt

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2024 Chris Rizzitello <sithlord48@gmail.com>
+# SPDX-FileCopyrightText: 2024 - 2025 Chris Rizzitello <sithlord48@gmail.com>
 # SPDX-FileCopyrightText: 2012 - 2024 Symless Ltd
 # SPDX-FileCopyrightText: 2009 - 2012 Nick Bolton
 # SPDX-License-Identifier: MIT
@@ -8,11 +8,13 @@ set(target ${CMAKE_PROJECT_NAME}-core)
 add_executable(${target} "${target}.cpp")
 if(WIN32)
   # Generate rc file
-  set(EXE_DESCRIPTION "${CMAKE_PROJECT_DESCRIPTION}\\n CLI combined server and client")
+  set(EXE_DESCRIPTION "${CMAKE_PROJECT_PROPER_NAME} combined server and client application")
+  set(EXE_ICON "IDI_DESKFLOW ICON DISCARDABLE \"${CMAKE_SOURCE_DIR}/src/apps/res/deskflow.ico\"")
   configure_file(${CMAKE_SOURCE_DIR}/src/apps/res/windows.rc.in ${target}.rc)
 
   target_sources(${target} PRIVATE
-    "${target}.exe.manifest"
+    ${target}.exe.manifest
+    ${CMAKE_SOURCE_DIR}/src/apps/res/deskflow.ico
     ${CMAKE_CURRENT_BINARY_DIR}/${target}.rc
   )
 endif()
@@ -25,16 +27,20 @@ target_link_libraries(
   io
   mt
   net
-  ipc
   platform
   server
   app
   ${libs})
 
 if(APPLE)
-  set_target_properties(${target} PROPERTIES RUNTIME_OUTPUT_DIRECTORY $<TARGET_BUNDLE_CONTENT_DIR:${CMAKE_PROJECT_PROPER_NAME}>/MacOS)
+  set_target_properties(${target} PROPERTIES
+    BUILD_WITH_INSTALL_RPATH TRUE
+    INSTALL_RPATH "@loader_path/../Libraries;@loader_path/../Frameworks"
+    RUNTIME_OUTPUT_DIRECTORY $<TARGET_BUNDLE_CONTENT_DIR:${CMAKE_PROJECT_PROPER_NAME}>/MacOS
+  )
 elseif(UNIX)
   install(TARGETS ${target} DESTINATION bin)
+  generate_app_man(${target})
 elseif(WIN32)
   install(
     TARGETS ${target}

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

@@ -11,17 +11,18 @@
 #include "base/Log.h"
 #include "deskflow/ClientApp.h"
 #include "deskflow/ServerApp.h"
-#include <iostream>
 
 #if SYSAPI_WIN32
 #include "arch/win32/ArchMiscWindows.h"
 #endif
 
+#include <iostream>
+
 void showHelp()
 {
-  std::cout << "Usage: " CORE_BINARY_NAME " <server | client> [...options]" << 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 << "Usage: deskflow-core <server | client> [...options]" << std::endl;
+  std::cout << "server - start as a server (deskflow-server)" << std::endl;
+  std::cout << "client - start as a client (deskflow-client)" << std::endl;
   std::cout << "use deskflow-core <server|client> --help for more information." << std::endl;
 }
 

src/apps/deskflow-daemon/CMakeLists.txt

@@ -8,7 +8,8 @@ if(WIN32)
   set(target ${CMAKE_PROJECT_NAME}-daemon)
 
   # Generate rc file
-  set(EXE_DESCRIPTION "This service runs in the background to help ${CMAKE_PROJECT_NAME} deal with UAC prompts")
+  set(EXE_DESCRIPTION "${CMAKE_PROJECT_PROPER_NAME} Daemon for handling secure desktops (UAC prompts, login screen, etc)")
+  set(EXE_ICON "IDI_DESKFLOW ICON DISCARDABLE \"${CMAKE_SOURCE_DIR}/src/apps/res/deskflow.ico\"")
   configure_file(${CMAKE_SOURCE_DIR}/src/apps/res/windows.rc.in ${target}.rc)
 
   add_executable(${target} WIN32 ${target}.cpp ${CMAKE_CURRENT_BINARY_DIR}/${target}.rc)
@@ -18,12 +19,13 @@ if(WIN32)
     arch
     base
     io
-    ipc
     mt
     net
     platform
     app
-    ${libs})
+    common
+    ${libs}
+    Qt6::Core)
 
   install(
     TARGETS ${target}

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

@@ -1,31 +1,150 @@
 /*
  * Deskflow -- mouse and keyboard sharing utility
- * SPDX-FileCopyrightText: (C) 2012 - 2016 Symless Ltd.
+ * SPDX-FileCopyrightText: (C) 2012 - 2016, 2025 Symless Ltd.
  * SPDX-FileCopyrightText: (C) 2012 Nick Bolton
  * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
  */
 
+#include "arch/Arch.h"
+#include "base/EventQueue.h"
+#include "base/Log.h"
+#include "common/Settings.h"
 #include "deskflow/DaemonApp.h"
+#include "deskflow/ipc/DaemonIpcServer.h"
 
-#include <iostream>
+#if SYSAPI_WIN32
 
-#ifdef SYSAPI_UNIX
-
-int main(int argc, char **argv)
-{
-  DaemonApp app;
-  return app.run(argc, argv);
-}
-
-#elif SYSAPI_WIN32
+#include "arch/win32/ArchMiscWindows.h"
 
 #define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
 
+#endif
+
+#include <QCommandLineParser>
+#include <QCoreApplication>
+#include <QThread>
+
+using namespace deskflow::core;
+
+void handleError(const char *message = "Unrecognized error.");
+
+int main(int argc, char **argv)
+{
+#if SYSAPI_WIN32
+  ArchMiscWindows::guardRuntimeVersion();
+
+  // Save window instance for later use, e.g. `GetModuleFileName` which is used when installing the daemon.
+  ArchMiscWindows::setInstanceWin32(GetModuleHandle(nullptr));
+#endif
+
+  Arch arch;
+  arch.init();
+
+  Log log;
+  EventQueue events;
+
+  // Daemon deliberately does not have a parent, as it will be moved to a new thread.
+  DaemonApp daemon(events);
+
+  QCoreApplication app(argc, argv);
+  QCoreApplication::setApplicationName(QStringLiteral("%1 Daemon").arg(kAppName));
+
+  QCommandLineParser parser;
+  parser.addHelpOption();
+  parser.addVersionOption();
+
+  const auto foregroundOption = QCommandLineOption({"f", "foreground"}, "Run in the foreground (show console)");
+  parser.addOption(foregroundOption);
+
+  const auto installOption = QCommandLineOption({"i", "install"}, "Install as a Windows service");
+  parser.addOption(installOption);
+
+  const auto uninstallOption = QCommandLineOption({"u", "uninstall"}, "Uninstall the Windows service");
+  parser.addOption(uninstallOption);
+
+  parser.process(app);
+
+  if (parser.isSet(foregroundOption)) {
+    daemon.setForeground();
+  }
+
+  // Depends on whether foreground option was set.
+  daemon.initLogging();
+
+  // Important: Log the app name and version number to the log file daemon app has initialized
+  // logging as it creates the file logger. Logging before would only log to stdout which is not
+  // useful for troubleshooting Windows services.
+  // It's important to write the version number to the log file so we can be certain the old daemon
+  // was uninstalled, since sometimes Windows services can get stuck and fail to be removed.
+  LOG_PRINT("%s v%s", QCoreApplication::applicationName().toStdString().c_str(), kDisplayVersion);
+
+  // Default log level to system setting (found in Registry).
+  auto logLevel = Settings::value(Settings::Daemon::LogLevel).toString().toStdString();
+  if (logLevel != "") {
+    CLOG->setFilter(logLevel.c_str());
+    LOG_DEBUG("log level: %s", logLevel.c_str());
+  }
+
+  try {
+
+#if SYSAPI_WIN32
+    // Show warning if not running as admin as daemon will behave differently.
+    if (!ArchMiscWindows::isProcessElevated()) {
+      LOG_WARN("not running as admin, some features may not work");
+    }
+#endif
+
+    if (parser.isSet(installOption)) {
+      daemon.install();
+      return kExitSuccess;
+    } else if (parser.isSet(uninstallOption)) {
+      daemon.uninstall();
+      return kExitSuccess;
+    }
+
+    const auto ipcServer =
+        new ipc::DaemonIpcServer(&app, DaemonApp::logFilename().toStdString().c_str()); // NOSONAR - Qt managed
+    ipcServer->listen();
+    daemon.connectIpcServer(ipcServer);
+
+    QThread daemonThread;
+    QObject::connect(&daemonThread, &QThread::finished, &app, &QCoreApplication::quit);
+    daemon.run(daemonThread);
+
+    const auto exitCode = QCoreApplication::exec();
+    daemonThread.wait();
+
+    LOG_DEBUG("daemon exited, code: %d", exitCode);
+    return exitCode;
+
+  } catch (std::exception &e) {
+    handleError(e.what());
+    return kExitFailed;
+  } catch (...) {
+    handleError();
+    return kExitFailed;
+  }
+}
+
+#if SYSAPI_WIN32
+
+// Win32 subsystem entry point (simply forwards to main).
+// We need this because using regular main under the Win32 subsystem results in empty args.
 int WINAPI WinMain(HINSTANCE, HINSTANCE, LPSTR, int)
 {
-  DaemonApp app;
-  return app.run(__argc, __argv);
+  return main(__argc, __argv);
 }
 
 #endif
+
+void handleError(const char *message)
+{
+  // Always print error to stdout in case run as CLI program.
+  LOG_ERR("%s", message);
+
+#if SYSAPI_WIN32
+  // Show a message box for when run from MSI in Win32 subsystem.
+  MessageBoxA(nullptr, message, "Deskflow daemon error", MB_OK | MB_ICONERROR);
+#endif
+}

src/apps/deskflow-gui/CMakeLists.txt

@@ -8,14 +8,10 @@ else()
   set(target deskflow)
 endif()
 
-
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTORCC ON)
-set(CMAKE_AUTOUIC ON)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 if(WIN32)
-  set(EXE_DESCRIPTION "${CMAKE_PROJECT_DESCRIPTION}\\n Control and configure deskflow")
+  set(EXE_DESCRIPTION "${CMAKE_PROJECT_PROPER_NAME} GUI configuration tool")
   set(EXE_ICON "IDI_ICON1 ICON DISCARDABLE \"${CMAKE_SOURCE_DIR}/src/apps/res/deskflow.ico\" ")
   configure_file(${CMAKE_SOURCE_DIR}/src/apps/res/windows.rc.in deskflow.rc)
   set(platform_extra deskflow.rc)
@@ -48,67 +44,13 @@ endif()
 add_executable(${target} WIN32 MACOSX_BUNDLE
   ${platform_extra}
   ../res/deskflow.qrc
-  Action.cpp
-  Action.h
-  DataDownloader.cpp
-  DataDownloader.h
-  Hotkey.cpp
-  Hotkey.h
-  KeySequence.cpp
-  KeySequence.h
-  main.cpp
-  MainWindow.cpp
-  MainWindow.h
-  MainWindow.ui
-  ProcessorArch.h
-  QUtility.cpp
-  QUtility.h
-  ScreenSetupModel.cpp
-  ScreenSetupModel.h
-  ServerConfig.cpp
-  ServerConfig.h
-  SetupWizard.cpp
-  SetupWizard.h
-  VersionChecker.cpp
-  VersionChecker.h
-  dialogs/AboutDialog.cpp
-  dialogs/AboutDialog.h
-  dialogs/AboutDialog.ui
-  dialogs/ActionDialog.cpp
-  dialogs/ActionDialog.h
-  dialogs/ActionDialog.ui
-  dialogs/AddClientDialog.cpp
-  dialogs/AddClientDialog.h
-  dialogs/AddClientDialog.ui
-  dialogs/HotkeyDialog.cpp
-  dialogs/HotkeyDialog.h
-  dialogs/HotkeyDialog.ui
-  dialogs/ScreenSettingsDialog.cpp
-  dialogs/ScreenSettingsDialog.h
-  dialogs/ScreenSettingsDialog.ui
-  dialogs/ServerConfigDialog.cpp
-  dialogs/ServerConfigDialog.h
-  dialogs/ServerConfigDialog.ui
-  dialogs/SettingsDialog.cpp
-  dialogs/SettingsDialog.h
-  dialogs/SettingsDialog.ui
-  widgets/ClientStateLabel.cpp
-  widgets/ClientStateLabel.h
-  widgets/KeySequenceWidget.cpp
-  widgets/KeySequenceWidget.h
-  widgets/NewScreenWidget.h
-  widgets/NewScreenWidget.cpp
-  widgets/ScreenSetupView.cpp
-  widgets/ScreenSetupView.h
-  widgets/ServerStateLabel.cpp
-  widgets/ServerStateLabel.h
-  widgets/TrashScreenWidget.cpp
-  widgets/TrashScreenWidget.h
+  deskflow-gui.cpp
 )
 
 target_link_libraries(
   ${target}
   gui
+  common
   Qt6::Core
   Qt6::Widgets
   Qt6::Network)
@@ -142,4 +84,5 @@ elseif(APPLE)
   install(TARGETS ${target} BUNDLE DESTINATION .)
 else()
   install(TARGETS ${target} DESTINATION bin)
+  generate_app_man(${target})
 endif()

src/apps/deskflow-gui/MainWindow.ui

@@ -1,653 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>MainWindow</class>
- <widget class="QMainWindow" name="MainWindow">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>883</width>
-    <height>690</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="windowTitle">
-   <string>Deskflow</string>
-  </property>
-  <widget class="QWidget" name="m_pWidgetTopLevel">
-   <layout class="QVBoxLayout" name="verticalLayout_7">
-    <property name="spacing">
-     <number>10</number>
-    </property>
-    <item>
-     <layout class="QHBoxLayout" name="m_layoutName">
-      <property name="sizeConstraint">
-       <enum>QLayout::SizeConstraint::SetMinAndMaxSize</enum>
-      </property>
-      <item>
-       <widget class="QLabel" name="lblComputerName">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string notr="true">This computer's name:</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <spacer name="m_pSpacerUpdate">
-        <property name="orientation">
-         <enum>Qt::Orientation::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>20</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
-       <widget class="QLabel" name="m_pLabelUpdate">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string notr="true">m_pLabelUpdate</string>
-        </property>
-        <property name="openExternalLinks">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </item>
-    <item>
-     <widget class="QLabel" name="m_pLabelIpAddresses">
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <property name="toolTip">
-       <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The highlighted IP is the one we think you should use. The server listens on all IPs, so the other IPs may work as well.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-      </property>
-      <property name="text">
-       <string notr="true">This computer's IP addresses:</string>
-      </property>
-     </widget>
-    </item>
-    <item>
-     <widget class="QLabel" name="lblMyFingerprint">
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <property name="text">
-       <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;TLS enabled (&lt;a href=&quot;#&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#4285f4;&quot;&gt;fingerprint&lt;/span&gt;&lt;/a&gt;)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-      </property>
-      <property name="textFormat">
-       <enum>Qt::TextFormat::RichText</enum>
-      </property>
-     </widget>
-    </item>
-    <item>
-     <widget class="QWidget" name="m_pWidgetModes" native="true">
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <layout class="QHBoxLayout" name="horizontalLayout_8">
-       <property name="spacing">
-        <number>20</number>
-       </property>
-       <property name="leftMargin">
-        <number>0</number>
-       </property>
-       <property name="topMargin">
-        <number>0</number>
-       </property>
-       <property name="rightMargin">
-        <number>0</number>
-       </property>
-       <property name="bottomMargin">
-        <number>0</number>
-       </property>
-       <item>
-        <widget class="QGroupBox" name="m_pGroupServer">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <layout class="QVBoxLayout" name="verticalLayout">
-          <property name="spacing">
-           <number>15</number>
-          </property>
-          <item alignment="Qt::AlignmentFlag::AlignTop">
-           <widget class="QWidget" name="m_pWidgetServerRadio" native="true">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <layout class="QVBoxLayout" name="verticalLayout_3">
-             <property name="spacing">
-              <number>0</number>
-             </property>
-             <property name="leftMargin">
-              <number>0</number>
-             </property>
-             <property name="topMargin">
-              <number>0</number>
-             </property>
-             <property name="rightMargin">
-              <number>0</number>
-             </property>
-             <property name="bottomMargin">
-              <number>0</number>
-             </property>
-             <item>
-              <widget class="QRadioButton" name="rbModeServer">
-               <property name="text">
-                <string>Use this computer's keyboard and mouse</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QLabel" name="label">
-               <property name="text">
-                <string>(make this computer the server)</string>
-               </property>
-               <property name="indent">
-                <number>20</number>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </widget>
-          </item>
-          <item alignment="Qt::AlignmentFlag::AlignTop">
-           <widget class="QWidget" name="m_pWidgetServer" native="true">
-            <layout class="QVBoxLayout" name="m_pLayoutServer">
-             <property name="spacing">
-              <number>15</number>
-             </property>
-             <property name="leftMargin">
-              <number>0</number>
-             </property>
-             <property name="topMargin">
-              <number>0</number>
-             </property>
-             <property name="rightMargin">
-              <number>0</number>
-             </property>
-             <property name="bottomMargin">
-              <number>0</number>
-             </property>
-             <item>
-              <widget class="QWidget" name="m_pWidgetServerInput" native="true">
-               <layout class="QVBoxLayout" name="m_pLayoutServerInverse">
-                <property name="spacing">
-                 <number>15</number>
-                </property>
-                <property name="leftMargin">
-                 <number>0</number>
-                </property>
-                <property name="topMargin">
-                 <number>0</number>
-                </property>
-                <property name="rightMargin">
-                 <number>0</number>
-                </property>
-                <property name="bottomMargin">
-                 <number>0</number>
-                </property>
-                <item>
-                 <widget class="QLabel" name="m_pLabelClientIp">
-                  <property name="text">
-                   <string>Client IP address or hostname:</string>
-                  </property>
-                  <property name="indent">
-                   <number>20</number>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <layout class="QHBoxLayout" name="horizontalLayout_3">
-                  <property name="leftMargin">
-                   <number>20</number>
-                  </property>
-                  <item>
-                   <widget class="QLineEdit" name="lineClientIp"/>
-                  </item>
-                  <item>
-                   <widget class="QPushButton" name="btnConnectToClient">
-                    <property name="text">
-                     <string>Connect</string>
-                    </property>
-                   </widget>
-                  </item>
-                 </layout>
-                </item>
-               </layout>
-              </widget>
-             </item>
-             <item>
-              <widget class="deskflow::gui::widgets::ServerStateLabel" name="m_pLabelServerState">
-               <property name="text">
-                <string>No clients connected</string>
-               </property>
-               <property name="indent">
-                <number>20</number>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <spacer name="verticalSpacer_2">
-               <property name="orientation">
-                <enum>Qt::Orientation::Vertical</enum>
-               </property>
-               <property name="sizeHint" stdset="0">
-                <size>
-                 <width>20</width>
-                 <height>1</height>
-                </size>
-               </property>
-              </spacer>
-             </item>
-             <item>
-              <layout class="QHBoxLayout" name="horizontalLayout_4">
-               <item>
-                <spacer name="spacer_2">
-                 <property name="orientation">
-                  <enum>Qt::Orientation::Horizontal</enum>
-                 </property>
-                 <property name="sizeHint" stdset="0">
-                  <size>
-                   <width>20</width>
-                   <height>20</height>
-                  </size>
-                 </property>
-                </spacer>
-               </item>
-               <item>
-                <widget class="QPushButton" name="btnConfigureServer">
-                 <property name="text">
-                  <string>&amp;Configure</string>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </item>
-            </layout>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="m_pGroupClient">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <layout class="QVBoxLayout" name="verticalLayout_5">
-          <property name="spacing">
-           <number>15</number>
-          </property>
-          <item alignment="Qt::AlignmentFlag::AlignTop">
-           <widget class="QWidget" name="m_pWidgetClientRadio" native="true">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <layout class="QVBoxLayout" name="verticalLayout_6">
-             <property name="spacing">
-              <number>0</number>
-             </property>
-             <property name="leftMargin">
-              <number>0</number>
-             </property>
-             <property name="topMargin">
-              <number>0</number>
-             </property>
-             <property name="rightMargin">
-              <number>0</number>
-             </property>
-             <property name="bottomMargin">
-              <number>0</number>
-             </property>
-             <item>
-              <widget class="QRadioButton" name="rbModeClient">
-               <property name="text">
-                <string>Use another computer’s mouse and keyboard</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QLabel" name="label_2">
-               <property name="text">
-                <string>(make this computer the client)</string>
-               </property>
-               <property name="indent">
-                <number>20</number>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </widget>
-          </item>
-          <item alignment="Qt::AlignmentFlag::AlignTop">
-           <widget class="QWidget" name="m_pWidgetClientInput" native="true">
-            <layout class="QVBoxLayout" name="m_pLayoutClient">
-             <property name="spacing">
-              <number>15</number>
-             </property>
-             <property name="leftMargin">
-              <number>0</number>
-             </property>
-             <property name="topMargin">
-              <number>0</number>
-             </property>
-             <property name="rightMargin">
-              <number>0</number>
-             </property>
-             <property name="bottomMargin">
-              <number>0</number>
-             </property>
-             <item>
-              <widget class="QLabel" name="m_pLabelServerName">
-               <property name="text">
-                <string>Server IP address or hostname:</string>
-               </property>
-               <property name="indent">
-                <number>20</number>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <layout class="QHBoxLayout" name="horizontalLayout_2">
-               <property name="leftMargin">
-                <number>20</number>
-               </property>
-               <item>
-                <widget class="QLineEdit" name="lineHostname">
-                 <property name="minimumSize">
-                  <size>
-                   <width>0</width>
-                   <height>0</height>
-                  </size>
-                 </property>
-                 <property name="toolTip">
-                  <string>Hostname or IP address of the server computer.</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QPushButton" name="btnConnect">
-                 <property name="text">
-                  <string>Connect</string>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </item>
-             <item>
-              <widget class="deskflow::gui::widgets::ClientStateLabel" name="m_pLabelClientState">
-               <property name="text">
-                <string>Connected to server</string>
-               </property>
-               <property name="indent">
-                <number>20</number>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-    </item>
-    <item>
-     <widget class="QFrame" name="frameLog">
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <property name="frameShape">
-       <enum>QFrame::Shape::StyledPanel</enum>
-      </property>
-      <property name="frameShadow">
-       <enum>QFrame::Shadow::Raised</enum>
-      </property>
-      <layout class="QVBoxLayout" name="verticalLayout_2">
-       <item>
-        <layout class="QHBoxLayout" name="horizontalLayout">
-         <property name="sizeConstraint">
-          <enum>QLayout::SizeConstraint::SetMinAndMaxSize</enum>
-         </property>
-         <item>
-          <widget class="QToolButton" name="btnToggleLog">
-           <property name="text">
-            <string>...</string>
-           </property>
-           <property name="checkable">
-            <bool>true</bool>
-           </property>
-           <property name="arrowType">
-            <enum>Qt::ArrowType::RightArrow</enum>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLabel" name="lblLog">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="text">
-            <string>Log</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <widget class="QPlainTextEdit" name="textLog">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="font">
-          <font>
-           <family>Courier</family>
-           <kerning>true</kerning>
-          </font>
-         </property>
-         <property name="undoRedoEnabled">
-          <bool>false</bool>
-         </property>
-         <property name="lineWrapMode">
-          <enum>QPlainTextEdit::LineWrapMode::NoWrap</enum>
-         </property>
-         <property name="readOnly">
-          <bool>true</bool>
-         </property>
-         <property name="maximumBlockCount">
-          <number>10000</number>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-    </item>
-    <item>
-     <layout class="QHBoxLayout" name="m_pLayoutActions">
-      <property name="spacing">
-       <number>6</number>
-      </property>
-      <property name="sizeConstraint">
-       <enum>QLayout::SizeConstraint::SetDefaultConstraint</enum>
-      </property>
-      <item>
-       <widget class="QLabel" name="lblConnectionSecurityStatus">
-        <property name="enabled">
-         <bool>true</bool>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>32</width>
-          <height>32</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>32</width>
-          <height>32</height>
-         </size>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QLabel" name="m_pStatusLabel">
-        <property name="text">
-         <string>Ready</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <spacer name="spacer">
-        <property name="orientation">
-         <enum>Qt::Orientation::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
-       <widget class="QLabel" name="m_pLabelNotice">
-        <property name="autoFillBackground">
-         <bool>false</bool>
-        </property>
-        <property name="text">
-         <string notr="true">m_pLabelNotice</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter</set>
-        </property>
-        <property name="margin">
-         <number>0</number>
-        </property>
-        <property name="openExternalLinks">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <spacer name="horizontalSpacer">
-        <property name="orientation">
-         <enum>Qt::Orientation::Horizontal</enum>
-        </property>
-        <property name="sizeType">
-         <enum>QSizePolicy::Policy::Fixed</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>20</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
-       <widget class="QPushButton" name="btnApplySettings">
-        <property name="enabled">
-         <bool>false</bool>
-        </property>
-        <property name="text">
-         <string>&amp;Apply</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="btnToggleCore">
-        <property name="enabled">
-         <bool>false</bool>
-        </property>
-        <property name="text">
-         <string>&amp;Start</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </item>
-   </layout>
-  </widget>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>deskflow::gui::widgets::ServerStateLabel</class>
-   <extends>QLabel</extends>
-   <header>widgets/ServerStateLabel.h</header>
-  </customwidget>
-  <customwidget>
-   <class>deskflow::gui::widgets::ClientStateLabel</class>
-   <extends>QLabel</extends>
-   <header>widgets/ClientStateLabel.h</header>
-  </customwidget>
- </customwidgets>
- <tabstops>
-  <tabstop>rbModeServer</tabstop>
-  <tabstop>lineClientIp</tabstop>
-  <tabstop>btnConnectToClient</tabstop>
-  <tabstop>btnConfigureServer</tabstop>
-  <tabstop>rbModeClient</tabstop>
-  <tabstop>lineHostname</tabstop>
-  <tabstop>btnConnect</tabstop>
-  <tabstop>btnToggleLog</tabstop>
-  <tabstop>textLog</tabstop>
-  <tabstop>btnApplySettings</tabstop>
-  <tabstop>btnToggleCore</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>

src/apps/deskflow-gui/ProcessorArch.h

@@ -1,18 +0,0 @@
-/*
- * Deskflow -- mouse and keyboard sharing utility
- * SPDX-FileCopyrightText: (C) 2015 - 2016 Symless Ltd.
- * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
- */
-
-#pragma once
-
-enum qProcessorArch
-{
-  kProcessorArchWin32,
-  kProcessorArchWin64,
-  kProcessorArchMac32,
-  kProcessorArchMac64,
-  kProcessorArchLinux32,
-  kProcessorArchLinux64,
-  kProcessorArchUnknown
-};

src/apps/deskflow-gui/QUtility.cpp

@@ -1,65 +0,0 @@
-/*
- * Deskflow -- mouse and keyboard sharing utility
- * SPDX-FileCopyrightText: (C) 2013 - 2016 Symless Ltd.
- * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
- */
-
-#include "QUtility.h"
-
-#include "ProcessorArch.h"
-
-#if defined(Q_OS_LINUX)
-#include <QFile>
-#include <QProcess>
-#endif
-
-#if defined(Q_OS_WIN)
-#define WIN32_LEAN_AND_MEAN
-#include <Windows.h>
-#endif
-
-void setIndexFromItemData(QComboBox *comboBox, const QVariant &itemData)
-{
-  for (int i = 0; i < comboBox->count(); ++i) {
-    if (comboBox->itemData(i) == itemData) {
-      comboBox->setCurrentIndex(i);
-      return;
-    }
-  }
-}
-
-QString hash(const QString &string)
-{
-  QByteArray data = string.toUtf8();
-  QByteArray hash = QCryptographicHash::hash(data, QCryptographicHash::Md5);
-  return hash.toHex();
-}
-
-qProcessorArch getProcessorArch()
-{
-#if defined(Q_OS_WIN)
-  SYSTEM_INFO systemInfo;
-  GetNativeSystemInfo(&systemInfo);
-
-  switch (systemInfo.wProcessorArchitecture) {
-  case PROCESSOR_ARCHITECTURE_INTEL:
-    return kProcessorArchWin32;
-  case PROCESSOR_ARCHITECTURE_IA64:
-    return kProcessorArchWin64;
-  case PROCESSOR_ARCHITECTURE_AMD64:
-    return kProcessorArchWin64;
-  default:
-    return kProcessorArchUnknown;
-  }
-#endif
-
-#if defined(Q_OS_LINUX)
-#ifdef __i386__
-  return kProcessorArchLinux32;
-#else
-  return kProcessorArchLinux64;
-#endif
-#endif
-
-  return kProcessorArchUnknown;
-}

src/apps/deskflow-gui/QUtility.h

@@ -1,18 +0,0 @@
-/*
- * Deskflow -- mouse and keyboard sharing utility
- * SPDX-FileCopyrightText: (C) 2013 - 2016 Symless Ltd.
- * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
- */
-
-#pragma once
-
-#include "ProcessorArch.h"
-
-#include <QComboBox>
-#include <QCryptographicHash>
-#include <QNetworkInterface>
-#include <QVariant>
-
-void setIndexFromItemData(QComboBox *comboBox, const QVariant &itemData);
-QString hash(const QString &string);
-qProcessorArch getProcessorArch();

src/apps/deskflow-gui/SetupWizard.cpp

@@ -1,89 +0,0 @@
-/*
- * Deskflow -- mouse and keyboard sharing utility
- * SPDX-FileCopyrightText: (C) 2024 Chris Rizzitello <sithlord48@gmail.com>
- * SPDX-FileCopyrightText: (C) 2012 Symless Ltd.
- * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
- */
-
-#include "SetupWizard.h"
-
-#include <QApplication>
-#include <QFormLayout>
-#include <QPushButton>
-
-#include "common/constants.h"
-#include "gui/config/AppConfig.h"
-#include "gui/styles.h"
-#include "gui/validators/ScreenNameValidator.h"
-#include "gui/validators/ValidationError.h"
-
-SetupWizard::SetupWizard(AppConfig &appConfig)
-    : m_appConfig{appConfig},
-      m_lblError{new QLabel(this)},
-      m_lineName{new QLineEdit(this)},
-      m_btnApply{new QPushButton(tr("Continue"), this)}
-{
-  setWindowTitle(tr("Setup %1").arg(kAppName));
-
-  setFixedSize(740, 550);
-
-  auto headerFont = QFont(QStringLiteral("Cantarell"), 18, 600);
-
-  auto labelTitle = new QLabel(this);
-  labelTitle->setFont(headerFont);
-  labelTitle->setText(tr("Name your computer"));
-  labelTitle->setAlignment(Qt::AlignHCenter | Qt::AlignHCenter);
-
-  auto labelName = new QLabel(this);
-  labelName->setText(tr("Computer Name"));
-
-  auto formLayout = new QFormLayout();
-  formLayout->addRow(labelName, m_lineName);
-  formLayout->addWidget(m_lblError);
-  formLayout->addWidget(new QLabel(tr("Call your computer something short and meaningful, but it must have:"), this));
-  formLayout->addWidget(new QLabel(tr("\t⬤ No spaces"), this));
-  formLayout->addWidget(new QLabel(tr("\t⬤ Only these special characters: _ - ."), this));
-  formLayout->addWidget(new QLabel(tr("\t⬤ Only English characters and numbers"), this));
-  formLayout->addWidget(new QLabel(tr("\t⬤ A different name from other computers"), this));
-
-  auto labelImage = new QLabel(this);
-  labelImage->setPixmap(QPixmap(QStringLiteral(":/image/welcome.png")));
-
-  auto mainLayout = new QVBoxLayout();
-  mainLayout->setContentsMargins(9, 30, 9, 9);
-  mainLayout->addWidget(labelImage, 0, Qt::AlignHCenter);
-  mainLayout->addWidget(labelTitle);
-  mainLayout->addLayout(formLayout);
-  mainLayout->addSpacerItem(new QSpacerItem(0, 25, QSizePolicy::Fixed, QSizePolicy::Fixed));
-  mainLayout->addWidget(m_btnApply);
-
-  setLayout(mainLayout);
-
-  m_lblError->setStyleSheet(deskflow::gui::kStyleErrorActiveLabel);
-
-  m_lineName->setText(appConfig.screenName());
-  m_lineName->setValidator(
-      new validators::ScreenNameValidator(m_lineName, new validators::ValidationError(this, m_lblError))
-  );
-
-  connect(m_btnApply, &QPushButton::clicked, this, &SetupWizard::accept);
-  connect(m_lineName, &QLineEdit::textChanged, this, &SetupWizard::nameChanged);
-}
-
-void SetupWizard::accept()
-{
-  m_appConfig.setWizardHasRun();
-  m_appConfig.setScreenName(m_lineName->text());
-  QDialog::accept();
-}
-
-void SetupWizard::nameChanged(const QString &error)
-{
-  m_btnApply->setEnabled(m_lineName->hasAcceptableInput());
-}
-
-void SetupWizard::reject()
-{
-  QDialog::reject();
-  QApplication::exit();
-}

src/apps/deskflow-gui/SetupWizard.h

@@ -1,35 +0,0 @@
-/*
- * Deskflow -- mouse and keyboard sharing utility
- * SPDX-FileCopyrightText: (C) 2024 Chris Rizzitello <sithlord48@gmail.com>
- * SPDX-FileCopyrightText: (C) 2012 Symless Ltd.
- * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
- */
-
-#pragma once
-
-#include <QDialog>
-
-class AppConfig;
-class QLabel;
-class QLineEdit;
-
-class SetupWizard : public QDialog
-{
-  Q_OBJECT
-
-public:
-  explicit SetupWizard(AppConfig &appConfig);
-  ~SetupWizard() = default;
-
-protected:
-  void accept() override;
-  void reject() override;
-
-private:
-  void nameChanged(const QString &error);
-
-  AppConfig &m_appConfig;
-  QLabel *m_lblError = nullptr;
-  QLineEdit *m_lineName = nullptr;
-  QPushButton *m_btnApply = nullptr;
-};

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

@@ -6,27 +6,21 @@
  * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
  */
 
-#include "MainWindow.h"
-#include "SetupWizard.h"
-#include "common/constants.h"
+#include "common/Constants.h"
+#include "common/UrlConstants.h"
+#include "gui/Diagnostic.h"
+#include "gui/DotEnv.h"
 #include "gui/Logger.h"
-#include "gui/config/AppConfig.h"
-#include "gui/config/ConfigScopes.h"
-#include "gui/constants.h"
-#include "gui/diagnostic.h"
-#include "gui/dotenv.h"
-#include "gui/messages.h"
-#include "gui/string_utils.h"
-#include "gui/style_utils.h"
+#include "gui/MainWindow.h"
+#include "gui/Messages.h"
+#include "gui/StyleUtils.h"
 
 #include <QApplication>
-#include <QDebug>
+#include <QCommandLineParser>
 #include <QGuiApplication>
 #include <QLocalSocket>
 #include <QMessageBox>
-#include <QObject>
 #include <QSharedMemory>
-#include <QtGlobal>
 
 #if defined(Q_OS_MAC)
 #include <Carbon/Carbon.h>
@@ -39,24 +33,10 @@
 
 using namespace deskflow::gui;
 
-class QThreadImpl : public QThread
-{
-public:
-  static void msleep(unsigned long msecs)
-  {
-    QThread::msleep(msecs);
-  }
-};
-
 #if defined(Q_OS_MAC)
 bool checkMacAssistiveDevices();
 #endif
 
-bool hasArg(const QString &arg, const QStringList &args)
-{
-  return std::ranges::any_of(args, [&arg](const QString &a) { return a == arg; });
-}
-
 int main(int argc, char *argv[])
 {
 #if defined(Q_OS_UNIX) && defined(QT_DEBUG)
@@ -64,21 +44,39 @@ int main(int argc, char *argv[])
   QLoggingCategory::setFilterRules(QStringLiteral("*.debug=true\nqt.*=false"));
 #endif
 
-#if defined(Q_OS_MAC)
-  /* Workaround for QTBUG-40332 - "High ping when QNetworkAccessManager is
-   * instantiated" */
-  ::setenv("QT_BEARER_POLL_TIMEOUT", "-1", 1);
-#endif
-
   QCoreApplication::setApplicationName(kAppName);
   QCoreApplication::setOrganizationName(kAppName);
+  QCoreApplication::setApplicationVersion(kVersion);
+  QCoreApplication::setOrganizationDomain(kOrgDomain); // used in prefix, can't be a url
   QGuiApplication::setDesktopFileName(QStringLiteral("org.deskflow.deskflow"));
 
-  // used as a prefix for settings paths, and must not be a url.
-  QCoreApplication::setOrganizationDomain(kOrgDomain);
-
   QApplication app(argc, argv);
 
+  // Add Command Line Options
+  QCommandLineOption helpOption = QCommandLineOption("help", "Display Help on the command line");
+  QCommandLineOption versionOption = QCommandLineOption("version", "Display version information");
+  QCommandLineOption noResetOption =
+      QCommandLineOption("no-reset", "Prevent settings reset if DESKFLOW_RESET_ALL is set");
+
+  QCommandLineParser parser;
+  parser.setSingleDashWordOptionMode(QCommandLineParser::ParseAsLongOptions);
+  parser.addOption(helpOption);
+  parser.addOption(versionOption);
+  parser.addOption(noResetOption);
+  parser.parse(QCoreApplication::arguments());
+
+  const auto header = QStringLiteral("%1: %2\n").arg(kAppName, kDisplayVersion);
+  if (parser.isSet(helpOption) || !parser.unknownOptionNames().isEmpty() || !parser.errorText().isEmpty()) {
+    QTextStream(stdout) << header << QStringLiteral("  %1\n\n").arg(kAppDescription)
+                        << parser.helpText().replace(QApplication::applicationFilePath(), kAppId);
+    return 0;
+  }
+
+  if (parser.isSet(versionOption)) {
+    QTextStream(stdout) << header << kCopyright << Qt::endl;
+    return 0;
+  }
+
   // Create a shared memory segment with a unique key
   // This is to prevent a new instance from running if one is already running
   QSharedMemory sharedMemory("deskflow-gui");
@@ -121,8 +119,10 @@ int main(int argc, char *argv[])
 #if defined(Q_OS_MAC)
 
   if (app.applicationDirPath().startsWith("/Volumes/")) {
-    QString msgBody = QStringLiteral("Please drag %1 to the Applications folder, "
-                                     "and open it from there.");
+    QString msgBody = QStringLiteral(
+        "Please drag %1 to the Applications folder, "
+        "and open it from there."
+    );
     QMessageBox::information(NULL, kAppName, msgBody.arg(kAppName));
     return 1;
   }
@@ -132,34 +132,13 @@ int main(int argc, char *argv[])
   }
 #endif
 
-  ConfigScopes configScopes;
-
   // --no-reset
-  QStringList arguments = QCoreApplication::arguments();
-  const auto noReset = hasArg("--no-reset", arguments);
-  const auto resetEnvVar = strToTrue(qEnvironmentVariable("DESKFLOW_RESET_ALL"));
-  if (resetEnvVar && !noReset) {
-    diagnostic::clearSettings(configScopes, false);
+  const auto resetEnvVar = QVariant(qEnvironmentVariable("DESKFLOW_RESET_ALL")).toBool();
+  if (resetEnvVar && !parser.isSet(noResetOption)) {
+    diagnostic::clearSettings(false);
   }
 
-  AppConfig appConfig(configScopes);
-
-  QObject::connect(
-      &configScopes, &ConfigScopes::saving, &appConfig, [&appConfig]() { appConfig.commit(); }, Qt::DirectConnection
-  );
-
-  if (appConfig.wizardShouldRun()) {
-    SetupWizard wizard(appConfig);
-    auto result = wizard.exec();
-    if (result != QDialog::Accepted) {
-      qInfo("wizard cancelled, exiting");
-      return 0;
-    }
-
-    configScopes.save();
-  }
-
-  MainWindow mainWindow(configScopes, appConfig);
+  MainWindow mainWindow;
   mainWindow.open();
 
   return QApplication::exec();
@@ -168,8 +147,6 @@ int main(int argc, char *argv[])
 #if defined(Q_OS_MAC)
 bool checkMacAssistiveDevices()
 {
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090 // mavericks
-
   // new in mavericks, applications are trusted individually
   // with use of the accessibility api. this call will show a
   // prompt which can show the security/privacy/accessibility
@@ -187,19 +164,5 @@ bool checkMacAssistiveDevices()
   bool result = AXIsProcessTrustedWithOptions(options);
   CFRelease(options);
   return result;
-
-#else
-
-  // now deprecated in mavericks.
-  bool result = AXAPIEnabled();
-  if (!result) {
-    QString msgBody = QString("Please enable access to assistive devices "
-                              "System Preferences -> Security & Privacy -> "
-                              "Privacy -> Accessibility, then re-open %1.");
-    QMessageBox::information(NULL, kAppName, msgBody.arg(kAppName));
-  }
-  return result;
-
-#endif
 }
 #endif

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

@@ -1,479 +0,0 @@
-/*
- * Deskflow -- mouse and keyboard sharing utility
- * SPDX-FileCopyrightText: (C) 2012 - 2016 Symless Ltd.
- * SPDX-FileCopyrightText: (C) 2008 Volker Lanz <vl@fidra.de>
- * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
- */
-
-#include "ServerConfigDialog.h"
-#include "ui_ServerConfigDialog.h"
-
-#include "common/constants.h"
-#include "dialogs/ActionDialog.h"
-#include "dialogs/HotkeyDialog.h"
-#include "dialogs/ScreenSettingsDialog.h"
-
-#include "ServerConfig.h"
-
-#include <QFileDialog>
-#include <QMessageBox>
-
-using enum ScreenConfig::SwitchCorner;
-using ServerProtocol = synergy::gui::ServerProtocol;
-
-ServerConfigDialog::ServerConfigDialog(QWidget *parent, ServerConfig &config, AppConfig &appConfig)
-    : QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint),
-      ui{std::make_unique<Ui::ServerConfigDialog>()},
-      m_OriginalServerConfig(config),
-      m_OriginalServerConfigIsExternal(config.useExternalConfig()),
-      m_OriginalServerConfigUsesExternalFile(config.configFile()),
-      m_ServerConfig(config),
-      m_ScreenSetupModel(serverConfig().screens(), serverConfig().numColumns(), serverConfig().numRows()),
-      m_Message(""),
-      m_appConfig(appConfig)
-{
-  ui->setupUi(this);
-
-  ui->m_pButtonBrowseConfigFile->setIcon(QIcon::fromTheme(QIcon::ThemeIcon::DocumentOpen));
-  ui->m_pTrashScreenWidget->setPixmap(QIcon::fromTheme("user-trash").pixmap(QSize(64, 64)));
-  ui->lblNewScreen->setPixmap(QIcon::fromTheme("video-display").pixmap(QSize(64, 64)));
-  ui->lblNewScreen->setToolTip(tr("Drag to the grid to add a new computer."));
-
-  // force the first tab, since qt creator sets the active tab as the last one
-  // the developer was looking at, and it's easy to accidentally save that.
-  ui->m_pTabWidget->setCurrentIndex(0);
-
-  ui->m_pEditConfigFile->setText(serverConfig().configFile());
-  ui->m_pCheckBoxUseExternalConfig->setChecked(serverConfig().useExternalConfig());
-  ui->m_pCheckBoxHeartbeat->setChecked(serverConfig().hasHeartbeat());
-  ui->m_pRadioProtocolSynergy->setChecked(serverConfig().protocol() == ServerProtocol::kSynergy);
-  ui->m_pRadioProtocolBarrier->setChecked(serverConfig().protocol() == ServerProtocol::kBarrier);
-  ui->m_pSpinBoxHeartbeat->setValue(serverConfig().heartbeat());
-
-  ui->m_pCheckBoxRelativeMouseMoves->setChecked(serverConfig().relativeMouseMoves());
-  ui->m_pCheckBoxWin32KeepForeground->setChecked(serverConfig().win32KeepForeground());
-
-  ui->m_pCheckBoxSwitchDelay->setChecked(serverConfig().hasSwitchDelay());
-  ui->m_pSpinBoxSwitchDelay->setValue(serverConfig().switchDelay());
-
-  ui->m_pCheckBoxSwitchDoubleTap->setChecked(serverConfig().hasSwitchDoubleTap());
-  ui->m_pSpinBoxSwitchDoubleTap->setValue(serverConfig().switchDoubleTap());
-
-  ui->m_pCheckBoxCornerTopLeft->setChecked(serverConfig().switchCorner(static_cast<int>(TopLeft)));
-  ui->m_pCheckBoxCornerTopRight->setChecked(serverConfig().switchCorner(static_cast<int>(TopRight)));
-  ui->m_pCheckBoxCornerBottomLeft->setChecked(serverConfig().switchCorner(static_cast<int>(BottomLeft)));
-  ui->m_pCheckBoxCornerBottomRight->setChecked(serverConfig().switchCorner(static_cast<int>(BottomRight)));
-  ui->m_pSpinBoxSwitchCornerSize->setValue(serverConfig().switchCornerSize());
-  ui->m_pCheckBoxDisableLockToScreen->setChecked(serverConfig().disableLockToScreen());
-
-  ui->m_pCheckBoxEnableClipboard->setChecked(serverConfig().clipboardSharing());
-  int clipboardSharingSizeM = static_cast<int>(serverConfig().clipboardSharingSize() / 1024);
-  ui->m_pSpinBoxClipboardSizeLimit->setValue(clipboardSharingSizeM);
-  ui->m_pSpinBoxClipboardSizeLimit->setEnabled(serverConfig().clipboardSharing());
-
-  for (const Hotkey &hotkey : std::as_const(serverConfig().hotkeys()))
-    ui->m_pListHotkeys->addItem(hotkey.text());
-
-  ui->m_pScreenSetupView->setModel(&m_ScreenSetupModel);
-
-  auto &screens = serverConfig().screens();
-  auto server = std::find_if(screens.begin(), screens.end(), [this](const Screen &screen) {
-    return (screen.name() == serverConfig().getServerName());
-  });
-
-  if (server == screens.end()) {
-    Screen serverScreen(serverConfig().getServerName());
-    serverScreen.markAsServer();
-    model().screen(serverConfig().numColumns() / 2, serverConfig().numRows() / 2) = serverScreen;
-  } else {
-    server->markAsServer();
-  }
-
-  ui->lblNewScreen->setEnabled(!model().isFull());
-  connect(ui->m_pTrashScreenWidget, &TrashScreenWidget::screenRemoved, this, &ServerConfigDialog::onScreenRemoved);
-
-  onChange();
-
-  // computers
-  connect(&m_ScreenSetupModel, &ScreenSetupModel::screensChanged, this, &ServerConfigDialog::onChange);
-
-// Above Qt 6.7 the checkbox signal signature has changed from int to Qt::CheckState
-#if QT_VERSION <= QT_VERSION_CHECK(6, 7, 0)
-  // advanced
-  connect(ui->m_pCheckBoxSwitchDelay, &QCheckBox::stateChanged, this, [this](const int &v) {
-    serverConfig().haveSwitchDelay(v);
-    onChange();
-  });
-  connect(ui->m_pCheckBoxSwitchDoubleTap, &QCheckBox::stateChanged, this, [this](const int &v) {
-    serverConfig().haveSwitchDoubleTap(v);
-    onChange();
-  });
-  connect(ui->m_pCheckBoxEnableClipboard, &QCheckBox::stateChanged, this, [this](const int &v) {
-    serverConfig().setClipboardSharing(v);
-    onChange();
-  });
-  connect(ui->m_pCheckBoxHeartbeat, &QCheckBox::stateChanged, this, [this](const int &v) {
-    serverConfig().haveHeartbeat(v);
-    onChange();
-  });
-  connect(ui->m_pCheckBoxRelativeMouseMoves, &QCheckBox::stateChanged, this, [this](const int &v) {
-    serverConfig().setRelativeMouseMoves(v);
-    onChange();
-  });
-  connect(ui->m_pCheckBoxWin32KeepForeground, &QCheckBox::stateChanged, this, [this](const int &v) {
-    serverConfig().setWin32KeepForeground(v);
-    onChange();
-  });
-  connect(ui->m_pCheckBoxDisableLockToScreen, &QCheckBox::stateChanged, this, [this](const int &v) {
-    serverConfig().setDisableLockToScreen(v);
-    onChange();
-  });
-  connect(ui->m_pCheckBoxCornerTopLeft, &QCheckBox::stateChanged, this, [this](const int &v) {
-    serverConfig().setSwitchCorner(static_cast<int>(TopLeft), v);
-    onChange();
-  });
-  connect(ui->m_pCheckBoxCornerTopRight, &QCheckBox::stateChanged, this, [this](const int &v) {
-    serverConfig().setSwitchCorner(static_cast<int>(TopRight), v);
-    onChange();
-  });
-  connect(ui->m_pCheckBoxCornerBottomLeft, &QCheckBox::stateChanged, this, [this](const int &v) {
-    serverConfig().setSwitchCorner(static_cast<int>(BottomLeft), v);
-    onChange();
-  });
-  connect(ui->m_pCheckBoxCornerBottomRight, &QCheckBox::stateChanged, this, [this](const int &v) {
-    serverConfig().setSwitchCorner(static_cast<int>(BottomRight), v);
-    onChange();
-  });
-  // config
-  connect(ui->m_pCheckBoxUseExternalConfig, &QCheckBox::stateChanged, this, [this](const int &v) {
-    serverConfig().setUseExternalConfig(v);
-    onChange();
-  });
-#else
-  connect(ui->m_pCheckBoxSwitchDelay, &QCheckBox::checkStateChanged, this, [this](const Qt::CheckState &v) {
-    serverConfig().haveSwitchDelay(v == Qt::Checked);
-    onChange();
-  });
-  connect(ui->m_pCheckBoxSwitchDoubleTap, &QCheckBox::checkStateChanged, this, [this](const Qt::CheckState &v) {
-    serverConfig().haveSwitchDoubleTap(v == Qt::Checked);
-    onChange();
-  });
-  connect(ui->m_pCheckBoxEnableClipboard, &QCheckBox::checkStateChanged, this, [this](const Qt::CheckState &v) {
-    serverConfig().setClipboardSharing(v == Qt::Checked);
-    onChange();
-  });
-  connect(ui->m_pCheckBoxHeartbeat, &QCheckBox::checkStateChanged, this, [this](const Qt::CheckState &v) {
-    serverConfig().haveHeartbeat(v == Qt::Checked);
-    onChange();
-  });
-  connect(ui->m_pCheckBoxRelativeMouseMoves, &QCheckBox::checkStateChanged, this, [this](const Qt::CheckState &v) {
-    serverConfig().setRelativeMouseMoves(v == Qt::Checked);
-    onChange();
-  });
-  connect(ui->m_pCheckBoxWin32KeepForeground, &QCheckBox::checkStateChanged, this, [this](const Qt::CheckState &v) {
-    serverConfig().setWin32KeepForeground(v == Qt::Checked);
-    onChange();
-  });
-  connect(ui->m_pCheckBoxDisableLockToScreen, &QCheckBox::checkStateChanged, this, [this](const Qt::CheckState &v) {
-    serverConfig().setDisableLockToScreen(v == Qt::Checked);
-    onChange();
-  });
-  connect(ui->m_pCheckBoxCornerTopLeft, &QCheckBox::checkStateChanged, this, [this](const Qt::CheckState &v) {
-    serverConfig().setSwitchCorner(static_cast<int>(TopLeft), v == Qt::Checked);
-    onChange();
-  });
-  connect(ui->m_pCheckBoxCornerTopRight, &QCheckBox::checkStateChanged, this, [this](const Qt::CheckState &v) {
-    serverConfig().setSwitchCorner(static_cast<int>(TopRight), v == Qt::Checked);
-    onChange();
-  });
-  connect(ui->m_pCheckBoxCornerBottomLeft, &QCheckBox::checkStateChanged, this, [this](const Qt::CheckState &v) {
-    serverConfig().setSwitchCorner(static_cast<int>(BottomLeft), v == Qt::Checked);
-    onChange();
-  });
-  connect(ui->m_pCheckBoxCornerBottomRight, &QCheckBox::checkStateChanged, this, [this](const Qt::CheckState &v) {
-    serverConfig().setSwitchCorner(static_cast<int>(BottomRight), v == Qt::Checked);
-    onChange();
-  });
-  // config
-  connect(ui->m_pCheckBoxUseExternalConfig, &QCheckBox::checkStateChanged, this, [this](const Qt::CheckState &v) {
-    serverConfig().setUseExternalConfig(v == Qt::Checked);
-    onChange();
-  });
-#endif
-
-  connect(
-      ui->m_pSpinBoxSwitchDelay, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), this,
-      [this](const int &v) {
-        serverConfig().setSwitchDelay(v);
-        onChange();
-      }
-  );
-  connect(
-      ui->m_pSpinBoxSwitchDoubleTap, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), this,
-      [this](const int &v) {
-        serverConfig().setSwitchDoubleTap(v);
-        onChange();
-      }
-  );
-  connect(
-      ui->m_pSpinBoxClipboardSizeLimit, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), this,
-      [this](const int &v) {
-        serverConfig().setClipboardSharingSize(v * 1024);
-        onChange();
-      }
-  );
-  connect(
-      ui->m_pSpinBoxHeartbeat, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), this,
-      [this](const int &v) {
-        serverConfig().setHeartbeat(v);
-        onChange();
-      }
-  );
-  connect(
-      ui->m_pSpinBoxSwitchCornerSize, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), this,
-      [this](const int &v) {
-        serverConfig().setSwitchCornerSize(v);
-        onChange();
-      }
-  );
-  connect(ui->m_pRadioProtocolSynergy, &QRadioButton::toggled, this, [this](const bool &v) {
-    if (v) {
-      serverConfig().setProtocol(ServerProtocol::kSynergy);
-      onChange();
-    }
-  });
-  connect(ui->m_pRadioProtocolBarrier, &QRadioButton::toggled, this, [this](const bool &v) {
-    if (v) {
-      serverConfig().setProtocol(ServerProtocol::kBarrier);
-      onChange();
-    }
-  });
-
-  connect(ui->m_pEditConfigFile, &QLineEdit::textChanged, this, [this]() {
-    serverConfig().setConfigFile(ui->m_pEditConfigFile->text());
-    onChange();
-  });
-}
-
-ServerConfigDialog::~ServerConfigDialog() = default;
-
-bool ServerConfigDialog::addClient(const QString &clientName)
-{
-  return addComputer(clientName, true);
-}
-
-void ServerConfigDialog::accept()
-{
-  if (ui->m_pCheckBoxUseExternalConfig->isChecked() && !QFile::exists(ui->m_pEditConfigFile->text())) {
-
-    auto selectedButton = QMessageBox::warning(
-        this, "Filename invalid", "Please select a valid configuration file.", QMessageBox::Ok | QMessageBox::Ignore
-    );
-
-    if (selectedButton != QMessageBox::Ok || !on_m_pButtonBrowseConfigFile_clicked()) {
-      return;
-    }
-  }
-
-  // now that the dialog has been accepted, copy the new server config to the
-  // original one, which is a reference to the one in MainWindow.
-  setOriginalServerConfig(serverConfig());
-
-  QDialog::accept();
-}
-
-void ServerConfigDialog::reject()
-{
-  serverConfig().setUseExternalConfig(m_OriginalServerConfigIsExternal);
-  serverConfig().setConfigFile(m_OriginalServerConfigUsesExternalFile);
-
-  QDialog::reject();
-}
-
-void ServerConfigDialog::on_m_pButtonNewHotkey_clicked()
-{
-  Hotkey hotkey;
-  HotkeyDialog dlg(this, hotkey);
-  if (dlg.exec() == QDialog::Accepted) {
-    serverConfig().hotkeys().append(hotkey);
-    ui->m_pListHotkeys->addItem(hotkey.text());
-    onChange();
-  }
-}
-
-void ServerConfigDialog::on_m_pButtonEditHotkey_clicked()
-{
-  int idx = ui->m_pListHotkeys->currentRow();
-  Q_ASSERT(idx >= 0 && idx < serverConfig().hotkeys().size());
-  Hotkey &hotkey = serverConfig().hotkeys()[idx];
-  HotkeyDialog dlg(this, hotkey);
-  if (dlg.exec() == QDialog::Accepted) {
-    ui->m_pListHotkeys->currentItem()->setText(hotkey.text());
-    onChange();
-  }
-}
-
-void ServerConfigDialog::on_m_pButtonRemoveHotkey_clicked()
-{
-  int idx = ui->m_pListHotkeys->currentRow();
-  Q_ASSERT(idx >= 0 && idx < serverConfig().hotkeys().size());
-  serverConfig().hotkeys().removeAt(idx);
-  ui->m_pListActions->clear();
-  delete ui->m_pListHotkeys->item(idx);
-  onChange();
-}
-
-void ServerConfigDialog::on_m_pListHotkeys_itemSelectionChanged()
-{
-  bool itemsSelected = !ui->m_pListHotkeys->selectedItems().isEmpty();
-  ui->m_pButtonEditHotkey->setEnabled(itemsSelected);
-  ui->m_pButtonRemoveHotkey->setEnabled(itemsSelected);
-  ui->m_pButtonNewAction->setEnabled(itemsSelected);
-
-  if (itemsSelected && serverConfig().hotkeys().size() > 0) {
-    ui->m_pListActions->clear();
-
-    int idx = ui->m_pListHotkeys->row(ui->m_pListHotkeys->selectedItems()[0]);
-
-    // There's a bug somewhere around here: We get idx == 1 right after we
-    // deleted the next to last item, so idx can only possibly be 0. GDB shows
-    // we got called indirectly from the delete line in
-    // on_m_pButtonRemoveHotkey_clicked() above, but the delete is of course
-    // necessary and seems correct. The while() is a generalized workaround for
-    // all that and shouldn't be required.
-    while (idx >= 0 && idx >= serverConfig().hotkeys().size())
-      idx--;
-
-    Q_ASSERT(idx >= 0 && idx < serverConfig().hotkeys().size());
-
-    const Hotkey &hotkey = serverConfig().hotkeys()[idx];
-    for (const Action &action : hotkey.actions())
-      ui->m_pListActions->addItem(action.text());
-  }
-}
-
-void ServerConfigDialog::on_m_pButtonNewAction_clicked()
-{
-  int idx = ui->m_pListHotkeys->currentRow();
-  Q_ASSERT(idx >= 0 && idx < serverConfig().hotkeys().size());
-  Hotkey &hotkey = serverConfig().hotkeys()[idx];
-
-  Action action;
-  ActionDialog dlg(this, serverConfig(), hotkey, action);
-  if (dlg.exec() == QDialog::Accepted) {
-    hotkey.actions().append(action);
-    ui->m_pListActions->addItem(action.text());
-    onChange();
-  }
-}
-
-void ServerConfigDialog::on_m_pButtonEditAction_clicked()
-{
-  int idxHotkey = ui->m_pListHotkeys->currentRow();
-  Q_ASSERT(idxHotkey >= 0 && idxHotkey < serverConfig().hotkeys().size());
-  Hotkey &hotkey = serverConfig().hotkeys()[idxHotkey];
-
-  int idxAction = ui->m_pListActions->currentRow();
-  Q_ASSERT(idxAction >= 0 && idxAction < hotkey.actions().size());
-  Action &action = hotkey.actions()[idxAction];
-
-  ActionDialog dlg(this, serverConfig(), hotkey, action);
-  if (dlg.exec() == QDialog::Accepted) {
-    ui->m_pListActions->currentItem()->setText(action.text());
-    onChange();
-  }
-}
-
-void ServerConfigDialog::on_m_pButtonRemoveAction_clicked()
-{
-  int idxHotkey = ui->m_pListHotkeys->currentRow();
-  Q_ASSERT(idxHotkey >= 0 && idxHotkey < serverConfig().hotkeys().size());
-  Hotkey &hotkey = serverConfig().hotkeys()[idxHotkey];
-
-  int idxAction = ui->m_pListActions->currentRow();
-  Q_ASSERT(idxAction >= 0 && idxAction < hotkey.actions().size());
-
-  hotkey.actions().removeAt(idxAction);
-  delete ui->m_pListActions->currentItem();
-  onChange();
-}
-
-void ServerConfigDialog::on_m_pCheckBoxEnableClipboard_stateChanged(int const state)
-{
-  ui->m_pSpinBoxClipboardSizeLimit->setEnabled(state == Qt::Checked);
-  if ((state == Qt::Checked) && (!ui->m_pSpinBoxClipboardSizeLimit->value())) {
-    int size = static_cast<int>((serverConfig().defaultClipboardSharingSize() + 512) / 1024);
-    ui->m_pSpinBoxClipboardSizeLimit->setValue(size ? size : 1);
-  }
-}
-
-void ServerConfigDialog::on_m_pListActions_itemSelectionChanged()
-{
-  ui->m_pButtonEditAction->setEnabled(!ui->m_pListActions->selectedItems().isEmpty());
-  ui->m_pButtonRemoveAction->setEnabled(!ui->m_pListActions->selectedItems().isEmpty());
-}
-
-void ServerConfigDialog::on_m_pButtonAddComputer_clicked()
-{
-  addComputer("", false);
-}
-
-void ServerConfigDialog::onScreenRemoved()
-{
-  ui->lblNewScreen->setEnabled(true);
-  onChange();
-}
-
-void ServerConfigDialog::on_m_pCheckBoxUseExternalConfig_toggled(bool checked)
-{
-  ui->m_pLabelConfigFile->setEnabled(checked);
-  ui->m_pEditConfigFile->setEnabled(checked);
-  ui->m_pButtonBrowseConfigFile->setEnabled(checked);
-
-  ui->m_pTabWidget->setTabEnabled(0, !checked);
-  ui->m_pTabWidget->setTabEnabled(1, !checked);
-  ui->m_pTabWidget->setTabEnabled(2, !checked);
-}
-
-bool ServerConfigDialog::on_m_pButtonBrowseConfigFile_clicked()
-{
-#if defined(Q_OS_WIN)
-  static const auto configExt = QStringLiteral("sgc");
-#else
-  static const auto configExt = QStringLiteral("conf");
-#endif
-  static const auto deskflowConfigFilter = QStringLiteral("%1 Configurations (*.%2);;All files (*.*)");
-
-  QString fileName =
-      QFileDialog::getOpenFileName(this, "Browse for a config file", "", deskflowConfigFilter.arg(kAppName, configExt));
-
-  if (!fileName.isEmpty()) {
-    ui->m_pEditConfigFile->setText(fileName);
-    return true;
-  }
-
-  return false;
-}
-
-bool ServerConfigDialog::addComputer(const QString &clientName, bool doSilent)
-{
-  bool isAccepted = false;
-  Screen newScreen(clientName);
-
-  ScreenSettingsDialog dlg(this, &newScreen, &model().m_Screens);
-  if (doSilent || dlg.exec() == QDialog::Accepted) {
-    model().addScreen(newScreen);
-    isAccepted = true;
-  }
-
-  ui->lblNewScreen->setEnabled(!model().isFull());
-  return isAccepted;
-}
-
-void ServerConfigDialog::onChange()
-{
-  bool isAppConfigDataEqual = m_OriginalServerConfigIsExternal == serverConfig().useExternalConfig() &&
-                              m_OriginalServerConfigUsesExternalFile == serverConfig().configFile();
-  ui->m_pButtonBox->button(QDialogButtonBox::Ok)
-      ->setEnabled(!isAppConfigDataEqual || !(m_OriginalServerConfig == m_ServerConfig));
-}

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

@@ -1,340 +0,0 @@
-/*
- * Deskflow -- mouse and keyboard sharing utility
- * SPDX-FileCopyrightText: (C) 2012 Symless Ltd.
- * SPDX-FileCopyrightText: (C) 2008 Volker Lanz <vl@fidra.de>
- * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
- */
-
-#include "SettingsDialog.h"
-#include "ui_SettingsDialog.h"
-
-#include "gui/core/CoreProcess.h"
-#include "gui/messages.h"
-#include "gui/style_utils.h"
-#include "gui/tls/TlsCertificate.h"
-#include "gui/tls/TlsUtility.h"
-#include "gui/validators/ScreenNameValidator.h"
-#include "gui/validators/ValidationError.h"
-
-#include <QDir>
-#include <QFileDialog>
-#include <QMessageBox>
-
-using namespace deskflow::gui;
-
-SettingsDialog::SettingsDialog(
-    QWidget *parent, AppConfig &appConfig, const IServerConfig &serverConfig, const CoreProcess &coreProcess
-)
-    : QDialog(parent),
-      ui{std::make_unique<Ui::SettingsDialog>()},
-      m_appConfig(appConfig),
-      m_serverConfig(serverConfig),
-      m_coreProcess(coreProcess),
-      m_tlsUtility(appConfig)
-{
-
-  ui->setupUi(this);
-
-  ui->m_pComboBoxTlsKeyLength->setItemIcon(0, QIcon::fromTheme(QIcon::ThemeIcon::SecurityLow));
-  ui->m_pComboBoxTlsKeyLength->setItemIcon(1, QIcon::fromTheme(QStringLiteral("security-medium")));
-  ui->m_pComboBoxTlsKeyLength->setItemIcon(2, QIcon::fromTheme(QIcon::ThemeIcon::SecurityHigh));
-
-  ui->m_pPushButtonTlsRegenCert->setIcon(QIcon::fromTheme(QIcon::ThemeIcon::ViewRefresh));
-
-  ui->m_pPushButtonTlsCertPath->setIcon(QIcon::fromTheme(QIcon::ThemeIcon::DocumentOpen));
-  ui->m_pButtonBrowseLog->setIcon(QIcon::fromTheme(QIcon::ThemeIcon::DocumentOpen));
-
-  ui->rb_icon_mono->setIcon(QIcon::fromTheme(QStringLiteral("deskflow-symbolic")));
-  ui->rb_icon_colorful->setIcon(QIcon::fromTheme(QStringLiteral("deskflow")));
-
-  // force the first tab, since qt creator sets the active tab as the last one
-  // the developer was looking at, and it's easy to accidentally save that.
-  ui->m_pTabWidget->setCurrentIndex(0);
-
-  loadFromConfig();
-  m_wasOriginallySystemScope = m_appConfig.isActiveScopeSystem();
-  updateControls();
-
-  m_pScreenNameError = new validators::ValidationError(this);
-  ui->m_pLineEditScreenName->setValidator(
-      new validators::ScreenNameValidator(ui->m_pLineEditScreenName, m_pScreenNameError, &serverConfig.screens())
-  );
-
-  connect(ui->m_pCheckBoxEnableTls, &QCheckBox::toggled, this, &SettingsDialog::updateTlsControlsEnabled);
-
-  connect(
-      this, &SettingsDialog::shown, this,
-      [this] {
-        if (!m_appConfig.isActiveScopeWritable()) {
-          showReadOnlyMessage();
-        }
-      },
-      Qt::QueuedConnection
-  );
-
-  adjustSize();
-  QApplication::processEvents();
-  setFixedHeight(height());
-  setWindowFlags((windowFlags() | Qt::CustomizeWindowHint) & ~Qt::WindowMinMaxButtonsHint);
-}
-
-//
-// Auto-connect slots
-//
-
-void SettingsDialog::on_m_pCheckBoxLogToFile_stateChanged(int i)
-{
-  bool checked = i == 2;
-
-  ui->m_pLabelLogPath->setEnabled(checked);
-  ui->m_pLineEditLogFilename->setEnabled(checked);
-  ui->m_pButtonBrowseLog->setEnabled(checked);
-}
-
-void SettingsDialog::on_m_pButtonBrowseLog_clicked()
-{
-  QString fileName = QFileDialog::getSaveFileName(
-      this, tr("Save log file to..."), ui->m_pLineEditLogFilename->text(), "Logs (*.log *.txt)"
-  );
-
-  if (!fileName.isEmpty()) {
-    ui->m_pLineEditLogFilename->setText(fileName);
-  }
-}
-
-void SettingsDialog::on_m_pCheckBoxEnableTls_clicked(bool)
-{
-  updateTlsControlsEnabled();
-}
-
-void SettingsDialog::on_m_pRadioSystemScope_toggled(bool checked)
-{
-  // We only need to test the System scoped Radio as they are connected
-  m_appConfig.setLoadFromSystemScope(checked);
-  loadFromConfig();
-  updateControls();
-
-  if (isVisible() && !m_appConfig.isActiveScopeWritable()) {
-    showReadOnlyMessage();
-  }
-}
-
-void SettingsDialog::on_m_pPushButtonTlsCertPath_clicked()
-{
-  QString fileName = QFileDialog::getSaveFileName(
-      this, tr("Select a TLS certificate to use..."), ui->m_pLineEditTlsCertPath->text(), "Cert (*.pem)", nullptr,
-      QFileDialog::DontConfirmOverwrite
-  );
-
-  if (!fileName.isEmpty()) {
-    ui->m_pLineEditTlsCertPath->setText(fileName);
-
-    if (QFile(fileName).exists()) {
-      updateKeyLengthOnFile(fileName);
-    } else {
-      qDebug("no tls certificate file at: %s", qUtf8Printable(fileName));
-    }
-  }
-}
-
-void SettingsDialog::on_m_pPushButtonTlsRegenCert_clicked()
-{
-  if (m_tlsUtility.generateCertificate()) {
-    QMessageBox::information(this, tr("TLS Certificate Regenerated"), tr("TLS certificate regenerated successfully."));
-  }
-}
-
-void SettingsDialog::on_m_pCheckBoxServiceEnabled_toggled(bool)
-{
-  updateControls();
-}
-
-//
-// End of auto-connect slots
-//
-
-void SettingsDialog::showEvent(QShowEvent *event)
-{
-  QDialog::showEvent(event);
-  Q_EMIT shown();
-}
-
-void SettingsDialog::showReadOnlyMessage()
-{
-  const auto activeScopeFilename = m_appConfig.scopes().activeFilePath();
-  messages::showReadOnlySettings(this, activeScopeFilename);
-}
-
-void SettingsDialog::accept()
-{
-  if (!ui->m_pLineEditScreenName->hasAcceptableInput()) {
-    QMessageBox::warning(this, tr("Invalid screen name"), m_pScreenNameError->message());
-    return;
-  }
-
-  m_appConfig.setLoadFromSystemScope(ui->m_pRadioSystemScope->isChecked());
-  m_appConfig.setScreenName(ui->m_pLineEditScreenName->text());
-  m_appConfig.setPort(ui->m_pSpinBoxPort->value());
-  m_appConfig.setNetworkInterface(ui->m_pLineEditInterface->text());
-  m_appConfig.setLogLevel(ui->m_pComboLogLevel->currentIndex());
-  m_appConfig.setLogToFile(ui->m_pCheckBoxLogToFile->isChecked());
-  m_appConfig.setLogFilename(ui->m_pLineEditLogFilename->text());
-  m_appConfig.setElevateMode(static_cast<ElevateMode>(ui->m_pComboElevate->currentIndex()));
-  m_appConfig.setAutoHide(ui->m_pCheckBoxAutoHide->isChecked());
-  m_appConfig.setEnableUpdateCheck(ui->m_pCheckBoxAutoUpdate->isChecked());
-  m_appConfig.setPreventSleep(ui->m_pCheckBoxPreventSleep->isChecked());
-  m_appConfig.setTlsCertPath(ui->m_pLineEditTlsCertPath->text());
-  m_appConfig.setTlsKeyLength(ui->m_pComboBoxTlsKeyLength->currentText().toInt());
-  m_appConfig.setTlsEnabled(ui->m_pCheckBoxEnableTls->isChecked());
-  m_appConfig.setLanguageSync(ui->m_pCheckBoxLanguageSync->isChecked());
-  m_appConfig.setInvertScrollDirection(ui->m_pCheckBoxScrollDirection->isChecked());
-  m_appConfig.setEnableService(ui->m_pCheckBoxServiceEnabled->isChecked());
-  m_appConfig.setCloseToTray(ui->m_pCheckBoxCloseToTray->isChecked());
-  m_appConfig.setInvertConnection(ui->m_pInvertConnection->isChecked());
-  m_appConfig.setColorfulTrayIcon(ui->rb_icon_colorful->isChecked());
-
-  QDialog::accept();
-}
-
-void SettingsDialog::reject()
-{
-  // restore original system scope value on reject.
-  if (m_appConfig.isActiveScopeSystem() != m_wasOriginallySystemScope) {
-    m_appConfig.setLoadFromSystemScope(m_wasOriginallySystemScope);
-  }
-
-  QDialog::reject();
-}
-
-void SettingsDialog::loadFromConfig()
-{
-
-  ui->m_pLineEditScreenName->setText(m_appConfig.screenName());
-  ui->m_pSpinBoxPort->setValue(m_appConfig.port());
-  ui->m_pLineEditInterface->setText(m_appConfig.networkInterface());
-  ui->m_pComboLogLevel->setCurrentIndex(m_appConfig.logLevel());
-  ui->m_pCheckBoxLogToFile->setChecked(m_appConfig.logToFile());
-  ui->m_pLineEditLogFilename->setText(m_appConfig.logFilename());
-  ui->m_pCheckBoxAutoHide->setChecked(m_appConfig.autoHide());
-  ui->m_pCheckBoxPreventSleep->setChecked(m_appConfig.preventSleep());
-  ui->m_pCheckBoxLanguageSync->setChecked(m_appConfig.languageSync());
-  ui->m_pCheckBoxScrollDirection->setChecked(m_appConfig.invertScrollDirection());
-  ui->m_pCheckBoxServiceEnabled->setChecked(m_appConfig.enableService());
-  ui->m_pCheckBoxCloseToTray->setChecked(m_appConfig.closeToTray());
-  ui->m_pComboElevate->setCurrentIndex(static_cast<int>(m_appConfig.elevateMode()));
-
-  if (m_appConfig.enableUpdateCheck().has_value()) {
-    ui->m_pCheckBoxAutoUpdate->setChecked(m_appConfig.enableUpdateCheck().value());
-  } else {
-    ui->m_pCheckBoxAutoUpdate->setChecked(false);
-  }
-
-  if (m_appConfig.isActiveScopeSystem()) {
-    ui->m_pRadioSystemScope->setChecked(true);
-  } else {
-    ui->m_pRadioUserScope->setChecked(true);
-  }
-
-  ui->m_pInvertConnection->setChecked(m_appConfig.invertConnection());
-
-  if (m_appConfig.colorfulTrayIcon())
-    ui->rb_icon_colorful->setChecked(true);
-  else
-    ui->rb_icon_mono->setChecked(true);
-
-  updateTlsControls();
-}
-
-void SettingsDialog::updateTlsControls()
-{
-
-  if (QFile(m_appConfig.tlsCertPath()).exists()) {
-    updateKeyLengthOnFile(m_appConfig.tlsCertPath());
-  } else {
-    const auto keyLengthText = QString::number(m_appConfig.tlsKeyLength());
-    ui->m_pComboBoxTlsKeyLength->setCurrentIndex(ui->m_pComboBoxTlsKeyLength->findText(keyLengthText));
-  }
-
-  const auto tlsEnabled = m_tlsUtility.isEnabled();
-  const auto writable = m_appConfig.isActiveScopeWritable();
-
-  ui->m_pCheckBoxEnableTls->setEnabled(writable);
-  ui->m_pCheckBoxEnableTls->setChecked(writable && tlsEnabled);
-  ui->m_pLineEditTlsCertPath->setText(m_appConfig.tlsCertPath());
-}
-
-void SettingsDialog::updateTlsControlsEnabled()
-{
-  const auto writable = m_appConfig.isActiveScopeWritable();
-  const auto clientMode = m_appConfig.clientGroupChecked();
-  const auto tlsChecked = ui->m_pCheckBoxEnableTls->isChecked();
-
-  auto enabled = writable && tlsChecked && !clientMode;
-  ui->m_pLabelTlsKeyLength->setEnabled(enabled);
-  ui->m_pComboBoxTlsKeyLength->setEnabled(enabled);
-  ui->m_pLabelTlsCert->setEnabled(enabled);
-  ui->m_pLineEditTlsCertPath->setEnabled(enabled);
-  ui->m_pPushButtonTlsCertPath->setEnabled(enabled);
-  ui->m_pPushButtonTlsRegenCert->setEnabled(enabled);
-}
-
-bool SettingsDialog::isClientMode() const
-{
-  return m_coreProcess.mode() == deskflow::gui::CoreProcess::Mode::Client;
-}
-
-void SettingsDialog::updateKeyLengthOnFile(const QString &path)
-{
-  TlsCertificate ssl;
-  if (!QFile(path).exists()) {
-    qFatal("tls certificate file not found: %s", qUtf8Printable(path));
-  }
-
-  auto length = ssl.getCertKeyLength(path);
-  auto index = ui->m_pComboBoxTlsKeyLength->findText(QString::number(length));
-  ui->m_pComboBoxTlsKeyLength->setCurrentIndex(index);
-  m_appConfig.setTlsKeyLength(length);
-}
-
-void SettingsDialog::updateControls()
-{
-
-#if defined(Q_OS_WIN)
-  const auto serviceAvailable = true;
-#else
-  // service not supported on unix yet, so always disable.
-  const auto serviceAvailable = false;
-  ui->m_pGroupService->setTitle("Service (Windows only)");
-#endif
-
-  const bool writable = m_appConfig.isActiveScopeWritable();
-  const bool serviceChecked = ui->m_pCheckBoxServiceEnabled->isChecked();
-  const bool logToFile = ui->m_pCheckBoxLogToFile->isChecked();
-
-  ui->m_pLineEditScreenName->setEnabled(writable);
-  ui->m_pSpinBoxPort->setEnabled(writable);
-  ui->m_pLineEditInterface->setEnabled(writable);
-  ui->m_pComboLogLevel->setEnabled(writable);
-  ui->m_pCheckBoxLogToFile->setEnabled(writable);
-  ui->m_pCheckBoxAutoHide->setEnabled(writable);
-  ui->m_pCheckBoxAutoUpdate->setEnabled(writable);
-  ui->m_pCheckBoxPreventSleep->setEnabled(writable);
-  ui->m_pLineEditTlsCertPath->setEnabled(writable);
-  ui->m_pComboBoxTlsKeyLength->setEnabled(writable);
-  ui->m_pCheckBoxCloseToTray->setEnabled(writable);
-
-  ui->m_pCheckBoxServiceEnabled->setEnabled(writable && serviceAvailable);
-  ui->m_pLabelElevate->setEnabled(writable && serviceChecked && serviceAvailable);
-  ui->m_pComboElevate->setEnabled(writable && serviceChecked && serviceAvailable);
-
-  ui->m_pCheckBoxLanguageSync->setEnabled(writable && isClientMode());
-  ui->m_pCheckBoxScrollDirection->setEnabled(writable && isClientMode());
-
-  ui->m_pLabelLogPath->setEnabled(writable && logToFile);
-  ui->m_pLineEditLogFilename->setEnabled(writable && logToFile);
-  ui->m_pButtonBrowseLog->setEnabled(writable && logToFile);
-
-  updateTlsControls();
-}
-
-SettingsDialog::~SettingsDialog() = default;

src/apps/deskflow-gui/dialogs/SettingsDialog.ui

@@ -1,824 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>SettingsDialog</class>
- <widget class="QDialog" name="SettingsDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>550</width>
-    <height>652</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Preferences</string>
-  </property>
-  <property name="modal">
-   <bool>true</bool>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout_7">
-   <property name="spacing">
-    <number>20</number>
-   </property>
-   <item>
-    <widget class="QTabWidget" name="m_pTabWidget">
-     <property name="tabPosition">
-      <enum>QTabWidget::TabPosition::North</enum>
-     </property>
-     <property name="currentIndex">
-      <number>0</number>
-     </property>
-     <widget class="QWidget" name="m_pTabRegular">
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <attribute name="title">
-       <string>&amp;Regular</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_3">
-       <property name="spacing">
-        <number>15</number>
-       </property>
-       <item>
-        <widget class="QGroupBox" name="m_pGroupBasics">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="title">
-          <string>Basics</string>
-         </property>
-         <layout class="QVBoxLayout" name="verticalLayout_2">
-          <item>
-           <layout class="QHBoxLayout" name="horizontalLayout">
-            <item>
-             <widget class="QLabel" name="m_pLabelComputerName">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="minimumSize">
-               <size>
-                <width>75</width>
-                <height>0</height>
-               </size>
-              </property>
-              <property name="text">
-               <string>Computer name</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <spacer name="horizontalSpacer">
-              <property name="orientation">
-               <enum>Qt::Orientation::Horizontal</enum>
-              </property>
-              <property name="sizeType">
-               <enum>QSizePolicy::Policy::Maximum</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>20</width>
-                <height>20</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-            <item>
-             <widget class="QLineEdit" name="m_pLineEditScreenName">
-              <property name="enabled">
-               <bool>true</bool>
-              </property>
-              <property name="maxLength">
-               <number>255</number>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-          <item>
-           <widget class="QCheckBox" name="m_pCheckBoxPreventSleep">
-            <property name="text">
-             <string>Prevent this computer from going to sleep</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QCheckBox" name="m_pCheckBoxLanguageSync">
-            <property name="text">
-             <string>Use server's keyboard language on this computer (client mode)</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QCheckBox" name="m_pCheckBoxScrollDirection">
-            <property name="text">
-             <string>Invert scroll direction on this computer (client mode)</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="m_pGroupApp">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="title">
-          <string>App</string>
-         </property>
-         <layout class="QVBoxLayout" name="verticalLayout_5">
-          <item>
-           <widget class="QCheckBox" name="m_pCheckBoxAutoUpdate">
-            <property name="text">
-             <string>Check for updates on startup </string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QCheckBox" name="m_pCheckBoxCloseToTray">
-            <property name="text">
-             <string>Leave app running in notification area when the window is closed</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QCheckBox" name="m_pCheckBoxAutoHide">
-            <property name="text">
-             <string>Hide the window when the app starts</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <layout class="QHBoxLayout" name="horizontalLayout_8">
-            <item>
-             <widget class="QLabel" name="label">
-              <property name="text">
-               <string>Tray icon style</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QRadioButton" name="rb_icon_colorful">
-              <property name="text">
-               <string>Colorful</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QRadioButton" name="rb_icon_mono">
-              <property name="text">
-               <string>Monocolor</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="m_pGroupSecurity">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="title">
-          <string>Security</string>
-         </property>
-         <layout class="QVBoxLayout" name="verticalLayout">
-          <property name="spacing">
-           <number>5</number>
-          </property>
-          <property name="topMargin">
-           <number>9</number>
-          </property>
-          <property name="bottomMargin">
-           <number>9</number>
-          </property>
-          <item>
-           <layout class="QHBoxLayout" name="horizontalLayout_5">
-            <property name="topMargin">
-             <number>0</number>
-            </property>
-            <item>
-             <widget class="QCheckBox" name="m_pCheckBoxEnableTls">
-              <property name="enabled">
-               <bool>true</bool>
-              </property>
-              <property name="text">
-               <string>Enable TLS encryption</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <spacer name="horizontalSpacer_2">
-              <property name="orientation">
-               <enum>Qt::Orientation::Horizontal</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>40</width>
-                <height>20</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-            <item>
-             <widget class="QLabel" name="m_pLabelTlsKeyLength">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="text">
-               <string>Key length</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QComboBox" name="m_pComboBoxTlsKeyLength">
-              <property name="currentText">
-               <string>1024</string>
-              </property>
-              <item>
-               <property name="text">
-                <string>1024</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string>2048</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string>4096</string>
-               </property>
-              </item>
-             </widget>
-            </item>
-           </layout>
-          </item>
-          <item>
-           <layout class="QHBoxLayout" name="horizontalLayout_6">
-            <property name="topMargin">
-             <number>0</number>
-            </property>
-            <item>
-             <widget class="QLabel" name="m_pLabelTlsCert">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="text">
-               <string>Certificate</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <spacer name="horizontalSpacer_3">
-              <property name="orientation">
-               <enum>Qt::Orientation::Horizontal</enum>
-              </property>
-              <property name="sizeType">
-               <enum>QSizePolicy::Policy::Minimum</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>30</width>
-                <height>20</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-            <item>
-             <widget class="QLineEdit" name="m_pLineEditTlsCertPath">
-              <property name="minimumSize">
-               <size>
-                <width>0</width>
-                <height>0</height>
-               </size>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QPushButton" name="m_pPushButtonTlsCertPath">
-              <property name="cursor">
-               <cursorShape>PointingHandCursor</cursorShape>
-              </property>
-              <property name="text">
-               <string/>
-              </property>
-              <property name="flat">
-               <bool>true</bool>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-          <item>
-           <layout class="QHBoxLayout" name="horizontalLayout_7">
-            <property name="topMargin">
-             <number>0</number>
-            </property>
-            <item>
-             <spacer name="horizontalSpacer_4">
-              <property name="orientation">
-               <enum>Qt::Orientation::Horizontal</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>40</width>
-                <height>20</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-            <item>
-             <widget class="QPushButton" name="m_pPushButtonTlsRegenCert">
-              <property name="text">
-               <string>Regenerate certificate</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-         </layout>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="m_pTabAdvanced">
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <attribute name="title">
-       <string>&amp;Advanced</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_6">
-       <property name="spacing">
-        <number>15</number>
-       </property>
-       <item>
-        <widget class="QGroupBox" name="m_pGroupNetworking">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="title">
-          <string>Networking</string>
-         </property>
-         <layout class="QVBoxLayout" name="verticalLayout_4">
-          <item>
-           <layout class="QHBoxLayout" name="horizontalLayout_2">
-            <property name="topMargin">
-             <number>0</number>
-            </property>
-            <item>
-             <widget class="QLabel" name="m_pLabel_20">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="text">
-               <string>Port</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QSpinBox" name="m_pSpinBoxPort">
-              <property name="enabled">
-               <bool>true</bool>
-              </property>
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="maximum">
-               <number>65535</number>
-              </property>
-              <property name="value">
-               <number>24800</number>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QLabel" name="m_pLabel_21">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="text">
-               <string>Network IP</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QLineEdit" name="m_pLineEditInterface">
-              <property name="enabled">
-               <bool>true</bool>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-          <item>
-           <widget class="QCheckBox" name="m_pInvertConnection">
-            <property name="text">
-             <string>Invert server/client TCP connection</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="m_pGroupLogs">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="title">
-          <string>Logs</string>
-         </property>
-         <layout class="QGridLayout" name="gridLayout">
-          <property name="topMargin">
-           <number>15</number>
-          </property>
-          <property name="bottomMargin">
-           <number>15</number>
-          </property>
-          <property name="verticalSpacing">
-           <number>7</number>
-          </property>
-          <item row="0" column="1">
-           <spacer name="horizontalSpacer_5">
-            <property name="orientation">
-             <enum>Qt::Orientation::Horizontal</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>40</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-          <item row="0" column="0">
-           <widget class="QCheckBox" name="m_pCheckBoxLogToFile">
-            <property name="text">
-             <string>Log to file</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="3">
-           <widget class="QComboBox" name="m_pComboLogLevel">
-            <item>
-             <property name="text">
-              <string>Info</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Debug</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Debug1</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Debug2</string>
-             </property>
-            </item>
-           </widget>
-          </item>
-          <item row="0" column="2">
-           <widget class="QLabel" name="m_pLabel_3">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="minimumSize">
-             <size>
-              <width>0</width>
-              <height>0</height>
-             </size>
-            </property>
-            <property name="text">
-             <string>Level</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="0" colspan="4">
-           <layout class="QHBoxLayout" name="horizontalLayout_4">
-            <property name="spacing">
-             <number>3</number>
-            </property>
-            <property name="topMargin">
-             <number>0</number>
-            </property>
-            <item>
-             <widget class="QLabel" name="m_pLabelLogPath">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="text">
-               <string>Log path</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <spacer name="horizontalSpacer_7">
-              <property name="orientation">
-               <enum>Qt::Orientation::Horizontal</enum>
-              </property>
-              <property name="sizeType">
-               <enum>QSizePolicy::Policy::Minimum</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>30</width>
-                <height>20</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-            <item>
-             <widget class="QLineEdit" name="m_pLineEditLogFilename">
-              <property name="enabled">
-               <bool>false</bool>
-              </property>
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QPushButton" name="m_pButtonBrowseLog">
-              <property name="enabled">
-               <bool>false</bool>
-              </property>
-              <property name="cursor">
-               <cursorShape>PointingHandCursor</cursorShape>
-              </property>
-              <property name="text">
-               <string/>
-              </property>
-              <property name="flat">
-               <bool>true</bool>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="m_pGroupService">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="title">
-          <string>Service</string>
-         </property>
-         <layout class="QGridLayout" name="gridLayout_3">
-          <item row="1" column="0">
-           <layout class="QHBoxLayout" name="horizontalLayout_9">
-            <item>
-             <widget class="QLabel" name="m_pLabelElevate">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="text">
-               <string>Launch with elevated privileges</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QComboBox" name="m_pComboElevate">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="minimumSize">
-               <size>
-                <width>0</width>
-                <height>0</height>
-               </size>
-              </property>
-              <property name="toolTip">
-               <string>Specify when the Windows background service should run the server or client
-                  process at an elevated privilege level.</string>
-              </property>
-              <property name="whatsThis">
-               <string>
-                &lt;p&gt;You may want to alter whether or not the privilege level of the server or client 
-                  process is automatically changed depending on your use case. In some cases it can help
-                  to diagnose or solve some problems related to elevated processes in Windows.&lt;/p&gt;
-                &lt;ul&gt;
-                  &lt;li&gt;Automatic: Elevate when the window session changes to secure mode&lt;/li&gt;
-                  &lt;li&gt;Always elevate: Always run in elevated mode (could be unsafe)&lt;/li&gt;
-                  &lt;li&gt;Never elevate: Turn off compatibility with login screen and UAC&lt;/li&gt;
-                &lt;/ul&gt;
-                </string>
-              </property>
-              <property name="currentIndex">
-               <number>0</number>
-              </property>
-              <item>
-               <property name="text">
-                <string>Automatic (as needed)</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string>Always elevate</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string>Never elevate</string>
-               </property>
-              </item>
-             </widget>
-            </item>
-           </layout>
-          </item>
-          <item row="0" column="0">
-           <widget class="QCheckBox" name="m_pCheckBoxServiceEnabled">
-            <property name="toolTip">
-             <string>Whether to launch the server or client process through the Windows background
-                service or direct from the GUI.</string>
-            </property>
-            <property name="whatsThis">
-             <string>
-              &lt;p&gt;The background service is only available on Windows.&lt;/p&gt;
-              &lt;p&gt;The Windows background service is used to:&lt;/p&gt;
-              &lt;ul&gt;
-              &lt;li&gt;Start the server or client automatically when the computer starts.&lt;/li&gt;
-              &lt;li&gt;Run the server or client in an elevated mode (e.g. on login screen, UAC dialogs, etc).&lt;/li&gt;
-              &lt;/ul&gt;
-              </string>
-            </property>
-            <property name="text">
-             <string>Use background service (daemon)</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="m_pGroupScope">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="title">
-          <string>Use settings profile from</string>
-         </property>
-         <layout class="QHBoxLayout" name="horizontalLayout_3">
-          <item>
-           <widget class="QRadioButton" name="m_pRadioUserScope">
-            <property name="text">
-             <string>Current user</string>
-            </property>
-            <property name="checked">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QRadioButton" name="m_pRadioSystemScope">
-            <property name="text">
-             <string>All users</string>
-            </property>
-            <property name="checked">
-             <bool>false</bool>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-    </widget>
-   </item>
-   <item>
-    <widget class="QDialogButtonBox" name="m_pButtonBox">
-     <property name="orientation">
-      <enum>Qt::Orientation::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Save</set>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <tabstops>
-  <tabstop>m_pLineEditScreenName</tabstop>
-  <tabstop>m_pSpinBoxPort</tabstop>
-  <tabstop>m_pLineEditInterface</tabstop>
-  <tabstop>m_pCheckBoxEnableTls</tabstop>
-  <tabstop>m_pComboBoxTlsKeyLength</tabstop>
-  <tabstop>m_pLineEditTlsCertPath</tabstop>
-  <tabstop>m_pPushButtonTlsCertPath</tabstop>
-  <tabstop>m_pPushButtonTlsRegenCert</tabstop>
-  <tabstop>m_pCheckBoxLogToFile</tabstop>
-  <tabstop>m_pComboLogLevel</tabstop>
-  <tabstop>m_pLineEditLogFilename</tabstop>
-  <tabstop>m_pButtonBrowseLog</tabstop>
-  <tabstop>m_pRadioUserScope</tabstop>
-  <tabstop>m_pRadioSystemScope</tabstop>
-  <tabstop>m_pComboElevate</tabstop>
- </tabstops>
- <resources/>
- <connections>
-  <connection>
-   <sender>m_pButtonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>SettingsDialog</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>266</x>
-     <y>340</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>157</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>m_pButtonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>SettingsDialog</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>334</x>
-     <y>340</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>286</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>

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

@@ -1,25 +0,0 @@
-/*
- * Deskflow -- mouse and keyboard sharing utility
- * SPDX-FileCopyrightText: (C) 2021 Symless Ltd.
- * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
- */
-
-#include "ClientStateLabel.h"
-
-namespace deskflow::gui::widgets {
-
-ClientStateLabel::ClientStateLabel(QWidget *parent) : QLabel(parent)
-{
-  hide();
-}
-
-void ClientStateLabel::updateClientState(const QString &line)
-{
-  if (line.contains("connected to server")) {
-    show();
-  } else if (line.contains("disconnected from server") || line.contains("process exited")) {
-    hide();
-  }
-}
-
-} // namespace deskflow::gui::widgets

src/apps/deskflow-gui/widgets/ClientStateLabel.h

@@ -1,20 +0,0 @@
-/*
- * Deskflow -- mouse and keyboard sharing utility
- * SPDX-FileCopyrightText: (C) 2021 Symless Ltd.
- * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
- */
-
-#pragma once
-
-#include <QLabel>
-
-namespace deskflow::gui::widgets {
-
-class ClientStateLabel : public QLabel
-{
-public:
-  explicit ClientStateLabel(QWidget *parent = nullptr);
-  void updateClientState(const QString &line);
-};
-
-} // namespace deskflow::gui::widgets

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

@@ -1,45 +0,0 @@
-/*
- * Deskflow -- mouse and keyboard sharing utility
- * SPDX-FileCopyrightText: (C) 2021 Symless Ltd.
- * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
- */
-
-#include "ServerStateLabel.h"
-
-#include "gui/core/ServerMessage.h"
-
-using namespace deskflow::gui;
-
-namespace deskflow::gui::widgets {
-
-ServerStateLabel::ServerStateLabel(QWidget *parent) : QLabel(parent)
-{
-}
-
-void ServerStateLabel::updateServerState(const QString &line)
-{
-  ServerMessage message(line);
-
-  if (message.isExitMessage()) {
-    m_clients.clear();
-  } else if (message.isConnectedMessage()) {
-    m_clients.append(message.getClientName());
-  } else if (message.isDisconnectedMessage()) {
-    m_clients.removeAll(message.getClientName());
-  }
-
-  if (m_clients.isEmpty()) {
-    setText(tr("No clients connected"));
-  } else {
-    // unfortunately, we can't rely on the clients list because we don't always
-    // catch the connect/disconnect messages. so clients tend to get stuck in
-    // the list even though they're offline.
-    // in order to properly show a list of clients, we would need the core to
-    // print a list of connected clients on every connect/disconnect event,
-    // which could be a bit noisy in the logs (perhaps an ipc message would be
-    // needed).
-    setText(tr("Client(s) are connected"));
-  }
-}
-
-} // namespace deskflow::gui::widgets

src/apps/deskflow-gui/widgets/ServerStateLabel.h

@@ -1,26 +0,0 @@
-/*
- * Deskflow -- mouse and keyboard sharing utility
- * SPDX-FileCopyrightText: (C) 2021 Symless Ltd.
- * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
- */
-
-#pragma once
-
-#include <QLabel>
-#include <QStringList>
-
-namespace deskflow::gui::widgets {
-
-class ServerStateLabel : public QLabel
-{
-public:
-  explicit ServerStateLabel(QWidget *parent = nullptr);
-  void updateServerState(const QString &line);
-
-private:
-  QStringList m_clients;
-
-  void updateState();
-};
-
-} // namespace deskflow::gui::widgets

src/apps/deskflow-server/CMakeLists.txt

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2024 Chris Rizzitello <sithlord48@gmail.com>
+# SPDX-FileCopyrightText: 2024 - 2025 Chris Rizzitello <sithlord48@gmail.com>
 # SPDX-FileCopyrightText: 2012 - 2024 Symless Ltd
 # SPDX-FileCopyrightText: 2009 - 2012 Nick Bolton
 # SPDX-License-Identifier: MIT
@@ -7,7 +7,7 @@ set(target ${CMAKE_PROJECT_NAME}-server)
 
 if(WIN32)
   # Generate rc file
-  set(EXE_DESCRIPTION "${CMAKE_PROJECT_DESCRIPTION}\\n CLI server application")
+  set(EXE_DESCRIPTION "${CMAKE_PROJECT_PROPER_NAME} server application")
 
   set(EXE_ICON "
     IDI_DESKFLOW              ICON  DISCARDABLE  \"${CMAKE_SOURCE_DIR}/src/apps/res/deskflow.ico\"
@@ -32,16 +32,20 @@ target_link_libraries(
   io
   mt
   net
-  ipc
   platform
   server
   app
   ${libs})
 
 if(APPLE)
-  set_target_properties(${target} PROPERTIES RUNTIME_OUTPUT_DIRECTORY $<TARGET_BUNDLE_CONTENT_DIR:${CMAKE_PROJECT_PROPER_NAME}>/MacOS)
+  set_target_properties(${target} PROPERTIES
+      BUILD_WITH_INSTALL_RPATH TRUE
+      INSTALL_RPATH "@loader_path/../Libraries;@loader_path/../Frameworks"
+      RUNTIME_OUTPUT_DIRECTORY $<TARGET_BUNDLE_CONTENT_DIR:${CMAKE_PROJECT_PROPER_NAME}>/MacOS
+  )
 elseif(UNIX)
   install(TARGETS ${target} DESTINATION bin)
+  generate_app_man(${target})
 elseif(WIN32)
   install(
     TARGETS ${target}

src/apps/deskflow-server/deskflow-server.cpp

@@ -18,6 +18,8 @@
 int main(int argc, char **argv)
 {
 #if SYSAPI_WIN32
+  ArchMiscWindows::guardRuntimeVersion();
+
   // record window instance for tray icon, etc
   ArchMiscWindows::setInstanceWin32(GetModuleHandle(NULL));
 #endif
@@ -28,6 +30,30 @@ int main(int argc, char **argv)
   Log log;
   EventQueue events;
 
+  // HACK: the `--active-desktop` arg actually belongs in the `deskflow-core` binary,
+  // but we are placing it here in the server binary temporarily until we are ready to
+  // ship the `deskflow-core` binary. we are deliberately not integrating `--active-desktop`
+  // into the existing `ServerApp` arg parsing code as that would be a waste of time.
+#if SYSAPI_WIN32
+  for (int i = 1; i < argc; ++i) {
+    std::string arg(argv[i]);
+    // This is called by the daemon (running in session 0) when it needs to know the name of the
+    // interactive desktop.
+    // It is necessary to run a utility process because the daemon runs in session 0, which does not
+    // have access to the active desktop, and so cannot query it's name.
+    if (arg == "--active-desktop") {
+      const auto name = ArchMiscWindows::getActiveDesktopName();
+      if (name.empty()) {
+        LOG((CLOG_CRIT "failed to get active desktop name"));
+        return kExitFailed;
+      }
+
+      LOG((CLOG_PRINT "%s", name.c_str()));
+      return kExitSuccess;
+    }
+  }
+#endif
+
   ServerApp app(&events);
   return app.run(argc, argv);
 }

src/apps/res/deskflow.qrc

@@ -2,6 +2,7 @@
     <qresource prefix="/">
         <file>icons/deskflow-dark/actions/16/configure.svg</file>
         <file>icons/deskflow-dark/actions/16/edit-copy.svg</file>
+        <file>icons/deskflow-dark/actions/16/document-edit.svg</file>
         <file>icons/deskflow-dark/actions/16/document-open.svg</file>
         <file>icons/deskflow-dark/actions/16/document-save-as.svg</file>
         <file>icons/deskflow-dark/actions/16/help-about.svg</file>
@@ -11,8 +12,10 @@
         <file>icons/deskflow-dark/actions/16/view-refresh.svg</file>
         <file>icons/deskflow-dark/actions/22/configure.svg</file>
         <file>icons/deskflow-dark/actions/22/edit-copy.svg</file>
+        <file>icons/deskflow-dark/actions/22/document-edit.svg</file>
         <file>icons/deskflow-dark/actions/22/document-open.svg</file>
         <file>icons/deskflow-dark/actions/22/document-save-as.svg</file>
+        <file>icons/deskflow-dark/actions/22/fingerprint.svg</file>
         <file>icons/deskflow-dark/actions/22/help-about.svg</file>
         <file>icons/deskflow-dark/actions/22/process-stop.svg</file>
         <file>icons/deskflow-dark/actions/22/system-run.svg</file>
@@ -20,9 +23,11 @@
         <file>icons/deskflow-dark/actions/22/view-refresh.svg</file>
         <file>icons/deskflow-dark/actions/24/configure.svg</file>
         <file>icons/deskflow-dark/actions/24/edit-copy.svg</file>
+        <file>icons/deskflow-dark/actions/24/document-edit.svg</file>
         <file>icons/deskflow-dark/actions/24/document-open.svg</file>
         <file>icons/deskflow-dark/actions/24/document-save-as.svg</file>
         <file>icons/deskflow-dark/actions/24/edit-clear-all.svg</file>
+        <file>icons/deskflow-dark/actions/24/fingerprint.svg</file>
         <file>icons/deskflow-dark/actions/24/help-about.svg</file>
         <file>icons/deskflow-dark/actions/24/process-stop.svg</file>
         <file>icons/deskflow-dark/actions/24/system-run.svg</file>
@@ -41,6 +46,7 @@
         <file>icons/deskflow-dark/apps/64/deskflow-symbolic.svg</file>
         <file>icons/deskflow-dark/devices/64/video-display.svg</file>
         <file>icons/deskflow-dark/places/64/user-trash.svg</file>
+        <file>icons/deskflow-dark/status/32/software-updates-release.svg</file>
         <file>icons/deskflow-dark/status/64/dialog-error.svg</file>
         <file>icons/deskflow-dark/status/64/dialog-information.svg</file>
         <file>icons/deskflow-dark/status/64/dialog-positive.svg</file>
@@ -53,6 +59,7 @@
         <file>icons/deskflow-light/actions/16/configure.svg</file>
         <file>icons/deskflow-light/actions/16/edit-clear-all.svg</file>
         <file>icons/deskflow-light/actions/16/edit-copy.svg</file>
+        <file>icons/deskflow-light/actions/16/document-edit.svg</file>
         <file>icons/deskflow-light/actions/16/document-open.svg</file>
         <file>icons/deskflow-light/actions/16/document-save-as.svg</file>
         <file>icons/deskflow-light/actions/16/help-about.svg</file>
@@ -63,8 +70,10 @@
         <file>icons/deskflow-light/actions/22/configure.svg</file>
         <file>icons/deskflow-light/actions/22/edit-clear-all.svg</file>
         <file>icons/deskflow-light/actions/22/edit-copy.svg</file>
+        <file>icons/deskflow-light/actions/22/document-edit.svg</file>
         <file>icons/deskflow-light/actions/22/document-open.svg</file>
         <file>icons/deskflow-light/actions/22/document-save-as.svg</file>
+        <file>icons/deskflow-light/actions/22/fingerprint.svg</file>
         <file>icons/deskflow-light/actions/22/help-about.svg</file>
         <file>icons/deskflow-light/actions/22/process-stop.svg</file>
         <file>icons/deskflow-light/actions/22/system-run.svg</file>
@@ -73,6 +82,8 @@
         <file>icons/deskflow-light/actions/24/configure.svg</file>
         <file>icons/deskflow-light/actions/24/edit-clear-all.svg</file>
         <file>icons/deskflow-light/actions/24/edit-copy.svg</file>
+        <file>icons/deskflow-light/actions/24/fingerprint.svg</file>
+        <file>icons/deskflow-light/actions/24/document-edit.svg</file>
         <file>icons/deskflow-light/actions/24/document-open.svg</file>
         <file>icons/deskflow-light/actions/24/document-save-as.svg</file>
         <file>icons/deskflow-light/actions/24/help-about.svg</file>
@@ -92,6 +103,7 @@
         <file>icons/deskflow-light/apps/64/deskflow.svg</file>
         <file>icons/deskflow-light/apps/64/deskflow-symbolic.svg</file>
         <file>icons/deskflow-light/devices/64/video-display.svg</file>
+        <file>icons/deskflow-light/status/32/software-updates-release.svg</file>
         <file>icons/deskflow-light/status/64/dialog-error.svg</file>
         <file>icons/deskflow-light/status/64/dialog-information.svg</file>
         <file>icons/deskflow-light/status/64/dialog-positive.svg</file>
@@ -101,6 +113,5 @@
         <file>icons/deskflow-light/status/64/security-low.svg</file>
         <file>icons/deskflow-light/status/64/security-medium.svg</file>
         <file>icons/deskflow-light/index.theme</file>
-        <file>image/welcome.png</file>
     </qresource>
 </RCC>

src/apps/res/icons/deskflow-dark/actions/16/document-edit.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">.ColorScheme-Text { color: #fcfcfc; } </style>
+  </defs>
+ <path style="fill:currentColor;fill-opacity:1;stroke:none" d="M 10.398438 2 L 5.2871094 7.1113281 L 2 10.398438 L 2 14 L 5.6015625 14 L 14 5.6015625 L 10.398438 2 z M 8.3496094 5.4902344 L 10.509766 7.6503906 L 7.3359375 10.826172 L 7.3359375 10.150391 L 6.3222656 10.171875 L 5.2871094 10.171875 L 5.2871094 9.1367188 L 5.2871094 8.5507812 L 6.7285156 7.1113281 L 8.3496094 5.4902344 z M 4.2734375 9.5644531 L 4.2734375 11.185547 L 5.3085938 11.185547 L 6.3007812 11.185547 L 6.3222656 11.837891 L 5.2421875 12.919922 L 3.8007812 12.919922 L 3.0800781 12.199219 L 3.0800781 10.757812 L 4.2734375 9.5644531 z " class="ColorScheme-Text"/>
+</svg>

src/apps/res/icons/deskflow-dark/actions/16/list-add.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">.ColorScheme-Text { color: #fcfcfc; } </style>
+  </defs>
+ <path style="fill:currentColor;fill-opacity:1;stroke:none" d="M 7 3.0058594 L 7 8 L 2 8 L 2 8.9980469 L 7 8.9980469 L 7 14.007812 L 8 14.007812 L 8 8.9980469 L 13 8.9980469 L 13 8 L 8 8 L 8 3.0058594 L 7 3.0058594 z " class="ColorScheme-Text"/>
+</svg>

src/apps/res/icons/deskflow-dark/actions/16/list-remove.svg

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+    <style type="text/css" id="current-color-scheme">.ColorScheme-NegativeText { color: #da4453; } </style>
+    <path class="ColorScheme-NegativeText" d="M 2.6992188,2 2,2.6992188 7.3007812,8 2,13.300781 C 2,13.300781 2.7082187,13.995 2.6992188,14 L 8,8.6992188 13.300781,14 C 13.291781,13.995 14,13.300781 14,13.300781 L 8.6992188,8 14,2.6992188 13.300781,2 8,7.3007812 Z" fill="currentColor"/>
+</svg>

src/apps/res/icons/deskflow-dark/actions/22/document-edit.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">.ColorScheme-Text { color: #fcfcfc; } </style>
+  </defs>
+ <path style="fill:currentColor;fill-opacity:1;stroke:none" d="m14.996094 3l-11.992188 11.992188h-.003906v4.00781h1 2 1.00781v-.003906l11.992188-11.992188-.001953-.001953.001953-.001953-4-4-.001953.001953-.001953-.001953m-1.998047 3.412109l2.589844 2.589844-7.587891 7.587891v-1.589844h-1-1v-1-.589844l6.998047-6.998047m-7.998047 7.998047v1.589844h1 1v1 .589844l-.410156.410156h-1.589844l-1-1v-1.589844l1-1" class="ColorScheme-Text"/>
+</svg>

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="svg2" height="22" style="" viewBox="0 0 22 22" width="22" xmlns="http://www.w3.org/2000/svg" sodipodi:docname="fingerprint.svg" inkscape:version="1.3.2 (091e20ef0f, 2023-11-25)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg">
+    <defs id="defs3051">
+        <style type="text/css" id="current-color-scheme">.ColorScheme-Text { color: #fcfcfc; } </style>
+    </defs>
+    <path id="path1" d="m 10.964844 2.9980469 c -1.5845236 -.0072353 -2.9422744 .2857394 -4.1777346 .9042969 c -.4112899 .2059109 -.4758434 .2776955 -.4492188 .5 c .0543735 .4537067 .2885593 .498883 .9824219 .1875 c 1.2899294 -.578856 1.9178453 -.7033109 3.5449215 -.7050782 c 1.867366 -.00153 2.554482 .1581718 4.085938 .9511719 c .263122 .1360571 1.097292 .7789323 1.408203 .4335937 c .307924 -.3078945 .144513 -.5609142 -.648437 -1.0117187 c -1.563801 -.8890431 -2.930512 -1.2511653 -4.746094 -1.2597656 z m -.046875 1.8320312 c -2.0906577 -.0015904 -4.1807664 .8256559 -5.7128909 2.4804688 c -.5926987 .640169 -1.2832031 1.689795 -1.2832031 1.9492187 c 0 .3024858 .1234451 .46875 .3496094 .46875 c .1772788 0 .3578489 -.190821 .7871094 -.8359375 c .9600458 -1.4427908 2.2051389 -2.4006204 3.8085937 -2.9296875 c 1.2435415 -.4058614 2.7001995 -.3588754 4.0996095 0 c 1.806888 .5938948 3.355915 1.916279 4.205078 3.5898438 c .184782 .3641515 .295572 .4765626 .476563 .4765626 c .311704 0 .495303 -.23344 .410156 -.5214845 c -.137293 -.4645988 -.869271 -1.5904919 -1.423828 -2.1894531 c -1.534258 -1.657146 -3.626141 -2.4866996 -5.716797 -2.4882813 z m .097656 1.8222657 c -.445604 -.00775 -.897825 .0344876 -1.3496094 .1289062 c -2.146845 .4487425 -3.9412221 2.1872289 -4.515625 4.375 c -.3048255 1.160984 -.1650506 3.057421 .3378906 4.574219 c .1503076 .453288 .223992 .547173 .4394532 .572265 c .4953707 .05757 .5425194 -.177958 .2460937 -1.203125 c -.8481973 -2.933423 -.117367 -5.4282751 1.9863281 -6.7890621 c 2.0798818 -1.3453843 4.9406298 -.948559 6.5683598 .9121093 c 1.020005 1.1659848 1.579872 3.1393058 1.134765 3.9999998 c -.294034 .568598 -1.009591 .909304 -1.597656 .761719 c -.429745 -.107851 -.940652 -.635832 -1.005859 -1.041016 c -.230123 -1.429844 -.554761 -1.988299 -1.376954 -2.371093 c -.701353 -.32655 -1.284385 -.317345 -1.9726558 .03125 c -.6413124 .324823 -1.1329202 .979024 -1.2324218 1.642578 c -.035906 .239115 -.0206307 .757671 .0351562 1.15039 c .3469606 2.446271 2.0965544 4.381247 4.5000004 4.976563 c .302262 .07484 .797346 .127554 1.099609 .117187 l .548828 -.017578 c .310632 -.157676 .327632 -.52228 0 -.701172 l -.777344 -.117187 c -.978866 -.149158 -1.383803 -.279437 -2.05664 -.658203 c -1.46318 -.823674 -2.511719 -2.609239 -2.511719 -4.277344 c 0 -.735113 .2787884 -1.164663 .927734 -1.433594 c .468905 -.194333 .474455 -.194333 .94336 0 c .593428 .24593 .879612 .658428 .953125 1.371094 c .134996 1.307917 1.042601 2.167969 2.287109 2.167969 c .998776 0 1.840549 -.647171 2.138672 -1.646485 c .291784 -.977992 -.101062 -2.621655 -.923828 -3.8710934 c -1.090395 -1.6558477 -2.895221 -2.6207549 -4.826172 -2.6542968 z m -.064453 1.8945312 c -.621891 .0078591 -1.2610341 .1220648 -1.7851564 .3261719 c -.8081421 .3957774 -1.5782434 1.1864461 -1.9765625 2.0273441 c -.3030937 .639832 -.3205007 .739905 -.3203125 1.826171 c .0002242 1.336431 .1608293 2.045939 .7363282 3.246094 c .4958946 1.034132 1.1835844 1.936783 1.9472656 2.554688 c .6619406 .535587 .7322516 .560867 1.0078126 .359375 c .282107 -.20626 .124685 -.56108 -.445313 -.998047 c -.6180212 -.473788 -1.2857839 -1.329765 -1.7363278 -2.228516 c -.7400486 -1.476217 -.9257648 -3.301198 -.4433593 -4.345703 c .3501094 -.758061 .8837753 -1.3239492 1.5644531 -1.658203 c .817809 -.4015966 2.012269 -.4015966 2.830078 0 c .976109 .479324 1.599333 1.353519 1.820313 2.550781 c .1319 .714664 .332068 .952234 .636718 .75586 c .141164 -.09099 .171337 -.242829 .158203 -.78711 c -.031914 -1.323089 -.957834 -2.6511972 -2.3125 -3.316406 c -.454743 -.2212609 -1.059749 -.3203662 -1.68164 -.3125 z m -.003906 3.615234 c -.072134 -.001465 -.153033 .023509 -.244141 .072266 c -.191281 .102402 -.208829 .174075 -.162109 .726563 c .147755 1.748088 1.464452 3.25256 3.171875 3.625 c .757301 .165124 .960616 .162423 1.142578 -.019532 c .363429 -.363416 .119519 -.652706 -.634766 -.755859 c -1.541693 -.21083 -2.687806 -1.387877 -2.871094 -2.947266 c -.054671 -.465046 -.185943 -.696776 -.402343 -.701172 z" class="ColorScheme-Text" fill="currentColor"/>
+</svg>

src/apps/res/icons/deskflow-dark/actions/22/list-add.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">.ColorScheme-Text { color: #fcfcfc; } </style>
+  </defs>
+ <path style="fill:currentColor;fill-opacity:1;stroke:none" d="M 10 4 L 10 11 L 3 11 L 3 12 L 10 12 L 10 19 L 11 19 L 11 12 L 18 12 L 18 11 L 11 11 L 11 4 L 10 4 z " class="ColorScheme-Text"/>  
+</svg>

src/apps/res/icons/deskflow-dark/actions/22/list-remove.svg

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
+    <style type="text/css" id="current-color-scheme">.ColorScheme-NegativeText { color: #da4453; } </style>
+    <path class="ColorScheme-NegativeText" d="M 3.6992188 3 L 3 3.6992188 L 10.300781 11 L 3 18.300781 C 3 18.300781 3.7112147 18.993333 3.6992188 19 L 11 11.699219 L 18.300781 19 C 18.288781 18.9933 19 18.300781 19 18.300781 L 11.699219 11.001953 L 19 3.6992188 L 18.300781 3 L 11 10.300781 L 3.6992188 3 z " fill="currentColor"/>
+</svg>

src/apps/res/icons/deskflow-dark/actions/24/document-edit.svg

@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">.ColorScheme-Text { color: #fcfcfc; } </style>
+  </defs>
+  <g transform="translate(1,1)">
+    <path style="fill:currentColor;fill-opacity:1;stroke:none" d="m14.996094 3l-11.992188 11.992188h-.003906v4.00781h1 2 1.00781v-.003906l11.992188-11.992188-.001953-.001953.001953-.001953-4-4-.001953.001953-.001953-.001953m-1.998047 3.412109l2.589844 2.589844-7.587891 7.587891v-1.589844h-1-1v-1-.589844l6.998047-6.998047m-7.998047 7.998047v1.589844h1 1v1 .589844l-.410156.410156h-1.589844l-1-1v-1.589844l1-1" class="ColorScheme-Text"/>
+  </g>
+</svg>

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

@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg" id="svg2" height="24" style="" viewBox="0 0 24 24" width="24" sodipodi:docname="fingerprint.svg" inkscape:version="1.3.2 (091e20ef0f, 2023-11-25)">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">.ColorScheme-Text { color: #fcfcfc; } </style>
+  </defs>
+  <g transform="translate(1,1)">
+    <path id="path1" d="m 10.964844 2.9980469 c -1.5845236 -.0072353 -2.9422744 .2857394 -4.1777346 .9042969 c -.4112899 .2059109 -.4758434 .2776955 -.4492188 .5 c .0543735 .4537067 .2885593 .498883 .9824219 .1875 c 1.2899294 -.578856 1.9178453 -.7033109 3.5449215 -.7050782 c 1.867366 -.00153 2.554482 .1581718 4.085938 .9511719 c .263122 .1360571 1.097292 .7789323 1.408203 .4335937 c .307924 -.3078945 .144513 -.5609142 -.648437 -1.0117187 c -1.563801 -.8890431 -2.930512 -1.2511653 -4.746094 -1.2597656 z m -.046875 1.8320312 c -2.0906577 -.0015904 -4.1807664 .8256559 -5.7128909 2.4804688 c -.5926987 .640169 -1.2832031 1.689795 -1.2832031 1.9492187 c 0 .3024858 .1234451 .46875 .3496094 .46875 c .1772788 0 .3578489 -.190821 .7871094 -.8359375 c .9600458 -1.4427908 2.2051389 -2.4006204 3.8085937 -2.9296875 c 1.2435415 -.4058614 2.7001995 -.3588754 4.0996095 0 c 1.806888 .5938948 3.355915 1.916279 4.205078 3.5898438 c .184782 .3641515 .295572 .4765626 .476563 .4765626 c .311704 0 .495303 -.23344 .410156 -.5214845 c -.137293 -.4645988 -.869271 -1.5904919 -1.423828 -2.1894531 c -1.534258 -1.657146 -3.626141 -2.4866996 -5.716797 -2.4882813 z m .097656 1.8222657 c -.445604 -.00775 -.897825 .0344876 -1.3496094 .1289062 c -2.146845 .4487425 -3.9412221 2.1872289 -4.515625 4.375 c -.3048255 1.160984 -.1650506 3.057421 .3378906 4.574219 c .1503076 .453288 .223992 .547173 .4394532 .572265 c .4953707 .05757 .5425194 -.177958 .2460937 -1.203125 c -.8481973 -2.933423 -.117367 -5.4282751 1.9863281 -6.7890621 c 2.0798818 -1.3453843 4.9406298 -.948559 6.5683598 .9121093 c 1.020005 1.1659848 1.579872 3.1393058 1.134765 3.9999998 c -.294034 .568598 -1.009591 .909304 -1.597656 .761719 c -.429745 -.107851 -.940652 -.635832 -1.005859 -1.041016 c -.230123 -1.429844 -.554761 -1.988299 -1.376954 -2.371093 c -.701353 -.32655 -1.284385 -.317345 -1.9726558 .03125 c -.6413124 .324823 -1.1329202 .979024 -1.2324218 1.642578 c -.035906 .239115 -.0206307 .757671 .0351562 1.15039 c .3469606 2.446271 2.0965544 4.381247 4.5000004 4.976563 c .302262 .07484 .797346 .127554 1.099609 .117187 l .548828 -.017578 c .310632 -.157676 .327632 -.52228 0 -.701172 l -.777344 -.117187 c -.978866 -.149158 -1.383803 -.279437 -2.05664 -.658203 c -1.46318 -.823674 -2.511719 -2.609239 -2.511719 -4.277344 c 0 -.735113 .2787884 -1.164663 .927734 -1.433594 c .468905 -.194333 .474455 -.194333 .94336 0 c .593428 .24593 .879612 .658428 .953125 1.371094 c .134996 1.307917 1.042601 2.167969 2.287109 2.167969 c .998776 0 1.840549 -.647171 2.138672 -1.646485 c .291784 -.977992 -.101062 -2.621655 -.923828 -3.8710934 c -1.090395 -1.6558477 -2.895221 -2.6207549 -4.826172 -2.6542968 z m -.064453 1.8945312 c -.621891 .0078591 -1.2610341 .1220648 -1.7851564 .3261719 c -.8081421 .3957774 -1.5782434 1.1864461 -1.9765625 2.0273441 c -.3030937 .639832 -.3205007 .739905 -.3203125 1.826171 c .0002242 1.336431 .1608293 2.045939 .7363282 3.246094 c .4958946 1.034132 1.1835844 1.936783 1.9472656 2.554688 c .6619406 .535587 .7322516 .560867 1.0078126 .359375 c .282107 -.20626 .124685 -.56108 -.445313 -.998047 c -.6180212 -.473788 -1.2857839 -1.329765 -1.7363278 -2.228516 c -.7400486 -1.476217 -.9257648 -3.301198 -.4433593 -4.345703 c .3501094 -.758061 .8837753 -1.3239492 1.5644531 -1.658203 c .817809 -.4015966 2.012269 -.4015966 2.830078 0 c .976109 .479324 1.599333 1.353519 1.820313 2.550781 c .1319 .714664 .332068 .952234 .636718 .75586 c .141164 -.09099 .171337 -.242829 .158203 -.78711 c -.031914 -1.323089 -.957834 -2.6511972 -2.3125 -3.316406 c -.454743 -.2212609 -1.059749 -.3203662 -1.68164 -.3125 z m -.003906 3.615234 c -.072134 -.001465 -.153033 .023509 -.244141 .072266 c -.191281 .102402 -.208829 .174075 -.162109 .726563 c .147755 1.748088 1.464452 3.25256 3.171875 3.625 c .757301 .165124 .960616 .162423 1.142578 -.019532 c .363429 -.363416 .119519 -.652706 -.634766 -.755859 c -1.541693 -.21083 -2.687806 -1.387877 -2.871094 -2.947266 c -.054671 -.465046 -.185943 -.696776 -.402343 -.701172 z" class="ColorScheme-Text" fill="currentColor"/>
+  </g>
+</svg>

src/apps/res/icons/deskflow-dark/actions/24/list-add.svg

@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">.ColorScheme-Text { color: #fcfcfc; } </style>
+  </defs>
+  <g transform="translate(1,1)">
+    <path style="fill:currentColor;fill-opacity:1;stroke:none" d="M 10 4 L 10 11 L 3 11 L 3 12 L 10 12 L 10 19 L 11 19 L 11 12 L 18 12 L 18 11 L 11 11 L 11 4 L 10 4 z " class="ColorScheme-Text"/>
+  </g>
+</svg>

src/apps/res/icons/deskflow-dark/actions/24/list-remove.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 24 24" width="24" height="24">
+  <style type="text/css" id="current-color-scheme">.ColorScheme-NegativeText { color: #da4453; } </style>
+  <g transform="translate(1,1)">
+    <path class="ColorScheme-NegativeText" d="M 3.6992188 3 L 3 3.6992188 L 10.300781 11 L 3 18.300781 C 3 18.300781 3.7112147 18.993333 3.6992188 19 L 11 11.699219 L 18.300781 19 C 18.288781 18.9933 19 18.300781 19 18.300781 L 11.699219 11.001953 L 19 3.6992188 L 18.300781 3 L 11 10.300781 L 3.6992188 3 z " fill="currentColor"/>
+  </g>
+</svg>

src/apps/res/icons/deskflow-dark/actions/32/document-edit.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">.ColorScheme-Text { color: #fcfcfc; } </style>
+  </defs>
+ <path style="fill:currentColor;fill-opacity:1;stroke:none" d="m22.27 4l-18.27 18.27v5.73h5.73c0 0 18.269-18.269 18.27-18.27zm-2.865 4.299l4.297 4.297-11.701 11.703v-2.299h-4v-2.299zm-12.404 12.402v2.299h4v2.299l-1.701 1.701h-2l-2.297-2.297v-2z" class="ColorScheme-Text"/>
+</svg>

src/apps/res/icons/deskflow-dark/index.theme

@@ -29,7 +29,7 @@ KDE-Extensions=.svg
 ########## Directories
 ########## ordered by category and alphabetically
 
-Directories=actions/16,actions/22,actions/24,actions/32,apps/64,devices/64,places/64,status/16,status/22,status,24,status/64
+Directories=actions/16,actions/22,actions/24,actions/32,apps/64,devices/64,places/64,status/16,status/22,status,24,status/32,status/64
 ScaledDirectories=actions/16@2x,actions/16@3x,actions/22@2x,actions/22@3x,actions/24@2x,actions/24@3x,actions/32@2x,actions/32@3x
 
 [apps/64]
@@ -156,6 +156,14 @@ Context=Places
 MinSize=48
 MaxSize=256
 
+#32x32 - Fixed size - For dialog icons >!!!ONLY!!!< - DO_NOT_USE_ANYWHERE_ELSE - Color
+[status/32]
+Size=32
+Context=Status
+Type=Scalable
+MinSize=22
+MaxSize=256
+
 #64x64 - Fixed size - For dialog icons >!!!ONLY!!!< - DO_NOT_USE_ANYWHERE_ELSE - Color
 [status/64]
 Size=64

src/apps/res/icons/deskflow-dark/status/32/software-updates-release.svg

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" width="22" height="22">
+    <style type="text/css" id="current-color-scheme">.ColorScheme-Accent { color: #3daee9; } .ColorScheme-Background { color: #2a2e32; } .ColorScheme-ButtonText { color: #31363b; } .ColorScheme-Text { color: #fcfcfc; } </style>
+    <g id="software-updates-release" transform="translate(0,22) translate(0,-22)">
+    <path style="fill:#2ecc71;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="M 7,7 4,10 4,19 9.0996094,19 13,19 l 5.099609,0 0,-9 -3,-3 L 13,7 9.0996094,7 Z m 0.3,1 3.7,0 3.7,0 2,2 -11.4,0 z m 1.7,3 4,0 0,5 -1,-1 -1,1 -1,-1 -1,1 z" id="path4164" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccccccccccccccc"/>
+    <path style="opacity:1;fill:#2ecc71;fill-opacity:1;stroke:none" d="M 16,3 A 3,3 0 0 0 13,6 3,3 0 0 0 16,9 3,3 0 0 0 19,6 3,3 0 0 0 16,3 Z" id="path4166" inkscape:connector-curvature="0"/>
+    <path style="opacity:1;fill:currentColor;fill-opacity:1;stroke:none" d="m 16,4 2,2 -1,0 0,2 -2,0 0,-2 -1,0 1,-1 1,-1 z" id="path4168" inkscape:connector-curvature="0" class="ColorScheme-Background"/>
+    <rect y="-2.6645353e-15" x="0" height="22" width="22" id="rect4170" style="opacity:1;fill:none;fill-opacity:0.59905659;stroke:none"/>
+  </g>
+</svg>

src/apps/res/icons/deskflow-light/actions/16/document-edit.svg

@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#232629;
+      }
+      </style>
+  </defs>
+ <path style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 10.398438 2 L 5.2871094 7.1113281 L 2 10.398438 L 2 14 L 5.6015625 14 L 14 5.6015625 L 10.398438 2 z M 8.3496094 5.4902344 L 10.509766 7.6503906 L 7.3359375 10.826172 L 7.3359375 10.150391 L 6.3222656 10.171875 L 5.2871094 10.171875 L 5.2871094 9.1367188 L 5.2871094 8.5507812 L 6.7285156 7.1113281 L 8.3496094 5.4902344 z M 4.2734375 9.5644531 L 4.2734375 11.185547 L 5.3085938 11.185547 L 6.3007812 11.185547 L 6.3222656 11.837891 L 5.2421875 12.919922 L 3.8007812 12.919922 L 3.0800781 12.199219 L 3.0800781 10.757812 L 4.2734375 9.5644531 z "
+     class="ColorScheme-Text"
+     />
+</svg>

src/apps/res/icons/deskflow-light/actions/16/list-add.svg

@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#232629;
+      }
+      </style>
+  </defs>
+ <path style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 7 3.0058594 L 7 8 L 2 8 L 2 8.9980469 L 7 8.9980469 L 7 14.007812 L 8 14.007812 L 8 8.9980469 L 13 8.9980469 L 13 8 L 8 8 L 8 3.0058594 L 7 3.0058594 z "
+     class="ColorScheme-Text"
+     />
+</svg>

src/apps/res/icons/deskflow-light/actions/16/list-remove.svg

@@ -0,0 +1,10 @@
+<svg version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+    <style
+        type="text/css"
+        id="current-color-scheme">
+        .ColorScheme-NegativeText {
+            color:#da4453;
+        }
+    </style>
+    <path class="ColorScheme-NegativeText" d="M 2.6992188,2 2,2.6992188 7.3007812,8 2,13.300781 C 2,13.300781 2.7082187,13.995 2.6992188,14 L 8,8.6992188 13.300781,14 C 13.291781,13.995 14,13.300781 14,13.300781 L 8.6992188,8 14,2.6992188 13.300781,2 8,7.3007812 Z" fill="currentColor"/>
+</svg>

src/apps/res/icons/deskflow-light/actions/22/document-edit.svg

@@ -0,0 +1,14 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#232629;
+      }
+      </style>
+  </defs>
+ <path 
+    style="fill:currentColor;fill-opacity:1;stroke:none" 
+   d="m14.996094 3l-11.992188 11.992188h-.003906v4.00781h1 2 1.00781v-.003906l11.992188-11.992188-.001953-.001953.001953-.001953-4-4-.001953.001953-.001953-.001953m-1.998047 3.412109l2.589844 2.589844-7.587891 7.587891v-1.589844h-1-1v-1-.589844l6.998047-6.998047m-7.998047 7.998047v1.589844h1 1v1 .589844l-.410156.410156h-1.589844l-1-1v-1.589844l1-1" 
+    class="ColorScheme-Text"
+    />
+</svg>

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

@@ -0,0 +1,10 @@
+<svg id="svg2" height="22" style="" viewBox="0 0 22 22" width="22" xmlns="http://www.w3.org/2000/svg" sodipodi:docname="fingerprint.svg" inkscape:version="1.3.2 (091e20ef0f, 2023-11-25)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg">
+    <defs id="defs3051">
+        <style type="text/css" id="current-color-scheme">
+            .ColorScheme-Text {
+                color:#232629;
+            }
+        </style>
+    </defs>
+    <path id="path1" d="m 10.964844 2.9980469 c -1.5845236 -.0072353 -2.9422744 .2857394 -4.1777346 .9042969 c -.4112899 .2059109 -.4758434 .2776955 -.4492188 .5 c .0543735 .4537067 .2885593 .498883 .9824219 .1875 c 1.2899294 -.578856 1.9178453 -.7033109 3.5449215 -.7050782 c 1.867366 -.00153 2.554482 .1581718 4.085938 .9511719 c .263122 .1360571 1.097292 .7789323 1.408203 .4335937 c .307924 -.3078945 .144513 -.5609142 -.648437 -1.0117187 c -1.563801 -.8890431 -2.930512 -1.2511653 -4.746094 -1.2597656 z m -.046875 1.8320312 c -2.0906577 -.0015904 -4.1807664 .8256559 -5.7128909 2.4804688 c -.5926987 .640169 -1.2832031 1.689795 -1.2832031 1.9492187 c 0 .3024858 .1234451 .46875 .3496094 .46875 c .1772788 0 .3578489 -.190821 .7871094 -.8359375 c .9600458 -1.4427908 2.2051389 -2.4006204 3.8085937 -2.9296875 c 1.2435415 -.4058614 2.7001995 -.3588754 4.0996095 0 c 1.806888 .5938948 3.355915 1.916279 4.205078 3.5898438 c .184782 .3641515 .295572 .4765626 .476563 .4765626 c .311704 0 .495303 -.23344 .410156 -.5214845 c -.137293 -.4645988 -.869271 -1.5904919 -1.423828 -2.1894531 c -1.534258 -1.657146 -3.626141 -2.4866996 -5.716797 -2.4882813 z m .097656 1.8222657 c -.445604 -.00775 -.897825 .0344876 -1.3496094 .1289062 c -2.146845 .4487425 -3.9412221 2.1872289 -4.515625 4.375 c -.3048255 1.160984 -.1650506 3.057421 .3378906 4.574219 c .1503076 .453288 .223992 .547173 .4394532 .572265 c .4953707 .05757 .5425194 -.177958 .2460937 -1.203125 c -.8481973 -2.933423 -.117367 -5.4282751 1.9863281 -6.7890621 c 2.0798818 -1.3453843 4.9406298 -.948559 6.5683598 .9121093 c 1.020005 1.1659848 1.579872 3.1393058 1.134765 3.9999998 c -.294034 .568598 -1.009591 .909304 -1.597656 .761719 c -.429745 -.107851 -.940652 -.635832 -1.005859 -1.041016 c -.230123 -1.429844 -.554761 -1.988299 -1.376954 -2.371093 c -.701353 -.32655 -1.284385 -.317345 -1.9726558 .03125 c -.6413124 .324823 -1.1329202 .979024 -1.2324218 1.642578 c -.035906 .239115 -.0206307 .757671 .0351562 1.15039 c .3469606 2.446271 2.0965544 4.381247 4.5000004 4.976563 c .302262 .07484 .797346 .127554 1.099609 .117187 l .548828 -.017578 c .310632 -.157676 .327632 -.52228 0 -.701172 l -.777344 -.117187 c -.978866 -.149158 -1.383803 -.279437 -2.05664 -.658203 c -1.46318 -.823674 -2.511719 -2.609239 -2.511719 -4.277344 c 0 -.735113 .2787884 -1.164663 .927734 -1.433594 c .468905 -.194333 .474455 -.194333 .94336 0 c .593428 .24593 .879612 .658428 .953125 1.371094 c .134996 1.307917 1.042601 2.167969 2.287109 2.167969 c .998776 0 1.840549 -.647171 2.138672 -1.646485 c .291784 -.977992 -.101062 -2.621655 -.923828 -3.8710934 c -1.090395 -1.6558477 -2.895221 -2.6207549 -4.826172 -2.6542968 z m -.064453 1.8945312 c -.621891 .0078591 -1.2610341 .1220648 -1.7851564 .3261719 c -.8081421 .3957774 -1.5782434 1.1864461 -1.9765625 2.0273441 c -.3030937 .639832 -.3205007 .739905 -.3203125 1.826171 c .0002242 1.336431 .1608293 2.045939 .7363282 3.246094 c .4958946 1.034132 1.1835844 1.936783 1.9472656 2.554688 c .6619406 .535587 .7322516 .560867 1.0078126 .359375 c .282107 -.20626 .124685 -.56108 -.445313 -.998047 c -.6180212 -.473788 -1.2857839 -1.329765 -1.7363278 -2.228516 c -.7400486 -1.476217 -.9257648 -3.301198 -.4433593 -4.345703 c .3501094 -.758061 .8837753 -1.3239492 1.5644531 -1.658203 c .817809 -.4015966 2.012269 -.4015966 2.830078 0 c .976109 .479324 1.599333 1.353519 1.820313 2.550781 c .1319 .714664 .332068 .952234 .636718 .75586 c .141164 -.09099 .171337 -.242829 .158203 -.78711 c -.031914 -1.323089 -.957834 -2.6511972 -2.3125 -3.316406 c -.454743 -.2212609 -1.059749 -.3203662 -1.68164 -.3125 z m -.003906 3.615234 c -.072134 -.001465 -.153033 .023509 -.244141 .072266 c -.191281 .102402 -.208829 .174075 -.162109 .726563 c .147755 1.748088 1.464452 3.25256 3.171875 3.625 c .757301 .165124 .960616 .162423 1.142578 -.019532 c .363429 -.363416 .119519 -.652706 -.634766 -.755859 c -1.541693 -.21083 -2.687806 -1.387877 -2.871094 -2.947266 c -.054671 -.465046 -.185943 -.696776 -.402343 -.701172 z" class="ColorScheme-Text" fill="currentColor"/>
+</svg>

src/apps/res/icons/deskflow-light/actions/22/list-add.svg

@@ -0,0 +1,14 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#232629;
+      }
+      </style>
+  </defs>
+ <path 
+    style="fill:currentColor;fill-opacity:1;stroke:none" 
+    d="M 10 4 L 10 11 L 3 11 L 3 12 L 10 12 L 10 19 L 11 19 L 11 12 L 18 12 L 18 11 L 11 11 L 11 4 L 10 4 z "
+    class="ColorScheme-Text"
+    />  
+</svg>

src/apps/res/icons/deskflow-light/actions/22/list-remove.svg

@@ -0,0 +1,10 @@
+<svg version="1.1" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
+    <style
+        type="text/css"
+        id="current-color-scheme">
+        .ColorScheme-NegativeText {
+            color:#da4453;
+        }
+    </style>
+    <path class="ColorScheme-NegativeText" d="M 3.6992188 3 L 3 3.6992188 L 10.300781 11 L 3 18.300781 C 3 18.300781 3.7112147 18.993333 3.6992188 19 L 11 11.699219 L 18.300781 19 C 18.288781 18.9933 19 18.300781 19 18.300781 L 11.699219 11.001953 L 19 3.6992188 L 18.300781 3 L 11 10.300781 L 3.6992188 3 z " fill="currentColor"/>
+</svg>

src/apps/res/icons/deskflow-light/actions/24/document-edit.svg

@@ -0,0 +1,12 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#232629;
+      }
+      </style>
+  </defs>
+  <g transform="translate(1,1)">
+    <path style="fill:currentColor;fill-opacity:1;stroke:none" d="m14.996094 3l-11.992188 11.992188h-.003906v4.00781h1 2 1.00781v-.003906l11.992188-11.992188-.001953-.001953.001953-.001953-4-4-.001953.001953-.001953-.001953m-1.998047 3.412109l2.589844 2.589844-7.587891 7.587891v-1.589844h-1-1v-1-.589844l6.998047-6.998047m-7.998047 7.998047v1.589844h1 1v1 .589844l-.410156.410156h-1.589844l-1-1v-1.589844l1-1" class="ColorScheme-Text"/>
+  </g>
+</svg>

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

@@ -0,0 +1,12 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg" id="svg2" height="24" style="" viewBox="0 0 24 24" width="24" sodipodi:docname="fingerprint.svg" inkscape:version="1.3.2 (091e20ef0f, 2023-11-25)">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+            .ColorScheme-Text {
+                color:#232629;
+            }
+        </style>
+  </defs>
+  <g transform="translate(1,1)">
+    <path id="path1" d="m 10.964844 2.9980469 c -1.5845236 -.0072353 -2.9422744 .2857394 -4.1777346 .9042969 c -.4112899 .2059109 -.4758434 .2776955 -.4492188 .5 c .0543735 .4537067 .2885593 .498883 .9824219 .1875 c 1.2899294 -.578856 1.9178453 -.7033109 3.5449215 -.7050782 c 1.867366 -.00153 2.554482 .1581718 4.085938 .9511719 c .263122 .1360571 1.097292 .7789323 1.408203 .4335937 c .307924 -.3078945 .144513 -.5609142 -.648437 -1.0117187 c -1.563801 -.8890431 -2.930512 -1.2511653 -4.746094 -1.2597656 z m -.046875 1.8320312 c -2.0906577 -.0015904 -4.1807664 .8256559 -5.7128909 2.4804688 c -.5926987 .640169 -1.2832031 1.689795 -1.2832031 1.9492187 c 0 .3024858 .1234451 .46875 .3496094 .46875 c .1772788 0 .3578489 -.190821 .7871094 -.8359375 c .9600458 -1.4427908 2.2051389 -2.4006204 3.8085937 -2.9296875 c 1.2435415 -.4058614 2.7001995 -.3588754 4.0996095 0 c 1.806888 .5938948 3.355915 1.916279 4.205078 3.5898438 c .184782 .3641515 .295572 .4765626 .476563 .4765626 c .311704 0 .495303 -.23344 .410156 -.5214845 c -.137293 -.4645988 -.869271 -1.5904919 -1.423828 -2.1894531 c -1.534258 -1.657146 -3.626141 -2.4866996 -5.716797 -2.4882813 z m .097656 1.8222657 c -.445604 -.00775 -.897825 .0344876 -1.3496094 .1289062 c -2.146845 .4487425 -3.9412221 2.1872289 -4.515625 4.375 c -.3048255 1.160984 -.1650506 3.057421 .3378906 4.574219 c .1503076 .453288 .223992 .547173 .4394532 .572265 c .4953707 .05757 .5425194 -.177958 .2460937 -1.203125 c -.8481973 -2.933423 -.117367 -5.4282751 1.9863281 -6.7890621 c 2.0798818 -1.3453843 4.9406298 -.948559 6.5683598 .9121093 c 1.020005 1.1659848 1.579872 3.1393058 1.134765 3.9999998 c -.294034 .568598 -1.009591 .909304 -1.597656 .761719 c -.429745 -.107851 -.940652 -.635832 -1.005859 -1.041016 c -.230123 -1.429844 -.554761 -1.988299 -1.376954 -2.371093 c -.701353 -.32655 -1.284385 -.317345 -1.9726558 .03125 c -.6413124 .324823 -1.1329202 .979024 -1.2324218 1.642578 c -.035906 .239115 -.0206307 .757671 .0351562 1.15039 c .3469606 2.446271 2.0965544 4.381247 4.5000004 4.976563 c .302262 .07484 .797346 .127554 1.099609 .117187 l .548828 -.017578 c .310632 -.157676 .327632 -.52228 0 -.701172 l -.777344 -.117187 c -.978866 -.149158 -1.383803 -.279437 -2.05664 -.658203 c -1.46318 -.823674 -2.511719 -2.609239 -2.511719 -4.277344 c 0 -.735113 .2787884 -1.164663 .927734 -1.433594 c .468905 -.194333 .474455 -.194333 .94336 0 c .593428 .24593 .879612 .658428 .953125 1.371094 c .134996 1.307917 1.042601 2.167969 2.287109 2.167969 c .998776 0 1.840549 -.647171 2.138672 -1.646485 c .291784 -.977992 -.101062 -2.621655 -.923828 -3.8710934 c -1.090395 -1.6558477 -2.895221 -2.6207549 -4.826172 -2.6542968 z m -.064453 1.8945312 c -.621891 .0078591 -1.2610341 .1220648 -1.7851564 .3261719 c -.8081421 .3957774 -1.5782434 1.1864461 -1.9765625 2.0273441 c -.3030937 .639832 -.3205007 .739905 -.3203125 1.826171 c .0002242 1.336431 .1608293 2.045939 .7363282 3.246094 c .4958946 1.034132 1.1835844 1.936783 1.9472656 2.554688 c .6619406 .535587 .7322516 .560867 1.0078126 .359375 c .282107 -.20626 .124685 -.56108 -.445313 -.998047 c -.6180212 -.473788 -1.2857839 -1.329765 -1.7363278 -2.228516 c -.7400486 -1.476217 -.9257648 -3.301198 -.4433593 -4.345703 c .3501094 -.758061 .8837753 -1.3239492 1.5644531 -1.658203 c .817809 -.4015966 2.012269 -.4015966 2.830078 0 c .976109 .479324 1.599333 1.353519 1.820313 2.550781 c .1319 .714664 .332068 .952234 .636718 .75586 c .141164 -.09099 .171337 -.242829 .158203 -.78711 c -.031914 -1.323089 -.957834 -2.6511972 -2.3125 -3.316406 c -.454743 -.2212609 -1.059749 -.3203662 -1.68164 -.3125 z m -.003906 3.615234 c -.072134 -.001465 -.153033 .023509 -.244141 .072266 c -.191281 .102402 -.208829 .174075 -.162109 .726563 c .147755 1.748088 1.464452 3.25256 3.171875 3.625 c .757301 .165124 .960616 .162423 1.142578 -.019532 c .363429 -.363416 .119519 -.652706 -.634766 -.755859 c -1.541693 -.21083 -2.687806 -1.387877 -2.871094 -2.947266 c -.054671 -.465046 -.185943 -.696776 -.402343 -.701172 z" class="ColorScheme-Text" fill="currentColor"/>
+  </g>
+</svg>

src/apps/res/icons/deskflow-light/actions/24/list-add.svg

@@ -0,0 +1,12 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#232629;
+      }
+      </style>
+  </defs>
+  <g transform="translate(1,1)">
+    <path style="fill:currentColor;fill-opacity:1;stroke:none" d="M 10 4 L 10 11 L 3 11 L 3 12 L 10 12 L 10 19 L 11 19 L 11 12 L 18 12 L 18 11 L 11 11 L 11 4 L 10 4 z " class="ColorScheme-Text"/>
+  </g>
+</svg>

src/apps/res/icons/deskflow-light/actions/24/list-remove.svg

@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 24 24" width="24" height="24">
+  <style type="text/css" id="current-color-scheme">
+        .ColorScheme-NegativeText {
+            color:#da4453;
+        }
+    </style>
+  <g transform="translate(1,1)">
+    <path class="ColorScheme-NegativeText" d="M 3.6992188 3 L 3 3.6992188 L 10.300781 11 L 3 18.300781 C 3 18.300781 3.7112147 18.993333 3.6992188 19 L 11 11.699219 L 18.300781 19 C 18.288781 18.9933 19 18.300781 19 18.300781 L 11.699219 11.001953 L 19 3.6992188 L 18.300781 3 L 11 10.300781 L 3.6992188 3 z " fill="currentColor"/>
+  </g>
+</svg>

src/apps/res/icons/deskflow-light/actions/32/document-edit.svg

@@ -0,0 +1,14 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#232629;
+      }
+      </style>
+  </defs>
+ <path 
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="m22.27 4l-18.27 18.27v5.73h5.73c0 0 18.269-18.269 18.27-18.27zm-2.865 4.299l4.297 4.297-11.701 11.703v-2.299h-4v-2.299zm-12.404 12.402v2.299h4v2.299l-1.701 1.701h-2l-2.297-2.297v-2z"
+     class="ColorScheme-Text"
+     />
+</svg>

src/apps/res/icons/deskflow-light/index.theme

@@ -29,7 +29,7 @@ KDE-Extensions=.svg
 ########## Directories
 ########## ordered by category and alphabetically
 
-Directories=actions/16,actions/22,actions/24,actions/32,apps/64,devices/64,places/64,status/16,status/22,status,24,status/64
+Directories=actions/16,actions/22,actions/24,actions/32,apps/64,devices/64,places/64,status/16,status/22,status,24,status/32,status/64
 ScaledDirectories=actions/16@2x,actions/16@3x,actions/22@2x,actions/22@3x,actions/24@2x,actions/24@3x,actions/32@2x,actions/32@3x
 
 [apps/64]
@@ -157,6 +157,14 @@ Context=Places
 MinSize=48
 MaxSize=256
 
+#32x32 - Fixed size - For dialog icons >!!!ONLY!!!< - DO_NOT_USE_ANYWHERE_ELSE - Color
+[status/32]
+Size=32
+Context=Status
+Type=Scalable
+MinSize=22
+MaxSize=256
+
 #64x64 - Fixed size - For dialog icons >!!!ONLY!!!< - DO_NOT_USE_ANYWHERE_ELSE - Color
 [status/64]
 Size=64

src/apps/res/icons/deskflow-light/status/32/software-updates-release.svg

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" width="22" height="22">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#31363b;
+      }
+      .ColorScheme-Background {
+        color:#eff0f1;
+      }
+      .ColorScheme-Accent {
+        color:#3daee9;
+      }
+      .ColorScheme-ButtonText {
+        color:#31363b;
+      }
+      </style>
+    <g id="software-updates-release" transform="translate(0,22) translate(0,-22)">
+    <path style="fill:#2ecc71;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="M 7,7 4,10 4,19 9.0996094,19 13,19 l 5.099609,0 0,-9 -3,-3 L 13,7 9.0996094,7 Z m 0.3,1 3.7,0 3.7,0 2,2 -11.4,0 z m 1.7,3 4,0 0,5 -1,-1 -1,1 -1,-1 -1,1 z" id="path4164" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccccccccccccccc"/>
+    <path style="opacity:1;fill:#2ecc71;fill-opacity:1;stroke:none" d="M 16,3 A 3,3 0 0 0 13,6 3,3 0 0 0 16,9 3,3 0 0 0 19,6 3,3 0 0 0 16,3 Z" id="path4166" inkscape:connector-curvature="0"/>
+    <path style="opacity:1;fill:currentColor;fill-opacity:1;stroke:none" d="m 16,4 2,2 -1,0 0,2 -2,0 0,-2 -1,0 1,-1 1,-1 z" id="path4168" inkscape:connector-curvature="0" class="ColorScheme-Background"/>
+    <rect y="-2.6645353e-15" x="0" height="22" width="22" id="rect4170" style="opacity:1;fill:none;fill-opacity:0.59905659;stroke:none"/>
+  </g>
+</svg>

src/apps/res/manpage.txt

@@ -0,0 +1,5 @@
+[SEE ALSO]
+deskflow(1), deskflow-client(1), deskflow-server(2)
+
+All documentation is on the web, so please point your browser at
+<https://github.com/deskflow/deskflow/wiki> and surf away.

src/lib/CMakeLists.txt

@@ -9,7 +9,6 @@ add_subdirectory(client)
 add_subdirectory(common)
 add_subdirectory(deskflow)
 add_subdirectory(io)
-add_subdirectory(ipc)
 add_subdirectory(mt)
 add_subdirectory(net)
 add_subdirectory(platform)

src/lib/Config.h.in

@@ -10,27 +10,12 @@
 /* Define if the <X11/extensions/dpms.h> header file declares function prototypes. */
 #cmakedefine HAVE_DPMS_PROTOTYPES @HAVE_DPMS_PROTOTYPES@
 
-/* Define if you have a working `getpwuid_r` function. */
-#cmakedefine HAVE_GETPWUID_R @HAVE_GETPWUID_R@
-
-/* Define to 1 if you have the `gmtime_r` function. */
-#cmakedefine HAVE_GMTIME_R @HAVE_GMTIME_R@
-
 /* Define if you have the `inet_aton` function. */
 #cmakedefine HAVE_INET_ATON @HAVE_INET_ATON@
 
-/* Define to 1 if you have the <istream> header file. */
-#cmakedefine HAVE_ISTREAM @HAVE_ISTREAM@
-
-/* Define to 1 if you have the <locale.h> header file. */
-#cmakedefine HAVE_LOCALE_H @HAVE_LOCALE_H@
-
 /* Define if you have the `nanosleep` function. */
 #cmakedefine HAVE_NANOSLEEP @HAVE_NANOSLEEP@
 
-/* Define to 1 if you have the <ostream> header file. */
-#cmakedefine HAVE_OSTREAM @HAVE_OSTREAM@
-
 /* Define if you have a POSIX `sigwait` function. */
 #cmakedefine HAVE_POSIX_SIGWAIT @HAVE_POSIX_SIGWAIT@
 
@@ -43,9 +28,6 @@
 /* Define if your compiler defines socklen_t. */
 #cmakedefine HAVE_SOCKLEN_T @HAVE_SOCKLEN_T@
 
-/* Define to 1 if you have the <sstream> header file. */
-#cmakedefine HAVE_SSTREAM @HAVE_SSTREAM@
-
 /* Define to 1 if you have the <sys/select.h> header file. */
 #cmakedefine HAVE_SYS_SELECT_H @HAVE_SYS_SELECT_H@
 
@@ -58,15 +40,9 @@
 /* Define to 1 if you have the <sys/types.h> header file. */
 #cmakedefine HAVE_SYS_TYPES_H @HAVE_SYS_TYPES_H@
 
-/* Define to 1 if you have the <sys/utsname.h> header file. */
-#cmakedefine HAVE_SYS_UTSNAME_H @HAVE_SYS_UTSNAME_H@
-
 /* Define to 1 if you have the <unistd.h> header file. */
 #cmakedefine HAVE_UNISTD_H @HAVE_UNISTD_H@
 
-/* Define to 1 if you have the <wchar.h> header file. */
-#cmakedefine HAVE_WCHAR_H @HAVE_WCHAR_H@
-
 /* Define to 1 if you have the <X11/extensions/Xrandr.h> header file. */
 #cmakedefine HAVE_X11_EXTENSIONS_XRANDR_H @HAVE_X11_EXTENSIONS_XRANDR_H@
 

src/lib/arch/Arch.cpp

@@ -30,9 +30,6 @@ Arch::Arch(Arch *arch)
 
 Arch::~Arch()
 {
-#if SYSAPI_WIN32
-  ArchMiscWindows::cleanup();
-#endif
 }
 
 void Arch::init()

src/lib/arch/Arch.h

@@ -24,31 +24,27 @@
 
 #pragma once
 
-#include "common/common.h"
+#include "common/Common.h"
 
 #if SYSAPI_WIN32
 
 #include "arch/win32/ArchConsoleWindows.h"
 #include "arch/win32/ArchDaemonWindows.h"
-#include "arch/win32/ArchFileWindows.h"
 #include "arch/win32/ArchLogWindows.h"
 #include "arch/win32/ArchMultithreadWindows.h"
 #include "arch/win32/ArchNetworkWinsock.h"
 #include "arch/win32/ArchSleepWindows.h"
 #include "arch/win32/ArchStringWindows.h"
-#include "arch/win32/ArchSystemWindows.h"
 #include "arch/win32/ArchTimeWindows.h"
 
 #elif SYSAPI_UNIX
 
 #include "arch/unix/ArchConsoleUnix.h"
 #include "arch/unix/ArchDaemonUnix.h"
-#include "arch/unix/ArchFileUnix.h"
 #include "arch/unix/ArchLogUnix.h"
 #include "arch/unix/ArchNetworkBSD.h"
 #include "arch/unix/ArchSleepUnix.h"
 #include "arch/unix/ArchStringUnix.h"
-#include "arch/unix/ArchSystemUnix.h"
 #include "arch/unix/ArchTimeUnix.h"
 
 #if HAVE_PTHREAD
@@ -75,13 +71,11 @@ typically at the beginning of \c main().
 */
 class Arch : public ARCH_CONSOLE,
              public ARCH_DAEMON,
-             public ARCH_FILE,
              public ARCH_LOG,
              public ARCH_MULTITHREAD,
              public ARCH_NETWORK,
              public ARCH_SLEEP,
              public ARCH_STRING,
-             public ARCH_SYSTEM,
              public ARCH_TIME
 {
 public:

src/lib/arch/CMakeLists.txt

@@ -10,8 +10,6 @@ if(WIN32)
     win32/ArchConsoleWindows.h
     win32/ArchDaemonWindows.cpp
     win32/ArchDaemonWindows.h
-    win32/ArchFileWindows.cpp
-    win32/ArchFileWindows.h
     win32/ArchLogWindows.cpp
     win32/ArchLogWindows.h
     win32/ArchMiscWindows.cpp
@@ -24,8 +22,6 @@ if(WIN32)
     win32/ArchSleepWindows.h
     win32/ArchStringWindows.cpp
     win32/ArchStringWindows.h
-    win32/ArchSystemWindows.cpp
-    win32/ArchSystemWindows.h
     win32/ArchTimeWindows.cpp
     win32/ArchTimeWindows.h
     win32/XArchWindows.cpp
@@ -38,8 +34,6 @@ elseif(UNIX)
     unix/ArchConsoleUnix.h
     unix/ArchDaemonUnix.cpp
     unix/ArchDaemonUnix.h
-    unix/ArchFileUnix.cpp
-    unix/ArchFileUnix.h
     unix/ArchLogUnix.cpp
     unix/ArchLogUnix.h
     unix/ArchMultithreadPosix.cpp
@@ -50,8 +44,6 @@ elseif(UNIX)
     unix/ArchSleepUnix.h
     unix/ArchStringUnix.cpp
     unix/ArchStringUnix.h
-    unix/ArchSystemUnix.cpp
-    unix/ArchSystemUnix.h
     unix/ArchTimeUnix.cpp
     unix/ArchTimeUnix.h
     unix/XArchUnix.cpp
@@ -68,23 +60,16 @@ add_library(arch STATIC ${PLATFORM_CODE}
   ArchDaemonNone.h
   IArchConsole.h
   IArchDaemon.h
-  IArchFile.h
   IArchLog.h
   IArchMultithread.h
   IArchNetwork.h
   IArchSleep.h
   IArchString.cpp
   IArchString.h
-  IArchSystem.h
   IArchTime.h
-  multibyte.h
   XArch.h
 )
 
 if(UNIX)
-  target_link_libraries(arch ${CMAKE_DL_LIBS} ${libs})
-  if(NOT APPLE)
-    find_package(Qt6 ${REQUIRED_QT_VERSION} REQUIRED COMPONENTS DBus)
-    target_link_libraries(arch Qt6::DBus)
-  endif()
+  target_link_libraries(arch ${libs})
 endif()

src/lib/arch/IArchDaemon.h

@@ -8,6 +8,8 @@
 #pragma once
 
 #include "common/IInterface.h"
+
+#include <functional>
 #include <string>
 
 //! Interface for architecture dependent daemonizing
@@ -19,7 +21,7 @@ implement this interface.
 class IArchDaemon : public IInterface
 {
 public:
-  typedef int (*DaemonFunc)(int argc, const char **argv);
+  using DaemonFunc = std::function<int(int, const char **)>;
 
   //! @name manipulators
   //@{

src/lib/arch/IArchFile.h

@@ -1,92 +0,0 @@
-/*
- * Deskflow -- mouse and keyboard sharing utility
- * SPDX-FileCopyrightText: (C) 2012 - 2016 Symless Ltd.
- * SPDX-FileCopyrightText: (C) 2002 Chris Schoeneman
- * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
- */
-
-#pragma once
-
-#include "common/IInterface.h"
-#include <string>
-
-//! Interface for architecture dependent file system operations
-/*!
-This interface defines the file system operations required by
-deskflow.  Each architecture must implement this interface.
-*/
-class IArchFile : public IInterface
-{
-public:
-  //! @name manipulators
-  //@{
-
-  //! Extract base name
-  /*!
-  Find the base name in the given \c pathname.
-  */
-  virtual const char *getBasename(const char *pathname) = 0;
-
-  //! Get user's home directory
-  /*!
-  Returns the user's home directory.  Returns the empty string if
-  this cannot be determined.
-  */
-  virtual std::string getUserDirectory() = 0;
-
-  //! Get system directory
-  /*!
-  Returns the ussystem configuration file directory.
-  */
-  virtual std::string getSystemDirectory() = 0;
-
-  //! Get installed directory
-  /*!
-  Returns the directory in which Deskflow is installed.
-  */
-  virtual std::string getInstalledDirectory() = 0;
-
-  //! Get log directory
-  /*!
-  Returns the log file directory.
-  */
-  virtual std::string getLogDirectory() = 0;
-
-  //! Get plugins directory
-  /*!
-  Returns the plugin files directory. If no plugin directory is set,
-  this will return the plugin folder within the user's profile.
-  */
-  virtual std::string getPluginDirectory() = 0;
-
-  //! Get user's profile directory
-  /*!
-  Returns the user's profile directory. If no profile directory is set,
-  this will return the user's profile according to the operating system,
-  which will depend on which user launched the program.
-  */
-  virtual std::string getProfileDirectory() = 0;
-
-  //! Concatenate path components
-  /*!
-  Concatenate pathname components with a directory separator
-  between them.  This should not check if the resulting path
-  is longer than allowed by the system;  we'll rely on the
-  system calls to tell us that.
-  */
-  virtual std::string concatPath(const std::string &prefix, const std::string &suffix) = 0;
-
-  //@}
-  //! Set the user's profile directory
-  /*
-  Returns the user's profile directory.
-  */
-  virtual void setProfileDirectory(const std::string &s) = 0;
-
-  //@}
-  //! Set the user's plugin directory
-  /*
-  Returns the user's plugin directory.
-  */
-  virtual void setPluginDirectory(const std::string &s) = 0;
-};

src/lib/arch/IArchString.cpp

@@ -7,7 +7,7 @@
 
 #include "arch/IArchString.h"
 #include "arch/Arch.h"
-#include "common/common.h"
+#include "common/Common.h"
 
 #include <climits>
 #include <cstdlib>

src/lib/arch/IArchString.h

@@ -8,8 +8,8 @@
 
 #pragma once
 
+#include "common/Common.h"
 #include "common/IInterface.h"
-#include "common/common.h"
 
 #include <stdarg.h>
 

src/lib/arch/IArchSystem.h

@@ -1,49 +0,0 @@
-/*
- * Deskflow -- mouse and keyboard sharing utility
- * SPDX-FileCopyrightText: (C) 2012 - 2016 Symless Ltd.
- * SPDX-FileCopyrightText: (C) 2004 Chris Schoeneman
- * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
- */
-
-#pragma once
-
-#include "common/IInterface.h"
-#include <string>
-
-//! Interface for architecture dependent system queries
-/*!
-This interface defines operations for querying system info.
-*/
-class IArchSystem : public IInterface
-{
-public:
-  //! @name accessors
-  //@{
-
-  //! Identify the OS
-  /*!
-  Returns a string identifying the operating system.
-  */
-  virtual std::string getOSName() const = 0;
-
-  //! Identify the platform
-  /*!
-  Returns a string identifying the platform this OS is running on.
-  */
-  virtual std::string getPlatformName() const = 0;
-  //@}
-
-  //! Get a Deskflow setting
-  /*!
-  Reads a Deskflow setting from the system.
-  */
-  virtual std::string setting(const std::string &valueName) const = 0;
-  //@}
-
-  //! Set a Deskflow setting
-  /*!
-  Writes a Deskflow setting from the system.
-  */
-  virtual void setting(const std::string &valueName, const std::string &valueString) const = 0;
-  //@}
-};

src/lib/arch/XArch.h

@@ -7,8 +7,9 @@
 
 #pragma once
 
-#include "common/common.h"
-#include "common/stdexcept.h"
+#include "common/Common.h"
+
+#include <stdexcept>
 #include <string>
 
 //! Generic thread exception
@@ -57,7 +58,7 @@ public:
   XArchEval()
   {
   }
-  virtual ~XArchEval() _NOEXCEPT
+  virtual ~XArchEval() throw()
   {
   }
 
@@ -75,7 +76,7 @@ public:
   XArch(const std::string &msg) : std::runtime_error(msg)
   {
   }
-  virtual ~XArch() _NOEXCEPT
+  virtual ~XArch() throw()
   {
   }
 };

src/lib/arch/multibyte.h

@@ -1,41 +0,0 @@
-/*
- * Deskflow -- mouse and keyboard sharing utility
- * SPDX-FileCopyrightText: (C) 2012 - 2016 Symless Ltd.
- * SPDX-FileCopyrightText: (C) 2002 Chris Schoeneman
- * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
- */
-
-#pragma once
-
-#include "arch/Arch.h"
-#include "common/common.h"
-
-#include <climits>
-#include <cstdlib>
-#include <cstring>
-#if HAVE_LOCALE_H
-#include <locale.h>
-#endif
-#if HAVE_WCHAR_H || defined(_MSC_VER)
-#include <wchar.h>
-#elif __APPLE__
-// wtf?  Darwin puts mbtowc() et al. in stdlib
-#include <cstdlib>
-#else
-// platform apparently has no wchar_t support.  provide dummy
-// implementations.  hopefully at least the C++ compiler has
-// a built-in wchar_t type.
-
-static inline int mbtowc(wchar_t *dst, const char *src, int n)
-{
-  *dst = static_cast<wchar_t>(*src);
-  return 1;
-}
-
-static inline int wctomb(char *dst, wchar_t src)
-{
-  *dst = static_cast<char>(src);
-  return 1;
-}
-
-#endif

src/lib/arch/unix/ArchFileUnix.cpp

@@ -1,146 +0,0 @@
-/*
- * Deskflow -- mouse and keyboard sharing utility
- * SPDX-FileCopyrightText: (C) 2012 - 2016 Symless Ltd.
- * SPDX-FileCopyrightText: (C) 2002 Chris Schoeneman
- * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
- */
-
-#include "arch/unix/ArchFileUnix.h"
-
-#include "common/constants.h"
-#include <cstring>
-#include <filesystem>
-#include <pwd.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-//
-// ArchFileUnix
-//
-
-ArchFileUnix::ArchFileUnix()
-{
-  // do nothing
-}
-
-ArchFileUnix::~ArchFileUnix()
-{
-  // do nothing
-}
-
-const char *ArchFileUnix::getBasename(const char *pathname)
-{
-  if (pathname == NULL) {
-    return NULL;
-  }
-
-  const char *basename = strrchr(pathname, '/');
-  if (basename != NULL) {
-    return basename + 1;
-  } else {
-    return pathname;
-  }
-}
-
-std::string ArchFileUnix::getUserDirectory()
-{
-  char *buffer = NULL;
-  std::string dir;
-#if HAVE_GETPWUID_R
-  struct passwd pwent;
-  struct passwd *pwentp{};
-#if defined(_SC_GETPW_R_SIZE_MAX)
-  long size = sysconf(_SC_GETPW_R_SIZE_MAX);
-  if (size == -1) {
-    size = BUFSIZ;
-  }
-#else
-  long size = BUFSIZ;
-#endif
-  buffer = new char[size];
-  getpwuid_r(getuid(), &pwent, buffer, size, &pwentp);
-#else
-  struct passwd *pwentp = getpwuid(getuid());
-#endif
-  if (pwentp != NULL && pwentp->pw_dir != NULL) {
-    dir = pwentp->pw_dir;
-  }
-  delete[] buffer;
-  return dir;
-}
-
-std::string ArchFileUnix::getSystemDirectory()
-{
-  return "/etc";
-}
-
-std::string ArchFileUnix::getInstalledDirectory()
-{
-#if WINAPI_XWINDOWS
-  return "/usr/bin";
-#else
-  std::string rtn = "/Applications/";
-  rtn.append(kAppName).append(".app/Contents/MacOS");
-  return rtn;
-#endif
-}
-
-std::string ArchFileUnix::getLogDirectory()
-{
-  return "/var/log";
-}
-
-std::string ArchFileUnix::getPluginDirectory()
-{
-  if (!m_pluginDirectory.empty()) {
-    return m_pluginDirectory;
-  }
-
-#if WINAPI_XWINDOWS
-  return getProfileDirectory().append("/plugins");
-#else
-  return getProfileDirectory().append("/Plugins");
-#endif
-}
-
-std::string ArchFileUnix::getProfileDirectory()
-{
-  if (!m_profileDirectory.empty()) {
-    return m_profileDirectory;
-  } else {
-    const std::filesystem::path homeDir = getUserDirectory();
-#if WINAPI_XWINDOWS
-    const auto xdgDir = std::getenv("XDG_CONFIG_HOME");
-    if (xdgDir != nullptr) {
-      return std::filesystem::path(xdgDir) / kAppName;
-    } else {
-      return homeDir / ".config" / kAppName;
-    }
-#else
-    return homeDir / "Library" / kAppName;
-#endif
-  }
-}
-
-std::string ArchFileUnix::concatPath(const std::string &prefix, const std::string &suffix)
-{
-  std::string path;
-  path.reserve(prefix.size() + 1 + suffix.size());
-  path += prefix;
-  if (path.size() == 0 || path[path.size() - 1] != '/') {
-    path += '/';
-  }
-  path += suffix;
-  return path;
-}
-
-void ArchFileUnix::setProfileDirectory(const std::string &s)
-{
-  m_profileDirectory = s;
-}
-
-void ArchFileUnix::setPluginDirectory(const std::string &s)
-{
-  m_pluginDirectory = s;
-}

src/lib/arch/unix/ArchFileUnix.h

@@ -1,36 +0,0 @@
-/*
- * Deskflow -- mouse and keyboard sharing utility
- * SPDX-FileCopyrightText: (C) 2012 - 2016 Symless Ltd.
- * SPDX-FileCopyrightText: (C) 2002 Chris Schoeneman
- * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
- */
-
-#pragma once
-
-#include "arch/IArchFile.h"
-
-#define ARCH_FILE ArchFileUnix
-
-//! Unix implementation of IArchFile
-class ArchFileUnix : public IArchFile
-{
-public:
-  ArchFileUnix();
-  virtual ~ArchFileUnix();
-
-  // IArchFile overrides
-  virtual const char *getBasename(const char *pathname);
-  virtual std::string getUserDirectory();
-  virtual std::string getSystemDirectory();
-  virtual std::string getInstalledDirectory();
-  virtual std::string getLogDirectory();
-  virtual std::string getPluginDirectory();
-  virtual std::string getProfileDirectory();
-  virtual std::string concatPath(const std::string &prefix, const std::string &suffix);
-  virtual void setProfileDirectory(const std::string &s);
-  virtual void setPluginDirectory(const std::string &s);
-
-private:
-  std::string m_profileDirectory;
-  std::string m_pluginDirectory;
-};

src/lib/arch/unix/ArchMultithreadPosix.h

@@ -8,8 +8,8 @@
 #pragma once
 
 #include "arch/IArchMultithread.h"
-#include "common/stdlist.h"
 
+#include <list>
 #include <pthread.h>
 
 #define ARCH_MULTITHREAD ArchMultithreadPosix

src/lib/arch/unix/ArchStringUnix.cpp

@@ -13,8 +13,6 @@
 // ArchStringUnix
 //
 
-#include "arch/multibyte.h"
-
 ArchStringUnix::ArchStringUnix()
 {
 }