Merge pull request #14 from saturneric/develop

Version 1.2.2

Author: saturneric

CMakeLists.txt

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

README.md

@@ -13,22 +13,20 @@ GpgFrontend is a Powerful, Easy-to-Use, Compact, Cross-Platform, and
 Installation-Free [OpenPGP](https://www.openpgp.org/)
 Crypto Tool.
 
-By using GpgFrontend, you can quickly encrypt and decrypt text or files. Or at the same time as the above
-operations, you can add your own signature to let others know that this document or this paragraph of text was
-issued by you. Please **take the initiative to protect privacy in your own hands**, instead of relying on servers and
-algorithms provided by large companies.
+By using GpgFrontend, you can quickly encrypt and decrypt text or files. Or at the same time as the above operations,
+you can add your own signature to let others know that this document or this paragraph of text was issued by you.
+Please **take the initiative to protect privacy in your own hands**, instead of relying on servers and algorithms
+provided by large companies.
 
 **Notice:** GpgFrontend does not provide an embedded [gnupg](https://gnupg.org/) binary library and needs to be
 installed by the user. **This is to ensure safety and avoid code or binary files involved in encryption and decryption
 being implanted in the backdoor during the delivery process.**
 
 If you find this tool useful and promising, welcome to encourage me through STAR this project. Thanks!
 
-[>> Quick Start](#quick-start)
-
-[>> Code & Binary Security](https://gpgfrontend.pub/#/about/code-binary-verify)
-
-[>> 简体中文文档](https://github.com/saturneric/GpgFrontend/blob/main/README_CN.md)
+[>> Quick Start <<](#quick-start) |
+[>> Code & Binary Security <<](https://gpgfrontend.pub/#/about/code-binary-verify) |
+[>> 简中README <<](https://github.com/saturneric/GpgFrontend/blob/main/README_CN.md)
 
 <div align="center">
 <img width="640" src="https://github.com/saturneric/Blob/blob/master/screenshots/main_mac.jpg?raw=true" alt="macOS Screenshot"/>
@@ -56,6 +54,7 @@ If you find this tool useful and promising, welcome to encourage me through STAR
 - [Document](#document)
 - [Purpose](#purpose)
 - [Build](#build)
+- [Languages Support](#languages-support)
 - [Contributing & Bugs Report](#contributing--bugs-report)
     - [Contract](#contract)
     - [Maintainers](#maintainers)
@@ -66,9 +65,7 @@ If you find this tool useful and promising, welcome to encourage me through STAR
 - Can run on **Windows, Linux and macOS**.
 - Open source, free, no need to install.
 - Just double-click, and then you can use it freely.
-- Supports multiple languages.
-    - If you are interested, you can help
-      me [translate the interface](https://gpgfrontend.pub/#/translate-interface).
+- Supports multiple [languages](#languages-support).
 
 ## Usage
 
@@ -94,8 +91,7 @@ What about files?
 
 ### More Helpful Operation
 
-Read the animated pictures in the [Document](https://gpgfrontend.pub/#/quick-start) to learn more
-awesome operations.
+Read the animated pictures in the [Document](https://gpgfrontend.pub/#/quick-start) to learn more awesome operations.
 
 ### How to Run it
 
@@ -120,6 +116,8 @@ awesome operations.
 
 #### Debian/Ubuntu/CentOS
 
+[![!AppImage](https://docs.appimage.org/_images/download-appimage-banner.svg)](https://github.com/saturneric/GpgFrontend/releases/latest)
+
 0. Install gnupg (If you have already followed please skip)
     - For Debian/Ubuntu
       ```shell
@@ -159,6 +157,24 @@ The GpgFrontend project is as open source, and it also insists on using open sou
 The tutorial for building the software will be released shortly. Before the relevant documents are released, you can
 refer to the project-related Github Action file if you know it.
 
+## Languages Support
+
+The supported languages are listed here. Some languages use machine translation and have not been verified. If you want
+to join translation and verification work, please refer to
+the [translate the interface](https://gpgfrontend.pub/#/translate-interface).
+
+Notice: The verification may not be complete and rigorous.
+
+|  Language |  English   | 简体中文  | français  | Французский  | Español  | 
+|  ----  | ----  | ----  | ----  | ----  | ----  |
+| Support  | Support | 支持 | Etre prêt | ожидать | apoyar |
+| Verification  | Origin | 不完全 | Jamais |Никогда | Nunca |
+
+|  Language |  日本語   | 繁體中文  | عربى  | português  |
+|  ----  | ----  | ----  | ----  | ----  | 
+| Support  | 未だに | 尚未 | ليس بعد | Ainda não |
+| Verification  |  |  |  | |
+
 ## Contract
 
 If you want to contact me individually, you can email [[email protected]](mailto:[email protected]).

include/gpg/GpgContext.h

@@ -71,7 +71,7 @@ namespace GpgME {
 
         ~GpgContext() override;
 
-        bool isGood() const;
+        [[nodiscard]] bool isGood() const;
 
         GpgImportInformation importKey(QByteArray inBuffer);
 
@@ -115,7 +115,7 @@ namespace GpgME {
 
         gpg_error_t
         sign(const QVector<GpgKey> &keys, const QByteArray &inBuffer, QByteArray *outBuffer, bool detached = false,
-             gpgme_sign_result_t* result = nullptr);
+             gpgme_sign_result_t *result = nullptr);
 
         bool addUID(const GpgKey &key, const GpgUID &uid);
 
@@ -125,6 +125,8 @@ namespace GpgME {
 
         bool setExpire(const GpgKey &key, const GpgSubKey *subkey, QDateTime *expires);
 
+        QProcess * generateRevokeCert(const GpgKey &key, const QString &outputFileName);
+
         static bool checkIfKeyCanSign(const GpgKey &key);
 
         static bool checkIfKeyCanCert(const GpgKey &key);
@@ -133,6 +135,7 @@ namespace GpgME {
 
         static bool checkIfKeyCanEncr(const GpgKey &key);
 
+
         /**
          * @details If text contains PGP-message, put a linebreak before the message,
          * so that gpgme can decrypt correctly
@@ -143,7 +146,7 @@ namespace GpgME {
 
         GpgKey getKeyByFpr(const QString &fpr);
 
-        const GpgKey & getKeyById(const QString &id);
+        const GpgKey &getKeyById(const QString &id);
 
         static QString gpgErrString(gpgme_error_t err);
 
@@ -173,7 +176,7 @@ namespace GpgME {
 
         void slotRefreshKeyList();
 
-        void slotUpdateKeyList(const QString& key_id);
+        void slotUpdateKeyList(const QString &key_id);
 
     private:
         gpgme_ctx_t mCtx{};
@@ -204,11 +207,11 @@ namespace GpgME {
                                  const char *passphrase_info,
                                  int last_was_bad, int fd);
 
-        void executeGpgCommand(const QStringList &arguments,
-                               QByteArray *stdOut,
-                               QByteArray *stdErr);
+        QProcess * executeGpgCommand(const QStringList &arguments,
+                                     QByteArray *stdOut,
+                                     QByteArray *stdErr, const std::function<void(QProcess *)> &interactFunc);
 
-        QString gpgBin;
+        QString gpgExec;
         QString gpgKeys;
     };
 } // namespace GpgME

include/ui/keypair_details/KeyPairDetailTab.h

@@ -36,10 +36,10 @@ class KeyPairDetailTab : public QWidget {
 Q_OBJECT
 
     /**
- * @details Return QString with a space inserted at every fourth character
- *
- * @param fingerprint The fingerprint to be beautified
- */
+     * @details Return QString with a space inserted at every fourth character
+     *
+     * @param fingerprint The fingerprint to be beautified
+     */
     static QString beautifyFingerprint(QString fingerprint);
 
     void createKeyServerOperaMenu();
@@ -64,6 +64,8 @@ private slots:
 
     void slotUpdateKeyToServer();
 
+    void slotGenRevokeCert();
+
 private:
 
     QString *keyid; /** The id of the key the details should be shown for */

include/ui/widgets/FilePage.h

@@ -57,13 +57,18 @@ private slots:
 
     void onCustomContextMenu(const QPoint &point);
 
+protected:
+
+    void keyPressEvent(QKeyEvent *event) override;
+
 
 private:
 
     QFileSystemModel *dirModel;
     QTreeView *dirTreeView;
     QLineEdit *pathEdit;
     QString mPath;
+    QString selectedPath;
 
     QPushButton *upLevelButton;
     QPushButton *goPathButton;