add import button for ever single missing key in verifydetailsdialog

git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@534 34ebc366-c3a9-4b3c-9f84-69acf7962910

3 files changed, 11 insertions, 69 deletions

diff --git a/gpg4usb.pro b/gpg4usb.pro
index e43c645..b755a1f 100644
--- a/gpg4usb.pro
+++ b/gpg4usb.pro
@@ -31,7 +31,8 @@ HEADERS += attachments.h \
     quitdialog.h \
     keyserverimportdialog.h \
     verifynotification.h \
-    verifydetailsdialog.h
+    verifydetailsdialog.h \
+    verifykeydetailbox.h
 SOURCES += attachments.cpp \
     context.cpp \
     gpgwin.cpp \
@@ -49,7 +50,8 @@ SOURCES += attachments.cpp \
     quitdialog.cpp \
     keyserverimportdialog.cpp \
     verifynotification.cpp \
-    verifydetailsdialog.cpp
+    verifydetailsdialog.cpp \
+    verifykeydetailbox.cpp
 RC_FILE = gpg4usb.rc
 
 # comment out line below for static building
diff --git a/verifydetailsdialog.cpp b/verifydetailsdialog.cpp
index accc2bf..0f6abf4 100644
--- a/verifydetailsdialog.cpp
+++ b/verifydetailsdialog.cpp
@@ -6,20 +6,20 @@ VerifyDetailsDialog::VerifyDetailsDialog(QWidget *parent, GpgME::Context* ctx, K
     this->mCtx = ctx;
     this->mKeyList = keyList;
 
-    QVBoxLayout* mVbox = new QVBoxLayout();
-
+    mVbox = new QVBoxLayout();
     QDateTime timestamp;
     timestamp.setTime_t(signature->timestamp);
 
     mVbox->addWidget(new QLabel(tr("Text was completly signed on %1 by:\n").arg(timestamp.toString(Qt::SystemLocaleShortDate))));
 
     while (signature) {
-        QGroupBox* sbox = addDetailBox(signature);
+        VerifyKeyDetailBox *sbox = new VerifyKeyDetailBox(this,mCtx,mKeyList,signature);
+        //QGroupBox* sbox = addDetailBox(signature);
         signature = signature->next;
         mVbox->addWidget(sbox);
     }
 
-    QDialogButtonBox* buttonBox = new QDialogButtonBox(QDialogButtonBox::Close);
+    buttonBox = new QDialogButtonBox(QDialogButtonBox::Close);
     connect(buttonBox, SIGNAL(rejected()), this, SLOT(close()));
 
     mVbox->addWidget(buttonBox);
@@ -31,65 +31,4 @@ VerifyDetailsDialog::VerifyDetailsDialog(QWidget *parent, GpgME::Context* ctx, K
     exec();
 }
 
-QGroupBox* VerifyDetailsDialog::addDetailBox( gpgme_signature_t signature ) {
-
-    QGridLayout *grid = new QGridLayout();
-
-    switch (gpg_err_code(signature->status))
-    {
-        case GPG_ERR_NO_PUBKEY:
-        {
-            //verifyStatus=VERIFY_ERROR_WARN;
-            //vn->addVerifyDetailLabel(tr("Key not present in keylist: ")+QString(signature->fpr),VERIFY_ERROR_WARN, false);
-            grid->addWidget(new QLabel(tr("Status:")), 0, 0);
-            grid->addWidget(new QLabel(tr("Fingerprint:")), 1, 0);
-            grid->addWidget(new QLabel("Key not present in keylist"), 0, 1);
-            grid->addWidget(new QLabel(signature->fpr), 1, 1);
-
-            break;
-        }
-        case GPG_ERR_NO_ERROR:
-        {
-            /*QString name = mKeyList->getKeyNameByFpr(signature->fpr);
-            QString email =mKeyList->getKeyEmailByFpr(signature->fpr);
-            vn->addVerifyDetailLabel(tr("Name: ")+name+"\n"+tr("EMail: ")+email+"\n"+tr("Fingerprint: ")+QString(signature->fpr),VERIFY_ERROR_OK, false);
-            break;*/
-
-            grid->addWidget(new QLabel(tr("Name:")), 0, 0);
-            grid->addWidget(new QLabel(tr("EMail:")), 1, 0);
-            grid->addWidget(new QLabel(tr("Fingerprint:")), 2, 0);
-            grid->addWidget(new QLabel(tr("Status:")), 3, 0);
-
-            grid->addWidget(new QLabel(mKeyList->getKeyNameByFpr(signature->fpr)), 0, 1);
-            grid->addWidget(new QLabel(mKeyList->getKeyEmailByFpr(signature->fpr)), 1, 1);
-            grid->addWidget(new QLabel(beautifyFingerprint(signature->fpr)), 2, 1);
-            grid->addWidget(new QLabel("OK"), 3, 1);
-
 
-        }
-        default:
-        {
-            //verifyStatus=VERIFY_ERROR_WARN;
-            /*vn->addVerifyDetailLabel(tr("Key with Fingerprint: ")+
-                                     QString(signature->fpr)+"\n"+tr("Signature status: ")+gpg_strerror(signature->status)+"\n"
-                                     +tr("Signature validity reason: ")+QString(gpgme_strerror(signature->validity_reason)),
-                                     VERIFY_ERROR_WARN, false);
-                                     */
-            break;
-        }
-    }
-
-    QGroupBox *sbox = new QGroupBox(tr("Key"));
-    sbox->setLayout(grid);
-    return sbox;
-
-}
-
-QString VerifyDetailsDialog::beautifyFingerprint(QString fingerprint)
-{
-    uint len = fingerprint.length();
-    if ((len > 0) && (len % 4 == 0))
-        for (uint n = 0; 4 *(n + 1) < len; ++n)
-            fingerprint.insert(5 * n + 4, ' ');
-    return fingerprint;
-}
diff --git a/verifydetailsdialog.h b/verifydetailsdialog.h
index 0678ad0..5ad3c0a 100644
--- a/verifydetailsdialog.h
+++ b/verifydetailsdialog.h
@@ -3,6 +3,7 @@
 
 #include "context.h"
 #include "keylist.h"
+#include "verifykeydetailbox.h"
 #include <QDialog>
 
 class VerifyDetailsDialog : public QDialog
@@ -12,10 +13,10 @@ public:
     explicit VerifyDetailsDialog(QWidget *parent, GpgME::Context* ctx, KeyList* mKeyList,  gpgme_signature_t signature);
 
 private:
-    QGroupBox* addDetailBox( gpgme_signature_t signature );
     GpgME::Context* mCtx;
     KeyList* mKeyList;
-    QString beautifyFingerprint(QString fingerprint);
+    QVBoxLayout* mVbox;
+    QDialogButtonBox* buttonBox;
 };
 
 #endif // __VERIFYDETAILSDIALOG_H__