diff options
| -rw-r--r-- | TODO | 2 | ||||
| -rw-r--r-- | context.cpp | 2 | ||||
| -rw-r--r-- | keylist.cpp | 3 | ||||
| -rwxr-xr-x | keymgmt.cpp | 15 | ||||
| -rwxr-xr-x | keymgmt.h | 2 |
5 files changed, 14 insertions, 10 deletions
@@ -40,6 +40,7 @@ attachments: - check and add missing statusbar messages - add editorpage-method setmodified - tab switching tab down doesn't work right in windows +- list keys to delete in warning dialog Release 0.3 - PGP-MIME, find and show inline encrypted files @@ -49,6 +50,7 @@ Release 0.3 - check class / includes - setup crosscompile-environment for building against glibc2.3 - Qt 4.6 / new gpg-binaries / new gpgme libs +- make keylist browsabel with keyboard Release 0.4 - adding signing and verifying diff --git a/context.cpp b/context.cpp index 0a32692..736eba5 100644 --- a/context.cpp +++ b/context.cpp @@ -162,7 +162,6 @@ gpgme_key_t Context::getKeyDetails(QString uid) if (!key) { gpgme_get_key(mCtx, uid.toAscii().constData(), &key, 0); } - return key; } @@ -220,7 +219,6 @@ GpgKeyList Context::listKeys() void Context::deleteKeys(QStringList *uidList) { - QString tmp; gpgme_key_t key; diff --git a/keylist.cpp b/keylist.cpp index 8f40950..77155e6 100644 --- a/keylist.cpp +++ b/keylist.cpp @@ -220,9 +220,6 @@ void KeyList::dropEvent(QDropEvent* event) QByteArray inBuffer(event->mimeData()->text().toUtf8()); mCtx->importKey(inBuffer); } - - - } void KeyList::dragEnterEvent(QDragEnterEvent *event) diff --git a/keymgmt.cpp b/keymgmt.cpp index 7b1b912..42f7486 100755 --- a/keymgmt.cpp +++ b/keymgmt.cpp @@ -176,15 +176,22 @@ void KeyMgmt::deleteCheckedKeys() void KeyMgmt::deleteKeysWithWarning(QStringList *uidList) { - /** * TODO: Different Messages for private/public key, check if * more than one selected... compare to seahorse "delete-dialog" */ - int ret = QMessageBox::question(this, tr("Deleting Keys"), - tr("Are you sure that you want to delete the selected keys?.\n" - "The action can not be undone."), + QString keynames; + foreach (QString uid, *uidList) { + keynames.append(mCtx->getKeyDetails(uid)->uids->name); + keynames.append("<i> <"); + keynames.append(mCtx->getKeyDetails(uid)->uids->email); + keynames.append("> </i><br/>"); + } + + int ret = QMessageBox::warning(this, tr("Deleting Keys"), + tr("<b>Are you sure that you want to delete the following keys?.</b><br/><br/>")+keynames+ + tr("<br/>The action can not be undone."), QMessageBox::No | QMessageBox::Yes); if (ret == QMessageBox::Yes) { @@ -53,8 +53,8 @@ public slots: void importKeyFromClipboard(); void exportKeyToFile(); void exportKeyToClipboard(); - void deleteCheckedKeys(); void deleteSelectedKeys(); + void deleteCheckedKeys(); void generateKeyDialog(); void expireBoxChanged(); void passwordEditChanged(); |