Write a text logo for never expiring.

Adjust the UI of the key details interface
Set the minimum length and width of the key details window.
Adjust the structure and layout of each tab page of key details.
Adjust part of the interface UI and text description.
Add revocation parentheses for signature deletion.

Signed-off-by: Saturneric <[email protected]>

7 files changed, 20 insertions, 17 deletions

diff --git a/src/ui/keygen/SubkeyGenerateDialog.cpp b/src/ui/keygen/SubkeyGenerateDialog.cpp
index a7a6d2f4..ae0c2bca 100644
--- a/src/ui/keygen/SubkeyGenerateDialog.cpp
+++ b/src/ui/keygen/SubkeyGenerateDialog.cpp
@@ -43,7 +43,7 @@ SubkeyGenerateDialog::SubkeyGenerateDialog(GpgME::GpgContext *ctx, const GpgKey
     vbox2->addWidget(errorLabel);
     vbox2->addWidget(buttonBox);
 
-    this->setWindowTitle(tr("Generate Subkey"));
+    this->setWindowTitle(tr("Generate New Subkey"));
 
     this->setLayout(vbox2);
     this->setModal(true);
diff --git a/src/ui/keypair_details/KeyDetailsDialog.cpp b/src/ui/keypair_details/KeyDetailsDialog.cpp
index b93244e1..c80374d4 100644
--- a/src/ui/keypair_details/KeyDetailsDialog.cpp
+++ b/src/ui/keypair_details/KeyDetailsDialog.cpp
@@ -39,5 +39,6 @@ KeyDetailsDialog::KeyDetailsDialog(GpgME::GpgContext *ctx, const GpgKey& key, QW
     this->setLayout(mainLayout);
     this->setWindowTitle(tr("Key Details"));
     this->setModal(true);
+    this->setMinimumSize(380, 620);
     this->show();
 }
\ No newline at end of file
diff --git a/src/ui/keypair_details/KeyPairDetailTab.cpp b/src/ui/keypair_details/KeyPairDetailTab.cpp
index 7ef267fa..66d01dfc 100644
--- a/src/ui/keypair_details/KeyPairDetailTab.cpp
+++ b/src/ui/keypair_details/KeyPairDetailTab.cpp
@@ -104,7 +104,6 @@ KeyPairDetailTab::KeyPairDetailTab(GpgME::GpgContext *ctx, const GpgKey &key, QW
 
     ownerBox->setLayout(vboxOD);
     mvbox->addWidget(ownerBox);
-
     keyBox->setLayout(vboxKD);
     mvbox->addWidget(keyBox);
 
@@ -124,9 +123,10 @@ KeyPairDetailTab::KeyPairDetailTab(GpgME::GpgContext *ctx, const GpgKey &key, QW
 
     fingerprintBox->setLayout(hboxFP);
     mvbox->addWidget(fingerprintBox);
+    mvbox->addStretch();
 
     if (key.is_private_key) {
-        auto *privKeyBox = new QGroupBox(tr("Private Key"));
+        auto *privKeyBox = new QGroupBox(tr("Operations"));
         auto *vboxPK = new QVBoxLayout();
 
         auto *exportButton = new QPushButton(tr("Export Private Key"));
diff --git a/src/ui/keypair_details/KeyPairSubkeyTab.cpp b/src/ui/keypair_details/KeyPairSubkeyTab.cpp
index 9d25a70c..f3edfe09 100644
--- a/src/ui/keypair_details/KeyPairSubkeyTab.cpp
+++ b/src/ui/keypair_details/KeyPairSubkeyTab.cpp
@@ -33,7 +33,7 @@ KeyPairSubkeyTab::KeyPairSubkeyTab(GpgME::GpgContext *ctx, const GpgKey &key, QW
 
     auto uidButtonsLayout = new QGridLayout();
 
-    auto addSubkeyButton = new QPushButton(tr("Add New Subkey"));
+    auto addSubkeyButton = new QPushButton(tr("Generate A New Subkey"));
     if(!mKey.is_private_key) {
         addSubkeyButton->setDisabled(true);
         setHidden(addSubkeyButton);
@@ -75,6 +75,7 @@ KeyPairSubkeyTab::KeyPairSubkeyTab(GpgME::GpgContext *ctx, const GpgKey &key, QW
 
     baseLayout->addWidget(listBox);
     baseLayout->addWidget(detailBox);
+    baseLayout->addStretch();
 
     connect(addSubkeyButton, SIGNAL(clicked(bool)), this, SLOT(slotAddSubkey()));
     connect(mCtx, SIGNAL(signalKeyInfoChanged()), this, SLOT(slotRefreshSubkeyList()));
@@ -105,10 +106,10 @@ void KeyPairSubkeyTab::creatSubkeyList() {
     subkeyList->setAlternatingRowColors(true);
 
     QStringList labels;
-    labels << tr("Subkey ID") << tr("Key Size") << tr("Algo") << tr("Create Time") << tr("Expire Time");
+    labels << tr("Subkey ID") << tr("Key Size") << tr("Algo") << tr("Create Date") << tr("Expire Date");
 
     subkeyList->setHorizontalHeaderLabels(labels);
-    subkeyList->horizontalHeader()->setStretchLastSection(true);
+    subkeyList->horizontalHeader()->setStretchLastSection(false);
 }
 
 void KeyPairSubkeyTab::slotRefreshSubkeyList() {
@@ -145,7 +146,7 @@ void KeyPairSubkeyTab::slotRefreshSubkeyList() {
         tmp3->setTextAlignment(Qt::AlignCenter);
         subkeyList->setItem(row, 3, tmp3);
 
-        auto *tmp4= new QTableWidgetItem(subkeys->expires.toTime_t() == 0 ? "Never Expire"  : subkeys->expires.toString());
+        auto *tmp4= new QTableWidgetItem(subkeys->expires.toTime_t() == 0 ? tr("Never Expire") : subkeys->expires.toString());
         tmp4->setTextAlignment(Qt::AlignCenter);
         subkeyList->setItem(row, 4, tmp4);
 
@@ -175,7 +176,7 @@ void KeyPairSubkeyTab::slotRefreshSubkeyDetail() {
 
     keyidVarLabel->setText(key->id);
     keySizeVarLabel->setText(QString::number(key->length));
-    expireVarLabel->setText(key->expires.toTime_t() == 0 ? "Never Expire"  : key->expires.toString());
+    expireVarLabel->setText(key->expires.toTime_t() == 0 ? tr("Never Expire")  : key->expires.toString());
     algorithmVarLabel->setText(key->pubkey_algo);
     createdVarLabel->setText(key->timestamp.toString());
 
diff --git a/src/ui/keypair_details/KeyPairUIDTab.cpp b/src/ui/keypair_details/KeyPairUIDTab.cpp
index c3c436be..1fe57916 100644
--- a/src/ui/keypair_details/KeyPairUIDTab.cpp
+++ b/src/ui/keypair_details/KeyPairUIDTab.cpp
@@ -78,7 +78,7 @@ void KeyPairUIDTab::createUIDList() {
 
     uidList = new QTableWidget(this);
     uidList->setColumnCount(4);
-    // uidList->horizontalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents);
+    uidList->horizontalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents);
     uidList->verticalHeader()->hide();
     uidList->setShowGrid(false);
     uidList->setSelectionBehavior(QAbstractItemView::SelectRows);
@@ -101,7 +101,7 @@ void KeyPairUIDTab::createUIDList() {
 void KeyPairUIDTab::createSignList() {
 
     sigList = new QTableWidget(this);
-    sigList->setColumnCount(4);
+    sigList->setColumnCount(5);
     sigList->horizontalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents);
     sigList->verticalHeader()->hide();
     sigList->setShowGrid(false);
@@ -116,9 +116,9 @@ void KeyPairUIDTab::createSignList() {
     sigList->setAlternatingRowColors(true);
 
     QStringList labels;
-    labels << tr("Key ID") << tr("Name") << tr("Email") << tr("Create Date");
+    labels << tr("Key ID") << tr("Name") << tr("Email") << tr("Create Date") << tr("Expired Date");
     sigList->setHorizontalHeaderLabels(labels);
-    sigList->horizontalHeader()->setStretchLastSection(true);
+    sigList->horizontalHeader()->setStretchLastSection(false);
 
 }
 
@@ -209,8 +209,9 @@ void KeyPairUIDTab::slotRefreshSigList() {
             auto *tmp4 = new QTableWidgetItem(sig->create_time.toString());
             sigList->setItem(sigRow, 3, tmp4);
 
-//            auto *tmp5 = new QTableWidgetItem(sig->expire_time.toTime_t() == 0 ? "Never Expire"  : sig->expire_time.toString());
-//            sigList->setItem(sigRow, 4, tmp5);
+            auto *tmp5 = new QTableWidgetItem(sig->expire_time.toTime_t() == 0 ? tr("Never Expire")  : sig->expire_time.toString());
+            tmp5->setTextAlignment(Qt::AlignCenter);
+            sigList->setItem(sigRow, 4, tmp5);
 
             sigRow++;
         }
@@ -454,7 +455,7 @@ void KeyPairUIDTab::slotDelUIDSingle() {
 void KeyPairUIDTab::createSignPopupMenu() {
     signPopupMenu = new QMenu(this);
 
-    auto *delSignAct = new QAction(tr("Delete Signature"), this);
+    auto *delSignAct = new QAction(tr("Delete(Revoke) Signature"), this);
     connect(delSignAct, SIGNAL(triggered()), this, SLOT(slotDelSign()));
 
     signPopupMenu->addAction(delSignAct);
diff --git a/src/ui/keypair_details/KeyUIDSignDialog.cpp b/src/ui/keypair_details/KeyUIDSignDialog.cpp
index 8cefd638..2fe03e26 100644
--- a/src/ui/keypair_details/KeyUIDSignDialog.cpp
+++ b/src/ui/keypair_details/KeyUIDSignDialog.cpp
@@ -69,7 +69,7 @@ KeyUIDSignDialog::KeyUIDSignDialog(GpgME::GpgContext *ctx, const GpgKey &key, co
 
     layout->addWidget(mKeyList, 0, 0);
     layout->addWidget(signKeyButton, 2, 0, Qt::AlignRight);
-    timeLayout->addWidget(new QLabel(tr("Expired Time")), 0, 0);
+    timeLayout->addWidget(new QLabel(tr("Expire Date")), 0, 0);
     timeLayout->addWidget(expiresEdit, 0, 1);
     timeLayout->addWidget(nonExpireCheck, 0, 2);
     layout->addLayout(timeLayout, 1, 0);
diff --git a/src/ui/widgets/KeyList.cpp b/src/ui/widgets/KeyList.cpp
index 27e57817..0868890f 100644
--- a/src/ui/widgets/KeyList.cpp
+++ b/src/ui/widgets/KeyList.cpp
@@ -77,7 +77,7 @@ KeyList::KeyList(GpgME::GpgContext *ctx,
            << tr("Usage") << tr("Validity") << tr("Finger Print");
 
     mKeyList->setHorizontalHeaderLabels(labels);
-    mKeyList->horizontalHeader()->setStretchLastSection(true);
+    mKeyList->horizontalHeader()->setStretchLastSection(false);
 
     auto *layout = new QVBoxLayout;
     layout->addWidget(mKeyList);