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]>

1 files changed, 6 insertions, 5 deletions

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());