aboutsummaryrefslogtreecommitdiffstats
path: root/src/ui/dialog
diff options
context:
space:
mode:
Diffstat (limited to 'src/ui/dialog')
-rw-r--r--src/ui/dialog/KeyGroupManageDialog.cpp3
-rw-r--r--src/ui/dialog/SignersPicker.cpp1
-rw-r--r--src/ui/dialog/controller/GnuPGControllerDialog.cpp1
-rw-r--r--src/ui/dialog/controller/SmartCardControllerDialog.cpp21
-rw-r--r--src/ui/dialog/details/VerifyDetailsDialog.cpp1
-rw-r--r--src/ui/dialog/import_export/KeyServerImportDialog.cpp1
-rw-r--r--src/ui/dialog/key_generate/KeyGenerateDialog.cpp1
-rw-r--r--src/ui/dialog/keypair_details/KeyDetailsDialog.cpp1
-rw-r--r--src/ui/dialog/keypair_details/KeyPairDetailTab.cpp43
-rw-r--r--src/ui/dialog/keypair_details/KeyPairDetailTab.h1
-rw-r--r--src/ui/dialog/keypair_details/KeyPairUIDTab.h3
-rw-r--r--src/ui/dialog/settings/SettingsDialog.cpp1
-rw-r--r--src/ui/dialog/settings/SettingsGeneral.cpp1
13 files changed, 35 insertions, 44 deletions
diff --git a/src/ui/dialog/KeyGroupManageDialog.cpp b/src/ui/dialog/KeyGroupManageDialog.cpp
index 88892ada..d7b9b3d3 100644
--- a/src/ui/dialog/KeyGroupManageDialog.cpp
+++ b/src/ui/dialog/KeyGroupManageDialog.cpp
@@ -87,6 +87,9 @@ KeyGroupManageDialog::KeyGroupManageDialog(
ui_->addButton->setDisabled(true);
ui_->removeButton->setDisabled(true);
+ ui_->keyGroupTipLabel->setText(tr("Key(s) in Key Group: "));
+ ui_->keyDBTipLabel->setText(tr("Key(s) in Key Dayabase: "));
+
QTimer::singleShot(200, [=]() { slot_notify_invalid_key_ids(); });
this->setModal(true);
diff --git a/src/ui/dialog/SignersPicker.cpp b/src/ui/dialog/SignersPicker.cpp
index 94a8f8df..f8bce07b 100644
--- a/src/ui/dialog/SignersPicker.cpp
+++ b/src/ui/dialog/SignersPicker.cpp
@@ -28,7 +28,6 @@
#include "SignersPicker.h"
-#include "core/GpgModel.h"
#include "ui/widgets/KeyList.h"
namespace GpgFrontend::UI {
diff --git a/src/ui/dialog/controller/GnuPGControllerDialog.cpp b/src/ui/dialog/controller/GnuPGControllerDialog.cpp
index 0ad1a6ca..5dacae65 100644
--- a/src/ui/dialog/controller/GnuPGControllerDialog.cpp
+++ b/src/ui/dialog/controller/GnuPGControllerDialog.cpp
@@ -28,7 +28,6 @@
#include "GnuPGControllerDialog.h"
-#include "core/GpgModel.h"
#include "core/function/GlobalSettingStation.h"
#include "core/model/SettingsObject.h"
#include "core/module/ModuleManager.h"
diff --git a/src/ui/dialog/controller/SmartCardControllerDialog.cpp b/src/ui/dialog/controller/SmartCardControllerDialog.cpp
index 6cc1f324..b48d49af 100644
--- a/src/ui/dialog/controller/SmartCardControllerDialog.cpp
+++ b/src/ui/dialog/controller/SmartCardControllerDialog.cpp
@@ -46,6 +46,23 @@ SmartCardControllerDialog::SmartCardControllerDialog(QWidget* parent)
channel_(kGpgFrontendDefaultChannel) {
ui_->setupUi(this);
+ ui_->smartCardLabel->setText(tr("Smart Card(s):"));
+ ui_->keyStubLabel->setText(tr("Key Stub(s) in Key Database(s):"));
+
+ ui_->cNameButton->setText(tr("Change Name"));
+ ui_->cLangButton->setText(tr("Change Language"));
+ ui_->cGenderButton->setText(tr("Change Gender"));
+ ui_->cLoginDataButton->setText(tr("Change Login Data"));
+ ui_->cPubKeyURLButton->setText(tr("Change Public Key URL"));
+ ui_->cPINButton->setText(tr("Change PIN"));
+ ui_->cAdminPINButton->setText(tr("Change Admin PIN"));
+ ui_->cResetCodeButton->setText(tr("Change Reset Code"));
+ ui_->fetchButton->setText(tr("Fetch"));
+ ui_->restartGpgAgentButton->setText(tr("Restart All Gpg-Agents"));
+ ui_->refreshButton->setText(tr("Refresh"));
+
+ ui_->operationGroupBox->setTitle(tr("Operations"));
+
for (const auto& key_db : GetGpgKeyDatabaseInfos()) {
ui_->keyDBIndexComboBox->insertItem(
key_db.channel, QString("%1: %2").arg(key_db.channel).arg(key_db.name));
@@ -117,6 +134,8 @@ SmartCardControllerDialog::SmartCardControllerDialog(QWidget* parent)
connect(timer_, &QTimer::timeout, this,
&SmartCardControllerDialog::slot_listen_smart_card_changes);
timer_->start(3000);
+
+ setWindowTitle(tr("Smart Card Controller"));
}
void SmartCardControllerDialog::select_smart_card_by_serial_number(
@@ -383,7 +402,7 @@ void SmartCardControllerDialog::slot_listen_smart_card_changes() {
}
void SmartCardControllerDialog::slot_disable_controllers(bool disable) {
- ui_->groupBox->setDisabled(disable);
+ ui_->operationGroupBox->setDisabled(disable);
ui_->keyDBIndexComboBox->setDisabled(disable);
ui_->cardKeysTreeView->setDisabled(disable);
}
diff --git a/src/ui/dialog/details/VerifyDetailsDialog.cpp b/src/ui/dialog/details/VerifyDetailsDialog.cpp
index e833ea01..abdf596f 100644
--- a/src/ui/dialog/details/VerifyDetailsDialog.cpp
+++ b/src/ui/dialog/details/VerifyDetailsDialog.cpp
@@ -28,7 +28,6 @@
#include "VerifyDetailsDialog.h"
-#include "core/GpgModel.h"
#include "ui/widgets/VerifyKeyDetailBox.h"
namespace GpgFrontend::UI {
diff --git a/src/ui/dialog/import_export/KeyServerImportDialog.cpp b/src/ui/dialog/import_export/KeyServerImportDialog.cpp
index 8e01bd4b..ad80f1a1 100644
--- a/src/ui/dialog/import_export/KeyServerImportDialog.cpp
+++ b/src/ui/dialog/import_export/KeyServerImportDialog.cpp
@@ -28,7 +28,6 @@
#include "KeyServerImportDialog.h"
-#include "core/GpgModel.h"
#include "core/function/GlobalSettingStation.h"
#include "core/function/gpg/GpgKeyImportExporter.h"
#include "core/model/SettingsObject.h"
diff --git a/src/ui/dialog/key_generate/KeyGenerateDialog.cpp b/src/ui/dialog/key_generate/KeyGenerateDialog.cpp
index a12db246..0a2dbe1a 100644
--- a/src/ui/dialog/key_generate/KeyGenerateDialog.cpp
+++ b/src/ui/dialog/key_generate/KeyGenerateDialog.cpp
@@ -28,7 +28,6 @@
#include "KeyGenerateDialog.h"
-#include "core/GpgModel.h"
#include "core/function/GlobalSettingStation.h"
#include "core/function/gpg/GpgKeyOpera.h"
#include "core/typedef/GpgTypedef.h"
diff --git a/src/ui/dialog/keypair_details/KeyDetailsDialog.cpp b/src/ui/dialog/keypair_details/KeyDetailsDialog.cpp
index 273d3316..340820da 100644
--- a/src/ui/dialog/keypair_details/KeyDetailsDialog.cpp
+++ b/src/ui/dialog/keypair_details/KeyDetailsDialog.cpp
@@ -28,7 +28,6 @@
#include "KeyDetailsDialog.h"
-#include "core/GpgModel.h"
#include "ui/UISignalStation.h"
#include "ui/dialog/keypair_details/KeyPairDetailTab.h"
#include "ui/dialog/keypair_details/KeyPairOperaTab.h"
diff --git a/src/ui/dialog/keypair_details/KeyPairDetailTab.cpp b/src/ui/dialog/keypair_details/KeyPairDetailTab.cpp
index b5a6c1d2..72a9a7c8 100644
--- a/src/ui/dialog/keypair_details/KeyPairDetailTab.cpp
+++ b/src/ui/dialog/keypair_details/KeyPairDetailTab.cpp
@@ -58,7 +58,6 @@ KeyPairDetailTab::KeyPairDetailTab(int channel, GpgKeyPtr key, QWidget* parent)
key_id_var_label_->setTextInteractionFlags(Qt::TextSelectableByMouse);
usage_var_label_ = new QLabel();
- actual_usage_var_label_ = new QLabel();
owner_trust_var_label_ = new QLabel();
key_size_var_label_ = new QLabel();
@@ -84,13 +83,12 @@ KeyPairDetailTab::KeyPairDetailTab(int channel, GpgKeyPtr key, QWidget* parent)
vbox_kd->addWidget(new QLabel(tr("Algorithm") + ": "), 1, 0);
vbox_kd->addWidget(new QLabel(tr("Algorithm Detail") + ": "), 2, 0);
vbox_kd->addWidget(new QLabel(tr("Key Size") + ": "), 3, 0);
- vbox_kd->addWidget(new QLabel(tr("Nominal Usage") + ": "), 4, 0);
- vbox_kd->addWidget(new QLabel(tr("Actual Usage") + ": "), 5, 0);
- vbox_kd->addWidget(new QLabel(tr("Owner Trust Level") + ": "), 6, 0);
- vbox_kd->addWidget(new QLabel(tr("Create Date (Local Time)") + ": "), 7, 0);
- vbox_kd->addWidget(new QLabel(tr("Expires on (Local Time)") + ": "), 8, 0);
- vbox_kd->addWidget(new QLabel(tr("Last Update (Local Time)") + ": "), 9, 0);
- vbox_kd->addWidget(new QLabel(tr("Primary Key Existence") + ": "), 10, 0);
+ vbox_kd->addWidget(new QLabel(tr("Usage") + ": "), 4, 0);
+ vbox_kd->addWidget(new QLabel(tr("Owner Trust Level") + ": "), 5, 0);
+ vbox_kd->addWidget(new QLabel(tr("Create Date (Local Time)") + ": "), 6, 0);
+ vbox_kd->addWidget(new QLabel(tr("Expires on (Local Time)") + ": "), 7, 0);
+ vbox_kd->addWidget(new QLabel(tr("Last Update (Local Time)") + ": "), 8, 0);
+ vbox_kd->addWidget(new QLabel(tr("Primary Key Existence") + ": "), 9, 0);
key_id_var_label_->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
vbox_kd->addWidget(key_id_var_label_, 0, 1, 1, 1);
@@ -98,12 +96,11 @@ KeyPairDetailTab::KeyPairDetailTab(int channel, GpgKeyPtr key, QWidget* parent)
vbox_kd->addWidget(algorithm_detail_var_label_, 2, 1, 1, 2);
vbox_kd->addWidget(key_size_var_label_, 3, 1, 1, 2);
vbox_kd->addWidget(usage_var_label_, 4, 1, 1, 2);
- vbox_kd->addWidget(actual_usage_var_label_, 5, 1, 1, 2);
- vbox_kd->addWidget(owner_trust_var_label_, 6, 1, 1, 2);
- vbox_kd->addWidget(created_var_label_, 7, 1, 1, 2);
- vbox_kd->addWidget(expire_var_label_, 8, 1, 1, 2);
- vbox_kd->addWidget(last_update_var_label_, 9, 1, 1, 2);
- vbox_kd->addWidget(primary_key_exist_var_label_, 10, 1, 1, 2);
+ vbox_kd->addWidget(owner_trust_var_label_, 5, 1, 1, 2);
+ vbox_kd->addWidget(created_var_label_, 6, 1, 1, 2);
+ vbox_kd->addWidget(expire_var_label_, 7, 1, 1, 2);
+ vbox_kd->addWidget(last_update_var_label_, 8, 1, 1, 2);
+ vbox_kd->addWidget(primary_key_exist_var_label_, 9, 1, 1, 2);
auto* copy_key_id_button = new QPushButton(tr("Copy"));
copy_key_id_button->setFlat(true);
@@ -219,24 +216,6 @@ void KeyPairDetailTab::slot_refresh_key_info() {
if (key_->IsHasAuthCap()) usage_steam << tr("Auth") << " ";
usage_var_label_->setText(usage_steam.readAll());
-
- QString buffer_2;
- QTextStream actual_usage_steam(&buffer_2);
-
- if (key_->IsHasActualCertCap()) {
- actual_usage_steam << tr("Certificate") << " ";
- }
- if (key_->IsHasActualEncrCap()) {
- actual_usage_steam << tr("Encrypt") << " ";
- }
- if (key_->IsHasActualSignCap()) {
- actual_usage_steam << tr("Sign") << " ";
- }
- if (key_->IsHasActualAuthCap()) {
- actual_usage_steam << tr("Auth") << " ";
- }
-
- actual_usage_var_label_->setText(actual_usage_steam.readAll());
owner_trust_var_label_->setText(key_->OwnerTrust());
QString key_size_val;
diff --git a/src/ui/dialog/keypair_details/KeyPairDetailTab.h b/src/ui/dialog/keypair_details/KeyPairDetailTab.h
index d388a4af..e5ddbb83 100644
--- a/src/ui/dialog/keypair_details/KeyPairDetailTab.h
+++ b/src/ui/dialog/keypair_details/KeyPairDetailTab.h
@@ -90,7 +90,6 @@ class KeyPairDetailTab : public QWidget {
QLabel* key_id_var_label_; ///< Label containing the keys keyid
QLabel* fingerprint_var_label_; ///< Label containing the keys fingerprint
QLabel* usage_var_label_;
- QLabel* actual_usage_var_label_;
QLabel* primary_key_exist_var_label_;
QLabel* owner_trust_var_label_;
diff --git a/src/ui/dialog/keypair_details/KeyPairUIDTab.h b/src/ui/dialog/keypair_details/KeyPairUIDTab.h
index ecae16b5..32f6883f 100644
--- a/src/ui/dialog/keypair_details/KeyPairUIDTab.h
+++ b/src/ui/dialog/keypair_details/KeyPairUIDTab.h
@@ -28,8 +28,7 @@
#pragma once
-#include "core/GpgModel.h"
-#include "ui/GpgFrontendUI.h"
+#include "core/typedef/GpgTypedef.h"
namespace GpgFrontend::UI {
diff --git a/src/ui/dialog/settings/SettingsDialog.cpp b/src/ui/dialog/settings/SettingsDialog.cpp
index 79910229..ee2e12c6 100644
--- a/src/ui/dialog/settings/SettingsDialog.cpp
+++ b/src/ui/dialog/settings/SettingsDialog.cpp
@@ -29,7 +29,6 @@
#include "SettingsDialog.h"
#include "core/GpgConstants.h"
-#include "core/GpgModel.h"
#include "ui/dialog/settings/SettingsAppearance.h"
#include "ui/dialog/settings/SettingsGeneral.h"
#include "ui/dialog/settings/SettingsKeyServer.h"
diff --git a/src/ui/dialog/settings/SettingsGeneral.cpp b/src/ui/dialog/settings/SettingsGeneral.cpp
index 73d8bccd..12024a4c 100644
--- a/src/ui/dialog/settings/SettingsGeneral.cpp
+++ b/src/ui/dialog/settings/SettingsGeneral.cpp
@@ -29,7 +29,6 @@
#include "SettingsGeneral.h"
#include "SettingsDialog.h"
-#include "core/GpgModel.h"
#include "core/function/GlobalSettingStation.h"
#include "ui_GeneralSettings.h"
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-27 05:08:03 +0000