This commit is contained in:
doitux
2008-12-08 21:20:49 +00:00
parent 15d934e5b8
commit d8c36d03eb
2 changed files with 29 additions and 3 deletions
+22 -1
View File
@@ -1781,6 +1781,15 @@
<string>Kick</string> <string>Kick</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout" > <layout class="QGridLayout" name="gridLayout" >
<property name="horizontalSpacing" >
<number>0</number>
</property>
<property name="verticalSpacing" >
<number>-1</number>
</property>
<property name="margin" >
<number>5</number>
</property>
<item row="0" column="0" > <item row="0" column="0" >
<layout class="QVBoxLayout" name="verticalLayout" > <layout class="QVBoxLayout" name="verticalLayout" >
<property name="spacing" > <property name="spacing" >
@@ -1859,6 +1868,12 @@
<layout class="QHBoxLayout" name="horizontalLayout" > <layout class="QHBoxLayout" name="horizontalLayout" >
<item> <item>
<widget class="QPushButton" name="pushButton_voteOnKickYes" > <widget class="QPushButton" name="pushButton_voteOnKickYes" >
<property name="maximumSize" >
<size>
<width>80</width>
<height>20</height>
</size>
</property>
<property name="text" > <property name="text" >
<string>Yes</string> <string>Yes</string>
</property> </property>
@@ -1866,6 +1881,12 @@
</item> </item>
<item> <item>
<widget class="QPushButton" name="pushButton_voteOnKickNo" > <widget class="QPushButton" name="pushButton_voteOnKickNo" >
<property name="maximumSize" >
<size>
<width>80</width>
<height>20</height>
</size>
</property>
<property name="text" > <property name="text" >
<string>No</string> <string>No</string>
</property> </property>
@@ -3013,7 +3034,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>1000</width> <width>1000</width>
<height>28</height> <height>30</height>
</rect> </rect>
</property> </property>
<widget class="QMenu" name="menuView" > <widget class="QMenu" name="menuView" >
+7 -2
View File
@@ -3207,8 +3207,13 @@ void gameTableImpl::refreshVotesMonitor(int currentVotes, int numVotesNeededToKi
if(currentVotes == 1) currentVotesString = tr("vote"); if(currentVotes == 1) currentVotesString = tr("vote");
else currentVotesString = tr("votes"); else currentVotesString = tr("votes");
PlayerInfo info(myStartWindow->getSession()->getClientPlayerInfo(playerAboutToBeKickedId)); if((*myStartWindow->getSession()->getCurrentGame()->getSeatsList()->begin())->getMyUniqueID() != playerAboutToBeKickedId) {
label_votesMonitor->setText(tr("Player <b>%1</b> has %2 %3 <br>against him. %4 votes needed to kick.").arg(QString::fromUtf8(info.playerName.c_str())).arg(currentVotes).arg(currentVotesString).arg(numVotesNeededToKick)); PlayerInfo info(myStartWindow->getSession()->getClientPlayerInfo(playerAboutToBeKickedId));
label_votesMonitor->setText(tr("Player <b>%1</b> has %2 %3 <br>against him. %4 votes needed to kick.").arg(QString::fromUtf8(info.playerName.c_str())).arg(currentVotes).arg(currentVotesString).arg(numVotesNeededToKick));
}
else {
label_votesMonitor->setText(tr("You have %1 %2 against you. %3 votes needed to kick.").arg(currentVotes).arg(currentVotesString).arg(numVotesNeededToKick));
}
} }
void gameTableImpl::refreshCardsChance(GameState bero) void gameTableImpl::refreshCardsChance(GameState bero)