Add SSL urls (ircs/ircs6) in server options dialog.

3 files changed, 13 insertions, 5 deletions

diff --git a/src/kvirc/ui/KviConsoleWindow.cpp b/src/kvirc/ui/KviConsoleWindow.cpp
index 7a44cb600..39c314b3f 100644
--- a/src/kvirc/ui/KviConsoleWindow.cpp
+++ b/src/kvirc/ui/KviConsoleWindow.cpp
@@ -424,7 +424,7 @@ void KviConsoleWindow::ircUriChanged(const QString & text)
 	int iStatus = KviIrcUrl::run(text,KviIrcUrl::CurrentContext,this);
 	if(iStatus & KviIrcUrl::InvalidProtocol || iStatus & KviIrcUrl::InvalidUrl)
 	{
-		KviMessageBox::warning(__tr2qs("KVIrc can accept only irc://, irc6://, ircs:// or irc6s:// URL's\n"
+		KviMessageBox::warning(__tr2qs("KVIrc can accept only irc://, irc6://, ircs:// or ircs6:// URL's\n"
 				"Your URL is invalid. Check spelling and try again"));
 	}
 	m_pInput->setFocus();
diff --git a/src/modules/options/OptionsWidget_servers.cpp b/src/modules/options/OptionsWidget_servers.cpp
index 4094e0c6b..70468719e 100644
--- a/src/modules/options/OptionsWidget_servers.cpp
+++ b/src/modules/options/OptionsWidget_servers.cpp
@@ -717,10 +717,10 @@ IrcServerDetailsWidget::IrcServerDetailsWidget(QWidget * par,KviIrcServer * s)
 
 #ifdef COMPILE_IPV6_SUPPORT
 	m_pUseIPV6Check->setChecked(s->isIPv6());
+	connect(m_pUseIPV6Check,SIGNAL(toggled(bool)),this,SLOT(useIPV6CheckToggled(bool)));
 #else
 	m_pUseIPV6Check->setEnabled(false);
 #endif
-	connect(m_pUseIPV6Check,SIGNAL(toggled(bool)),this,SLOT(useIPV6CheckToggled(bool)));
 
 	KviTalToolTip::add(m_pUseIPV6Check,__tr2qs_ctx("<center>This check identifies IPv6 servers.<br>If enabled, KVIrc will attempt to use the IPv6 protocol " \
 		"(thus your OS <b>must</b> have a working IPv6 stack and you <b>must</b> have an IPv6 connection).</center>","options"));
@@ -731,11 +731,12 @@ IrcServerDetailsWidget::IrcServerDetailsWidget(QWidget * par,KviIrcServer * s)
 
 	KviTalToolTip::add(m_pUseSSLCheck,__tr2qs_ctx("<center>This check will cause the connection to use the <b>Secure Socket Layer</b> " \
 		"encryption support. Obviously, this server must have support for this, too. :)</center>","options"));
-#ifndef COMPILE_SSL_SUPPORT
+#ifdef COMPILE_SSL_SUPPORT
+	m_pUseSSLCheck->setChecked(s->useSSL());
+	connect(m_pUseSSLCheck,SIGNAL(toggled(bool)),this,SLOT(useSSLCheckToggled(bool)));
+#else
 	m_pUseSSLCheck->setEnabled(false);
 #endif
-	m_pUseSSLCheck->setChecked(s->useSSL());
-
 
 	iRow++;
 
@@ -1037,6 +1038,11 @@ void IrcServerDetailsWidget::useIPV6CheckToggled(bool)
 	setHeaderLabelText();
 }
 
+void IrcServerDetailsWidget::useSSLCheckToggled(bool)
+{
+	setHeaderLabelText();
+}
+
 void IrcServerDetailsWidget::portEditorTextChanged(const QString &)
 {
 	setHeaderLabelText();
@@ -1045,6 +1051,7 @@ void IrcServerDetailsWidget::portEditorTextChanged(const QString &)
 void IrcServerDetailsWidget::setHeaderLabelText()
 {
 	QString szTmp = "<font size=\"+1\"><b>irc";
+	if(m_pUseSSLCheck->isChecked())szTmp += "s";
 	if(m_pUseIPV6Check->isChecked())szTmp += "6";
 	szTmp += "://";
 	szTmp += m_szHostname;
diff --git a/src/modules/options/OptionsWidget_servers.h b/src/modules/options/OptionsWidget_servers.h
index 842d71423..43de13bbd 100644
--- a/src/modules/options/OptionsWidget_servers.h
+++ b/src/modules/options/OptionsWidget_servers.h
@@ -157,6 +157,7 @@ protected slots:
 	void useDefaultInitUModeToggled(bool);
 	void portEditorTextChanged(const QString &);
 	void useIPV6CheckToggled(bool);
+	void useSSLCheckToggled(bool);
 public:
 	void setHeaderLabelText();
 	void fillData(KviIrcServer *s);