From 147869e3a5ac20fb7d0425e3b97b358990503a9d Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Thu, 31 Oct 2024 14:47:40 -0400 Subject: [PATCH] build: remove DESKFLOW_SHOW_DEV_THANKS define --- cmake/Definitions.cmake | 18 ------------------ src/gui/src/MainWindow.cpp | 14 -------------- src/gui/src/MainWindow.h | 1 - src/lib/gui/config/AppConfig.cpp | 14 +------------- src/lib/gui/config/AppConfig.h | 11 +---------- src/lib/gui/messages.cpp | 17 ----------------- src/lib/gui/messages.h | 2 -- 7 files changed, 2 insertions(+), 75 deletions(-) diff --git a/cmake/Definitions.cmake b/cmake/Definitions.cmake index f45457bdb..0f2eef6e3 100644 --- a/cmake/Definitions.cmake +++ b/cmake/Definitions.cmake @@ -16,7 +16,6 @@ macro(configure_definitions) - configure_meta() configure_ninja() configure_options() @@ -52,23 +51,6 @@ macro(configure_definitions) endmacro() -macro(configure_meta) - - set(DESKFLOW_SHOW_DEV_THANKS - true - CACHE BOOL "Show developer thanks message") - - message(VERBOSE "Show dev thanks: ${DESKFLOW_SHOW_DEV_THANKS}") - - if(DESKFLOW_SHOW_DEV_THANKS) - message(VERBOSE "Showing developer thanks message") - add_definitions(-DDESKFLOW_SHOW_DEV_THANKS) - else() - message(VERBOSE "Not showing developer thanks message") - endif() - -endmacro() - macro(configure_ninja) # use response files so that ninja can compile on windows, otherwise you get # an error when linking qt: "The input line is too long." diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp index 3c516d49c..3ce7cffe5 100644 --- a/src/gui/src/MainWindow.cpp +++ b/src/gui/src/MainWindow.cpp @@ -776,19 +776,6 @@ void MainWindow::showFirstConnectedMessage() messages::showFirstConnectedMessage(this, m_AppConfig.closeToTray(), m_AppConfig.enableService(), isServer); } -void MainWindow::showDevThanksMessage() -{ - if (!m_AppConfig.showDevThanks()) { - qDebug("skipping dev thanks message"); - return; - } - - m_AppConfig.setShowDevThanks(false); - m_ConfigScopes.save(); - - messages::showDevThanks(this, kAppName); -} - void MainWindow::onCoreProcessSecureSocket(bool enabled) { secureSocket(enabled); @@ -897,7 +884,6 @@ void MainWindow::onCoreConnectionStateChanged(CoreConnectionState state) secureSocket(false); } else if (isVisible()) { showFirstConnectedMessage(); - showDevThanksMessage(); } } diff --git a/src/gui/src/MainWindow.h b/src/gui/src/MainWindow.h index 0efeefe06..f984f4667 100644 --- a/src/gui/src/MainWindow.h +++ b/src/gui/src/MainWindow.h @@ -194,7 +194,6 @@ private: void resizeEvent(QResizeEvent *event) override; void moveEvent(QMoveEvent *event) override; void showFirstConnectedMessage(); - void showDevThanksMessage(); void updateStatus(); void showAndActivate(); diff --git a/src/lib/gui/config/AppConfig.cpp b/src/lib/gui/config/AppConfig.cpp index a7534ae23..a95b41498 100644 --- a/src/lib/gui/config/AppConfig.cpp +++ b/src/lib/gui/config/AppConfig.cpp @@ -83,7 +83,7 @@ const char *const AppConfig::m_SettingsName[] = { "closeToTray", "mainWindowSize", "mainWindowPosition", - "showDevThanks", + "", // 41 = Show dev thanks, obsolete "showCloseReminder", "enableUpdateCheck", }; @@ -149,7 +149,6 @@ void AppConfig::recallFromCurrentScope() m_MainWindowPosition = getFromCurrentScope(kMainWindowPosition, [](const QVariant &v) { return v.toPoint(); }); m_MainWindowSize = getFromCurrentScope(kMainWindowSize, [](const QVariant &v) { return v.toSize(); }); - m_ShowDevThanks = getFromCurrentScope(kShowDevThanks, m_ShowDevThanks).toBool(); m_ShowCloseReminder = getFromCurrentScope(kShowCloseReminder, m_ShowCloseReminder).toBool(); m_EnableUpdateCheck = getFromCurrentScope(kEnableUpdateCheck, [](const QVariant &v) { return v.toBool(); }); } @@ -207,7 +206,6 @@ void AppConfig::commit() setInCurrentScope(kCloseToTray, m_CloseToTray); setInCurrentScope(kMainWindowSize, m_MainWindowSize); setInCurrentScope(kMainWindowPosition, m_MainWindowPosition); - setInCurrentScope(kShowDevThanks, m_ShowDevThanks); setInCurrentScope(kShowCloseReminder, m_ShowCloseReminder); setInCurrentScope(kEnableUpdateCheck, m_EnableUpdateCheck); } @@ -576,11 +574,6 @@ std::optional AppConfig::mainWindowPosition() const return m_MainWindowPosition; } -bool AppConfig::showDevThanks() const -{ - return m_ShowDevThanks; -} - bool AppConfig::showCloseReminder() const { return m_ShowCloseReminder; @@ -754,11 +747,6 @@ void AppConfig::setMainWindowPosition(const QPoint &position) m_MainWindowPosition = position; } -void AppConfig::setShowDevThanks(bool value) -{ - m_ShowDevThanks = value; -} - void AppConfig::setShowCloseReminder(bool value) { m_ShowCloseReminder = value; diff --git a/src/lib/gui/config/AppConfig.h b/src/lib/gui/config/AppConfig.h index 936809225..8fc077413 100644 --- a/src/lib/gui/config/AppConfig.h +++ b/src/lib/gui/config/AppConfig.h @@ -39,12 +39,6 @@ const ElevateMode kDefaultElevateMode = ElevateMode::kAutomatic; const QString kDefaultLogFile = QStringLiteral("%1.log").arg(kAppId); const int kDefaultTlsKeyLength = 2048; -#ifdef DESKFLOW_SHOW_DEV_THANKS -const bool kDefaultShowDevThanks = true; -#else -const bool kDefaultShowDevThanks = false; -#endif - #if defined(Q_OS_WIN) const ProcessMode kDefaultProcessMode = ProcessMode::kService; #else @@ -112,7 +106,7 @@ private: kCloseToTray = 38, kMainWindowSize = 39, kMainWindowPosition = 40, - kShowDevThanks = 41, + // 41 = show dev thanks, obsolete kShowCloseReminder = 42, kEnableUpdateCheck = 43, }; @@ -187,7 +181,6 @@ public: QString lastVersion() const; std::optional mainWindowSize() const; std::optional mainWindowPosition() const; - bool showDevThanks() const; bool showCloseReminder() const; std::optional enableUpdateCheck() const; @@ -228,7 +221,6 @@ public: void setLastVersion(const QString &version); void setMainWindowSize(const QSize &size); void setMainWindowPosition(const QPoint &position); - void setShowDevThanks(bool show); void setShowCloseReminder(bool show); void setEnableUpdateCheck(bool value); @@ -333,7 +325,6 @@ private: int m_TlsKeyLength = deskflow::gui::kDefaultTlsKeyLength; std::optional m_MainWindowSize; std::optional m_MainWindowPosition; - bool m_ShowDevThanks = deskflow::gui::kDefaultShowDevThanks; bool m_LoadFromSystemScope = false; bool m_ShowCloseReminder = true; std::optional m_EnableUpdateCheck; diff --git a/src/lib/gui/messages.cpp b/src/lib/gui/messages.cpp index b8b2fb73e..381c365eb 100644 --- a/src/lib/gui/messages.cpp +++ b/src/lib/gui/messages.cpp @@ -189,23 +189,6 @@ void showFirstConnectedMessage(QWidget *parent, bool closeToTray, bool enableSer QMessageBox::information(parent, "Connected", message); } -void showDevThanks(QWidget *parent, const QString &productName) -{ - if (productName.isEmpty()) { - qFatal("product name not set"); - } - - QMessageBox::information( - parent, "Thank you!", - QString("

Thanks for using %1.

" - "

If you enjoy using this tool, visit our website:

" - R"(

%2

)" - "

Please report bugs and consider contributing code.

" - "

This message will only appear once.

") - .arg(productName, kUrlApp, kColorSecondary) - ); -} - void showClientConnectError(QWidget *parent, ClientError error, const QString &address) { using enum ClientError; diff --git a/src/lib/gui/messages.h b/src/lib/gui/messages.h index 6e2bf0b07..34cf38051 100644 --- a/src/lib/gui/messages.h +++ b/src/lib/gui/messages.h @@ -47,8 +47,6 @@ void showFirstConnectedMessage(QWidget *parent, bool closeToTray, bool enableSer void showCloseReminder(QWidget *parent); -void showDevThanks(QWidget *parent, const QString &productName); - void showClientConnectError(QWidget *parent, ClientError error, const QString &address); NewClientPromptResult showNewClientPrompt(QWidget *parent, const QString &clientName);