some text text changes, add method getKeyByFpr()

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

1 files changed, 6 insertions, 10 deletions

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: