Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e87bd96619 | ||
|
|
17529615d1 |
@ -1,25 +1,11 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM)
|
* Copyright (C) 2025-2026 ООО «КАРУМА»
|
||||||
*
|
*
|
||||||
* Copyright (C) 2013 Open Education Foundation
|
* This file is part of SaiCore.
|
||||||
*
|
*
|
||||||
* Copyright (C) 2010-2013 Groupement d'Intérêt Public pour
|
* SaiCore is proprietary software: you can NOT redistribute it and/or modify
|
||||||
* l'Education Numérique en Afrique (GIP ENA)
|
* it without the express written permission of ООО «КАРУМА».
|
||||||
*
|
*
|
||||||
* This file is part of OpenBoard.
|
* SaiCore is distributed under a proprietary EULA license.
|
||||||
*
|
* See the LICENSE file for details, or contact support@saicore.ru
|
||||||
* OpenBoard is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, version 3 of the License,
|
|
||||||
* with a specific linking exception for the OpenSSL project's
|
|
||||||
* "OpenSSL" library (or with modified versions of it that use the
|
|
||||||
* same license as the "OpenSSL" library).
|
|
||||||
*
|
|
||||||
* OpenBoard is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with OpenBoard. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -1,27 +1,13 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 2015-2022 Département de l'Instruction Publique (DIP-SEM)
|
* Copyright (C) 2025-2026 ООО «КАРУМА»
|
||||||
*
|
|
||||||
* Copyright (C) 2013 Open Education Foundation
|
|
||||||
*
|
|
||||||
* Copyright (C) 2010-2013 Groupement d'Intérêt Public pour
|
|
||||||
* l'Education Numérique en Afrique (GIP ENA)
|
|
||||||
*
|
*
|
||||||
* This file is part of SaiCore.
|
* This file is part of SaiCore.
|
||||||
*
|
*
|
||||||
* SaiCore is free software: you can redistribute it and/or modify
|
* SaiCore is proprietary software: you can NOT redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it without the express written permission of ООО «КАРУМА».
|
||||||
* the Free Software Foundation, version 3 of the License,
|
|
||||||
* with a specific linking exception for the OpenSSL project's
|
|
||||||
* "OpenSSL" library (or with modified versions of it that use the
|
|
||||||
* same license as the "OpenSSL" library).
|
|
||||||
*
|
*
|
||||||
* SaiCore is distributed in the hope that it will be useful,
|
* SaiCore is distributed under a proprietary EULA license.
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* See the LICENSE file for details, or contact support@saicore.ru
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with SaiCore. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -1,27 +1,13 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 2015-2022 Département de l'Instruction Publique (DIP-SEM)
|
* Copyright (C) 2025-2026 ООО «КАРУМА»
|
||||||
*
|
|
||||||
* Copyright (C) 2013 Open Education Foundation
|
|
||||||
*
|
|
||||||
* Copyright (C) 2010-2013 Groupement d'Intérêt Public pour
|
|
||||||
* l'Education Numérique en Afrique (GIP ENA)
|
|
||||||
*
|
*
|
||||||
* This file is part of SaiCore.
|
* This file is part of SaiCore.
|
||||||
*
|
*
|
||||||
* SaiCore is free software: you can redistribute it and/or modify
|
* SaiCore is proprietary software: you can NOT redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it without the express written permission of ООО «КАРУМА».
|
||||||
* the Free Software Foundation, version 3 of the License,
|
|
||||||
* with a specific linking exception for the OpenSSL project's
|
|
||||||
* "OpenSSL" library (or with modified versions of it that use the
|
|
||||||
* same license as the "OpenSSL" library).
|
|
||||||
*
|
*
|
||||||
* SaiCore is distributed in the hope that it will be useful,
|
* SaiCore is distributed under a proprietary EULA license.
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* See the LICENSE file for details, or contact support@saicore.ru
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with SaiCore. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -1,22 +1,13 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA)
|
* Copyright (C) 2025-2026 ООО «КАРУМА»
|
||||||
*
|
*
|
||||||
* This file is part of Open-Sankoré.
|
* This file is part of SaiCore.
|
||||||
*
|
*
|
||||||
* Open-Sankoré is free software: you can redistribute it and/or modify
|
* SaiCore is proprietary software: you can NOT redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it without the express written permission of ООО «КАРУМА».
|
||||||
* the Free Software Foundation, version 3 of the License,
|
|
||||||
* with a specific linking exception for the OpenSSL project's
|
|
||||||
* "OpenSSL" library (or with modified versions of it that use the
|
|
||||||
* same license as the "OpenSSL" library).
|
|
||||||
*
|
*
|
||||||
* Open-Sankoré is distributed in the hope that it will be useful,
|
* SaiCore is distributed under a proprietary EULA license.
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* See the LICENSE file for details, or contact support@saicore.ru
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with Open-Sankoré. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -1,22 +1,13 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA)
|
* Copyright (C) 2025-2026 ООО «КАРУМА»
|
||||||
*
|
*
|
||||||
* This file is part of Open-Sankoré.
|
* This file is part of SaiCore.
|
||||||
*
|
*
|
||||||
* Open-Sankoré is free software: you can redistribute it and/or modify
|
* SaiCore is proprietary software: you can NOT redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it without the express written permission of ООО «КАРУМА».
|
||||||
* the Free Software Foundation, version 3 of the License,
|
|
||||||
* with a specific linking exception for the OpenSSL project's
|
|
||||||
* "OpenSSL" library (or with modified versions of it that use the
|
|
||||||
* same license as the "OpenSSL" library).
|
|
||||||
*
|
*
|
||||||
* Open-Sankoré is distributed in the hope that it will be useful,
|
* SaiCore is distributed under a proprietary EULA license.
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* See the LICENSE file for details, or contact support@saicore.ru
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with Open-Sankoré. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -1,27 +1,13 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 2015-2022 Département de l'Instruction Publique (DIP-SEM)
|
* Copyright (C) 2025-2026 ООО «КАРУМА»
|
||||||
*
|
|
||||||
* Copyright (C) 2013 Open Education Foundation
|
|
||||||
*
|
|
||||||
* Copyright (C) 2010-2013 Groupement d'Intérêt Public pour
|
|
||||||
* l'Education Numérique en Afrique (GIP ENA)
|
|
||||||
*
|
*
|
||||||
* This file is part of SaiCore.
|
* This file is part of SaiCore.
|
||||||
*
|
*
|
||||||
* SaiCore is free software: you can redistribute it and/or modify
|
* SaiCore is proprietary software: you can NOT redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it without the express written permission of ООО «КАРУМА».
|
||||||
* the Free Software Foundation, version 3 of the License,
|
|
||||||
* with a specific linking exception for the OpenSSL project's
|
|
||||||
* "OpenSSL" library (or with modified versions of it that use the
|
|
||||||
* same license as the "OpenSSL" library).
|
|
||||||
*
|
*
|
||||||
* SaiCore is distributed in the hope that it will be useful,
|
* SaiCore is distributed under a proprietary EULA license.
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* See the LICENSE file for details, or contact support@saicore.ru
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with SaiCore. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
1
release.json
Normal file
1
release.json
Normal file
@ -0,0 +1 @@
|
|||||||
|
{"tag_name":"v1.0.0","target_commitish":"main","name":"SaiCore v1.0.0","body":"SaiCore v1.0.0 — отечественное ПО для интерактивных панелей и досок.\n\nВозможности:\n- Рисование, презентации, запись уроков\n- Работа с документами PDF\n- Кроссплатформенность: Astra Linux, Debian, Ubuntu\n- Проприетарная лицензия EULA\n- Пробный период 30 дней\n- Система лицензирования с grace period 7 дней\n\nПравообладатель: ООО «КАРУМА»","draft":false,"prerelease":false}
|
||||||
@ -3227,9 +3227,9 @@ hr { height: 1px; border-width: 0; }
|
|||||||
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Cantarell'; font-size:10pt;"><br /></p>
|
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Cantarell'; font-size:10pt;"><br /></p>
|
||||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Cantarell'; font-size:10pt;">SaiCore — программное обеспечение для интерактивных панелей. © 2026 SaiCore. Все права защищены.</span></p>
|
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Cantarell'; font-size:10pt;">SaiCore — программное обеспечение для интерактивных панелей. © 2026 SaiCore. Все права защищены.</span></p>
|
||||||
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Cantarell'; font-size:10pt;"><br /></p>
|
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Cantarell'; font-size:10pt;"><br /></p>
|
||||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Cantarell'; font-size:10pt;">SaiCore основано на OpenBoard. OpenBoard является производным от Open-Sankoré. Open-Sankoré © 2010-2015 GIP ENA. Все права защищены.</span></p>
|
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Cantarell'; font-size:10pt;">SaiCore разработано ООО «КАРУМА». Все права защищены.</span></p>
|
||||||
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Cantarell'; font-size:10pt;"><br /></p>
|
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Cantarell'; font-size:10pt;"><br /></p>
|
||||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Cantarell'; font-size:10pt;">SaiCore — свободное программное обеспечение: вы можете распространять и изменять его на условиях GNU General Public License версии 3, опубликованной Free Software Foundation. Исходный код доступен на </span><a href="https://saicore.ru"><span style=" font-family:'Cantarell'; font-size:10pt; text-decoration: underline; color:#0000ff;">saicore.ru</span></a><span style=" font-family:'Cantarell'; font-size:10pt;">.</span></p>
|
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Cantarell'; font-size:10pt;">SaiCore — проприетарное программное обеспечение ООО «КАРУМА». Использование без лицензионного ключа допускается только в течение пробного периода (30 дней). Подробнее: </span><a href="https://saicore.ru"><span style=" font-family:'Cantarell'; font-size:10pt; text-decoration: underline; color:#0000ff;">saicore.ru</span></a><span style=" font-family:'Cantarell'; font-size:10pt;">.</span></p>
|
||||||
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Cantarell'; font-size:10pt;"><br /></p>
|
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Cantarell'; font-size:10pt;"><br /></p>
|
||||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Cantarell'; font-size:10pt;">Контактная информация:</span></p>
|
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Cantarell'; font-size:10pt;">Контактная информация:</span></p>
|
||||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="https://saicore.ru"><span style=" font-family:'Cantarell'; font-size:10pt; text-decoration: underline; color:#0000ff;">saicore.ru</span></a></p></td></tr></table></body></html></string>
|
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="https://saicore.ru"><span style=" font-family:'Cantarell'; font-size:10pt; text-decoration: underline; color:#0000ff;">saicore.ru</span></a></p></td></tr></table></body></html></string>
|
||||||
|
|||||||
@ -76,7 +76,7 @@ const QString UBSvgSubsetAdaptor::sFontSizePrefix = "font-size:";
|
|||||||
const QString UBSvgSubsetAdaptor::sPixelUnit = "px";
|
const QString UBSvgSubsetAdaptor::sPixelUnit = "px";
|
||||||
const QString UBSvgSubsetAdaptor::sFontWeightPrefix = "font-weight:";
|
const QString UBSvgSubsetAdaptor::sFontWeightPrefix = "font-weight:";
|
||||||
const QString UBSvgSubsetAdaptor::sFontStylePrefix = "font-style:";
|
const QString UBSvgSubsetAdaptor::sFontStylePrefix = "font-style:";
|
||||||
const QString UBSvgSubsetAdaptor::sFormerUniboardDocumentNamespaceUri = "http://www.mnemis.com/uniboard";
|
const QString UBSvgSubsetAdaptor::sFormerUniboardDocumentNamespaceUri = "https://saicore.ru/document";
|
||||||
|
|
||||||
const QString tElement = "element";
|
const QString tElement = "element";
|
||||||
const QString tGroup = "group";
|
const QString tGroup = "group";
|
||||||
@ -307,7 +307,7 @@ QUuid UBSvgSubsetAdaptor::sceneUuid(std::shared_ptr<UBDocumentProxy> proxy, cons
|
|||||||
{
|
{
|
||||||
auto svgSceneUuid = xml.attributes().value(UBSettings::uniboardDocumentNamespaceUri, "uuid");
|
auto svgSceneUuid = xml.attributes().value(UBSettings::uniboardDocumentNamespaceUri, "uuid");
|
||||||
if (svgSceneUuid.isNull())
|
if (svgSceneUuid.isNull())
|
||||||
svgSceneUuid = xml.attributes().value("http://www.mnemis.com/uniboard", "uuid");
|
svgSceneUuid = xml.attributes().value("https://saicore.ru/document", "uuid");
|
||||||
|
|
||||||
if (!svgSceneUuid.isNull())
|
if (!svgSceneUuid.isNull())
|
||||||
uuid = QUuid(svgSceneUuid.toString());
|
uuid = QUuid(svgSceneUuid.toString());
|
||||||
|
|||||||
@ -67,10 +67,10 @@ UBMainWindow* UBApplication::mainWindow = 0;
|
|||||||
|
|
||||||
bool UBApplication::isClosing = false;
|
bool UBApplication::isClosing = false;
|
||||||
|
|
||||||
const QString UBApplication::mimeTypeUniboardDocument = QString("application/vnd.mnemis-uniboard-document");
|
const QString UBApplication::mimeTypeUniboardDocument = QString("application/vnd.saicore-document");
|
||||||
const QString UBApplication::mimeTypeUniboardPage = QString("application/vnd.mnemis-uniboard-page");
|
const QString UBApplication::mimeTypeUniboardPage = QString("application/vnd.saicore-page");
|
||||||
const QString UBApplication::mimeTypeUniboardPageItem = QString("application/vnd.mnemis-uniboard-page-item");
|
const QString UBApplication::mimeTypeUniboardPageItem = QString("application/vnd.saicore-page-item");
|
||||||
const QString UBApplication::mimeTypeUniboardPageThumbnail = QString("application/vnd.mnemis-uniboard-thumbnail");
|
const QString UBApplication::mimeTypeUniboardPageThumbnail = QString("application/vnd.saicore-thumbnail");
|
||||||
|
|
||||||
QString UBApplication::fileToOpen = "";
|
QString UBApplication::fileToOpen = "";
|
||||||
|
|
||||||
@ -179,7 +179,7 @@ UBApplication::~UBApplication()
|
|||||||
staticMemoryCleaner = 0;
|
staticMemoryCleaner = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
QString UBApplication::checkLanguageAvailabilityForSankore(QString &language)
|
QString UBApplication::checkLanguageAvailabilityForSaiCore(QString &language)
|
||||||
{
|
{
|
||||||
QStringList availableTranslations = UBPlatformUtils::availableTranslations();
|
QStringList availableTranslations = UBPlatformUtils::availableTranslations();
|
||||||
|
|
||||||
@ -213,11 +213,11 @@ void UBApplication::setupTranslators(QStringList args)
|
|||||||
QString language("");
|
QString language("");
|
||||||
|
|
||||||
if(!forcedLanguage.isEmpty())
|
if(!forcedLanguage.isEmpty())
|
||||||
language = checkLanguageAvailabilityForSankore(forcedLanguage);
|
language = checkLanguageAvailabilityForSaiCore(forcedLanguage);
|
||||||
|
|
||||||
if(language.isEmpty()){
|
if(language.isEmpty()){
|
||||||
QString systemLanguage = UBPlatformUtils::systemLanguage();
|
QString systemLanguage = UBPlatformUtils::systemLanguage();
|
||||||
language = checkLanguageAvailabilityForSankore(systemLanguage);
|
language = checkLanguageAvailabilityForSaiCore(systemLanguage);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(language.isEmpty()){
|
if(language.isEmpty()){
|
||||||
|
|||||||
@ -128,7 +128,7 @@ class UBApplication : public SingleApplication
|
|||||||
void setupTranslators(QStringList args);
|
void setupTranslators(QStringList args);
|
||||||
QList<QMenu*> mProtoMenus;
|
QList<QMenu*> mProtoMenus;
|
||||||
bool mIsVerbose;
|
bool mIsVerbose;
|
||||||
QString checkLanguageAvailabilityForSankore(QString& language);
|
QString checkLanguageAvailabilityForSaiCore(QString& language);
|
||||||
protected:
|
protected:
|
||||||
/*
|
/*
|
||||||
#if defined(Q_OS_MAC) && !defined(QT_MAC_USE_COCOA)
|
#if defined(Q_OS_MAC) && !defined(QT_MAC_USE_COCOA)
|
||||||
|
|||||||
@ -25,6 +25,7 @@
|
|||||||
UBLicenseManager* UBLicenseManager::sInstance = nullptr;
|
UBLicenseManager* UBLicenseManager::sInstance = nullptr;
|
||||||
|
|
||||||
const QString LICENSE_SERVER_URL = "https://license.saicore.ru/api/activate";
|
const QString LICENSE_SERVER_URL = "https://license.saicore.ru/api/activate";
|
||||||
|
const QString UPDATE_CHECK_URL = "https://license.saicore.ru/api/check_update";
|
||||||
const int TRIAL_DURATION_DAYS = 30;
|
const int TRIAL_DURATION_DAYS = 30;
|
||||||
const int GRACE_PERIOD_DAYS = 7;
|
const int GRACE_PERIOD_DAYS = 7;
|
||||||
|
|
||||||
@ -311,6 +312,8 @@ bool UBLicenseManager::activateLicense(const QString& key)
|
|||||||
json["product"] = "SaiCore";
|
json["product"] = "SaiCore";
|
||||||
json["version"] = "1.0.0";
|
json["version"] = "1.0.0";
|
||||||
|
|
||||||
|
mPendingActivationKey = key.trimmed().toUpper();
|
||||||
|
|
||||||
QNetworkReply* reply = mNetworkManager->post(request, QJsonDocument(json).toJson(QJsonDocument::Compact));
|
QNetworkReply* reply = mNetworkManager->post(request, QJsonDocument(json).toJson(QJsonDocument::Compact));
|
||||||
connect(reply, &QNetworkReply::finished, this, [this, reply]() { onActivationReply(reply); });
|
connect(reply, &QNetworkReply::finished, this, [this, reply]() { onActivationReply(reply); });
|
||||||
|
|
||||||
@ -323,10 +326,11 @@ void UBLicenseManager::onActivationReply(QNetworkReply* reply)
|
|||||||
|
|
||||||
if (reply->error() != QNetworkReply::NoError)
|
if (reply->error() != QNetworkReply::NoError)
|
||||||
{
|
{
|
||||||
if (validateLicenseOffline(mLicenseKey))
|
if (validateLicenseOffline(mPendingActivationKey))
|
||||||
{
|
{
|
||||||
mLicenseKey = reply->property("key").toString();
|
mLicenseKey = mPendingActivationKey;
|
||||||
mLicenseExpiry = QDateTime::currentDateTime().addYears(1);
|
mLicenseExpiry = QDateTime::currentDateTime().addYears(1);
|
||||||
|
mGracePeriodStart = QDateTime();
|
||||||
mState = LicenseActive;
|
mState = LicenseActive;
|
||||||
saveState();
|
saveState();
|
||||||
emit licenseStateChanged(mState);
|
emit licenseStateChanged(mState);
|
||||||
@ -354,6 +358,7 @@ void UBLicenseManager::onActivationReply(QNetworkReply* reply)
|
|||||||
|
|
||||||
mLicenseKey = obj.value("license_key").toString();
|
mLicenseKey = obj.value("license_key").toString();
|
||||||
mLicenseExpiry = expiry;
|
mLicenseExpiry = expiry;
|
||||||
|
mGracePeriodStart = QDateTime();
|
||||||
mState = LicenseActive;
|
mState = LicenseActive;
|
||||||
saveState();
|
saveState();
|
||||||
emit licenseStateChanged(mState);
|
emit licenseStateChanged(mState);
|
||||||
@ -389,3 +394,48 @@ void UBLicenseManager::deactivateLicense()
|
|||||||
saveState();
|
saveState();
|
||||||
emit licenseStateChanged(mState);
|
emit licenseStateChanged(mState);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void UBLicenseManager::checkForUpdates()
|
||||||
|
{
|
||||||
|
QNetworkRequest request;
|
||||||
|
request.setUrl(QUrl(UPDATE_CHECK_URL));
|
||||||
|
request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
|
||||||
|
request.setRawHeader("User-Agent", "SaiCore/1.0.0");
|
||||||
|
|
||||||
|
QJsonObject json;
|
||||||
|
json["version"] = "1.0.0";
|
||||||
|
json["platform"] = QSysInfo::productType();
|
||||||
|
|
||||||
|
QNetworkReply* reply = mNetworkManager->post(request, QJsonDocument(json).toJson(QJsonDocument::Compact));
|
||||||
|
connect(reply, &QNetworkReply::finished, this, [this, reply]() { onUpdateCheckReply(reply); });
|
||||||
|
}
|
||||||
|
|
||||||
|
void UBLicenseManager::onUpdateCheckReply(QNetworkReply* reply)
|
||||||
|
{
|
||||||
|
reply->deleteLater();
|
||||||
|
|
||||||
|
if (reply->error() != QNetworkReply::NoError)
|
||||||
|
{
|
||||||
|
qWarning() << "Update check failed:" << reply->errorString();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
QByteArray data = reply->readAll();
|
||||||
|
QJsonDocument doc = QJsonDocument::fromJson(data);
|
||||||
|
QJsonObject obj = doc.object();
|
||||||
|
|
||||||
|
bool hasUpdate = obj.value("update_available").toBool(false);
|
||||||
|
if (hasUpdate)
|
||||||
|
{
|
||||||
|
QString version = obj.value("latest_version").toString();
|
||||||
|
QString downloadUrl = obj.value("download_url").toString();
|
||||||
|
QString changelog = obj.value("changelog").toString();
|
||||||
|
|
||||||
|
qInfo() << "Update available:" << version;
|
||||||
|
emit updateAvailable(version, downloadUrl, changelog);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
qDebug() << "SaiCore is up to date";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@ -59,6 +59,7 @@ public:
|
|||||||
bool activateLicense(const QString& key);
|
bool activateLicense(const QString& key);
|
||||||
bool validateLicenseFormat(const QString& key) const;
|
bool validateLicenseFormat(const QString& key) const;
|
||||||
bool validateLicenseOffline(const QString& key) const;
|
bool validateLicenseOffline(const QString& key) const;
|
||||||
|
void checkForUpdates();
|
||||||
|
|
||||||
void startTrial();
|
void startTrial();
|
||||||
void deactivateLicense();
|
void deactivateLicense();
|
||||||
@ -68,9 +69,11 @@ public:
|
|||||||
signals:
|
signals:
|
||||||
void licenseStateChanged(LicenseState newState);
|
void licenseStateChanged(LicenseState newState);
|
||||||
void activationResult(bool success, const QString& message);
|
void activationResult(bool success, const QString& message);
|
||||||
|
void updateAvailable(const QString& version, const QString& downloadUrl, const QString& changelog);
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
void onActivationReply(QNetworkReply* reply);
|
void onActivationReply(QNetworkReply* reply);
|
||||||
|
void onUpdateCheckReply(QNetworkReply* reply);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
UBLicenseManager(QObject* parent = nullptr);
|
UBLicenseManager(QObject* parent = nullptr);
|
||||||
@ -84,6 +87,7 @@ private:
|
|||||||
QDateTime mTrialStart;
|
QDateTime mTrialStart;
|
||||||
QDateTime mLicenseExpiry;
|
QDateTime mLicenseExpiry;
|
||||||
QDateTime mGracePeriodStart;
|
QDateTime mGracePeriodStart;
|
||||||
|
QString mPendingActivationKey;
|
||||||
QNetworkAccessManager* mNetworkManager;
|
QNetworkAccessManager* mNetworkManager;
|
||||||
static const int GRACE_PERIOD_DAYS = 7;
|
static const int GRACE_PERIOD_DAYS = 7;
|
||||||
|
|
||||||
|
|||||||
@ -51,8 +51,8 @@ QString UBSettings::documentDate = QString("date");
|
|||||||
|
|
||||||
QString UBSettings::trashedDocumentGroupNamePrefix = QString("_Trash:");
|
QString UBSettings::trashedDocumentGroupNamePrefix = QString("_Trash:");
|
||||||
|
|
||||||
QString UBSettings::uniboardDocumentNamespaceUri = "http://uniboard.mnemis.com/document";
|
QString UBSettings::uniboardDocumentNamespaceUri = "https://saicore.ru/document";
|
||||||
QString UBSettings::uniboardApplicationNamespaceUri = "http://uniboard.mnemis.com/application";
|
QString UBSettings::uniboardApplicationNamespaceUri = "https://saicore.ru/application";
|
||||||
|
|
||||||
QString UBSettings::undoCommandTransactionName = "UndoTransaction";
|
QString UBSettings::undoCommandTransactionName = "UndoTransaction";
|
||||||
|
|
||||||
|
|||||||
@ -222,6 +222,13 @@ int main(int argc, char *argv[])
|
|||||||
<< "days remaining. License required.";
|
<< "days remaining. License required.";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
QObject::connect(licenseManager, &UBLicenseManager::updateAvailable,
|
||||||
|
[](const QString& version, const QString& url, const QString& changelog) {
|
||||||
|
qDebug() << "Update available:" << version << url;
|
||||||
|
});
|
||||||
|
|
||||||
|
licenseManager->checkForUpdates();
|
||||||
|
|
||||||
qDebug() << "file name argument" << fileToOpen;
|
qDebug() << "file name argument" << fileToOpen;
|
||||||
result = app.exec(fileToOpen);
|
result = app.exec(fileToOpen);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -869,7 +869,7 @@ void UBGraphicsWidgetItem::registerAPI()
|
|||||||
if (!mUniboardAPI)
|
if (!mUniboardAPI)
|
||||||
{
|
{
|
||||||
mUniboardAPI = new UBWidgetUniboardAPI(scene(), this);
|
mUniboardAPI = new UBWidgetUniboardAPI(scene(), this);
|
||||||
mWebEngineView->page()->webChannel()->registerObject("sankore", mUniboardAPI);
|
mWebEngineView->page()->webChannel()->registerObject("saicore", mUniboardAPI);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -1354,8 +1354,8 @@ QString UBGraphicsW3CWidgetItem::createHtmlWrapperInDir(const QString& html, con
|
|||||||
#endif
|
#endif
|
||||||
outConfig << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" << '\n';
|
outConfig << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" << '\n';
|
||||||
outConfig << "<widget xmlns=\"http://www.w3.org/ns/widgets\"" << '\n';
|
outConfig << "<widget xmlns=\"http://www.w3.org/ns/widgets\"" << '\n';
|
||||||
outConfig << " xmlns:ub=\"http://uniboard.mnemis.com/widgets\"" << '\n';
|
outConfig << " xmlns:ub=\"https://saicore.ru/widgets\"" << '\n';
|
||||||
outConfig << " id=\"http://uniboard.mnemis.com/" << pName << "\"" <<'\n';
|
outConfig << " id=\"https://saicore.ru/" << pName << "\"" <<'\n';
|
||||||
|
|
||||||
outConfig << " version=\"2.0\"" << '\n';
|
outConfig << " version=\"2.0\"" << '\n';
|
||||||
outConfig << " width=\"" << sizeHint.width() << "\"" << '\n';
|
outConfig << " width=\"" << sizeHint.width() << "\"" << '\n';
|
||||||
|
|||||||
@ -115,9 +115,9 @@ QStringList UBPlatformUtils::availableTranslations()
|
|||||||
{
|
{
|
||||||
QString translationsPath = applicationResourcesDirectory() + "/" + "i18n" + "/";
|
QString translationsPath = applicationResourcesDirectory() + "/" + "i18n" + "/";
|
||||||
QStringList translationsList = UBFileSystemUtils::allFiles(translationsPath);
|
QStringList translationsList = UBFileSystemUtils::allFiles(translationsPath);
|
||||||
static const QRegularExpression sankoreTranslationFiles("(.*)SaiCore_(.*).qm");
|
static const QRegularExpression saicoreTranslationFiles("(.*)SaiCore_(.*).qm");
|
||||||
translationsList = translationsList.filter(sankoreTranslationFiles);
|
translationsList = translationsList.filter(saicoreTranslationFiles);
|
||||||
return translationsList.replaceInStrings(sankoreTranslationFiles, "\\2");
|
return translationsList.replaceInStrings(saicoreTranslationFiles, "\\2");
|
||||||
}
|
}
|
||||||
|
|
||||||
QString UBPlatformUtils::translationPath(QString pFilePrefix,QString pLanguage)
|
QString UBPlatformUtils::translationPath(QString pFilePrefix,QString pLanguage)
|
||||||
|
|||||||
@ -84,9 +84,9 @@ QStringList UBPlatformUtils::availableTranslations()
|
|||||||
{
|
{
|
||||||
QString translationsPath = applicationResourcesDirectory() + "/" + "i18n" + "/";
|
QString translationsPath = applicationResourcesDirectory() + "/" + "i18n" + "/";
|
||||||
QStringList translationsList = UBFileSystemUtils::allFiles(translationsPath);
|
QStringList translationsList = UBFileSystemUtils::allFiles(translationsPath);
|
||||||
static const QRegularExpression sankoreTranslationFiles("(.*)SaiCore_(.*).qm");
|
static const QRegularExpression saicoreTranslationFiles("(.*)SaiCore_(.*).qm");
|
||||||
translationsList = translationsList.filter(sankoreTranslationFiles);
|
translationsList = translationsList.filter(saicoreTranslationFiles);
|
||||||
return translationsList.replaceInStrings(sankoreTranslationFiles, "\\2");
|
return translationsList.replaceInStrings(saicoreTranslationFiles, "\\2");
|
||||||
}
|
}
|
||||||
|
|
||||||
QString UBPlatformUtils::translationPath(QString pFilePrefix,QString pLanguage)
|
QString UBPlatformUtils::translationPath(QString pFilePrefix,QString pLanguage)
|
||||||
|
|||||||
@ -32,7 +32,7 @@ const char *UBFeaturesWidget::objNameFeatureList = "FeatureList";
|
|||||||
const QMargins FeatureListMargins(0, 0, 0, 30);
|
const QMargins FeatureListMargins(0, 0, 0, 30);
|
||||||
const int FeatureListBorderOffset = 10;
|
const int FeatureListBorderOffset = 10;
|
||||||
const char featureTypeSplitter = ':';
|
const char featureTypeSplitter = ':';
|
||||||
static const QString mimeSankoreFeatureTypes = "Sankore/featureTypes";
|
static const QString mimeSaiCoreFeatureTypes = "SaiCore/featureTypes";
|
||||||
|
|
||||||
UBFeaturesWidget::UBFeaturesWidget(QWidget *parent, const char *name)
|
UBFeaturesWidget::UBFeaturesWidget(QWidget *parent, const char *name)
|
||||||
: UBDockPaletteWidget(parent)
|
: UBDockPaletteWidget(parent)
|
||||||
@ -777,7 +777,7 @@ void UBFeaturesProgressInfo::sendFeature(UBFeature pFeature)
|
|||||||
UBFeaturesWebView::UBFeaturesWebView(QWidget* parent, const char* name):QWidget(parent)
|
UBFeaturesWebView::UBFeaturesWebView(QWidget* parent, const char* name):QWidget(parent)
|
||||||
, mpView(NULL)
|
, mpView(NULL)
|
||||||
, mpLayout(NULL)
|
, mpLayout(NULL)
|
||||||
, mpSankoreAPI(NULL)
|
, mpSaiCoreAPI(NULL)
|
||||||
{
|
{
|
||||||
setObjectName(name);
|
setObjectName(name);
|
||||||
|
|
||||||
@ -788,10 +788,10 @@ UBFeaturesWebView::UBFeaturesWebView(QWidget* parent, const char* name):QWidget(
|
|||||||
|
|
||||||
mpView = new QWebEngineView(this);
|
mpView = new QWebEngineView(this);
|
||||||
mpView->setObjectName("SearchEngineView");
|
mpView->setObjectName("SearchEngineView");
|
||||||
mpSankoreAPI = new UBWidgetUniboardAPI(UBApplication::boardController->activeScene());
|
mpSaiCoreAPI = new UBWidgetUniboardAPI(UBApplication::boardController->activeScene());
|
||||||
QWebChannel* channel = new QWebChannel(this);
|
QWebChannel* channel = new QWebChannel(this);
|
||||||
mpView->page()->setWebChannel(channel);
|
mpView->page()->setWebChannel(channel);
|
||||||
mpView->page()->webChannel()->registerObject("sankore", mpSankoreAPI);
|
mpView->page()->webChannel()->registerObject("saicore", mpSaiCoreAPI);
|
||||||
UBWebController::injectScripts(mpView);
|
UBWebController::injectScripts(mpView);
|
||||||
|
|
||||||
mpLayout->addWidget(mpView);
|
mpLayout->addWidget(mpView);
|
||||||
@ -800,10 +800,10 @@ UBFeaturesWebView::UBFeaturesWebView(QWidget* parent, const char* name):QWidget(
|
|||||||
|
|
||||||
UBFeaturesWebView::~UBFeaturesWebView()
|
UBFeaturesWebView::~UBFeaturesWebView()
|
||||||
{
|
{
|
||||||
if( NULL != mpSankoreAPI )
|
if( NULL != mpSaiCoreAPI )
|
||||||
{
|
{
|
||||||
delete mpSankoreAPI;
|
delete mpSaiCoreAPI;
|
||||||
mpSankoreAPI = NULL;
|
mpSaiCoreAPI = NULL;
|
||||||
}
|
}
|
||||||
if( NULL != mpView )
|
if( NULL != mpView )
|
||||||
{
|
{
|
||||||
@ -1156,7 +1156,7 @@ QMimeData* UBFeaturesModel::mimeData(const QModelIndexList &indexes) const
|
|||||||
|
|
||||||
mimeData->setUrls(urlList);
|
mimeData->setUrls(urlList);
|
||||||
mimeData->setFeatures(featuresList);
|
mimeData->setFeatures(featuresList);
|
||||||
mimeData->setData(mimeSankoreFeatureTypes, typeData);
|
mimeData->setData(mimeSaiCoreFeatureTypes, typeData);
|
||||||
|
|
||||||
return mimeData;
|
return mimeData;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -300,7 +300,7 @@ public:
|
|||||||
private:
|
private:
|
||||||
QWebEngineView* mpView;
|
QWebEngineView* mpView;
|
||||||
QVBoxLayout* mpLayout;
|
QVBoxLayout* mpLayout;
|
||||||
UBWidgetUniboardAPI* mpSankoreAPI;
|
UBWidgetUniboardAPI* mpSaiCoreAPI;
|
||||||
};
|
};
|
||||||
|
|
||||||
class UBFeatureProperties : public QWidget
|
class UBFeatureProperties : public QWidget
|
||||||
|
|||||||
@ -40,10 +40,10 @@ UBStartupHintsPalette::UBStartupHintsPalette(QWidget *parent) :
|
|||||||
setLayout(mLayout);
|
setLayout(mLayout);
|
||||||
QString url = UBSettings::settings()->applicationStartupHintsDirectory() + "/index.html";
|
QString url = UBSettings::settings()->applicationStartupHintsDirectory() + "/index.html";
|
||||||
mpWebView = new UBWebEngineView(this);
|
mpWebView = new UBWebEngineView(this);
|
||||||
mpSankoreAPI = new UBWidgetUniboardAPI(0);
|
mpSaiCoreAPI = new UBWidgetUniboardAPI(0);
|
||||||
QWebChannel* channel = new QWebChannel(this);
|
QWebChannel* channel = new QWebChannel(this);
|
||||||
mpWebView->page()->setWebChannel(channel);
|
mpWebView->page()->setWebChannel(channel);
|
||||||
mpWebView->page()->webChannel()->registerObject("sankore", mpSankoreAPI);
|
mpWebView->page()->webChannel()->registerObject("saicore", mpSaiCoreAPI);
|
||||||
UBWebController::injectScripts(mpWebView);
|
UBWebController::injectScripts(mpWebView);
|
||||||
if (QFile::exists(url))
|
if (QFile::exists(url))
|
||||||
mpWebView->setUrl(QUrl::fromLocalFile(url));
|
mpWebView->setUrl(QUrl::fromLocalFile(url));
|
||||||
|
|||||||
@ -48,7 +48,7 @@ private:
|
|||||||
QCheckBox* mShowNextTime;
|
QCheckBox* mShowNextTime;
|
||||||
QVBoxLayout* mLayout;
|
QVBoxLayout* mLayout;
|
||||||
QHBoxLayout* mButtonLayout;
|
QHBoxLayout* mButtonLayout;
|
||||||
UBWidgetUniboardAPI *mpSankoreAPI;
|
UBWidgetUniboardAPI *mpSaiCoreAPI;
|
||||||
UBWebEngineView* mpWebView;
|
UBWebEngineView* mpWebView;
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
|
|||||||
@ -222,7 +222,7 @@ void UBToolWidget::registerAPI()
|
|||||||
mWebView->page()->setWebChannel(channel);
|
mWebView->page()->setWebChannel(channel);
|
||||||
mUniboardAPI = new UBWidgetUniboardAPI(UBApplication::boardController->activeScene(), mToolWidget);
|
mUniboardAPI = new UBWidgetUniboardAPI(UBApplication::boardController->activeScene(), mToolWidget);
|
||||||
|
|
||||||
channel->registerObject("sankore", mUniboardAPI);
|
channel->registerObject("saicore", mUniboardAPI);
|
||||||
|
|
||||||
UBGraphicsW3CWidgetItem *graphicsW3cWidgetItem = dynamic_cast<UBGraphicsW3CWidgetItem*>(mToolWidget);
|
UBGraphicsW3CWidgetItem *graphicsW3cWidgetItem = dynamic_cast<UBGraphicsW3CWidgetItem*>(mToolWidget);
|
||||||
if (graphicsW3cWidgetItem)
|
if (graphicsW3cWidgetItem)
|
||||||
|
|||||||
@ -308,8 +308,8 @@ void UBEmbedController::generateConfig(int pWidth, int pHeight, const QString& p
|
|||||||
#endif
|
#endif
|
||||||
out << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" << '\n';
|
out << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" << '\n';
|
||||||
out << "<widget xmlns=\"http://www.w3.org/ns/widgets\"" << '\n';
|
out << "<widget xmlns=\"http://www.w3.org/ns/widgets\"" << '\n';
|
||||||
out << " xmlns:ub=\"http://uniboard.mnemis.com/widgets\"" << '\n';
|
out << " xmlns:ub=\"https://saicore.ru/widgets\"" << '\n';
|
||||||
out << " id=\"http://uniboard.mnemis.com/" << mTrapFlashUi->widgetNameLineEdit->text() << "\"" <<'\n';
|
out << " id=\"https://saicore.ru/" << mTrapFlashUi->widgetNameLineEdit->text() << "\"" <<'\n';
|
||||||
|
|
||||||
out << " version=\"2.0\"" << '\n';
|
out << " version=\"2.0\"" << '\n';
|
||||||
out << " width=\"" << pWidth << "\"" << '\n';
|
out << " width=\"" << pWidth << "\"" << '\n';
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user