diff --git a/src/commands/learncardkeyscommand.cpp b/src/commands/learncardkeyscommand.cpp index 96cf945f9..16f75f946 100644 --- a/src/commands/learncardkeyscommand.cpp +++ b/src/commands/learncardkeyscommand.cpp @@ -1,105 +1,130 @@ /* -*- mode: c++; c-basic-offset:4 -*- commands/learncardkeyscommand.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 "learncardkeyscommand.h" #include "command_p.h" #include #include #include #include +#include + using namespace Kleo; using namespace Kleo::Commands; using namespace GpgME; LearnCardKeysCommand::LearnCardKeysCommand(GpgME::Protocol proto) : GnuPGProcessCommand(nullptr), m_protocol(proto) { setIgnoresSuccessOrFailure(true); setShowsOutputWindow(true); connect(this, &Command::finished, SmartCard::ReaderStatus::mutableInstance(), &SmartCard::ReaderStatus::updateStatus); } LearnCardKeysCommand::~LearnCardKeysCommand() {} Protocol LearnCardKeysCommand::protocol() const { return m_protocol; } QStringList LearnCardKeysCommand::arguments() const { if (protocol() == OpenPGP) { return QStringList() << gpgPath() << QStringLiteral("--batch") << QStringLiteral("--card-status") << QStringLiteral("-v"); } else { return QStringList() << gpgSmPath() << QStringLiteral("--learn-card") << QStringLiteral("-v"); } } QString LearnCardKeysCommand::errorCaption() const { return i18n("Error Learning SmartCard"); } QString LearnCardKeysCommand::successCaption() const { return i18n("Finished Learning SmartCard"); } QString LearnCardKeysCommand::crashExitMessage(const QStringList &args) const { return xi18nc("@info", "The GPG or GpgSM process that tried to learn the smart card " "ended prematurely because of an unexpected error." "Please check the output of %1 for details.", args.join(QLatin1Char(' '))); } QString LearnCardKeysCommand::errorExitMessage(const QStringList &) const { // unused, since we setIgnoresSuccessOrFailure(true) return QString(); } QString LearnCardKeysCommand::successMessage(const QStringList &) const { // unused, since we setIgnoresSuccessOrFailure(true) return QString(); } +void LearnCardKeysCommand::doStart() +{ + GnuPGProcessCommand::doStart(); + + auto detailsDlg = dialog(); + if (detailsDlg) { + detailsDlg->hide(); + } + + const auto dlg = new QProgressDialog(i18n("Loading certificates... (this can take a while)"), + i18n("Show Details"), 0, 0, d->parentWidgetOrView()); + dlg->setAttribute(Qt::WA_DeleteOnClose); + dlg->setModal(true); + connect(dlg, &QProgressDialog::canceled, this, [detailsDlg] () { + if (detailsDlg) { + detailsDlg->show(); + } + }); + connect(this, &LearnCardKeysCommand::finished, this, [dlg] () { + dlg->accept(); + }); + dlg->show(); +} diff --git a/src/commands/learncardkeyscommand.h b/src/commands/learncardkeyscommand.h index 52ca06552..b1604be70 100644 --- a/src/commands/learncardkeyscommand.h +++ b/src/commands/learncardkeyscommand.h @@ -1,76 +1,78 @@ /* -*- mode: c++; c-basic-offset:4 -*- commands/learncardkeyscommand.h 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. */ #ifndef __KLEOPATRA_COMMMANDS_LEARNCARDKEYSCOMMAND_H__ #define __KLEOPATRA_COMMMANDS_LEARNCARDKEYSCOMMAND_H__ #include #include namespace Kleo { namespace Commands { class LearnCardKeysCommand : public GnuPGProcessCommand { Q_OBJECT public: explicit LearnCardKeysCommand(GpgME::Protocol proto); ~LearnCardKeysCommand() override; GpgME::Protocol protocol() const; /* reimp */ static Restrictions restrictions() { return AnyCardCanLearnKeys; } private: + void doStart() override; + QStringList arguments() const override; QString errorCaption() const override; QString successCaption() const override; QString crashExitMessage(const QStringList &) const override; QString errorExitMessage(const QStringList &) const override; QString successMessage(const QStringList &) const override; private: GpgME::Protocol m_protocol; }; } } #endif // __KLEOPATRA_COMMMANDS_LEARNCARDKEYSCOMMAND_H__