refactor: move ALL gui parts to lib

REUSE.toml

@@ -194,13 +194,13 @@ SPDX-FileCopyrightText = "Chris Rizzitello <sithlord48@gmail.com>"
 SPDX-License-Identifier = "LGPL-2.1-only"
 
 [[annotations]]
-path = "src/apps/deskflow-gui/MainWindow.ui"
+path = "src/lib/gui/MainWindow.ui"
 precedence = "override"
 SPDX-FileCopyrightText = "Deskflow Developers"
 SPDX-License-Identifier = "GPL-2.0-only WITH LicenseRef-OpenSSL-Exception"
 
 [[annotations]]
-path = "src/apps/deskflow-gui/dialogs/*.ui"
+path = "src/lib/gui/dialogs/*.ui"
 precedence = "override"
 SPDX-FileCopyrightText = "Deskflow Developers"
 SPDX-License-Identifier = "GPL-2.0-only WITH LicenseRef-OpenSSL-Exception"

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(

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 <QApplication>
 #include <QDebug>

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(