From 3c65d087eeee687ac01af2e80f3dd538f9a2c230 Mon Sep 17 00:00:00 2001 From: Saturneric Date: Sat, 2 Oct 2021 22:08:50 +0800 Subject: UI Framework Modified. --- src/ui/help/VersionCheckThread.cpp | 65 +++++++++++++++++++------------------- 1 file changed, 33 insertions(+), 32 deletions(-) (limited to 'src/ui/help/VersionCheckThread.cpp') diff --git a/src/ui/help/VersionCheckThread.cpp b/src/ui/help/VersionCheckThread.cpp index bf1bbeda..3204dadf 100644 --- a/src/ui/help/VersionCheckThread.cpp +++ b/src/ui/help/VersionCheckThread.cpp @@ -25,51 +25,52 @@ #include "ui/help/VersionCheckThread.h" #include "GpgFrontendBuildInfo.h" #include "rapidjson/document.h" -#include "rapidjson/writer.h" using namespace rapidjson; -void VersionCheckThread::run() { - qDebug() << "Start Version Thread to get latest version from Github"; +namespace GpgFrontend::UI { - auto currentVersion = "v" + QString::number(VERSION_MAJOR) + "." - + QString::number(VERSION_MINOR) + "." - + QString::number(VERSION_PATCH); +void VersionCheckThread::run() { + qDebug() << "Start Version Thread to get latest version from Github"; - while(mNetworkReply->isRunning()) { - QApplication::processEvents(); - } + auto currentVersion = "v" + QString::number(VERSION_MAJOR) + "." + + QString::number(VERSION_MINOR) + "." + + QString::number(VERSION_PATCH); - if(mNetworkReply->error() != QNetworkReply::NoError) { - qDebug() << "VersionCheckThread Found Network Error"; - return; - } + while (mNetworkReply->isRunning()) { + QApplication::processEvents(); + } - QByteArray bytes = mNetworkReply->readAll(); + if (mNetworkReply->error() != QNetworkReply::NoError) { + qDebug() << "VersionCheckThread Found Network Error"; + return; + } - Document d; - d.Parse(bytes.constData()); + QByteArray bytes = mNetworkReply->readAll(); - QString latestVersion = d["tag_name"].GetString(); + Document d; + d.Parse(bytes.constData()); - qDebug() << "Latest Version From Github" << latestVersion; + QString latestVersion = d["tag_name"].GetString(); - QRegularExpression re("^[vV](\\d+\\.)?(\\d+\\.)?(\\*|\\d+)"); - QRegularExpressionMatch match = re.match(latestVersion); - if (match.hasMatch()) { - latestVersion = match.captured(0); // matched == "23 def" - qDebug() << "Latest Version Matched" << latestVersion; - } else { - latestVersion = currentVersion; - qDebug() << "Latest Version Unknown" << latestVersion; - } + qDebug() << "Latest Version From Github" << latestVersion; - if(latestVersion != currentVersion) { - emit upgradeVersion(currentVersion, latestVersion); - } + QRegularExpression re("^[vV](\\d+\\.)?(\\d+\\.)?(\\*|\\d+)"); + QRegularExpressionMatch match = re.match(latestVersion); + if (match.hasMatch()) { + latestVersion = match.captured(0); // matched == "23 def" + qDebug() << "Latest Version Matched" << latestVersion; + } else { + latestVersion = currentVersion; + qDebug() << "Latest Version Unknown" << latestVersion; + } + if (latestVersion != currentVersion) { + emit upgradeVersion(currentVersion, latestVersion); + } } -VersionCheckThread::VersionCheckThread(QNetworkReply *networkReply):mNetworkReply(networkReply) { +VersionCheckThread::VersionCheckThread(QNetworkReply* networkReply) + : mNetworkReply(networkReply) {} -} +} // namespace GpgFrontend::UI -- cgit v1.2.3 From 1ae8663decb3163b92d32b80cefb46eb678a5af6 Mon Sep 17 00:00:00 2001 From: Saturneric Date: Thu, 2 Dec 2021 01:25:46 +0800 Subject: Add i18n Support 1. Remove Qt Linguist. 2. Add GNU gettext libraries. 3. Modified source codes to meet with i18n support. --- src/ui/help/VersionCheckThread.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/ui/help/VersionCheckThread.cpp') diff --git a/src/ui/help/VersionCheckThread.cpp b/src/ui/help/VersionCheckThread.cpp index 3204dadf..a35583f4 100644 --- a/src/ui/help/VersionCheckThread.cpp +++ b/src/ui/help/VersionCheckThread.cpp @@ -1,7 +1,7 @@ /** - * This file is part of GPGFrontend. + * This file is part of GpgFrontend. * - * GPGFrontend is free software: you can redistribute it and/or modify + * GpgFrontend 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, either version 3 of the License, or * (at your option) any later version. @@ -23,6 +23,7 @@ */ #include "ui/help/VersionCheckThread.h" + #include "GpgFrontendBuildInfo.h" #include "rapidjson/document.h" -- cgit v1.2.3 From 0d7cd30a97bfa3ed3ee9347cc8ad485a3bcbddee Mon Sep 17 00:00:00 2001 From: Saturneric Date: Thu, 2 Dec 2021 14:41:28 +0800 Subject: Modified & Improve 1. Modified Wizard. 2. Modified Stttings General Tab. 3. Improve Project Configuration. --- src/ui/help/VersionCheckThread.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/ui/help/VersionCheckThread.cpp') diff --git a/src/ui/help/VersionCheckThread.cpp b/src/ui/help/VersionCheckThread.cpp index a35583f4..44ef0bd1 100644 --- a/src/ui/help/VersionCheckThread.cpp +++ b/src/ui/help/VersionCheckThread.cpp @@ -32,7 +32,7 @@ using namespace rapidjson; namespace GpgFrontend::UI { void VersionCheckThread::run() { - qDebug() << "Start Version Thread to get latest version from Github"; + LOG(INFO) << "Start Version Thread to get latest version from Github"; auto currentVersion = "v" + QString::number(VERSION_MAJOR) + "." + QString::number(VERSION_MINOR) + "." + @@ -43,7 +43,7 @@ void VersionCheckThread::run() { } if (mNetworkReply->error() != QNetworkReply::NoError) { - qDebug() << "VersionCheckThread Found Network Error"; + LOG(ERROR) << "VersionCheckThread Found Network Error"; return; } @@ -54,16 +54,16 @@ void VersionCheckThread::run() { QString latestVersion = d["tag_name"].GetString(); - qDebug() << "Latest Version From Github" << latestVersion; + LOG(INFO) << "Latest Version From Github" << latestVersion.toStdString(); - QRegularExpression re("^[vV](\\d+\\.)?(\\d+\\.)?(\\*|\\d+)"); + QRegularExpression re(R"(^[vV](\d+\.)?(\d+\.)?(\*|\d+))"); QRegularExpressionMatch match = re.match(latestVersion); if (match.hasMatch()) { latestVersion = match.captured(0); // matched == "23 def" - qDebug() << "Latest Version Matched" << latestVersion; + LOG(INFO) << "Latest Version Matched" << latestVersion.toStdString(); } else { latestVersion = currentVersion; - qDebug() << "Latest Version Unknown" << latestVersion; + LOG(WARNING) << "Latest Version Unknown" << latestVersion.toStdString(); } if (latestVersion != currentVersion) { -- cgit v1.2.3 From 1e3f1d13a6fb1bfc8f24be83032df1e92350dbcc Mon Sep 17 00:00:00 2001 From: Saturneric Date: Fri, 3 Dec 2021 05:35:16 +0800 Subject: Fixed. 1. Fixed known issue in File Operations. --- src/ui/help/VersionCheckThread.cpp | 77 -------------------------------------- 1 file changed, 77 deletions(-) delete mode 100644 src/ui/help/VersionCheckThread.cpp (limited to 'src/ui/help/VersionCheckThread.cpp') diff --git a/src/ui/help/VersionCheckThread.cpp b/src/ui/help/VersionCheckThread.cpp deleted file mode 100644 index 44ef0bd1..00000000 --- a/src/ui/help/VersionCheckThread.cpp +++ /dev/null @@ -1,77 +0,0 @@ -/** - * This file is part of GpgFrontend. - * - * GpgFrontend 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, either version 3 of the License, or - * (at your option) any later version. - * - * Foobar 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 Foobar. If not, see . - * - * The initial version of the source code is inherited from gpg4usb-team. - * Their source code version also complies with GNU General Public License. - * - * The source code version of this software was modified and released - * by Saturneric starting on May 12, 2021. - * - */ - -#include "ui/help/VersionCheckThread.h" - -#include "GpgFrontendBuildInfo.h" -#include "rapidjson/document.h" - -using namespace rapidjson; - -namespace GpgFrontend::UI { - -void VersionCheckThread::run() { - LOG(INFO) << "Start Version Thread to get latest version from Github"; - - auto currentVersion = "v" + QString::number(VERSION_MAJOR) + "." + - QString::number(VERSION_MINOR) + "." + - QString::number(VERSION_PATCH); - - while (mNetworkReply->isRunning()) { - QApplication::processEvents(); - } - - if (mNetworkReply->error() != QNetworkReply::NoError) { - LOG(ERROR) << "VersionCheckThread Found Network Error"; - return; - } - - QByteArray bytes = mNetworkReply->readAll(); - - Document d; - d.Parse(bytes.constData()); - - QString latestVersion = d["tag_name"].GetString(); - - LOG(INFO) << "Latest Version From Github" << latestVersion.toStdString(); - - QRegularExpression re(R"(^[vV](\d+\.)?(\d+\.)?(\*|\d+))"); - QRegularExpressionMatch match = re.match(latestVersion); - if (match.hasMatch()) { - latestVersion = match.captured(0); // matched == "23 def" - LOG(INFO) << "Latest Version Matched" << latestVersion.toStdString(); - } else { - latestVersion = currentVersion; - LOG(WARNING) << "Latest Version Unknown" << latestVersion.toStdString(); - } - - if (latestVersion != currentVersion) { - emit upgradeVersion(currentVersion, latestVersion); - } -} - -VersionCheckThread::VersionCheckThread(QNetworkReply* networkReply) - : mNetworkReply(networkReply) {} - -} // namespace GpgFrontend::UI -- cgit v1.2.3