pengjunjie/desktop-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/desktop-apps.git synced 2026-02-10 18:05:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

[win-nix] changed license info loading

Browse Source
This commit is contained in:
maxkadushkin
2025-08-01 00:56:09 +03:00
parent 41f3c3f995
commit 73b4a3258e
3 changed files with 25 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/loginpage/src/panelabout.js
View File

@ -64,7 +64,7 @@
var _opts = args.opts;
!!_opts.active && (_opts.edition = !!_opts.edition ? _opts.edition + ' ' + _opts.active : _opts.active);
_opts.edition = !!_opts.edition ? `<div id="idx-ver-edition" class="about-field">${_opts.edition}</div>` : '';
const strVersion = args.opts.paidversion === true ? utils.Lang.strVersionCommercial : utils.Lang.strVersionCommunity;
const strVersion = args.opts.commercial === true ? utils.Lang.strVersionCommercial : utils.Lang.strVersionCommunity;
let _ext_ver = '';
if ( !!_opts.arch ) _ext_ver += `${_opts.arch == 'x64' ? 'x64' : 'x86'}`;

10
win-linux/defaults.pri
View File

@ -184,16 +184,6 @@ CMD_IN_HELP_URL = $$join(URL_WEBAPPS_HELP,,\\\",\\\")
message(no webapps help url found)
}
LICENSE_NAME = $$(DESKTOP_LICENSE_NAME)
!isEmpty(LICENSE_NAME) {
DEFINES += APP_LICENSE_NAME=$$join(LICENSE_NAME,,\",\")
}
LICENSE_URL = $$(DESKTOP_LICENSE_URL)
!isEmpty(LICENSE_URL) {
DEFINES += APP_LICENSE_URL=$$join(LICENSE_URL,,\",\")
}
PLATFORM_BUILD=$$CORE_BUILDS_PLATFORM_PREFIX
core_linux:LIBS += -Wl,-unresolved-symbols=ignore-in-shared-libs

43
win-linux/src/prop/cmainwindowimpl.cpp
View File

@ -41,16 +41,9 @@
#include <QJsonDocument>
#include <QFile>
#if !defined APP_LICENSE_NAME
# define LICENSE_NAME "GNU AGPL v3"
# define LICENSE_URL URL_AGPL
#else
# 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
#define DEFAULT_LICENSE_NAME "GNU AGPL v3"
#define DEFAULT_LICENSE_URL URL_AGPL
#define LICENSE_FILE_NAME "./LICENSE.txt"
CMainWindowImpl::CMainWindowImpl(const QRect &rect) :
CMainWindow(rect)
@ -60,13 +53,28 @@ CMainWindowImpl::CMainWindowImpl(const QRect &rect) :
void CMainWindowImpl::refreshAboutVersion()
{
#if defined(LICENSE_URL)
QString _license = tr("Licensed under") + " &lt;a class=\"link\" onclick=\"window.open('" + LICENSE_URL + "')\" draggable=\"false\" href=\"#\"&gt;" + LICENSE_NAME + "&lt;/a&gt;";
#else
QString _license = tr("Licensed under") + " " + LICENSE_NAME;
#endif
QJsonObject _json_obj;
QString _lic_name, _lic_url;
QFile _lic_file(LICENSE_FILE_NAME);
if ( _lic_file.exists() ) {
if ( _lic_file.open(QIODevice::ReadOnly | QIODevice::Text )) {
QTextStream stream(&_lic_file);
_lic_name = _lic_file.readLine().trimmed();
_lic_file.close();
}
}
if ( _lic_name.isEmpty() ) {
_lic_name = DEFAULT_LICENSE_NAME;
_lic_url = DEFAULT_LICENSE_URL;
} else {
_lic_url = "file://" + QFileInfo(LICENSE_FILE_NAME).absoluteFilePath();
_json_obj["commercial"] = _lic_name != DEFAULT_LICENSE_NAME;
}
QString _license = tr("Licensed under") + " &lt;a class=\"link\" onclick=\"window.open('" + _lic_url + "')\" draggable=\"false\" href=\"#\"&gt;" + _lic_name + "&lt;/a&gt;";
_json_obj["version"] = VER_FILEVERSION_STR;
#ifdef Q_OS_WIN
# ifdef Q_OS_WIN64
@ -76,9 +84,6 @@ void CMainWindowImpl::refreshAboutVersion()
# endif
#endif
_json_obj["edition"] = _license;
#ifdef LICENSE_TYPE_COMMERCIAL
_json_obj["paidversion"] = true;
#endif
#if defined(ABOUT_PAGE_APP_NAME)
_json_obj["appname"] = ABOUT_PAGE_APP_NAME;