[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: kdenox/konq-embed/dropin/kssl
From: Eva Brucherseifer <eva () kde ! org>
Date: 2006-12-16 21:27:31
Message-ID: 1166304451.799265.2160.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 614222 by eva:
cleanup of code
M +2 -48 ksslinfodlg.cpp
--- trunk/kdenox/konq-embed/dropin/kssl/ksslinfodlg.cpp #614221:614222
@@ -56,7 +56,6 @@
friend class KSSLInfoDlg;
bool m_secCon;
QGridLayout *m_layout;
- //QComboBox *_chain;
KSSLCertificate *_cert;
KSSLCertificate::KSSLValidationList _cert_ksvl;
@@ -122,7 +121,7 @@
d->pixmap->setPixmap(QPixmap( \
KGlobal::dirs()->findResource("icon","decrypted.png") ));
d->info->setText(i18n("SSL support is not available in this build of \
KDE.")); }
- d->m_layout->addRowSpacing( 0, 30 ); // give minimum height to look better
+ //d->m_layout->addRowSpacing( 0, 30 ); // give minimum height to look better
/* QHBoxLayout *buttonLayout = new QHBoxLayout(topLayout, \
KDialog::spacingHint()); buttonLayout->addStretch( 1 );
@@ -215,12 +214,7 @@
d->_cert = cert;
- //QGridLayout *layout = new QGridLayout(4, 2, KDialog::spacingHint());
-
- //QHBoxLayout *hlayout = new QHBoxLayout( 0 );
- //layout->addMultiCellLayout(hlayout, 0, 0, 0, 1);
-
- QVBoxLayout *vLayout = new QVBoxLayout( d->_parent, KDialog::marginHint(), 0 );
+ QVBoxLayout *vLayout = new QVBoxLayout( d->_parent, 0, 0 );
d->m_layout->addMultiCell(vLayout, 1, 1, 0, 2);
d->_subject = new KSSLCertBox( d->_parent );
@@ -243,42 +237,6 @@
}
}
-/*
- hlayout->addWidget(new QLabel(i18n("Chain:"), d->_parent));
- hlayout->addSpacing( 6 );
- d->_chain = new QComboBox(d->_parent);
- d->_chain->setSizePolicy( QSizePolicy(QSizePolicy::Expanding, \
QSizePolicy::Fixed) );
- hlayout->addWidget( d->_chain);
- hlayout->addItem( new QSpacerItem( 0, 0, QSizePolicy::Expanding, \
QSizePolicy::Minimum));
- connect(d->_chain, SIGNAL(activated(int)), this, SLOT(slotChain(int)));
-
- d->_chain->clear();
-
- if (cert->chain().isValid() && cert->chain().depth() > 1) {
- d->_chain->setEnabled(true);
- d->_chain->insertItem(i18n("0 - Site Certificate"));
- int cnt = 0;
- QPtrList<KSSLCertificate> cl = cert->chain().getChain();
- for (KSSLCertificate *c = cl.first(); c != 0; c = cl.next()) {
- KSSLX509Map map(c->getSubject());
- QString id;
- id = map.getValue("CN");
- if (id.length() == 0)
- id = map.getValue("O");
- if (id.length() == 0)
- id = map.getValue("OU");
- d->_chain->insertItem(QString::number(++cnt)+" - "+id);
- }
- d->_chain->setCurrentItem(0);
- } else d->_chain->setEnabled(false);
-
- layout->addWidget(new QLabel(i18n("Peer certificate:"), d->_parent), 2, 0);
- layout->addWidget(d->_subject = \
static_cast<KSSLCertBox*>(buildCertInfo(cert->getSubject())), 3, 0);
- layout->addWidget(new QLabel(i18n("Issuer:"), d->_parent), 2, 1);
- layout->addWidget(d->_issuer = \
static_cast<KSSLCertBox*>(buildCertInfo(cert->getIssuer())), 3, 1);
- d->m_layout->addMultiCell(layout, 1, 1, 0, 2);
-*/
-
QGridLayout* layout = new QGridLayout(11, 2, KDialog::spacingHint());
layout->setColStretch(1, 1);
QLabel *ipl = new QLabel(i18n("IP address:"), d->_parent);
@@ -318,7 +276,6 @@
layout->addWidget(new QLabel(i18n("Cipher strength:"), d->_parent), 10, 0);
layout->addWidget(new QLabel(i18n("%1 bits used of a %2 bit \
cipher").arg(usedbits).arg(bits), d->_parent), 10, 1); \
d->m_layout->addMultiCell(layout, 2, 2, 0, 2);
- //vLayout->addLayout(layout);
displayCert(cert);
}
@@ -415,9 +372,6 @@
d->_csl->setText(errorStr);
d->_csl->setMinimumSize(d->_csl->sizeHint());
- //d->_subject->setValues(x->getSubject());
- //d->_issuer->setValues(x->getIssuer());
-
d->_digest->setText(x->getMD5DigestText());
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic