From 4f0e8cb844a869dbff609f3ff4001d20f4169521 Mon Sep 17 00:00:00 2001 From: Nick Bolton Date: Sat, 21 Sep 2024 19:59:48 +0100 Subject: [PATCH] feat: change most domains to Deskflow --- cmake/Definitions.cmake | 2 +- cmake/Packaging.cmake | 4 ++-- res/dist/arch/PKGBUILD.in | 4 ++-- src/gui/src/ServerConfigDialogBase.ui | 4 +--- src/lib/gui/constants.h | 4 ++-- src/lib/gui/proxy/QSettingsProxy.cpp | 2 +- src/lib/platform/MSWindowsClipboard.cpp | 4 ---- src/lib/platform/OSXScreen.mm | 2 -- 8 files changed, 9 insertions(+), 17 deletions(-) diff --git a/cmake/Definitions.cmake b/cmake/Definitions.cmake index c868b24585..fe95d05a59 100644 --- a/cmake/Definitions.cmake +++ b/cmake/Definitions.cmake @@ -34,7 +34,7 @@ macro(configure_definitions) set(UNIT_TESTS_BIN unittests) if("${VERSION_URL}" STREQUAL "") - set(VERSION_URL "https://api.symless.com/version?version=v1") + set(VERSION_URL "https://api.deskflow.org/version") endif() add_definitions(-DDESKFLOW_VERSION_URL="${VERSION_URL}") diff --git a/cmake/Packaging.cmake b/cmake/Packaging.cmake index e5d19af86e..cd50b19372 100644 --- a/cmake/Packaging.cmake +++ b/cmake/Packaging.cmake @@ -21,7 +21,7 @@ macro(configure_packaging) if(${BUILD_INSTALLER}) set(CPACK_PACKAGE_NAME "deskflow") - set(CPACK_PACKAGE_CONTACT "Deskflow ") + set(CPACK_PACKAGE_CONTACT "Deskflow ") set(CPACK_PACKAGE_DESCRIPTION "Mouse and keyboard sharing utility") set(CPACK_PACKAGE_VENDOR "Symless") set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE") @@ -89,7 +89,7 @@ macro(configure_linux_packaging) set(CPACK_PACKAGE_VERSION ${DESKFLOW_VERSION_LINUX}) set(CPACK_GENERATOR "DEB;RPM;TGZ") - set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Deskflow ") + set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Deskflow ") set(CPACK_DEBIAN_PACKAGE_SECTION "utils") set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON) diff --git a/res/dist/arch/PKGBUILD.in b/res/dist/arch/PKGBUILD.in index 770738c5ff..6bd3814e0a 100644 --- a/res/dist/arch/PKGBUILD.in +++ b/res/dist/arch/PKGBUILD.in @@ -1,10 +1,10 @@ -# Maintainer: Deskflow team +# Maintainer: Deskflow pkgname=deskflow pkgver=@DESKFLOW_VERSION_FOUR_PART@ pkgrel=1 pkgdesc="Mouse and keyboard sharing utility" -url='https://symless.com/deskflow/' +url='https://deskflow.org/' arch=('x86_64') license=('GPL-2.0-only') depends=( diff --git a/src/gui/src/ServerConfigDialogBase.ui b/src/gui/src/ServerConfigDialogBase.ui index c2d4bf88e5..822f0504e6 100644 --- a/src/gui/src/ServerConfigDialogBase.ui +++ b/src/gui/src/ServerConfigDialogBase.ui @@ -873,9 +873,7 @@ - Use a Core server config file to create complex screen layouts that are not possible with the simple grid-based screen layout editor. - -[How to write a config file](https://symless.com/synergy/help/creating-text-config-files) + Use a server config file to create complex screen layouts that are not possible with the simple grid-based screen layout editor. Enabling this setting will disable the server config GUI. diff --git a/src/lib/gui/constants.h b/src/lib/gui/constants.h index ef899aabce..29bc4f9692 100644 --- a/src/lib/gui/constants.h +++ b/src/lib/gui/constants.h @@ -24,7 +24,7 @@ namespace deskflow::gui { // important: this is used for settings paths on some platforms, // and must not be a url. qt automatically converts this to reverse domain // notation (rdn), e.g. com.symless -const auto kOrgDomain = "symless.com"; +const auto kOrgDomain = "deskflow.org"; const auto kLinkBuy = R"(Buy now)"; const auto kLinkRenew = R"(Renew now)"; @@ -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"; +const auto kUrlGitHub = "https://github.com/deskflow/deskflow"; const auto kUrlGnomeTrayFix = "https://extensions.gnome.org/extension/2890/tray-icons-reloaded/"; const auto kUrlProduct = QString("%1/synergy").arg(kUrlWebsite); diff --git a/src/lib/gui/proxy/QSettingsProxy.cpp b/src/lib/gui/proxy/QSettingsProxy.cpp index 3fe3d580d6..7602d97002 100644 --- a/src/lib/gui/proxy/QSettingsProxy.cpp +++ b/src/lib/gui/proxy/QSettingsProxy.cpp @@ -131,7 +131,7 @@ void QSettingsProxy::loadUser() { #if defined(Q_OS_MAC) // on mac, we used to save settings to "com.http-symless-com.Deskflow.plist" // because `setOrganizationName` was historically called using a url instead - // of an actual domain (e.g. symless.com). + // of an actual domain (e.g. deskflow.org). migrateLegacyUserSettings(*m_pSettings); #endif // Q_OS_MAC } diff --git a/src/lib/platform/MSWindowsClipboard.cpp b/src/lib/platform/MSWindowsClipboard.cpp index 96031002e3..a2cea985ba 100644 --- a/src/lib/platform/MSWindowsClipboard.cpp +++ b/src/lib/platform/MSWindowsClipboard.cpp @@ -121,10 +121,6 @@ bool MSWindowsClipboard::open(Time time) const { LOG((CLOG_DEBUG "open clipboard")); if (!OpenClipboard(m_window)) { - // unable to cause this in integ tests; but this can happen! - // * http://symless.com/pm/issues/86 - // * http://symless.com/pm/issues/1256 - // logging improved to see if we can catch more info next time. LOG((CLOG_WARN "failed to open clipboard: %d", GetLastError())); return false; } diff --git a/src/lib/platform/OSXScreen.mm b/src/lib/platform/OSXScreen.mm index 7b74f8c80f..c8c0a425e8 100644 --- a/src/lib/platform/OSXScreen.mm +++ b/src/lib/platform/OSXScreen.mm @@ -863,9 +863,7 @@ OSXScreen::enter() // reset buttons m_buttonState.reset(); - // patch by Yutaka Tsutano // wakes the client screen - // http://symless.com/spit/issues/details/3287#c12 io_registry_entry_t entry = IORegistryEntryFromPath( kIOMasterPortDefault, "IOService:/IOResources/IODisplayWrangler");