smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change default value for dev thanks message (1.16) (#7453)

Browse source 
* Forward port: Change default value for dev thanks message

* Remove sneaky submodules

* Update ChangeLog
This commit is contained in:
Nick Bolton 2024-08-30 21:14:02 +01:00 committed by GitHub
parent 4e844bf307
commit 4d84097334
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 14 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -15,7 +15,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
cmake_minimum_required(VERSION 3.5) cmake_minimum_required(VERSION 3.5)
project(synergy-core C CXX) project(synergy C CXX)
include(cmake/Version.cmake) include(cmake/Version.cmake)
include(cmake/Definitions.cmake) include(cmake/Definitions.cmake)

2
CONTRIBUTING.md
View file

@ -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

1
ChangeLog
View file

@ -5,6 +5,7 @@ Enhancements:
- #7449 Wayland support (port Red Hat libei and libportal impl) - #7449 Wayland support (port Red Hat libei and libportal impl)
- #7448 Only add PR comments for internal PR - #7448 Only add PR comments for internal PR
- #7445 Update `config.yaml` to support Linux Mint build target - #7445 Update `config.yaml` to support Linux Mint build target
- #7453 Change default value for dev thanks message
# 1.15.0 # 1.15.0

2
Doxyfile
View file

@ -32,7 +32,7 @@ DOXYFILE_ENCODING = UTF-8
# title of most generated pages and in a few other places. # title of most generated pages and in a few other places.
# The default value is: My Project. # 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 # 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 # could be handy for archiving the generated documentation or if some version

12
README.md
View file

@ -1,10 +1,10 @@
# Synergy # 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) [![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-core/actions/workflows/ci.yml/badge.svg)](https://github.com/symless/synergy-core/actions/workflows/ci.yml) [![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-core/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/symless/synergy-core/actions/workflows/codeql-analysis.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-core/actions/workflows/sonarcloud-analysis.yml/badge.svg)](https://github.com/symless/synergy-core/actions/workflows/sonarcloud-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-core/actions/workflows/build-containers.yml/badge.svg)](https://github.com/symless/synergy-core/actions/workflows/build-containers.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. [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 ## 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:** **1. Dependencies:**

10
cmake/Definitions.cmake
View file

@ -66,11 +66,6 @@ macro(configure_definitions)
add_definitions(-DSYNERGY_PRODUCT_NAME="${PRODUCT_NAME}") add_definitions(-DSYNERGY_PRODUCT_NAME="${PRODUCT_NAME}")
endif() 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") if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
message(STATUS "Disabling debug build") message(STATUS "Disabling debug build")
add_definitions(-DNDEBUG) add_definitions(-DNDEBUG)
@ -150,10 +145,6 @@ macro(configure_options)
set(DEFAULT_ENABLE_COVERAGE ON) set(DEFAULT_ENABLE_COVERAGE ON)
endif() 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_GUI "Build GUI" ${DEFAULT_BUILD_GUI})
option(BUILD_INSTALLER "Build installer" ${DEFAULT_BUILD_INSTALLER}) option(BUILD_INSTALLER "Build installer" ${DEFAULT_BUILD_INSTALLER})
option(BUILD_TESTS "Build tests" ${DEFAULT_BUILD_TESTS}) option(BUILD_TESTS "Build tests" ${DEFAULT_BUILD_TESTS})
@ -161,6 +152,5 @@ macro(configure_options)
option(ENABLE_ACTIVATION "Enable activation" ${DEFAULT_ENABLE_ACTIVATION}) option(ENABLE_ACTIVATION "Enable activation" ${DEFAULT_ENABLE_ACTIVATION})
option(LICENSED_PRODUCT "Show licensing info" ${DEFAULT_LICENSED_PRODUCT}) option(LICENSED_PRODUCT "Show licensing info" ${DEFAULT_LICENSED_PRODUCT})
option(ENABLE_COVERAGE "Enable test coverage" ${DEFAULT_ENABLE_COVERAGE}) option(ENABLE_COVERAGE "Enable test coverage" ${DEFAULT_ENABLE_COVERAGE})
option(SHOW_DEV_THANKS "Show dev thanks message" ${DEFAULT_SHOW_DEV_THANKS})
endmacro() endmacro()

2
src/gui/src/CancelActivationDialog.ui
View file

@ -17,7 +17,7 @@
<item alignment="Qt::AlignmentFlag::AlignTop"> <item alignment="Qt::AlignmentFlag::AlignTop">
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="text"> <property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;You'll need to purchase a license to use this build of Synergy.&lt;/p&gt;&lt;p&gt;&lt;a href=&quot;https://symless.com/synergy/purchase?source=gui&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#007af4;&quot;&gt;Purchase Synergy&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;p&gt;If you'd prefer to use the community edition instead, visit us on GitHub.&lt;/p&gt;&lt;p&gt;&lt;a href=&quot;https://github.com/symless/synergy-core&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#007af4;&quot;&gt;GitHub project&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;You'll need to purchase a license to use this build of Synergy.&lt;/p&gt;&lt;p&gt;&lt;a href=&quot;https://symless.com/synergy/purchase?source=gui&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#007af4;&quot;&gt;Purchase Synergy&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;p&gt;If you'd prefer to use the community edition instead, visit us on GitHub.&lt;/p&gt;&lt;p&gt;&lt;a href=&quot;https://github.com/symless/synergy&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#007af4;&quot;&gt;GitHub project&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="wordWrap"> <property name="wordWrap">
<bool>true</bool> <bool>true</bool>

9
src/lib/gui/config/AppConfig.h
View file

@ -21,6 +21,7 @@
#include "ElevateMode.h" #include "ElevateMode.h"
#include "IAppConfig.h" #include "IAppConfig.h"
#include "IConfigScopes.h" #include "IConfigScopes.h"
#include "gui/license/license_utils.h"
#include "gui/paths.h" #include "gui/paths.h"
#include <QDir> #include <QDir>
@ -44,12 +45,6 @@ const ProcessMode kDefaultProcessMode = ProcessMode::kService;
const ProcessMode kDefaultProcessMode = ProcessMode::kDesktop; const ProcessMode kDefaultProcessMode = ProcessMode::kDesktop;
#endif // Q_OS_WIN #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 } // namespace synergy::gui
/** /**
@ -334,7 +329,7 @@ private:
int m_TlsKeyLength = synergy::gui::kDefaultTlsKeyLength; int m_TlsKeyLength = synergy::gui::kDefaultTlsKeyLength;
std::optional<QSize> m_MainWindowSize; std::optional<QSize> m_MainWindowSize;
std::optional<QPoint> m_MainWindowPosition; std::optional<QPoint> m_MainWindowPosition;
bool m_ShowDevThanks = synergy::gui::kDefaultShowDevThanks; bool m_ShowDevThanks = !synergy::gui::license::isLicensedProduct();
bool m_LoadFromSystemScope = false; bool m_LoadFromSystemScope = false;
bool m_ShowCloseReminder = true; bool m_ShowCloseReminder = true;

2
src/lib/gui/constants.h
View file

@ -32,7 +32,7 @@ const auto kLinkDownload = R"(<a href="%1" style="color: %2">Download now</a>)";
const auto kUrlWebsite = "https://symless.com"; const auto kUrlWebsite = "https://symless.com";
const auto kUrlSourceQuery = "source=gui"; 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 = const auto kUrlGnomeTrayFix =
"https://extensions.gnome.org/extension/2890/tray-icons-reloaded/"; "https://extensions.gnome.org/extension/2890/tray-icons-reloaded/";
const auto kUrlProduct = QString("%1/synergy").arg(kUrlWebsite); const auto kUrlProduct = QString("%1/synergy").arg(kUrlWebsite);