[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/KDE/3.5/kdepim
From: Pradeepto Bhattacharya <pradeepto () kde ! org>
Date: 2008-07-07 9:38:40
Message-ID: 1215423520.155748.15920.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 829025 by pradeepto:
Merged revisions 821346-821370,821372-821378,821380-821648,821650,821652-821813,821815 \
-821835,821837-822268,822270-823864,823866-823882,823884-824217,824219-824277,824279-824285,824287-824288,824290-824805,824807-825075,825077-825083,825085-825806 \
via svnmerge from svn+ssh://pradeepto@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
........
r821346 | pradeepto | 2008-06-17 12:16:45 +0530 (Tue, 17 Jun 2008) | 2 lines
-- kolab/issue2568 (kolab/merge79) - Merging from proko2. Adding a "Start \
Certificate Manager" buttong the kleo's Encryption Key Selection \
Dialog.
........
r823853 | tilladam | 2008-06-24 16:38:52 +0530 (Tue, 24 Jun 2008) | 5 lines
Start with a reasonable initial size. We can't rely on size hint,
as the word-wrapped label invalidates the proper minimum size handling.
kolab/issue2568
........
r825806 | tilladam | 2008-06-29 18:11:27 +0530 (Sun, 29 Jun 2008) | 2 lines
Don't be quite so explicit.
........
_M . (directory)
M +26 -6 certmanager/lib/ui/keyselectiondialog.cpp
M +6 -1 certmanager/lib/ui/keyselectiondialog.h
** branches/KDE/3.5/kdepim #property svnmerge-integrated
- /branches/kdepim/enterprise/kdepim:1-767022,767033,767233-767554,767556,767558-76 \
7946,767948-769318,769320-769354,769356-771105,771107-771251,771253-772311,772313-7723 \
16,772318-775194,775196-775202,775204,775207-775211,775213-778001,778003-778004,778007 \
,778010-778011,778013-778029,778031-778727,778729-779448,779450-779482,779484-779505,7 \
79507-779852,779854-779994,782647-783127,783129-783243,783245,783248-783477,783479-783 \
847,784547,787827,817568,817604,817710-818288,818312-819076,819078-820073,820075-82103 \
5,821037-821124,821126-821345,821347-821378,821380-821648,821650-821813,821815-821835, \
821837-822268,822270-823852,823854-823864,823866-824217,824219-824277,824279-824285,82 \
4287-824288,824290-824805,824807-825075,825077-825083,825085-825805,825807-826354,826356-827491
+ /branches/kdepim/enterprise/kdepim:1-767022,767033,767233-767554,767556,767558-767 \
946,767948-769318,769320-769354,769356-771105,771107-771251,771253-772311,772313-77231 \
6,772318-775194,775196-775202,775204,775207-775211,775213-778001,778003-778004,778007, \
778010-778011,778013-778029,778031-778727,778729-779448,779450-779482,779484-779505,77 \
9507-779852,779854-779994,782647-783127,783129-783243,783245,783248-783477,783479-7838 \
47,784547,787827,817568,817604,817710-818288,818312-819076,819078-820073,820075-821035 \
,821037-821124,821126-821378,821380-821648,821650-821813,821815-821835,821837-822268,8 \
22270-823864,823866-824217,824219-824277,824279-824285,824287-824288,824290-824805,824807-825075,825077-825083,825085-826354,826356-827491
--- branches/KDE/3.5/kdepim/certmanager/lib/ui/keyselectiondialog.cpp #829024:829025
@@ -2,7 +2,7 @@
keyselectiondialog.cpp
This file is part of libkleopatra, the KDE keymanagement library
- Copyright (c) 2004 Klarälvdalens Datakonsult AB
+ Copyright (c) 2004 Klarävdalens Datakonsult AB
Based on kpgpui.cpp
Copyright (C) 2001,2002 the KPGP authors
@@ -60,6 +60,7 @@
#include <kwin.h>
#include <kconfig.h>
#include <kmessagebox.h>
+#include <kprocess.h>
// Qt
#include <qcheckbox.h>
@@ -295,7 +296,7 @@
bool rememberChoice,
QWidget * parent, const char * name,
bool modal )
- : KDialogBase( parent, name, modal, title, Default|Ok|Cancel, Ok ),
+ : KDialogBase( parent, name, modal, title, Default|Ok|Cancel|Help, Ok ),
mOpenPGPBackend( 0 ),
mSMIMEBackend( 0 ),
mRememberCB( 0 ),
@@ -314,7 +315,7 @@
bool rememberChoice,
QWidget * parent, const char * name,
bool modal )
- : KDialogBase( parent, name, modal, title, Default|Ok|Cancel, Ok ),
+ : KDialogBase( parent, name, modal, title, Default|Ok|Cancel|Help, Ok ),
mOpenPGPBackend( 0 ),
mSMIMEBackend( 0 ),
mRememberCB( 0 ),
@@ -391,15 +392,16 @@
SLOT(slotRMB(Kleo::KeyListViewItem*,const QPoint&)) );
setButtonText( KDialogBase::Default, i18n("&Reread Keys") );
- connect( this, SIGNAL(defaultClicked()),
- this, SLOT(slotRereadKeys()) );
+ setButtonGuiItem( KDialogBase::Help, i18n("&Start Certificate Manager") );
+ connect( this, SIGNAL(defaultClicked()), this, SLOT(slotRereadKeys()) );
+ connect( this, SIGNAL(helpClicked()), this, SLOT(slotStartCertificateManager()) );
slotRereadKeys();
mTopLayout->activate();
if ( kapp ) {
KWin::setIcons( winId(), kapp->icon(), kapp->miniIcon() );
- QSize dialogSize( sizeHint() );
+ QSize dialogSize( 500, 400 );
KConfigGroup dialogConfig( KGlobal::config(), "Key Selection Dialog" );
dialogSize = dialogConfig.readSizeEntry( "Dialog size", &dialogSize );
@@ -493,6 +495,24 @@
}
}
+void Kleo::KeySelectionDialog::slotHelp()
+{
+ emit helpClicked();
+}
+
+void Kleo::KeySelectionDialog::slotStartCertificateManager()
+{
+ KProcess certManagerProc;
+ certManagerProc << "kleopatra";
+
+ if( !certManagerProc.start( KProcess::DontCare ) )
+ KMessageBox::error( this, i18n( "Could not start certificate manager; "
+ "please check your installation." ),
+ i18n( "Certificate Manager Error" ) );
+ else
+ kdDebug(5006) << "\nslotStartCertManager(): certificate manager started.\n" << \
endl; +}
+
#ifndef __KLEO_UI_SHOW_KEY_LIST_ERROR_H__
#define __KLEO_UI_SHOW_KEY_LIST_ERROR_H__
static void showKeyListError( QWidget * parent, const GpgME::Error & err ) {
--- branches/KDE/3.5/kdepim/certmanager/lib/ui/keyselectiondialog.h #829024:829025
@@ -2,7 +2,7 @@
keyselectiondialog.h
This file is part of libkleopatra, the KDE keymanagement library
- Copyright (c) 2004 Klarälvdalens Datakonsult AB
+ Copyright (c) 2004 Klarävdalens Datakonsult AB
Based on kpgpui.h
Copyright (C) 2001,2002 the KPGP authors
@@ -119,12 +119,17 @@
QStringList smimeFingerprints() const;
bool rememberSelection() const;
+ protected slots:
+ // reimplemented to avoid popping up the help, since we
+ // override the button
+ void slotHelp();
// Could be used by derived classes to insert their own widget
QVBoxLayout* topLayout() const { return mTopLayout; }
private slots:
void slotRereadKeys();
+ void slotStartCertificateManager();
void slotKeyListResult( const GpgME::KeyListResult & );
void slotSelectionChanged();
void slotCheckSelection() { slotCheckSelection( 0 ); }
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic