From fdabcfcdda69750545114407c3cb0b99b6b162c0 Mon Sep 17 00:00:00 2001
From: doitux <f.hammer@web.de>
Date: Thu, 1 Jul 2010 15:00:19 +0000
Subject: [PATCH] leave game to lobby message bugfix, move connected players
 list in lobby back to top again

---
 src/gui/qt/gamelobbydialog.ui          | 55 ++++++++++----------
 src/gui/qt/gametable/gametableimpl.cpp |  2 +-
 src/gui/qt/mymessagedialog.ui          | 69 +++++++++++++-------------
 3 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/src/gui/qt/gamelobbydialog.ui b/src/gui/qt/gamelobbydialog.ui
index 466ffee0..16f12c4f 100644
--- a/src/gui/qt/gamelobbydialog.ui
+++ b/src/gui/qt/gamelobbydialog.ui
@@ -335,6 +335,33 @@ p, li { white-space: pre-wrap; }
       <property name="bottomMargin">
        <number>7</number>
       </property>
+      <item>
+       <widget class="QTreeWidget" name="treeWidget_connectedPlayers">
+        <property name="minimumSize">
+         <size>
+          <width>221</width>
+          <height>240</height>
+         </size>
+        </property>
+        <property name="midLineWidth">
+         <number>1</number>
+        </property>
+        <property name="iconSize">
+         <size>
+          <width>25</width>
+          <height>26</height>
+         </size>
+        </property>
+        <property name="indentation">
+         <number>15</number>
+        </property>
+        <column>
+         <property name="text">
+          <string>Connected Players</string>
+         </property>
+        </column>
+       </widget>
+      </item>
       <item>
        <widget class="QScrollArea" name="scrollArea">
         <property name="minimumSize">
@@ -617,33 +644,6 @@ p, li { white-space: pre-wrap; }
         </widget>
        </widget>
       </item>
-      <item>
-       <widget class="QTreeWidget" name="treeWidget_connectedPlayers">
-        <property name="minimumSize">
-         <size>
-          <width>221</width>
-          <height>240</height>
-         </size>
-        </property>
-        <property name="midLineWidth">
-         <number>1</number>
-        </property>
-        <property name="iconSize">
-         <size>
-          <width>25</width>
-          <height>26</height>
-         </size>
-        </property>
-        <property name="indentation">
-         <number>15</number>
-        </property>
-        <column>
-         <property name="text">
-          <string>Connected Players</string>
-         </property>
-        </column>
-       </widget>
-      </item>
       <item>
        <layout class="QHBoxLayout" name="horizontalLayout_2">
         <item>
@@ -837,7 +837,6 @@ p, li { white-space: pre-wrap; }
   <tabstop>pushButton_JoinGame</tabstop>
   <tabstop>textBrowser_ChatDisplay</tabstop>
   <tabstop>lineEdit_ChatInput</tabstop>
-  <tabstop>treeWidget_connectedPlayers</tabstop>
   <tabstop>checkBox_fillUpWithComputerOpponents</tabstop>
   <tabstop>pushButton_StartGame</tabstop>
   <tabstop>pushButton_Kick</tabstop>
diff --git a/src/gui/qt/gametable/gametableimpl.cpp b/src/gui/qt/gametable/gametableimpl.cpp
index 600af42e..100e2fa6 100755
--- a/src/gui/qt/gametable/gametableimpl.cpp
+++ b/src/gui/qt/gametable/gametableimpl.cpp
@@ -3103,7 +3103,7 @@ void gameTableImpl::leaveCurrentNetworkGame() {
             myStartWindow->getSession()->sendLeaveCurrentGame();
         }
         else {
-            if (dialog.exec(1, tr("Attention! Do you really want to leave the current game\nand go back to the lobby?"), tr("PokerTH - Internet Game Message"), QPixmap(":/gfx/logoChip3D.png"), QDialogButtonBox::Ok) == QDialog::Accepted, true ) {
+            if (dialog.exec(1, tr("Attention! Do you really want to leave the current game\nand go back to the lobby?"), tr("PokerTH - Internet Game Message"), QPixmap(":/gfx/logoChip3D.png"), QDialogButtonBox::Yes|QDialogButtonBox::No, true) == QDialog::Accepted) {
                 assert(myStartWindow->getSession());
                 myStartWindow->getSession()->sendLeaveCurrentGame();
             }
diff --git a/src/gui/qt/mymessagedialog.ui b/src/gui/qt/mymessagedialog.ui
index 8f874d62..79c65ccb 100644
--- a/src/gui/qt/mymessagedialog.ui
+++ b/src/gui/qt/mymessagedialog.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>myMessageDialog</class>
- <widget class="QDialog" name="myMessageDialog" >
-  <property name="geometry" >
+ <widget class="QDialog" name="myMessageDialog">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,16 +10,16 @@
     <height>118</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Dialog</string>
   </property>
-  <layout class="QGridLayout" >
-   <property name="topMargin" >
+  <layout class="QGridLayout">
+   <property name="topMargin">
     <number>9</number>
    </property>
-   <item row="0" column="0" >
-    <widget class="QLabel" name="label_icon" >
-     <property name="minimumSize" >
+   <item row="0" column="0">
+    <widget class="QLabel" name="label_icon">
+     <property name="minimumSize">
       <size>
        <width>50</width>
        <height>50</height>
@@ -26,24 +27,24 @@
      </property>
     </widget>
    </item>
-   <item rowspan="2" row="0" column="1" >
-    <layout class="QGridLayout" >
-     <item row="0" column="0" >
-      <widget class="QLabel" name="label" >
-       <property name="text" >
+   <item row="0" column="1" rowspan="2">
+    <layout class="QGridLayout">
+     <item row="0" column="0">
+      <widget class="QLabel" name="label">
+       <property name="text">
         <string>MessageText</string>
        </property>
       </widget>
      </item>
-     <item row="1" column="0" >
+     <item row="1" column="0">
       <spacer>
-       <property name="orientation" >
+       <property name="orientation">
         <enum>Qt::Vertical</enum>
        </property>
-       <property name="sizeType" >
+       <property name="sizeType">
         <enum>QSizePolicy::Fixed</enum>
        </property>
-       <property name="sizeHint" >
+       <property name="sizeHint" stdset="0">
         <size>
          <width>199</width>
          <height>13</height>
@@ -51,31 +52,31 @@
        </property>
       </spacer>
      </item>
-     <item row="2" column="0" >
-      <widget class="QCheckBox" name="checkBox" >
-       <property name="text" >
-        <string>Do not show this warning again.</string>
+     <item row="2" column="0">
+      <widget class="QCheckBox" name="checkBox">
+       <property name="text">
+        <string>Do not show this mesage again.</string>
        </property>
       </widget>
      </item>
-     <item row="3" column="0" >
-      <widget class="QDialogButtonBox" name="buttonBox" >
-       <property name="orientation" >
+     <item row="3" column="0">
+      <widget class="QDialogButtonBox" name="buttonBox">
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="standardButtons" >
-        <set>QDialogButtonBox::No|QDialogButtonBox::NoButton|QDialogButtonBox::Yes</set>
+       <property name="standardButtons">
+        <set>QDialogButtonBox::No|QDialogButtonBox::Yes</set>
        </property>
       </widget>
      </item>
     </layout>
    </item>
-   <item row="1" column="0" >
+   <item row="1" column="0">
     <spacer>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeHint" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>81</height>
@@ -93,11 +94,11 @@
    <receiver>myMessageDialog</receiver>
    <slot>accept()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>248</x>
      <y>254</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>157</x>
      <y>274</y>
     </hint>
@@ -109,11 +110,11 @@
    <receiver>myMessageDialog</receiver>
    <slot>reject()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>316</x>
      <y>260</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>286</x>
      <y>274</y>
     </hint>