diff --git a/CMakeLists.txt b/CMakeLists.txt index ecaaf24f8..9712a544f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,7 +15,7 @@ # along with this program. If not, see . cmake_minimum_required(VERSION 3.5) -project(synergy-core C CXX) +project(synergy C CXX) include(cmake/Version.cmake) include(cmake/Definitions.cmake) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 211288915..3ef2fe5ac 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1 +1 @@ -See our wiki for information on contributing code: https://github.com/symless/synergy-core/wiki +See our wiki for information on contributing code: https://github.com/symless/synergy/wiki diff --git a/ChangeLog b/ChangeLog index 06c336cfb..42a8fc340 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ Enhancements: - #7449 Wayland support (port Red Hat libei and libportal impl) - #7448 Only add PR comments for internal PR - #7445 Update `config.yaml` to support Linux Mint build target +- #7453 Change default value for dev thanks message # 1.15.0 diff --git a/Doxyfile b/Doxyfile index c532019c9..249659e1b 100644 --- a/Doxyfile +++ b/Doxyfile @@ -32,7 +32,7 @@ DOXYFILE_ENCODING = UTF-8 # title of most generated pages and in a few other places. # The default value is: My Project. -PROJECT_NAME = Synergy-Core +PROJECT_NAME = Synergy # The PROJECT_NUMBER tag can be used to enter a project or revision number. This # could be handy for archiving the generated documentation or if some version diff --git a/README.md b/README.md index 845cc9051..40d40dfd2 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ # Synergy -[![Quality Gate](https://sonarcloud.io/api/project_badges/measure?project=symless_synergy-core&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=symless_synergy-core) -[![CI](https://github.com/symless/synergy-core/actions/workflows/ci.yml/badge.svg)](https://github.com/symless/synergy-core/actions/workflows/ci.yml) -[![CodeQL Analysis](https://github.com/symless/synergy-core/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/symless/synergy-core/actions/workflows/codeql-analysis.yml) -[![SonarCloud Analysis](https://github.com/symless/synergy-core/actions/workflows/sonarcloud-analysis.yml/badge.svg)](https://github.com/symless/synergy-core/actions/workflows/sonarcloud-analysis.yml) -[![Build containers](https://github.com/symless/synergy-core/actions/workflows/build-containers.yml/badge.svg)](https://github.com/symless/synergy-core/actions/workflows/build-containers.yml) +[![Quality Gate](https://sonarcloud.io/api/project_badges/measure?project=symless_synergy&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=symless_synergy) +[![CI](https://github.com/symless/synergy/actions/workflows/ci.yml/badge.svg)](https://github.com/symless/synergy/actions/workflows/ci.yml) +[![CodeQL Analysis](https://github.com/symless/synergy/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/symless/synergy/actions/workflows/codeql-analysis.yml) +[![SonarCloud Analysis](https://github.com/symless/synergy/actions/workflows/sonarcloud-analysis.yml/badge.svg)](https://github.com/symless/synergy/actions/workflows/sonarcloud-analysis.yml) +[![Build containers](https://github.com/symless/synergy/actions/workflows/build-containers.yml/badge.svg)](https://github.com/symless/synergy/actions/workflows/build-containers.yml) [Synergy](https://symless.com/synergy) is a keyboard and mouse sharing app. Use the keyboard, mouse, or trackpad of one computer to control nearby computers, and work seamlessly between them. @@ -24,7 +24,7 @@ Join us on [Discord](https://discord.com/invite/xBFv6j7) or [Slack](https://syne ## Developer Quick Start -How to build Synergy 1 Community Edition. Check the [Developer Guide](https://github.com/symless/synergy-core/wiki/Developer-Guide) wiki page if you have problems. +How to build Synergy 1 Community Edition. Check the [Developer Guide](https://github.com/symless/synergy/wiki/Developer-Guide) wiki page if you have problems. **1. Dependencies:** diff --git a/cmake/Definitions.cmake b/cmake/Definitions.cmake index 5265a4b26..8c0a601a4 100644 --- a/cmake/Definitions.cmake +++ b/cmake/Definitions.cmake @@ -66,11 +66,6 @@ macro(configure_definitions) add_definitions(-DSYNERGY_PRODUCT_NAME="${PRODUCT_NAME}") endif() - if(SHOW_DEV_THANKS) - message(STATUS "Enabling dev thanks message") - add_definitions(-DSYNERGY_SHOW_DEV_THANKS=1) - endif() - if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug") message(STATUS "Disabling debug build") add_definitions(-DNDEBUG) @@ -150,10 +145,6 @@ macro(configure_options) set(DEFAULT_ENABLE_COVERAGE ON) endif() - if("$ENV{SYNERGY_SHOW_DEV_THANKS}" STREQUAL "false") - set(DEFAULT_SHOW_DEV_THANKS OFF) - endif() - option(BUILD_GUI "Build GUI" ${DEFAULT_BUILD_GUI}) option(BUILD_INSTALLER "Build installer" ${DEFAULT_BUILD_INSTALLER}) option(BUILD_TESTS "Build tests" ${DEFAULT_BUILD_TESTS}) @@ -161,6 +152,5 @@ macro(configure_options) option(ENABLE_ACTIVATION "Enable activation" ${DEFAULT_ENABLE_ACTIVATION}) option(LICENSED_PRODUCT "Show licensing info" ${DEFAULT_LICENSED_PRODUCT}) option(ENABLE_COVERAGE "Enable test coverage" ${DEFAULT_ENABLE_COVERAGE}) - option(SHOW_DEV_THANKS "Show dev thanks message" ${DEFAULT_SHOW_DEV_THANKS}) endmacro() diff --git a/src/gui/src/CancelActivationDialog.ui b/src/gui/src/CancelActivationDialog.ui index c9fff355c..975c0792b 100644 --- a/src/gui/src/CancelActivationDialog.ui +++ b/src/gui/src/CancelActivationDialog.ui @@ -17,7 +17,7 @@ - <html><head/><body><p>You'll need to purchase a license to use this build of Synergy.</p><p><a href="https://symless.com/synergy/purchase?source=gui"><span style=" text-decoration: underline; color:#007af4;">Purchase Synergy</span></a></p><p>If you'd prefer to use the community edition instead, visit us on GitHub.</p><p><a href="https://github.com/symless/synergy-core"><span style=" text-decoration: underline; color:#007af4;">GitHub project</span></a></p></body></html> + <html><head/><body><p>You'll need to purchase a license to use this build of Synergy.</p><p><a href="https://symless.com/synergy/purchase?source=gui"><span style=" text-decoration: underline; color:#007af4;">Purchase Synergy</span></a></p><p>If you'd prefer to use the community edition instead, visit us on GitHub.</p><p><a href="https://github.com/symless/synergy"><span style=" text-decoration: underline; color:#007af4;">GitHub project</span></a></p></body></html> true diff --git a/src/lib/gui/config/AppConfig.h b/src/lib/gui/config/AppConfig.h index 3e3346375..3dd7a5ef9 100644 --- a/src/lib/gui/config/AppConfig.h +++ b/src/lib/gui/config/AppConfig.h @@ -21,6 +21,7 @@ #include "ElevateMode.h" #include "IAppConfig.h" #include "IConfigScopes.h" +#include "gui/license/license_utils.h" #include "gui/paths.h" #include @@ -44,12 +45,6 @@ const ProcessMode kDefaultProcessMode = ProcessMode::kService; const ProcessMode kDefaultProcessMode = ProcessMode::kDesktop; #endif // Q_OS_WIN -#ifdef SYNERGY_SHOW_DEV_THANKS -const bool kDefaultShowDevThanks = true; -#else -const bool kDefaultShowDevThanks = false; -#endif // SYNERGY_SHOW_DEV_THANKS - } // namespace synergy::gui /** @@ -334,7 +329,7 @@ private: int m_TlsKeyLength = synergy::gui::kDefaultTlsKeyLength; std::optional m_MainWindowSize; std::optional m_MainWindowPosition; - bool m_ShowDevThanks = synergy::gui::kDefaultShowDevThanks; + bool m_ShowDevThanks = !synergy::gui::license::isLicensedProduct(); bool m_LoadFromSystemScope = false; bool m_ShowCloseReminder = true; diff --git a/src/lib/gui/constants.h b/src/lib/gui/constants.h index c6cbe86cb..ae230f039 100644 --- a/src/lib/gui/constants.h +++ b/src/lib/gui/constants.h @@ -32,7 +32,7 @@ const auto kLinkDownload = R"(Download now)"; const auto kUrlWebsite = "https://symless.com"; const auto kUrlSourceQuery = "source=gui"; -const auto kUrlGitHub = "https://github.com/symless/synergy-core"; +const auto kUrlGitHub = "https://github.com/symless/synergy"; const auto kUrlGnomeTrayFix = "https://extensions.gnome.org/extension/2890/tray-icons-reloaded/"; const auto kUrlProduct = QString("%1/synergy").arg(kUrlWebsite);