forwardport from proko2: Final touch for "aegypten-proxy" GUI:

disable proxy settings when "Ignore HTTP CRL DPs of certificate" is unchecked.

svn path=/branches/KDE_3_4_BRANCH/kdepim/; revision=394079

configuredialog.cpp

@@ -3839,6 +3839,11 @@ SecurityPageSMimeTab::SecurityPageSMimeTab( QWidget * parent, const char * name
   connect( mWidget->disableLDAPCB, SIGNAL( toggled( bool ) ), this, SLOT( slotEmitChanged() ) );
   connect( mWidget->customLDAPProxy, SIGNAL( textChanged( const QString& ) ), this, SLOT( slotEmitChanged() ) );
 
+  connect( mWidget->disableHTTPCB, SIGNAL( toggled( bool ) ),
+           this, SLOT( slotUpdateHTTPActions() ) );
+  connect( mWidget->ignoreHTTPDPCB, SIGNAL( toggled( bool ) ),
+           this, SLOT( slotUpdateHTTPActions() ) );
+
   // Button-group for exclusive radiobuttons
   QButtonGroup* bgHTTPProxy = new QButtonGroup( mWidget );
   bgHTTPProxy->hide();
@@ -3983,6 +3988,19 @@ void SecurityPage::SMimeTab::doLoadOther() {
     disableDirmngrWidget( mWidget->customLDAPProxy );
     disableDirmngrWidget( mWidget->customLDAPLabel );
   }
+  slotUpdateHTTPActions();
+}
+
+void SecurityPage::SMimeTab::slotUpdateHTTPActions() {
+  mWidget->ignoreHTTPDPCB->setEnabled( !mWidget->disableHTTPCB->isChecked() );
+
+  // The proxy settings only make sense when "Ignore HTTP CRL DPs of certificate" is checked.
+  bool enableProxySettings = !mWidget->disableHTTPCB->isChecked()
+                          && mWidget->ignoreHTTPDPCB->isChecked();
+  mWidget->systemHTTPProxy->setEnabled( enableProxySettings );
+  mWidget->useCustomHTTPProxyRB->setEnabled( enableProxySettings );
+  mWidget->honorHTTPProxyRB->setEnabled( enableProxySettings );
+  mWidget->customHTTPProxy->setEnabled( enableProxySettings );
 }
 
 void SecurityPage::SMimeTab::installProfile( KConfig * ) {

configuredialog_p.h

@@ -827,6 +827,9 @@ public:
   void save();
   void installProfile( KConfig * profile );
 
+private slots:
+  void slotUpdateHTTPActions();
+
 private:
   //virtual void doLoadFromGlobalSettings();
   virtual void doLoadOther();

smimeconfiguration.ui

@@ -402,12 +402,6 @@ The syntax is "HOST" or "HOST:PORT". If PORT is omitted, port 389 (standard LDAP
         <receiver>customHTTPProxy</receiver>
         <slot>setDisabled(bool)</slot>
     </connection>
-    <connection>
-        <sender>disableHTTPCB</sender>
-        <signal>toggled(bool)</signal>
-        <receiver>frameHTTP</receiver>
-        <slot>setDisabled(bool)</slot>
-    </connection>
     <connection>
         <sender>disableLDAPCB</sender>
         <signal>toggled(bool)</signal>