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">
<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>
src/gui/qt/gametable/gametableimpl.cpp
+1 -1
View File
@@ -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();
}
src/gui/qt/mymessagedialog.ui
+6 -5
View File
@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>myMessageDialog</class>
<widget class="QDialog" name="myMessageDialog">
@@ -26,7 +27,7 @@
</property>
</widget>
</item>
<item rowspan="2" row="0" column="1" >
<item row="0" column="1" rowspan="2">
<layout class="QGridLayout">
<item row="0" column="0">
<widget class="QLabel" name="label">
@@ -43,7 +44,7 @@
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0">
<size>
<width>199</width>
<height>13</height>
@@ -54,7 +55,7 @@
<item row="2" column="0">
<widget class="QCheckBox" name="checkBox">
<property name="text">
<string>Do not show this warning again.</string>
<string>Do not show this mesage again.</string>
</property>
</widget>
</item>
@@ -64,7 +65,7 @@
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::No|QDialogButtonBox::NoButton|QDialogButtonBox::Yes</set>
<set>QDialogButtonBox::No|QDialogButtonBox::Yes</set>
</property>
</widget>
</item>
@@ -75,7 +76,7 @@
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>81</height>