diff options
| author |  Szymon Tomasz Stefanek | 2011-12-21 04:30:08 +0000 |
|---|---|---|
| committer | Szymon Tomasz Stefanek | 2011-12-21 04:30:08 +0000 |
| commit | 72e767c54de4dd534d7ceed50f8845dc03870a66 (patch) | |
| tree | fc5e99921e639de0b63d9f0c62ae4e9fb564066c /src/modules | |
| parent | StartTls and Sasl are now per-server options. These are no longer needed. (diff) | |
| download | KVIrc-72e767c54de4dd534d7ceed50f8845dc03870a66.tar.gz KVIrc-72e767c54de4dd534d7ceed50f8845dc03870a66.tar.bz2 KVIrc-72e767c54de4dd534d7ceed50f8845dc03870a66.zip | |
Allow STARTTLS to be used also without CAP support.
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5997 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/options/OptionsWidget_servers.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/modules/options/OptionsWidget_servers.cpp b/src/modules/options/OptionsWidget_servers.cpp index 6735e5314..45b03c5da 100644 --- a/src/modules/options/OptionsWidget_servers.cpp +++ b/src/modules/options/OptionsWidget_servers.cpp @@ -892,6 +892,20 @@ IrcServerDetailsWidget::IrcServerDetailsWidget(QWidget * par,KviIrcServer * s) iRow = 0; + m_pEnableSTARTTLSCheck = new QCheckBox(__tr2qs_ctx("Switch to SSL/TLS by using the STARTTLS extension","options"),tab); + gl->addWidget(m_pEnableSTARTTLSCheck,iRow,0,1,2); + KviTalToolTip::add(m_pEnableSTARTTLSCheck,__tr2qs_ctx("<center>This check enables the use of the <b>Transport Layer Security</b> " \ + "protocol. If you enable the Extended Capabilities below then the TLS protocol support will be detected by using " \ + "a CAP LS command. Without Extended Capabilities the STARTTLS command will be forcibly sent at the beginning of the " \ + "connection.</center>","options")); +#ifndef COMPILE_SSL_SUPPORT + m_pEnableSTARTTLSCheck->setEnabled(false); +#endif + m_pEnableSTARTTLSCheck->setChecked(s->enabledSTARTTLS()); + + iRow++; + + QGroupBox * pCapGroup = new QGroupBox(__tr2qs_ctx("Extended Capabilities","options"),tab); gl->addWidget(pCapGroup,iRow,0,1,2); @@ -906,20 +920,6 @@ IrcServerDetailsWidget::IrcServerDetailsWidget(QWidget * par,KviIrcServer * s) m_pEnableCAPCheck->setChecked(s->enabledCAP()); - - m_pEnableSTARTTLSCheck = new QCheckBox(__tr2qs_ctx("Switch to SSL/TLS by using the STARTTLS extension","options"),tab); - pCapLayout->addWidget(m_pEnableSTARTTLSCheck,1,0); - - m_pEnableSTARTTLSCheck->setEnabled(s->enabledCAP()); - QObject::connect(m_pEnableCAPCheck,SIGNAL(toggled(bool)),m_pEnableSTARTTLSCheck,SLOT(setEnabled(bool))); - KviTalToolTip::add(m_pEnableSTARTTLSCheck,__tr2qs_ctx("<center>This check enables the use of the <b>Transport Layer Security</b> " \ - "protocol. If you enable the proper global option in the Connection/SSL tab, the TLS protocol will be used for this server if available.</center>","options")); -#ifndef COMPILE_SSL_SUPPORT - m_pEnableSTARTTLSCheck->setEnabled(false); -#endif - m_pEnableSTARTTLSCheck->setChecked(s->enabledCAP() && s->enabledSTARTTLS()); - - QGroupBox * pSASLGroup = new QGroupBox(__tr2qs_ctx("SASL Authentication","options"),tab); pCapLayout->addWidget(pSASLGroup,2,0); |