symless · OwenMPhillips · Apr 10, 2025 · Apr 2, 2025 · Apr 3, 2025 · Apr 7, 2025
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -151,6 +151,7 @@ jobs:
           WINDOWS_PFX_PASSWORD: ${{ secrets.WINDOWS_PFX_PASS }}
 
       - name: Upload to GitHub
+        if: ${{ env.PACKAGE_BUILD == 'true' }}
         uses: actions/upload-artifact@v4
         with:
           name: "package-${{ env.SYNERGY_PACKAGE_PREFIX }}-${{ matrix.target.name }}"
@@ -230,6 +231,7 @@ jobs:
           APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
 
       - name: Upload to GitHub
+        if: ${{ env.PACKAGE_BUILD == 'true' }}
         uses: actions/upload-artifact@v4
         with:
           name: "package-${{ env.SYNERGY_PACKAGE_PREFIX }}-${{ matrix.target.name }}"
@@ -327,6 +329,7 @@ jobs:
         run: ./scripts/package.py
 
       - name: Upload to GitHub
+        if: ${{ env.PACKAGE_BUILD == 'true' }}
         uses: actions/upload-artifact@v4
         with:
           name: "package-${{ env.SYNERGY_PACKAGE_PREFIX }}-${{ matrix.distro.name }}"

diff --git a/cmake/Build.cmake b/cmake/Build.cmake
@@ -28,7 +28,6 @@ macro(configure_build)
 
   warnings_as_errors()
   set_build_date()
-  configure_file_shared()
 
 endmacro()
 
@@ -50,8 +49,3 @@ macro(set_build_date)
   message(STATUS "Build date: ${BUILD_DATE}")
   add_definitions(-DBUILD_DATE="${BUILD_DATE}")
 endmacro()
-
-macro(configure_file_shared)
-  configure_file(${PROJECT_SOURCE_DIR}/src/lib/gui/gui_config.h.in
-                 ${PROJECT_BINARY_DIR}/config/gui_config.h)
-endmacro()
diff --git a/ext/synergy-extra b/ext/synergy-extra
diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp
@@ -18,6 +18,10 @@
 
 #include "MainWindow.h"
 
+#ifdef DESKFLOW_GUI_HOOK_HEADER
+#include DESKFLOW_GUI_HOOK_HEADER
+#endif
+
 #include "AboutDialog.h"
 #include "ServerConfigDialog.h"
 #include "common/constants.h"
@@ -81,6 +85,9 @@ MainWindow::MainWindow(ConfigScopes &configScopes, AppConfig &appConfig)
       m_TlsUtility(appConfig),
       m_WindowSaveTimer(this)
 {
+#ifdef DESKFLOW_GUI_HOOK_MAIN_WINDOW
+  DESKFLOW_GUI_HOOK_MAIN_WINDOW
+#endif
 
   setupUi(this);
   createMenuBar();
@@ -849,10 +856,11 @@ void MainWindow::onCoreProcessStateChanged(CoreProcessState state)
 {
   updateStatus();
 
-  if (state == CoreProcessState::Started) {
+  if (state == CoreProcessState::Started && !m_AppConfig.startedBefore()) {
     qDebug("recording that core has started");
     m_AppConfig.setStartedBefore(true);
     m_ConfigScopes.save();
+    messages::showFirstServerStartMessage(this);
   }
 
   if (state == CoreProcessState::Started || state == CoreProcessState::Starting ||
@@ -1032,7 +1040,6 @@ void MainWindow::enableServer(bool enable)
     if (!m_AppConfig.startedBefore()) {
       qDebug("auto-starting core server for first time");
       m_CoreProcess.start();
-      messages::showFirstServerStartMessage(this);
     }
   }
 }

diff --git a/src/gui/src/main.cpp b/src/gui/src/main.cpp
@@ -16,6 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifdef DESKFLOW_GUI_HOOK_HEADER
+#include DESKFLOW_GUI_HOOK_HEADER
+#endif
+
 #include "DeskflowApplication.h"
 #include "MainWindow.h"
 #include "SetupWizard.h"
@@ -29,11 +33,6 @@
 #include "gui/dotenv.h"
 #include "gui/messages.h"
 #include "gui/string_utils.h"
-#include "gui_config.h" // IWYU pragma: keep
-
-#ifdef DESKFLOW_GUI_HOOK_HEADER
-#include DESKFLOW_GUI_HOOK_HEADER
-#endif
 
 #include <QApplication>
 #include <QDebug>
@@ -147,8 +146,8 @@ int main(int argc, char *argv[])
 
   mainWindow.open();
 
-#ifdef DESKFLOW_GUI_HOOK_START
-  DESKFLOW_GUI_HOOK_START
+#ifdef DESKFLOW_GUI_HOOK_APP_START
+  DESKFLOW_GUI_HOOK_APP_START
 #endif
 
 #ifdef SYNERGY_VERSION_CHECK

diff --git a/src/lib/gui/VersionChecker.cpp b/src/lib/gui/VersionChecker.cpp
@@ -17,13 +17,12 @@
 
 #include "VersionChecker.h"
 
-#include "common/constants.h"
-#include "gui_config.h" // IWYU pragma: keep
-
 #ifdef DESKFLOW_GUI_HOOK_HEADER
 #include DESKFLOW_GUI_HOOK_HEADER
 #endif
 
+#include "common/constants.h"
+
 #include <QLocale>
 #include <QNetworkAccessManager>
 #include <QNetworkReply>

diff --git a/src/lib/gui/core/CoreProcess.cpp b/src/lib/gui/core/CoreProcess.cpp
@@ -6,6 +6,10 @@
 
 #include "CoreProcess.h"
 
+#ifdef DESKFLOW_GUI_HOOK_HEADER
+#include DESKFLOW_GUI_HOOK_HEADER
+#endif
+
 #include "common/constants.h"
 #include "gui/config/IAppConfig.h"
 #include "gui/core/CoreTool.h"
@@ -347,6 +351,10 @@ void CoreProcess::handleLogLines(const QString &text)
 
 void CoreProcess::start(std::optional<ProcessMode> processModeOption)
 {
+#ifdef DESKFLOW_GUI_HOOK_CORE_START
+  DESKFLOW_GUI_HOOK_CORE_START
+#endif
+
   QMutexLocker locker(&m_processMutex);
 
   const auto processMode = processModeOption.value_or(m_appConfig.processMode());

diff --git a/src/lib/gui/dialogs/SettingsDialog.cpp b/src/lib/gui/dialogs/SettingsDialog.cpp
@@ -18,17 +18,16 @@
 
 #include "SettingsDialog.h"
 
+#ifdef DESKFLOW_GUI_HOOK_HEADER
+#include DESKFLOW_GUI_HOOK_HEADER
+#endif
+
 #include "gui/core/CoreProcess.h"
 #include "gui/messages.h"
 #include "gui/tls/TlsCertificate.h"
 #include "gui/tls/TlsUtility.h"
 #include "gui/validators/ScreenNameValidator.h"
 #include "gui/validators/ValidationError.h"
-#include "gui_config.h" // IWYU pragma: keep
-
-#ifdef DESKFLOW_GUI_HOOK_HEADER
-#include DESKFLOW_GUI_HOOK_HEADER
-#endif
 
 #include <QDir>
 #include <QFileDialog>

diff --git a/src/lib/gui/gui_config.h.in b/src/lib/gui/gui_config.h.in
diff --git a/src/test/integtests/main.cpp b/src/test/integtests/main.cpp
@@ -16,6 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifdef DESKFLOW_GUI_HOOK_HEADER
+#include DESKFLOW_GUI_HOOK_HEADER
+#endif
+
 #include "arch/Arch.h"
 #include "base/Log.h"
 #include "shared/ExitTimeout.h"
@@ -33,6 +37,10 @@ const auto testDir = "tmp/test";
 
 int main(int argc, char **argv)
 {
+#ifdef DESKFLOW_GUI_HOOK_TEST_START
+  DESKFLOW_GUI_HOOK_TEST_START
+#endif
+
   // HACK: Unit tests should not use the filesystem.
   std::filesystem::create_directories(testDir);
 

diff --git a/src/test/unittests/main.cpp b/src/test/unittests/main.cpp
@@ -16,6 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifdef DESKFLOW_GUI_HOOK_HEADER
+#include DESKFLOW_GUI_HOOK_HEADER
+#endif
+
 #include "arch/Arch.h"
 #include "base/Log.h"
 #include "shared/ExitTimeout.h"
@@ -33,6 +37,10 @@ const auto testDir = "tmp/test";
 
 int main(int argc, char **argv)
 {
+#ifdef DESKFLOW_GUI_HOOK_TEST_START
+  DESKFLOW_GUI_HOOK_TEST_START
+#endif
+
   // HACK: Unit tests should not use the filesystem.
   std::filesystem::create_directories(testDir);
+1 −0		.env.example
+0 −137		.vscode/launch.json
+0 −77		.vscode/tasks.json
+17 −2		cmake/Extra.cmake
+30 −22		src/lib/synergy/gui/ActivationDialog.cpp
+6 −0		src/lib/synergy/gui/ActivationDialog.h
+2 −2		src/lib/synergy/gui/ActivationDialog.ui
+4 −1		src/lib/synergy/gui/constants.h
+145 −0		src/lib/synergy/gui/license/LicenseActivator.cpp
+66 −0		src/lib/synergy/gui/license/LicenseActivator.h
+184 −45		src/lib/synergy/gui/license/LicenseHandler.cpp
+19 −6		src/lib/synergy/gui/license/LicenseHandler.h
+13 −0		src/lib/synergy/gui/license/LicenseSettings.cpp
+12 −1		src/lib/synergy/gui/license/LicenseSettings.h
+25 −21		src/lib/synergy/hooks/gui_hook.h
+29 −0		src/lib/synergy/hooks/gui_hook_config.h.in
+1 −0		src/lib/synergy/license/SerialKey.h
+21 −2		src/lib/synergy/license/parse_serial_key.cpp