diff --git a/src/dialogs/lookupcertificatesdialog.cpp b/src/dialogs/lookupcertificatesdialog.cpp index 6989452b6..98a01e255 100644 --- a/src/dialogs/lookupcertificatesdialog.cpp +++ b/src/dialogs/lookupcertificatesdialog.cpp @@ -1,269 +1,260 @@ /* -*- mode: c++; c-basic-offset:4 -*- dialogs/lookupcertificatesdialog.cpp This file is part of Kleopatra, the KDE keymanager Copyright (c) 2008 Klarälvdalens Datakonsult AB Kleopatra is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. Kleopatra is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of the Qt library by Trolltech AS, Norway (or with modified versions of Qt that use the same license as Qt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than Qt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ #include #include "lookupcertificatesdialog.h" #include "ui_lookupcertificatesdialog.h" -#include - #include -#include -#include #include #include #include #include #include +#include #include using namespace Kleo; using namespace Kleo::Dialogs; using namespace GpgME; -static const int minimalSearchTextLength = 2; // ### TODO: make that KIOSK-able +static const int minimalSearchTextLength = 2; class LookupCertificatesDialog::Private { friend class ::Kleo::Dialogs::LookupCertificatesDialog; LookupCertificatesDialog *const q; public: explicit Private(LookupCertificatesDialog *qq); ~Private(); private: void slotSelectionChanged() { enableDisableWidgets(); } void slotSearchTextChanged() { enableDisableWidgets(); } void slotSearchClicked() { Q_EMIT q->searchTextChanged(ui.findED->text()); } void slotDetailsClicked() { Q_ASSERT(q->selectedCertificates().size() == 1); Q_EMIT q->detailsRequested(q->selectedCertificates().front()); } void slotSaveAsClicked() { Q_EMIT q->saveAsRequested(q->selectedCertificates()); } void readConfig(); void writeConfig(); void enableDisableWidgets(); QString searchText() const { return ui.findED->text().trimmed(); } - QModelIndexList selectedIndexes() const + + std::vector selectedCertificates() const { - if (const QItemSelectionModel *const sm = ui.resultTV->selectionModel()) { - return sm->selectedRows(); - } else { - return QModelIndexList(); + const QAbstractItemView *const view = ui.resultTV->view(); + if (!view) { + return std::vector(); } + const auto *const model = dynamic_cast(view->model()); + Q_ASSERT(model); + const QItemSelectionModel *const sm = view->selectionModel(); + Q_ASSERT(sm); + return model->keys(sm->selectedRows()); } + int numSelectedCertificates() const { - return selectedIndexes().size(); + return ui.resultTV->selectedKeys().size(); } private: - AbstractKeyListModel *model; - KeyListSortFilterProxyModel proxy; bool passive; struct Ui : Ui_LookupCertificatesDialog { explicit Ui(LookupCertificatesDialog *q) : Ui_LookupCertificatesDialog() { setupUi(q); saveAsPB->hide(); // ### not yet implemented in LookupCertificatesCommand findED->setClearButtonEnabled(true); + resultTV->setFlatModel(AbstractKeyListModel::createFlatKeyListModel(q)); + resultTV->setHierarchicalView(false); + importPB()->setText(i18n("Import")); importPB()->setEnabled(false); - HeaderView *hv = new HeaderView(Qt::Horizontal); - KDAB_SET_OBJECT_NAME(hv); - resultTV->setHeader(hv); - - connect(resultTV, SIGNAL(doubleClicked(QModelIndex)), + connect(resultTV->view(), SIGNAL(doubleClicked(QModelIndex)), importPB(), SLOT(animateClick())); findED->setFocus(); + + connect(selectAllPB, &QPushButton::clicked, + resultTV->view(), &QTreeView::selectAll); + connect(deselectAllPB, &QPushButton::clicked, + resultTV->view(), &QTreeView::clearSelection); } QPushButton *importPB() const { return buttonBox->button(QDialogButtonBox::Save); } QPushButton *closePB() const { return buttonBox->button(QDialogButtonBox::Close); } } ui; }; LookupCertificatesDialog::Private::Private(LookupCertificatesDialog *qq) : q(qq), - model(AbstractKeyListModel::createFlatKeyListModel()), - proxy(), passive(false), ui(q) { - KDAB_SET_OBJECT_NAME(model); - KDAB_SET_OBJECT_NAME(proxy); - - proxy.setSourceModel(model); - ui.resultTV->setModel(&proxy); - - connect(ui.resultTV->selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)), + connect(ui.resultTV->view()->selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)), q, SLOT(slotSelectionChanged())); } LookupCertificatesDialog::Private::~Private() {} void LookupCertificatesDialog::Private::readConfig() { KConfigGroup dialog(KSharedConfig::openConfig(), "LookupCertificatesDialog"); const QSize size = dialog.readEntry("Size", QSize(600, 400)); if (size.isValid()) { q->resize(size); } - const QByteArray headerState = dialog.readEntry("header", QByteArray()); - if (!headerState.isEmpty()) { - ui.resultTV->header()->restoreState(headerState); - } } void LookupCertificatesDialog::Private::writeConfig() { KConfigGroup dialog(KSharedConfig::openConfig(), "LookupCertificatesDialog"); - dialog.writeEntry("header", ui.resultTV->header()->saveState()); dialog.writeEntry("Size", q->size()); dialog.sync(); } LookupCertificatesDialog::LookupCertificatesDialog(QWidget *p, Qt::WindowFlags f) : QDialog(p, f), d(new Private(this)) { d->ui.findPB->setEnabled(false); d->readConfig(); } LookupCertificatesDialog::~LookupCertificatesDialog() { d->writeConfig(); } void LookupCertificatesDialog::setCertificates(const std::vector &certs) { - d->model->setKeys(certs); - d->ui.resultTV->header()->resizeSections(QHeaderView::ResizeToContents); - d->ui.resultTV->setFocus(); + d->ui.resultTV->view()->setFocus(); + d->ui.resultTV->setKeys(certs); } std::vector LookupCertificatesDialog::selectedCertificates() const { - return d->proxy.keys(d->selectedIndexes()); + return d->selectedCertificates(); } void LookupCertificatesDialog::setPassive(bool on) { if (d->passive == on) { return; } d->passive = on; d->enableDisableWidgets(); } bool LookupCertificatesDialog::isPassive() const { return d->passive; } void LookupCertificatesDialog::setSearchText(const QString &text) { d->ui.findED->setText(text); } QString LookupCertificatesDialog::searchText() const { return d->ui.findED->text(); } void LookupCertificatesDialog::accept() { - Q_ASSERT(!d->selectedIndexes().empty()); + Q_ASSERT(!selectedCertificates().empty()); Q_EMIT importRequested(selectedCertificates()); QDialog::accept(); } void LookupCertificatesDialog::Private::enableDisableWidgets() { // enable/disable everything except 'close', based on passive: Q_FOREACH (QObject *const o, q->children()) if (QWidget *const w = qobject_cast(o)) { w->setDisabled(passive && w != ui.closePB() && w != ui.buttonBox); } if (passive) { return; } ui.findPB->setEnabled(searchText().length() > minimalSearchTextLength); - const int n = numSelectedCertificates(); + const int n = q->selectedCertificates().size(); ui.detailsPB->setEnabled(n == 1); ui.saveAsPB->setEnabled(n == 1); ui.importPB()->setEnabled(n != 0); ui.importPB()->setDefault(false); // otherwise Import becomes default button if enabled and return triggers both a search and accept() } #include "moc_lookupcertificatesdialog.cpp" diff --git a/src/dialogs/lookupcertificatesdialog.ui b/src/dialogs/lookupcertificatesdialog.ui index 666cef3c6..029c84b24 100644 --- a/src/dialogs/lookupcertificatesdialog.ui +++ b/src/dialogs/lookupcertificatesdialog.ui @@ -1,299 +1,265 @@ LookupCertificatesDialog 0 0 553 292 Lookup on Server Search false Qt::Horizontal false Details... false false Save As... false false Select All false Qt::Vertical 20 40 false Deselect All false Find: findED - + true 400 0 - - QAbstractItemView::ExtendedSelection - - - true - - - true - QDialogButtonBox::Close|QDialogButtonBox::Save + + + Kleo::KeyTreeView + QWidget +
view/keytreeview.h
+ + findED returnPressed() findPB animateClick() 409 19 430 19 buttonBox accepted() LookupCertificatesDialog accept() 28 265 46 291 buttonBox rejected() LookupCertificatesDialog reject() 188 273 218 291 - - selectAllPB - clicked() - resultTV - selectAll() - - - 437 - 79 - - - 409 - 77 - - - - - deselectAllPB - clicked() - resultTV - clearSelection() - - - 465 - 115 - - - 409 - 119 - - - findPB clicked() LookupCertificatesDialog slotSearchClicked() 437 39 443 45 detailsPB clicked() LookupCertificatesDialog slotDetailsClicked() 523 177 541 177 saveAsPB clicked() LookupCertificatesDialog slotSaveAsClicked() 517 221 539 219 findED textChanged(QString) LookupCertificatesDialog slotSearchTextChanged() 93 19 93 3 slotSearchClicked() slotDetailsClicked() slotSaveAsClicked() slotSearchTextChanged()