2 files changed, 29 insertions, 5 deletions

diff --git a/src/ui/dialog/keypair_details/KeyPairSubkeyTab.cpp b/src/ui/dialog/keypair_details/KeyPairSubkeyTab.cpp
index a262c004..b37f610f 100644
--- a/src/ui/dialog/keypair_details/KeyPairSubkeyTab.cpp
+++ b/src/ui/dialog/keypair_details/KeyPairSubkeyTab.cpp
@@ -238,10 +238,15 @@ void KeyPairSubkeyTab::slot_refresh_subkey_list() {
     if (row == 0) {
       for (auto i = 0; i < subkey_list_->columnCount(); i++) {
         subkey_list_->item(row, i)->setForeground(QColor(65, 105, 255));
+        for (auto i = 0; i < subkey_list_->columnCount(); i++) {
+          auto font = subkey_list_->item(row, i)->font();
+          font.setBold(true);
+          subkey_list_->item(row, i)->setFont(font);
+        }
       }
     }
 
-    if (subkey.IsExpired() || subkey.IsRevoked() || !subkey.IsSecretKey()) {
+    if (subkey.IsExpired() || subkey.IsRevoked()) {
       for (auto i = 0; i < subkey_list_->columnCount(); i++) {
         auto font = subkey_list_->item(row, i)->font();
         font.setStrikeOut(true);
@@ -249,6 +254,15 @@ void KeyPairSubkeyTab::slot_refresh_subkey_list() {
       }
     }
 
+    if (!subkey.IsSecretKey()) {
+      for (auto i = 0; i < subkey_list_->columnCount(); i++) {
+        auto font = subkey_list_->item(row, i)->font();
+        font.setWeight(QFont::ExtraLight);
+        font.setItalic(true);
+        subkey_list_->item(row, i)->setFont(font);
+      }
+    }
+
     row++;
   }
 
diff --git a/src/ui/dialog/keypair_details/KeyPairUIDTab.cpp b/src/ui/dialog/keypair_details/KeyPairUIDTab.cpp
index 47408a99..9fc13690 100644
--- a/src/ui/dialog/keypair_details/KeyPairUIDTab.cpp
+++ b/src/ui/dialog/keypair_details/KeyPairUIDTab.cpp
@@ -140,7 +140,7 @@ void KeyPairUIDTab::create_uid_list() {
   uid_list_->setAlternatingRowColors(true);
 
   QStringList labels;
-  labels << tr("Select") << tr("Name") << tr("Email") << tr("Comment");
+  labels << tr("Index") << tr("Name") << tr("Email") << tr("Comment");
   uid_list_->setHorizontalHeaderLabels(labels);
   uid_list_->horizontalHeader()->setStretchLastSection(true);
 }
@@ -178,9 +178,6 @@ void KeyPairUIDTab::slot_refresh_uid_list() {
 
   auto uids = m_key_.GetUIDs();
   for (auto& uid : *uids) {
-    if (uid.GetInvalid() || uid.GetRevoked()) {
-      continue;
-    }
     this->buffered_uids_.push_back(std::move(uid));
   }
 
@@ -204,6 +201,19 @@ void KeyPairUIDTab::slot_refresh_uid_list() {
     if (row == 0) {
       for (auto i = 0; i < uid_list_->columnCount(); i++) {
         uid_list_->item(row, i)->setForeground(QColor(65, 105, 255));
+        for (auto i = 0; i < uid_list_->columnCount(); i++) {
+          auto font = uid_list_->item(row, i)->font();
+          font.setBold(true);
+          uid_list_->item(row, i)->setFont(font);
+        }
+      }
+    }
+
+    if (uid.GetRevoked() || uid.GetInvalid()) {
+      for (auto i = 0; i < uid_list_->columnCount(); i++) {
+        auto font = uid_list_->item(row, i)->font();
+        font.setStrikeOut(true);
+        uid_list_->item(row, i)->setFont(font);
       }
     }