some text text changes, add method getKeyByFpr()

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

6 files changed, 30 insertions, 36 deletions

diff --git a/keylist.cpp b/keylist.cpp
index 98f2fdb..f93f45f 100644
--- a/keylist.cpp
+++ b/keylist.cpp
@@ -105,26 +105,21 @@ void KeyList::refresh()
     setChecked(keyList);
 }
 
-QString KeyList::getKeyNameByFpr(QString fpr)
-{
-    QString id;
-    for (int i = 0; i < mKeyList->rowCount(); i++) {
-        if (mKeyList->item(i, 5)->text() == fpr) {
-            id=mKeyList->item(i,2)->text();
-        }
-    }
-    return id;
-}
-
-QString KeyList::getKeyEmailByFpr(QString fpr)
-{
-    QString id;
+/**
+ * note: privkey status is not returned
+ */
+GpgKey KeyList::getKeyByFpr(QString fpr) {
+    GpgKey key;
     for (int i = 0; i < mKeyList->rowCount(); i++) {
         if (mKeyList->item(i, 5)->text() == fpr) {
-            id=mKeyList->item(i,3)->text();
+            //key.privkey = mKeyList->item(i,1)->text();
+            key.id = mKeyList->item(i,4)->text();
+            key.name = mKeyList->item(i,2)->text();
+            key.email = mKeyList->item(i,3)->text();
+            key.fpr = fpr;
         }
     }
-    return id;
+    return key;
 }
 
 QStringList *KeyList::getChecked()
diff --git a/keylist.h b/keylist.h
index 269cfb4..be91e1e 100644
--- a/keylist.h
+++ b/keylist.h
@@ -43,8 +43,7 @@ public:
 
     QStringList *getChecked();
     QStringList *getPrivateChecked();
-    QString getKeyNameByFpr(QString fpr);
-    QString getKeyEmailByFpr(QString fpr);
+    GpgKey getKeyByFpr(QString fpr);
 
     void setChecked(QStringList *keyIds);
     //QStringList *getPrivateChecked();
diff --git a/keyserverimportdialog.cpp b/keyserverimportdialog.cpp
index 61a16cd..f31de6a 100644
--- a/keyserverimportdialog.cpp
+++ b/keyserverimportdialog.cpp
@@ -224,7 +224,7 @@ void KeyServerImportDialog::import(QStringList keyIds, QUrl keyServerUrl)
 {
     foreach(QString keyId, keyIds) {
         QUrl reqUrl(keyServerUrl.scheme() + "://" + keyServerUrl.host() + ":11371/pks/lookup?op=get&search=0x"+keyId+"&options=mr");
-        qDebug() << "req to " << reqUrl;
+        //qDebug() << "req to " << reqUrl;
         QNetworkReply *reply = qnam.get(QNetworkRequest(reqUrl));
         connect(reply, SIGNAL(finished()),
                 this, SLOT(importFinished()));
diff --git a/verifydetailsdialog.cpp b/verifydetailsdialog.cpp
index e9150bd..83896a0 100644
--- a/verifydetailsdialog.cpp
+++ b/verifydetailsdialog.cpp
@@ -60,12 +60,12 @@ void VerifyDetailsDialog::refresh()
     {
     case 2:
     {
-        mVboxLayout->addWidget(new QLabel(tr("Text was completly signed on %1 by:\n").arg(timestamp.toString(Qt::SystemLocaleShortDate))));
+        mVboxLayout->addWidget(new QLabel(tr("Text was completely signed on %1 by:\n").arg(timestamp.toString("dd. MMM. yyyy"))));
         break;
     }
     case 1:
     {
-        mVboxLayout->addWidget(new QLabel(tr("Text was partially signed on %1 by:\n").arg(timestamp.toString(Qt::SystemLocaleShortDate))));
+        mVboxLayout->addWidget(new QLabel(tr("Text was partially signed on %1 by:\n").arg(timestamp.toString("dd. MMM. yyyy"))));
         break;
     }
     }
diff --git a/verifykeydetailbox.cpp b/verifykeydetailbox.cpp
index 192c642..75d0a12 100644
--- a/verifykeydetailbox.cpp
+++ b/verifykeydetailbox.cpp
@@ -27,7 +27,6 @@ VerifyKeyDetailBox::VerifyKeyDetailBox(QWidget *parent, GpgME::Context* ctx, Key
     this->mCtx = ctx;
     this->mKeyList = keyList;
     this->fpr=signature->fpr;
-    this->setTitle(signature->fpr);
 
     grid = new QGridLayout();
 
@@ -38,22 +37,27 @@ VerifyKeyDetailBox::VerifyKeyDetailBox(QWidget *parent, GpgME::Context* ctx, Key
             QPushButton *importButton = new QPushButton(tr("Import from keyserver"));
             connect(importButton, SIGNAL(clicked()), this, SLOT(importFormKeyserver()));
 
+            this->setTitle(tr("Key not present with id 0x") + signature->fpr);
+
             grid->addWidget(new QLabel(tr("Status:")), 0, 0);
-            grid->addWidget(new QLabel(tr("Fingerprint:")), 1, 0);
+            //grid->addWidget(new QLabel(tr("Fingerprint:")), 1, 0);
             grid->addWidget(new QLabel(tr("Key not present in keylist")), 0, 1);
-            grid->addWidget(new QLabel(signature->fpr), 1, 1);
+            //grid->addWidget(new QLabel(signature->fpr), 1, 1);
             grid->addWidget(importButton, 2,0,2,1);
             break;
         }
         case GPG_ERR_NO_ERROR:
         {
+            GpgKey key = mKeyList->getKeyByFpr(signature->fpr);
+
+            this->setTitle(key.name);
             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(key.name), 0, 1);
+            grid->addWidget(new QLabel(key.email), 1, 1);
             grid->addWidget(new QLabel(beautifyFingerprint(signature->fpr)), 2, 1);
             grid->addWidget(new QLabel(tr("OK")), 3, 1);
 
diff --git a/verifynotification.cpp b/verifynotification.cpp
index 3cff1e4..01f1db8 100644
--- a/verifynotification.cpp
+++ b/verifynotification.cpp
@@ -55,9 +55,6 @@ VerifyNotification::VerifyNotification(QWidget *parent, GpgME::Context *ctx, Key
 void VerifyNotification::importFromKeyserver()
 {
     KeyServerImportDialog *importDialog =new KeyServerImportDialog(mCtx,this);
-    /*foreach (QString keyid, *keysNotInList) {
-        importDialog->import(keyid);
-    }*/
     importDialog->import(*keysNotInList);
 }
 
@@ -115,18 +112,17 @@ bool VerifyNotification::refresh()
         case GPG_ERR_NO_PUBKEY:
         {
             verifyStatus=VERIFY_ERROR_WARN;
-            verifyLabelText.append(tr("Key not present with Fingerprint: ")+mCtx->beautifyFingerprint(QString(sign->fpr)));
+            verifyLabelText.append(tr("Key not present with id 0x ")+QString(sign->fpr));
             this->keysNotInList->append(sign->fpr);
             unknownKeyFound=true;
             break;
         }
         case GPG_ERR_NO_ERROR:
         {
-            QString name = mKeyList->getKeyNameByFpr(sign->fpr);
-            QString email =mKeyList->getKeyEmailByFpr(sign->fpr);
-            verifyLabelText.append(name);
-            if (!email.isEmpty()) {
-                verifyLabelText.append("<"+email+">");
+            GpgKey key = mKeyList->getKeyByFpr(sign->fpr);
+            verifyLabelText.append(key.name);
+            if (!key.email.isEmpty()) {
+                verifyLabelText.append("<"+key.email+">");
             }
             break;
         }
@@ -145,7 +141,7 @@ bool VerifyNotification::refresh()
     {
     case 2:
     {
-        verifyLabelText.prepend(tr("Text is completly signed by: "));
+        verifyLabelText.prepend(tr("Text is completely signed by: "));
         break;
     }
     case 1: