Page MenuHome GnuPG
Files F26446070

No OneTemporary
Actions

View Options

diff --git a/src/view/searchbar.cpp b/src/view/searchbar.cpp
index c5f742e42..cb48290ae 100644
--- a/src/view/searchbar.cpp
+++ b/src/view/searchbar.cpp
@@ -1,216 +1,217 @@
/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil; -*-
view/searchbar.cpp
This file is part of Kleopatra, the KDE keymanager
SPDX-FileCopyrightText: 2007 Klarälvdalens Datakonsult AB
+ SPDX-FileCopyrightText: 2022 g10 Code GmbH
+ SPDX-FileContributor: Ingo Klöcker <dev@ingo-kloecker.de>
SPDX-License-Identifier: GPL-2.0-or-later
*/
#include <config-kleopatra.h>
#include "searchbar.h"
+#include <Libkleo/Algorithm>
+#include <Libkleo/KeyCache>
#include <Libkleo/KeyFilter>
#include <Libkleo/KeyFilterManager>
#include <KLocalizedString>
#include <QLineEdit>
#include <QComboBox>
#include <QHBoxLayout>
#include <QPushButton>
#include <QSortFilterProxyModel>
#include <Libkleo/GnuPG>
-#include <qgpgme/keylistjob.h>
-#include <qgpgme/protocol.h>
-#include <gpgme++/keylistresult.h>
using namespace Kleo;
namespace
{
class ProxyModel : public QSortFilterProxyModel
{
Q_OBJECT
public:
using QSortFilterProxyModel::QSortFilterProxyModel;
protected:
bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override
{
const QModelIndex index = sourceModel()->index(sourceRow, 0, sourceParent);
const auto matchContexts = qvariant_cast<KeyFilter::MatchContexts>(sourceModel()->data(index, KeyFilterManager::FilterMatchContextsRole));
return matchContexts & KeyFilter::Filtering;
}
};
}
class SearchBar::Private
{
friend class ::Kleo::SearchBar;
SearchBar *const q;
public:
explicit Private(SearchBar *qq);
~Private();
private:
void slotKeyFilterChanged(int idx)
{
Q_EMIT q->keyFilterChanged(keyFilter(idx));
}
std::shared_ptr<KeyFilter> keyFilter(int idx) const
{
const QModelIndex mi = proxyModel->mapToSource(proxyModel->index(idx, 0));
return KeyFilterManager::instance()->fromModelIndex(mi);
}
std::shared_ptr<KeyFilter> currentKeyFilter() const
{
return keyFilter(combo->currentIndex());
}
QString currentKeyFilterID() const
{
if (const std::shared_ptr<KeyFilter> f = currentKeyFilter()) {
return f->id();
} else {
return QString();
}
}
void listNotCertifiedKeys() const
{
lineEdit->clear();
combo->setCurrentIndex(combo->findData(QStringLiteral("not-certified-certificates")));
Q_EMIT q->keyFilterChanged(keyFilter(combo->currentIndex()));
}
/* List all OpenPGP keys and see if we find one with a UID that is
* not at least fully valid. If we find one, show the certify
* button. */
- /* XXX: It would be nice to do this every time the user certifies
- * a key. */
void showOrHideCertifyButton() const
{
- QGpgME::KeyListJob *job = QGpgME::openpgp()->keyListJob();
- connect(job, &QGpgME::KeyListJob::result, job,
- [this](const GpgME::KeyListResult&, const std::vector<GpgME::Key> &keys, const QString&, const GpgME::Error&)
- {
- for (const auto &key: keys) {
- if (Kleo::keyValidity(key) < GpgME::UserID::Validity::Full) {
- certifyButton->show();
- return;
- }
- }
- certifyButton->hide();
- });
- job->start(QStringList());
+ if (!KeyCache::instance()->initialized()) {
+ return;
+ }
+ if (Kleo::any_of(KeyCache::instance()->keys(),
+ [](const auto &key) {
+ return (key.protocol() == GpgME::OpenPGP)
+ && (Kleo::keyValidity(key) < GpgME::UserID::Validity::Full);
+ })) {
+ certifyButton->show();
+ return;
+ }
+ certifyButton->hide();
}
private:
ProxyModel *proxyModel;
QLineEdit *lineEdit;
QComboBox *combo;
QPushButton *certifyButton;
};
SearchBar::Private::Private(SearchBar *qq)
: q(qq)
{
auto layout = new QHBoxLayout(q);
layout->setContentsMargins(0, 0, 0, 0);
lineEdit = new QLineEdit(q);
lineEdit->setClearButtonEnabled(true);
lineEdit->setPlaceholderText(i18n("Search..."));
lineEdit->setAccessibleName(i18n("Filter certificates by text"));
lineEdit->setToolTip(i18n("Show only certificates that match the entered search term."));
layout->addWidget(lineEdit, /*stretch=*/1);
combo = new QComboBox(q);
combo->setAccessibleName(i18n("Filter certificates by category"));
combo->setToolTip(i18n("Show only certificates that belong to the selected category."));
layout->addWidget(combo);
certifyButton = new QPushButton(q);
certifyButton->setIcon(QIcon::fromTheme(QStringLiteral("security-medium")));
certifyButton->setAccessibleName(i18n("Show not certified certificates"));
certifyButton->setToolTip(i18n("Some certificates are not yet certified. "
"Click here to see a list of these certificates."
"<br/><br/>"
"Certification is required to make sure that the certificates "
"actually belong to the identity they claim to belong to."));
certifyButton->hide();
layout->addWidget(certifyButton);
- showOrHideCertifyButton();
proxyModel = new ProxyModel{q};
proxyModel->setSourceModel(KeyFilterManager::instance()->model());
proxyModel->sort(0, Qt::AscendingOrder);
combo->setModel(proxyModel);
KDAB_SET_OBJECT_NAME(layout);
KDAB_SET_OBJECT_NAME(lineEdit);
KDAB_SET_OBJECT_NAME(combo);
KDAB_SET_OBJECT_NAME(certifyButton);
connect(lineEdit, &QLineEdit::textChanged, q, &SearchBar::stringFilterChanged);
connect(combo, SIGNAL(currentIndexChanged(int)), q, SLOT(slotKeyFilterChanged(int)));
connect(certifyButton, SIGNAL(clicked()), q, SLOT(listNotCertifiedKeys()));
+
+ connect(KeyCache::instance().get(), &KeyCache::keyListingDone,
+ q, [this]() { showOrHideCertifyButton(); });
+ showOrHideCertifyButton();
}
SearchBar::Private::~Private() {}
SearchBar::SearchBar(QWidget *parent, Qt::WindowFlags f)
: QWidget(parent, f), d(new Private(this))
{
}
SearchBar::~SearchBar() {}
void SearchBar::updateClickMessage(const QString &shortcutStr)
{
d->lineEdit->setPlaceholderText(i18n("Search...<%1>", shortcutStr));
}
// slot
void SearchBar::setStringFilter(const QString &filter)
{
d->lineEdit->setText(filter);
}
// slot
void SearchBar::setKeyFilter(const std::shared_ptr<KeyFilter> &kf)
{
const QModelIndex sourceIndex = KeyFilterManager::instance()->toModelIndex(kf);
const QModelIndex proxyIndex = d->proxyModel->mapFromSource(sourceIndex);
if (proxyIndex.isValid()) {
d->combo->setCurrentIndex(proxyIndex.row());
} else {
d->combo->setCurrentIndex(0);
}
}
// slot
void SearchBar::setChangeStringFilterEnabled(bool on)
{
d->lineEdit->setEnabled(on);
}
// slot
void SearchBar::setChangeKeyFilterEnabled(bool on)
{
d->combo->setEnabled(on);
}
QLineEdit *SearchBar::lineEdit() const
{
return d->lineEdit;
}
#include "moc_searchbar.cpp"
#include "searchbar.moc"

File Metadata

Mime Type
text/x-diff
Expires
Thu, Jul 17, 12:26 AM (20 h, 52 m)
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
89/c5/52a00cd349b724a642fa0393a214

Event Timeline