From c5110146431dcf077c37733764ae8254c59865f7 Mon Sep 17 00:00:00 2001
From: nils <nils@34ebc366-c3a9-4b3c-9f84-69acf7962910>
Date: Mon, 12 Dec 2011 23:12:19 +0000
Subject: show reason for strike out in keyserverimport dialog

git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@701 34ebc366-c3a9-4b3c-9f84-69acf7962910
---
 keyserverimportdialog.cpp | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'keyserverimportdialog.cpp')

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;
-- 
cgit v1.2.3