[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdepim/kleopatra/dialogs
From: Marc Mutz <mutz () kde ! org>
Date: 2010-09-23 12:14:05
Message-ID: 20100923121405.A4E29AC88C () svn ! kde ! org
[Download RAW message or body]
SVN commit 1178640 by mutz:
dialogs/: remove dialogs that are QWizards, and remove code that would call QWizards
M +4 -0 certificatedetailsdialog.cpp
M +2 -0 certificatedetailsdialog.h
M +8 -0 certificateselectiondialog.cpp
M +2 -0 certificateselectiondialog.h
M +4 -0 certifycertificatedialog.cpp
M +4 -2 certifycertificatedialog.h
--- trunk/KDE/kdepim/kleopatra/dialogs/certificatedetailsdialog.cpp #1178639:1178640
@@ -159,6 +159,7 @@
commandFinished( addUserIDCommand );
}
+#ifndef QT_NO_WIZARD
void slotCertifyUserIDClicked() {
const std::vector<UserID> uids = selectedUserIDs();
if ( uids.empty() )
@@ -168,6 +169,7 @@
void slotSignCertificateCommandFinished() {
commandFinished( signCertificateCommand );
}
+#endif // QT_NO_WIZARD
void slotRevokeCertificateClicked() {
@@ -337,7 +339,9 @@
const std::vector<UserID> uids = selectedUserIDs();
const std::vector<UserID::Signature> sigs = selectedSignatures();
+#ifndef QT_NO_WIZARD
ui.certifyUserIDPB->setEnabled( !uids.empty() && sigs.empty() && \
!signCertificateCommand ); +#endif
ui.revokeUserIDPB->setEnabled( !uids.empty() && sigs.empty() );
ui.revokeCertificationPB->setEnabled( uids.empty() && !sigs.empty() && own( \
sigs ) ); }
--- trunk/KDE/kdepim/kleopatra/dialogs/certificatedetailsdialog.h #1178639:1178640
@@ -68,8 +68,10 @@
Q_PRIVATE_SLOT( d, void slotAddUserIDClicked() )
Q_PRIVATE_SLOT( d, void slotAddUserIDCommandFinished() )
Q_PRIVATE_SLOT( d, void slotRevokeUserIDClicked() )
+#ifndef QT_NO_WIZARD
Q_PRIVATE_SLOT( d, void slotCertifyUserIDClicked() )
Q_PRIVATE_SLOT( d, void slotSignCertificateCommandFinished() )
+#endif // QT_NO_WIZARD
Q_PRIVATE_SLOT( d, void slotRevokeCertificationClicked() )
Q_PRIVATE_SLOT( d, void slotShowCertificationsClicked() )
Q_PRIVATE_SLOT( d, void slotSignatureListingNextKey(GpgME::Key) )
--- trunk/KDE/kdepim/kleopatra/dialogs/certificateselectiondialog.cpp \
#1178639:1178640 @@ -82,6 +82,7 @@
cmd->setParentWidget( q );
cmd->start();
}
+#ifndef QT_NO_WIZARD
void create() {
NewCertificateCommand * cmd = new NewCertificateCommand( 0 );
cmd->setParentWidget( q );
@@ -89,6 +90,7 @@
cmd->setProtocol( (options & OpenPGPFormat) ? OpenPGP : CMS );
cmd->start();
}
+#endif
void lookup() {
Command * const cmd = new LookupCertificatesCommand( 0 );
cmd->setParentWidget( q );
@@ -147,17 +149,23 @@
Q_UNUSED( cancel );
QPushButton * const reload = buttonBox.addButton( i18n("Reload"), \
QDialogButtonBox::ActionRole );
QPushButton * const lookup = buttonBox.addButton( i18n("Lookup..."), \
QDialogButtonBox::ActionRole ); +#ifndef QT_NO_WIZARD
QPushButton * const create = buttonBox.addButton( i18n("New..."), \
QDialogButtonBox::ActionRole ); +#endif
lookup->setToolTip( i18nc("@info:tooltip","Lookup certificates on \
server") );
reload->setToolTip( i18nc("@info:tooltip","Refresh certificate list") );
+#ifndef QT_NO_WIZARD
create->setToolTip( i18nc("@info:tooltip","Create a new certificate") );
+#endif
connect( &buttonBox, SIGNAL(accepted()), q, SLOT(accept()) );
connect( &buttonBox, SIGNAL(rejected()), q, SLOT(reject()) );
connect( reload, SIGNAL(clicked()), q, SLOT(reload()) );
connect( lookup, SIGNAL(clicked()), q, SLOT(lookup()) );
+#ifndef QT_NO_WIZARD
connect( create, SIGNAL(clicked()), q, SLOT(create()) );
+#endif
connect( KeyCache::instance().get(), SIGNAL(keysMayHaveChanged()),
q, SLOT(slotKeysMayHaveChanged()) );
}
--- trunk/KDE/kdepim/kleopatra/dialogs/certificateselectiondialog.h #1178639:1178640
@@ -104,7 +104,9 @@
class Private;
kdtools::pimpl_ptr<Private> d;
Q_PRIVATE_SLOT( d, void reload() )
+#ifndef QT_NO_WIZARD
Q_PRIVATE_SLOT( d, void create() )
+#endif
Q_PRIVATE_SLOT( d, void lookup() )
Q_PRIVATE_SLOT( d, void slotKeysMayHaveChanged() )
Q_PRIVATE_SLOT( d, void slotSelectionChanged() )
--- trunk/KDE/kdepim/kleopatra/dialogs/certifycertificatedialog.cpp #1178639:1178640
@@ -33,6 +33,9 @@
#include <config-kleopatra.h>
#include "certifycertificatedialog.h"
+
+#ifndef QT_NO_WIZARD
+
#include "certifycertificatedialog_p.h"
#include <utils/formatting.h>
@@ -457,3 +460,4 @@
#include "moc_certifycertificatedialog.cpp"
#include "moc_certifycertificatedialog_p.cpp"
+#endif // QT_NO_WIZARD
--- trunk/KDE/kdepim/kleopatra/dialogs/certifycertificatedialog.h #1178639:1178640
@@ -33,10 +33,10 @@
#ifndef __KLEOPATRA_DIALOGS_CERTIFYCERTIFICATEDIALOG_H__
#define __KLEOPATRA_DIALOGS_CERTIFYCERTIFICATEDIALOG_H__
-#include <QDialog>
-
#include <QWizard>
+#ifndef QT_NO_WIZARD
+
#include <kleo/signkeyjob.h>
#include <gpgme++/key.h>
@@ -91,5 +91,7 @@
}
}
+#endif // QT_NO_WIZARD
+
#endif /* __KLEOPATRA_DIALOGS_CERTIFYCERTIFICATEDIALOG_H__ */
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic