GpgFrontend/GpgFrontend
1
0
Fork 0
Code Actions

Write a text logo for never expiring.

Browse Source 
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 <eric.bktu@gmail.com>
This commit is contained in:
Saturneric 2021-05-31 22:19:14 +08:00
parent 18423b4d10
commit dff37c4a6d
7 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ui/keygen/SubkeyGenerateDialog.cpp
View File

@ -43,7 +43,7 @@ SubkeyGenerateDialog::SubkeyGenerateDialog(GpgME::GpgContext *ctx, const GpgKey
vbox2->addWidget(errorLabel); vbox2->addWidget(errorLabel);
vbox2->addWidget(buttonBox); vbox2->addWidget(buttonBox);
this->setWindowTitle(tr("Generate Subkey")); this->setWindowTitle(tr("Generate New Subkey"));
this->setLayout(vbox2); this->setLayout(vbox2);
this->setModal(true); this->setModal(true);

1
src/ui/keypair_details/KeyDetailsDialog.cpp
View File

@ -39,5 +39,6 @@ KeyDetailsDialog::KeyDetailsDialog(GpgME::GpgContext *ctx, const GpgKey& key, QW
this->setLayout(mainLayout); this->setLayout(mainLayout);
this->setWindowTitle(tr("Key Details")); this->setWindowTitle(tr("Key Details"));
this->setModal(true); this->setModal(true);
this->setMinimumSize(380, 620);
this->show(); this->show();
} }

4
src/ui/keypair_details/KeyPairDetailTab.cpp
View File

@ -104,7 +104,6 @@ KeyPairDetailTab::KeyPairDetailTab(GpgME::GpgContext *ctx, const GpgKey &key, QW
ownerBox->setLayout(vboxOD); ownerBox->setLayout(vboxOD);
mvbox->addWidget(ownerBox); mvbox->addWidget(ownerBox);
keyBox->setLayout(vboxKD); keyBox->setLayout(vboxKD);
mvbox->addWidget(keyBox); mvbox->addWidget(keyBox);
@ -124,9 +123,10 @@ KeyPairDetailTab::KeyPairDetailTab(GpgME::GpgContext *ctx, const GpgKey &key, QW
fingerprintBox->setLayout(hboxFP); fingerprintBox->setLayout(hboxFP);
mvbox->addWidget(fingerprintBox); mvbox->addWidget(fingerprintBox);
mvbox->addStretch();
if (key.is_private_key) { if (key.is_private_key) {
auto *privKeyBox = new QGroupBox(tr("Private Key")); auto *privKeyBox = new QGroupBox(tr("Operations"));
auto *vboxPK = new QVBoxLayout(); auto *vboxPK = new QVBoxLayout();
auto *exportButton = new QPushButton(tr("Export Private Key")); auto *exportButton = new QPushButton(tr("Export Private Key"));

11
src/ui/keypair_details/KeyPairSubkeyTab.cpp
View File

@ -33,7 +33,7 @@ KeyPairSubkeyTab::KeyPairSubkeyTab(GpgME::GpgContext *ctx, const GpgKey &key, QW
auto uidButtonsLayout = new QGridLayout(); 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) { if(!mKey.is_private_key) {
addSubkeyButton->setDisabled(true); addSubkeyButton->setDisabled(true);
setHidden(addSubkeyButton); setHidden(addSubkeyButton);
@ -75,6 +75,7 @@ KeyPairSubkeyTab::KeyPairSubkeyTab(GpgME::GpgContext *ctx, const GpgKey &key, QW
baseLayout->addWidget(listBox); baseLayout->addWidget(listBox);
baseLayout->addWidget(detailBox); baseLayout->addWidget(detailBox);
baseLayout->addStretch();
connect(addSubkeyButton, SIGNAL(clicked(bool)), this, SLOT(slotAddSubkey())); connect(addSubkeyButton, SIGNAL(clicked(bool)), this, SLOT(slotAddSubkey()));
connect(mCtx, SIGNAL(signalKeyInfoChanged()), this, SLOT(slotRefreshSubkeyList())); connect(mCtx, SIGNAL(signalKeyInfoChanged()), this, SLOT(slotRefreshSubkeyList()));
@ -105,10 +106,10 @@ void KeyPairSubkeyTab::creatSubkeyList() {
subkeyList->setAlternatingRowColors(true); subkeyList->setAlternatingRowColors(true);
QStringList labels; 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->setHorizontalHeaderLabels(labels);
subkeyList->horizontalHeader()->setStretchLastSection(true); subkeyList->horizontalHeader()->setStretchLastSection(false);
} }
void KeyPairSubkeyTab::slotRefreshSubkeyList() { void KeyPairSubkeyTab::slotRefreshSubkeyList() {
@ -145,7 +146,7 @@ void KeyPairSubkeyTab::slotRefreshSubkeyList() {
tmp3->setTextAlignment(Qt::AlignCenter); tmp3->setTextAlignment(Qt::AlignCenter);
subkeyList->setItem(row, 3, tmp3); 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); tmp4->setTextAlignment(Qt::AlignCenter);
subkeyList->setItem(row, 4, tmp4); subkeyList->setItem(row, 4, tmp4);
@ -175,7 +176,7 @@ void KeyPairSubkeyTab::slotRefreshSubkeyDetail() {
keyidVarLabel->setText(key->id); keyidVarLabel->setText(key->id);
keySizeVarLabel->setText(QString::number(key->length)); 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); algorithmVarLabel->setText(key->pubkey_algo);
createdVarLabel->setText(key->timestamp.toString()); createdVarLabel->setText(key->timestamp.toString());

15
src/ui/keypair_details/KeyPairUIDTab.cpp
View File

@ -78,7 +78,7 @@ void KeyPairUIDTab::createUIDList() {
uidList = new QTableWidget(this); uidList = new QTableWidget(this);
uidList->setColumnCount(4); uidList->setColumnCount(4);
// uidList->horizontalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents); uidList->horizontalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents);
uidList->verticalHeader()->hide(); uidList->verticalHeader()->hide();
uidList->setShowGrid(false); uidList->setShowGrid(false);
uidList->setSelectionBehavior(QAbstractItemView::SelectRows); uidList->setSelectionBehavior(QAbstractItemView::SelectRows);
@ -101,7 +101,7 @@ void KeyPairUIDTab::createUIDList() {
void KeyPairUIDTab::createSignList() { void KeyPairUIDTab::createSignList() {
sigList = new QTableWidget(this); sigList = new QTableWidget(this);
sigList->setColumnCount(4); sigList->setColumnCount(5);
sigList->horizontalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents); sigList->horizontalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents);
sigList->verticalHeader()->hide(); sigList->verticalHeader()->hide();
sigList->setShowGrid(false); sigList->setShowGrid(false);
@ -116,9 +116,9 @@ void KeyPairUIDTab::createSignList() {
sigList->setAlternatingRowColors(true); sigList->setAlternatingRowColors(true);
QStringList labels; 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->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()); auto *tmp4 = new QTableWidgetItem(sig->create_time.toString());
sigList->setItem(sigRow, 3, tmp4); sigList->setItem(sigRow, 3, tmp4);
// auto *tmp5 = new QTableWidgetItem(sig->expire_time.toTime_t() == 0 ? "Never Expire" : sig->expire_time.toString()); auto *tmp5 = new QTableWidgetItem(sig->expire_time.toTime_t() == 0 ? tr("Never Expire") : sig->expire_time.toString());
// sigList->setItem(sigRow, 4, tmp5); tmp5->setTextAlignment(Qt::AlignCenter);
sigList->setItem(sigRow, 4, tmp5);
sigRow++; sigRow++;
} }
@ -454,7 +455,7 @@ void KeyPairUIDTab::slotDelUIDSingle() {
void KeyPairUIDTab::createSignPopupMenu() { void KeyPairUIDTab::createSignPopupMenu() {
signPopupMenu = new QMenu(this); 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())); connect(delSignAct, SIGNAL(triggered()), this, SLOT(slotDelSign()));
signPopupMenu->addAction(delSignAct); signPopupMenu->addAction(delSignAct);

2
src/ui/keypair_details/KeyUIDSignDialog.cpp
View File

@ -69,7 +69,7 @@ KeyUIDSignDialog::KeyUIDSignDialog(GpgME::GpgContext *ctx, const GpgKey &key, co
layout->addWidget(mKeyList, 0, 0); layout->addWidget(mKeyList, 0, 0);
layout->addWidget(signKeyButton, 2, 0, Qt::AlignRight); 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(expiresEdit, 0, 1);
timeLayout->addWidget(nonExpireCheck, 0, 2); timeLayout->addWidget(nonExpireCheck, 0, 2);
layout->addLayout(timeLayout, 1, 0); layout->addLayout(timeLayout, 1, 0);

2
src/ui/widgets/KeyList.cpp
View File

@ -77,7 +77,7 @@ KeyList::KeyList(GpgME::GpgContext *ctx,
<< tr("Usage") << tr("Validity") << tr("Finger Print"); << tr("Usage") << tr("Validity") << tr("Finger Print");
mKeyList->setHorizontalHeaderLabels(labels); mKeyList->setHorizontalHeaderLabels(labels);
mKeyList->horizontalHeader()->setStretchLastSection(true); mKeyList->horizontalHeader()->setStretchLastSection(false);
auto *layout = new QVBoxLayout; auto *layout = new QVBoxLayout;
layout->addWidget(mKeyList); layout->addWidget(mKeyList);