From 95997d27106daf91336847f50efaaa32279b7fc7 Mon Sep 17 00:00:00 2001 From: saturneric Date: Mon, 16 Oct 2023 17:54:05 +0800 Subject: fix: check and update copyright at files --- src/ui/dialog/keypair_details/KeyUIDSignDialog.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/ui/dialog/keypair_details/KeyUIDSignDialog.cpp') diff --git a/src/ui/dialog/keypair_details/KeyUIDSignDialog.cpp b/src/ui/dialog/keypair_details/KeyUIDSignDialog.cpp index 12da3284..b2f5eb10 100644 --- a/src/ui/dialog/keypair_details/KeyUIDSignDialog.cpp +++ b/src/ui/dialog/keypair_details/KeyUIDSignDialog.cpp @@ -1,5 +1,5 @@ /** - * Copyright (C) 2021 Saturneric + * Copyright (C) 2021 Saturneric * * This file is part of GpgFrontend. * @@ -19,8 +19,10 @@ * The initial version of the source code is inherited from * the gpg4usb project, which is under GPL-3.0-or-later. * - * The source code version of this software was modified and released - * by Saturneric starting on May 12, 2021. + * All the source code of GpgFrontend was modified and released by + * Saturneric starting on May 12, 2021. + * + * SPDX-License-Identifier: GPL-3.0-or-later * */ -- cgit v1.2.3 From 4dcd2ac8c4f673fc21c4cf0072d6cb648ca64e7e Mon Sep 17 00:00:00 2001 From: saturneric Date: Tue, 7 Nov 2023 15:57:28 +0800 Subject: refactor: separate typedef and impl --- src/ui/dialog/keypair_details/KeyUIDSignDialog.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/ui/dialog/keypair_details/KeyUIDSignDialog.cpp') diff --git a/src/ui/dialog/keypair_details/KeyUIDSignDialog.cpp b/src/ui/dialog/keypair_details/KeyUIDSignDialog.cpp index b2f5eb10..6afaa510 100644 --- a/src/ui/dialog/keypair_details/KeyUIDSignDialog.cpp +++ b/src/ui/dialog/keypair_details/KeyUIDSignDialog.cpp @@ -28,6 +28,7 @@ #include "KeyUIDSignDialog.h" +#include "core/GpgModel.h" #include "core/function/gpg/GpgKeyGetter.h" #include "core/function/gpg/GpgKeyManager.h" #include "ui/SignalStation.h" @@ -45,12 +46,9 @@ KeyUIDSignDialog::KeyUIDSignDialog(const GpgKey& key, UIDArgsListPtr uid, _("Signers"), "signers", KeyListRow::ONLY_SECRET_KEY, KeyListColumn::NAME | KeyListColumn::EmailAddress, [key_id](const GpgKey& key, const KeyTable&) -> bool { - if (key.IsDisabled() || !key.IsHasCertificationCapability() || - !key.IsHasMasterKey() || key.IsExpired() || key.IsRevoked() || - key_id == key.GetId()) - return false; - else - return true; + return !(key.IsDisabled() || !key.IsHasCertificationCapability() || + !key.IsHasMasterKey() || key.IsExpired() || key.IsRevoked() || + key_id == key.GetId()); }); m_key_list_->SlotRefresh(); -- cgit v1.2.3 From 8a63c3954d6745c5e323dcf3e518219ce6545cc0 Mon Sep 17 00:00:00 2001 From: saturneric Date: Fri, 1 Dec 2023 23:23:01 -0800 Subject: fix: add set owner struct action in keymanager menu --- src/ui/dialog/keypair_details/KeyUIDSignDialog.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/ui/dialog/keypair_details/KeyUIDSignDialog.cpp') diff --git a/src/ui/dialog/keypair_details/KeyUIDSignDialog.cpp b/src/ui/dialog/keypair_details/KeyUIDSignDialog.cpp index 6afaa510..54b6298a 100644 --- a/src/ui/dialog/keypair_details/KeyUIDSignDialog.cpp +++ b/src/ui/dialog/keypair_details/KeyUIDSignDialog.cpp @@ -31,7 +31,7 @@ #include "core/GpgModel.h" #include "core/function/gpg/GpgKeyGetter.h" #include "core/function/gpg/GpgKeyManager.h" -#include "ui/SignalStation.h" +#include "ui/UISignalStation.h" namespace GpgFrontend::UI { @@ -99,8 +99,8 @@ KeyUIDSignDialog::KeyUIDSignDialog(const GpgKey& key, UIDArgsListPtr uid, setAttribute(Qt::WA_DeleteOnClose, true); connect(this, &KeyUIDSignDialog::SignalKeyUIDSignUpdate, - SignalStation::GetInstance(), - &SignalStation::SignalKeyDatabaseRefresh); + UISignalStation::GetInstance(), + &UISignalStation::SignalKeyDatabaseRefresh); } void KeyUIDSignDialog::slot_sign_key(bool clicked) { -- cgit v1.2.3 From 644aa4397b03dbef73f8bfedc13925b51cad836b Mon Sep 17 00:00:00 2001 From: saturneric Date: Fri, 5 Jan 2024 20:55:15 +0800 Subject: feat: integrate logging api to core --- src/ui/dialog/keypair_details/KeyUIDSignDialog.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/ui/dialog/keypair_details/KeyUIDSignDialog.cpp') diff --git a/src/ui/dialog/keypair_details/KeyUIDSignDialog.cpp b/src/ui/dialog/keypair_details/KeyUIDSignDialog.cpp index 54b6298a..97f20289 100644 --- a/src/ui/dialog/keypair_details/KeyUIDSignDialog.cpp +++ b/src/ui/dialog/keypair_details/KeyUIDSignDialog.cpp @@ -108,7 +108,7 @@ void KeyUIDSignDialog::slot_sign_key(bool clicked) { auto key_ids = m_key_list_->GetChecked(); auto keys = GpgKeyGetter::GetInstance().GetKeys(key_ids); - SPDLOG_DEBUG("key info got"); + GF_UI_LOG_DEBUG("key info got"); #ifdef GPGFRONTEND_GUI_QT6 auto expires = std::make_unique(boost::posix_time::from_time_t( @@ -118,9 +118,9 @@ void KeyUIDSignDialog::slot_sign_key(bool clicked) { boost::posix_time::from_time_t(expires_edit_->dateTime().toTime_t())); #endif - SPDLOG_DEBUG("sign start"); + GF_UI_LOG_DEBUG("sign start"); for (const auto& uid : *m_uids_) { - SPDLOG_DEBUG("sign uid: {}", uid); + GF_UI_LOG_DEBUG("sign uid: {}", uid); // Sign For mKey if (!GpgKeyManager::GetInstance().SignKey(m_key_, *keys, uid, expires)) { QMessageBox::critical( -- cgit v1.2.3 From bf538056b24a68b8fd235b1c50991ee8eb46a776 Mon Sep 17 00:00:00 2001 From: saturneric Date: Fri, 12 Jan 2024 14:02:37 +0800 Subject: refactor: use QString instead of std::string and improve threading system --- src/ui/dialog/keypair_details/KeyUIDSignDialog.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/ui/dialog/keypair_details/KeyUIDSignDialog.cpp') diff --git a/src/ui/dialog/keypair_details/KeyUIDSignDialog.cpp b/src/ui/dialog/keypair_details/KeyUIDSignDialog.cpp index 97f20289..47b8eb93 100644 --- a/src/ui/dialog/keypair_details/KeyUIDSignDialog.cpp +++ b/src/ui/dialog/keypair_details/KeyUIDSignDialog.cpp @@ -125,7 +125,7 @@ void KeyUIDSignDialog::slot_sign_key(bool clicked) { if (!GpgKeyManager::GetInstance().SignKey(m_key_, *keys, uid, expires)) { QMessageBox::critical( nullptr, _("Unsuccessful Operation"), - QString(_("Signature operation failed for UID %1")).arg(uid.c_str())); + QString(_("Signature operation failed for UID %1")).arg(uid)); } } -- cgit v1.2.3 From 6983b5c1dd82d159236ebd06cf17f071cc9c1ee9 Mon Sep 17 00:00:00 2001 From: saturneric Date: Fri, 12 Jan 2024 23:08:38 +0800 Subject: refactor: remove boost and use QString instead of std::filesystem::path --- src/ui/dialog/keypair_details/KeyUIDSignDialog.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'src/ui/dialog/keypair_details/KeyUIDSignDialog.cpp') diff --git a/src/ui/dialog/keypair_details/KeyUIDSignDialog.cpp b/src/ui/dialog/keypair_details/KeyUIDSignDialog.cpp index 47b8eb93..55cafe55 100644 --- a/src/ui/dialog/keypair_details/KeyUIDSignDialog.cpp +++ b/src/ui/dialog/keypair_details/KeyUIDSignDialog.cpp @@ -109,14 +109,7 @@ void KeyUIDSignDialog::slot_sign_key(bool clicked) { auto keys = GpgKeyGetter::GetInstance().GetKeys(key_ids); GF_UI_LOG_DEBUG("key info got"); -#ifdef GPGFRONTEND_GUI_QT6 - auto expires = - std::make_unique(boost::posix_time::from_time_t( - expires_edit_->dateTime().toSecsSinceEpoch())); -#else - auto expires = std::make_unique( - boost::posix_time::from_time_t(expires_edit_->dateTime().toTime_t())); -#endif + auto expires = std::make_unique(expires_edit_->dateTime()); GF_UI_LOG_DEBUG("sign start"); for (const auto& uid : *m_uids_) { -- cgit v1.2.3 From 620ae9e7c1a8b2db2515c080416cb592066e5fec Mon Sep 17 00:00:00 2001 From: saturneric Date: Tue, 16 Jan 2024 21:35:59 +0800 Subject: refactor: remove libgettext from project --- src/ui/dialog/keypair_details/KeyUIDSignDialog.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'src/ui/dialog/keypair_details/KeyUIDSignDialog.cpp') diff --git a/src/ui/dialog/keypair_details/KeyUIDSignDialog.cpp b/src/ui/dialog/keypair_details/KeyUIDSignDialog.cpp index 55cafe55..ba12f232 100644 --- a/src/ui/dialog/keypair_details/KeyUIDSignDialog.cpp +++ b/src/ui/dialog/keypair_details/KeyUIDSignDialog.cpp @@ -43,7 +43,7 @@ KeyUIDSignDialog::KeyUIDSignDialog(const GpgKey& key, UIDArgsListPtr uid, const auto key_id = m_key_.GetId(); m_key_list_ = new KeyList(KeyMenuAbility::NONE, this); m_key_list_->AddListGroupTab( - _("Signers"), "signers", KeyListRow::ONLY_SECRET_KEY, + tr("Signers"), "signers", KeyListRow::ONLY_SECRET_KEY, KeyListColumn::NAME | KeyListColumn::EmailAddress, [key_id](const GpgKey& key, const KeyTable&) -> bool { return !(key.IsDisabled() || !key.IsHasCertificationCapability() || @@ -83,7 +83,7 @@ KeyUIDSignDialog::KeyUIDSignDialog(const GpgKey& key, UIDArgsListPtr uid, layout->addWidget(m_key_list_, 0, 0); layout->addWidget(sign_key_button_, 2, 0, Qt::AlignRight); - timeLayout->addWidget(new QLabel(_("Expire Date")), 0, 0); + timeLayout->addWidget(new QLabel(tr("Expire Date")), 0, 0); timeLayout->addWidget(expires_edit_, 0, 1); timeLayout->addWidget(non_expire_check_, 0, 2); layout->addLayout(timeLayout, 1, 0); @@ -93,7 +93,7 @@ KeyUIDSignDialog::KeyUIDSignDialog(const GpgKey& key, UIDArgsListPtr uid, this->setLayout(layout); this->setModal(true); - this->setWindowTitle(_("Sign For Key's UID(s)")); + this->setWindowTitle(tr("Sign For Key's UID(s)")); this->adjustSize(); setAttribute(Qt::WA_DeleteOnClose, true); @@ -117,13 +117,14 @@ void KeyUIDSignDialog::slot_sign_key(bool clicked) { // Sign For mKey if (!GpgKeyManager::GetInstance().SignKey(m_key_, *keys, uid, expires)) { QMessageBox::critical( - nullptr, _("Unsuccessful Operation"), - QString(_("Signature operation failed for UID %1")).arg(uid)); + nullptr, tr("Unsuccessful Operation"), + tr("Signature operation failed for UID %1").arg(uid)); } } - QMessageBox::information(nullptr, _("Operation Complete"), - _("The signature operation of the UID is complete")); + QMessageBox::information( + nullptr, tr("Operation Complete"), + tr("The signature operation of the UID is complete")); this->close(); emit SignalKeyUIDSignUpdate(); } -- cgit v1.2.3 From 5baef3c4a3b947d3275e9ce44cfb7a68984f6cca Mon Sep 17 00:00:00 2001 From: saturneric Date: Fri, 19 Jan 2024 21:54:26 +0800 Subject: fix: solve discovered bugs and improve ui operations --- src/ui/dialog/keypair_details/KeyUIDSignDialog.cpp | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) (limited to 'src/ui/dialog/keypair_details/KeyUIDSignDialog.cpp') diff --git a/src/ui/dialog/keypair_details/KeyUIDSignDialog.cpp b/src/ui/dialog/keypair_details/KeyUIDSignDialog.cpp index ba12f232..a56a7fc7 100644 --- a/src/ui/dialog/keypair_details/KeyUIDSignDialog.cpp +++ b/src/ui/dialog/keypair_details/KeyUIDSignDialog.cpp @@ -28,10 +28,10 @@ #include "KeyUIDSignDialog.h" -#include "core/GpgModel.h" #include "core/function/gpg/GpgKeyGetter.h" #include "core/function/gpg/GpgKeyManager.h" #include "ui/UISignalStation.h" +#include "ui/widgets/KeyList.h" namespace GpgFrontend::UI { @@ -70,23 +70,17 @@ KeyUIDSignDialog::KeyUIDSignDialog(const GpgKey& key, UIDArgsListPtr uid, non_expire_check_->setTristate(false); connect(non_expire_check_, &QCheckBox::stateChanged, this, - [this](int state) -> void { - if (state == 0) - expires_edit_->setDisabled(false); - else - expires_edit_->setDisabled(true); - }); + [this](int state) -> void { expires_edit_->setEnabled(state == 0); }); - auto layout = new QGridLayout(); - - auto timeLayout = new QGridLayout(); + auto* layout = new QGridLayout(); + auto* time_layout = new QGridLayout(); layout->addWidget(m_key_list_, 0, 0); layout->addWidget(sign_key_button_, 2, 0, Qt::AlignRight); - timeLayout->addWidget(new QLabel(tr("Expire Date")), 0, 0); - timeLayout->addWidget(expires_edit_, 0, 1); - timeLayout->addWidget(non_expire_check_, 0, 2); - layout->addLayout(timeLayout, 1, 0); + time_layout->addWidget(new QLabel(tr("Expire Date")), 0, 0); + time_layout->addWidget(expires_edit_, 0, 1); + time_layout->addWidget(non_expire_check_, 0, 2); + layout->addLayout(time_layout, 1, 0); connect(sign_key_button_, &QPushButton::clicked, this, &KeyUIDSignDialog::slot_sign_key); -- cgit v1.2.3