aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/options/optw_connection.cpp
diff options
context:
space:
mode:
authorGravatar Elvio Basello2008-08-28 13:46:21 +0000
committerGravatar Elvio Basello2008-08-28 13:46:21 +0000
commit6097662ccbe04a6fe3005c9607af3ad688ce5b89 (patch)
tree53b3d18221f020b2de9cff9783c1de0b0f0b70b6 /src/modules/options/optw_connection.cpp
parentupported fix for #220 (diff)
downloadKVIrc-6097662ccbe04a6fe3005c9607af3ad688ce5b89.tar.gz
KVIrc-6097662ccbe04a6fe3005c9607af3ad688ce5b89.tar.bz2
KVIrc-6097662ccbe04a6fe3005c9607af3ad688ce5b89.zip
initial work on STARTTLS protocol: KVIrc now knows how to handle it
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@2334 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/options/optw_connection.cpp')
-rw-r--r--src/modules/options/optw_connection.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/modules/options/optw_connection.cpp b/src/modules/options/optw_connection.cpp
index 6e50160b0..0ef2026c9 100644
--- a/src/modules/options/optw_connection.cpp
+++ b/src/modules/options/optw_connection.cpp
@@ -47,7 +47,6 @@ KviConnectionOptionsWidget::KviConnectionOptionsWidget(QWidget * parent)
gbox = addGroupBox(0,1,0,1,Qt::Horizontal,__tr2qs_ctx("On Unexpected Disconnect","options"));
-
b1 = addBoolSelector(gbox,__tr2qs_ctx("Keep channels open","options"),KviOption_boolKeepChannelsOpenOnUnexpectedDisconnect,true);
mergeTip(b1,__tr2qs_ctx("<center>This option will cause KVIrc to keep channels open after an unexpected disconnect.</center>","options"));
@@ -89,7 +88,6 @@ KviConnectionOptionsWidget::KviConnectionOptionsWidget(QWidget * parent)
addRowSpacer(0,2,4,2);
}
-
KviConnectionOptionsWidget::~KviConnectionOptionsWidget()
{
}
@@ -122,7 +120,12 @@ KviSSLOptionsWidget::KviSSLOptionsWidget(QWidget * parent)
p = addPasswordSelector(gbox,__tr2qs_ctx("Private key password:","options"),
&(KVI_OPTION_STRING(KviOption_stringSSLPrivateKeyPass)),KVI_OPTION_BOOL(KviOption_boolUseSSLPrivateKey));
connect(b,SIGNAL(toggled(bool)),p,SLOT(setEnabled(bool)));
- addRowSpacer(0,2,0,2);
+
+ b = addBoolSelector(this,__tr2qs_ctx("Use the STARTTLS security protocol if available","options"),&(KVI_OPTION_BOOL(KviOption_boolUseStartTlsIfAvailable)),true);
+ mergeTip(b,__tr2qs_ctx("<center>This option will cause KVIrc to try to reconnect to the server using an encrypted connection</center>","options"));
+ addWidgetToLayout(b,0,2,0,2);
+
+ addRowSpacer(0,3,0,3);
#else
addLabel(0,0,0,0,__tr2qs_ctx("This executable has no SSL support.","options"));
#endif