diff --git a/src/apps/deskflow-gui/CMakeLists.txt b/src/apps/deskflow-gui/CMakeLists.txt index de48b00c9..961a24a8c 100644 --- a/src/apps/deskflow-gui/CMakeLists.txt +++ b/src/apps/deskflow-gui/CMakeLists.txt @@ -85,6 +85,24 @@ add_executable(${target} WIN32 MACOSX_BUNDLE 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 diff --git a/src/apps/deskflow-gui/dialogs/ScreenSettingsDialog.cpp b/src/apps/deskflow-gui/dialogs/ScreenSettingsDialog.cpp index c5485b827..a2beaba9c 100644 --- a/src/apps/deskflow-gui/dialogs/ScreenSettingsDialog.cpp +++ b/src/apps/deskflow-gui/dialogs/ScreenSettingsDialog.cpp @@ -10,9 +10,9 @@ #include "gui/Styles.h" #include "gui/config/Screen.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 diff --git a/src/apps/deskflow-gui/dialogs/SettingsDialog.h b/src/apps/deskflow-gui/dialogs/SettingsDialog.h index 9bf3346ba..36091424f 100644 --- a/src/apps/deskflow-gui/dialogs/SettingsDialog.h +++ b/src/apps/deskflow-gui/dialogs/SettingsDialog.h @@ -12,7 +12,7 @@ #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; diff --git a/src/lib/gui/validators/AliasValidator.cpp b/src/apps/deskflow-gui/validators/AliasValidator.cpp similarity index 86% rename from src/lib/gui/validators/AliasValidator.cpp rename to src/apps/deskflow-gui/validators/AliasValidator.cpp index e991039ad..2b696aa8d 100644 --- a/src/lib/gui/validators/AliasValidator.cpp +++ b/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 namespace validators { diff --git a/src/lib/gui/validators/AliasValidator.h b/src/apps/deskflow-gui/validators/AliasValidator.h similarity index 90% rename from src/lib/gui/validators/AliasValidator.h rename to src/apps/deskflow-gui/validators/AliasValidator.h index 6d94ceb89..72489a58b 100644 --- a/src/lib/gui/validators/AliasValidator.h +++ b/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 { diff --git a/src/lib/gui/validators/ComputerNameValidator.cpp b/src/apps/deskflow-gui/validators/ComputerNameValidator.cpp similarity index 100% rename from src/lib/gui/validators/ComputerNameValidator.cpp rename to src/apps/deskflow-gui/validators/ComputerNameValidator.cpp diff --git a/src/lib/gui/validators/ComputerNameValidator.h b/src/apps/deskflow-gui/validators/ComputerNameValidator.h similarity index 100% rename from src/lib/gui/validators/ComputerNameValidator.h rename to src/apps/deskflow-gui/validators/ComputerNameValidator.h diff --git a/src/lib/gui/validators/EmptyStringValidator.cpp b/src/apps/deskflow-gui/validators/EmptyStringValidator.cpp similarity index 100% rename from src/lib/gui/validators/EmptyStringValidator.cpp rename to src/apps/deskflow-gui/validators/EmptyStringValidator.cpp diff --git a/src/lib/gui/validators/EmptyStringValidator.h b/src/apps/deskflow-gui/validators/EmptyStringValidator.h similarity index 100% rename from src/lib/gui/validators/EmptyStringValidator.h rename to src/apps/deskflow-gui/validators/EmptyStringValidator.h diff --git a/src/lib/gui/validators/IStringValidator.cpp b/src/apps/deskflow-gui/validators/IStringValidator.cpp similarity index 100% rename from src/lib/gui/validators/IStringValidator.cpp rename to src/apps/deskflow-gui/validators/IStringValidator.cpp diff --git a/src/lib/gui/validators/IStringValidator.h b/src/apps/deskflow-gui/validators/IStringValidator.h similarity index 100% rename from src/lib/gui/validators/IStringValidator.h rename to src/apps/deskflow-gui/validators/IStringValidator.h diff --git a/src/lib/gui/validators/LineEditValidator.cpp b/src/apps/deskflow-gui/validators/LineEditValidator.cpp similarity index 100% rename from src/lib/gui/validators/LineEditValidator.cpp rename to src/apps/deskflow-gui/validators/LineEditValidator.cpp diff --git a/src/lib/gui/validators/LineEditValidator.h b/src/apps/deskflow-gui/validators/LineEditValidator.h similarity index 100% rename from src/lib/gui/validators/LineEditValidator.h rename to src/apps/deskflow-gui/validators/LineEditValidator.h diff --git a/src/lib/gui/validators/ScreenDuplicationsValidator.cpp b/src/apps/deskflow-gui/validators/ScreenDuplicationsValidator.cpp similarity index 100% rename from src/lib/gui/validators/ScreenDuplicationsValidator.cpp rename to src/apps/deskflow-gui/validators/ScreenDuplicationsValidator.cpp diff --git a/src/lib/gui/validators/ScreenDuplicationsValidator.h b/src/apps/deskflow-gui/validators/ScreenDuplicationsValidator.h similarity index 100% rename from src/lib/gui/validators/ScreenDuplicationsValidator.h rename to src/apps/deskflow-gui/validators/ScreenDuplicationsValidator.h diff --git a/src/lib/gui/validators/ScreenNameValidator.cpp b/src/apps/deskflow-gui/validators/ScreenNameValidator.cpp similarity index 79% rename from src/lib/gui/validators/ScreenNameValidator.cpp rename to src/apps/deskflow-gui/validators/ScreenNameValidator.cpp index 086ffc36d..c73d1fc55 100644 --- a/src/lib/gui/validators/ScreenNameValidator.cpp +++ b/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 #include diff --git a/src/lib/gui/validators/ScreenNameValidator.h b/src/apps/deskflow-gui/validators/ScreenNameValidator.h similarity index 92% rename from src/lib/gui/validators/ScreenNameValidator.h rename to src/apps/deskflow-gui/validators/ScreenNameValidator.h index 5d4804b31..9ef7e31b2 100644 --- a/src/lib/gui/validators/ScreenNameValidator.h +++ b/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 { diff --git a/src/lib/gui/validators/SpacesValidator.cpp b/src/apps/deskflow-gui/validators/SpacesValidator.cpp similarity index 100% rename from src/lib/gui/validators/SpacesValidator.cpp rename to src/apps/deskflow-gui/validators/SpacesValidator.cpp diff --git a/src/lib/gui/validators/SpacesValidator.h b/src/apps/deskflow-gui/validators/SpacesValidator.h similarity index 100% rename from src/lib/gui/validators/SpacesValidator.h rename to src/apps/deskflow-gui/validators/SpacesValidator.h diff --git a/src/lib/gui/validators/ValidationError.cpp b/src/apps/deskflow-gui/validators/ValidationError.cpp similarity index 100% rename from src/lib/gui/validators/ValidationError.cpp rename to src/apps/deskflow-gui/validators/ValidationError.cpp diff --git a/src/lib/gui/validators/ValidationError.h b/src/apps/deskflow-gui/validators/ValidationError.h similarity index 100% rename from src/lib/gui/validators/ValidationError.h rename to src/apps/deskflow-gui/validators/ValidationError.h diff --git a/src/lib/gui/CMakeLists.txt b/src/lib/gui/CMakeLists.txt index 626125cd1..98ac55d24 100644 --- a/src/lib/gui/CMakeLists.txt +++ b/src/lib/gui/CMakeLists.txt @@ -57,24 +57,6 @@ 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 ) target_link_libraries(