Prepare final AEgypten test: hide all configuration options that are not fully implemented yet.

svn path=/trunk/kdenetwork/kmail/; revision=163255

configuredialog.cpp

@@ -4040,8 +4040,11 @@ PluginPage::PluginPage( CryptPlugWrapperList* cryptPlugList,
     _encryptionPage = new EncryptionPage( this );
     addTab( _encryptionPage, i18n("&Encryption Configuration") );
 
-    _dirservicesPage = new DirServicesPage( this );
-    addTab( _dirservicesPage, i18n("&Directory Services") );
+// KHZ NO FULLTEST  _dirservicesPage = new DirServicesPage( this );
+// KHZ NO FULLTEST  addTab( _dirservicesPage, i18n("&Directory Services") );
+_dirservicesPage = new DirServicesPage( 0 );
+_dirservicesPage->hide();
+
 
     connect( mTabWidget, SIGNAL(currentChanged( QWidget * )),
              this, SLOT(slotCurrentPlugInTabPageChanged( QWidget * )) );
@@ -4508,7 +4511,7 @@ bool PluginPage::isPluginConfigEqual( int pluginno ) const
                _signaturePage->sigDialog &&
                _signaturePage->sigDialog->signatureAlgorithmCO &&
                ( _signaturePage->sigDialog->signatureAlgorithmCO->currentText() ==
-                 "SHA-1" ) ) );
+                 "RSA + SHA-1" ) ) );
     kdDebug(5006) << "5) RET = " << ret << endl;
     if( !ret )
         return false;
@@ -4789,7 +4792,7 @@ void PluginPage::savePluginConfig( int pluginno )
     // Signature Settings group box
     QString sigAlgoStr = _signaturePage->sigDialog->signatureAlgorithmCO->currentText();
     SignatureAlgorithm sigAlgo = SignAlg_SHA1;
-    if( sigAlgoStr == "SHA-1" )
+    if( sigAlgoStr == "RSA + SHA-1" )
         sigAlgo = SignAlg_SHA1;
     else
         kdDebug(5006) << "Unknown signature algorithm " << sigAlgoStr << endl;

encryptionconfigurationdialogimpl.cpp

@@ -2,9 +2,18 @@
 #include "cryptplugwrapper.h"
 
 #include <qbuttongroup.h>
+#include <qradiobutton.h>
 #include <qcheckbox.h>
 #include <qspinbox.h>
 
+
+
+
+#define FULLTEST false
+
+
+
+
 /*
  *  Constructs a EncryptionConfigurationDialogImpl which is a child of 'parent', with the
  *  name 'name' and widget flags set to 'f'
@@ -41,6 +50,23 @@ void EncryptionConfigurationDialogImpl::enableDisable( CryptPlugWrapper* cryptPl
     warnReceiverNotInCertificateCB->setEnabled( cryptPlug->hasFeature( Feature_WarnEncryptEmailNotInCertificate ) );
     saveMessagesBG->setEnabled( cryptPlug->hasFeature( Feature_StoreMessagesEncrypted ) );
     certificatePathCheckBG->setEnabled( cryptPlug->hasFeature( Feature_CheckCertificatePath ) );
+    
+    if( ! FULLTEST ) {
+        askEachPartRB                 ->hide(); // We won't implement that.
+        
+        warnCRLExpireCB               ->hide(); // Will implement that later.
+        warnCRLExpireSB               ->hide(); // Will implement that later.
+        
+        warnChainCertificateExpiresCB ->hide(); // Will implement that later.
+        warnChainCertificateExpiresSB ->hide(); // Will implement that later.
+        warnReceiverNotInCertificateCB->hide(); // Will implement that later.
+        
+        alwaysCheckRootRB             ->hide(); // Will implement that later.
+        
+        /*enable:*/
+        pathMayEndLocallyCB           ->setEnabled( true );
+        
+    }
 }
 
 #include "encryptionconfigurationdialogimpl.moc"

signatureconfigurationdialog.ui

@@ -280,7 +280,7 @@ It is recommended to leave this option turned on for maximum integrity.
                                 <widget class="QComboBox" row="1" column="1">
                                     <item>
                                         <property name="text">
-                                            <string>SHA-1</string>
+                                            <string>RSA + SHA-1</string>
                                         </property>
                                     </item>
                                     <property name="name">

signatureconfigurationdialogimpl.cpp

@@ -3,10 +3,18 @@
 #include "cryptplugwrapper.h"
 
 #include <qbuttongroup.h>
+#include <qradiobutton.h>
 #include <qcheckbox.h>
 #include <qspinbox.h>
 
 
+
+
+#define FULLTEST false
+
+
+
+
 /*
  *  Constructs a SignatureConfigurationDialogImpl which is a child of 'parent', with the
  *  name 'name' and widget flags set to 'f'
@@ -48,6 +56,31 @@ void SignatureConfigurationDialogImpl::enableDisable( CryptPlugWrapper* cryptPlu
     warnAddressNotInCertificateCB->setEnabled( cryptPlug->hasFeature( Feature_WarnSignEmailNotInCertificate ) );
     pinEntryBG->setEnabled( cryptPlug->hasFeature( Feature_PinEntrySettings ) );
     saveMessagesBG->setEnabled( cryptPlug->hasFeature( Feature_StoreMessagesWithSigs ) );
+    
+    if( ! FULLTEST ){
+        askEachPartRB                ->hide(); // We won't implement that.
+        
+        dontSendCertificatesRB       ->hide(); // Will implement that later.
+        sendChainWithoutRootRB       ->hide(); // Will implement that later.
+        sendChainWithRootRB          ->hide(); // Will implement that later.
+        
+        warnCACertificateExpiresCB   ->hide(); // Will implement that later.
+        warnCACertificateExpiresSB   ->hide(); // Will implement that later.
+        warnRootCertificateExpiresCB ->hide(); // Will implement that later.
+        warnRootCertificateExpiresSB ->hide(); // Will implement that later.
+        warnAddressNotInCertificateCB->hide(); // Will implement that later.
+        
+        sendSigOpaqueRB              ->hide(); // Will implement that later.
+        
+        pinOncePerSessionRB          ->hide(); // Will implement that later.
+        pinAddCertificatesRB         ->hide(); // Will implement that later.
+        pinAlwaysWhenSigningRB       ->hide(); // Will implement that later.
+        pinIntervalRB                ->hide(); // Will implement that later.
+        pinIntervalSB                ->hide(); // Will implement that later.
+        
+        saveSentSigsCB               ->hide(); // We won't implement that.
+        saveMessagesBG               ->hide(); // We won't implement that.
+    }
 }
 
 #include "signatureconfigurationdialogimpl.moc"