strike out expired keys

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

3 files changed, 13 insertions, 2 deletions

diff --git a/context.cpp b/context.cpp
index e3ee119..a9ad82c 100644
--- a/context.cpp
+++ b/context.cpp
@@ -186,11 +186,12 @@ GpgKeyList Context::listKeys()
             continue;
 
         gpgkey.id = key->subkeys->keyid;
+        gpgkey.fpr = key->subkeys->fpr;
+        gpgkey.expired = (key->expired != 0);
 
         if (key->uids) {
             gpgkey.name = key->uids->name;
             gpgkey.email = key->uids->email;
-            gpgkey.fpr = key->subkeys->fpr;
         }
         keys.append(gpgkey);
         gpgme_key_unref(key);
diff --git a/context.h b/context.h
index 705a07e..25a225e 100644
--- a/context.h
+++ b/context.h
@@ -45,8 +45,9 @@ public:
     QString id;
     QString name;
     QString email;
-    bool privkey;
     QString fpr;
+    bool privkey;
+    bool expired;
 };
 
 typedef QLinkedList< GpgKey > GpgKeyList;
diff --git a/keylist.cpp b/keylist.cpp
index 01ae4dd..0abade4 100644
--- a/keylist.cpp
+++ b/keylist.cpp
@@ -93,11 +93,20 @@ void KeyList::refresh()
         mKeyList->setItem(row, 2, tmp2);
         QTableWidgetItem *tmp3 = new QTableWidgetItem(it->email);
         tmp3->setToolTip(it->email);
+        // strike out expired keys
+        if(it->expired) {
+            QFont strike = tmp2->font();
+            strike.setStrikeOut(true);
+            tmp2->setFont(strike);
+            tmp3->setFont(strike);
+        }
         mKeyList->setItem(row, 3, tmp3);
         QTableWidgetItem *tmp4 = new QTableWidgetItem(it->id);
         mKeyList->setItem(row, 4, tmp4);
         QTableWidgetItem *tmp5 = new QTableWidgetItem(it->fpr);
         mKeyList->setItem(row, 5, tmp5);
+
+
         it++;
         ++row;
     }