sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

leave game to lobby message bugfix, move connected players list in lobby back to top again

Browse Source
This commit is contained in:
doitux
2010-07-01 15:00:19 +00:00
parent eb938062b3
commit fdabcfcdda
3 changed files with 63 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/qt/gamelobbydialog.ui
+27 -28
View File
@@ -335,6 +335,33 @@ p, li { white-space: pre-wrap; }
<property name="bottomMargin"> <property name="bottomMargin">
<number>7</number> <number>7</number>
</property> </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> <item>
<widget class="QScrollArea" name="scrollArea"> <widget class="QScrollArea" name="scrollArea">
<property name="minimumSize"> <property name="minimumSize">
@@ -617,33 +644,6 @@ p, li { white-space: pre-wrap; }
</widget> </widget>
</widget> </widget>
</item> </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> <item>
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<item> <item>
@@ -837,7 +837,6 @@ p, li { white-space: pre-wrap; }
<tabstop>pushButton_JoinGame</tabstop> <tabstop>pushButton_JoinGame</tabstop>
<tabstop>textBrowser_ChatDisplay</tabstop> <tabstop>textBrowser_ChatDisplay</tabstop>
<tabstop>lineEdit_ChatInput</tabstop> <tabstop>lineEdit_ChatInput</tabstop>
<tabstop>treeWidget_connectedPlayers</tabstop>
<tabstop>checkBox_fillUpWithComputerOpponents</tabstop> <tabstop>checkBox_fillUpWithComputerOpponents</tabstop>
<tabstop>pushButton_StartGame</tabstop> <tabstop>pushButton_StartGame</tabstop>
<tabstop>pushButton_Kick</tabstop> <tabstop>pushButton_Kick</tabstop>
src/gui/qt/gametable/gametableimpl.cpp
+1 -1
View File
@@ -3103,7 +3103,7 @@ void gameTableImpl::leaveCurrentNetworkGame() {
myStartWindow->getSession()->sendLeaveCurrentGame(); myStartWindow->getSession()->sendLeaveCurrentGame();
} }
else { 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()); assert(myStartWindow->getSession());
myStartWindow->getSession()->sendLeaveCurrentGame(); myStartWindow->getSession()->sendLeaveCurrentGame();
} }
src/gui/qt/mymessagedialog.ui
+35 -34
View File
@@ -1,7 +1,8 @@
<ui version="4.0" > <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>myMessageDialog</class> <class>myMessageDialog</class>
<widget class="QDialog" name="myMessageDialog" > <widget class="QDialog" name="myMessageDialog">
<property name="geometry" > <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
@@ -9,16 +10,16 @@
<height>118</height> <height>118</height>
</rect> </rect>
</property> </property>
<property name="windowTitle" > <property name="windowTitle">
<string>Dialog</string> <string>Dialog</string>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout">
<property name="topMargin" > <property name="topMargin">
<number>9</number> <number>9</number>
</property> </property>
<item row="0" column="0" > <item row="0" column="0">
<widget class="QLabel" name="label_icon" > <widget class="QLabel" name="label_icon">
<property name="minimumSize" > <property name="minimumSize">
<size> <size>
<width>50</width> <width>50</width>
<height>50</height> <height>50</height>
@@ -26,24 +27,24 @@
</property> </property>
</widget> </widget>
</item> </item>
<item rowspan="2" row="0" column="1" > <item row="0" column="1" rowspan="2">
<layout class="QGridLayout" > <layout class="QGridLayout">
<item row="0" column="0" > <item row="0" column="0">
<widget class="QLabel" name="label" > <widget class="QLabel" name="label">
<property name="text" > <property name="text">
<string>MessageText</string> <string>MessageText</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0" > <item row="1" column="0">
<spacer> <spacer>
<property name="orientation" > <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeType" > <property name="sizeType">
<enum>QSizePolicy::Fixed</enum> <enum>QSizePolicy::Fixed</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0">
<size> <size>
<width>199</width> <width>199</width>
<height>13</height> <height>13</height>
@@ -51,31 +52,31 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="2" column="0" > <item row="2" column="0">
<widget class="QCheckBox" name="checkBox" > <widget class="QCheckBox" name="checkBox">
<property name="text" > <property name="text">
<string>Do not show this warning again.</string> <string>Do not show this mesage again.</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0" > <item row="3" column="0">
<widget class="QDialogButtonBox" name="buttonBox" > <widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation" > <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="standardButtons" > <property name="standardButtons">
<set>QDialogButtonBox::No|QDialogButtonBox::NoButton|QDialogButtonBox::Yes</set> <set>QDialogButtonBox::No|QDialogButtonBox::Yes</set>
</property> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</item> </item>
<item row="1" column="0" > <item row="1" column="0">
<spacer> <spacer>
<property name="orientation" > <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>20</width>
<height>81</height> <height>81</height>
@@ -93,11 +94,11 @@
<receiver>myMessageDialog</receiver> <receiver>myMessageDialog</receiver>
<slot>accept()</slot> <slot>accept()</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel">
<x>248</x> <x>248</x>
<y>254</y> <y>254</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel">
<x>157</x> <x>157</x>
<y>274</y> <y>274</y>
</hint> </hint>
@@ -109,11 +110,11 @@
<receiver>myMessageDialog</receiver> <receiver>myMessageDialog</receiver>
<slot>reject()</slot> <slot>reject()</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel">
<x>316</x> <x>316</x>
<y>260</y> <y>260</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel">
<x>286</x> <x>286</x>
<y>274</y> <y>274</y>
</hint> </hint>