From c3eb070efcbb388f27b659fba28d54aa602ae57b Mon Sep 17 00:00:00 2001 From: maxkadushkin Date: Fri, 25 Jul 2025 17:01:02 +0300 Subject: [PATCH] [win-nix] fix fill license info --- win-linux/defaults.pri | 14 ++++++-------- win-linux/src/prop/cmainwindowimpl.cpp | 18 +++++++++++------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/win-linux/defaults.pri b/win-linux/defaults.pri index 80e5396a4..4bc49e2d5 100644 --- a/win-linux/defaults.pri +++ b/win-linux/defaults.pri @@ -184,16 +184,14 @@ CMD_IN_HELP_URL = $$join(URL_WEBAPPS_HELP,,\\\",\\\") message(no webapps help url found) } -APP_LICENSE_NAME = $$join(CFG_APP_LICENSE_NAME,,\\\",\\\") -!isEmpty(CFG_APP_LICENSE_NAME) { - DEFINES += APP_LICENSE_NAME=$$APP_LICENSE_NAME - message(applicense name: $$APP_LICENSE_NAME) +LICENSE_NAME = $$(DESKTOP_LICENSE_NAME) +!isEmpty(LICENSE_NAME) { + DEFINES += APP_LICENSE_NAME=$$join(LICENSE_NAME,,\",\") } -APP_LICENSE_URL = $$join(CFG_APP_LICENSE_URL,,\\\",\\\") -!isEmpty(CFG_APP_LICENSE_URL) { - DEFINES += APP_LICENSE_URL=$$APP_LICENSE_URL - message(applicense url: $$APP_LICENSE_URL) +LICENSE_URL = $$(DESKTOP_LICENSE_URL) +!isEmpty(LICENSE_URL) { + DEFINES += APP_LICENSE_URL=$$join(LICENSE_URL,,\",\") } PLATFORM_BUILD=$$CORE_BUILDS_PLATFORM_PREFIX diff --git a/win-linux/src/prop/cmainwindowimpl.cpp b/win-linux/src/prop/cmainwindowimpl.cpp index b9c763c9c..b98c06ce9 100644 --- a/win-linux/src/prop/cmainwindowimpl.cpp +++ b/win-linux/src/prop/cmainwindowimpl.cpp @@ -42,10 +42,14 @@ #include #if !defined APP_LICENSE_NAME -# define APP_LICENSE_NAME "GNU AGPL v3" -# define APP_LICENSE_URL URL_AGPL +# define LICENSE_NAME "GNU AGPL v3" +# define LICENSE_URL URL_AGPL #else -# define APP_LICENSE_COMMERCIAL +# define LICENSE_TYPE_COMMERCIAL +# define LICENSE_NAME TO_STR(APP_LICENSE_NAME) +# if defined(APP_LICENSE_URL) +# define LICENSE_URL TO_STR(APP_LICENSE_URL) +# endif #endif CMainWindowImpl::CMainWindowImpl(const QRect &rect) : @@ -56,10 +60,10 @@ CMainWindowImpl::CMainWindowImpl(const QRect &rect) : void CMainWindowImpl::refreshAboutVersion() { -#if defined(APP_LICENSE_URL) - QString _license = tr("Licensed under") + " <a class=\"link\" onclick=\"window.open('" + TO_STR(APP_LICENSE_URL) + "')\" draggable=\"false\" href=\"#\">" + TO_STR(APP_LICENSE_NAME) + "</a>"; +#if defined(LICENSE_URL) + QString _license = tr("Licensed under") + " <a class=\"link\" onclick=\"window.open('" + LICENSE_URL + "')\" draggable=\"false\" href=\"#\">" + LICENSE_NAME + "</a>"; #else - QString _license = tr("Licensed under") + " " + TO_STR(APP_LICENSE_NAME); + QString _license = tr("Licensed under") + " " + LICENSE_NAME; #endif QJsonObject _json_obj; @@ -72,7 +76,7 @@ void CMainWindowImpl::refreshAboutVersion() # endif #endif _json_obj["edition"] = _license; -#ifdef APP_LICENSE_COMMERCIAL +#ifdef LICENSE_TYPE_COMMERCIAL _json_obj["paidversion"] = true; #endif