diff options
| author | nils <nils@34ebc366-c3a9-4b3c-9f84-69acf7962910> | 2011-12-12 23:12:19 +0000 |
|---|---|---|
| committer | nils <nils@34ebc366-c3a9-4b3c-9f84-69acf7962910> | 2011-12-12 23:12:19 +0000 |
| commit | c5110146431dcf077c37733764ae8254c59865f7 (patch) | |
| tree | db0c21a3a56dfc3cdd5afb0871580e8180dbd0d3 | |
| parent | added advamced settings tab with steganography and disable steganography per... (diff) | |
| download | gpg4usb-c5110146431dcf077c37733764ae8254c59865f7.tar.gz gpg4usb-c5110146431dcf077c37733764ae8254c59865f7.zip | |
show reason for strike out in keyserverimport dialog
git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@701 34ebc366-c3a9-4b3c-9f84-69acf7962910
| -rw-r--r-- | TODO | 4 | ||||
| -rw-r--r-- | keyserverimportdialog.cpp | 18 |
2 files changed, 16 insertions, 6 deletions
@@ -16,7 +16,7 @@ Release 0.3.2 - show import details at all places - option in settingsdialog for enabling steganographic operations [DONE] - minimal steganography option: remove or add pgp-headers on demand [DONE] - - Add advanced tab to settings dialog + - Add advanced tab to settings dialog [DONE] - investigate in embedding a steganography tool http://steghide.sourceforge.net/ http://www.outguess.org/ @@ -24,7 +24,7 @@ Release 0.3.2 - understandable message if no matching private key found for decryption (no data error) - investigate in adding a offline help system [DONE] - have a look on the format -- keyimport from keyserver dialog should show reason for strike out +- keyimport from keyserver dialog should show reason for strike out [DONE] - key import should be more verbose: [DONE] - show message, which keys are imported [DONE] - if import failed, because no key was found [DONE] diff --git a/keyserverimportdialog.cpp b/keyserverimportdialog.cpp index d333d5b..8a5ceeb 100644 --- a/keyserverimportdialog.cpp +++ b/keyserverimportdialog.cpp @@ -99,7 +99,7 @@ QComboBox *KeyServerImportDialog::createComboBox() void KeyServerImportDialog::createKeysTable() { keysTable = new QTableWidget(); - keysTable->setColumnCount(3); + keysTable->setColumnCount(4); // always a whole row is marked keysTable->setSelectionBehavior(QAbstractItemView::SelectRows); @@ -109,7 +109,7 @@ void KeyServerImportDialog::createKeysTable() keysTable->setSelectionMode(QAbstractItemView::SingleSelection); QStringList labels; - labels << tr("UID") << tr("Creation date") << tr("KeyID"); + labels << tr("UID") << tr("Creation date") << tr("KeyID") << tr("Tag"); keysTable->horizontalHeader()->setResizeMode(0, QHeaderView::ResizeToContents); keysTable->setHorizontalHeaderLabels(labels); keysTable->verticalHeader()->hide(); @@ -188,13 +188,23 @@ void KeyServerImportDialog::searchFinished() QString flags = line[line.size()-1]; + keysTable->setRowCount(row+1); + // flags can be "d" for disabled, "r" for revoked // or "e" for expired - if (flags.contains("r")) { + if (flags.contains("r") or flags.contains("d") or flags.contains("e")) { strikeout=true; + if (flags.contains("e")) { + keysTable->setItem(row, 3, new QTableWidgetItem( QString("expired"))); + } + if (flags.contains("r")) { + keysTable->setItem(row, 3, new QTableWidgetItem( QString(tr("revoked")))); + } + if (flags.contains("d")) { + keysTable->setItem(row, 3, new QTableWidgetItem( QString(tr("disabled")))); + } } - keysTable->setRowCount(row+1); QStringList line2 = QString(reply->readLine()).split(":"); QTableWidgetItem *uid; |