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

List:       kde-commits
Subject:    kdenox/konq-embed/src
From:       Rafael Van Daele-Hunt <rafael () zeal-hq ! com>
Date:       2006-03-26 13:11:59
Message-ID: 1143378719.080639.11894.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 522684 by chipmunkwrangler:

Moved "Accept" (CA for site signing) from ViewCA dialog into main CA
list.


 M  +16 -19    preferences_road.cc  
 M  +1 -3      preferences_road.h  


--- trunk/kdenox/konq-embed/src/preferences_road.cc #522683:522684
@@ -180,7 +180,7 @@
       certBox( 0 ), caList( 0 ), policies( new KConfig("ksslpolicies", false) ),
       _signers( 0 ),
       removeCertBtn( 0 ), verifyCertBtn( 0 ), editCertBtn( 0 ),
-      caSSLImport( 0 ), caSSLRemove( 0 ), caSSLRestore( 0 ), caSSLView( 0 )
+      caSSLImport( 0 ), caSSLRemove( 0 ), caSSLRestore( 0 ), caSSLView( 0 ), caAccept( 0 )
 {
     setCaption( tr( "Preferences" ) );
 
@@ -547,10 +547,16 @@
 
 void PreferencesRoad::caSelectionChanged()
 {
+    CAItem *x = static_cast<CAItem *>(caList->selectedItem());
+    KSSLCertificate *cert = (x) ? KSSLCertificate::fromString(x->getCert().local8Bit()) : 0;
+    bool somethingIsSelected = (0 != x);
     bool b = caList->selectedItem();
     caSSLImport->setEnabled(false);
-    caSSLRemove->setEnabled(b);
-    caSSLView->setEnabled(b);
+    caSSLRemove->setEnabled(somethingIsSelected);
+    caSSLView->setEnabled(somethingIsSelected);
+    caAccept->setEnabled( (cert) ? cert->x509V3Extensions().certTypeSSLCA() : false );
+    caAccept->setChecked( ( x ) ? x->getSite() : false );
+
 }
 
 QLayout *PreferencesRoad::createCAPrefs( QWidget *parent )
@@ -562,7 +568,7 @@
     caSSLRemove =  new QPushButton( tr( "Remove" ),    btnParent, "eraseCABtn" );
     caSSLRestore = new QPushButton( tr( "Restore" ),   btnParent, "caSSLRestore" );
     caSSLView =    new QPushButton( tr( "View..." ),   btnParent, "caSSLView" );
-    QCheckBox *accept = new QCheckBox( tr( "Accept" ), btnParent, "acceptCA" );
+    caAccept =     new QCheckBox( tr( "Accept" ), btnParent, "acceptCA" );
 
     QBoxLayout *box = new QVBoxLayout( btnParent );
     box->setSpacing( SPACING );
@@ -572,14 +578,14 @@
     box->add( caSSLRestore );
     box->add( caSSLView );
     box->addStretch( 1 );
-    box->add( accept );
-    accept->setEnabled(false);
+    box->add( caAccept );
     layout->add( btnParent );
 
-    connect(caSSLImport,  SIGNAL(clicked()), SLOT(importCA()));
-    connect(caSSLRemove,  SIGNAL(clicked()), SLOT(removeCA()));
-    connect(caSSLRestore, SIGNAL(clicked()), SLOT(restoreCA()));
-    connect(caSSLView,    SIGNAL(clicked()), SLOT(viewCA()));
+    connect(caSSLImport,  SIGNAL(clicked()),     SLOT(importCA()));
+    connect(caSSLRemove,  SIGNAL(clicked()),     SLOT(removeCA()));
+    connect(caSSLRestore, SIGNAL(clicked()),     SLOT(restoreCA()));
+    connect(caSSLView,    SIGNAL(clicked()),     SLOT(viewCA()));
+    connect(caAccept,     SIGNAL(toggled(bool)), SLOT(caAccepted(bool)));
     caSelectionChanged();
 
     return layout;
@@ -768,7 +774,6 @@
     if (!x)
         return;
     ViewCADialog dlg( x, this );
-    connect(&dlg, SIGNAL(caAccepted(bool)), this, SLOT(caAccepted(bool)));
 #ifdef _QT_QPE_
     QPEApplication::execDialog(&dlg);
 #else
@@ -1001,15 +1006,10 @@
     KSSLCertBox *caIssuer = new KSSLCertBox( top );
     KSSLCertificate *cert = KSSLCertificate::fromString(x->getCert().local8Bit());
     QLabel *cHash = new QLabel(bottom);
-    QCheckBox *caSite = new QCheckBox(i18n("Accept for site signing"), bottom);
     if (!cert) {
        caIssuer->setValues(QString(QString::null));
-       caSite->setEnabled(false);
-       caSite->setChecked(false);
        cHash->clear();
     } else {
-       caSite->setEnabled(cert->x509V3Extensions().certTypeSSLCA());
-       caSite->setChecked(x->getSite());
        caIssuer->setValues(cert->getIssuer());
        cHash->setText(cert->getMD5DigestText());
        delete cert;
@@ -1019,13 +1019,10 @@
     hl->addWidget(new QLabel(i18n("MD5 digest:"), bottom) );
     hl->add( cHash );
     hl->addStretch( 1 );
-    hl->add( caSite );
 
     QBoxLayout *vl = new QVBoxLayout( this );
     vl->add( top );
     vl->add( bottom );
-
-    connect(caSite, SIGNAL(toggled(bool)), SIGNAL(caAccepted(bool)));
 }
 
 #include "preferences_road.moc"
--- trunk/kdenox/konq-embed/src/preferences_road.h #522683:522684
@@ -110,6 +110,7 @@
     QPushButton *caSSLRemove;
     QPushButton *caSSLRestore;
     QPushButton *caSSLView;
+    QCheckBox *caAccept;
 };
 
 // helper class to reduce code duplication:
@@ -197,11 +198,8 @@
 
 class ViewCADialog : public QDialog
 {
-    Q_OBJECT
 public:
     ViewCADialog(CAItem *, QWidget *parent, const char * name=0);
-signals:
-    void caAccepted(bool);
 };
 
 #endif
[prev in list] [next in list] [prev in thread] [next in thread]