From e7694f9a0729cb88064eda6623c99070f5a46dc0 Mon Sep 17 00:00:00 2001 From: saturneric Date: Sun, 2 Jun 2024 22:03:59 +0200 Subject: feat: rewrite key list structure and logic --- src/ui/dialog/SignersPicker.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/ui/dialog/SignersPicker.cpp') diff --git a/src/ui/dialog/SignersPicker.cpp b/src/ui/dialog/SignersPicker.cpp index 9c342cc7..5ab33425 100644 --- a/src/ui/dialog/SignersPicker.cpp +++ b/src/ui/dialog/SignersPicker.cpp @@ -46,9 +46,10 @@ SignersPicker::SignersPicker(QWidget* parent) /*Setup KeyList*/ key_list_ = new KeyList(0U, this); key_list_->AddListGroupTab( - tr("Signers"), "signers", KeyListRow::ONLY_SECRET_KEY, - KeyListColumn::NAME | KeyListColumn::EmailAddress | KeyListColumn::Usage, - [](const GpgKey& key, const KeyTable&) -> bool { + tr("Signers"), "signers", GpgKeyTableDisplayMode::kPrivateKey, + GpgKeyTableColumn::kName | GpgKeyTableColumn::kEmailAddress | + GpgKeyTableColumn::kUsage, + [](const GpgKey& key) -> bool { return key.IsHasActualSigningCapability(); }); key_list_->SlotRefresh(); -- cgit v1.2.3 From d0333031c1f593998a501eff866f091ff2f036be Mon Sep 17 00:00:00 2001 From: saturneric Date: Fri, 28 Jun 2024 23:05:25 +0200 Subject: feat: user can select shown columns at key table --- src/ui/dialog/SignersPicker.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'src/ui/dialog/SignersPicker.cpp') diff --git a/src/ui/dialog/SignersPicker.cpp b/src/ui/dialog/SignersPicker.cpp index 5ab33425..c6bbbbe7 100644 --- a/src/ui/dialog/SignersPicker.cpp +++ b/src/ui/dialog/SignersPicker.cpp @@ -44,23 +44,23 @@ SignersPicker::SignersPicker(QWidget* parent) connect(cancel_button, &QPushButton::clicked, this, &QDialog::reject); /*Setup KeyList*/ - key_list_ = new KeyList(0U, this); - key_list_->AddListGroupTab( - tr("Signers"), "signers", GpgKeyTableDisplayMode::kPrivateKey, - GpgKeyTableColumn::kName | GpgKeyTableColumn::kEmailAddress | - GpgKeyTableColumn::kUsage, - [](const GpgKey& key) -> bool { - return key.IsHasActualSigningCapability(); - }); + key_list_ = + new KeyList(KeyMenuAbility::SEARCH_BAR, + GpgKeyTableColumn::kNAME | GpgKeyTableColumn::kEMAIL_ADDRESS | + GpgKeyTableColumn::kKEY_ID | GpgKeyTableColumn::kUSAGE, + this); + key_list_->AddListGroupTab(tr("Signers"), "signers", + GpgKeyTableDisplayMode::kPRIVATE_KEY, + [](const GpgKey& key) -> bool { + return key.IsHasActualSigningCapability(); + }); key_list_->SlotRefresh(); auto* vbox2 = new QVBoxLayout(); vbox2->addWidget(new QLabel(tr("Select Signer(s)") + ": ")); vbox2->addWidget(key_list_); vbox2->addWidget(new QLabel( - QString( - tr("Please select one or more private keys you use for signing.")) + - "\n" + + tr("Please select one or more private keys you use for signing.") + "\n" + tr("If no key is selected, the default key will be used for signing."))); vbox2->addWidget(confirm_button); vbox2->addWidget(cancel_button); -- cgit v1.2.3 From 19926663f11c1013d0c68ccc92f2a4e236942ce9 Mon Sep 17 00:00:00 2001 From: saturneric Date: Fri, 28 Jun 2024 23:20:04 +0200 Subject: refactor: rewrite KeyMenuAbility --- src/ui/dialog/SignersPicker.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/ui/dialog/SignersPicker.cpp') diff --git a/src/ui/dialog/SignersPicker.cpp b/src/ui/dialog/SignersPicker.cpp index c6bbbbe7..7152bc6e 100644 --- a/src/ui/dialog/SignersPicker.cpp +++ b/src/ui/dialog/SignersPicker.cpp @@ -45,7 +45,7 @@ SignersPicker::SignersPicker(QWidget* parent) /*Setup KeyList*/ key_list_ = - new KeyList(KeyMenuAbility::SEARCH_BAR, + new KeyList(KeyMenuAbility::kCOLUMN_FILTER | KeyMenuAbility::kSEARCH_BAR, GpgKeyTableColumn::kNAME | GpgKeyTableColumn::kEMAIL_ADDRESS | GpgKeyTableColumn::kKEY_ID | GpgKeyTableColumn::kUSAGE, this); -- cgit v1.2.3