From 1d5aa18b1b6a2afb7e0e5ee230afa6edc59b5b73 Mon Sep 17 00:00:00 2001
From: doitux <f.hammer@web.de>
Date: Wed, 23 Apr 2008 23:15:12 +0000
Subject: [PATCH] adds two new config variables for automatic server
 configuration (serverlist)

---
 src/config/configfile.cpp                     |  12 +-
 src/gui/qt/settingsdialog.ui                  | 789 ++++++++++++------
 .../qt/settingsdialog/settingsdialogimpl.cpp  |  15 +
 .../qt/settingsdialog/settingsdialogimpl.h    |   3 +
 4 files changed, 541 insertions(+), 278 deletions(-)

diff --git a/src/config/configfile.cpp b/src/config/configfile.cpp
index d4c20da9..004dd1eb 100644
--- a/src/config/configfile.cpp
+++ b/src/config/configfile.cpp
@@ -48,7 +48,7 @@ ConfigFile::ConfigFile(char *argv0, bool readonly) : noWriteAccess(readonly)
 	myQtToolsInterface = CreateQtToolsWrapper();
 
 	// !!!! Revisionsnummer der Configdefaults !!!!!
-	configRev = 52;
+	configRev = 54;
 
 	//standard defaults
 	logOnOffDefault = "1";
@@ -132,7 +132,7 @@ ConfigFile::ConfigFile(char *argv0, bool readonly) : noWriteAccess(readonly)
 	configList.push_back(ConfigInfo("ConfigRevision", CONFIG_TYPE_INT, tempIntToString.str()));
 	configList.push_back(ConfigInfo("AppDataDir", CONFIG_TYPE_STRING, myQtToolsInterface->getDataPathStdString(myArgv0)));
 	configList.push_back(ConfigInfo("Language", CONFIG_TYPE_INT, myQtToolsInterface->getDefaultLanguage()));
-	configList.push_back(ConfigInfo("InternetServerAddressIRCChannelUpdateDone", CONFIG_TYPE_INT, "1")); //HACK
+	/*configList.push_back(ConfigInfo("InternetServerAddressIRCChannelUpdateDone", CONFIG_TYPE_INT, "1"));*/ //HACK
 	configList.push_back(ConfigInfo("ShowLeftToolBox", CONFIG_TYPE_INT, "1"));
 	configList.push_back(ConfigInfo("ShowRightToolBox", CONFIG_TYPE_INT, "1"));
 	configList.push_back(ConfigInfo("ShowStatusbarMessages", CONFIG_TYPE_INT, "1"));
@@ -188,6 +188,8 @@ ConfigFile::ConfigFile(char *argv0, bool readonly) : noWriteAccess(readonly)
 	configList.push_back(ConfigInfo("ServerUseIpv6", CONFIG_TYPE_INT, "0"));
 	configList.push_back(ConfigInfo("ServerUseSctp", CONFIG_TYPE_INT, "0"));
 	configList.push_back(ConfigInfo("ServerPort", CONFIG_TYPE_INT, "7234"));
+	configList.push_back(ConfigInfo("InternetServerConfigMode", CONFIG_TYPE_INT, "0"));
+	configList.push_back(ConfigInfo("InternetServerListAddress", CONFIG_TYPE_STRING, "pokerth.net/serverlist.xml.z"));
 	configList.push_back(ConfigInfo("InternetServerAddress", CONFIG_TYPE_STRING, "pokerth.6dns.org"));
 	configList.push_back(ConfigInfo("InternetServerPort", CONFIG_TYPE_INT, "7234"));
 	configList.push_back(ConfigInfo("InternetServerPassword", CONFIG_TYPE_STRING, ""));
@@ -453,10 +455,10 @@ void ConfigFile::updateConfig(ConfigState myConfigState) {
 
 				TiXmlElement* oldConf = oldDocHandle.FirstChild( "PokerTH" ).FirstChild( "Configuration" ).FirstChild( configList[i].name ).ToElement();
 				
-				//HACK remove after 0.6
-				TiXmlElement* ISAIRCChannelUpdateDone = oldDocHandle.FirstChild( "PokerTH" ).FirstChild( "Configuration" ).FirstChild( "InternetServerAddressIRCChannelUpdateDone" ).ToElement();
+// 				//HACK remove after 0.6
+// 				TiXmlElement* ISAIRCChannelUpdateDone = oldDocHandle.FirstChild( "PokerTH" ).FirstChild( "Configuration" ).FirstChild( "InternetServerAddressIRCChannelUpdateDone" ).ToElement();
 								
-				if ( oldConf && (ISAIRCChannelUpdateDone || !(configList[i].name == "IRCChannel" || (configList[i].name == "InternetServerAddress" ))) /*HACK remove after 0.6*/ ) {
+				if ( oldConf /*&& (ISAIRCChannelUpdateDone || !(configList[i].name == "IRCChannel" || (configList[i].name == "InternetServerAddress" )))*/ /*HACK remove after 0.6*/ ) {
 				// if element is already there --> take over the saved values
 					
 					if(configList[i].name != "ConfigRevision" && configList[i].name != "AppDataDir") {
diff --git a/src/gui/qt/settingsdialog.ui b/src/gui/qt/settingsdialog.ui
index 6b4e9cb2..aafdb352 100644
--- a/src/gui/qt/settingsdialog.ui
+++ b/src/gui/qt/settingsdialog.ui
@@ -6,7 +6,7 @@
     <x>0</x>
     <y>0</y>
     <width>671</width>
-    <height>572</height>
+    <height>688</height>
    </rect>
   </property>
   <property name="minimumSize" >
@@ -18,9 +18,9 @@
   <property name="windowTitle" >
    <string>Settings</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout" >
+  <layout class="QVBoxLayout" >
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_2" >
+    <layout class="QHBoxLayout" >
      <item>
       <widget class="QListWidget" name="listWidget" >
        <property name="minimumSize" >
@@ -78,19 +78,11 @@
         <number>0</number>
        </property>
        <widget class="QWidget" name="page" >
-        <property name="geometry" >
-         <rect>
-          <x>0</x>
-          <y>0</y>
-          <width>455</width>
-          <height>511</height>
-         </rect>
-        </property>
         <layout class="QGridLayout" >
          <item row="0" column="0" >
           <widget class="QLabel" name="label_19" >
            <property name="styleSheet" >
-            <string notr="true" >QLabel { font-weight: bold;  }</string>
+            <string>QLabel { font-weight: bold;  }</string>
            </property>
            <property name="text" >
             <string>Interface</string>
@@ -124,7 +116,7 @@
              <property name="orientation" >
               <enum>Qt::Horizontal</enum>
              </property>
-             <property name="sizeHint" stdset="0" >
+             <property name="sizeHint" >
               <size>
                <width>40</width>
                <height>20</height>
@@ -231,7 +223,10 @@
             <property name="bottomMargin" >
              <number>9</number>
             </property>
-            <property name="spacing" >
+            <property name="horizontalSpacing" >
+             <number>6</number>
+            </property>
+            <property name="verticalSpacing" >
              <number>6</number>
             </property>
             <item row="1" column="0" >
@@ -239,7 +234,16 @@
               <property name="spacing" >
                <number>0</number>
               </property>
-              <property name="margin" >
+              <property name="leftMargin" >
+               <number>0</number>
+              </property>
+              <property name="topMargin" >
+               <number>0</number>
+              </property>
+              <property name="rightMargin" >
+               <number>0</number>
+              </property>
+              <property name="bottomMargin" >
                <number>0</number>
               </property>
               <item>
@@ -247,7 +251,16 @@
                 <property name="spacing" >
                  <number>2</number>
                 </property>
-                <property name="margin" >
+                <property name="leftMargin" >
+                 <number>0</number>
+                </property>
+                <property name="topMargin" >
+                 <number>0</number>
+                </property>
+                <property name="rightMargin" >
+                 <number>0</number>
+                </property>
+                <property name="bottomMargin" >
                  <number>0</number>
                 </property>
                 <item>
@@ -318,7 +331,7 @@ p, li { white-space: pre-wrap; }
            <property name="orientation" >
             <enum>Qt::Vertical</enum>
            </property>
-           <property name="sizeHint" stdset="0" >
+           <property name="sizeHint" >
             <size>
              <width>400</width>
              <height>111</height>
@@ -329,19 +342,11 @@ p, li { white-space: pre-wrap; }
         </layout>
        </widget>
        <widget class="QWidget" name="page_6" >
-        <property name="geometry" >
-         <rect>
-          <x>0</x>
-          <y>0</y>
-          <width>455</width>
-          <height>511</height>
-         </rect>
-        </property>
         <layout class="QGridLayout" >
          <item row="0" column="0" >
           <widget class="QLabel" name="label_26" >
            <property name="styleSheet" >
-            <string notr="true" >QLabel { font-weight: bold;  }</string>
+            <string>QLabel { font-weight: bold;  }</string>
            </property>
            <property name="text" >
             <string>Sound</string>
@@ -372,7 +377,16 @@ p, li { white-space: pre-wrap; }
               <property name="spacing" >
                <number>6</number>
               </property>
-              <property name="margin" >
+              <property name="leftMargin" >
+               <number>0</number>
+              </property>
+              <property name="topMargin" >
+               <number>0</number>
+              </property>
+              <property name="rightMargin" >
+               <number>0</number>
+              </property>
+              <property name="bottomMargin" >
                <number>0</number>
               </property>
               <item>
@@ -457,7 +471,7 @@ p, li { white-space: pre-wrap; }
            <property name="orientation" >
             <enum>Qt::Vertical</enum>
            </property>
-           <property name="sizeHint" stdset="0" >
+           <property name="sizeHint" >
             <size>
              <width>400</width>
              <height>321</height>
@@ -468,33 +482,25 @@ p, li { white-space: pre-wrap; }
         </layout>
        </widget>
        <widget class="QWidget" name="page_2" >
-        <property name="geometry" >
-         <rect>
-          <x>0</x>
-          <y>0</y>
-          <width>455</width>
-          <height>511</height>
-         </rect>
-        </property>
-        <layout class="QGridLayout" >
-         <item row="0" column="0" >
+        <layout class="QVBoxLayout" >
+         <item>
           <widget class="QLabel" name="label_5" >
            <property name="styleSheet" >
-            <string notr="true" >QLabel { font-weight: bold;  }</string>
+            <string>QLabel { font-weight: bold;  }</string>
            </property>
            <property name="text" >
             <string>Local Game Settings</string>
            </property>
           </widget>
          </item>
-         <item row="1" column="0" >
+         <item>
           <widget class="Line" name="line_3" >
            <property name="orientation" >
             <enum>Qt::Horizontal</enum>
            </property>
           </widget>
          </item>
-         <item row="2" column="0" >
+         <item>
           <layout class="QHBoxLayout" >
            <item>
             <widget class="QLabel" name="label_4" >
@@ -521,7 +527,7 @@ p, li { white-space: pre-wrap; }
            </item>
           </layout>
          </item>
-         <item row="3" column="0" >
+         <item>
           <layout class="QHBoxLayout" >
            <item>
             <widget class="QLabel" name="label_2" >
@@ -551,7 +557,7 @@ p, li { white-space: pre-wrap; }
            </item>
           </layout>
          </item>
-         <item row="4" column="0" >
+         <item>
           <layout class="QHBoxLayout" >
            <item>
             <widget class="QLabel" name="label_3" >
@@ -578,7 +584,7 @@ p, li { white-space: pre-wrap; }
            </item>
           </layout>
          </item>
-         <item row="5" column="0" >
+         <item>
           <layout class="QHBoxLayout" >
            <item>
             <widget class="QGroupBox" name="groupBox_6" >
@@ -657,7 +663,7 @@ p, li { white-space: pre-wrap; }
                 <property name="orientation" >
                  <enum>Qt::Vertical</enum>
                 </property>
-                <property name="sizeHint" stdset="0" >
+                <property name="sizeHint" >
                  <size>
                   <width>20</width>
                   <height>5</height>
@@ -715,7 +721,7 @@ p, li { white-space: pre-wrap; }
            </item>
           </layout>
          </item>
-         <item row="6" column="0" >
+         <item>
           <layout class="QHBoxLayout" >
            <item>
             <widget class="QLabel" name="label" >
@@ -742,29 +748,29 @@ p, li { white-space: pre-wrap; }
            </item>
           </layout>
          </item>
-         <item row="7" column="0" >
+         <item>
           <widget class="QCheckBox" name="checkBox_pauseBetweenHands" >
            <property name="text" >
             <string>Pause between hands (press "start" button to go on)</string>
            </property>
           </widget>
          </item>
-         <item row="8" column="0" >
+         <item>
           <widget class="QCheckBox" name="checkBox_showGameSettingsDialogOnNewGame" >
            <property name="text" >
             <string>Show game settings dialog on every new game</string>
            </property>
           </widget>
          </item>
-         <item row="9" column="0" >
+         <item>
           <spacer>
            <property name="orientation" >
             <enum>Qt::Vertical</enum>
            </property>
-           <property name="sizeHint" stdset="0" >
+           <property name="sizeHint" >
             <size>
-             <width>400</width>
-             <height>231</height>
+             <width>437</width>
+             <height>285</height>
             </size>
            </property>
           </spacer>
@@ -772,19 +778,11 @@ p, li { white-space: pre-wrap; }
         </layout>
        </widget>
        <widget class="QWidget" name="page_4" >
-        <property name="geometry" >
-         <rect>
-          <x>0</x>
-          <y>0</y>
-          <width>455</width>
-          <height>511</height>
-         </rect>
-        </property>
-        <layout class="QVBoxLayout" name="verticalLayout_2" >
+        <layout class="QVBoxLayout" >
          <item>
           <widget class="QLabel" name="label_34" >
            <property name="styleSheet" >
-            <string notr="true" >QLabel { font-weight: bold;  }</string>
+            <string>QLabel { font-weight: bold;  }</string>
            </property>
            <property name="text" >
             <string>Network Game Settings</string>
@@ -955,7 +953,7 @@ p, li { white-space: pre-wrap; }
                 <property name="orientation" >
                  <enum>Qt::Vertical</enum>
                 </property>
-                <property name="sizeHint" stdset="0" >
+                <property name="sizeHint" >
                  <size>
                   <width>20</width>
                   <height>10</height>
@@ -1071,14 +1069,17 @@ p, li { white-space: pre-wrap; }
           </layout>
          </item>
          <item>
-          <spacer name="verticalSpacer" >
+          <spacer>
            <property name="orientation" >
             <enum>Qt::Vertical</enum>
            </property>
-           <property name="sizeHint" stdset="0" >
+           <property name="sizeType" >
+            <enum>QSizePolicy::Fixed</enum>
+           </property>
+           <property name="sizeHint" >
             <size>
              <width>20</width>
-             <height>40</height>
+             <height>14</height>
             </size>
            </property>
           </spacer>
@@ -1101,7 +1102,10 @@ p, li { white-space: pre-wrap; }
             <property name="bottomMargin" >
              <number>9</number>
             </property>
-            <property name="spacing" >
+            <property name="horizontalSpacing" >
+             <number>6</number>
+            </property>
+            <property name="verticalSpacing" >
              <number>6</number>
             </property>
             <item row="1" column="1" >
@@ -1189,10 +1193,10 @@ p, li { white-space: pre-wrap; }
            <property name="orientation" >
             <enum>Qt::Vertical</enum>
            </property>
-           <property name="sizeHint" stdset="0" >
+           <property name="sizeHint" >
             <size>
              <width>400</width>
-             <height>41</height>
+             <height>216</height>
             </size>
            </property>
           </spacer>
@@ -1200,33 +1204,25 @@ p, li { white-space: pre-wrap; }
         </layout>
        </widget>
        <widget class="QWidget" name="page_7" >
-        <property name="geometry" >
-         <rect>
-          <x>0</x>
-          <y>0</y>
-          <width>419</width>
-          <height>574</height>
-         </rect>
-        </property>
-        <layout class="QGridLayout" >
-         <item row="0" column="0" >
+        <layout class="QVBoxLayout" >
+         <item>
           <widget class="QLabel" name="label_30" >
            <property name="styleSheet" >
-            <string notr="true" >QLabel { font-weight: bold;  }</string>
+            <string>QLabel { font-weight: bold;  }</string>
            </property>
            <property name="text" >
             <string>Internet Game Settings</string>
            </property>
           </widget>
          </item>
-         <item row="1" column="0" >
+         <item>
           <widget class="Line" name="line_9" >
            <property name="orientation" >
             <enum>Qt::Horizontal</enum>
            </property>
           </widget>
          </item>
-         <item row="2" column="0" >
+         <item>
           <widget class="QLabel" name="label_43" >
            <property name="text" >
             <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
@@ -1239,50 +1235,139 @@ p, li { white-space: pre-wrap; }
            </property>
           </widget>
          </item>
-         <item row="3" column="0" >
-          <spacer>
-           <property name="orientation" >
-            <enum>Qt::Vertical</enum>
-           </property>
-           <property name="sizeType" >
-            <enum>QSizePolicy::Fixed</enum>
-           </property>
-           <property name="sizeHint" stdset="0" >
-            <size>
-             <width>400</width>
-             <height>16</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-         <item row="4" column="0" >
+         <item>
           <widget class="QGroupBox" name="groupBox_4" >
            <property name="title" >
             <string>Internet Server Settings (Dedicated Server)</string>
            </property>
            <layout class="QGridLayout" >
-            <property name="margin" >
-             <number>9</number>
+            <property name="topMargin" >
+             <number>5</number>
             </property>
-            <property name="spacing" >
-             <number>6</number>
+            <property name="bottomMargin" >
+             <number>4</number>
             </property>
-            <item row="4" column="0" >
-             <widget class="QCheckBox" name="checkBox_InternetServerUseSctp" >
-              <property name="text" >
-               <string>Use SCTP</string>
+            <item row="0" column="0" colspan="2" >
+             <widget class="QGroupBox" name="groupBox_automaticServerConfig" >
+              <property name="title" >
+               <string>Automatic Server Configuration URL</string>
               </property>
+              <property name="checkable" >
+               <bool>true</bool>
+              </property>
+              <layout class="QGridLayout" >
+               <property name="topMargin" >
+                <number>5</number>
+               </property>
+               <item row="0" column="0" >
+                <widget class="QLabel" name="label_18" >
+                 <property name="text" >
+                  <string>Serverlist Address:</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="0" column="1" >
+                <widget class="QLineEdit" name="lineEdit_InternetServerListAddress" />
+               </item>
+              </layout>
              </widget>
             </item>
-            <item row="3" column="0" >
+            <item row="1" column="0" colspan="2" >
+             <widget class="QGroupBox" name="groupBox_manualServerConfig" >
+              <property name="minimumSize" >
+               <size>
+                <width>0</width>
+                <height>116</height>
+               </size>
+              </property>
+              <property name="title" >
+               <string>Manual Server Configuration</string>
+              </property>
+              <property name="checkable" >
+               <bool>true</bool>
+              </property>
+              <property name="checked" >
+               <bool>false</bool>
+              </property>
+              <layout class="QGridLayout" >
+               <property name="topMargin" >
+                <number>4</number>
+               </property>
+               <item row="0" column="0" >
+                <widget class="QLabel" name="label_41" >
+                 <property name="text" >
+                  <string>Server Address:</string>
+                 </property>
+                 <property name="buddy" >
+                  <cstring>lineEdit_InternetServerAddress</cstring>
+                 </property>
+                </widget>
+               </item>
+               <item row="0" column="1" >
+                <widget class="QLineEdit" name="lineEdit_InternetServerAddress" >
+                 <property name="maxLength" >
+                  <number>60</number>
+                 </property>
+                </widget>
+               </item>
+               <item row="1" column="0" >
+                <widget class="QLabel" name="label_31" >
+                 <property name="text" >
+                  <string>Server Port:</string>
+                 </property>
+                 <property name="buddy" >
+                  <cstring>spinBox_InternetServerPort</cstring>
+                 </property>
+                </widget>
+               </item>
+               <item row="1" column="1" >
+                <widget class="QSpinBox" name="spinBox_InternetServerPort" >
+                 <property name="minimum" >
+                  <number>80</number>
+                 </property>
+                 <property name="maximum" >
+                  <number>65535</number>
+                 </property>
+                 <property name="value" >
+                  <number>7234</number>
+                 </property>
+                </widget>
+               </item>
+               <item row="2" column="0" >
+                <widget class="QLabel" name="label_44" >
+                 <property name="text" >
+                  <string>Server Password:</string>
+                 </property>
+                 <property name="buddy" >
+                  <cstring>lineEdit_InternetServerPassword</cstring>
+                 </property>
+                </widget>
+               </item>
+               <item row="2" column="1" >
+                <widget class="QLineEdit" name="lineEdit_InternetServerPassword" >
+                 <property name="echoMode" >
+                  <enum>QLineEdit::Password</enum>
+                 </property>
+                </widget>
+               </item>
+              </layout>
+             </widget>
+            </item>
+            <item row="2" column="0" >
              <widget class="QCheckBox" name="checkBox_InternetServerUseIpv6" >
               <property name="text" >
                <string>Use IPv6</string>
               </property>
              </widget>
             </item>
-            <item row="3" column="1" >
+            <item row="2" column="1" >
              <widget class="QLabel" name="label_32" >
+              <property name="minimumSize" >
+               <size>
+                <width>299</width>
+                <height>0</height>
+               </size>
+              </property>
               <property name="text" >
                <string>&lt;a href="http://en.wikipedia.org/wiki/Ipv6">What is this?&lt;/a></string>
               </property>
@@ -1291,17 +1376,14 @@ p, li { white-space: pre-wrap; }
               </property>
              </widget>
             </item>
-            <item row="1" column="0" >
-             <widget class="QLabel" name="label_31" >
+            <item row="3" column="0" >
+             <widget class="QCheckBox" name="checkBox_InternetServerUseSctp" >
               <property name="text" >
-               <string>Server Port:</string>
-              </property>
-              <property name="buddy" >
-               <cstring>spinBox_InternetServerPort</cstring>
+               <string>Use SCTP</string>
               </property>
              </widget>
             </item>
-            <item row="4" column="1" >
+            <item row="3" column="1" >
              <widget class="QLabel" name="label_42" >
               <property name="text" >
                <string>&lt;a href="http://en.wikipedia.org/wiki/Stream_Control_Transmission_Protocol">What is this?&lt;/a></string>
@@ -1311,62 +1393,24 @@ p, li { white-space: pre-wrap; }
               </property>
              </widget>
             </item>
-            <item row="1" column="1" >
-             <widget class="QSpinBox" name="spinBox_InternetServerPort" >
-              <property name="minimum" >
-               <number>80</number>
-              </property>
-              <property name="maximum" >
-               <number>65535</number>
-              </property>
-              <property name="value" >
-               <number>7234</number>
-              </property>
-             </widget>
-            </item>
-            <item row="0" column="0" >
-             <widget class="QLabel" name="label_41" >
-              <property name="text" >
-               <string>Server Address:</string>
-              </property>
-              <property name="buddy" >
-               <cstring>lineEdit_InternetServerAddress</cstring>
-              </property>
-             </widget>
-            </item>
-            <item row="0" column="1" >
-             <widget class="QLineEdit" name="lineEdit_InternetServerAddress" >
-              <property name="maxLength" >
-               <number>60</number>
-              </property>
-             </widget>
-            </item>
-            <item row="2" column="0" >
-             <widget class="QLabel" name="label_44" >
-              <property name="text" >
-               <string>Server Password:</string>
-              </property>
-              <property name="buddy" >
-               <cstring>lineEdit_InternetServerPassword</cstring>
-              </property>
-             </widget>
-            </item>
-            <item row="2" column="1" >
-             <widget class="QLineEdit" name="lineEdit_InternetServerPassword" >
-              <property name="echoMode" >
-               <enum>QLineEdit::Password</enum>
-              </property>
-             </widget>
-            </item>
            </layout>
           </widget>
          </item>
-         <item row="5" column="0" >
+         <item>
           <layout class="QHBoxLayout" >
            <property name="spacing" >
             <number>6</number>
            </property>
-           <property name="margin" >
+           <property name="leftMargin" >
+            <number>0</number>
+           </property>
+           <property name="topMargin" >
+            <number>0</number>
+           </property>
+           <property name="rightMargin" >
+            <number>0</number>
+           </property>
+           <property name="bottomMargin" >
             <number>0</number>
            </property>
            <item>
@@ -1388,7 +1432,7 @@ p, li { white-space: pre-wrap; }
            </item>
           </layout>
          </item>
-         <item row="6" column="0" >
+         <item>
           <widget class="QGroupBox" name="groupBox_lobbyChat" >
            <property name="title" >
             <string>Enable/Disable Lobby Chat (IRC Server)</string>
@@ -1397,6 +1441,12 @@ p, li { white-space: pre-wrap; }
             <bool>true</bool>
            </property>
            <layout class="QGridLayout" >
+            <property name="topMargin" >
+             <number>5</number>
+            </property>
+            <property name="bottomMargin" >
+             <number>4</number>
+            </property>
             <item row="0" column="0" >
              <widget class="QLabel" name="label_48" >
               <property name="text" >
@@ -1494,15 +1544,15 @@ p, li { white-space: pre-wrap; }
            </layout>
           </widget>
          </item>
-         <item row="7" column="0" >
+         <item>
           <spacer>
            <property name="orientation" >
             <enum>Qt::Vertical</enum>
            </property>
-           <property name="sizeHint" stdset="0" >
+           <property name="sizeHint" >
             <size>
-             <width>400</width>
-             <height>51</height>
+             <width>437</width>
+             <height>16</height>
             </size>
            </property>
           </spacer>
@@ -1510,19 +1560,23 @@ p, li { white-space: pre-wrap; }
         </layout>
        </widget>
        <widget class="QWidget" name="page_3" >
-        <property name="geometry" >
-         <rect>
-          <x>0</x>
-          <y>0</y>
-          <width>419</width>
-          <height>574</height>
-         </rect>
-        </property>
         <layout class="QGridLayout" >
-         <property name="margin" >
+         <property name="leftMargin" >
           <number>9</number>
          </property>
-         <property name="spacing" >
+         <property name="topMargin" >
+          <number>9</number>
+         </property>
+         <property name="rightMargin" >
+          <number>9</number>
+         </property>
+         <property name="bottomMargin" >
+          <number>9</number>
+         </property>
+         <property name="horizontalSpacing" >
+          <number>6</number>
+         </property>
+         <property name="verticalSpacing" >
           <number>6</number>
          </property>
          <item row="5" column="0" >
@@ -1530,7 +1584,7 @@ p, li { white-space: pre-wrap; }
            <property name="orientation" >
             <enum>Qt::Vertical</enum>
            </property>
-           <property name="sizeHint" stdset="0" >
+           <property name="sizeHint" >
             <size>
              <width>20</width>
              <height>40</height>
@@ -1541,7 +1595,7 @@ p, li { white-space: pre-wrap; }
          <item row="0" column="0" >
           <widget class="QLabel" name="label_7" >
            <property name="styleSheet" >
-            <string notr="true" >QLabel { font-weight: bold;  }</string>
+            <string>QLabel { font-weight: bold;  }</string>
            </property>
            <property name="text" >
             <string>Player Nicks</string>
@@ -1554,18 +1608,42 @@ p, li { white-space: pre-wrap; }
             <string>Computer Engine</string>
            </property>
            <layout class="QGridLayout" >
-            <property name="margin" >
+            <property name="leftMargin" >
              <number>7</number>
             </property>
-            <property name="spacing" >
+            <property name="topMargin" >
+             <number>7</number>
+            </property>
+            <property name="rightMargin" >
+             <number>7</number>
+            </property>
+            <property name="bottomMargin" >
+             <number>7</number>
+            </property>
+            <property name="horizontalSpacing" >
+             <number>10</number>
+            </property>
+            <property name="verticalSpacing" >
              <number>10</number>
             </property>
             <item row="1" column="2" >
              <layout class="QGridLayout" >
-              <property name="margin" >
+              <property name="leftMargin" >
                <number>0</number>
               </property>
-              <property name="spacing" >
+              <property name="topMargin" >
+               <number>0</number>
+              </property>
+              <property name="rightMargin" >
+               <number>0</number>
+              </property>
+              <property name="bottomMargin" >
+               <number>0</number>
+              </property>
+              <property name="horizontalSpacing" >
+               <number>4</number>
+              </property>
+              <property name="verticalSpacing" >
                <number>4</number>
               </property>
               <item row="0" column="0" >
@@ -1601,7 +1679,16 @@ p, li { white-space: pre-wrap; }
                 <property name="spacing" >
                  <number>6</number>
                 </property>
-                <property name="margin" >
+                <property name="leftMargin" >
+                 <number>0</number>
+                </property>
+                <property name="topMargin" >
+                 <number>0</number>
+                </property>
+                <property name="rightMargin" >
+                 <number>0</number>
+                </property>
+                <property name="bottomMargin" >
                  <number>0</number>
                 </property>
                 <item>
@@ -1612,7 +1699,7 @@ p, li { white-space: pre-wrap; }
                   <property name="sizeType" >
                    <enum>QSizePolicy::Fixed</enum>
                   </property>
-                  <property name="sizeHint" stdset="0" >
+                  <property name="sizeHint" >
                    <size>
                     <width>3</width>
                     <height>20</height>
@@ -1656,7 +1743,7 @@ p, li { white-space: pre-wrap; }
                   <property name="sizeType" >
                    <enum>QSizePolicy::Fixed</enum>
                   </property>
-                  <property name="sizeHint" stdset="0" >
+                  <property name="sizeHint" >
                    <size>
                     <width>3</width>
                     <height>20</height>
@@ -1695,10 +1782,22 @@ p, li { white-space: pre-wrap; }
             </item>
             <item row="1" column="1" >
              <layout class="QGridLayout" >
-              <property name="margin" >
+              <property name="leftMargin" >
                <number>0</number>
               </property>
-              <property name="spacing" >
+              <property name="topMargin" >
+               <number>0</number>
+              </property>
+              <property name="rightMargin" >
+               <number>0</number>
+              </property>
+              <property name="bottomMargin" >
+               <number>0</number>
+              </property>
+              <property name="horizontalSpacing" >
+               <number>4</number>
+              </property>
+              <property name="verticalSpacing" >
                <number>4</number>
               </property>
               <item row="0" column="0" >
@@ -1734,7 +1833,16 @@ p, li { white-space: pre-wrap; }
                 <property name="spacing" >
                  <number>6</number>
                 </property>
-                <property name="margin" >
+                <property name="leftMargin" >
+                 <number>0</number>
+                </property>
+                <property name="topMargin" >
+                 <number>0</number>
+                </property>
+                <property name="rightMargin" >
+                 <number>0</number>
+                </property>
+                <property name="bottomMargin" >
                  <number>0</number>
                 </property>
                 <item>
@@ -1745,7 +1853,7 @@ p, li { white-space: pre-wrap; }
                   <property name="sizeType" >
                    <enum>QSizePolicy::Fixed</enum>
                   </property>
-                  <property name="sizeHint" stdset="0" >
+                  <property name="sizeHint" >
                    <size>
                     <width>3</width>
                     <height>20</height>
@@ -1789,7 +1897,7 @@ p, li { white-space: pre-wrap; }
                   <property name="sizeType" >
                    <enum>QSizePolicy::Fixed</enum>
                   </property>
-                  <property name="sizeHint" stdset="0" >
+                  <property name="sizeHint" >
                    <size>
                     <width>3</width>
                     <height>20</height>
@@ -1828,10 +1936,22 @@ p, li { white-space: pre-wrap; }
             </item>
             <item row="1" column="0" >
              <layout class="QGridLayout" >
-              <property name="margin" >
+              <property name="leftMargin" >
                <number>0</number>
               </property>
-              <property name="spacing" >
+              <property name="topMargin" >
+               <number>0</number>
+              </property>
+              <property name="rightMargin" >
+               <number>0</number>
+              </property>
+              <property name="bottomMargin" >
+               <number>0</number>
+              </property>
+              <property name="horizontalSpacing" >
+               <number>4</number>
+              </property>
+              <property name="verticalSpacing" >
                <number>4</number>
               </property>
               <item row="2" column="0" >
@@ -1892,7 +2012,16 @@ p, li { white-space: pre-wrap; }
                 <property name="spacing" >
                  <number>6</number>
                 </property>
-                <property name="margin" >
+                <property name="leftMargin" >
+                 <number>0</number>
+                </property>
+                <property name="topMargin" >
+                 <number>0</number>
+                </property>
+                <property name="rightMargin" >
+                 <number>0</number>
+                </property>
+                <property name="bottomMargin" >
                  <number>0</number>
                 </property>
                 <item>
@@ -1903,7 +2032,7 @@ p, li { white-space: pre-wrap; }
                   <property name="sizeType" >
                    <enum>QSizePolicy::Fixed</enum>
                   </property>
-                  <property name="sizeHint" stdset="0" >
+                  <property name="sizeHint" >
                    <size>
                     <width>3</width>
                     <height>20</height>
@@ -1947,7 +2076,7 @@ p, li { white-space: pre-wrap; }
                   <property name="sizeType" >
                    <enum>QSizePolicy::Fixed</enum>
                   </property>
-                  <property name="sizeHint" stdset="0" >
+                  <property name="sizeHint" >
                    <size>
                     <width>3</width>
                     <height>20</height>
@@ -1961,10 +2090,22 @@ p, li { white-space: pre-wrap; }
             </item>
             <item row="0" column="2" >
              <layout class="QGridLayout" >
-              <property name="margin" >
+              <property name="leftMargin" >
                <number>0</number>
               </property>
-              <property name="spacing" >
+              <property name="topMargin" >
+               <number>0</number>
+              </property>
+              <property name="rightMargin" >
+               <number>0</number>
+              </property>
+              <property name="bottomMargin" >
+               <number>0</number>
+              </property>
+              <property name="horizontalSpacing" >
+               <number>4</number>
+              </property>
+              <property name="verticalSpacing" >
                <number>4</number>
               </property>
               <item row="0" column="0" >
@@ -2025,7 +2166,16 @@ p, li { white-space: pre-wrap; }
                 <property name="spacing" >
                  <number>6</number>
                 </property>
-                <property name="margin" >
+                <property name="leftMargin" >
+                 <number>0</number>
+                </property>
+                <property name="topMargin" >
+                 <number>0</number>
+                </property>
+                <property name="rightMargin" >
+                 <number>0</number>
+                </property>
+                <property name="bottomMargin" >
                  <number>0</number>
                 </property>
                 <item>
@@ -2036,7 +2186,7 @@ p, li { white-space: pre-wrap; }
                   <property name="sizeType" >
                    <enum>QSizePolicy::Fixed</enum>
                   </property>
-                  <property name="sizeHint" stdset="0" >
+                  <property name="sizeHint" >
                    <size>
                     <width>3</width>
                     <height>20</height>
@@ -2080,7 +2230,7 @@ p, li { white-space: pre-wrap; }
                   <property name="sizeType" >
                    <enum>QSizePolicy::Fixed</enum>
                   </property>
-                  <property name="sizeHint" stdset="0" >
+                  <property name="sizeHint" >
                    <size>
                     <width>3</width>
                     <height>20</height>
@@ -2094,10 +2244,22 @@ p, li { white-space: pre-wrap; }
             </item>
             <item row="0" column="1" >
              <layout class="QGridLayout" >
-              <property name="margin" >
+              <property name="leftMargin" >
                <number>0</number>
               </property>
-              <property name="spacing" >
+              <property name="topMargin" >
+               <number>0</number>
+              </property>
+              <property name="rightMargin" >
+               <number>0</number>
+              </property>
+              <property name="bottomMargin" >
+               <number>0</number>
+              </property>
+              <property name="horizontalSpacing" >
+               <number>4</number>
+              </property>
+              <property name="verticalSpacing" >
                <number>4</number>
               </property>
               <item row="2" column="0" >
@@ -2158,7 +2320,16 @@ p, li { white-space: pre-wrap; }
                 <property name="spacing" >
                  <number>6</number>
                 </property>
-                <property name="margin" >
+                <property name="leftMargin" >
+                 <number>0</number>
+                </property>
+                <property name="topMargin" >
+                 <number>0</number>
+                </property>
+                <property name="rightMargin" >
+                 <number>0</number>
+                </property>
+                <property name="bottomMargin" >
                  <number>0</number>
                 </property>
                 <item>
@@ -2169,7 +2340,7 @@ p, li { white-space: pre-wrap; }
                   <property name="sizeType" >
                    <enum>QSizePolicy::Fixed</enum>
                   </property>
-                  <property name="sizeHint" stdset="0" >
+                  <property name="sizeHint" >
                    <size>
                     <width>3</width>
                     <height>20</height>
@@ -2213,7 +2384,7 @@ p, li { white-space: pre-wrap; }
                   <property name="sizeType" >
                    <enum>QSizePolicy::Fixed</enum>
                   </property>
-                  <property name="sizeHint" stdset="0" >
+                  <property name="sizeHint" >
                    <size>
                     <width>3</width>
                     <height>20</height>
@@ -2227,10 +2398,22 @@ p, li { white-space: pre-wrap; }
             </item>
             <item row="0" column="0" >
              <layout class="QGridLayout" >
-              <property name="margin" >
+              <property name="leftMargin" >
                <number>0</number>
               </property>
-              <property name="spacing" >
+              <property name="topMargin" >
+               <number>0</number>
+              </property>
+              <property name="rightMargin" >
+               <number>0</number>
+              </property>
+              <property name="bottomMargin" >
+               <number>0</number>
+              </property>
+              <property name="horizontalSpacing" >
+               <number>4</number>
+              </property>
+              <property name="verticalSpacing" >
                <number>4</number>
               </property>
               <item row="2" column="0" >
@@ -2291,7 +2474,16 @@ p, li { white-space: pre-wrap; }
                 <property name="spacing" >
                  <number>6</number>
                 </property>
-                <property name="margin" >
+                <property name="leftMargin" >
+                 <number>0</number>
+                </property>
+                <property name="topMargin" >
+                 <number>0</number>
+                </property>
+                <property name="rightMargin" >
+                 <number>0</number>
+                </property>
+                <property name="bottomMargin" >
                  <number>0</number>
                 </property>
                 <item>
@@ -2302,7 +2494,7 @@ p, li { white-space: pre-wrap; }
                   <property name="sizeType" >
                    <enum>QSizePolicy::Fixed</enum>
                   </property>
-                  <property name="sizeHint" stdset="0" >
+                  <property name="sizeHint" >
                    <size>
                     <width>3</width>
                     <height>20</height>
@@ -2346,7 +2538,7 @@ p, li { white-space: pre-wrap; }
                   <property name="sizeType" >
                    <enum>QSizePolicy::Fixed</enum>
                   </property>
-                  <property name="sizeHint" stdset="0" >
+                  <property name="sizeHint" >
                    <size>
                     <width>3</width>
                     <height>20</height>
@@ -2383,10 +2575,22 @@ p, li { white-space: pre-wrap; }
          </item>
          <item row="2" column="0" >
           <layout class="QGridLayout" >
-           <property name="margin" >
+           <property name="leftMargin" >
             <number>0</number>
            </property>
-           <property name="spacing" >
+           <property name="topMargin" >
+            <number>0</number>
+           </property>
+           <property name="rightMargin" >
+            <number>0</number>
+           </property>
+           <property name="bottomMargin" >
+            <number>0</number>
+           </property>
+           <property name="horizontalSpacing" >
+            <number>0</number>
+           </property>
+           <property name="verticalSpacing" >
             <number>0</number>
            </property>
            <item row="0" column="0" >
@@ -2394,7 +2598,16 @@ p, li { white-space: pre-wrap; }
              <property name="spacing" >
               <number>6</number>
              </property>
-             <property name="margin" >
+             <property name="leftMargin" >
+              <number>0</number>
+             </property>
+             <property name="topMargin" >
+              <number>0</number>
+             </property>
+             <property name="rightMargin" >
+              <number>0</number>
+             </property>
+             <property name="bottomMargin" >
               <number>0</number>
              </property>
              <item>
@@ -2402,7 +2615,7 @@ p, li { white-space: pre-wrap; }
                <property name="orientation" >
                 <enum>Qt::Horizontal</enum>
                </property>
-               <property name="sizeHint" stdset="0" >
+               <property name="sizeHint" >
                 <size>
                  <width>40</width>
                  <height>20</height>
@@ -2443,7 +2656,7 @@ p, li { white-space: pre-wrap; }
                <property name="orientation" >
                 <enum>Qt::Horizontal</enum>
                </property>
-               <property name="sizeHint" stdset="0" >
+               <property name="sizeHint" >
                 <size>
                  <width>40</width>
                  <height>20</height>
@@ -2458,7 +2671,16 @@ p, li { white-space: pre-wrap; }
              <property name="spacing" >
               <number>6</number>
              </property>
-             <property name="margin" >
+             <property name="leftMargin" >
+              <number>6</number>
+             </property>
+             <property name="topMargin" >
+              <number>6</number>
+             </property>
+             <property name="rightMargin" >
+              <number>6</number>
+             </property>
+             <property name="bottomMargin" >
               <number>6</number>
              </property>
              <item>
@@ -2466,7 +2688,7 @@ p, li { white-space: pre-wrap; }
                <property name="orientation" >
                 <enum>Qt::Horizontal</enum>
                </property>
-               <property name="sizeHint" stdset="0" >
+               <property name="sizeHint" >
                 <size>
                  <width>40</width>
                  <height>20</height>
@@ -2504,7 +2726,7 @@ p, li { white-space: pre-wrap; }
                <property name="orientation" >
                 <enum>Qt::Horizontal</enum>
                </property>
-               <property name="sizeHint" stdset="0" >
+               <property name="sizeHint" >
                 <size>
                  <width>40</width>
                  <height>20</height>
@@ -2519,7 +2741,16 @@ p, li { white-space: pre-wrap; }
              <property name="spacing" >
               <number>6</number>
              </property>
-             <property name="margin" >
+             <property name="leftMargin" >
+              <number>0</number>
+             </property>
+             <property name="topMargin" >
+              <number>0</number>
+             </property>
+             <property name="rightMargin" >
+              <number>0</number>
+             </property>
+             <property name="bottomMargin" >
               <number>0</number>
              </property>
              <item>
@@ -2527,7 +2758,7 @@ p, li { white-space: pre-wrap; }
                <property name="orientation" >
                 <enum>Qt::Horizontal</enum>
                </property>
-               <property name="sizeHint" stdset="0" >
+               <property name="sizeHint" >
                 <size>
                  <width>20</width>
                  <height>40</height>
@@ -2540,7 +2771,16 @@ p, li { white-space: pre-wrap; }
                <property name="spacing" >
                 <number>6</number>
                </property>
-               <property name="margin" >
+               <property name="leftMargin" >
+                <number>0</number>
+               </property>
+               <property name="topMargin" >
+                <number>0</number>
+               </property>
+               <property name="rightMargin" >
+                <number>0</number>
+               </property>
+               <property name="bottomMargin" >
                 <number>0</number>
                </property>
                <item>
@@ -2551,7 +2791,7 @@ p, li { white-space: pre-wrap; }
                  <property name="sizeType" >
                   <enum>QSizePolicy::Fixed</enum>
                  </property>
-                 <property name="sizeHint" stdset="0" >
+                 <property name="sizeHint" >
                   <size>
                    <width>3</width>
                    <height>20</height>
@@ -2595,7 +2835,7 @@ p, li { white-space: pre-wrap; }
                  <property name="sizeType" >
                   <enum>QSizePolicy::Fixed</enum>
                  </property>
-                 <property name="sizeHint" stdset="0" >
+                 <property name="sizeHint" >
                   <size>
                    <width>3</width>
                    <height>20</height>
@@ -2610,7 +2850,7 @@ p, li { white-space: pre-wrap; }
                <property name="orientation" >
                 <enum>Qt::Horizontal</enum>
                </property>
-               <property name="sizeHint" stdset="0" >
+               <property name="sizeHint" >
                 <size>
                  <width>20</width>
                  <height>40</height>
@@ -2625,19 +2865,23 @@ p, li { white-space: pre-wrap; }
         </layout>
        </widget>
        <widget class="QWidget" name="page_5" >
-        <property name="geometry" >
-         <rect>
-          <x>0</x>
-          <y>0</y>
-          <width>455</width>
-          <height>511</height>
-         </rect>
-        </property>
         <layout class="QGridLayout" >
-         <property name="margin" >
+         <property name="leftMargin" >
           <number>9</number>
          </property>
-         <property name="spacing" >
+         <property name="topMargin" >
+          <number>9</number>
+         </property>
+         <property name="rightMargin" >
+          <number>9</number>
+         </property>
+         <property name="bottomMargin" >
+          <number>9</number>
+         </property>
+         <property name="horizontalSpacing" >
+          <number>6</number>
+         </property>
+         <property name="verticalSpacing" >
           <number>6</number>
          </property>
          <item row="2" column="0" >
@@ -2651,7 +2895,7 @@ p, li { white-space: pre-wrap; }
            <property name="checked" >
             <bool>true</bool>
            </property>
-           <layout class="QGridLayout" name="gridLayout" >
+           <layout class="QGridLayout" >
             <item row="0" column="0" >
              <widget class="QLabel" name="label_29" >
               <property name="text" >
@@ -2663,7 +2907,7 @@ p, li { white-space: pre-wrap; }
              </widget>
             </item>
             <item row="0" column="1" >
-             <layout class="QHBoxLayout" name="horizontalLayout" >
+             <layout class="QHBoxLayout" >
               <item>
                <widget class="QLineEdit" name="lineEdit_logDir" />
               </item>
@@ -2682,8 +2926,7 @@ p, li { white-space: pre-wrap; }
                  </size>
                 </property>
                 <property name="icon" >
-                 <iconset>
-                  <normaloff>../../../../../../.designer/backup</normaloff>../../../../../../.designer/backup</iconset>
+                 <iconset>../../../../../../.designer/backup</iconset>
                 </property>
                </widget>
               </item>
@@ -2759,7 +3002,7 @@ p, li { white-space: pre-wrap; }
          <item row="0" column="0" >
           <widget class="QLabel" name="label_6" >
            <property name="styleSheet" >
-            <string notr="true" >QLabel { font-weight: bold;  }</string>
+            <string>QLabel { font-weight: bold;  }</string>
            </property>
            <property name="text" >
             <string>Log Messages</string>
@@ -2778,7 +3021,7 @@ p, li { white-space: pre-wrap; }
            <property name="orientation" >
             <enum>Qt::Vertical</enum>
            </property>
-           <property name="sizeHint" stdset="0" >
+           <property name="sizeHint" >
             <size>
              <width>20</width>
              <height>40</height>
@@ -2805,7 +3048,7 @@ p, li { white-space: pre-wrap; }
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="standardButtons" >
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>
@@ -2933,12 +3176,12 @@ p, li { white-space: pre-wrap; }
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>361</x>
-     <y>366</y>
+     <x>362</x>
+     <y>426</y>
     </hint>
     <hint type="destinationlabel" >
-     <x>571</x>
-     <y>366</y>
+     <x>609</x>
+     <y>426</y>
     </hint>
    </hints>
   </connection>
@@ -2949,12 +3192,12 @@ p, li { white-space: pre-wrap; }
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>361</x>
-     <y>366</y>
+     <x>362</x>
+     <y>426</y>
     </hint>
     <hint type="destinationlabel" >
-     <x>600</x>
-     <y>368</y>
+     <x>638</x>
+     <y>426</y>
     </hint>
    </hints>
   </connection>
@@ -2965,8 +3208,8 @@ p, li { white-space: pre-wrap; }
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>489</x>
-     <y>596</y>
+     <x>498</x>
+     <y>678</y>
     </hint>
     <hint type="destinationlabel" >
      <x>354</x>
@@ -2981,8 +3224,8 @@ p, li { white-space: pre-wrap; }
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>577</x>
-     <y>596</y>
+     <x>586</x>
+     <y>678</y>
     </hint>
     <hint type="destinationlabel" >
      <x>599</x>
@@ -2997,12 +3240,12 @@ p, li { white-space: pre-wrap; }
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>304</x>
-     <y>38</y>
+     <x>413</x>
+     <y>425</y>
     </hint>
     <hint type="destinationlabel" >
-     <x>304</x>
-     <y>38</y>
+     <x>650</x>
+     <y>426</y>
     </hint>
    </hints>
   </connection>
@@ -3013,12 +3256,12 @@ p, li { white-space: pre-wrap; }
    <slot>setNum(int)</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>304</x>
-     <y>38</y>
+     <x>639</x>
+     <y>96</y>
     </hint>
     <hint type="destinationlabel" >
-     <x>304</x>
-     <y>38</y>
+     <x>335</x>
+     <y>97</y>
     </hint>
    </hints>
   </connection>
@@ -3029,12 +3272,12 @@ p, li { white-space: pre-wrap; }
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>304</x>
-     <y>38</y>
+     <x>639</x>
+     <y>200</y>
     </hint>
     <hint type="destinationlabel" >
-     <x>304</x>
-     <y>38</y>
+     <x>639</x>
+     <y>235</y>
     </hint>
    </hints>
   </connection>
@@ -3045,12 +3288,12 @@ p, li { white-space: pre-wrap; }
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>304</x>
-     <y>38</y>
+     <x>639</x>
+     <y>200</y>
     </hint>
     <hint type="destinationlabel" >
-     <x>304</x>
-     <y>38</y>
+     <x>639</x>
+     <y>235</y>
     </hint>
    </hints>
   </connection>
diff --git a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp
index 54e68e23..90a1285e 100644
--- a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp
+++ b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp
@@ -92,6 +92,10 @@ settingsDialogImpl::settingsDialogImpl(QWidget *parent, ConfigFile *c, selectAva
 	connect( radioButton_manualBlindsOrder, SIGNAL( toggled(bool) ), this, SLOT( setFirstSmallBlindMargin() ));	//temporarely unused until ai is enabled in network
 
 	connect( comboBox_switchLanguage, SIGNAL( currentIndexChanged (int) ), this, SLOT ( setLanguageChanged(int) ));
+
+	connect(groupBox_automaticServerConfig, SIGNAL(toggled(bool)), this, SLOT(toggleGroupBoxAutomaticServerConfig(bool)));
+	connect(groupBox_manualServerConfig, SIGNAL(toggled(bool)), this, SLOT(toggleGroupBoxManualServerConfig(bool)));
+
 // 	label_36->hide();
 // 	spinBox_netGameSpeed->hide();
 // 
@@ -163,6 +167,9 @@ void settingsDialogImpl::exec() {
 	checkBox_useSctp->setChecked(myConfig->readConfigInt("ServerUseSctp"));
 
 	//Internet Game Settings
+	if(myConfig->readConfigInt("InternetServerConfigMode")) { groupBox_manualServerConfig->setChecked(TRUE); }
+	else { groupBox_automaticServerConfig->setChecked(TRUE); }
+	lineEdit_InternetServerListAddress->setText(QString::fromUtf8(myConfig->readConfigString("InternetServerListAddress").c_str()));
 	lineEdit_InternetServerAddress->setText(QString::fromUtf8(myConfig->readConfigString("InternetServerAddress").c_str()));
 	spinBox_InternetServerPort->setValue(myConfig->readConfigInt("InternetServerPort"));
 	lineEdit_InternetServerPassword->setText(QString::fromUtf8(myConfig->readConfigString("InternetServerPassword").c_str()));
@@ -303,6 +310,9 @@ void settingsDialogImpl::isAccepted() {
 	myConfig->writeConfigInt("ServerUseSctp", checkBox_useSctp->isChecked());
 
 	//Internet Game Settings
+	if(groupBox_automaticServerConfig->isChecked()) { myConfig->writeConfigInt("InternetServerConfigMode", 0); }
+	if(groupBox_manualServerConfig->isChecked()) { myConfig->writeConfigInt("InternetServerConfigMode", 1); }
+	myConfig->writeConfigString("InternetServerListAddress", lineEdit_InternetServerListAddress->text().toUtf8().constData());
 	myConfig->writeConfigString("InternetServerAddress", lineEdit_InternetServerAddress->text().toUtf8().constData());
 	myConfig->writeConfigInt("InternetServerPort", spinBox_InternetServerPort->value());
 	myConfig->writeConfigString("InternetServerPassword", lineEdit_InternetServerPassword->text().toUtf8().constData());
@@ -603,3 +613,8 @@ void settingsDialogImpl::setLanguageChanged(int index) {
 	changedLanguageIndex = index;
 	
 }
+
+void settingsDialogImpl::toggleGroupBoxAutomaticServerConfig(bool /*toggleState*/) { if(groupBox_automaticServerConfig->isChecked()) groupBox_manualServerConfig->setChecked(FALSE); }
+
+void settingsDialogImpl::toggleGroupBoxManualServerConfig(bool /*toggleState*/) { if(groupBox_manualServerConfig->isChecked()) groupBox_automaticServerConfig->setChecked(FALSE); }
+
diff --git a/src/gui/qt/settingsdialog/settingsdialogimpl.h b/src/gui/qt/settingsdialog/settingsdialogimpl.h
index 23191114..bc96fefd 100644
--- a/src/gui/qt/settingsdialog/settingsdialogimpl.h
+++ b/src/gui/qt/settingsdialog/settingsdialogimpl.h
@@ -73,6 +73,9 @@ public slots:
 	void setFirstSmallBlindMargin() ;
 
 	void setLanguageChanged(int);
+
+	void toggleGroupBoxAutomaticServerConfig(bool /*toggleState*/);
+	void toggleGroupBoxManualServerConfig(bool /*toggleState*/);
 	
 private: