[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepim/kmail
From:       Marc Mutz <mutz () kde ! org>
Date:       2010-07-07 11:59:58
Message-ID: 20100707115958.843F7AC85D () svn ! kde ! org
[Download RAW message or body]

SVN commit 1147109 by mutz:

ConfigureDialog: SecurityTab: add a button to configure the Chiasmus cryptogrpahic \
backend.

 M  +23 -0     configuredialog.cpp  
 M  +2 -1      configuredialog_p.h  
 M  +24 -0     ui/warningconfiguration.ui  


--- trunk/KDE/kdepim/kmail/configuredialog.cpp #1147108:1147109
@@ -79,6 +79,7 @@
 #include "kleo/cryptobackendfactory.h"
 #include "libkleo/ui/keyrequester.h"
 #include "libkleo/ui/keyselectiondialog.h"
+#include "libkleo/ui/cryptoconfigdialog.h"
 
 #include <mailtransport/transportmanagementwidget.h>
 using MailTransport::TransportManagementWidget;
@@ -3221,6 +3222,7 @@
   connect( mWidget->warnReceiverNotInCertificateCB, SIGNAL(toggled(bool)), \
SLOT(slotEmitChanged()) );  
   connect( mWidget->gnupgButton, SIGNAL(clicked()), SLOT(slotConfigureGnupg()) );
+  connect( mWidget->chiasmusButton, SIGNAL(clicked()), SLOT(slotConfigureChiasmus()) \
);  connect( mWidget->enableAllWarningsPB, SIGNAL(clicked()), \
SLOT(slotReenableAllWarningsClicked()) );  }
 
@@ -3301,6 +3303,27 @@
   delete dlg;
 }
 
+void SecurityPage::WarningTab::slotConfigureChiasmus()
+{
+  using namespace Kleo;
+  // Find Chiasmus backend:
+  if ( const CryptoBackendFactory * const bf = \
Kleo::CryptoBackendFactory::instance() ) +    for ( unsigned int i = 0 ; const \
CryptoBackend * const b = bf->backend( i ) ; ++i ) +      if ( b->name() == \
QLatin1String( "Chiasmus" ) ) +        if ( CryptoConfig * const c = b->config() ) {
+          QPointer<CryptoConfigDialog> dlg( new CryptoConfigDialog( c, this ) );
+          dlg->exec();
+          delete dlg;
+          break;
+        } else {
+          kWarning() << "Found Chiasmus backend, but there doesn't seem to be a \
config object available from it."; +        }
+      else
+        kDebug() << "Skipping" << b->name() << "backend (not \"Chiasmus\")";
+  else
+    kDebug() << "Kleo::CryptoBackendFactory::instance() returned NULL!";
+}
+
 ////
 
 QString SecurityPage::SMimeTab::helpAnchor() const
--- trunk/KDE/kdepim/kmail/configuredialog_p.h #1147108:1147109
@@ -758,9 +758,10 @@
 
   void save();
 
-private slots:
+private Q_SLOTS:
   void slotReenableAllWarningsClicked();
   void slotConfigureGnupg();
+  void slotConfigureChiasmus();
 
 private:
   //virtual void doLoadFromGlobalSettings();
--- trunk/KDE/kdepim/kmail/ui/warningconfiguration.ui #1147108:1147109
@@ -407,6 +407,30 @@
    </item>
    <item>
     <layout class="QHBoxLayout">
+     <item>
+      <spacer name="horizontalSpacer2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="chiasmusButton">
+       <property name="text">
+        <string>Chiasmus Settings...</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout">
      <property name="margin">
       <number>0</number>
      </property>


[prev in list] [next in list] [prev in thread] [next in thread]