From 5b9e666df25ef1ca56907f0cbda186a4759253b5 Mon Sep 17 00:00:00 2001
From: doitux <f.hammer@web.de>
Date: Thu, 15 Nov 2007 21:28:17 +0000
Subject: [PATCH] adds channelpassword option for lobby-irc-channel

---
 src/config/configfile.cpp                      |  3 ++-
 src/gui/qt/settingsdialog.ui                   | 18 ++++++++++++++++--
 .../qt/settingsdialog/settingsdialogimpl.cpp   |  2 ++
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/config/configfile.cpp b/src/config/configfile.cpp
index 5ad78b77..ccea6642 100644
--- a/src/config/configfile.cpp
+++ b/src/config/configfile.cpp
@@ -53,7 +53,7 @@ ConfigFile::ConfigFile(int argc, char **argv) : noWriteAccess(0)
 		if(strcmp(argv[i], "--nowriteaccess") == 0) { noWriteAccess = 1; }
 	}
 	// !!!! Revisionsnummer der Configdefaults !!!!!
-	configRev = 50;
+	configRev = 51;
 
 	//standard defaults
 	logOnOffDefault = "1";
@@ -214,6 +214,7 @@ ConfigFile::ConfigFile(int argc, char **argv) : noWriteAccess(0)
 	configList.push_back(ConfigInfo("IRCServerAddress", CONFIG_TYPE_STRING, "chat.freenode.net"));
 	configList.push_back(ConfigInfo("IRCServerPort", CONFIG_TYPE_INT, "6667"));
 	configList.push_back(ConfigInfo("IRCChannel", CONFIG_TYPE_STRING, "#pokerth-lobby"));
+	configList.push_back(ConfigInfo("IRCChannelPassword", CONFIG_TYPE_STRING, ""));
 	configList.push_back(ConfigInfo("IRCServerUseIpv6", CONFIG_TYPE_INT, "0"));
 	configList.push_back(ConfigInfo("MyName", CONFIG_TYPE_STRING, "Human Player"));
 	configList.push_back(ConfigInfo("MyAvatar", CONFIG_TYPE_STRING, ""));
diff --git a/src/gui/qt/settingsdialog.ui b/src/gui/qt/settingsdialog.ui
index f73c7094..ccaf9c9f 100644
--- a/src/gui/qt/settingsdialog.ui
+++ b/src/gui/qt/settingsdialog.ui
@@ -1352,14 +1352,14 @@ p, li { white-space: pre-wrap; }
             </property>
            </widget>
           </item>
-          <item row="3" column="0" >
+          <item row="4" column="0" >
            <widget class="QCheckBox" name="checkBox_IRCServerUseIpv6" >
             <property name="text" >
              <string>Use IPv6</string>
             </property>
            </widget>
           </item>
-          <item row="3" column="1" >
+          <item row="4" column="1" >
            <widget class="QLabel" name="label_45" >
             <property name="text" >
              <string>&lt;a href="http://en.wikipedia.org/wiki/Ipv6">What is this?&lt;/a></string>
@@ -1369,6 +1369,20 @@ p, li { white-space: pre-wrap; }
             </property>
            </widget>
           </item>
+          <item row="3" column="1" >
+           <widget class="QLineEdit" name="lineEdit_IRCChannelPassword" >
+            <property name="echoMode" >
+             <enum>QLineEdit::Password</enum>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="0" >
+           <widget class="QLabel" name="label_17" >
+            <property name="text" >
+             <string>Channel Password:</string>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>
diff --git a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp
index c5fddb46..624022d0 100644
--- a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp
+++ b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp
@@ -167,6 +167,7 @@ void settingsDialogImpl::exec() {
 	lineEdit_IRCServerAddress->setText(QString::fromUtf8(myConfig->readConfigString("IRCServerAddress").c_str()));
 	spinBox_IRCServerPort->setValue(myConfig->readConfigInt("IRCServerPort"));
 	lineEdit_IRCChannel->setText(QString::fromUtf8(myConfig->readConfigString("IRCChannel").c_str()));
+	lineEdit_IRCChannelPassword->setText(QString::fromUtf8(myConfig->readConfigString("IRCChannelPassword").c_str()));
 	checkBox_IRCServerUseIpv6->setChecked(myConfig->readConfigInt("IRCServerUseIpv6"));
 
 	//Interface
@@ -304,6 +305,7 @@ void settingsDialogImpl::isAccepted() {
 	myConfig->writeConfigString("IRCServerAddress", lineEdit_IRCServerAddress->text().toUtf8().constData());
 	myConfig->writeConfigInt("IRCServerPort", spinBox_IRCServerPort->value());
 	myConfig->writeConfigString("IRCChannel", lineEdit_IRCChannel->text().toUtf8().constData());
+	myConfig->writeConfigString("IRCChannelPassword", lineEdit_IRCChannelPassword->text().toUtf8().constData());
 	myConfig->writeConfigInt("IRCServerUseIpv6", checkBox_IRCServerUseIpv6->isChecked());
 	
 // 	Interface