Compare commits

..

2 Commits
v1.0.0 ... main

24 changed files with 135 additions and 147 deletions

View File

@ -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
* l'Education Numérique en Afrique (GIP ENA)
* SaiCore is proprietary software: you can NOT redistribute it and/or modify
* it without the express written permission of ООО «КАРУМА».
*
* This file is part of OpenBoard.
*
* 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/>.
* SaiCore is distributed under a proprietary EULA license.
* See the LICENSE file for details, or contact support@saicore.ru
*/

View File

@ -1,27 +1,13 @@
/*
* Copyright (C) 2015-2022 Département de l'Instruction Publique (DIP-SEM)
*
* 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)
* Copyright (C) 2025-2026 ООО «КАРУМА»
*
* This file is part of SaiCore.
*
* SaiCore 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).
* SaiCore is proprietary software: you can NOT redistribute it and/or modify
* it without the express written permission of ООО «КАРУМА».
*
* SaiCore 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 SaiCore. If not, see <http://www.gnu.org/licenses/>.
* SaiCore is distributed under a proprietary EULA license.
* See the LICENSE file for details, or contact support@saicore.ru
*/

View File

@ -1,27 +1,13 @@
/*
* Copyright (C) 2015-2022 Département de l'Instruction Publique (DIP-SEM)
*
* 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)
* Copyright (C) 2025-2026 ООО «КАРУМА»
*
* This file is part of SaiCore.
*
* SaiCore 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).
* SaiCore is proprietary software: you can NOT redistribute it and/or modify
* it without the express written permission of ООО «КАРУМА».
*
* SaiCore 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 SaiCore. If not, see <http://www.gnu.org/licenses/>.
* SaiCore is distributed under a proprietary EULA license.
* See the LICENSE file for details, or contact support@saicore.ru
*/

View File

@ -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
* 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).
* SaiCore is proprietary software: you can NOT redistribute it and/or modify
* it without the express written permission of ООО «КАРУМА».
*
* Open-Sankoré 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 Open-Sankoré. If not, see <http://www.gnu.org/licenses/>.
* SaiCore is distributed under a proprietary EULA license.
* See the LICENSE file for details, or contact support@saicore.ru
*/

View File

@ -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
* 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).
* SaiCore is proprietary software: you can NOT redistribute it and/or modify
* it without the express written permission of ООО «КАРУМА».
*
* Open-Sankoré 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 Open-Sankoré. If not, see <http://www.gnu.org/licenses/>.
* SaiCore is distributed under a proprietary EULA license.
* See the LICENSE file for details, or contact support@saicore.ru
*/

View File

@ -1,27 +1,13 @@
/*
* Copyright (C) 2015-2022 Département de l'Instruction Publique (DIP-SEM)
*
* 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)
* Copyright (C) 2025-2026 ООО «КАРУМА»
*
* This file is part of SaiCore.
*
* SaiCore 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).
* SaiCore is proprietary software: you can NOT redistribute it and/or modify
* it without the express written permission of ООО «КАРУМА».
*
* SaiCore 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 SaiCore. If not, see <http://www.gnu.org/licenses/>.
* SaiCore is distributed under a proprietary EULA license.
* See the LICENSE file for details, or contact support@saicore.ru
*/

1
release.json Normal file
View 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}

View File

@ -3227,9 +3227,9 @@ hr { height: 1px; border-width: 0; }
&lt;p style=&quot;-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;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Cantarell'; font-size:10pt;&quot;&gt;SaiCore — программное обеспечение для интерактивных панелей. © 2026 SaiCore. Все права защищены.&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot;-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;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Cantarell'; font-size:10pt;&quot;&gt;SaiCore основано на OpenBoard. OpenBoard является производным от Open-Sankoré. Open-Sankoré © 2010-2015 GIP ENA. Все права защищены.&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Cantarell'; font-size:10pt;&quot;&gt;SaiCore разработано ООО «КАРУМА». Все права защищены.&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot;-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;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Cantarell'; font-size:10pt;&quot;&gt;SaiCore — свободное программное обеспечение: вы можете распространять и изменять его на условиях GNU General Public License версии 3, опубликованной Free Software Foundation. Исходный код доступен на &lt;/span&gt;&lt;a href=&quot;https://saicore.ru&quot;&gt;&lt;span style=&quot; font-family:'Cantarell'; font-size:10pt; text-decoration: underline; color:#0000ff;&quot;&gt;saicore.ru&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-family:'Cantarell'; font-size:10pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Cantarell'; font-size:10pt;&quot;&gt;SaiCore — проприетарное программное обеспечение ООО «КАРУМА». Использование без лицензионного ключа допускается только в течение пробного периода (30 дней). Подробнее: &lt;/span&gt;&lt;a href=&quot;https://saicore.ru&quot;&gt;&lt;span style=&quot; font-family:'Cantarell'; font-size:10pt; text-decoration: underline; color:#0000ff;&quot;&gt;saicore.ru&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-family:'Cantarell'; font-size:10pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot;-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;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Cantarell'; font-size:10pt;&quot;&gt;Контактная информация:&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;https://saicore.ru&quot;&gt;&lt;span style=&quot; font-family:'Cantarell'; font-size:10pt; text-decoration: underline; color:#0000ff;&quot;&gt;saicore.ru&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</string>

View File

@ -76,7 +76,7 @@ const QString UBSvgSubsetAdaptor::sFontSizePrefix = "font-size:";
const QString UBSvgSubsetAdaptor::sPixelUnit = "px";
const QString UBSvgSubsetAdaptor::sFontWeightPrefix = "font-weight:";
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 tGroup = "group";
@ -307,7 +307,7 @@ QUuid UBSvgSubsetAdaptor::sceneUuid(std::shared_ptr<UBDocumentProxy> proxy, cons
{
auto svgSceneUuid = xml.attributes().value(UBSettings::uniboardDocumentNamespaceUri, "uuid");
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())
uuid = QUuid(svgSceneUuid.toString());

View File

@ -67,10 +67,10 @@ UBMainWindow* UBApplication::mainWindow = 0;
bool UBApplication::isClosing = false;
const QString UBApplication::mimeTypeUniboardDocument = QString("application/vnd.mnemis-uniboard-document");
const QString UBApplication::mimeTypeUniboardPage = QString("application/vnd.mnemis-uniboard-page");
const QString UBApplication::mimeTypeUniboardPageItem = QString("application/vnd.mnemis-uniboard-page-item");
const QString UBApplication::mimeTypeUniboardPageThumbnail = QString("application/vnd.mnemis-uniboard-thumbnail");
const QString UBApplication::mimeTypeUniboardDocument = QString("application/vnd.saicore-document");
const QString UBApplication::mimeTypeUniboardPage = QString("application/vnd.saicore-page");
const QString UBApplication::mimeTypeUniboardPageItem = QString("application/vnd.saicore-page-item");
const QString UBApplication::mimeTypeUniboardPageThumbnail = QString("application/vnd.saicore-thumbnail");
QString UBApplication::fileToOpen = "";
@ -179,7 +179,7 @@ UBApplication::~UBApplication()
staticMemoryCleaner = 0;
}
QString UBApplication::checkLanguageAvailabilityForSankore(QString &language)
QString UBApplication::checkLanguageAvailabilityForSaiCore(QString &language)
{
QStringList availableTranslations = UBPlatformUtils::availableTranslations();
@ -213,11 +213,11 @@ void UBApplication::setupTranslators(QStringList args)
QString language("");
if(!forcedLanguage.isEmpty())
language = checkLanguageAvailabilityForSankore(forcedLanguage);
language = checkLanguageAvailabilityForSaiCore(forcedLanguage);
if(language.isEmpty()){
QString systemLanguage = UBPlatformUtils::systemLanguage();
language = checkLanguageAvailabilityForSankore(systemLanguage);
language = checkLanguageAvailabilityForSaiCore(systemLanguage);
}
if(language.isEmpty()){

View File

@ -128,7 +128,7 @@ class UBApplication : public SingleApplication
void setupTranslators(QStringList args);
QList<QMenu*> mProtoMenus;
bool mIsVerbose;
QString checkLanguageAvailabilityForSankore(QString& language);
QString checkLanguageAvailabilityForSaiCore(QString& language);
protected:
/*
#if defined(Q_OS_MAC) && !defined(QT_MAC_USE_COCOA)

View File

@ -25,6 +25,7 @@
UBLicenseManager* UBLicenseManager::sInstance = nullptr;
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 GRACE_PERIOD_DAYS = 7;
@ -311,6 +312,8 @@ bool UBLicenseManager::activateLicense(const QString& key)
json["product"] = "SaiCore";
json["version"] = "1.0.0";
mPendingActivationKey = key.trimmed().toUpper();
QNetworkReply* reply = mNetworkManager->post(request, QJsonDocument(json).toJson(QJsonDocument::Compact));
connect(reply, &QNetworkReply::finished, this, [this, reply]() { onActivationReply(reply); });
@ -323,10 +326,11 @@ void UBLicenseManager::onActivationReply(QNetworkReply* reply)
if (reply->error() != QNetworkReply::NoError)
{
if (validateLicenseOffline(mLicenseKey))
if (validateLicenseOffline(mPendingActivationKey))
{
mLicenseKey = reply->property("key").toString();
mLicenseKey = mPendingActivationKey;
mLicenseExpiry = QDateTime::currentDateTime().addYears(1);
mGracePeriodStart = QDateTime();
mState = LicenseActive;
saveState();
emit licenseStateChanged(mState);
@ -354,6 +358,7 @@ void UBLicenseManager::onActivationReply(QNetworkReply* reply)
mLicenseKey = obj.value("license_key").toString();
mLicenseExpiry = expiry;
mGracePeriodStart = QDateTime();
mState = LicenseActive;
saveState();
emit licenseStateChanged(mState);
@ -389,3 +394,48 @@ void UBLicenseManager::deactivateLicense()
saveState();
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";
}
}

View File

@ -59,6 +59,7 @@ public:
bool activateLicense(const QString& key);
bool validateLicenseFormat(const QString& key) const;
bool validateLicenseOffline(const QString& key) const;
void checkForUpdates();
void startTrial();
void deactivateLicense();
@ -68,9 +69,11 @@ public:
signals:
void licenseStateChanged(LicenseState newState);
void activationResult(bool success, const QString& message);
void updateAvailable(const QString& version, const QString& downloadUrl, const QString& changelog);
private slots:
void onActivationReply(QNetworkReply* reply);
void onUpdateCheckReply(QNetworkReply* reply);
private:
UBLicenseManager(QObject* parent = nullptr);
@ -84,6 +87,7 @@ private:
QDateTime mTrialStart;
QDateTime mLicenseExpiry;
QDateTime mGracePeriodStart;
QString mPendingActivationKey;
QNetworkAccessManager* mNetworkManager;
static const int GRACE_PERIOD_DAYS = 7;

View File

@ -51,8 +51,8 @@ QString UBSettings::documentDate = QString("date");
QString UBSettings::trashedDocumentGroupNamePrefix = QString("_Trash:");
QString UBSettings::uniboardDocumentNamespaceUri = "http://uniboard.mnemis.com/document";
QString UBSettings::uniboardApplicationNamespaceUri = "http://uniboard.mnemis.com/application";
QString UBSettings::uniboardDocumentNamespaceUri = "https://saicore.ru/document";
QString UBSettings::uniboardApplicationNamespaceUri = "https://saicore.ru/application";
QString UBSettings::undoCommandTransactionName = "UndoTransaction";

View File

@ -222,6 +222,13 @@ int main(int argc, char *argv[])
<< "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;
result = app.exec(fileToOpen);
}

View File

@ -869,7 +869,7 @@ void UBGraphicsWidgetItem::registerAPI()
if (!mUniboardAPI)
{
mUniboardAPI = new UBWidgetUniboardAPI(scene(), this);
mWebEngineView->page()->webChannel()->registerObject("sankore", mUniboardAPI);
mWebEngineView->page()->webChannel()->registerObject("saicore", mUniboardAPI);
}
else
{
@ -1354,8 +1354,8 @@ QString UBGraphicsW3CWidgetItem::createHtmlWrapperInDir(const QString& html, con
#endif
outConfig << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" << '\n';
outConfig << "<widget xmlns=\"http://www.w3.org/ns/widgets\"" << '\n';
outConfig << " xmlns:ub=\"http://uniboard.mnemis.com/widgets\"" << '\n';
outConfig << " id=\"http://uniboard.mnemis.com/" << pName << "\"" <<'\n';
outConfig << " xmlns:ub=\"https://saicore.ru/widgets\"" << '\n';
outConfig << " id=\"https://saicore.ru/" << pName << "\"" <<'\n';
outConfig << " version=\"2.0\"" << '\n';
outConfig << " width=\"" << sizeHint.width() << "\"" << '\n';

View File

@ -115,9 +115,9 @@ QStringList UBPlatformUtils::availableTranslations()
{
QString translationsPath = applicationResourcesDirectory() + "/" + "i18n" + "/";
QStringList translationsList = UBFileSystemUtils::allFiles(translationsPath);
static const QRegularExpression sankoreTranslationFiles("(.*)SaiCore_(.*).qm");
translationsList = translationsList.filter(sankoreTranslationFiles);
return translationsList.replaceInStrings(sankoreTranslationFiles, "\\2");
static const QRegularExpression saicoreTranslationFiles("(.*)SaiCore_(.*).qm");
translationsList = translationsList.filter(saicoreTranslationFiles);
return translationsList.replaceInStrings(saicoreTranslationFiles, "\\2");
}
QString UBPlatformUtils::translationPath(QString pFilePrefix,QString pLanguage)

View File

@ -84,9 +84,9 @@ QStringList UBPlatformUtils::availableTranslations()
{
QString translationsPath = applicationResourcesDirectory() + "/" + "i18n" + "/";
QStringList translationsList = UBFileSystemUtils::allFiles(translationsPath);
static const QRegularExpression sankoreTranslationFiles("(.*)SaiCore_(.*).qm");
translationsList = translationsList.filter(sankoreTranslationFiles);
return translationsList.replaceInStrings(sankoreTranslationFiles, "\\2");
static const QRegularExpression saicoreTranslationFiles("(.*)SaiCore_(.*).qm");
translationsList = translationsList.filter(saicoreTranslationFiles);
return translationsList.replaceInStrings(saicoreTranslationFiles, "\\2");
}
QString UBPlatformUtils::translationPath(QString pFilePrefix,QString pLanguage)

View File

@ -32,7 +32,7 @@ const char *UBFeaturesWidget::objNameFeatureList = "FeatureList";
const QMargins FeatureListMargins(0, 0, 0, 30);
const int FeatureListBorderOffset = 10;
const char featureTypeSplitter = ':';
static const QString mimeSankoreFeatureTypes = "Sankore/featureTypes";
static const QString mimeSaiCoreFeatureTypes = "SaiCore/featureTypes";
UBFeaturesWidget::UBFeaturesWidget(QWidget *parent, const char *name)
: UBDockPaletteWidget(parent)
@ -777,7 +777,7 @@ void UBFeaturesProgressInfo::sendFeature(UBFeature pFeature)
UBFeaturesWebView::UBFeaturesWebView(QWidget* parent, const char* name):QWidget(parent)
, mpView(NULL)
, mpLayout(NULL)
, mpSankoreAPI(NULL)
, mpSaiCoreAPI(NULL)
{
setObjectName(name);
@ -788,10 +788,10 @@ UBFeaturesWebView::UBFeaturesWebView(QWidget* parent, const char* name):QWidget(
mpView = new QWebEngineView(this);
mpView->setObjectName("SearchEngineView");
mpSankoreAPI = new UBWidgetUniboardAPI(UBApplication::boardController->activeScene());
mpSaiCoreAPI = new UBWidgetUniboardAPI(UBApplication::boardController->activeScene());
QWebChannel* channel = new QWebChannel(this);
mpView->page()->setWebChannel(channel);
mpView->page()->webChannel()->registerObject("sankore", mpSankoreAPI);
mpView->page()->webChannel()->registerObject("saicore", mpSaiCoreAPI);
UBWebController::injectScripts(mpView);
mpLayout->addWidget(mpView);
@ -800,10 +800,10 @@ UBFeaturesWebView::UBFeaturesWebView(QWidget* parent, const char* name):QWidget(
UBFeaturesWebView::~UBFeaturesWebView()
{
if( NULL != mpSankoreAPI )
if( NULL != mpSaiCoreAPI )
{
delete mpSankoreAPI;
mpSankoreAPI = NULL;
delete mpSaiCoreAPI;
mpSaiCoreAPI = NULL;
}
if( NULL != mpView )
{
@ -1156,7 +1156,7 @@ QMimeData* UBFeaturesModel::mimeData(const QModelIndexList &indexes) const
mimeData->setUrls(urlList);
mimeData->setFeatures(featuresList);
mimeData->setData(mimeSankoreFeatureTypes, typeData);
mimeData->setData(mimeSaiCoreFeatureTypes, typeData);
return mimeData;
}

View File

@ -300,7 +300,7 @@ public:
private:
QWebEngineView* mpView;
QVBoxLayout* mpLayout;
UBWidgetUniboardAPI* mpSankoreAPI;
UBWidgetUniboardAPI* mpSaiCoreAPI;
};
class UBFeatureProperties : public QWidget

View File

@ -40,10 +40,10 @@ UBStartupHintsPalette::UBStartupHintsPalette(QWidget *parent) :
setLayout(mLayout);
QString url = UBSettings::settings()->applicationStartupHintsDirectory() + "/index.html";
mpWebView = new UBWebEngineView(this);
mpSankoreAPI = new UBWidgetUniboardAPI(0);
mpSaiCoreAPI = new UBWidgetUniboardAPI(0);
QWebChannel* channel = new QWebChannel(this);
mpWebView->page()->setWebChannel(channel);
mpWebView->page()->webChannel()->registerObject("sankore", mpSankoreAPI);
mpWebView->page()->webChannel()->registerObject("saicore", mpSaiCoreAPI);
UBWebController::injectScripts(mpWebView);
if (QFile::exists(url))
mpWebView->setUrl(QUrl::fromLocalFile(url));

View File

@ -48,7 +48,7 @@ private:
QCheckBox* mShowNextTime;
QVBoxLayout* mLayout;
QHBoxLayout* mButtonLayout;
UBWidgetUniboardAPI *mpSankoreAPI;
UBWidgetUniboardAPI *mpSaiCoreAPI;
UBWebEngineView* mpWebView;
private slots:

View File

@ -222,7 +222,7 @@ void UBToolWidget::registerAPI()
mWebView->page()->setWebChannel(channel);
mUniboardAPI = new UBWidgetUniboardAPI(UBApplication::boardController->activeScene(), mToolWidget);
channel->registerObject("sankore", mUniboardAPI);
channel->registerObject("saicore", mUniboardAPI);
UBGraphicsW3CWidgetItem *graphicsW3cWidgetItem = dynamic_cast<UBGraphicsW3CWidgetItem*>(mToolWidget);
if (graphicsW3cWidgetItem)

View File

@ -308,8 +308,8 @@ void UBEmbedController::generateConfig(int pWidth, int pHeight, const QString& p
#endif
out << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" << '\n';
out << "<widget xmlns=\"http://www.w3.org/ns/widgets\"" << '\n';
out << " xmlns:ub=\"http://uniboard.mnemis.com/widgets\"" << '\n';
out << " id=\"http://uniboard.mnemis.com/" << mTrapFlashUi->widgetNameLineEdit->text() << "\"" <<'\n';
out << " xmlns:ub=\"https://saicore.ru/widgets\"" << '\n';
out << " id=\"https://saicore.ru/" << mTrapFlashUi->widgetNameLineEdit->text() << "\"" <<'\n';
out << " version=\"2.0\"" << '\n';
out << " width=\"" << pWidth << "\"" << '\n';