From 107a369b490be077b89224b72f42fbcf3a0ac90b Mon Sep 17 00:00:00 2001
From: doitux <f.hammer@web.de>
Date: Thu, 18 Sep 2008 21:54:05 +0000
Subject: [PATCH]

---
 src/gui/qt/resources/pokerth.qrc           | 21 ------
 src/gui/qt/settingsdialog.ui               | 76 ++++++++++++++++------
 src/gui/qt/startwindow/startwindowimpl.cpp |  8 +--
 3 files changed, 60 insertions(+), 45 deletions(-)

diff --git a/src/gui/qt/resources/pokerth.qrc b/src/gui/qt/resources/pokerth.qrc
index 704daba4..d9c9015b 100644
--- a/src/gui/qt/resources/pokerth.qrc
+++ b/src/gui/qt/resources/pokerth.qrc
@@ -1,51 +1,30 @@
 <RCC>
   <qresource prefix="gfx" >
     <file>media_podcast.png</file>
-    <file>audio_input_microphone_small.png</file>
     <file>book.png</file>
     <file>system_users_big.png</file>
-    <file>document_import.png</file>
-    <file>document_export.png</file>
-    <file>bday.png</file>
-    <file>document_multiple.png</file>
     <file>tools_wizard.png</file>
     <file>speaker.png</file>
-    <file>player_stop.png</file>
     <file>player_play.png</file>
-    <file>folder_sound.png</file>
     <file>arrow_right_double.png</file>
     <file>view_refresh.png</file>
     <file>arrow_left_double.png</file>
     <file>list_remove_user.png</file>
-    <file>archive_extract.png</file>
-    <file>preferences_system_time.png</file>
-    <file>archive_remove.png</file>
-    <file>audio_x_monkey.png</file>
     <file>user.png</file>
     <file>application_exit.png</file>
     <file>system_users.png</file>
     <file>list_add_user.png</file>
-    <file>document_new.png</file>
-    <file>kontact_date.png</file>
     <file>list_add.png</file>
     <file>applications_education.png</file>
-    <file>go_jump_today.png</file>
-    <file>document_properties.png</file>
     <file>audio_input_microphone.png</file>
     <file>dialog_close.png</file>
     <file>systemsettings.png</file>
-    <file>archive_insert.png</file>
-    <file>sound.png</file>
-    <file>document_preview.png</file>
     <file>editdelete.png</file>
     <file>user_properties.png</file>
     <file>printer1.png</file>
     <file>pdf.png</file>
-    <file>view_calendar_day.png</file>
-    <file>clock.png</file>
     <file>preferences_desktop_user.png</file>
     <file>dialog_ok_apply.png</file>
     <file>filesave.png</file>
-    <file>view_calendar_list.png</file>
   </qresource>
 </RCC>
diff --git a/src/gui/qt/settingsdialog.ui b/src/gui/qt/settingsdialog.ui
index 5437cc81..c389c58d 100644
--- a/src/gui/qt/settingsdialog.ui
+++ b/src/gui/qt/settingsdialog.ui
@@ -99,7 +99,7 @@
      <item>
       <widget class="QStackedWidget" name="stackedWidget" >
        <property name="currentIndex" >
-        <number>4</number>
+        <number>0</number>
        </property>
        <widget class="QWidget" name="page" >
         <layout class="QGridLayout" name="gridLayout_8" >
@@ -152,6 +152,9 @@
          </item>
          <item row="3" column="0" >
           <layout class="QGridLayout" name="gridLayout_7" >
+           <property name="spacing" >
+            <number>-1</number>
+           </property>
            <item row="0" column="0" >
             <widget class="QCheckBox" name="checkBox_showIntro" >
              <property name="text" >
@@ -194,13 +197,20 @@
              </property>
             </widget>
            </item>
-           <item row="3" column="0" >
+           <item row="4" column="0" >
             <widget class="QCheckBox" name="checkBox_showBlindButtons" >
              <property name="text" >
               <string>Show buttons for small blind and big blind</string>
              </property>
             </widget>
            </item>
+           <item row="3" column="0" >
+            <widget class="QCheckBox" name="checkBox_alternateFKeysUserActionMode" >
+             <property name="text" >
+              <string>Reverse order of F-Keys (F1 - F4)</string>
+             </property>
+            </widget>
+           </item>
            <item row="3" column="1" >
             <widget class="QCheckBox" name="checkBox_antiPeekMode" >
              <property name="text" >
@@ -208,13 +218,6 @@
              </property>
             </widget>
            </item>
-           <item row="4" column="0" >
-            <widget class="QCheckBox" name="checkBox_alternateFKeysUserActionMode" >
-             <property name="text" >
-              <string>Reverse order of F-Keys (F1 - F4)</string>
-             </property>
-            </widget>
-           </item>
           </layout>
          </item>
          <item row="4" column="0" >
@@ -1167,6 +1170,19 @@ p, li { white-space: pre-wrap; }
            </layout>
           </widget>
          </item>
+         <item>
+          <spacer name="verticalSpacer_2" >
+           <property name="orientation" >
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeHint" stdset="0" >
+            <size>
+             <width>20</width>
+             <height>40</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
         </layout>
        </widget>
        <widget class="QWidget" name="page_7" >
@@ -1203,9 +1219,15 @@ p, li { white-space: pre-wrap; }
          </item>
          <item rowspan="2" row="3" column="0" >
           <widget class="QGroupBox" name="groupBox_4" >
+           <property name="minimumSize" >
+            <size>
+             <width>300</width>
+             <height>0</height>
+            </size>
+           </property>
            <property name="maximumSize" >
             <size>
-             <width>285</width>
+             <width>300</width>
              <height>16777215</height>
             </size>
            </property>
@@ -1391,6 +1413,12 @@ p, li { white-space: pre-wrap; }
             </item>
             <item row="1" column="1" >
              <widget class="QSpinBox" name="spinBox_IRCServerPort" >
+              <property name="sizePolicy" >
+               <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
               <property name="minimum" >
                <number>80</number>
               </property>
@@ -1412,17 +1440,10 @@ p, li { white-space: pre-wrap; }
               </property>
              </widget>
             </item>
-            <item row="2" column="1" >
-             <widget class="QLineEdit" name="lineEdit_IRCChannel" >
-              <property name="text" >
-               <string>#pokerth</string>
-              </property>
-             </widget>
-            </item>
             <item row="3" column="0" >
              <widget class="QLabel" name="label_17" >
               <property name="text" >
-               <string>Channel Password:</string>
+               <string>Password:</string>
               </property>
               <property name="buddy" >
                <cstring>lineEdit_IRCChannelPassword</cstring>
@@ -1453,7 +1474,24 @@ p, li { white-space: pre-wrap; }
               </property>
              </widget>
             </item>
+            <item row="2" column="1" >
+             <widget class="QLineEdit" name="lineEdit_IRCChannel" >
+              <property name="text" >
+               <string>#pokerth</string>
+              </property>
+             </widget>
+            </item>
            </layout>
+           <zorder>label_48</zorder>
+           <zorder>lineEdit_IRCServerAddress</zorder>
+           <zorder>label_46</zorder>
+           <zorder>spinBox_IRCServerPort</zorder>
+           <zorder>label_49</zorder>
+           <zorder>label_17</zorder>
+           <zorder>lineEdit_IRCChannelPassword</zorder>
+           <zorder>checkBox_IRCServerUseIpv6</zorder>
+           <zorder>label_45</zorder>
+           <zorder>lineEdit_IRCChannel</zorder>
           </widget>
          </item>
          <item row="4" column="2" >
@@ -2733,8 +2771,6 @@ p, li { white-space: pre-wrap; }
   <tabstop>checkBox_showFadeOutCardsAnimation</tabstop>
   <tabstop>checkBox_showFlipCardsAnimation</tabstop>
   <tabstop>checkBox_showBlindButtons</tabstop>
-  <tabstop>checkBox_antiPeekMode</tabstop>
-  <tabstop>checkBox_alternateFKeysUserActionMode</tabstop>
   <tabstop>checkBox_enableBetInputFocusSwitch</tabstop>
   <tabstop>radioButton_flipsideTux</tabstop>
   <tabstop>radioButton_flipsideOwn</tabstop>
diff --git a/src/gui/qt/startwindow/startwindowimpl.cpp b/src/gui/qt/startwindow/startwindowimpl.cpp
index f211c568..082daf17 100644
--- a/src/gui/qt/startwindow/startwindowimpl.cpp
+++ b/src/gui/qt/startwindow/startwindowimpl.cpp
@@ -698,12 +698,12 @@ void startWindowImpl::networkError(int errorID, int /*osErrorID*/) {
 				QMessageBox::Close); }
 		break;
 		case ERR_NET_PLAYER_NAME_IN_USE:
-			{ /*myChangeHumanPlayerNameDialog->label_Message->setText(tr("Your player name is already used by another player.\nPlease choose a different name."));
-			  myChangeHumanPlayerNameDialog->exec();*/ }
+			{ myChangeHumanPlayerNameDialog->label_Message->setText(tr("Your player name is already used by another player.\nPlease choose a different name."));
+			  myChangeHumanPlayerNameDialog->exec(); }
 		break;
 		case ERR_NET_INVALID_PLAYER_NAME:
-			{ /*myChangeHumanPlayerNameDialog->label_Message->setText(tr("The player name is too short, too long or invalid. Please choose another one."));
-			  myChangeHumanPlayerNameDialog->exec();*/ }
+			{ myChangeHumanPlayerNameDialog->label_Message->setText(tr("The player name is too short, too long or invalid. Please choose another one."));
+			  myChangeHumanPlayerNameDialog->exec(); }
 		break;
 		case ERR_NET_INVALID_GAME_NAME:
 			{ QMessageBox::warning(this, tr("Network Error"),