From 465e6dc6b65e9173764b7815bd449afa8bab11a6 Mon Sep 17 00:00:00 2001 From: nils Date: Tue, 6 Sep 2011 13:43:24 +0000 Subject: minor changes in verify-method and some doxygen documenation git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@526 34ebc366-c3a9-4b3c-9f84-69acf7962910 --- gpgwin.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'gpgwin.cpp') diff --git a/gpgwin.cpp b/gpgwin.cpp index 243ddb5..2213ca8 100644 --- a/gpgwin.cpp +++ b/gpgwin.cpp @@ -56,6 +56,7 @@ GpgWin::GpgWin() mKeyList->addMenuAction(appendSelectedKeysAct); mKeyList->addMenuAction(copyMailAddressToClipboardAct); mKeyList->addMenuAction(showKeyDetailsAct); + restoreSettings(); // open filename if provided as first command line parameter @@ -66,7 +67,6 @@ GpgWin::GpgWin() edit->loadFile(args[1]); } } - edit->curTextPage()->setFocus(); this->setWindowTitle(qApp->applicationName()); } @@ -626,7 +626,6 @@ void GpgWin::openKeyManagement() { if (!keyMgmt) { keyMgmt = new KeyMgmt(mCtx, iconPath); -// keyMgmt->resize(800, 400); } keyMgmt->show(); keyMgmt->raise(); @@ -756,7 +755,9 @@ void GpgWin::verify() while (sign) { timestamp.setTime_t(sign->timestamp); - if (gpg_err_code(sign->status) == 9) { + switch (gpg_err_code(sign->status)) + { + case GPG_ERR_NO_PUBKEY: verifyStatus=VERIFY_ERROR_WARN; verifyLabelText.append(tr("Key not present with Fingerprint: ")+QString(sign->fpr)); @@ -765,7 +766,8 @@ void GpgWin::verify() unknownKeyFound=true; verifyDetailText->append(tr("Key not present:")); //verifyDetailText->append(tr("Signature status: ")+gpg_strerror(sign->status)+"\nsig validity reason: "+QString(gpgme_strerror(sign->validity_reason))+"\n"); - } else { + break; + default: QString name = mKeyList->getKeyNameByFpr(sign->fpr); QString email =mKeyList->getKeyEmailByFpr(sign->fpr); qDebug() << email; @@ -775,6 +777,7 @@ void GpgWin::verify() verifyLabelText.append("<"+email+">"); } vn->setProperty("keyFound", true); + break; } verifyDetailText->append(tr("\nFingerprint: ")+QString(sign->fpr)+"\n\n"); verifyLabelText.append("\n"); -- cgit