From 5cfaa4a4e075a23b3c493ac2ba9a0de2228c7ba2 Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Fri, 28 Mar 2025 17:58:30 -0400 Subject: [PATCH] refactor: move ALL gui parts to lib --- REUSE.toml | 4 +- src/apps/deskflow-gui/CMakeLists.txt | 73 +------------------ .../{main.cpp => deskflow-gui.cpp} | 7 +- src/{apps/deskflow-gui => lib/gui}/Action.cpp | 0 src/{apps/deskflow-gui => lib/gui}/Action.h | 0 src/lib/gui/CMakeLists.txt | 71 ++++++++++++++++++ .../gui}/DataDownloader.cpp | 0 .../deskflow-gui => lib/gui}/DataDownloader.h | 0 .../deskflow-gui => lib/gui}/Diagnostic.cpp | 0 .../deskflow-gui => lib/gui}/Diagnostic.h | 0 src/{apps/deskflow-gui => lib/gui}/Hotkey.cpp | 0 src/{apps/deskflow-gui => lib/gui}/Hotkey.h | 0 .../deskflow-gui => lib/gui}/KeySequence.cpp | 0 .../deskflow-gui => lib/gui}/KeySequence.h | 0 .../deskflow-gui => lib/gui}/MainWindow.cpp | 0 .../deskflow-gui => lib/gui}/MainWindow.h | 0 .../deskflow-gui => lib/gui}/MainWindow.ui | 0 .../gui}/ScreenSetupModel.cpp | 0 .../gui}/ScreenSetupModel.h | 0 .../deskflow-gui => lib/gui}/ServerConfig.cpp | 0 .../deskflow-gui => lib/gui}/ServerConfig.h | 0 .../deskflow-gui => lib/gui}/StyleUtils.h | 0 .../gui}/VersionChecker.cpp | 0 .../deskflow-gui => lib/gui}/VersionChecker.h | 0 .../gui}/dialogs/AboutDialog.cpp | 0 .../gui}/dialogs/AboutDialog.h | 0 .../gui}/dialogs/AboutDialog.ui | 0 .../gui}/dialogs/ActionDialog.cpp | 0 .../gui}/dialogs/ActionDialog.h | 0 .../gui}/dialogs/ActionDialog.ui | 0 .../gui}/dialogs/AddClientDialog.cpp | 0 .../gui}/dialogs/AddClientDialog.h | 0 .../gui}/dialogs/AddClientDialog.ui | 0 .../gui}/dialogs/FingerprintDialog.cpp | 0 .../gui}/dialogs/FingerprintDialog.h | 0 .../gui}/dialogs/HotkeyDialog.cpp | 0 .../gui}/dialogs/HotkeyDialog.h | 0 .../gui}/dialogs/HotkeyDialog.ui | 0 .../gui}/dialogs/ScreenSettingsDialog.cpp | 0 .../gui}/dialogs/ScreenSettingsDialog.h | 0 .../gui}/dialogs/ScreenSettingsDialog.ui | 0 .../gui}/dialogs/ServerConfigDialog.cpp | 0 .../gui}/dialogs/ServerConfigDialog.h | 0 .../gui}/dialogs/ServerConfigDialog.ui | 0 .../gui}/dialogs/SettingsDialog.cpp | 0 .../gui}/dialogs/SettingsDialog.h | 0 .../gui}/dialogs/SettingsDialog.ui | 0 .../gui}/validators/AliasValidator.cpp | 0 .../gui}/validators/AliasValidator.h | 0 .../gui}/validators/ComputerNameValidator.cpp | 0 .../gui}/validators/ComputerNameValidator.h | 0 .../gui}/validators/EmptyStringValidator.cpp | 0 .../gui}/validators/EmptyStringValidator.h | 0 .../gui}/validators/IStringValidator.cpp | 0 .../gui}/validators/IStringValidator.h | 0 .../gui}/validators/LineEditValidator.cpp | 0 .../gui}/validators/LineEditValidator.h | 0 .../ScreenDuplicationsValidator.cpp | 0 .../validators/ScreenDuplicationsValidator.h | 0 .../gui}/validators/ScreenNameValidator.cpp | 0 .../gui}/validators/ScreenNameValidator.h | 0 .../gui}/validators/SpacesValidator.cpp | 0 .../gui}/validators/SpacesValidator.h | 0 .../gui}/validators/ValidationError.cpp | 0 .../gui}/validators/ValidationError.h | 0 .../gui}/widgets/FingerprintPreview.cpp | 0 .../gui}/widgets/FingerprintPreview.h | 0 .../gui}/widgets/KeySequenceWidget.cpp | 0 .../gui}/widgets/KeySequenceWidget.h | 0 .../gui}/widgets/NewScreenWidget.cpp | 0 .../gui}/widgets/NewScreenWidget.h | 0 .../gui}/widgets/ScreenSetupView.cpp | 0 .../gui}/widgets/ScreenSetupView.h | 0 .../gui}/widgets/TrashScreenWidget.cpp | 0 .../gui}/widgets/TrashScreenWidget.h | 0 75 files changed, 77 insertions(+), 78 deletions(-) rename src/apps/deskflow-gui/{main.cpp => deskflow-gui.cpp} (98%) rename src/{apps/deskflow-gui => lib/gui}/Action.cpp (100%) rename src/{apps/deskflow-gui => lib/gui}/Action.h (100%) rename src/{apps/deskflow-gui => lib/gui}/DataDownloader.cpp (100%) rename src/{apps/deskflow-gui => lib/gui}/DataDownloader.h (100%) rename src/{apps/deskflow-gui => lib/gui}/Diagnostic.cpp (100%) rename src/{apps/deskflow-gui => lib/gui}/Diagnostic.h (100%) rename src/{apps/deskflow-gui => lib/gui}/Hotkey.cpp (100%) rename src/{apps/deskflow-gui => lib/gui}/Hotkey.h (100%) rename src/{apps/deskflow-gui => lib/gui}/KeySequence.cpp (100%) rename src/{apps/deskflow-gui => lib/gui}/KeySequence.h (100%) rename src/{apps/deskflow-gui => lib/gui}/MainWindow.cpp (100%) rename src/{apps/deskflow-gui => lib/gui}/MainWindow.h (100%) rename src/{apps/deskflow-gui => lib/gui}/MainWindow.ui (100%) rename src/{apps/deskflow-gui => lib/gui}/ScreenSetupModel.cpp (100%) rename src/{apps/deskflow-gui => lib/gui}/ScreenSetupModel.h (100%) rename src/{apps/deskflow-gui => lib/gui}/ServerConfig.cpp (100%) rename src/{apps/deskflow-gui => lib/gui}/ServerConfig.h (100%) rename src/{apps/deskflow-gui => lib/gui}/StyleUtils.h (100%) rename src/{apps/deskflow-gui => lib/gui}/VersionChecker.cpp (100%) rename src/{apps/deskflow-gui => lib/gui}/VersionChecker.h (100%) rename src/{apps/deskflow-gui => lib/gui}/dialogs/AboutDialog.cpp (100%) rename src/{apps/deskflow-gui => lib/gui}/dialogs/AboutDialog.h (100%) rename src/{apps/deskflow-gui => lib/gui}/dialogs/AboutDialog.ui (100%) rename src/{apps/deskflow-gui => lib/gui}/dialogs/ActionDialog.cpp (100%) rename src/{apps/deskflow-gui => lib/gui}/dialogs/ActionDialog.h (100%) rename src/{apps/deskflow-gui => lib/gui}/dialogs/ActionDialog.ui (100%) rename src/{apps/deskflow-gui => lib/gui}/dialogs/AddClientDialog.cpp (100%) rename src/{apps/deskflow-gui => lib/gui}/dialogs/AddClientDialog.h (100%) rename src/{apps/deskflow-gui => lib/gui}/dialogs/AddClientDialog.ui (100%) rename src/{apps/deskflow-gui => lib/gui}/dialogs/FingerprintDialog.cpp (100%) rename src/{apps/deskflow-gui => lib/gui}/dialogs/FingerprintDialog.h (100%) rename src/{apps/deskflow-gui => lib/gui}/dialogs/HotkeyDialog.cpp (100%) rename src/{apps/deskflow-gui => lib/gui}/dialogs/HotkeyDialog.h (100%) rename src/{apps/deskflow-gui => lib/gui}/dialogs/HotkeyDialog.ui (100%) rename src/{apps/deskflow-gui => lib/gui}/dialogs/ScreenSettingsDialog.cpp (100%) rename src/{apps/deskflow-gui => lib/gui}/dialogs/ScreenSettingsDialog.h (100%) rename src/{apps/deskflow-gui => lib/gui}/dialogs/ScreenSettingsDialog.ui (100%) rename src/{apps/deskflow-gui => lib/gui}/dialogs/ServerConfigDialog.cpp (100%) rename src/{apps/deskflow-gui => lib/gui}/dialogs/ServerConfigDialog.h (100%) rename src/{apps/deskflow-gui => lib/gui}/dialogs/ServerConfigDialog.ui (100%) rename src/{apps/deskflow-gui => lib/gui}/dialogs/SettingsDialog.cpp (100%) rename src/{apps/deskflow-gui => lib/gui}/dialogs/SettingsDialog.h (100%) rename src/{apps/deskflow-gui => lib/gui}/dialogs/SettingsDialog.ui (100%) rename src/{apps/deskflow-gui => lib/gui}/validators/AliasValidator.cpp (100%) rename src/{apps/deskflow-gui => lib/gui}/validators/AliasValidator.h (100%) rename src/{apps/deskflow-gui => lib/gui}/validators/ComputerNameValidator.cpp (100%) rename src/{apps/deskflow-gui => lib/gui}/validators/ComputerNameValidator.h (100%) rename src/{apps/deskflow-gui => lib/gui}/validators/EmptyStringValidator.cpp (100%) rename src/{apps/deskflow-gui => lib/gui}/validators/EmptyStringValidator.h (100%) rename src/{apps/deskflow-gui => lib/gui}/validators/IStringValidator.cpp (100%) rename src/{apps/deskflow-gui => lib/gui}/validators/IStringValidator.h (100%) rename src/{apps/deskflow-gui => lib/gui}/validators/LineEditValidator.cpp (100%) rename src/{apps/deskflow-gui => lib/gui}/validators/LineEditValidator.h (100%) rename src/{apps/deskflow-gui => lib/gui}/validators/ScreenDuplicationsValidator.cpp (100%) rename src/{apps/deskflow-gui => lib/gui}/validators/ScreenDuplicationsValidator.h (100%) rename src/{apps/deskflow-gui => lib/gui}/validators/ScreenNameValidator.cpp (100%) rename src/{apps/deskflow-gui => lib/gui}/validators/ScreenNameValidator.h (100%) rename src/{apps/deskflow-gui => lib/gui}/validators/SpacesValidator.cpp (100%) rename src/{apps/deskflow-gui => lib/gui}/validators/SpacesValidator.h (100%) rename src/{apps/deskflow-gui => lib/gui}/validators/ValidationError.cpp (100%) rename src/{apps/deskflow-gui => lib/gui}/validators/ValidationError.h (100%) rename src/{apps/deskflow-gui => lib/gui}/widgets/FingerprintPreview.cpp (100%) rename src/{apps/deskflow-gui => lib/gui}/widgets/FingerprintPreview.h (100%) rename src/{apps/deskflow-gui => lib/gui}/widgets/KeySequenceWidget.cpp (100%) rename src/{apps/deskflow-gui => lib/gui}/widgets/KeySequenceWidget.h (100%) rename src/{apps/deskflow-gui => lib/gui}/widgets/NewScreenWidget.cpp (100%) rename src/{apps/deskflow-gui => lib/gui}/widgets/NewScreenWidget.h (100%) rename src/{apps/deskflow-gui => lib/gui}/widgets/ScreenSetupView.cpp (100%) rename src/{apps/deskflow-gui => lib/gui}/widgets/ScreenSetupView.h (100%) rename src/{apps/deskflow-gui => lib/gui}/widgets/TrashScreenWidget.cpp (100%) rename src/{apps/deskflow-gui => lib/gui}/widgets/TrashScreenWidget.h (100%) diff --git a/REUSE.toml b/REUSE.toml index bd559d638..71529aeef 100644 --- a/REUSE.toml +++ b/REUSE.toml @@ -194,13 +194,13 @@ SPDX-FileCopyrightText = "Chris Rizzitello " SPDX-License-Identifier = "LGPL-2.1-only" [[annotations]] -path = "src/apps/deskflow-gui/MainWindow.ui" +path = "src/lib/gui/MainWindow.ui" precedence = "override" SPDX-FileCopyrightText = "Deskflow Developers" SPDX-License-Identifier = "GPL-2.0-only WITH LicenseRef-OpenSSL-Exception" [[annotations]] -path = "src/apps/deskflow-gui/dialogs/*.ui" +path = "src/lib/gui/dialogs/*.ui" precedence = "override" SPDX-FileCopyrightText = "Deskflow Developers" SPDX-License-Identifier = "GPL-2.0-only WITH LicenseRef-OpenSSL-Exception" diff --git a/src/apps/deskflow-gui/CMakeLists.txt b/src/apps/deskflow-gui/CMakeLists.txt index 7e7771e13..f66fa9624 100644 --- a/src/apps/deskflow-gui/CMakeLists.txt +++ b/src/apps/deskflow-gui/CMakeLists.txt @@ -44,78 +44,7 @@ endif() add_executable(${target} WIN32 MACOSX_BUNDLE ${platform_extra} ../res/deskflow.qrc - Action.cpp - Action.h - DataDownloader.cpp - DataDownloader.h - Diagnostic.cpp - Diagnostic.h - Hotkey.cpp - Hotkey.h - KeySequence.cpp - KeySequence.h - main.cpp - MainWindow.cpp - MainWindow.h - MainWindow.ui - ScreenSetupModel.cpp - ScreenSetupModel.h - ServerConfig.cpp - ServerConfig.h - StyleUtils.h - VersionChecker.cpp - VersionChecker.h - dialogs/AboutDialog.cpp - dialogs/AboutDialog.h - dialogs/AboutDialog.ui - dialogs/ActionDialog.cpp - dialogs/ActionDialog.h - dialogs/ActionDialog.ui - dialogs/AddClientDialog.cpp - dialogs/AddClientDialog.h - dialogs/AddClientDialog.ui - dialogs/FingerprintDialog.h - dialogs/FingerprintDialog.cpp - dialogs/HotkeyDialog.cpp - dialogs/HotkeyDialog.h - dialogs/HotkeyDialog.ui - dialogs/ScreenSettingsDialog.cpp - dialogs/ScreenSettingsDialog.h - dialogs/ScreenSettingsDialog.ui - dialogs/ServerConfigDialog.cpp - dialogs/ServerConfigDialog.h - dialogs/ServerConfigDialog.ui - dialogs/SettingsDialog.cpp - dialogs/SettingsDialog.h - dialogs/SettingsDialog.ui - 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/TrashScreenWidget.cpp - widgets/TrashScreenWidget.h + deskflow-gui.cpp ) target_link_libraries( diff --git a/src/apps/deskflow-gui/main.cpp b/src/apps/deskflow-gui/deskflow-gui.cpp similarity index 98% rename from src/apps/deskflow-gui/main.cpp rename to src/apps/deskflow-gui/deskflow-gui.cpp index 56cf10ec4..a2bf9e646 100644 --- a/src/apps/deskflow-gui/main.cpp +++ b/src/apps/deskflow-gui/deskflow-gui.cpp @@ -6,15 +6,14 @@ * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception */ -#include "Diagnostic.h" -#include "MainWindow.h" -#include "StyleUtils.h" - #include "common/Constants.h" #include "common/UrlConstants.h" +#include "gui/Diagnostic.h" #include "gui/DotEnv.h" #include "gui/Logger.h" +#include "gui/MainWindow.h" #include "gui/Messages.h" +#include "gui/StyleUtils.h" #include #include diff --git a/src/apps/deskflow-gui/Action.cpp b/src/lib/gui/Action.cpp similarity index 100% rename from src/apps/deskflow-gui/Action.cpp rename to src/lib/gui/Action.cpp diff --git a/src/apps/deskflow-gui/Action.h b/src/lib/gui/Action.h similarity index 100% rename from src/apps/deskflow-gui/Action.h rename to src/lib/gui/Action.h diff --git a/src/lib/gui/CMakeLists.txt b/src/lib/gui/CMakeLists.txt index 34a9f161d..01bf8cfb7 100644 --- a/src/lib/gui/CMakeLists.txt +++ b/src/lib/gui/CMakeLists.txt @@ -15,15 +15,35 @@ endif() add_library(${target} STATIC ${platform_sources} + Action.cpp + Action.h + DataDownloader.cpp + DataDownloader.h + Diagnostic.cpp + Diagnostic.h DotEnv.cpp DotEnv.h FileTail.cpp FileTail.h + Hotkey.cpp + Hotkey.h + KeySequence.cpp + KeySequence.h Logger.cpp Logger.h + MainWindow.cpp + MainWindow.h + MainWindow.ui Messages.cpp Messages.h + ScreenSetupModel.cpp + ScreenSetupModel.h + ServerConfig.cpp + ServerConfig.h Styles.h + StyleUtils.h + VersionChecker.cpp + VersionChecker.h config/IServerConfig.h config/Screen.cpp config/Screen.h @@ -43,6 +63,29 @@ add_library(${target} STATIC core/ServerMessage.h core/WaylandWarnings.cpp core/WaylandWarnings.h + dialogs/AboutDialog.cpp + dialogs/AboutDialog.h + dialogs/AboutDialog.ui + dialogs/ActionDialog.cpp + dialogs/ActionDialog.h + dialogs/ActionDialog.ui + dialogs/AddClientDialog.cpp + dialogs/AddClientDialog.h + dialogs/AddClientDialog.ui + dialogs/FingerprintDialog.cpp + dialogs/FingerprintDialog.h + dialogs/HotkeyDialog.cpp + dialogs/HotkeyDialog.h + dialogs/HotkeyDialog.ui + dialogs/ScreenSettingsDialog.cpp + dialogs/ScreenSettingsDialog.h + dialogs/ScreenSettingsDialog.ui + dialogs/ServerConfigDialog.cpp + dialogs/ServerConfigDialog.h + dialogs/ServerConfigDialog.ui + dialogs/SettingsDialog.cpp + dialogs/SettingsDialog.h + dialogs/SettingsDialog.ui ipc/DaemonIpcClient.cpp ipc/DaemonIpcClient.h proxy/QProcessProxy.cpp @@ -51,6 +94,34 @@ add_library(${target} STATIC tls/TlsCertificate.h tls/TlsUtility.cpp tls/TlsUtility.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.cpp + widgets/FingerprintPreview.h + widgets/KeySequenceWidget.cpp + widgets/KeySequenceWidget.h + widgets/NewScreenWidget.cpp + widgets/NewScreenWidget.h + widgets/ScreenSetupView.cpp + widgets/ScreenSetupView.h + widgets/TrashScreenWidget.cpp + widgets/TrashScreenWidget.h ) target_link_libraries( diff --git a/src/apps/deskflow-gui/DataDownloader.cpp b/src/lib/gui/DataDownloader.cpp similarity index 100% rename from src/apps/deskflow-gui/DataDownloader.cpp rename to src/lib/gui/DataDownloader.cpp diff --git a/src/apps/deskflow-gui/DataDownloader.h b/src/lib/gui/DataDownloader.h similarity index 100% rename from src/apps/deskflow-gui/DataDownloader.h rename to src/lib/gui/DataDownloader.h diff --git a/src/apps/deskflow-gui/Diagnostic.cpp b/src/lib/gui/Diagnostic.cpp similarity index 100% rename from src/apps/deskflow-gui/Diagnostic.cpp rename to src/lib/gui/Diagnostic.cpp diff --git a/src/apps/deskflow-gui/Diagnostic.h b/src/lib/gui/Diagnostic.h similarity index 100% rename from src/apps/deskflow-gui/Diagnostic.h rename to src/lib/gui/Diagnostic.h diff --git a/src/apps/deskflow-gui/Hotkey.cpp b/src/lib/gui/Hotkey.cpp similarity index 100% rename from src/apps/deskflow-gui/Hotkey.cpp rename to src/lib/gui/Hotkey.cpp diff --git a/src/apps/deskflow-gui/Hotkey.h b/src/lib/gui/Hotkey.h similarity index 100% rename from src/apps/deskflow-gui/Hotkey.h rename to src/lib/gui/Hotkey.h diff --git a/src/apps/deskflow-gui/KeySequence.cpp b/src/lib/gui/KeySequence.cpp similarity index 100% rename from src/apps/deskflow-gui/KeySequence.cpp rename to src/lib/gui/KeySequence.cpp diff --git a/src/apps/deskflow-gui/KeySequence.h b/src/lib/gui/KeySequence.h similarity index 100% rename from src/apps/deskflow-gui/KeySequence.h rename to src/lib/gui/KeySequence.h diff --git a/src/apps/deskflow-gui/MainWindow.cpp b/src/lib/gui/MainWindow.cpp similarity index 100% rename from src/apps/deskflow-gui/MainWindow.cpp rename to src/lib/gui/MainWindow.cpp diff --git a/src/apps/deskflow-gui/MainWindow.h b/src/lib/gui/MainWindow.h similarity index 100% rename from src/apps/deskflow-gui/MainWindow.h rename to src/lib/gui/MainWindow.h diff --git a/src/apps/deskflow-gui/MainWindow.ui b/src/lib/gui/MainWindow.ui similarity index 100% rename from src/apps/deskflow-gui/MainWindow.ui rename to src/lib/gui/MainWindow.ui diff --git a/src/apps/deskflow-gui/ScreenSetupModel.cpp b/src/lib/gui/ScreenSetupModel.cpp similarity index 100% rename from src/apps/deskflow-gui/ScreenSetupModel.cpp rename to src/lib/gui/ScreenSetupModel.cpp diff --git a/src/apps/deskflow-gui/ScreenSetupModel.h b/src/lib/gui/ScreenSetupModel.h similarity index 100% rename from src/apps/deskflow-gui/ScreenSetupModel.h rename to src/lib/gui/ScreenSetupModel.h diff --git a/src/apps/deskflow-gui/ServerConfig.cpp b/src/lib/gui/ServerConfig.cpp similarity index 100% rename from src/apps/deskflow-gui/ServerConfig.cpp rename to src/lib/gui/ServerConfig.cpp diff --git a/src/apps/deskflow-gui/ServerConfig.h b/src/lib/gui/ServerConfig.h similarity index 100% rename from src/apps/deskflow-gui/ServerConfig.h rename to src/lib/gui/ServerConfig.h diff --git a/src/apps/deskflow-gui/StyleUtils.h b/src/lib/gui/StyleUtils.h similarity index 100% rename from src/apps/deskflow-gui/StyleUtils.h rename to src/lib/gui/StyleUtils.h diff --git a/src/apps/deskflow-gui/VersionChecker.cpp b/src/lib/gui/VersionChecker.cpp similarity index 100% rename from src/apps/deskflow-gui/VersionChecker.cpp rename to src/lib/gui/VersionChecker.cpp diff --git a/src/apps/deskflow-gui/VersionChecker.h b/src/lib/gui/VersionChecker.h similarity index 100% rename from src/apps/deskflow-gui/VersionChecker.h rename to src/lib/gui/VersionChecker.h diff --git a/src/apps/deskflow-gui/dialogs/AboutDialog.cpp b/src/lib/gui/dialogs/AboutDialog.cpp similarity index 100% rename from src/apps/deskflow-gui/dialogs/AboutDialog.cpp rename to src/lib/gui/dialogs/AboutDialog.cpp diff --git a/src/apps/deskflow-gui/dialogs/AboutDialog.h b/src/lib/gui/dialogs/AboutDialog.h similarity index 100% rename from src/apps/deskflow-gui/dialogs/AboutDialog.h rename to src/lib/gui/dialogs/AboutDialog.h diff --git a/src/apps/deskflow-gui/dialogs/AboutDialog.ui b/src/lib/gui/dialogs/AboutDialog.ui similarity index 100% rename from src/apps/deskflow-gui/dialogs/AboutDialog.ui rename to src/lib/gui/dialogs/AboutDialog.ui diff --git a/src/apps/deskflow-gui/dialogs/ActionDialog.cpp b/src/lib/gui/dialogs/ActionDialog.cpp similarity index 100% rename from src/apps/deskflow-gui/dialogs/ActionDialog.cpp rename to src/lib/gui/dialogs/ActionDialog.cpp diff --git a/src/apps/deskflow-gui/dialogs/ActionDialog.h b/src/lib/gui/dialogs/ActionDialog.h similarity index 100% rename from src/apps/deskflow-gui/dialogs/ActionDialog.h rename to src/lib/gui/dialogs/ActionDialog.h diff --git a/src/apps/deskflow-gui/dialogs/ActionDialog.ui b/src/lib/gui/dialogs/ActionDialog.ui similarity index 100% rename from src/apps/deskflow-gui/dialogs/ActionDialog.ui rename to src/lib/gui/dialogs/ActionDialog.ui diff --git a/src/apps/deskflow-gui/dialogs/AddClientDialog.cpp b/src/lib/gui/dialogs/AddClientDialog.cpp similarity index 100% rename from src/apps/deskflow-gui/dialogs/AddClientDialog.cpp rename to src/lib/gui/dialogs/AddClientDialog.cpp diff --git a/src/apps/deskflow-gui/dialogs/AddClientDialog.h b/src/lib/gui/dialogs/AddClientDialog.h similarity index 100% rename from src/apps/deskflow-gui/dialogs/AddClientDialog.h rename to src/lib/gui/dialogs/AddClientDialog.h diff --git a/src/apps/deskflow-gui/dialogs/AddClientDialog.ui b/src/lib/gui/dialogs/AddClientDialog.ui similarity index 100% rename from src/apps/deskflow-gui/dialogs/AddClientDialog.ui rename to src/lib/gui/dialogs/AddClientDialog.ui diff --git a/src/apps/deskflow-gui/dialogs/FingerprintDialog.cpp b/src/lib/gui/dialogs/FingerprintDialog.cpp similarity index 100% rename from src/apps/deskflow-gui/dialogs/FingerprintDialog.cpp rename to src/lib/gui/dialogs/FingerprintDialog.cpp diff --git a/src/apps/deskflow-gui/dialogs/FingerprintDialog.h b/src/lib/gui/dialogs/FingerprintDialog.h similarity index 100% rename from src/apps/deskflow-gui/dialogs/FingerprintDialog.h rename to src/lib/gui/dialogs/FingerprintDialog.h diff --git a/src/apps/deskflow-gui/dialogs/HotkeyDialog.cpp b/src/lib/gui/dialogs/HotkeyDialog.cpp similarity index 100% rename from src/apps/deskflow-gui/dialogs/HotkeyDialog.cpp rename to src/lib/gui/dialogs/HotkeyDialog.cpp diff --git a/src/apps/deskflow-gui/dialogs/HotkeyDialog.h b/src/lib/gui/dialogs/HotkeyDialog.h similarity index 100% rename from src/apps/deskflow-gui/dialogs/HotkeyDialog.h rename to src/lib/gui/dialogs/HotkeyDialog.h diff --git a/src/apps/deskflow-gui/dialogs/HotkeyDialog.ui b/src/lib/gui/dialogs/HotkeyDialog.ui similarity index 100% rename from src/apps/deskflow-gui/dialogs/HotkeyDialog.ui rename to src/lib/gui/dialogs/HotkeyDialog.ui diff --git a/src/apps/deskflow-gui/dialogs/ScreenSettingsDialog.cpp b/src/lib/gui/dialogs/ScreenSettingsDialog.cpp similarity index 100% rename from src/apps/deskflow-gui/dialogs/ScreenSettingsDialog.cpp rename to src/lib/gui/dialogs/ScreenSettingsDialog.cpp diff --git a/src/apps/deskflow-gui/dialogs/ScreenSettingsDialog.h b/src/lib/gui/dialogs/ScreenSettingsDialog.h similarity index 100% rename from src/apps/deskflow-gui/dialogs/ScreenSettingsDialog.h rename to src/lib/gui/dialogs/ScreenSettingsDialog.h diff --git a/src/apps/deskflow-gui/dialogs/ScreenSettingsDialog.ui b/src/lib/gui/dialogs/ScreenSettingsDialog.ui similarity index 100% rename from src/apps/deskflow-gui/dialogs/ScreenSettingsDialog.ui rename to src/lib/gui/dialogs/ScreenSettingsDialog.ui diff --git a/src/apps/deskflow-gui/dialogs/ServerConfigDialog.cpp b/src/lib/gui/dialogs/ServerConfigDialog.cpp similarity index 100% rename from src/apps/deskflow-gui/dialogs/ServerConfigDialog.cpp rename to src/lib/gui/dialogs/ServerConfigDialog.cpp diff --git a/src/apps/deskflow-gui/dialogs/ServerConfigDialog.h b/src/lib/gui/dialogs/ServerConfigDialog.h similarity index 100% rename from src/apps/deskflow-gui/dialogs/ServerConfigDialog.h rename to src/lib/gui/dialogs/ServerConfigDialog.h diff --git a/src/apps/deskflow-gui/dialogs/ServerConfigDialog.ui b/src/lib/gui/dialogs/ServerConfigDialog.ui similarity index 100% rename from src/apps/deskflow-gui/dialogs/ServerConfigDialog.ui rename to src/lib/gui/dialogs/ServerConfigDialog.ui diff --git a/src/apps/deskflow-gui/dialogs/SettingsDialog.cpp b/src/lib/gui/dialogs/SettingsDialog.cpp similarity index 100% rename from src/apps/deskflow-gui/dialogs/SettingsDialog.cpp rename to src/lib/gui/dialogs/SettingsDialog.cpp diff --git a/src/apps/deskflow-gui/dialogs/SettingsDialog.h b/src/lib/gui/dialogs/SettingsDialog.h similarity index 100% rename from src/apps/deskflow-gui/dialogs/SettingsDialog.h rename to src/lib/gui/dialogs/SettingsDialog.h diff --git a/src/apps/deskflow-gui/dialogs/SettingsDialog.ui b/src/lib/gui/dialogs/SettingsDialog.ui similarity index 100% rename from src/apps/deskflow-gui/dialogs/SettingsDialog.ui rename to src/lib/gui/dialogs/SettingsDialog.ui diff --git a/src/apps/deskflow-gui/validators/AliasValidator.cpp b/src/lib/gui/validators/AliasValidator.cpp similarity index 100% rename from src/apps/deskflow-gui/validators/AliasValidator.cpp rename to src/lib/gui/validators/AliasValidator.cpp diff --git a/src/apps/deskflow-gui/validators/AliasValidator.h b/src/lib/gui/validators/AliasValidator.h similarity index 100% rename from src/apps/deskflow-gui/validators/AliasValidator.h rename to src/lib/gui/validators/AliasValidator.h diff --git a/src/apps/deskflow-gui/validators/ComputerNameValidator.cpp b/src/lib/gui/validators/ComputerNameValidator.cpp similarity index 100% rename from src/apps/deskflow-gui/validators/ComputerNameValidator.cpp rename to src/lib/gui/validators/ComputerNameValidator.cpp diff --git a/src/apps/deskflow-gui/validators/ComputerNameValidator.h b/src/lib/gui/validators/ComputerNameValidator.h similarity index 100% rename from src/apps/deskflow-gui/validators/ComputerNameValidator.h rename to src/lib/gui/validators/ComputerNameValidator.h diff --git a/src/apps/deskflow-gui/validators/EmptyStringValidator.cpp b/src/lib/gui/validators/EmptyStringValidator.cpp similarity index 100% rename from src/apps/deskflow-gui/validators/EmptyStringValidator.cpp rename to src/lib/gui/validators/EmptyStringValidator.cpp diff --git a/src/apps/deskflow-gui/validators/EmptyStringValidator.h b/src/lib/gui/validators/EmptyStringValidator.h similarity index 100% rename from src/apps/deskflow-gui/validators/EmptyStringValidator.h rename to src/lib/gui/validators/EmptyStringValidator.h diff --git a/src/apps/deskflow-gui/validators/IStringValidator.cpp b/src/lib/gui/validators/IStringValidator.cpp similarity index 100% rename from src/apps/deskflow-gui/validators/IStringValidator.cpp rename to src/lib/gui/validators/IStringValidator.cpp diff --git a/src/apps/deskflow-gui/validators/IStringValidator.h b/src/lib/gui/validators/IStringValidator.h similarity index 100% rename from src/apps/deskflow-gui/validators/IStringValidator.h rename to src/lib/gui/validators/IStringValidator.h diff --git a/src/apps/deskflow-gui/validators/LineEditValidator.cpp b/src/lib/gui/validators/LineEditValidator.cpp similarity index 100% rename from src/apps/deskflow-gui/validators/LineEditValidator.cpp rename to src/lib/gui/validators/LineEditValidator.cpp diff --git a/src/apps/deskflow-gui/validators/LineEditValidator.h b/src/lib/gui/validators/LineEditValidator.h similarity index 100% rename from src/apps/deskflow-gui/validators/LineEditValidator.h rename to src/lib/gui/validators/LineEditValidator.h diff --git a/src/apps/deskflow-gui/validators/ScreenDuplicationsValidator.cpp b/src/lib/gui/validators/ScreenDuplicationsValidator.cpp similarity index 100% rename from src/apps/deskflow-gui/validators/ScreenDuplicationsValidator.cpp rename to src/lib/gui/validators/ScreenDuplicationsValidator.cpp diff --git a/src/apps/deskflow-gui/validators/ScreenDuplicationsValidator.h b/src/lib/gui/validators/ScreenDuplicationsValidator.h similarity index 100% rename from src/apps/deskflow-gui/validators/ScreenDuplicationsValidator.h rename to src/lib/gui/validators/ScreenDuplicationsValidator.h diff --git a/src/apps/deskflow-gui/validators/ScreenNameValidator.cpp b/src/lib/gui/validators/ScreenNameValidator.cpp similarity index 100% rename from src/apps/deskflow-gui/validators/ScreenNameValidator.cpp rename to src/lib/gui/validators/ScreenNameValidator.cpp diff --git a/src/apps/deskflow-gui/validators/ScreenNameValidator.h b/src/lib/gui/validators/ScreenNameValidator.h similarity index 100% rename from src/apps/deskflow-gui/validators/ScreenNameValidator.h rename to src/lib/gui/validators/ScreenNameValidator.h diff --git a/src/apps/deskflow-gui/validators/SpacesValidator.cpp b/src/lib/gui/validators/SpacesValidator.cpp similarity index 100% rename from src/apps/deskflow-gui/validators/SpacesValidator.cpp rename to src/lib/gui/validators/SpacesValidator.cpp diff --git a/src/apps/deskflow-gui/validators/SpacesValidator.h b/src/lib/gui/validators/SpacesValidator.h similarity index 100% rename from src/apps/deskflow-gui/validators/SpacesValidator.h rename to src/lib/gui/validators/SpacesValidator.h diff --git a/src/apps/deskflow-gui/validators/ValidationError.cpp b/src/lib/gui/validators/ValidationError.cpp similarity index 100% rename from src/apps/deskflow-gui/validators/ValidationError.cpp rename to src/lib/gui/validators/ValidationError.cpp diff --git a/src/apps/deskflow-gui/validators/ValidationError.h b/src/lib/gui/validators/ValidationError.h similarity index 100% rename from src/apps/deskflow-gui/validators/ValidationError.h rename to src/lib/gui/validators/ValidationError.h diff --git a/src/apps/deskflow-gui/widgets/FingerprintPreview.cpp b/src/lib/gui/widgets/FingerprintPreview.cpp similarity index 100% rename from src/apps/deskflow-gui/widgets/FingerprintPreview.cpp rename to src/lib/gui/widgets/FingerprintPreview.cpp diff --git a/src/apps/deskflow-gui/widgets/FingerprintPreview.h b/src/lib/gui/widgets/FingerprintPreview.h similarity index 100% rename from src/apps/deskflow-gui/widgets/FingerprintPreview.h rename to src/lib/gui/widgets/FingerprintPreview.h diff --git a/src/apps/deskflow-gui/widgets/KeySequenceWidget.cpp b/src/lib/gui/widgets/KeySequenceWidget.cpp similarity index 100% rename from src/apps/deskflow-gui/widgets/KeySequenceWidget.cpp rename to src/lib/gui/widgets/KeySequenceWidget.cpp diff --git a/src/apps/deskflow-gui/widgets/KeySequenceWidget.h b/src/lib/gui/widgets/KeySequenceWidget.h similarity index 100% rename from src/apps/deskflow-gui/widgets/KeySequenceWidget.h rename to src/lib/gui/widgets/KeySequenceWidget.h diff --git a/src/apps/deskflow-gui/widgets/NewScreenWidget.cpp b/src/lib/gui/widgets/NewScreenWidget.cpp similarity index 100% rename from src/apps/deskflow-gui/widgets/NewScreenWidget.cpp rename to src/lib/gui/widgets/NewScreenWidget.cpp diff --git a/src/apps/deskflow-gui/widgets/NewScreenWidget.h b/src/lib/gui/widgets/NewScreenWidget.h similarity index 100% rename from src/apps/deskflow-gui/widgets/NewScreenWidget.h rename to src/lib/gui/widgets/NewScreenWidget.h diff --git a/src/apps/deskflow-gui/widgets/ScreenSetupView.cpp b/src/lib/gui/widgets/ScreenSetupView.cpp similarity index 100% rename from src/apps/deskflow-gui/widgets/ScreenSetupView.cpp rename to src/lib/gui/widgets/ScreenSetupView.cpp diff --git a/src/apps/deskflow-gui/widgets/ScreenSetupView.h b/src/lib/gui/widgets/ScreenSetupView.h similarity index 100% rename from src/apps/deskflow-gui/widgets/ScreenSetupView.h rename to src/lib/gui/widgets/ScreenSetupView.h diff --git a/src/apps/deskflow-gui/widgets/TrashScreenWidget.cpp b/src/lib/gui/widgets/TrashScreenWidget.cpp similarity index 100% rename from src/apps/deskflow-gui/widgets/TrashScreenWidget.cpp rename to src/lib/gui/widgets/TrashScreenWidget.cpp diff --git a/src/apps/deskflow-gui/widgets/TrashScreenWidget.h b/src/lib/gui/widgets/TrashScreenWidget.h similarity index 100% rename from src/apps/deskflow-gui/widgets/TrashScreenWidget.h rename to src/lib/gui/widgets/TrashScreenWidget.h