Page MenuHome GnuPG
Files F36276680

No OneTemporary
Actions

View Options

diff --git a/dialogs/certificatedetailsdialog.cpp b/dialogs/certificatedetailsdialog.cpp
index 5177fa4e8..7a83ff6c3 100644
--- a/dialogs/certificatedetailsdialog.cpp
+++ b/dialogs/certificatedetailsdialog.cpp
@@ -1,284 +1,283 @@
/* -*- mode: c++; c-basic-offset:4 -*-
dialogs/certificatedetailsdialog.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 <config-kleopatra.h>
#include "certificatedetailsdialog.h"
#include "ui_certificatedetailsdialog.h"
#include <models/useridlistmodel.h>
#include <models/keycache.h>
#include <commands/changepassphrasecommand.h>
#include <commands/changeownertrustcommand.h>
#include <commands/changeexpirycommand.h>
#include <commands/adduseridcommand.h>
+#include <commands/signcertificatecommand.h>
#include <utils/formatting.h>
#include <gpgme++/key.h>
#include <KDebug>
#include <KMessageBox>
#include <KLocalizedString>
#include <QPointer>
#include <boost/mem_fn.hpp>
#include <algorithm>
#include <cassert>
using namespace Kleo;
using namespace Kleo::Dialogs;
using namespace Kleo::Commands;
using namespace GpgME;
using namespace boost;
static bool own( const std::vector<UserID::Signature> & sigs ) {
// ### check whether we have secret keys for all sigs (by fingerprint)
return false;
}
class CertificateDetailsDialog::Private {
friend class ::Kleo::Dialogs::CertificateDetailsDialog;
CertificateDetailsDialog * const q;
public:
explicit Private( CertificateDetailsDialog * qq )
: q( qq ),
key(),
certificationsModel(),
ui( q )
{
ui.certificationsTV->setModel( &certificationsModel );
connect( ui.certificationsTV->selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)),
q, SLOT(slotCertificationSelectionChanged()) );
connect( KeyCache::instance().get(), SIGNAL(keysMayHaveChanged()),
q, SLOT(slotKeysMayHaveChanged()) );
}
private:
void startCommandImplementation( const QPointer<Command> & ptr, const char * slot ) {
connect( ptr, SIGNAL(finished()), q, slot );
ptr->start();
enableDisableWidgets();
}
- template <typename T>
- void startCommand( QPointer<Command> & ptr, const char * slot ) {
+ template <typename T, typename A>
+ void startCommand( QPointer<Command> & ptr, const A & arg, const char * slot ) {
if ( ptr )
return;
- ptr = new T( this->key );
+ ptr = new T( arg );
startCommandImplementation( ptr, slot );
}
+ template <typename T>
+ void startCommand( QPointer<Command> & ptr, const char * slot ) {
+ startCommand<T>( ptr, this->key, slot );
+ }
void commandFinished( QPointer<Command> & ptr ) {
ptr = 0;
enableDisableWidgets();
}
void slotChangePassphraseClicked() {
startCommand<ChangePassphraseCommand>( changePassphraseCommand, SLOT(slotChangePassphraseCommandFinished()) );
}
void slotChangePassphraseCommandFinished() {
commandFinished( changePassphraseCommand );
}
void slotChangeTrustLevelClicked() {
startCommand<ChangeOwnerTrustCommand>( changeOwnerTrustCommand, SLOT(slotChangeOwnerTrustCommandFinished()) );
}
void slotChangeOwnerTrustCommandFinished() {
commandFinished( changeOwnerTrustCommand );
}
void slotChangeExpiryDateClicked() {
startCommand<ChangeExpiryCommand>( changeExpiryDateCommand, SLOT(slotChangeExpiryDateCommandFinished()) );
}
void slotChangeExpiryDateCommandFinished() {
commandFinished( changeExpiryDateCommand );
}
- void slotRevokeCertificateClicked();
-
void slotAddUserIDClicked() {
startCommand<AddUserIDCommand>( addUserIDCommand, SLOT(slotAddUserIDCommandFinished()) );
}
void slotAddUserIDCommandFinished() {
commandFinished( addUserIDCommand );
}
- void slotRevokeUserIDClicked();
- void slotCertifyUserIDClicked();
+ void slotCertifyUserIDClicked() {
+ const std::vector<UserID> uids = selectedUserIDs();
+ if ( uids.empty() )
+ return;
+ startCommand<SignCertificateCommand>( signCertificateCommand, uids, SLOT(slotSignCertificateCommandFinished()) );
+ }
+ void slotSignCertificateCommandFinished() {
+ commandFinished( signCertificateCommand );
+ }
+
+ void slotRevokeCertificateClicked() {
+
+ }
+
+ void slotRevokeUserIDClicked() {
+
+ }
+
+ void slotRevokeCertificationClicked() {
+
+ }
- void slotRevokeCertificationClicked();
+ void slotShowCertificationsClicked() {
- void slotShowCertificationsClicked();
+ }
void slotCertificationSelectionChanged() {
enableDisableWidgets();
}
void slotKeysMayHaveChanged() {
if ( const char * const fpr = key.primaryFingerprint() )
q->setKey( KeyCache::instance()->findByFingerprint( fpr ) );
}
private:
void updateWidgetVisibility() {
const bool x509 = key.protocol() == CMS;
const bool pgp = key.protocol() == OpenPGP;
const bool secret = key.hasSecret();
const bool sigs = (key.keyListMode() & Signatures);
// Overview Tab
ui.changePassphrasePB->setVisible( secret );
ui.changeTrustLevelPB->setVisible( pgp && !secret );
ui.changeExpiryDatePB->setVisible( pgp && secret );
// Certifications Tab
ui.userIDsActionsGB->setVisible( pgp );
ui.certificationsActionGB->setVisible( pgp );
ui.addUserIDPB->setVisible( secret );
- ui.certifyUserIDPB->setVisible( !secret );
ui.showCertificationsPB->setVisible( pgp && !sigs );
// ...
}
QModelIndexList selectedCertificationsIndexes() const {
return ui.certificationsTV->selectionModel()->selectedRows();
}
std::vector<UserID> selectedUserIDs() const {
const QModelIndexList mil = selectedCertificationsIndexes();
std::vector<UserID> uids = certificationsModel.userIDs( mil, true );
uids.erase( std::remove_if( uids.begin(), uids.end(), mem_fn( &UserID::isNull ) ), uids.end() );
return uids;
}
std::vector<UserID::Signature> selectedSignatures() const {
const QModelIndexList mil = selectedCertificationsIndexes();
std::vector<UserID::Signature> sigs = certificationsModel.signatures( mil );
sigs.erase( std::remove_if( sigs.begin(), sigs.end(), mem_fn( &UserID::Signature::isNull ) ), sigs.end() );
return sigs;
}
void enableDisableWidgets() {
// Overview Tab
ui.changePassphrasePB->setEnabled( !changePassphraseCommand );
ui.changeTrustLevelPB->setEnabled( !changeOwnerTrustCommand );
ui.changeExpiryDatePB->setEnabled( !changeExpiryDateCommand );
// Certifications Tab
ui.addUserIDPB->setEnabled( !addUserIDCommand );
const std::vector<UserID> uids = selectedUserIDs();
const std::vector<UserID::Signature> sigs = selectedSignatures();
- ui.certifyUserIDPB->setEnabled( !uids.empty() && sigs.empty() );
+ ui.certifyUserIDPB->setEnabled( !uids.empty() && sigs.empty() && !signCertificateCommand );
ui.revokeUserIDPB->setEnabled( !uids.empty() && sigs.empty() );
ui.revokeCertificationPB->setEnabled( uids.empty() && !sigs.empty() && own( sigs ) );
}
void updateLabel() {
ui.overviewLB->setText( Formatting::formatOverview( key ) );
}
void propagateKey() {
certificationsModel.setKey( key );
}
private:
Key key;
UserIDListModel certificationsModel;
QPointer<Command> changePassphraseCommand;
QPointer<Command> changeOwnerTrustCommand;
QPointer<Command> changeExpiryDateCommand;
QPointer<Command> addUserIDCommand;
+ QPointer<Command> signCertificateCommand;
struct UI : public Ui_CertificateDetailsDialog {
explicit UI( Dialogs::CertificateDetailsDialog * qq )
: Ui_CertificateDetailsDialog()
{
setupUi( qq );
}
} ui;
};
CertificateDetailsDialog::CertificateDetailsDialog( QWidget * p, Qt::WindowFlags f )
: QDialog( p, f ), d( new Private( this ) )
{
}
CertificateDetailsDialog::~CertificateDetailsDialog() {}
void CertificateDetailsDialog::setKey( const Key & key ) {
d->key = key;
d->updateWidgetVisibility();
d->enableDisableWidgets();
d->updateLabel();
d->propagateKey();
}
Key CertificateDetailsDialog::key() const {
return d->key;
}
-void CertificateDetailsDialog::Private::slotRevokeCertificateClicked() {
-
-}
-
-
-void CertificateDetailsDialog::Private::slotRevokeUserIDClicked() {
-
-}
-
-void CertificateDetailsDialog::Private::slotCertifyUserIDClicked() {
-
-}
-
-void CertificateDetailsDialog::Private::slotRevokeCertificationClicked() {
-
-}
-
-void CertificateDetailsDialog::Private::slotShowCertificationsClicked() {
-
-}
-
-
-
#include "moc_certificatedetailsdialog.cpp"
diff --git a/dialogs/certificatedetailsdialog.h b/dialogs/certificatedetailsdialog.h
index 2032bdd4e..1bf645889 100644
--- a/dialogs/certificatedetailsdialog.h
+++ b/dialogs/certificatedetailsdialog.h
@@ -1,81 +1,82 @@
/* -*- mode: c++; c-basic-offset:4 -*-
dialogs/certificatedetailsdialog.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_DIALOGS_CERTIFICATEDETAILS_H__
#define __KLEOPATRA_DIALOGS_CERTIFICATEDETAILS_H__
#include <QDialog>
#include <utils/pimpl_ptr.h>
class QDate;
namespace GpgME {
class Key;
}
namespace Kleo {
namespace Dialogs {
class CertificateDetailsDialog : public QDialog {
Q_OBJECT
public:
explicit CertificateDetailsDialog( QWidget * parent=0, Qt::WindowFlags f=0 );
~CertificateDetailsDialog();
void setKey( const GpgME::Key & key );
GpgME::Key key() const;
private:
class Private;
kdtools::pimpl_ptr<Private> d;
Q_PRIVATE_SLOT( d, void slotChangePassphraseClicked() )
Q_PRIVATE_SLOT( d, void slotChangePassphraseCommandFinished() )
Q_PRIVATE_SLOT( d, void slotChangeTrustLevelClicked() )
Q_PRIVATE_SLOT( d, void slotChangeOwnerTrustCommandFinished() )
Q_PRIVATE_SLOT( d, void slotChangeExpiryDateClicked() )
Q_PRIVATE_SLOT( d, void slotChangeExpiryDateCommandFinished() )
Q_PRIVATE_SLOT( d, void slotRevokeCertificateClicked() )
Q_PRIVATE_SLOT( d, void slotAddUserIDClicked() )
Q_PRIVATE_SLOT( d, void slotAddUserIDCommandFinished() )
Q_PRIVATE_SLOT( d, void slotRevokeUserIDClicked() )
Q_PRIVATE_SLOT( d, void slotCertifyUserIDClicked() )
+ Q_PRIVATE_SLOT( d, void slotSignCertificateCommandFinished() )
Q_PRIVATE_SLOT( d, void slotRevokeCertificationClicked() )
Q_PRIVATE_SLOT( d, void slotShowCertificationsClicked() )
Q_PRIVATE_SLOT( d, void slotCertificationSelectionChanged() )
Q_PRIVATE_SLOT( d, void slotKeysMayHaveChanged() )
};
}
}
#endif /* __KLEOPATRA_DIALOGS_CERTIFICATEDETAILS_H__ */

File Metadata

Mime Type
text/x-diff
Expires
Sun, Feb 22, 6:50 PM (33 m, 21 s)
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
aa/71/e1b2a356d9c48bd81ac0f830dc35

Event Timeline