From 5f09f4b9bd9e933a4007d33f5046493a794e4fd4 Mon Sep 17 00:00:00 2001
From: doitux <f.hammer@web.de>
Date: Wed, 4 Aug 2010 21:11:47 +0000
Subject: [PATCH] small fixes for last action

---
 src/gui/qt/gamelobbydialog.ui                 | 387 ++++++++----------
 .../gamelobbydialog/gamelobbydialogimpl.cpp   |   2 -
 2 files changed, 176 insertions(+), 213 deletions(-)

diff --git a/src/gui/qt/gamelobbydialog.ui b/src/gui/qt/gamelobbydialog.ui
index 17298bb4..d04b1f11 100644
--- a/src/gui/qt/gamelobbydialog.ui
+++ b/src/gui/qt/gamelobbydialog.ui
@@ -426,7 +426,7 @@ p, li { white-space: pre-wrap; }
          </property>
          <layout class="QGridLayout" name="gridLayout">
           <property name="horizontalSpacing">
-           <number>1</number>
+           <number>-1</number>
           </property>
           <property name="verticalSpacing">
            <number>2</number>
@@ -435,241 +435,206 @@ p, li { white-space: pre-wrap; }
            <number>4</number>
           </property>
           <item row="0" column="0">
-           <layout class="QHBoxLayout" name="horizontalLayout_3">
+           <widget class="QLabel" name="label_gameType">
+            <property name="text">
+             <string>Game type:</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+            <property name="wordWrap">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <layout class="QHBoxLayout" name="horizontalLayout">
             <item>
-             <widget class="QLabel" name="label_gameType">
-              <property name="text">
-               <string>Game type: </string>
+             <widget class="QLabel" name="label_typeIcon">
+              <property name="minimumSize">
+               <size>
+                <width>16</width>
+                <height>16</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>16</width>
+                <height>16</height>
+               </size>
               </property>
               <property name="alignment">
                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
               </property>
-              <property name="wordWrap">
-               <bool>true</bool>
-              </property>
              </widget>
             </item>
             <item>
-             <layout class="QHBoxLayout" name="horizontalLayout">
-              <item>
-               <widget class="QLabel" name="label_typeIcon">
-                <property name="minimumSize">
-                 <size>
-                  <width>16</width>
-                  <height>16</height>
-                 </size>
-                </property>
-                <property name="maximumSize">
-                 <size>
-                  <width>16</width>
-                  <height>16</height>
-                 </size>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QLabel" name="label_typeText">
-                <property name="text">
-                 <string/>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-                </property>
-               </widget>
-              </item>
-             </layout>
+             <widget class="QLabel" name="label_typeText">
+              <property name="text">
+               <string/>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+              </property>
+             </widget>
             </item>
            </layout>
           </item>
           <item row="1" column="0">
-           <widget class="Line" name="line">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
+           <widget class="QLabel" name="label_gameDesc2">
+            <property name="text">
+             <string>Start Cash:</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing</set>
+            </property>
+            <property name="wordWrap">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <widget class="QLabel" name="label_StartCash">
+            <property name="styleSheet">
+             <string notr="true">QLabel { color:rgb(0, 0, 255); }</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
             </property>
            </widget>
           </item>
           <item row="2" column="0">
-           <layout class="QHBoxLayout" name="_3">
-            <item>
-             <widget class="QLabel" name="label_gameDesc2">
-              <property name="text">
-               <string>Start Cash: </string>
-              </property>
-              <property name="alignment">
-               <set>Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing</set>
-              </property>
-              <property name="wordWrap">
-               <bool>true</bool>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QLabel" name="label_StartCash">
-              <property name="styleSheet">
-               <string notr="true">QLabel { color:rgb(0, 0, 255); }</string>
-              </property>
-              <property name="alignment">
-               <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-              </property>
-             </widget>
-            </item>
-           </layout>
+           <widget class="QLabel" name="label_gameDesc3">
+            <property name="text">
+             <string>First small blind:</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing</set>
+            </property>
+            <property name="wordWrap">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1">
+           <widget class="QLabel" name="label_SmallBlind">
+            <property name="styleSheet">
+             <string notr="true">QLabel { color:rgb(0, 0, 255); }</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+            </property>
+           </widget>
           </item>
           <item row="3" column="0">
-           <layout class="QHBoxLayout">
-            <item>
-             <widget class="QLabel" name="label_gameDesc3">
-              <property name="text">
-               <string>First small blind: </string>
-              </property>
-              <property name="alignment">
-               <set>Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing</set>
-              </property>
-              <property name="wordWrap">
-               <bool>true</bool>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QLabel" name="label_SmallBlind">
-              <property name="styleSheet">
-               <string notr="true">QLabel { color:rgb(0, 0, 255); }</string>
-              </property>
-              <property name="alignment">
-               <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-              </property>
-             </widget>
-            </item>
-           </layout>
+           <widget class="QLabel" name="label_gameDesc4">
+            <property name="text">
+             <string>Blinds raise interval:</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing</set>
+            </property>
+            <property name="wordWrap">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="1">
+           <widget class="QLabel" name="label_blindsRaiseIntervall">
+            <property name="styleSheet">
+             <string notr="true">QLabel { color:rgb(0, 0, 255); }</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+            </property>
+            <property name="wordWrap">
+             <bool>true</bool>
+            </property>
+           </widget>
           </item>
           <item row="4" column="0">
-           <layout class="QHBoxLayout">
-            <item>
-             <widget class="QLabel" name="label_gameDesc4">
-              <property name="text">
-               <string>Blinds raise interval: </string>
-              </property>
-              <property name="alignment">
-               <set>Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing</set>
-              </property>
-              <property name="wordWrap">
-               <bool>true</bool>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QLabel" name="label_blindsRaiseIntervall">
-              <property name="styleSheet">
-               <string notr="true">QLabel { color:rgb(0, 0, 255); }</string>
-              </property>
-              <property name="alignment">
-               <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-              </property>
-              <property name="wordWrap">
-               <bool>true</bool>
-              </property>
-             </widget>
-            </item>
-           </layout>
+           <widget class="QLabel" name="label_gameDesc5">
+            <property name="text">
+             <string>Blinds raise mode:</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing</set>
+            </property>
+            <property name="wordWrap">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="1">
+           <widget class="QLabel" name="label_blindsRaiseMode">
+            <property name="styleSheet">
+             <string notr="true">QLabel { color:rgb(0, 0, 255); }</string>
+            </property>
+            <property name="text">
+             <string/>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+            </property>
+            <property name="wordWrap">
+             <bool>true</bool>
+            </property>
+           </widget>
           </item>
           <item row="5" column="0">
-           <layout class="QHBoxLayout">
-            <item>
-             <widget class="QLabel" name="label_gameDesc5">
-              <property name="text">
-               <string>Blinds raise mode: </string>
-              </property>
-              <property name="alignment">
-               <set>Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing</set>
-              </property>
-              <property name="wordWrap">
-               <bool>true</bool>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QLabel" name="label_blindsRaiseMode">
-              <property name="styleSheet">
-               <string notr="true">QLabel { color:rgb(0, 0, 255); }</string>
-              </property>
-              <property name="text">
-               <string/>
-              </property>
-              <property name="alignment">
-               <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-              </property>
-              <property name="wordWrap">
-               <bool>true</bool>
-              </property>
-             </widget>
-            </item>
-           </layout>
+           <widget class="QLabel" name="label_gameDesc6">
+            <property name="text">
+             <string>Manual blinds list:</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing</set>
+            </property>
+            <property name="wordWrap">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="5" column="1">
+           <widget class="QLabel" name="label_blindsList">
+            <property name="styleSheet">
+             <string notr="true">QLabel { color:rgb(0, 0, 255); }</string>
+            </property>
+            <property name="text">
+             <string/>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+            </property>
+            <property name="wordWrap">
+             <bool>true</bool>
+            </property>
+           </widget>
           </item>
           <item row="6" column="0">
-           <layout class="QHBoxLayout">
-            <item>
-             <widget class="QLabel" name="label_gameDesc6">
-              <property name="text">
-               <string>Manual blinds list: </string>
-              </property>
-              <property name="alignment">
-               <set>Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing</set>
-              </property>
-              <property name="wordWrap">
-               <bool>true</bool>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QLabel" name="label_blindsList">
-              <property name="styleSheet">
-               <string notr="true">QLabel { color:rgb(0, 0, 255); }</string>
-              </property>
-              <property name="text">
-               <string/>
-              </property>
-              <property name="alignment">
-               <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-              </property>
-              <property name="wordWrap">
-               <bool>true</bool>
-              </property>
-             </widget>
-            </item>
-           </layout>
+           <widget class="QLabel" name="label_gameDesc7">
+            <property name="text">
+             <string>Timeout for player action (sec):</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing</set>
+            </property>
+            <property name="wordWrap">
+             <bool>true</bool>
+            </property>
+           </widget>
           </item>
-          <item row="7" column="0">
-           <layout class="QHBoxLayout">
-            <item>
-             <widget class="QLabel" name="label_gameDesc7">
-              <property name="text">
-               <string>Timeout for player action (sec): </string>
-              </property>
-              <property name="alignment">
-               <set>Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing</set>
-              </property>
-              <property name="wordWrap">
-               <bool>true</bool>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QLabel" name="label_TimeoutForPlayerAction">
-              <property name="styleSheet">
-               <string notr="true">QLabel { color:rgb(0, 0, 255); }</string>
-              </property>
-              <property name="alignment">
-               <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-              </property>
-              <property name="wordWrap">
-               <bool>true</bool>
-              </property>
-             </widget>
-            </item>
-           </layout>
+          <item row="6" column="1">
+           <widget class="QLabel" name="label_TimeoutForPlayerAction">
+            <property name="styleSheet">
+             <string notr="true">QLabel { color:rgb(0, 0, 255); }</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+            </property>
+            <property name="wordWrap">
+             <bool>true</bool>
+            </property>
+           </widget>
           </item>
          </layout>
         </widget>
diff --git a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
index e78757bf..0ab16424 100644
--- a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
+++ b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
@@ -1141,7 +1141,6 @@ void gameLobbyDialogImpl::showGameDescription(bool show) {
         label_gameDesc5->show();
         label_gameDesc6->show();
         label_gameDesc7->show();
-        line->show();
     }
     else {
         label_gameType->hide();
@@ -1151,7 +1150,6 @@ void gameLobbyDialogImpl::showGameDescription(bool show) {
         label_gameDesc5->hide();
         label_gameDesc6->hide();
         label_gameDesc7->hide();
-        line->hide();
     }
 }