1 files changed, 34 insertions, 19 deletions

diff --git a/src/gpg/result_analyse/SignResultAnalyse.cpp b/src/gpg/result_analyse/SignResultAnalyse.cpp
index fac598d5..10d76678 100644
--- a/src/gpg/result_analyse/SignResultAnalyse.cpp
+++ b/src/gpg/result_analyse/SignResultAnalyse.cpp
@@ -24,58 +24,73 @@
 
 #include "gpg/result_analyse/SignResultAnalyse.h"
 
-SignResultAnalyse::SignResultAnalyse(gpgme_error_t error, gpgme_sign_result_t result) {
+SignResultAnalyse::SignResultAnalyse(GpgME::GpgContext *ctx, gpgme_error_t error, gpgme_sign_result_t result) {
 
-    stream << "# Sign Report: " << Qt::endl
-        << "-----" << Qt::endl;
-    stream << "Status: " << gpgme_strerror(error) << Qt::endl << Qt::endl;
+    qDebug() << "Start Sign Result Analyse";
 
-    if(gpg_err_code(error) != GPG_ERR_NO_ERROR) {
+    stream << tr("[#] Sign Operation ");
+
+    if (gpgme_err_code(error) == GPG_ERR_NO_ERROR)
+        stream << tr("[Success]") << Qt::endl;
+    else {
+        stream << tr("[Failed] ") << gpgme_strerror(error) << Qt::endl;
         setStatus(-1);
     }
 
-    if(result != nullptr) {
+    if (result != nullptr && (result->signatures != nullptr || result->invalid_signers != nullptr)) {
 
+        qDebug() << "Sign Result Analyse Getting Result";
+        stream << "------------>" << Qt::endl;
         auto new_sign = result->signatures;
 
         while (new_sign != nullptr) {
-            stream << "> A New Signature: " << Qt::endl;
+            stream << tr("[>] New Signature: ") << Qt::endl;
+
+            qDebug() << "Signers Fingerprint: " << new_sign->fpr;
 
-            stream << "Sign mode: ";
+            stream << tr("    Sign Mode: ");
             if (new_sign->type == GPGME_SIG_MODE_NORMAL)
-                stream << "Normal";
+                stream << tr("Normal");
             else if (new_sign->type == GPGME_SIG_MODE_CLEAR)
-                stream << "Clear";
+                stream << tr("Clear");
             else if (new_sign->type == GPGME_SIG_MODE_DETACH)
-                stream << "Detach";
+                stream << tr("Detach");
 
             stream << Qt::endl;
 
-            stream << "Public key algo: " << gpgme_pubkey_algo_name(new_sign->pubkey_algo) << Qt::endl;
-            stream << "Hash algo: " << gpgme_hash_algo_name(new_sign->hash_algo) << Qt::endl;
-            stream << "Date of signature: " << QDateTime::fromTime_t(new_sign->timestamp).toString() << Qt::endl;
+            GpgKey singerKey = ctx->getKeyByFpr(new_sign->fpr);
+            if(singerKey.good) {
+                stream << tr("    Signer: ") << singerKey.uids.first().uid << Qt::endl;
+            } else {
+                stream << tr("    Signer: ") << tr("<unknown>") << Qt::endl;
+            }
+            stream << tr("    Public Key Algo: ") << gpgme_pubkey_algo_name(new_sign->pubkey_algo) << Qt::endl;
+            stream << tr("    Hash Algo: ") << gpgme_hash_algo_name(new_sign->hash_algo) << Qt::endl;
+            stream << tr("    Date & Time: ") << QDateTime::fromTime_t(new_sign->timestamp).toString() << Qt::endl;
 
             stream << Qt::endl;
 
             new_sign = new_sign->next;
         }
 
+        qDebug() << "Sign Result Analyse Getting Invalid Signer";
+
         auto invalid_signer = result->invalid_signers;
 
         if (invalid_signer != nullptr)
-            stream << "Invalid Signers: " << Qt::endl;
+            stream << tr("Invalid Signers: ") << Qt::endl;
 
         while (invalid_signer != nullptr) {
             setStatus(0);
-            stream << "Fingerprint: " << invalid_signer->fpr << Qt::endl;
-            stream << "Reason: " << gpgme_strerror(invalid_signer->reason) << Qt::endl;
+            stream << tr("[>] Signer: ") << Qt::endl;
+            stream << tr("      Fingerprint: ") << invalid_signer->fpr << Qt::endl;
+            stream << tr("      Reason: ") << gpgme_strerror(invalid_signer->reason) << Qt::endl;
             stream << Qt::endl;
 
             invalid_signer = invalid_signer->next;
         }
+        stream << "<------------" << Qt::endl;
 
     }
 
-    stream << "-----" << Qt::endl << Qt::endl;
-
 }