Release 1.21.0

remove _NOEXCEPT define and just use throw()

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -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/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,30 +37,26 @@ 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 \
+                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 -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
             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 \
+                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
             elif [ ${{ inputs.like }} == "arch" ]; then
               pacman -Syu --noconfirm base-devel cmake ninja \
-                gcc openssl glib2 gdk-pixbuf2 libxtst libnotify \
-                libxkbfile gtest pugixml libei libportal \
+                gcc openssl glib2 libxtst libxkbfile gtest libei libportal \
                 qt6-base qt6-tools gtk3 tomlplusplus cli11
             else
               echo "Unknown like"
@@ -67,13 +67,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 +87,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.8.2
+          qt-install-dir: ${{matrix.target.qt-install-dir}}
           like: ${{ matrix.target.like }}
 
       - name: Get version
@@ -311,7 +315,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
 
       - name: Build on FreeBSD
         if: ${{ matrix.distro.name == 'freebsd' }}
@@ -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,7 +18,7 @@ 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_MINOR 21)
 set(DESKFLOW_VERSION_PATCH 0)
 set(DESKFLOW_VERSION_TWEAK 0)
 
@@ -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"

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,51 @@
 	</branding>
 	<content_rating type="oars-1.0" />
 	<releases>
-		<release version="1.19.0" date="2025-1-31" urgency="high">
+		<release version="1.21.0" date="2025-03-27" 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 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 +102,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 +121,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 +175,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 +292,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 +342,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/deploy.cmake

@@ -46,7 +46,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 +53,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/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,73 @@
 <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" />
+
+    <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="Deskflow"
+      FileRef="CM_FP_deskflow.exe"
+      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)" />
+      <Custom
+        Action="RunDeskflow"
+        OnExit="success"
+        Condition="NOT Installed" />
     </InstallExecuteSequence>
   </CPackWiXFragment>
 </CPackWiXPatch>

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/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,14 +32,17 @@ 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)
 elseif(WIN32)

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,14 +27,17 @@ 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)
 elseif(WIN32)

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)
@@ -52,6 +48,8 @@ add_executable(${target} WIN32 MACOSX_BUNDLE
   Action.h
   DataDownloader.cpp
   DataDownloader.h
+  Diagnostic.cpp
+  Diagnostic.h
   Hotkey.cpp
   Hotkey.h
   KeySequence.cpp
@@ -60,15 +58,11 @@ add_executable(${target} WIN32 MACOSX_BUNDLE
   MainWindow.cpp
   MainWindow.h
   MainWindow.ui
-  ProcessorArch.h
-  QUtility.cpp
-  QUtility.h
   ScreenSetupModel.cpp
   ScreenSetupModel.h
   ServerConfig.cpp
   ServerConfig.h
-  SetupWizard.cpp
-  SetupWizard.h
+  StyleUtils.h
   VersionChecker.cpp
   VersionChecker.h
   dialogs/AboutDialog.cpp
@@ -80,6 +74,8 @@ add_executable(${target} WIN32 MACOSX_BUNDLE
   dialogs/AddClientDialog.cpp
   dialogs/AddClientDialog.h
   dialogs/AddClientDialog.ui
+  dialogs/FingerprintDialog.h
+  dialogs/FingerprintDialog.cpp
   dialogs/HotkeyDialog.cpp
   dialogs/HotkeyDialog.h
   dialogs/HotkeyDialog.ui
@@ -92,16 +88,32 @@ add_executable(${target} WIN32 MACOSX_BUNDLE
   dialogs/SettingsDialog.cpp
   dialogs/SettingsDialog.h
   dialogs/SettingsDialog.ui
-  widgets/ClientStateLabel.cpp
-  widgets/ClientStateLabel.h
+  validators/AliasValidator.cpp
+  validators/AliasValidator.h
+  validators/ComputerNameValidator.cpp
+  validators/ComputerNameValidator.h
+  validators/EmptyStringValidator.cpp
+  validators/EmptyStringValidator.h
+  validators/IStringValidator.cpp
+  validators/IStringValidator.h
+  validators/LineEditValidator.cpp
+  validators/LineEditValidator.h
+  validators/ScreenDuplicationsValidator.cpp
+  validators/ScreenDuplicationsValidator.h
+  validators/ScreenNameValidator.cpp
+  validators/ScreenNameValidator.h
+  validators/SpacesValidator.cpp
+  validators/SpacesValidator.h
+  validators/ValidationError.cpp
+  validators/ValidationError.h
+  widgets/FingerprintPreview.h
+  widgets/FingerprintPreview.cpp
   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
 )
@@ -109,6 +121,7 @@ add_executable(${target} WIN32 MACOSX_BUNDLE
 target_link_libraries(
   ${target}
   gui
+  common
   Qt6::Core
   Qt6::Widgets
   Qt6::Network)

src/apps/deskflow-gui/Diagnostic.cpp

@@ -4,12 +4,11 @@
  * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
  */
 
-#include "diagnostic.h"
+#include "Diagnostic.h"
 
-#include "config/ConfigScopes.h"
-#include "paths.h"
+#include "common/Settings.h"
 
-#include <QApplication>
+#include <QCoreApplication>
 #include <QDir>
 #include <QProcess>
 
@@ -27,23 +26,19 @@ void restart()
   QProcess::startDetached(program, arguments);
 
   qDebug("exiting current process");
-  QApplication::exit();
+  QCoreApplication::exit();
 }
 
-void clearSettings(ConfigScopes &scopes, bool enableRestart)
+void clearSettings(bool enableRestart)
 {
   qDebug("clearing settings");
-  scopes.clear();
+  Settings::proxy().clear();
 
   // save but do not emit saving signal which will prevent the current state of
   // the app config and server configs from being applied.
-  scopes.save(false);
+  Settings::save(false);
 
-  auto configDir = paths::configDir();
-  qDebug("removing config dir: %s", qPrintable(configDir.absolutePath()));
-  configDir.removeRecursively();
-
-  auto profileDir = paths::coreProfileDir();
+  auto profileDir = QDir(Settings::settingsPath());
   qDebug("removing profile dir: %s", qPrintable(profileDir.absolutePath()));
   profileDir.removeRecursively();
 

src/apps/deskflow-gui/Diagnostic.h

@@ -6,10 +6,8 @@
 
 #pragma once
 
-#include "gui/config/ConfigScopes.h"
-
 namespace deskflow::gui::diagnostic {
 
-void clearSettings(ConfigScopes &scopes, bool enableRestart);
+void clearSettings(bool enableRestart);
 
 }

src/apps/deskflow-gui/MainWindow.h

@@ -11,16 +11,13 @@
 #include <QMainWindow>
 #include <QMutex>
 #include <QProcess>
+#include <QRegularExpression>
 #include <QSettings>
 #include <QSystemTrayIcon>
 #include <QThread>
 
 #include "ServerConfig.h"
 #include "VersionChecker.h"
-#include "common/ipc.h"
-#include "gui/config/AppConfig.h"
-#include "gui/config/ConfigScopes.h"
-#include "gui/config/ServerConfigDialogState.h"
 #include "gui/core/ClientConnection.h"
 #include "gui/core/CoreProcess.h"
 #include "gui/core/ServerConnection.h"
@@ -33,12 +30,14 @@
 
 class QAction;
 class QMenu;
+class QLabel;
 class QLineEdit;
 class QGroupBox;
 class QPushButton;
 class QTextEdit;
 class QComboBox;
 class QTabWidget;
+class QToolButton;
 class QCheckBox;
 class QRadioButton;
 class QMessageBox;
@@ -46,21 +45,23 @@ class QAbstractButton;
 class QLocalServer;
 
 class DeskflowApplication;
-class SetupWizard;
 
 namespace Ui {
 class MainWindow;
 }
 
+namespace deskflow::gui::ipc {
+class DaemonIpcClient;
+}
+
 class MainWindow : public QMainWindow
 {
-  using CoreMode = deskflow::gui::CoreProcess::Mode;
+  using CoreMode = Settings::CoreMode;
   using CoreProcess = deskflow::gui::CoreProcess;
 
   Q_OBJECT
 
   friend class DeskflowApplication;
-  friend class SetupWizard;
   friend class SettingsDialog;
 
 public:
@@ -71,18 +72,18 @@ public:
   };
 
 public:
-  explicit MainWindow(deskflow::gui::ConfigScopes &configScopes, AppConfig &appConfig);
+  explicit MainWindow();
   ~MainWindow() override;
 
   CoreMode coreMode() const
   {
-    return m_CoreProcess.mode();
+    return m_coreProcess.mode();
   }
   QString address() const;
   void open();
   ServerConfig &serverConfig()
   {
-    return m_ServerConfig;
+    return m_serverConfig;
   }
   void autoAddScreen(const QString name);
 
@@ -91,59 +92,46 @@ public:
 signals:
   void shown();
 
-private slots:
+private:
   void toggleLogVisible(bool visible);
-  //
-  // Manual slots
-  //
-  void onShown();
-  void onConfigScopesSaving();
-  void onAppConfigTlsChanged();
-  void onAppConfigScreenNameChanged();
-  void onAppConfigInvertConnection();
-  void onCoreProcessStarting();
-  void onCoreProcessError(CoreProcess::Error error);
-  void onCoreConnectionStateChanged(CoreProcess::ConnectionState state);
-  void onCoreProcessStateChanged(CoreProcess::ProcessState state);
-  void onCoreProcessSecureSocket(bool enabled);
-  void onVersionCheckerUpdateFound(const QString &version);
-  void onTrayIconActivated(QSystemTrayIcon::ActivationReason reason);
-  void onServerConnectionConfigureClient(const QString &clientName);
+
+  void firstShown();
+
+  void settingsChanged(const QString &key = QString());
+  void serverConfigSaving();
+  void coreProcessStarting();
+  void coreProcessError(CoreProcess::Error error);
+  void coreConnectionStateChanged(CoreProcess::ConnectionState state);
+  void coreProcessStateChanged(CoreProcess::ProcessState state);
+  void versionCheckerUpdateFound(const QString &version);
+  void trayIconActivated(QSystemTrayIcon::ActivationReason reason);
+  void serverConnectionConfigureClient(const QString &clientName);
 
   void clearSettings();
   void openAboutDialog();
   void openHelpUrl() const;
+  void openGetNewVersionUrl() const;
   void openSettings();
   void startCore();
   void stopCore();
-  bool saveConfig();
-  void testFatalError() const;
-  void testCriticalError() const;
+  bool saveServerConfig();
   void resetCore();
 
   void showMyFingerprint();
-  void setModeServer();
-  void setModeClient();
+  void updateSecurityIcon(bool visible);
+
+  void coreModeToggled();
+  void updateModeControls(bool serverMode);
 
-private:
   std::unique_ptr<Ui::MainWindow> ui;
 
   void updateSize();
-  AppConfig &appConfig()
-  {
-    return m_AppConfig;
-  }
-  AppConfig const &appConfig() const
-  {
-    return m_AppConfig;
-  }
   void createMenuBar();
   void setupTrayIcon();
   void applyConfig();
   void setIcon();
   bool checkForApp(int which, QString &app);
   void setStatus(const QString &status);
-  void sendIpcMessage(IpcMessageType type, const char *buffer, bool showErrors);
   void updateFromLogLine(const QString &line);
   QString getIPAddresses() const;
   void enableServer(bool enable);
@@ -168,26 +156,42 @@ private:
   void showFirstConnectedMessage();
   void updateStatus();
   void showAndActivate();
+  void showHostNameEditor();
+  void setHostName();
 
-  VersionChecker m_VersionChecker;
-  QSystemTrayIcon *m_trayIcon = nullptr;
-  QAbstractButton *m_pCancelButton = nullptr;
-  bool m_SecureSocket = false;
-  deskflow::gui::config::ServerConfigDialogState m_ServerConfigDialogState;
-  bool m_SaveOnExit = true;
-  deskflow::gui::core::WaylandWarnings m_WaylandWarnings;
+  /**
+   * @brief trustedFingerprintDb get the fingerprintDb for the trusted clients or trusted servers.
+   * @return The path to the trusted fingerprint file
+   */
+  QString trustedFingerprintDb();
 
-  deskflow::gui::ConfigScopes &m_ConfigScopes;
-  AppConfig &m_AppConfig;
-  ServerConfig m_ServerConfig;
-  deskflow::gui::CoreProcess m_CoreProcess;
-  deskflow::gui::ServerConnection m_ServerConnection;
-  deskflow::gui::ClientConnection m_ClientConnection;
-  deskflow::gui::TlsUtility m_TlsUtility;
-  QSize m_expandedSize = QSize();
+  // Generate prints if they are missing
+  // Returns true if successful
+  bool regenerateLocalFingerprints();
 
-  QLocalServer *m_guiDupeChecker = nullptr;
   inline static const auto m_guiSocketName = QStringLiteral("deskflow-gui");
+  inline static const auto m_nameRegEx = QRegularExpression(QStringLiteral("^[\\w\\-_\\.]{0,255}$"));
+
+  VersionChecker m_versionChecker;
+  bool m_secureSocket = false;
+  bool m_saveOnExit = true;
+  deskflow::gui::core::WaylandWarnings m_waylandWarnings;
+  ServerConfig m_serverConfig;
+  deskflow::gui::CoreProcess m_coreProcess;
+  deskflow::gui::ServerConnection m_serverConnection;
+  deskflow::gui::ClientConnection m_clientConnection;
+  deskflow::gui::TlsUtility m_tlsUtility;
+  QSize m_expandedSize = QSize();
+  QStringList m_checkedClients;
+  QStringList m_checkedServers;
+  QSystemTrayIcon *m_trayIcon = nullptr;
+  QLocalServer *m_guiDupeChecker = nullptr;
+  deskflow::gui::ipc::DaemonIpcClient *m_daemonIpcClient = nullptr;
+
+  QLabel *m_lblSecurityStatus = nullptr;
+  QLabel *m_lblStatus = nullptr;
+  QToolButton *m_btnFingerprint = nullptr;
+  QPushButton *m_btnUpdate = nullptr;
 
   // Window Actions
   QAction *m_actionAbout = nullptr;
@@ -197,10 +201,7 @@ private:
   QAction *m_actionQuit = nullptr;
   QAction *m_actionTrayQuit = nullptr;
   QAction *m_actionRestore = nullptr;
-  QAction *m_actionSave = nullptr;
   QAction *m_actionSettings = nullptr;
   QAction *m_actionStartCore = nullptr;
   QAction *m_actionStopCore = nullptr;
-  QAction *m_actionTestCriticalError = nullptr;
-  QAction *m_actionTestFatalError = nullptr;
 };

src/apps/deskflow-gui/MainWindow.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>883</width>
-    <height>690</height>
+    <width>735</width>
+    <height>515</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -19,62 +19,129 @@
   <property name="windowTitle">
    <string>Deskflow</string>
   </property>
-  <widget class="QWidget" name="m_pWidgetTopLevel">
-   <layout class="QVBoxLayout" name="verticalLayout_7">
+  <widget class="QWidget" name="topLevelWidget">
+   <layout class="QVBoxLayout" name="_2">
     <property name="spacing">
      <number>10</number>
     </property>
     <item>
-     <layout class="QHBoxLayout" name="m_layoutName">
-      <property name="sizeConstraint">
-       <enum>QLayout::SizeConstraint::SetMinAndMaxSize</enum>
+     <widget class="QWidget" name="widget" native="true">
+      <property name="minimumSize">
+       <size>
+        <width>0</width>
+        <height>28</height>
+       </size>
       </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>
+      <property name="maximumSize">
+       <size>
+        <width>16777215</width>
+        <height>28</height>
+       </size>
+      </property>
+      <layout class="QHBoxLayout" name="horizontalLayout_5">
+       <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="labelComputerName">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string notr="true">This computer's name:</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="lblComputerName">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string>lblName</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLineEdit" name="lineEditName">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" 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;Name can't have have spaces or special characters&lt;/p&gt;&lt;p&gt;Use Enter to save the name change.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         </property>
+         <property name="maxLength">
+          <number>255</number>
+         </property>
+         <property name="frame">
+          <bool>false</bool>
+         </property>
+         <property name="clearButtonEnabled">
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="btnEditName">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="toolTip">
+          <string>Edit Computer Name</string>
+         </property>
+         <property name="icon">
+          <iconset theme="document-edit"/>
+         </property>
+         <property name="iconSize">
+          <size>
+           <width>16</width>
+           <height>16</height>
+          </size>
+         </property>
+         <property name="flat">
+          <bool>true</bool>
+         </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>
+      </layout>
+     </widget>
     </item>
     <item>
-     <widget class="QLabel" name="m_pLabelIpAddresses">
+     <widget class="QLabel" name="lblIpAddresses">
       <property name="sizePolicy">
        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
         <horstretch>0</horstretch>
@@ -90,244 +157,57 @@
      </widget>
     </item>
     <item>
-     <widget class="QLabel" name="lblMyFingerprint">
+     <widget class="QGroupBox" name="groupBox">
       <property name="sizePolicy">
-       <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+       <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
         <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 name="title">
+       <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>
+      <layout class="QVBoxLayout" name="verticalLayout">
        <item>
-        <widget class="QGroupBox" name="m_pGroupServer">
+        <widget class="QWidget" name="widgetModeSelection" native="true">
          <property name="sizePolicy">
-          <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+          <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
            <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>
+         <layout class="QHBoxLayout" name="horizontalLayout">
+          <item>
+           <widget class="QRadioButton" name="rbModeServer">
+            <property name="text">
+             <string>Use this computer's keyboard and mouse
+(make this computer the server)</string>
             </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>
+          <item>
+           <widget class="QRadioButton" name="rbModeClient">
+            <property name="text">
+             <string>Use another computer’s mouse and keyboard
+(make this computer the client)</string>
+            </property>
            </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">
+        <widget class="QWidget" name="widgetModeOptions" native="true">
+         <layout class="QHBoxLayout" name="horizontalLayout_2">
+          <item>
+           <widget class="QWidget" name="serverOptions" native="true">
             <property name="sizePolicy">
-             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+             <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
-            <layout class="QVBoxLayout" name="verticalLayout_6">
-             <property name="spacing">
-              <number>0</number>
-             </property>
+            <layout class="QHBoxLayout" name="horizontalLayout_4">
              <property name="leftMargin">
               <number>0</number>
              </property>
@@ -341,31 +221,72 @@
               <number>0</number>
              </property>
              <item>
-              <widget class="QRadioButton" name="rbModeClient">
+              <widget class="QPushButton" name="btnConfigureServer">
+               <property name="sizePolicy">
+                <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
                <property name="text">
-                <string>Use another computer’s mouse and keyboard</string>
+                <string>&amp;Configure Server</string>
                </property>
               </widget>
              </item>
              <item>
-              <widget class="QLabel" name="label_2">
-               <property name="text">
-                <string>(make this computer the client)</string>
+              <widget class="QToolButton" name="btnSaveServerConfig">
+               <property name="toolTip">
+                <string>Export server configuration</string>
                </property>
-               <property name="indent">
-                <number>20</number>
+               <property name="text">
+                <string>...</string>
+               </property>
+               <property name="icon">
+                <iconset theme="QIcon::ThemeIcon::DocumentSaveAs"/>
+               </property>
+               <property name="iconSize">
+                <size>
+                 <width>22</width>
+                 <height>22</height>
+                </size>
                </property>
               </widget>
              </item>
+             <item>
+              <spacer name="horizontalSpacer">
+               <property name="orientation">
+                <enum>Qt::Orientation::Horizontal</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>40</width>
+                 <height>5</height>
+                </size>
+               </property>
+              </spacer>
+             </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>
+          <item>
+           <widget class="QLabel" name="lblNoMode">
+            <property name="text">
+             <string>You must select a mode</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignmentFlag::AlignCenter</set>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QWidget" name="clientOptions" native="true">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <layout class="QHBoxLayout" name="horizontalLayout_3">
              <property name="leftMargin">
               <number>0</number>
              </property>
@@ -380,48 +301,37 @@
              </property>
              <item>
               <widget class="QLabel" name="m_pLabelServerName">
+               <property name="sizePolicy">
+                <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
                <property name="text">
                 <string>Server IP address or hostname:</string>
                </property>
                <property name="indent">
-                <number>20</number>
+                <number>0</number>
                </property>
               </widget>
              </item>
              <item>
-              <layout class="QHBoxLayout" name="horizontalLayout_2">
-               <property name="leftMargin">
-                <number>20</number>
+              <widget class="QLineEdit" name="lineHostname">
+               <property name="minimumSize">
+                <size>
+                 <width>0</width>
+                 <height>0</height>
+                </size>
                </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>
+               <property name="toolTip">
+                <string>Hostname or IP address of the server computer.</string>
+               </property>
+              </widget>
              </item>
              <item>
-              <widget class="deskflow::gui::widgets::ClientStateLabel" name="m_pLabelClientState">
+              <widget class="QPushButton" name="btnConnect">
                <property name="text">
-                <string>Connected to server</string>
-               </property>
-               <property name="indent">
-                <number>20</number>
+                <string>Connect</string>
                </property>
               </widget>
              </item>
@@ -443,22 +353,19 @@
        </sizepolicy>
       </property>
       <property name="frameShape">
-       <enum>QFrame::Shape::StyledPanel</enum>
+       <enum>QFrame::Shape::NoFrame</enum>
       </property>
       <property name="frameShadow">
-       <enum>QFrame::Shadow::Raised</enum>
+       <enum>QFrame::Shadow::Plain</enum>
       </property>
-      <layout class="QVBoxLayout" name="verticalLayout_2">
+      <layout class="QVBoxLayout" name="_3">
        <item>
-        <layout class="QHBoxLayout" name="horizontalLayout">
+        <layout class="QHBoxLayout" name="_4">
          <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>
@@ -480,6 +387,39 @@
            </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="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>
        <item>
@@ -496,9 +436,6 @@
            <kerning>true</kerning>
           </font>
          </property>
-         <property name="undoRedoEnabled">
-          <bool>false</bool>
-         </property>
          <property name="lineWrapMode">
           <enum>QPlainTextEdit::LineWrapMode::NoWrap</enum>
          </property>
@@ -513,140 +450,13 @@
       </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 class="QStatusBar" name="statusBar"/>
  </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/>

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/ServerConfig.cpp

@@ -1,5 +1,6 @@
 /*
  * Deskflow -- mouse and keyboard sharing utility
+ * SPDX-FileCopyrightText: (C) 2025 Chris Rizzitello <sithlord48@gmail.com>
  * 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
@@ -9,13 +10,13 @@
 
 #include "Hotkey.h"
 #include "MainWindow.h"
+#include "common/Settings.h"
 #include "dialogs/AddClientDialog.h"
 
 #include <QAbstractButton>
 #include <QMessageBox>
 #include <QPushButton>
 
-using namespace deskflow::gui::proxy;
 using enum ScreenConfig::Modifier;
 using enum ScreenConfig::SwitchCorner;
 using enum ScreenConfig::Fix;
@@ -35,9 +36,8 @@ static const struct
 
 const int serverDefaultIndex = 7;
 
-ServerConfig::ServerConfig(AppConfig &appConfig, MainWindow &mainWindow, int columns, int rows)
-    : m_pAppConfig(&appConfig),
-      m_pMainWindow(&mainWindow),
+ServerConfig::ServerConfig(MainWindow &mainWindow, int columns, int rows)
+    : m_pMainWindow(&mainWindow),
       m_Screens(columns),
       m_Columns(columns),
       m_Rows(rows),
@@ -75,7 +75,6 @@ bool ServerConfig::operator==(const ServerConfig &sc) const
          m_SwitchCornerSize == sc.m_SwitchCornerSize &&         //
          m_SwitchCorners == sc.m_SwitchCorners &&               //
          m_Hotkeys == sc.m_Hotkeys &&                           //
-         m_pAppConfig == sc.m_pAppConfig &&                     //
          m_EnableDragAndDrop == sc.m_EnableDragAndDrop &&       //
          m_DisableLockToScreen == sc.m_DisableLockToScreen &&   //
          m_ClipboardSharing == sc.m_ClipboardSharing &&         //
@@ -130,10 +129,6 @@ void ServerConfig::commit()
   settings().setValue("clipboardSharing", clipboardSharing());
   settings().setValue("clipboardSharingSize", QVariant::fromValue(clipboardSharingSize()));
 
-  if (!getClientAddress().isEmpty()) {
-    settings().setValue("clientAddress", getClientAddress());
-  }
-
   writeSettings(settings(), switchCorners(), "switchCorner");
 
   settings().beginWriteArray("screens");
@@ -141,8 +136,9 @@ void ServerConfig::commit()
     settings().setArrayIndex(i);
     auto &screen = screens()[i];
     screen.saveSettings(settings());
-    if (screen.isServer() && m_pAppConfig->screenName() != screen.name()) {
-      m_pAppConfig->setScreenName(screen.name());
+    auto screenName = Settings::value(Settings::Core::ScreenName).toString();
+    if (screen.isServer() && screenName != screen.name()) {
+      Settings::setValue(Settings::Core::ScreenName, screen.name());
     }
   }
   settings().endArray();
@@ -186,9 +182,8 @@ void ServerConfig::recall()
       settings().value("clipboardSharingSize", (int)ServerConfig::defaultClipboardSharingSize()).toULongLong()
   );
   setClipboardSharing(settings().value("clipboardSharing", true).toBool());
-  setClientAddress(settings().value("clientAddress", "").toString());
 
-  readSettings(settings(), switchCorners(), "switchCorner", 0, static_cast<int>(NumSwitchCorners));
+  readSettings(settings(), switchCorners(), "switchCorner", false, static_cast<int>(NumSwitchCorners));
 
   int numScreens = settings().beginReadArray("screens");
   Q_ASSERT(numScreens <= screens().size());
@@ -293,11 +288,6 @@ QTextStream &operator<<(QTextStream &outStream, const ServerConfig &config)
   outStream << "\t"
             << "clipboardSharingSize = " << config.clipboardSharingSize() << Qt::endl;
 
-  if (!config.getClientAddress().isEmpty()) {
-    outStream << "\t"
-              << "clientAddress = " << config.getClientAddress() << Qt::endl;
-  }
-
   if (config.hasSwitchDelay())
     outStream << "\t"
               << "switchDelay = " << config.switchDelay() << Qt::endl;
@@ -340,8 +330,8 @@ int ServerConfig::autoAddScreen(const QString name)
 {
   int serverIndex = -1;
   int targetIndex = -1;
-  if (!findScreenName(m_pAppConfig->screenName(), serverIndex) &&
-      !fixNoServer(m_pAppConfig->screenName(), serverIndex)) {
+  const auto screenName = Settings::value(Settings::Core::ScreenName).toString();
+  if (!findScreenName(screenName, serverIndex) && !fixNoServer(screenName, serverIndex)) {
     return kAutoAddScreenManualServer;
   }
 
@@ -397,29 +387,29 @@ int ServerConfig::autoAddScreen(const QString name)
   return kAutoAddScreenOk;
 }
 
-const QString &ServerConfig::getServerName() const
+const QString ServerConfig::getServerName() const
 {
-  return m_pAppConfig->screenName();
+  return Settings::value(Settings::Core::ScreenName).toString();
 }
 
 void ServerConfig::updateServerName()
 {
   for (auto &screen : screens()) {
     if (screen.isServer()) {
-      screen.setName(m_pAppConfig->screenName());
+      screen.setName(Settings::value(Settings::Core::ScreenName).toString());
       break;
     }
   }
 }
 
-const QString &ServerConfig::configFile() const
+const QString ServerConfig::configFile() const
 {
-  return m_pAppConfig->configFile();
+  return Settings::value(Settings::Server::ExternalConfigFile).toString();
 }
 
 bool ServerConfig::useExternalConfig() const
 {
-  return m_pAppConfig->useExternalConfig();
+  return Settings::value(Settings::Server::ExternalConfig).toBool();
 }
 
 bool ServerConfig::isFull() const
@@ -453,11 +443,12 @@ bool ServerConfig::screenExists(const QString &screenName) const
 void ServerConfig::addClient(const QString &clientName)
 {
   int serverIndex = -1;
+  const auto screenName = Settings::value(Settings::Core::ScreenName).toString();
 
-  if (findScreenName(m_pAppConfig->screenName(), serverIndex)) {
+  if (findScreenName(screenName, serverIndex)) {
     m_Screens[serverIndex].markAsServer();
   } else {
-    fixNoServer(m_pAppConfig->screenName(), serverIndex);
+    fixNoServer(screenName, serverIndex);
   }
 
   m_Screens.addScreenByPriority(Screen(clientName));
@@ -465,12 +456,12 @@ void ServerConfig::addClient(const QString &clientName)
 
 void ServerConfig::setConfigFile(const QString &configFile)
 {
-  m_pAppConfig->setConfigFile(configFile);
+  Settings::setValue(Settings::Server::ExternalConfigFile, configFile);
 }
 
 void ServerConfig::setUseExternalConfig(bool useExternalConfig)
 {
-  m_pAppConfig->setUseExternalConfig(useExternalConfig);
+  Settings::setValue(Settings::Server::ExternalConfig, useExternalConfig);
 }
 
 bool ServerConfig::findScreenName(const QString &name, int &index)
@@ -545,25 +536,7 @@ size_t ServerConfig::setClipboardSharingSize(size_t size)
   return size;
 }
 
-void ServerConfig::setClientAddress(const QString &address)
-{
-  if (m_pAppConfig->invertConnection()) {
-    m_ClientAddress = address;
-  }
-}
-
-QString ServerConfig::getClientAddress() const
-{
-  QString clientAddress;
-
-  if (m_pAppConfig->invertConnection()) {
-    clientAddress = m_ClientAddress.trimmed();
-  }
-
-  return clientAddress;
-}
-
 QSettingsProxy &ServerConfig::settings()
 {
-  return m_pAppConfig->scopes().activeSettings();
+  return Settings::proxy();
 }

src/apps/deskflow-gui/ServerConfig.h

@@ -23,7 +23,6 @@ class QString;
 class QFile;
 class ServerConfigDialog;
 class MainWindow;
-class AppConfig;
 
 namespace synergy::gui {
 
@@ -40,14 +39,13 @@ const auto kDefaultProtocol = ServerProtocol::kBarrier;
 
 class ServerConfig : public ScreenConfig, public deskflow::gui::IServerConfig
 {
-  using QSettingsProxy = deskflow::gui::proxy::QSettingsProxy;
   using ServerProtocol = synergy::gui::ServerProtocol;
 
   friend class ServerConfigDialog;
   friend QTextStream &operator<<(QTextStream &outStream, const ServerConfig &config);
 
 public:
-  ServerConfig(AppConfig &appConfig, MainWindow &mainWindow, int columns = kDefaultColumns, int rows = kDefaultRows);
+  ServerConfig(MainWindow &mainWindow, int columns = kDefaultColumns, int rows = kDefaultRows);
   ~ServerConfig() override = default;
 
   bool operator==(const ServerConfig &sc) const;
@@ -155,9 +153,9 @@ public:
   void commit();
   int numScreens() const;
   int autoAddScreen(const QString name);
-  const QString &getServerName() const;
+  const QString getServerName() const;
   void updateServerName();
-  const QString &configFile() const;
+  const QString configFile() const;
   bool useExternalConfig() const;
   void addClient(const QString &clientName);
   QString getClientAddress() const;
@@ -278,7 +276,6 @@ private:
   QList<bool> m_SwitchCorners;
   HotkeyList m_Hotkeys;
 
-  AppConfig *m_pAppConfig;
   MainWindow *m_pMainWindow;
   ScreenList m_Screens;
   int m_Columns;

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/VersionChecker.cpp

@@ -6,8 +6,7 @@
 
 #include "VersionChecker.h"
 
-#include "common/constants.h"
-#include "gui/env_vars.h"
+#include "common/Settings.h"
 
 #include <QLocale>
 #include <QNetworkAccessManager>
@@ -17,18 +16,14 @@
 #include <QRegularExpression>
 #include <memory>
 
-using namespace deskflow::gui;
-
-VersionChecker::VersionChecker(std::shared_ptr<QNetworkAccessManagerProxy> network)
-    : m_network(network ? network : std::make_shared<QNetworkAccessManagerProxy>())
+VersionChecker::VersionChecker(QObject *parent) : QObject(parent), m_network{new QNetworkAccessManager(this)}
 {
-  m_network->init();
-  connect(m_network.get(), &QNetworkAccessManagerProxy::finished, this, &VersionChecker::replyFinished);
+  connect(m_network, &QNetworkAccessManager::finished, this, &VersionChecker::replyFinished, Qt::UniqueConnection);
 }
 
 void VersionChecker::checkLatest() const
 {
-  const QString url = env_vars::versionUrl();
+  const QString url = Settings::value(Settings::Core::UpdateUrl).toString();
   qDebug("checking for updates at: %s", qPrintable(url));
   auto request = QNetworkRequest(url);
   auto userAgent = QString("%1 %2 on %3").arg(kAppName, kVersion, QSysInfo::prettyProductName());
@@ -47,16 +42,23 @@ void VersionChecker::replyFinished(QNetworkReply *reply)
     return;
   }
 
-  qInfo("version check server success, http status: %d", httpStatus);
+  qDebug("version check server success, http status: %d", httpStatus);
 
   const auto newestVersion = QString(reply->readAll());
+  reply->deleteLater();
   qDebug("version check response: %s", qPrintable(newestVersion));
 
-  if (!newestVersion.isEmpty() && compareVersions(kVersion, newestVersion) > 0) {
-    qDebug("update found");
+  if (newestVersion.isEmpty()) {
+    qWarning() << "version check is response is empty";
+    return;
+  }
+
+  if (compareVersions(kVersion, newestVersion) > 0) {
+    qWarning().noquote() //
+        << QStringLiteral("current version %1 out of date, update available: %2").arg(kVersion, newestVersion);
     Q_EMIT updateFound(newestVersion);
   } else {
-    qDebug("no updates found");
+    qDebug().noquote() << QStringLiteral("current version %1 is upto date").arg(kVersion);
   }
 }
 
@@ -97,8 +99,11 @@ int VersionChecker::compareVersions(const QString &left, const QString &right)
   QStringList leftParts = left.split("-");
   QStringList rightParts = right.split("-");
 
-  QStringList leftNumberParts = left.split(".");
-  QStringList rightNumberParts = right.split(".");
+  QString leftNumber = leftParts.at(0);
+  QString rightNumber = rightParts.at(0);
+
+  QStringList leftNumberParts = leftNumber.split(".");
+  QStringList rightNumberParts = rightNumber.split(".");
 
   auto leftStagePart = leftParts.size() > 1 ? leftParts.at(1) : "";
   auto rightStagePart = rightParts.size() > 1 ? rightParts.at(1) : "";

src/apps/deskflow-gui/VersionChecker.h

@@ -6,26 +6,18 @@
 
 #pragma once
 
-#include "gui/proxy/QNetworkAccessManagerProxy.h"
-
 #include <QObject>
 #include <QString>
 #include <memory>
 
 class QNetworkAccessManager;
 class QNetworkReply;
-class VersionCheckerTests;
 
 class VersionChecker : public QObject
 {
-  using QNetworkAccessManagerProxy = deskflow::gui::proxy::QNetworkAccessManagerProxy;
-
   Q_OBJECT
-
-  friend class VersionCheckerTests;
-
 public:
-  explicit VersionChecker(std::shared_ptr<QNetworkAccessManagerProxy> network = nullptr);
+  explicit VersionChecker(QObject *parent = nullptr);
   void checkLatest() const;
 public slots:
   void replyFinished(QNetworkReply *reply);
@@ -42,6 +34,5 @@ private:
    * more recent the version
    */
   static int getStageVersion(QString stage);
-
-  std::shared_ptr<QNetworkAccessManagerProxy> m_network;
+  QNetworkAccessManager *m_network = nullptr;
 };

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

@@ -9,8 +9,7 @@
 #include "AboutDialog.h"
 #include "ui_AboutDialog.h"
 
-#include "common/constants.h"
-#include "gui/style_utils.h"
+#include "common/Constants.h"
 
 #include <QClipboard>
 #include <QDateTime>
@@ -32,15 +31,7 @@ AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent), ui{std::make_unique
   ui->btnCopyVersion->setIcon(QIcon::fromTheme(QIcon::ThemeIcon::EditCopy));
   connect(ui->btnCopyVersion, &QPushButton::clicked, this, &AboutDialog::copyVersionText);
 
-  // Set up the displayed version number
-  auto versionString = QString(kVersion);
-  if (versionString.endsWith(QStringLiteral(".0"))) {
-    versionString.chop(2);
-  } else {
-    versionString.append(QStringLiteral(" (%1)").arg(kVersionGitSha));
-  }
-
-  ui->lblVersion->setText(versionString);
+  ui->lblVersion->setText(kDisplayVersion);
 
   ui->lblDescription->setText(kAppDescription);
   ui->lblCopyright->setText(kCopyright);
@@ -49,8 +40,8 @@ AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent), ui{std::make_unique
   ui->btnOk->setDefault(true);
   connect(ui->btnOk, &QPushButton::clicked, this, [this] { close(); });
 
+  setFixedWidth(600);
   adjustSize();
-  resize(QSize(parent->width() * 0.65, height()));
   setMinimumSize(size());
 }
 

src/apps/deskflow-gui/dialogs/AboutDialog.h

@@ -25,8 +25,6 @@ private:
   std::unique_ptr<Ui::AboutDialog> ui;
   void copyVersionText();
 
-  inline static const auto s_lightCopy = QStringLiteral(":/icons/64x64/copy-light.png");
-  inline static const auto s_darkCopy = QStringLiteral(":/icons/64x64/copy-dark.png");
   inline static const auto s_awesomeDevs = QStringList{
       // Chris is the ultimate creator, and the one who started it all in 2001.
       QStringLiteral("Chris Schoeneman"),

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

@@ -3,13 +3,13 @@
  <class>AboutDialog</class>
  <widget class="QDialog" name="AboutDialog">
   <property name="windowModality">
-   <enum>Qt::WindowModality::ApplicationModal</enum>
+   <enum>Qt::ApplicationModal</enum>
   </property>
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>493</width>
+    <width>600</width>
     <height>475</height>
    </rect>
   </property>
@@ -67,7 +67,7 @@ p, li { white-space: pre-wrap; }
       <item row="6" column="1">
        <spacer name="verticalSpacer">
         <property name="orientation">
-         <enum>Qt::Orientation::Vertical</enum>
+         <enum>Qt::Vertical</enum>
         </property>
         <property name="sizeHint" stdset="0">
          <size>
@@ -80,7 +80,7 @@ p, li { white-space: pre-wrap; }
       <item row="0" column="1">
        <spacer name="verticalSpacer_3">
         <property name="orientation">
-         <enum>Qt::Orientation::Vertical</enum>
+         <enum>Qt::Vertical</enum>
         </property>
         <property name="sizeHint" stdset="0">
          <size>
@@ -105,7 +105,7 @@ p, li { white-space: pre-wrap; }
          <bool>false</bool>
         </property>
         <property name="alignment">
-         <set>Qt::AlignmentFlag::AlignBottom|Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft</set>
+         <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
         </property>
         <property name="indent">
          <number>0</number>
@@ -158,7 +158,7 @@ p, li { white-space: pre-wrap; }
             <string>Version: </string>
            </property>
            <property name="alignment">
-            <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter</set>
+            <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
            </property>
            <property name="indent">
             <number>0</number>
@@ -182,7 +182,7 @@ p, li { white-space: pre-wrap; }
             <string>lbl_version</string>
            </property>
            <property name="alignment">
-            <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter</set>
+            <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
            </property>
            <property name="smaller_text" stdset="0">
             <bool>true</bool>
@@ -207,7 +207,7 @@ p, li { white-space: pre-wrap; }
             <string>Copy version info</string>
            </property>
            <property name="icon">
-            <iconset resource="../../res/deskflow.qrc">
+            <iconset>
              <normaloff>:/icons/64x64/copy-dark.png</normaloff>:/icons/64x64/copy-dark.png</iconset>
            </property>
            <property name="flat">
@@ -224,7 +224,7 @@ p, li { white-space: pre-wrap; }
             </sizepolicy>
            </property>
            <property name="orientation">
-            <enum>Qt::Orientation::Horizontal</enum>
+            <enum>Qt::Horizontal</enum>
            </property>
            <property name="sizeHint" stdset="0">
             <size>
@@ -272,7 +272,7 @@ p, li { white-space: pre-wrap; }
       <string>lblDescription</string>
      </property>
      <property name="alignment">
-      <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
+      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
      </property>
     </widget>
    </item>
@@ -292,10 +292,10 @@ p, li { white-space: pre-wrap; }
    <item>
     <spacer name="verticalSpacer_2">
      <property name="orientation">
-      <enum>Qt::Orientation::Vertical</enum>
+      <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeType">
-      <enum>QSizePolicy::Policy::Fixed</enum>
+      <enum>QSizePolicy::Fixed</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
@@ -306,49 +306,105 @@ p, li { white-space: pre-wrap; }
     </spacer>
    </item>
    <item>
-    <widget class="QGroupBox" name="groupBox_17">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
+    <widget class="QScrollArea" name="scrollArea">
+     <property name="sizeAdjustPolicy">
+      <enum>QAbstractScrollArea::AdjustIgnored</enum>
      </property>
-     <property name="title">
-      <string>Important developers</string>
+     <property name="widgetResizable">
+      <bool>true</bool>
      </property>
-     <property name="flat">
-      <bool>false</bool>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout_8" stretch="0">
-      <property name="spacing">
-       <number>6</number>
+     <widget class="QWidget" name="scrollAreaWidgetContents">
+      <property name="geometry">
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>574</width>
+        <height>191</height>
+       </rect>
       </property>
-      <property name="leftMargin">
-       <number>6</number>
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
       </property>
-      <property name="rightMargin">
-       <number>6</number>
-      </property>
-      <property name="bottomMargin">
-       <number>6</number>
-      </property>
-      <item>
-       <widget class="QLabel" name="lblImportantDevs">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>lblImportantDevs</string>
-        </property>
-        <property name="wordWrap">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-     </layout>
+      <layout class="QVBoxLayout" name="verticalLayout_4">
+       <property name="spacing">
+        <number>6</number>
+       </property>
+       <property name="leftMargin">
+        <number>3</number>
+       </property>
+       <property name="topMargin">
+        <number>3</number>
+       </property>
+       <property name="rightMargin">
+        <number>3</number>
+       </property>
+       <property name="bottomMargin">
+        <number>3</number>
+       </property>
+       <item>
+        <widget class="QLabel" name="label_2">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Icons from &lt;a href=&quot;https://develop.kde.org/frameworks/breeze-icons/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#007af4;&quot;&gt;KDE Breeze&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         </property>
+         <property name="openExternalLinks">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="groupBox">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="title">
+          <string>Important Developers</string>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_2">
+          <property name="leftMargin">
+           <number>3</number>
+          </property>
+          <property name="topMargin">
+           <number>3</number>
+          </property>
+          <property name="rightMargin">
+           <number>3</number>
+          </property>
+          <property name="bottomMargin">
+           <number>3</number>
+          </property>
+          <item>
+           <widget class="QLabel" name="lblImportantDevs">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="text">
+             <string>lblImportantDevs</string>
+            </property>
+            <property name="wordWrap">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+      </layout>
+     </widget>
     </widget>
    </item>
    <item>
@@ -375,8 +431,6 @@ p, li { white-space: pre-wrap; }
    </item>
   </layout>
  </widget>
- <resources>
-  <include location="../../res/deskflow.qrc"/>
- </resources>
+ <resources/>
  <connections/>
 </ui>

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

@@ -149,7 +149,7 @@
       </sizepolicy>
      </property>
      <property name="title">
-      <string>Computers to recieve this event</string>
+      <string>Computers to receive this event</string>
      </property>
      <layout class="QHBoxLayout" name="_3">
       <item>

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

@@ -0,0 +1,78 @@
+/*
+ * Deskflow -- mouse and keyboard sharing utility
+ * SPDX-FileCopyrightText: (C) 2025 Deskflow Developers
+ * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
+ */
+
+#include "FingerprintDialog.h"
+
+#include "widgets/FingerprintPreview.h"
+
+#include <QFont>
+#include <QLabel>
+#include <QPushButton>
+#include <QVBoxLayout>
+
+FingerprintDialog::FingerprintDialog(
+    QWidget *parent, const QList<deskflow::FingerprintData> &fingerprints, FingerprintDialogMode mode
+)
+    : QDialog(parent),
+      m_lblHeader{new QLabel(this)},
+      m_lblFooter{new QLabel(this)},
+      m_fingerprintPreview{new FingerprintPreview(this, fingerprints)},
+      m_buttonBox{new QDialogButtonBox(this)}
+{
+  setWindowIcon(QIcon::fromTheme("fingerprint"));
+  setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
+
+  m_lblHeader->setWordWrap(true);
+  m_lblFooter->setWordWrap(true);
+  m_lblFooter->setAlignment(Qt::AlignHCenter);
+
+  auto layout = new QVBoxLayout();
+  layout->addWidget(m_lblHeader);
+  layout->addSpacerItem(new QSpacerItem(0, 10, QSizePolicy::Fixed, QSizePolicy::Fixed));
+  layout->addWidget(m_fingerprintPreview, 0, Qt::AlignTop | Qt::AlignHCenter);
+  layout->addWidget(m_lblFooter);
+  layout->addWidget(m_buttonBox);
+  setLayout(layout);
+
+  if (mode == Local) {
+    setWindowTitle(tr("Local Fingerprints"));
+    m_lblHeader->setText(tr("Local computer's fingerprints"));
+    m_lblFooter->setVisible(false);
+    m_buttonBox->setStandardButtons(QDialogButtonBox::Ok);
+    connect(m_buttonBox->button(QDialogButtonBox::Ok), &QPushButton::clicked, this, &QDialog::accept);
+  } else {
+    setWindowTitle(tr("Security Question"));
+    auto body =
+        tr("Compare the fingerprints in this dialog to those on the %1.\n"
+           "Only connect if they match!");
+
+    if (mode == FingerprintDialogMode::Server) {
+      m_lblHeader->setText(tr("A new client is connecting.\n%1").arg(body.arg(tr("client"))));
+      m_lblFooter->setText(tr("\nDo you want connect to and trust the client?\n"));
+    } else {
+      m_lblHeader->setText(tr("You are connecting to a new server.\n%1").arg(body.arg(tr("server"))));
+      m_lblFooter->setText(tr("\nDo you want connect to the server?\n"));
+    }
+
+    m_buttonBox->setStandardButtons(QDialogButtonBox::Help | QDialogButtonBox::Yes | QDialogButtonBox::No);
+
+    // Use help to request a dialog with the host prints
+    // Help is used because its always to the furthest from the other buttons.
+    m_buttonBox->button(QDialogButtonBox::Help)->setText(tr("View local fingerprints"));
+    m_buttonBox->button(QDialogButtonBox::Help)->setIcon(QIcon::fromTheme("fingerprint"));
+    m_buttonBox->button(QDialogButtonBox::Help)->setToolTip(tr("Show the local machines fingerprints"));
+    connect(
+        m_buttonBox->button(QDialogButtonBox::Help), &QPushButton::clicked, this,
+        &FingerprintDialog::requestLocalPrintsDialog
+    );
+
+    m_buttonBox->button(QDialogButtonBox::No)->setFocus();
+    connect(m_buttonBox->button(QDialogButtonBox::No), &QPushButton::clicked, this, &QDialog::reject);
+    connect(m_buttonBox->button(QDialogButtonBox::Yes), &QPushButton::clicked, this, &QDialog::accept);
+  }
+  adjustSize();
+  setFixedSize(size());
+}

src/apps/deskflow-gui/dialogs/FingerprintDialog.h

@@ -0,0 +1,43 @@
+/*
+ * Deskflow -- mouse and keyboard sharing utility
+ * SPDX-FileCopyrightText: (C) 2025 Deskflow Developers
+ * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
+ */
+
+#pragma once
+
+#include "net/FingerprintData.h"
+
+#include <QDialog>
+#include <QDialogButtonBox>
+
+enum FingerprintDialogMode
+{
+  Local,
+  Client,
+  Server
+};
+
+class QLabel;
+class FingerprintPreview;
+
+class FingerprintDialog : public QDialog
+{
+  Q_OBJECT
+
+public:
+  explicit FingerprintDialog(
+      QWidget *parent = nullptr, const QList<deskflow::FingerprintData> &fingerprints = {},
+      FingerprintDialogMode mode = FingerprintDialogMode::Local
+  );
+  ~FingerprintDialog() = default;
+
+signals:
+  void requestLocalPrintsDialog();
+
+private:
+  QLabel *m_lblHeader = nullptr;
+  QLabel *m_lblFooter = nullptr;
+  FingerprintPreview *m_fingerprintPreview = nullptr;
+  QDialogButtonBox *m_buttonBox = nullptr;
+};

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

@@ -8,11 +8,11 @@
 #include "ScreenSettingsDialog.h"
 #include "ui_ScreenSettingsDialog.h"
 
+#include "gui/Styles.h"
 #include "gui/config/Screen.h"
-#include "gui/styles.h"
-#include "gui/validators/AliasValidator.h"
-#include "gui/validators/ScreenNameValidator.h"
-#include "gui/validators/ValidationError.h"
+#include "validators/AliasValidator.h"
+#include "validators/ScreenNameValidator.h"
+#include "validators/ValidationError.h"
 
 #include <QMessageBox>
 

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

@@ -1,5 +1,6 @@
 /*
  * Deskflow -- mouse and keyboard sharing utility
+ * SPDX-FileCopyrightText: (C) 2025 Chris Rizzitello <sithlord48@gmail.com>
  * 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
@@ -8,7 +9,7 @@
 #include "ServerConfigDialog.h"
 #include "ui_ServerConfigDialog.h"
 
-#include "common/constants.h"
+#include "common/Constants.h"
 #include "dialogs/ActionDialog.h"
 #include "dialogs/HotkeyDialog.h"
 #include "dialogs/ScreenSettingsDialog.h"
@@ -21,7 +22,7 @@
 using enum ScreenConfig::SwitchCorner;
 using ServerProtocol = synergy::gui::ServerProtocol;
 
-ServerConfigDialog::ServerConfigDialog(QWidget *parent, ServerConfig &config, AppConfig &appConfig)
+ServerConfigDialog::ServerConfigDialog(QWidget *parent, ServerConfig &config)
     : QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint),
       ui{std::make_unique<Ui::ServerConfigDialog>()},
       m_OriginalServerConfig(config),
@@ -29,52 +30,119 @@ ServerConfigDialog::ServerConfigDialog(QWidget *parent, ServerConfig &config, Ap
       m_OriginalServerConfigUsesExternalFile(config.configFile()),
       m_ServerConfig(config),
       m_ScreenSetupModel(serverConfig().screens(), serverConfig().numColumns(), serverConfig().numRows()),
-      m_Message(""),
-      m_appConfig(appConfig)
+      m_Message("")
 {
   ui->setupUi(this);
 
-  ui->m_pButtonBrowseConfigFile->setIcon(QIcon::fromTheme(QIcon::ThemeIcon::DocumentOpen));
-  ui->m_pTrashScreenWidget->setPixmap(QIcon::fromTheme("user-trash").pixmap(QSize(64, 64)));
+  connect(ui->buttonBox, &QDialogButtonBox::accepted, this, &ServerConfigDialog::accept);
+  connect(ui->buttonBox, &QDialogButtonBox::rejected, this, &ServerConfigDialog::reject);
+
+  ui->lblRemoveScreen->setPixmap(QIcon::fromTheme("user-trash").pixmap(QSize(64, 64)));
+  connect(ui->lblRemoveScreen, &TrashScreenWidget::screenRemoved, this, &ServerConfigDialog::onScreenRemoved);
+
+  ui->lblNewScreen->setEnabled(!model().isFull());
   ui->lblNewScreen->setPixmap(QIcon::fromTheme("video-display").pixmap(QSize(64, 64)));
-  ui->lblNewScreen->setToolTip(tr("Drag to the grid to add a new computer."));
+
+  connect(ui->btnNewHotkey, &QPushButton::clicked, this, &ServerConfigDialog::addHotkey);
+  connect(ui->btnEditHotkey, &QPushButton::clicked, this, &ServerConfigDialog::editHotkey);
+  connect(ui->btnRemoveHotkey, &QPushButton::clicked, this, &ServerConfigDialog::removeHotkey);
+  connect(ui->listHotkeys, &QListView::doubleClicked, this, &ServerConfigDialog::editHotkey);
+  connect(
+      ui->listHotkeys->selectionModel(), &QItemSelectionModel::selectionChanged, this,
+      &ServerConfigDialog::listHotkeysSelectionChanged
+  );
+
+  connect(ui->btnNewAction, &QPushButton::clicked, this, &ServerConfigDialog::addAction);
+  connect(ui->btnEditAction, &QPushButton::clicked, this, &ServerConfigDialog::editAction);
+  connect(ui->btnRemoveAction, &QPushButton::clicked, this, &ServerConfigDialog::removeAction);
+  connect(ui->listActions, &QListView::doubleClicked, this, &ServerConfigDialog::editAction);
+  connect(
+      ui->listActions->selectionModel(), &QItemSelectionModel::selectionChanged, this,
+      &ServerConfigDialog::listActionsSelectionChanged
+  );
 
   // 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->tabWidget->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->btnBrowseConfigFile->setIcon(QIcon::fromTheme(QIcon::ThemeIcon::DocumentOpen));
+  ui->lineConfigFile->setText(serverConfig().configFile());
 
-  ui->m_pCheckBoxRelativeMouseMoves->setChecked(serverConfig().relativeMouseMoves());
-  ui->m_pCheckBoxWin32KeepForeground->setChecked(serverConfig().win32KeepForeground());
+  ui->groupExternalConfig->setChecked(serverConfig().useExternalConfig());
 
-  ui->m_pCheckBoxSwitchDelay->setChecked(serverConfig().hasSwitchDelay());
-  ui->m_pSpinBoxSwitchDelay->setValue(serverConfig().switchDelay());
+  ui->rbProtocolSynergy->setChecked(serverConfig().protocol() == ServerProtocol::kSynergy);
+  ui->rbProtocolBarrier->setChecked(serverConfig().protocol() == ServerProtocol::kBarrier);
+  connect(ui->rbProtocolBarrier, &QRadioButton::toggled, this, &ServerConfigDialog::toggleProtocol);
 
-  ui->m_pCheckBoxSwitchDoubleTap->setChecked(serverConfig().hasSwitchDoubleTap());
-  ui->m_pSpinBoxSwitchDoubleTap->setValue(serverConfig().switchDoubleTap());
+  ui->cbHeartbeat->setChecked(serverConfig().hasHeartbeat());
+  connect(ui->cbHeartbeat, &QCheckBox::toggled, this, &ServerConfigDialog::toggleHeartbeat);
 
-  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->sbHeartbeat->setValue(serverConfig().heartbeat());
+  connect(ui->sbHeartbeat, QOverload<int>::of(&QSpinBox::valueChanged), this, &ServerConfigDialog::setHeartbeat);
 
-  ui->m_pCheckBoxEnableClipboard->setChecked(serverConfig().clipboardSharing());
+  ui->cbRelativeMouseMoves->setChecked(serverConfig().relativeMouseMoves());
+
+#ifndef Q_OS_WIN
+  ui->cbWin32KeepForeground->setVisible(false);
+#endif
+  ui->cbWin32KeepForeground->setChecked(serverConfig().win32KeepForeground());
+  connect(ui->cbWin32KeepForeground, &QCheckBox::toggled, this, &ServerConfigDialog::toggleWin32Foreground);
+
+  ui->cbSwitchDelay->setChecked(serverConfig().hasSwitchDelay());
+  connect(ui->cbSwitchDelay, &QCheckBox::toggled, this, &ServerConfigDialog::toggleSwitchDelay);
+
+  ui->sbSwitchDelay->setValue(serverConfig().switchDelay());
+  connect(ui->sbSwitchDelay, QOverload<int>::of(&QSpinBox::valueChanged), this, &ServerConfigDialog::setSwitchDelay);
+
+  ui->cbSwitchDoubleTap->setChecked(serverConfig().hasSwitchDoubleTap());
+  connect(ui->cbSwitchDoubleTap, &QCheckBox::toggled, this, &ServerConfigDialog::toggleSwitchDoubleTap);
+
+  ui->sbSwitchDoubleTap->setValue(serverConfig().switchDoubleTap());
+  connect(
+      ui->sbSwitchDoubleTap, QOverload<int>::of(&QSpinBox::valueChanged), this, &ServerConfigDialog::setSwitchDoubleTap
+  );
+
+  connect(ui->cbRelativeMouseMoves, &QCheckBox::toggled, this, &ServerConfigDialog::toggleRelativeMouseMoves);
+  connect(ui->cbEnableClipboard, &QCheckBox::toggled, this, &ServerConfigDialog::toggleClipboard);
+
+  connect(ui->groupExternalConfig, &QGroupBox::toggled, this, &ServerConfigDialog::toggleExternalConfig);
+  connect(ui->btnBrowseConfigFile, &QPushButton::clicked, this, &ServerConfigDialog::browseConfigFile);
+
+  connect(
+      ui->sbSwitchCornerSize, QOverload<int>::of(&QSpinBox::valueChanged), this,
+      &ServerConfigDialog::setSwitchCornerSize
+  );
+  connect(
+      ui->sbClipboardSizeLimit, QOverload<int>::of(&QSpinBox::valueChanged), this,
+      &ServerConfigDialog::setClipboardLimit
+  );
+
+  ui->cbCornerTopLeft->setChecked(serverConfig().switchCorner(static_cast<int>(TopLeft)));
+  connect(ui->cbCornerTopLeft, &QCheckBox::toggled, this, &ServerConfigDialog::toggleCornerTopLeft);
+
+  ui->cbCornerTopRight->setChecked(serverConfig().switchCorner(static_cast<int>(TopRight)));
+  connect(ui->cbCornerTopRight, &QCheckBox::toggled, this, &ServerConfigDialog::toggleCornerTopRight);
+
+  ui->cbCornerBottomLeft->setChecked(serverConfig().switchCorner(static_cast<int>(BottomLeft)));
+  connect(ui->cbCornerBottomLeft, &QCheckBox::toggled, this, &ServerConfigDialog::toggleCornerBottomLeft);
+
+  ui->cbCornerBottomRight->setChecked(serverConfig().switchCorner(static_cast<int>(BottomRight)));
+  connect(ui->cbCornerBottomRight, &QCheckBox::toggled, this, &ServerConfigDialog::toggleCornerBottomRight);
+
+  ui->sbSwitchCornerSize->setValue(serverConfig().switchCornerSize());
+
+  ui->cbDisableLockToScreen->setChecked(serverConfig().disableLockToScreen());
+  connect(ui->cbDisableLockToScreen, &QCheckBox::toggled, this, &ServerConfigDialog::toggleLockToScreen);
+
+  ui->cbEnableClipboard->setChecked(serverConfig().clipboardSharing());
   int clipboardSharingSizeM = static_cast<int>(serverConfig().clipboardSharingSize() / 1024);
-  ui->m_pSpinBoxClipboardSizeLimit->setValue(clipboardSharingSizeM);
-  ui->m_pSpinBoxClipboardSizeLimit->setEnabled(serverConfig().clipboardSharing());
+  ui->sbClipboardSizeLimit->setValue(clipboardSharingSizeM);
+  ui->sbClipboardSizeLimit->setEnabled(serverConfig().clipboardSharing());
 
   for (const Hotkey &hotkey : std::as_const(serverConfig().hotkeys()))
-    ui->m_pListHotkeys->addItem(hotkey.text());
+    ui->listHotkeys->addItem(hotkey.text());
 
-  ui->m_pScreenSetupView->setModel(&m_ScreenSetupModel);
+  ui->screenSetupView->setModel(&m_ScreenSetupModel);
 
   auto &screens = serverConfig().screens();
   auto server = std::find_if(screens.begin(), screens.end(), [this](const Screen &screen) {
@@ -89,170 +157,10 @@ ServerConfigDialog::ServerConfigDialog(QWidget *parent, ServerConfig &config, Ap
     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;
@@ -264,13 +172,13 @@ bool ServerConfigDialog::addClient(const QString &clientName)
 
 void ServerConfigDialog::accept()
 {
-  if (ui->m_pCheckBoxUseExternalConfig->isChecked() && !QFile::exists(ui->m_pEditConfigFile->text())) {
+  if (ui->groupExternalConfig->isChecked() && !QFile::exists(ui->lineConfigFile->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()) {
+    if (selectedButton != QMessageBox::Ok || !browseConfigFile()) {
       return;
     }
   }
@@ -290,130 +198,242 @@ void ServerConfigDialog::reject()
   QDialog::reject();
 }
 
-void ServerConfigDialog::on_m_pButtonNewHotkey_clicked()
+void ServerConfigDialog::addHotkey()
 {
   Hotkey hotkey;
   HotkeyDialog dlg(this, hotkey);
   if (dlg.exec() == QDialog::Accepted) {
     serverConfig().hotkeys().append(hotkey);
-    ui->m_pListHotkeys->addItem(hotkey.text());
+    ui->listHotkeys->addItem(hotkey.text());
     onChange();
   }
 }
 
-void ServerConfigDialog::on_m_pButtonEditHotkey_clicked()
+void ServerConfigDialog::editHotkey()
 {
-  int idx = ui->m_pListHotkeys->currentRow();
-  Q_ASSERT(idx >= 0 && idx < serverConfig().hotkeys().size());
-  Hotkey &hotkey = serverConfig().hotkeys()[idx];
+  int row = ui->listHotkeys->currentRow();
+  if (row < 0 || row >= serverConfig().hotkeys().size()) {
+    qDebug() << "Attempt to editing out of bounds hotkey row: " << row;
+    return;
+  }
+
+  Hotkey &hotkey = serverConfig().hotkeys()[row];
   HotkeyDialog dlg(this, hotkey);
   if (dlg.exec() == QDialog::Accepted) {
-    ui->m_pListHotkeys->currentItem()->setText(hotkey.text());
+    ui->listHotkeys->currentItem()->setText(hotkey.text());
     onChange();
   }
 }
 
-void ServerConfigDialog::on_m_pButtonRemoveHotkey_clicked()
+void ServerConfigDialog::removeHotkey()
 {
-  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);
+  int row = ui->listHotkeys->currentRow();
+  if (row < 0 || row >= serverConfig().hotkeys().size()) {
+    qDebug() << "Attempt to remove out of bounds hotkey row: " << row;
+    return;
+  }
+
+  serverConfig().hotkeys().removeAt(row);
+  ui->listActions->clear();
+  delete ui->listHotkeys->item(row);
   onChange();
 }
 
-void ServerConfigDialog::on_m_pListHotkeys_itemSelectionChanged()
+void ServerConfigDialog::listHotkeysSelectionChanged(const QItemSelection &selected, const QItemSelection &deselected)
 {
-  bool itemsSelected = !ui->m_pListHotkeys->selectedItems().isEmpty();
-  ui->m_pButtonEditHotkey->setEnabled(itemsSelected);
-  ui->m_pButtonRemoveHotkey->setEnabled(itemsSelected);
-  ui->m_pButtonNewAction->setEnabled(itemsSelected);
+  bool itemsSelected = !selected.isEmpty();
+  ui->btnEditHotkey->setEnabled(itemsSelected);
+  ui->btnRemoveHotkey->setEnabled(itemsSelected);
+  ui->btnNewAction->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];
+  if (itemsSelected && !serverConfig().hotkeys().isEmpty()) {
+    ui->listActions->clear();
+    const Hotkey &hotkey = serverConfig().hotkeys().at(selected.indexes().first().row());
     for (const Action &action : hotkey.actions())
-      ui->m_pListActions->addItem(action.text());
+      ui->listActions->addItem(action.text());
   }
 }
 
-void ServerConfigDialog::on_m_pButtonNewAction_clicked()
+void ServerConfigDialog::addAction()
 {
-  int idx = ui->m_pListHotkeys->currentRow();
-  Q_ASSERT(idx >= 0 && idx < serverConfig().hotkeys().size());
-  Hotkey &hotkey = serverConfig().hotkeys()[idx];
+  int row = ui->listHotkeys->currentRow();
+  if (row < 0 || row >= serverConfig().hotkeys().size()) {
+    qDebug() << "Attempt to add action to out of bounds hotkey row: " << row;
+    return;
+  }
 
+  Hotkey &hotkey = serverConfig().hotkeys()[row];
   Action action;
   ActionDialog dlg(this, serverConfig(), hotkey, action);
   if (dlg.exec() == QDialog::Accepted) {
     hotkey.actions().append(action);
-    ui->m_pListActions->addItem(action.text());
+    ui->listActions->addItem(action.text());
     onChange();
   }
 }
 
-void ServerConfigDialog::on_m_pButtonEditAction_clicked()
+void ServerConfigDialog::editAction()
 {
-  int idxHotkey = ui->m_pListHotkeys->currentRow();
-  Q_ASSERT(idxHotkey >= 0 && idxHotkey < serverConfig().hotkeys().size());
-  Hotkey &hotkey = serverConfig().hotkeys()[idxHotkey];
+  int hotkeyRow = ui->listHotkeys->currentRow();
+  if (hotkeyRow < 0 || hotkeyRow >= serverConfig().hotkeys().size()) {
+    qDebug() << "Attempt to edit action from out of bounds hotkey row: " << hotkeyRow;
+    return;
+  }
+  Hotkey &hotkey = serverConfig().hotkeys()[hotkeyRow];
 
-  int idxAction = ui->m_pListActions->currentRow();
-  Q_ASSERT(idxAction >= 0 && idxAction < hotkey.actions().size());
-  Action &action = hotkey.actions()[idxAction];
+  int actionRow = ui->listActions->currentRow();
+  if (actionRow < 0 || actionRow >= hotkey.actions().size()) {
+    qDebug() << "Attempt to remove out of bounds action row: " << actionRow;
+    return;
+  }
+  Action &action = hotkey.actions()[actionRow];
 
   ActionDialog dlg(this, serverConfig(), hotkey, action);
   if (dlg.exec() == QDialog::Accepted) {
-    ui->m_pListActions->currentItem()->setText(action.text());
+    ui->listActions->currentItem()->setText(action.text());
     onChange();
   }
 }
 
-void ServerConfigDialog::on_m_pButtonRemoveAction_clicked()
+void ServerConfigDialog::removeAction()
 {
-  int idxHotkey = ui->m_pListHotkeys->currentRow();
-  Q_ASSERT(idxHotkey >= 0 && idxHotkey < serverConfig().hotkeys().size());
-  Hotkey &hotkey = serverConfig().hotkeys()[idxHotkey];
+  int hotkeyRow = ui->listHotkeys->currentRow();
+  if (hotkeyRow < 0 || hotkeyRow >= serverConfig().hotkeys().size()) {
+    qDebug() << "Attempt to remove action from out of bounds hotkey row: " << hotkeyRow;
+    return;
+  }
+  Hotkey &hotkey = serverConfig().hotkeys()[hotkeyRow];
 
-  int idxAction = ui->m_pListActions->currentRow();
-  Q_ASSERT(idxAction >= 0 && idxAction < hotkey.actions().size());
+  int actionRow = ui->listActions->currentRow();
+  if (actionRow < 0 || actionRow >= hotkey.actions().size()) {
+    qDebug() << "Attempt to remove out of bounds action row: " << actionRow;
+    return;
+  }
 
-  hotkey.actions().removeAt(idxAction);
-  delete ui->m_pListActions->currentItem();
+  hotkey.actions().removeAt(actionRow);
+  delete ui->listActions->currentItem();
   onChange();
 }
 
-void ServerConfigDialog::on_m_pCheckBoxEnableClipboard_stateChanged(int const state)
+void ServerConfigDialog::toggleClipboard(bool enabled)
 {
-  ui->m_pSpinBoxClipboardSizeLimit->setEnabled(state == Qt::Checked);
-  if ((state == Qt::Checked) && (!ui->m_pSpinBoxClipboardSizeLimit->value())) {
+  ui->sbClipboardSizeLimit->setEnabled(enabled);
+  if (enabled && !ui->sbClipboardSizeLimit->value()) {
     int size = static_cast<int>((serverConfig().defaultClipboardSharingSize() + 512) / 1024);
-    ui->m_pSpinBoxClipboardSizeLimit->setValue(size ? size : 1);
+    ui->sbClipboardSizeLimit->setValue(size ? size : 1);
   }
+  serverConfig().setClipboardSharing(enabled);
+  onChange();
 }
 
-void ServerConfigDialog::on_m_pListActions_itemSelectionChanged()
+void ServerConfigDialog::setClipboardLimit(int limit)
 {
-  ui->m_pButtonEditAction->setEnabled(!ui->m_pListActions->selectedItems().isEmpty());
-  ui->m_pButtonRemoveAction->setEnabled(!ui->m_pListActions->selectedItems().isEmpty());
+  serverConfig().setClipboardSharingSize(limit * 1024);
+  onChange();
 }
 
-void ServerConfigDialog::on_m_pButtonAddComputer_clicked()
+void ServerConfigDialog::toggleHeartbeat(bool enabled)
+{
+  ui->sbHeartbeat->setEnabled(enabled);
+  serverConfig().haveHeartbeat(enabled);
+  onChange();
+}
+
+void ServerConfigDialog::setHeartbeat(int rate)
+{
+  serverConfig().setHeartbeat(rate);
+  onChange();
+}
+
+void ServerConfigDialog::toggleRelativeMouseMoves(bool enabled)
+{
+  serverConfig().setRelativeMouseMoves(enabled);
+  onChange();
+}
+
+void ServerConfigDialog::toggleProtocol()
+{
+  ServerProtocol proto = ui->rbProtocolBarrier->isChecked() ? ServerProtocol::kBarrier : ServerProtocol::kSynergy;
+  serverConfig().setProtocol(proto);
+  onChange();
+}
+
+void ServerConfigDialog::setSwitchCornerSize(int size)
+{
+  serverConfig().setSwitchCornerSize(size);
+  onChange();
+}
+
+void ServerConfigDialog::toggleCornerBottomLeft(bool enable)
+{
+  serverConfig().setSwitchCorner(static_cast<int>(BottomLeft), enable);
+  onChange();
+}
+
+void ServerConfigDialog::toggleCornerTopLeft(bool enable)
+{
+  serverConfig().setSwitchCorner(static_cast<int>(TopLeft), enable);
+  onChange();
+}
+
+void ServerConfigDialog::toggleCornerBottomRight(bool enable)
+{
+  serverConfig().setSwitchCorner(static_cast<int>(BottomRight), enable);
+  onChange();
+}
+
+void ServerConfigDialog::toggleCornerTopRight(bool enable)
+{
+  serverConfig().setSwitchCorner(static_cast<int>(TopRight), enable);
+  onChange();
+}
+
+void ServerConfigDialog::listActionsSelectionChanged(const QItemSelection &selected, const QItemSelection &deselected)
+{
+  bool enabled = !selected.isEmpty();
+  ui->btnEditAction->setEnabled(enabled);
+  ui->btnRemoveAction->setEnabled(enabled);
+}
+
+void ServerConfigDialog::toggleSwitchDoubleTap(bool enable)
+{
+  ui->sbSwitchDoubleTap->setEnabled(enable);
+  serverConfig().haveSwitchDoubleTap(enable);
+  onChange();
+}
+
+void ServerConfigDialog::setSwitchDoubleTap(int within)
+{
+  serverConfig().setSwitchDoubleTap(within);
+  onChange();
+}
+
+void ServerConfigDialog::toggleSwitchDelay(bool enable)
+{
+  ui->sbSwitchDelay->setEnabled(enable);
+  serverConfig().haveSwitchDelay(enable);
+  onChange();
+}
+
+void ServerConfigDialog::setSwitchDelay(int delay)
+{
+  serverConfig().setSwitchDelay(delay);
+  onChange();
+}
+
+void ServerConfigDialog::toggleLockToScreen(bool disabled)
+{
+  serverConfig().setDisableLockToScreen(disabled);
+  onChange();
+}
+
+void ServerConfigDialog::toggleWin32Foreground(bool enabled)
+{
+  serverConfig().setWin32KeepForeground(enabled);
+  onChange();
+}
+
+void ServerConfigDialog::addClient()
 {
   addComputer("", false);
 }
@@ -424,18 +444,21 @@ void ServerConfigDialog::onScreenRemoved()
   onChange();
 }
 
-void ServerConfigDialog::on_m_pCheckBoxUseExternalConfig_toggled(bool checked)
+void ServerConfigDialog::toggleExternalConfig(bool checked)
 {
-  ui->m_pLabelConfigFile->setEnabled(checked);
-  ui->m_pEditConfigFile->setEnabled(checked);
-  ui->m_pButtonBrowseConfigFile->setEnabled(checked);
+  ui->labelConfigFile->setEnabled(checked);
+  ui->lineConfigFile->setEnabled(checked);
+  ui->btnBrowseConfigFile->setEnabled(checked);
 
-  ui->m_pTabWidget->setTabEnabled(0, !checked);
-  ui->m_pTabWidget->setTabEnabled(1, !checked);
-  ui->m_pTabWidget->setTabEnabled(2, !checked);
+  ui->tabWidget->setTabEnabled(0, !checked);
+  ui->tabWidget->setTabEnabled(1, !checked);
+  ui->tabWidget->setTabEnabled(2, !checked);
+
+  serverConfig().setUseExternalConfig(checked);
+  onChange();
 }
 
-bool ServerConfigDialog::on_m_pButtonBrowseConfigFile_clicked()
+bool ServerConfigDialog::browseConfigFile()
 {
 #if defined(Q_OS_WIN)
   static const auto configExt = QStringLiteral("sgc");
@@ -448,7 +471,9 @@ bool ServerConfigDialog::on_m_pButtonBrowseConfigFile_clicked()
       QFileDialog::getOpenFileName(this, "Browse for a config file", "", deskflowConfigFilter.arg(kAppName, configExt));
 
   if (!fileName.isEmpty()) {
-    ui->m_pEditConfigFile->setText(fileName);
+    ui->lineConfigFile->setText(fileName);
+    serverConfig().setConfigFile(ui->lineConfigFile->text());
+    onChange();
     return true;
   }
 
@@ -474,6 +499,6 @@ void ServerConfigDialog::onChange()
 {
   bool isAppConfigDataEqual = m_OriginalServerConfigIsExternal == serverConfig().useExternalConfig() &&
                               m_OriginalServerConfigUsesExternalFile == serverConfig().configFile();
-  ui->m_pButtonBox->button(QDialogButtonBox::Ok)
+  ui->buttonBox->button(QDialogButtonBox::Ok)
       ->setEnabled(!isAppConfigDataEqual || !(m_OriginalServerConfig == m_ServerConfig));
 }

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

@@ -1,5 +1,6 @@
 /*
  * Deskflow -- mouse and keyboard sharing utility
+ * SPDX-FileCopyrightText: (C) 2025 Chris Rizzitello <sithlord48@gmail.com>
  * 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
@@ -9,10 +10,11 @@
 
 #include "ScreenSetupModel.h"
 #include "ServerConfig.h"
-#include "gui/config/AppConfig.h"
 
 #include <QDialog>
 
+class QItemSelection;
+
 namespace Ui {
 class ServerConfigDialog;
 }
@@ -22,7 +24,7 @@ class ServerConfigDialog : public QDialog
   Q_OBJECT
 
 public:
-  ServerConfigDialog(QWidget *parent, ServerConfig &config, AppConfig &appConfig);
+  ServerConfigDialog(QWidget *parent, ServerConfig &config);
   ~ServerConfigDialog();
   bool addClient(const QString &clientName);
 
@@ -35,23 +37,49 @@ public slots:
   }
 
 protected slots:
-  void on_m_pButtonNewHotkey_clicked();
-  void on_m_pListHotkeys_itemSelectionChanged();
-  void on_m_pButtonEditHotkey_clicked();
-  void on_m_pButtonRemoveHotkey_clicked();
-
-  void on_m_pButtonNewAction_clicked();
-  void on_m_pListActions_itemSelectionChanged();
-  void on_m_pButtonEditAction_clicked();
-  void on_m_pButtonRemoveAction_clicked();
-  void on_m_pCheckBoxEnableClipboard_stateChanged(int state);
-  void on_m_pButtonAddComputer_clicked();
   void onScreenRemoved();
-  void on_m_pCheckBoxUseExternalConfig_toggled(bool checked = false);
-  bool on_m_pButtonBrowseConfigFile_clicked();
 
 protected:
+  void addClient();
   bool addComputer(const QString &clientName, bool doSilent);
+
+  void addHotkey();
+  void editHotkey();
+  void removeHotkey();
+  void listHotkeysSelectionChanged(const QItemSelection &selected, const QItemSelection &deselected);
+
+  void addAction();
+  void editAction();
+  void removeAction();
+  void listActionsSelectionChanged(const QItemSelection &selected, const QItemSelection &deselected);
+
+  void toggleSwitchDoubleTap(bool enable);
+  void setSwitchDoubleTap(int within);
+
+  void toggleSwitchDelay(bool enable);
+  void setSwitchDelay(int delay);
+
+  void toggleLockToScreen(bool disabled);
+  void toggleWin32Foreground(bool enabled);
+
+  void toggleClipboard(bool enabled);
+  void setClipboardLimit(int limit);
+
+  void toggleHeartbeat(bool enabled);
+  void setHeartbeat(int rate);
+
+  void toggleRelativeMouseMoves(bool enabled);
+  void toggleProtocol();
+
+  void setSwitchCornerSize(int size);
+  void toggleCornerBottomLeft(bool enable);
+  void toggleCornerTopLeft(bool enable);
+  void toggleCornerBottomRight(bool enable);
+  void toggleCornerTopRight(bool enable);
+
+  void toggleExternalConfig(bool enable = false);
+  bool browseConfigFile();
+
   ServerConfig &serverConfig()
   {
     return m_ServerConfig;
@@ -64,10 +92,6 @@ protected:
   {
     return m_ScreenSetupModel;
   }
-  AppConfig &appConfig()
-  {
-    return m_appConfig;
-  }
 
 private:
   std::unique_ptr<Ui::ServerConfigDialog> ui;
@@ -77,7 +101,6 @@ private:
   QString m_OriginalServerConfigUsesExternalFile;
   ScreenSetupModel m_ScreenSetupModel;
   QString m_Message;
-  AppConfig &m_appConfig;
 
 private slots:
   void onChange();

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

@@ -1,5 +1,6 @@
 /*
  * Deskflow -- mouse and keyboard sharing utility
+ * SPDX-FileCopyrightText: (C) 2025 Deskflow Developers
  * 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
@@ -8,13 +9,11 @@
 #include "SettingsDialog.h"
 #include "ui_SettingsDialog.h"
 
+#include "common/Settings.h"
+#include "gui/Messages.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>
@@ -22,112 +21,74 @@
 
 using namespace deskflow::gui;
 
-SettingsDialog::SettingsDialog(
-    QWidget *parent, AppConfig &appConfig, const IServerConfig &serverConfig, const CoreProcess &coreProcess
-)
+SettingsDialog::SettingsDialog(QWidget *parent, 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)
+      m_tlsUtility(this)
 {
 
   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->comboTlsKeyLength->setItemIcon(0, QIcon::fromTheme(QIcon::ThemeIcon::SecurityLow));
+  ui->comboTlsKeyLength->setItemIcon(1, QIcon::fromTheme(QStringLiteral("security-medium")));
+  ui->comboTlsKeyLength->setItemIcon(2, QIcon::fromTheme(QIcon::ThemeIcon::SecurityHigh));
+  ui->lblTlsCertInfo->setFixedSize(28, 28);
 
-  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")));
+  ui->rbIconMono->setIcon(QIcon::fromTheme(QStringLiteral("deskflow-symbolic")));
+  ui->rbIconColorful->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);
+  ui->tabWidget->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);
+
+  initConnections();
 }
 
-//
-// Auto-connect slots
-//
-
-void SettingsDialog::on_m_pCheckBoxLogToFile_stateChanged(int i)
+void SettingsDialog::initConnections()
 {
-  bool checked = i == 2;
+  connect(this, &SettingsDialog::shown, this, &SettingsDialog::showReadOnlyMessage, Qt::QueuedConnection);
+  connect(Settings::instance(), &Settings::writableChanged, this, &SettingsDialog::showReadOnlyMessage);
 
-  ui->m_pLabelLogPath->setEnabled(checked);
-  ui->m_pLineEditLogFilename->setEnabled(checked);
-  ui->m_pButtonBrowseLog->setEnabled(checked);
+  connect(ui->buttonBox, &QDialogButtonBox::accepted, this, &SettingsDialog::accept);
+  connect(ui->buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
+
+  connect(ui->groupSecurity, &QGroupBox::toggled, this, &SettingsDialog::updateTlsControlsEnabled);
+  connect(ui->cbServiceEnabled, &QCheckBox::toggled, this, &SettingsDialog::updateControls);
+  connect(ui->btnTlsRegenCert, &QPushButton::clicked, this, &SettingsDialog::regenCertificates);
+  connect(ui->comboTlsKeyLength, &QComboBox::currentIndexChanged, this, &SettingsDialog::updateRequestedKeySize);
+  connect(ui->btnTlsCertPath, &QPushButton::clicked, this, &SettingsDialog::browseCertificatePath);
+  connect(ui->btnBrowseLog, &QPushButton::clicked, this, &SettingsDialog::browseLogPath);
+  connect(ui->cbLogToFile, &QCheckBox::toggled, this, &SettingsDialog::setLogToFile);
 }
 
-void SettingsDialog::on_m_pButtonBrowseLog_clicked()
+void SettingsDialog::regenCertificates()
 {
-  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);
+  if (m_tlsUtility.generateCertificate()) {
+    QMessageBox::information(this, tr("TLS Certificate Regenerated"), tr("TLS certificate regenerated successfully."));
+    const auto certificate = Settings::value(Settings::Security::Certificate).toString();
+    updateKeyLengthOnFile(certificate);
   }
 }
 
-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()
+void SettingsDialog::browseCertificatePath()
 {
   QString fileName = QFileDialog::getSaveFileName(
-      this, tr("Select a TLS certificate to use..."), ui->m_pLineEditTlsCertPath->text(), "Cert (*.pem)", nullptr,
+      this, tr("Select a TLS certificate to use..."), ui->lineTlsCertPath->text(), "Cert (*.pem)", nullptr,
       QFileDialog::DontConfirmOverwrite
   );
 
   if (!fileName.isEmpty()) {
-    ui->m_pLineEditTlsCertPath->setText(fileName);
+    ui->lineTlsCertPath->setText(fileName);
 
     if (QFile(fileName).exists()) {
       updateKeyLengthOnFile(fileName);
@@ -137,22 +98,21 @@ void SettingsDialog::on_m_pPushButtonTlsCertPath_clicked()
   }
 }
 
-void SettingsDialog::on_m_pPushButtonTlsRegenCert_clicked()
+void SettingsDialog::browseLogPath()
 {
-  if (m_tlsUtility.generateCertificate()) {
-    QMessageBox::information(this, tr("TLS Certificate Regenerated"), tr("TLS certificate regenerated successfully."));
+  QString fileName =
+      QFileDialog::getSaveFileName(this, tr("Save log file to..."), ui->lineLogFilename->text(), "Logs (*.log *.txt)");
+
+  if (!fileName.isEmpty()) {
+    ui->lineLogFilename->setText(fileName);
   }
 }
 
-void SettingsDialog::on_m_pCheckBoxServiceEnabled_toggled(bool)
+void SettingsDialog::setLogToFile(bool logToFile)
 {
-  updateControls();
+  ui->widgetLogFilename->setEnabled(logToFile);
 }
 
-//
-// End of auto-connect slots
-//
-
 void SettingsDialog::showEvent(QShowEvent *event)
 {
   QDialog::showEvent(event);
@@ -161,126 +121,112 @@ void SettingsDialog::showEvent(QShowEvent *event)
 
 void SettingsDialog::showReadOnlyMessage()
 {
-  const auto activeScopeFilename = m_appConfig.scopes().activeFilePath();
-  messages::showReadOnlySettings(this, activeScopeFilename);
+  if (Settings::isWritable())
+    return;
+  messages::showReadOnlySettings(this, Settings::settingsFile());
 }
 
 void SettingsDialog::accept()
 {
-  if (!ui->m_pLineEditScreenName->hasAcceptableInput()) {
-    QMessageBox::warning(this, tr("Invalid screen name"), m_pScreenNameError->message());
-    return;
-  }
+  Settings::setValue(Settings::Core::Port, ui->sbPort->value());
+  Settings::setValue(Settings::Core::Interface, ui->lineInterface->text());
+  Settings::setValue(Settings::Log::Level, ui->comboLogLevel->currentIndex());
+  Settings::setValue(Settings::Log::ToFile, ui->cbLogToFile->isChecked());
+  Settings::setValue(Settings::Log::File, ui->lineLogFilename->text());
+  Settings::setValue(Settings::Core::ElevateMode, ui->comboElevate->currentIndex());
+  Settings::setValue(Settings::Gui::Autohide, ui->cbAutoHide->isChecked());
+  Settings::setValue(Settings::Gui::AutoUpdateCheck, ui->cbAutoUpdate->isChecked());
+  Settings::setValue(Settings::Core::PreventSleep, ui->cbPreventSleep->isChecked());
+  Settings::setValue(Settings::Security::Certificate, ui->lineTlsCertPath->text());
+  Settings::setValue(Settings::Security::KeySize, ui->comboTlsKeyLength->currentText().toInt());
+  Settings::setValue(Settings::Security::TlsEnabled, ui->groupSecurity->isChecked());
+  Settings::setValue(Settings::Client::LanguageSync, ui->cbLanguageSync->isChecked());
+  Settings::setValue(Settings::Client::InvertScrollDirection, ui->cbScrollDirection->isChecked());
+  Settings::setValue(Settings::Gui::CloseToTray, ui->cbCloseToTray->isChecked());
+  Settings::setValue(Settings::Gui::SymbolicTrayIcon, ui->rbIconMono->isChecked());
+  Settings::setValue(Settings::Security::CheckPeers, ui->cbRequireClientCert->isChecked());
 
-  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());
+  Settings::ProcessMode mode;
+  if (ui->cbServiceEnabled->isChecked())
+    mode = Settings::ProcessMode::Service;
+  else
+    mode = Settings::ProcessMode::Desktop;
+  Settings::setValue(Settings::Core::ProcessMode, mode);
 
   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->sbPort->setValue(Settings::value(Settings::Core::Port).toInt());
+  ui->lineInterface->setText(Settings::value(Settings::Core::Interface).toString());
+  ui->comboLogLevel->setCurrentIndex(Settings::value(Settings::Log::Level).toInt());
+  ui->cbLogToFile->setChecked(Settings::value(Settings::Log::ToFile).toBool());
+  ui->lineLogFilename->setText(Settings::value(Settings::Log::File).toString());
+  ui->cbAutoHide->setChecked(Settings::value(Settings::Gui::Autohide).toBool());
+  ui->cbPreventSleep->setChecked(Settings::value(Settings::Core::PreventSleep).toBool());
+  ui->cbLanguageSync->setChecked(Settings::value(Settings::Client::LanguageSync).toBool());
+  ui->cbScrollDirection->setChecked(Settings::value(Settings::Client::InvertScrollDirection).toBool());
+  ui->cbCloseToTray->setChecked(Settings::value(Settings::Gui::CloseToTray).toBool());
+  ui->comboElevate->setCurrentIndex(Settings::value(Settings::Core::ElevateMode).toInt());
+  ui->cbAutoUpdate->setChecked(Settings::value(Settings::Gui::Autohide).toBool());
 
-  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()));
+  const auto processMode = Settings::value(Settings::Core::ProcessMode).value<Settings::ProcessMode>();
+  ui->cbServiceEnabled->setChecked(processMode == Settings::ProcessMode::Service);
 
-  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);
+  if (Settings::value(Settings::Gui::SymbolicTrayIcon).toBool())
+    ui->rbIconMono->setChecked(true);
   else
-    ui->rb_icon_mono->setChecked(true);
+    ui->rbIconColorful->setChecked(true);
 
+  qDebug() << "load from config done";
   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 certificate = Settings::value(Settings::Security::Certificate).toString();
+  if (QFile(certificate).exists()) {
+    updateKeyLengthOnFile(certificate);
   }
 
-  const auto tlsEnabled = m_tlsUtility.isEnabled();
-  const auto writable = m_appConfig.isActiveScopeWritable();
+  ui->comboTlsKeyLength->setCurrentText(Settings::value(Settings::Security::KeySize).toString());
 
-  ui->m_pCheckBoxEnableTls->setEnabled(writable);
-  ui->m_pCheckBoxEnableTls->setChecked(writable && tlsEnabled);
-  ui->m_pLineEditTlsCertPath->setText(m_appConfig.tlsCertPath());
+  const auto tlsEnabled = Settings::value(Settings::Security::TlsEnabled).toBool();
+  const auto writable = Settings::isWritable();
+  const auto enabled = writable && tlsEnabled;
+
+  ui->lineTlsCertPath->setText(certificate);
+  ui->cbRequireClientCert->setChecked(Settings::value(Settings::Security::CheckPeers).toBool());
+  ui->groupSecurity->setChecked(tlsEnabled);
+
+  ui->groupSecurity->setEnabled(writable);
+  ui->comboTlsKeyLength->setEnabled(enabled);
+  ui->widgetTlsCert->setEnabled(enabled);
+  ui->lblTlsKeyLength->setEnabled(enabled);
+  ui->btnTlsRegenCert->setEnabled(enabled);
+  ui->cbRequireClientCert->setEnabled(enabled);
 }
 
 void SettingsDialog::updateTlsControlsEnabled()
 {
-  const auto writable = m_appConfig.isActiveScopeWritable();
-  const auto clientMode = m_appConfig.clientGroupChecked();
-  const auto tlsChecked = ui->m_pCheckBoxEnableTls->isChecked();
+  const auto writable = Settings::isWritable();
+  const auto clientMode =
+      Settings::value(Settings::Core::CoreMode).value<Settings::CoreMode>() == Settings::CoreMode::Client;
+  const auto tlsChecked = ui->groupSecurity->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);
+  ui->lblTlsKeyLength->setEnabled(enabled);
+  ui->comboTlsKeyLength->setEnabled(enabled);
+  ui->lblTlsCert->setEnabled(enabled);
+  ui->widgetTlsCert->setEnabled(enabled);
+  ui->btnTlsRegenCert->setEnabled(enabled);
+  ui->cbRequireClientCert->setEnabled(enabled);
 }
 
 bool SettingsDialog::isClientMode() const
 {
-  return m_coreProcess.mode() == deskflow::gui::CoreProcess::Mode::Client;
+  return m_coreProcess.mode() == Settings::CoreMode::Client;
 }
 
 void SettingsDialog::updateKeyLengthOnFile(const QString &path)
@@ -291,9 +237,14 @@ void SettingsDialog::updateKeyLengthOnFile(const QString &path)
   }
 
   auto length = ssl.getCertKeyLength(path);
-  auto index = ui->m_pComboBoxTlsKeyLength->findText(QString::number(length));
-  ui->m_pComboBoxTlsKeyLength->setCurrentIndex(index);
-  m_appConfig.setTlsKeyLength(length);
+  QPixmap labelIcon = QPixmap(QIcon::fromTheme(QIcon::ThemeIcon::SecurityLow).pixmap(24, 24));
+  if (length == 2048)
+    labelIcon = QPixmap(QIcon::fromTheme(QStringLiteral("security-medium")).pixmap(24, 24));
+  if (length == 4096)
+    labelIcon = QPixmap(QIcon::fromTheme(QIcon::ThemeIcon::SecurityHigh).pixmap(24, 24));
+
+  ui->lblTlsCertInfo->setPixmap(labelIcon);
+  ui->lblTlsCertInfo->setToolTip(QStringLiteral("Key length: %1 bits").arg(QString::number(length)));
 }
 
 void SettingsDialog::updateControls()
@@ -304,37 +255,40 @@ void SettingsDialog::updateControls()
 #else
   // service not supported on unix yet, so always disable.
   const auto serviceAvailable = false;
-  ui->m_pGroupService->setTitle("Service (Windows only)");
+  ui->groupService->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();
+  const bool writable = Settings::isWritable();
+  const bool serviceChecked = ui->cbServiceEnabled->isChecked();
+  const bool logToFile = ui->cbLogToFile->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->sbPort->setEnabled(writable);
+  ui->lineInterface->setEnabled(writable);
+  ui->comboLogLevel->setEnabled(writable);
+  ui->cbLogToFile->setEnabled(writable);
+  ui->cbAutoHide->setEnabled(writable);
+  ui->cbAutoUpdate->setEnabled(writable);
+  ui->cbPreventSleep->setEnabled(writable);
+  ui->lineTlsCertPath->setEnabled(writable);
+  ui->comboTlsKeyLength->setEnabled(writable);
+  ui->cbCloseToTray->setEnabled(writable);
 
-  ui->m_pCheckBoxServiceEnabled->setEnabled(writable && serviceAvailable);
-  ui->m_pLabelElevate->setEnabled(writable && serviceChecked && serviceAvailable);
-  ui->m_pComboElevate->setEnabled(writable && serviceChecked && serviceAvailable);
+  ui->cbServiceEnabled->setEnabled(writable && serviceAvailable);
+  ui->widgetElevate->setEnabled(writable && serviceChecked && serviceAvailable);
 
-  ui->m_pCheckBoxLanguageSync->setEnabled(writable && isClientMode());
-  ui->m_pCheckBoxScrollDirection->setEnabled(writable && isClientMode());
+  ui->cbLanguageSync->setEnabled(writable && isClientMode());
+  ui->cbScrollDirection->setEnabled(writable && isClientMode());
 
-  ui->m_pLabelLogPath->setEnabled(writable && logToFile);
-  ui->m_pLineEditLogFilename->setEnabled(writable && logToFile);
-  ui->m_pButtonBrowseLog->setEnabled(writable && logToFile);
+  ui->widgetLogFilename->setEnabled(writable && logToFile);
 
   updateTlsControls();
 }
 
+void SettingsDialog::updateRequestedKeySize()
+{
+  if (ui->comboTlsKeyLength->currentText() == Settings::value(Settings::Security::KeySize).toString())
+    return;
+  Settings::setValue(Settings::Security::KeySize, ui->comboTlsKeyLength->currentText());
+}
+
 SettingsDialog::~SettingsDialog() = default;

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

@@ -1,5 +1,6 @@
 /*
  * Deskflow -- mouse and keyboard sharing utility
+ * SPDX-FileCopyrightText: (C) 2025 Deskflow Developers
  * 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
@@ -8,11 +9,10 @@
 #pragma once
 #include <QDialog>
 
-#include "gui/config/AppConfig.h"
 #include "gui/config/IServerConfig.h"
 #include "gui/core/CoreProcess.h"
 #include "gui/tls/TlsUtility.h"
-#include "gui/validators/ValidationError.h"
+#include "validators/ValidationError.h"
 
 namespace Ui {
 class SettingsDialog;
@@ -27,26 +27,19 @@ class SettingsDialog : public QDialog
 
 public:
   void extracted();
-  SettingsDialog(
-      QWidget *parent, AppConfig &appConfig, const IServerConfig &serverConfig, const CoreProcess &coreProcess
-  );
+  SettingsDialog(QWidget *parent, const IServerConfig &serverConfig, const CoreProcess &coreProcess);
   ~SettingsDialog() override;
 
 signals:
   void shown();
 
-private slots:
-  void on_m_pCheckBoxEnableTls_clicked(bool checked);
-  void on_m_pCheckBoxLogToFile_stateChanged(int);
-  void on_m_pButtonBrowseLog_clicked();
-  void on_m_pRadioSystemScope_toggled(bool checked);
-  void on_m_pPushButtonTlsCertPath_clicked();
-  void on_m_pPushButtonTlsRegenCert_clicked();
-  void on_m_pCheckBoxServiceEnabled_toggled(bool checked);
-
 private:
+  void initConnections();
+  void regenCertificates();
+  void browseCertificatePath();
+  void browseLogPath();
+  void setLogToFile(bool logToFile);
   void accept() override;
-  void reject() override;
   void showEvent(QShowEvent *event) override;
   bool isClientMode() const;
   void updateTlsControls();
@@ -56,24 +49,16 @@ private:
   /// @brief Load all settings.
   void loadFromConfig();
 
-  /// @brief Enables or disables the TLS regenerate button.
-  void updateTlsRegenerateButton();
-
   /// @brief Updates the key length value based on the loaded file.
   void updateKeyLengthOnFile(const QString &path);
 
   /// @brief Enables controls when they should be.
   void updateControls();
 
-  validators::ValidationError *m_pScreenNameError;
-
-  /// @brief Stores settings scope at start of settings dialog
-  /// This is necessary to restore state if user changes
-  /// the scope and doesn't save changes
-  bool m_wasOriginallySystemScope = false;
+  /// @brief updates the setting vaule for key size.
+  void updateRequestedKeySize();
 
   std::unique_ptr<Ui::SettingsDialog> ui;
-  AppConfig &m_appConfig;
   const IServerConfig &m_serverConfig;
   const CoreProcess &m_coreProcess;
   deskflow::gui::TlsUtility m_tlsUtility;

src/apps/deskflow-gui/main.cpp

@@ -6,18 +6,15 @@
  * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
  */
 
+#include "Diagnostic.h"
 #include "MainWindow.h"
-#include "SetupWizard.h"
-#include "common/constants.h"
+#include "StyleUtils.h"
+
+#include "common/Constants.h"
+#include "common/UrlConstants.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/Messages.h"
 
 #include <QApplication>
 #include <QDebug>
@@ -121,8 +118,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 +131,15 @@ 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"));
+  const auto resetEnvVar = QVariant(qEnvironmentVariable("DESKFLOW_RESET_ALL")).toBool();
   if (resetEnvVar && !noReset) {
-    diagnostic::clearSettings(configScopes, false);
+    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();
@@ -193,9 +173,11 @@ bool checkMacAssistiveDevices()
   // 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.");
+    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;

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

@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
  */
 
-#include "gui/validators/ComputerNameValidator.h"
-#include "gui/validators/SpacesValidator.h"
-
 #include "AliasValidator.h"
 
+#include "ComputerNameValidator.h"
+#include "SpacesValidator.h"
+
 #include <QRegularExpression>
 
 namespace validators {

src/apps/deskflow-gui/validators/AliasValidator.h

@@ -7,7 +7,7 @@
 #pragma once
 
 #include "LineEditValidator.h"
-#include "gui/validators/ValidationError.h"
+#include "ValidationError.h"
 
 namespace validators {
 

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

@@ -6,7 +6,7 @@
 
 #include "LineEditValidator.h"
 
-#include "gui/styles.h"
+#include "gui/Styles.h"
 
 #include <QValidator>
 

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

@@ -6,11 +6,11 @@
 
 #include "ScreenNameValidator.h"
 
-#include "gui/validators/ComputerNameValidator.h"
-#include "gui/validators/EmptyStringValidator.h"
-#include "gui/validators/ScreenDuplicationsValidator.h"
-#include "gui/validators/SpacesValidator.h"
-#include "gui/validators/ValidationError.h"
+#include "ComputerNameValidator.h"
+#include "EmptyStringValidator.h"
+#include "ScreenDuplicationsValidator.h"
+#include "SpacesValidator.h"
+#include "ValidationError.h"
 
 #include <QRegularExpression>
 #include <memory>
@@ -23,9 +23,11 @@ ScreenNameValidator::ScreenNameValidator(QLineEdit *lineEdit, ValidationError *e
   addValidator(std::make_unique<EmptyStringValidator>("Computer name cannot be empty"));
   addValidator(std::make_unique<SpacesValidator>("Computer name cannot contain spaces"));
   addValidator(std::make_unique<ComputerNameValidator>("Contains invalid characters or is too long"));
-  addValidator(std::make_unique<ScreenDuplicationsValidator>(
-      "A computer with this name already exists", lineEdit ? lineEdit->text() : "", pScreens
-  ));
+  addValidator(
+      std::make_unique<ScreenDuplicationsValidator>(
+          "A computer with this name already exists", lineEdit ? lineEdit->text() : "", pScreens
+      )
+  );
 }
 
 } // namespace validators

src/apps/deskflow-gui/validators/ScreenNameValidator.h

@@ -7,8 +7,9 @@
 #pragma once
 
 #include "LineEditValidator.h"
+#include "ValidationError.h"
+
 #include "gui/config/ScreenList.h"
-#include "gui/validators/ValidationError.h"
 
 namespace validators {
 

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

@@ -6,7 +6,7 @@
 
 #include "ValidationError.h"
 
-#include "gui/styles.h"
+#include "gui/Styles.h"
 
 using namespace deskflow::gui;
 

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/FingerprintPreview.cpp

@@ -0,0 +1,101 @@
+/*
+ * Deskflow -- mouse and keyboard sharing utility
+ * SPDX-FileCopyrightText: (C) 2025 Deskflow Developers
+ * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
+ */
+
+#include "FingerprintPreview.h"
+
+#include <QFont>
+#include <QHBoxLayout>
+#include <QLabel>
+
+#include <net/SecureUtils.h>
+
+FingerprintPreview::FingerprintPreview(QWidget *parent, const QList<deskflow::FingerprintData> &fingerprints)
+    : QFrame(parent)
+{
+  setFrameShape(QFrame::StyledPanel);
+  setFrameStyle(QFrame::Sunken);
+  setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
+
+  QString sha1String;
+  QString sha256String;
+  QString sha256Art;
+
+  for (const auto &fingerprint : fingerprints) {
+    if (fingerprint.algorithm == "sha1") {
+      sha1String = QString::fromStdString(deskflow::formatSSLFingerprint(fingerprint.data));
+    }
+
+    if (fingerprint.algorithm == "sha256") {
+      sha256String = QString::fromStdString(deskflow::formatSSLFingerprintColumns(fingerprint.data));
+      sha256Art = QString::fromStdString(deskflow::generateFingerprintArt(fingerprint.data));
+    }
+  }
+
+  auto labelSha1 = new QLabel(QStringLiteral("SHA1:"), this);
+  labelSha1->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
+
+  auto lblSha1 = new QLabel(sha1String, this);
+  lblSha1->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
+  lblSha1->setTextInteractionFlags(Qt::TextSelectableByMouse);
+
+  auto sha1Layout = new QHBoxLayout();
+  sha1Layout->addWidget(labelSha1);
+  sha1Layout->addWidget(lblSha1);
+
+  auto frameSha1 = new QFrame(this);
+  frameSha1->setFrameShape(QFrame::StyledPanel);
+  frameSha1->setFrameStyle(QFrame::Sunken);
+  frameSha1->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
+  frameSha1->setLayout(sha1Layout);
+
+  auto labelSha256 = new QLabel(QStringLiteral("SHA256:"), this);
+  labelSha256->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
+
+  auto lblSha256String = new QLabel(sha256String, this);
+  lblSha256String->setAlignment(Qt::AlignTop | Qt::AlignHCenter);
+  lblSha256String->setTextInteractionFlags(Qt::TextSelectableByMouse);
+
+  auto lblSha256Art = new QLabel(sha256Art, this);
+  lblSha256Art->setAlignment(Qt::AlignVCenter | Qt::AlignHCenter);
+  lblSha256Art->setTextInteractionFlags(Qt::TextSelectableByMouse);
+
+  QFont f = font();
+  f.setFamilies({"Hack", "Liberation Mono", "Monospace", "Andale Mono"});
+  f.setStyleHint(QFont::Monospace);
+  lblSha256Art->setFont(f);
+
+  auto innersha256Layout = new QHBoxLayout();
+  innersha256Layout->setContentsMargins(0, 0, 0, 0);
+  innersha256Layout->addWidget(lblSha256String);
+  innersha256Layout->addWidget(lblSha256Art);
+
+  auto sha256Layout = new QVBoxLayout();
+  sha256Layout->addWidget(labelSha256);
+  sha256Layout->addLayout(innersha256Layout);
+
+  auto frameSha256 = new QFrame(this);
+  frameSha256->setFrameShape(QFrame::StyledPanel);
+  frameSha256->setFrameStyle(QFrame::Sunken);
+  frameSha256->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
+  frameSha256->setLayout(sha256Layout);
+
+  auto layout = new QVBoxLayout();
+  layout->addWidget(frameSha1);
+  layout->addWidget(frameSha256);
+
+  setLayout(layout);
+
+  if (sha1String.isEmpty()) {
+    frameSha1->setVisible(false);
+  }
+
+  if (sha256String.isEmpty()) {
+    frameSha256->setVisible(false);
+  }
+
+  adjustSize();
+  setFixedSize(size());
+}

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

@@ -0,0 +1,18 @@
+/*
+ * Deskflow -- mouse and keyboard sharing utility
+ * SPDX-FileCopyrightText: (C) 2025 Deskflow Developers
+ * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
+ */
+
+#pragma once
+
+#include <QFrame>
+#include <net/FingerprintData.h>
+
+class FingerprintPreview : public QFrame
+{
+  Q_OBJECT
+public:
+  explicit FingerprintPreview(QWidget *parent, const QList<deskflow::FingerprintData> &fingerprints = {});
+  ~FingerprintPreview() = default;
+};

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,14 +32,17 @@ 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)
 elseif(WIN32)

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