Merge pull request #10 from saturneric/develop

Develop Version 1.1.3

Author: saturneric

.gitignore

@@ -1,5 +1,6 @@
 # Project
 include/GpgFrontend.h
+include/GpgFrontendBuildInfo.h
 
 #CLion
 .idea/*

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.16)
 
-project(GpgFrontend VERSION 1.1.2 LANGUAGES CXX)
+project(GpgFrontend VERSION 1.1.3 LANGUAGES CXX)
 
 message(STATUS "GPGFrontend Build Configuration Started CMAKE Version ${CMAKE_VERSION}")
 

README.md

@@ -196,6 +196,8 @@ mingw-w64: http://mingw-w64.org/doku.php
 
 AppImage: https://appimage.org/
 
+rapidjson: https://github.com/Tencent/rapidjson
+
 Application
 Bundles: [Link](https://developer.apple.com/library/archive/documentation/CoreFoundation/Conceptual/CFBundles/BundleTypes/BundleTypes.html#//apple_ref/doc/uid/10000123i-CH101-SW1)
 

README_CN.md

@@ -179,6 +179,8 @@ mingw-w64: http://mingw-w64.org/doku.php
 
 AppImage: https://appimage.org/
 
+rapidjson: https://github.com/Tencent/rapidjson
+
 Application Bundles: [Link](!https://developer.apple.com/library/archive/documentation/CoreFoundation/Conceptual/CFBundles/BundleTypes/BundleTypes.html#//apple_ref/doc/uid/10000123i-CH101-SW1)
 
 本软件图标使用来自 [阿里巴巴矢量图标库](!https://www.iconfont.cn/) 的素材。免费库中的图标未注册为商标。不涉及版权问题。

include/GpgFrontend.h.in

@@ -1,3 +1,27 @@
+/**
+ * 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 <https://www.gnu.org/licenses/>.
+ *
+ * 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<[email protected]> starting on May 12, 2021.
+ *
+ */
+
 #ifndef GPGFRONTEND_H_IN
 #define GPGFRONTEND_H_IN
 
@@ -23,22 +47,6 @@
 #define RELEASE 0
 #define DEBUG 1
 
-#define PROJECT_NAME "@PROJECT_NAME@"
-#define BUILD_VERSION "@BUILD_VERSION@"
-#define GIT_VERSION "@GIT_VERSION@"
-#define OS_PLATFORM @OS_PLATFORM@
-
-#define BUILD_FLAG @BUILD_FLAG@
-
-#define VERSION_MAJOR @CMAKE_PROJECT_VERSION_MAJOR@
-#define VERSION_MINOR @CMAKE_PROJECT_VERSION_MINOR@
-#define VERSION_PATCH @CMAKE_PROJECT_VERSION_PATCH@
-
-#define BUILD_TIMESTAMP "@BUILD_TIMESTAMP@"
-
-#define GIT_BRANCH_NAME "@GIT_BRANCH_NAME@"
-#define GIT_COMMIT_HASH "@GIT_COMMIT_HASH@"
-
 #if OS_PLATFORM == MACOS && BUILD_FLAG == RELEASE
 # define RESOURCE_DIR(appDir) (appDir + "/../Resources/")
 #elif OS_PLATFORM == LINUX && BUILD_FLAG == RELEASE

include/GpgFrontendBuildInfo.h.in

@@ -0,0 +1,44 @@
+/**
+ * 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 <https://www.gnu.org/licenses/>.
+ *
+ * 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<[email protected]> starting on May 12, 2021.
+ *
+ */
+
+#ifndef GPGFRONTEND_BUILD_INFO_H_IN
+#define GPGFRONTEND_BUILD_INFO_H_IN
+
+#define VERSION_MAJOR @CMAKE_PROJECT_VERSION_MAJOR@
+#define VERSION_MINOR @CMAKE_PROJECT_VERSION_MINOR@
+#define VERSION_PATCH @CMAKE_PROJECT_VERSION_PATCH@
+
+#define GIT_BRANCH_NAME "@GIT_BRANCH_NAME@"
+#define GIT_COMMIT_HASH "@GIT_COMMIT_HASH@"
+
+#define PROJECT_NAME "@PROJECT_NAME@"
+#define BUILD_VERSION "@BUILD_VERSION@"
+#define GIT_VERSION "@GIT_VERSION@"
+#define OS_PLATFORM @OS_PLATFORM@
+
+#define BUILD_FLAG @BUILD_FLAG@
+
+#define BUILD_TIMESTAMP "@BUILD_TIMESTAMP@"
+
+#endif // GPGFRONTEND_BUILD_INFO_H_IN

include/MainWindow.h

@@ -31,7 +31,7 @@
 #include "ui/widgets/TextEdit.h"
 #include "ui/FileEncryptionDialog.h"
 #include "ui/SettingsDialog.h"
-#include "ui/AboutDialog.h"
+#include "ui/help/AboutDialog.h"
 #include "ui/widgets/InfoBoardWidget.h"
 #include "ui/FindWidget.h"
 #include "ui/Wizard.h"
@@ -216,6 +216,11 @@ private slots:
      */
     void slotAbout();
 
+    /**
+     * @details Open check-update-tab in about-dialog.
+     */
+    void slotCheckUpdate();
+
     /**
      * @details Open File Opera Tab
      */
@@ -258,6 +263,11 @@ private slots:
      */
     void slotSetRestartNeeded(bool needed);
 
+    /**
+     * @details called when need to upgrade.
+     */
+    void slotVersionUpgrade(const QString &currentVersion, const QString &latestVersion);
+
 private:
     /**
      * @details Create actions for the main-menu and the context-menu of the keylist.
@@ -363,6 +373,7 @@ private slots:
     QAction *zoomInAct; /** Action to zoom in */
     QAction *zoomOutAct; /** Action to zoom out */
     QAction *aboutAct; /** Action to open about dialog */
+    QAction *checkUpdateAct; /** Action to open about dialog */
     QAction *fileEncryptAct; /** Action to open dialog for encrypting file */
     QAction *fileDecryptAct; /** Action to open dialog for decrypting file */
     QAction *fileSignAct; /** Action to open dialog for signing file */
@@ -387,6 +398,8 @@ private slots:
     KeyMgmt *keyMgmt; /**< TODO */
     KeyServerImportDialog *importDialog; /**< TODO */
 
+    QNetworkAccessManager *networkAccessManager;
+
     bool attachmentDockCreated;
     bool restartNeeded;
 };