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

List:       kde-commits
Subject:    kdenox/konq-embed/src
From:       Eva Brucherseifer <eva () kde ! org>
Date:       2006-12-07 14:04:51
Message-ID: 1165500291.928094.9757.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 611282 by eva:

don't save cert cache settings after change but rather 
after accepting the dialog


 M  +27 -17    preferences_road.cc  
 M  +5 -3      preferences_road.h  


--- trunk/kdenox/konq-embed/src/preferences_road.cc #611281:611282
@@ -1176,21 +1176,18 @@
     grid->addWidget(validUntil, 1, 1);
 
     QButtonGroup *cacheGroup = new QVButtonGroup(i18n("Cache"), w);
-    QRadioButton *cachePerm = new QRadioButton(i18n("Permanentl&y"), cacheGroup);
-    QRadioButton *cacheUntil = new QRadioButton(i18n("&Until"), cacheGroup);
+    cachePerm = new QRadioButton(i18n("Permanentl&y"), cacheGroup);
+    cacheUntil = new QRadioButton(i18n("&Until"), cacheGroup);
     untilDate = new QLabel(cacheGroup);
     untilDate->setText( KGlobal::locale()->formatDateTime( certItem->getExpires()) );
     untilDate->setEnabled(!certItem->isPermanent());
     grid->addWidget( cacheGroup, 2, 0 );
-    connect(cachePerm, SIGNAL(clicked()), SLOT(slotPermanent()));
-    connect(cacheUntil, SIGNAL(clicked()), SLOT(slotUntil()));
 
     policyGroup = new QVButtonGroup(i18n("Policy"), w );
     policyAccept = new QRadioButton(i18n("Accep&t"), policyGroup);
     policyReject = new QRadioButton(i18n("Re&ject"), policyGroup);
     policyPrompt = new QRadioButton(i18n("&Prompt"), policyGroup);
     grid->addWidget( policyGroup, 2, 1 );
-    connect(policyGroup, SIGNAL(clicked(int)), SLOT(slotPolicyChanged(int)));
     switch(certItem->getPolicy()) {
     case KSSLCertificateCache::Accept:
         policyGroup->setButton(policyGroup->id(policyAccept));
@@ -1238,23 +1235,23 @@
 }
 
 
-void EditCertDialog::slotUntil()
-{
-    untilDate->setEnabled(true);
-    if (certItem)
-        certItem->setPermanent(false);
+void EditCertDialog::slotPolicyChanged(int id) {
+    if (!certItem) return;
+
+    if (id == policyGroup->id(policyAccept)) {
+        certItem->setPolicy(KSSLCertificateCache::Accept);
+    } else if (id == policyGroup->id(policyReject)) {
+        certItem->setPolicy(KSSLCertificateCache::Reject);
+    } else if (id == policyGroup->id(policyPrompt)) {
+        certItem->setPolicy(KSSLCertificateCache::Prompt);
+    }
 }
 
-void EditCertDialog::slotPermanent()
+void EditCertDialog::accept()
 {
-    untilDate->setEnabled(false);
-    if (certItem)
-        certItem->setPermanent(true);
-}
-
-void EditCertDialog::slotPolicyChanged(int id) {
     if (!certItem) return;
 
+    int id = policyGroup->id(policyGroup->selected());
     if (id == policyGroup->id(policyAccept)) {
         certItem->setPolicy(KSSLCertificateCache::Accept);
     } else if (id == policyGroup->id(policyReject)) {
@@ -1262,8 +1259,21 @@
     } else if (id == policyGroup->id(policyPrompt)) {
         certItem->setPolicy(KSSLCertificateCache::Prompt);
     }
+
+    if (cachePerm->isChecked())
+    {
+        untilDate->setEnabled(false);
+        certItem->setPermanent(true);
+    }
+    else
+    {
+        untilDate->setEnabled(true);
+        certItem->setPermanent(true);
+    }
+    QDialog::accept();
 }
 
+
 //////////////////////////////////////////////////////////////////////////////
 
 ViewCADialog::ViewCADialog(CAItem *x, QWidget *parent, const char * name) :
--- trunk/kdenox/konq-embed/src/preferences_road.h #611281:611282
@@ -192,11 +192,11 @@
     Q_OBJECT
 public:
     EditCertDialog(OtherCertItem *, KSSLCertificate *, QWidget *parent, const char * name=0);
+public slots:
+    void accept();
 private slots:
-    void slotUntil();
-    void slotPermanent();
-    void slotPolicyChanged(int id);
     void slotChain(int x);
+    void slotPolicyChanged( int id );
 
 private:
     OtherCertItem *certItem;
@@ -206,6 +206,8 @@
     QRadioButton *policyAccept;
     QRadioButton *policyReject;
     QRadioButton *policyPrompt;
+    QRadioButton *cachePerm;
+    QRadioButton *cacheUntil;
     QComboBox* _chain;
     KSSLCertBox *oSubject;
     KSSLCertBox *oIssuer;
[prev in list] [next in list] [prev in thread] [next in thread]