1 files changed, 23 insertions, 14 deletions

diff --git a/src/ui/keypair_details/KeyPairSubkeyTab.cpp b/src/ui/keypair_details/KeyPairSubkeyTab.cpp
index 93e07875..8068d9a8 100644
--- a/src/ui/keypair_details/KeyPairSubkeyTab.cpp
+++ b/src/ui/keypair_details/KeyPairSubkeyTab.cpp
@@ -62,10 +62,10 @@ KeyPairSubkeyTab::KeyPairSubkeyTab(const std::string& key_id, QWidget* parent)
   subkeyDetailLayout->addWidget(new QLabel(QString(_("Key Size")) + ": "), 2,
                                 0);
   subkeyDetailLayout->addWidget(new QLabel(QString(_("Usage")) + ": "), 3, 0);
-  subkeyDetailLayout->addWidget(new QLabel(QString(_("Expires On")) + ": "), 4,
-                                0);
-  subkeyDetailLayout->addWidget(new QLabel(QString(_("Last Update")) + ": "), 5,
-                                0);
+  subkeyDetailLayout->addWidget(
+      new QLabel(QString(_("Expires On (Local Time)")) + ": "), 4, 0);
+  subkeyDetailLayout->addWidget(
+      new QLabel(QString(_("Create Date (Local Time)")) + ": "), 5, 0);
   subkeyDetailLayout->addWidget(new QLabel(QString(_("Existence")) + ": "), 6,
                                 0);
   subkeyDetailLayout->addWidget(new QLabel(QString(_("Fingerprint")) + ": "), 7,
@@ -80,14 +80,23 @@ KeyPairSubkeyTab::KeyPairSubkeyTab(const std::string& key_id, QWidget* parent)
   masterKeyExistVarLabel = new QLabel();
   fingerPrintVarLabel = new QLabel();
 
-  subkeyDetailLayout->addWidget(keyidVarLabel, 0, 1);
-  subkeyDetailLayout->addWidget(keySizeVarLabel, 2, 1);
-  subkeyDetailLayout->addWidget(expireVarLabel, 4, 1);
-  subkeyDetailLayout->addWidget(algorithmVarLabel, 1, 1);
-  subkeyDetailLayout->addWidget(createdVarLabel, 5, 1);
-  subkeyDetailLayout->addWidget(usageVarLabel, 3, 1);
-  subkeyDetailLayout->addWidget(masterKeyExistVarLabel, 6, 1);
-  subkeyDetailLayout->addWidget(fingerPrintVarLabel, 7, 1);
+  subkeyDetailLayout->addWidget(keyidVarLabel, 0, 1, 1, 1);
+  subkeyDetailLayout->addWidget(keySizeVarLabel, 2, 1, 1, 2);
+  subkeyDetailLayout->addWidget(expireVarLabel, 4, 1, 1, 2);
+  subkeyDetailLayout->addWidget(algorithmVarLabel, 1, 1, 1, 2);
+  subkeyDetailLayout->addWidget(createdVarLabel, 5, 1, 1, 2);
+  subkeyDetailLayout->addWidget(usageVarLabel, 3, 1, 1, 2);
+  subkeyDetailLayout->addWidget(masterKeyExistVarLabel, 6, 1, 1, 2);
+  subkeyDetailLayout->addWidget(fingerPrintVarLabel, 7, 1, 1, 2);
+
+  auto* copyKeyIdButton = new QPushButton(_("Copy"));
+  copyKeyIdButton->setFlat(true);
+  subkeyDetailLayout->addWidget(copyKeyIdButton, 0, 2);
+  connect(copyKeyIdButton, &QPushButton::clicked, this, [=]() {
+    QString fpr = keyidVarLabel->text().trimmed();
+    QClipboard* cb = QApplication::clipboard();
+    cb->setText(fpr);
+  });
 
   listBox->setLayout(subkeyListLayout);
   listBox->setContentsMargins(0, 12, 0, 0);
@@ -134,8 +143,8 @@ void KeyPairSubkeyTab::createSubkeyList() {
   subkeyList->setAlternatingRowColors(true);
 
   QStringList labels;
-  labels << _("Subkey ID") << _("Key Size") << _("Algo") << _("Create Date")
-         << _("Expire Date");
+  labels << _("Subkey ID") << _("Key Size") << _("Algo")
+         << _("Create Date (UTC)") << _("Expire Date (UTC)");
 
   subkeyList->setHorizontalHeaderLabels(labels);
   subkeyList->horizontalHeader()->setStretchLastSection(false);