From 883d05ad7dd8e33c862334c48dc2d912aced551b Mon Sep 17 00:00:00 2001
From: doitux <f.hammer@web.de>
Date: Thu, 15 Nov 2012 09:35:49 +0100
Subject: [PATCH] bugfix for #148

---
 src/gui/qt/settingsdialog.ui                  | 162 +++++++++---------
 .../qt/settingsdialog/settingsdialogimpl.cpp  |  16 +-
 2 files changed, 91 insertions(+), 87 deletions(-)

diff --git a/src/gui/qt/settingsdialog.ui b/src/gui/qt/settingsdialog.ui
index 1da41760..a6d320cc 100644
--- a/src/gui/qt/settingsdialog.ui
+++ b/src/gui/qt/settingsdialog.ui
@@ -1561,8 +1561,8 @@ p, li { white-space: pre-wrap; }
         </layout>
        </widget>
        <widget class="QWidget" name="page_7">
-        <layout class="QGridLayout" name="gridLayout_6">
-         <item row="0" column="0">
+        <layout class="QVBoxLayout" name="verticalLayout_4">
+         <item>
           <widget class="QLabel" name="label_30">
            <property name="styleSheet">
             <string notr="true">QLabel { font-weight: bold;  }</string>
@@ -1572,14 +1572,14 @@ p, li { white-space: pre-wrap; }
            </property>
           </widget>
          </item>
-         <item row="1" column="0" colspan="2">
+         <item>
           <widget class="Line" name="line_9">
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
           </widget>
          </item>
-         <item row="2" column="0" colspan="2">
+         <item>
           <widget class="QTabWidget" name="tabWidget_2">
            <property name="currentIndex">
             <number>0</number>
@@ -1588,8 +1588,8 @@ p, li { white-space: pre-wrap; }
             <attribute name="title">
              <string>Server</string>
             </attribute>
-            <layout class="QGridLayout" name="gridLayout_18">
-             <item row="0" column="0">
+            <layout class="QVBoxLayout" name="verticalLayout_3">
+             <item>
               <widget class="QGroupBox" name="groupBox_automaticServerConfig">
                <property name="title">
                 <string>Automatic Server Configuration URL</string>
@@ -1597,28 +1597,25 @@ p, li { white-space: pre-wrap; }
                <property name="checkable">
                 <bool>true</bool>
                </property>
-               <layout class="QGridLayout" name="gridLayout_3">
-                <item row="0" column="0">
+               <layout class="QHBoxLayout" name="horizontalLayout_9">
+                <property name="bottomMargin">
+                 <number>4</number>
+                </property>
+                <item>
                  <widget class="QLabel" name="label_18">
                   <property name="text">
                    <string>Serverlist Address:</string>
                   </property>
                  </widget>
                 </item>
-                <item row="0" column="1">
+                <item>
                  <widget class="QLineEdit" name="lineEdit_InternetServerListAddress"/>
                 </item>
                </layout>
               </widget>
              </item>
-             <item row="1" column="0">
+             <item>
               <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>
@@ -1679,70 +1676,6 @@ p, li { white-space: pre-wrap; }
                 <item row="2" column="1">
                  <widget class="QLineEdit" name="lineEdit_avatarServerAddress"/>
                 </item>
-                <item row="3" column="0" colspan="2">
-                 <layout class="QHBoxLayout" name="horizontalLayout_7">
-                  <item>
-                   <widget class="QCheckBox" name="checkBox_InternetServerUseIpv6">
-                    <property name="text">
-                     <string>Use IPv6</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <widget class="QLabel" name="label_32">
-                    <property name="text">
-                     <string>&lt;a href=&quot;http://en.wikipedia.org/wiki/Ipv6&quot;&gt;What is this?&lt;/a&gt;</string>
-                    </property>
-                    <property name="openExternalLinks">
-                     <bool>true</bool>
-                    </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <spacer name="horizontalSpacer">
-                    <property name="orientation">
-                     <enum>Qt::Horizontal</enum>
-                    </property>
-                    <property name="sizeHint" stdset="0">
-                     <size>
-                      <width>40</width>
-                      <height>20</height>
-                     </size>
-                    </property>
-                   </spacer>
-                  </item>
-                  <item>
-                   <widget class="QCheckBox" name="checkBox_InternetServerUseSctp">
-                    <property name="text">
-                     <string>Use SCTP</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <widget class="QLabel" name="label_42">
-                    <property name="text">
-                     <string>&lt;a href=&quot;http://en.wikipedia.org/wiki/Stream_Control_Transmission_Protocol&quot;&gt;What is this?&lt;/a&gt;</string>
-                    </property>
-                    <property name="openExternalLinks">
-                     <bool>true</bool>
-                    </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <spacer name="horizontalSpacer_8">
-                    <property name="orientation">
-                     <enum>Qt::Horizontal</enum>
-                    </property>
-                    <property name="sizeHint" stdset="0">
-                     <size>
-                      <width>40</width>
-                      <height>20</height>
-                     </size>
-                    </property>
-                   </spacer>
-                  </item>
-                 </layout>
-                </item>
                </layout>
               </widget>
              </item>
@@ -1935,11 +1868,78 @@ p, li { white-space: pre-wrap; }
            </widget>
           </widget>
          </item>
-         <item row="3" column="1">
+         <item>
+          <layout class="QHBoxLayout" name="horizontalLayout_7">
+           <item>
+            <widget class="QCheckBox" name="checkBox_InternetServerUseIpv6">
+             <property name="text">
+              <string>Use IPv6</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLabel" name="label_32">
+             <property name="text">
+              <string>&lt;a href=&quot;http://en.wikipedia.org/wiki/Ipv6&quot;&gt;What is this?&lt;/a&gt;</string>
+             </property>
+             <property name="openExternalLinks">
+              <bool>true</bool>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <spacer name="horizontalSpacer">
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>40</width>
+               <height>20</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+           <item>
+            <widget class="QCheckBox" name="checkBox_InternetServerUseSctp">
+             <property name="text">
+              <string>Use SCTP</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLabel" name="label_whatIsSctp">
+             <property name="text">
+              <string>&lt;a href=&quot;http://en.wikipedia.org/wiki/Stream_Control_Transmission_Protocol&quot;&gt;What is this?&lt;/a&gt;</string>
+             </property>
+             <property name="openExternalLinks">
+              <bool>true</bool>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <spacer name="horizontalSpacer_8">
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>40</width>
+               <height>20</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
+         </item>
+         <item>
           <spacer name="verticalSpacer">
            <property name="orientation">
             <enum>Qt::Vertical</enum>
            </property>
+           <property name="sizeType">
+            <enum>QSizePolicy::Expanding</enum>
+           </property>
            <property name="sizeHint" stdset="0">
             <size>
              <width>20</width>
diff --git a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp
index a6ae15d4..ff1aebe0 100644
--- a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp
+++ b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp
@@ -213,12 +213,11 @@ void settingsDialogImpl::prepareDialog()
 	checkBox_useIpv6->setChecked(myConfig->readConfigInt("ServerUseIpv6"));
 	checkBox_useSctp->setChecked(myConfig->readConfigInt("ServerUseSctp"));
 
-	//Internet Game Settings
-	if(myConfig->readConfigInt("InternetServerConfigMode")) {
-		groupBox_manualServerConfig->setChecked(TRUE);
-	} else {
-		groupBox_automaticServerConfig->setChecked(TRUE);
-	}
+    //Internet Game Settings
+
+    checkBox_InternetServerUseSctp->hide(); //temporarely disabled until sctp support is back
+    label_whatIsSctp->hide();
+
 	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"));
@@ -240,6 +239,11 @@ void settingsDialogImpl::prepareDialog()
 	checkBox_InetGane_AutoLeaveTheTableAfterGameFinished->setChecked(myConfig->readConfigInt("NetAutoLeaveGameAfterFinish"));
 	comboBox_internetGameType->setCurrentIndex(myConfig->readConfigInt("InternetGameType"));
 	lineEdit_internetGameName->setText(QString::fromUtf8(myConfig->readConfigString("InternetGameName").c_str()));
+    if(myConfig->readConfigInt("InternetServerConfigMode")) {
+        groupBox_manualServerConfig->setChecked(TRUE);
+    } else {
+        groupBox_automaticServerConfig->setChecked(TRUE);
+    }
 
 	std::list<std::string> playerIgnoreList = myConfig->readConfigStringList("PlayerIgnoreList");
 	std::list<std::string>::iterator it5;