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

remove join any game button - add spectator link to pokerth-live

Browse Source
This commit is contained in:
doitux
2013-10-04 21:32:24 +02:00
parent 04abfb658d
commit 1e23bca665
4 changed files with 99 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/qt/gamelobbydialog.ui
+10 -16
View File
@@ -223,13 +223,20 @@
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<widget class="QPushButton" name="pushButton_joinAnyGame"> <widget class="QPushButton" name="pushButton_JoinGame">
<property name="text"> <property name="text">
<string>Join &amp;any game</string> <string>&amp;Join Game</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="resources/pokerth.qrc"> <iconset resource="resources/pokerth.qrc">
<normaloff>:/gfx/transform-rotate.png</normaloff>:/gfx/transform-rotate.png</iconset> <normaloff>:/gfx/go-next-view.png</normaloff>:/gfx/go-next-view.png</iconset>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_spectate">
<property name="openExternalLinks">
<bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
@@ -260,17 +267,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QPushButton" name="pushButton_JoinGame">
<property name="text">
<string>&amp;Join Game</string>
</property>
<property name="icon">
<iconset resource="resources/pokerth.qrc">
<normaloff>:/gfx/go-next-view.png</normaloff>:/gfx/go-next-view.png</iconset>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
<item row="3" column="1" rowspan="2"> <item row="3" column="1" rowspan="2">
@@ -957,9 +953,7 @@
<tabstop>comboBox_nickListFilter</tabstop> <tabstop>comboBox_nickListFilter</tabstop>
<tabstop>comboBox_gameListFilter</tabstop> <tabstop>comboBox_gameListFilter</tabstop>
<tabstop>treeView_GameList</tabstop> <tabstop>treeView_GameList</tabstop>
<tabstop>pushButton_joinAnyGame</tabstop>
<tabstop>pushButton_CreateGame</tabstop> <tabstop>pushButton_CreateGame</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>treeWidget_connectedPlayers</tabstop>
src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
+2 -60
View File
@@ -86,8 +86,10 @@ gameLobbyDialogImpl::gameLobbyDialogImpl(startWindowImpl *parent, ConfigFile *c)
//HTML stuff //HTML stuff
QString pokerthDotNet("<a href='http://www.pokerth.net'>http://www.pokerth.net</a>"); QString pokerthDotNet("<a href='http://www.pokerth.net'>http://www.pokerth.net</a>");
QString clickToRanking(QString("<a href='http://online-ranking.pokerth.net'>%1</a>").arg(tr("Click here to view the online rankings"))); QString clickToRanking(QString("<a href='http://online-ranking.pokerth.net'>%1</a>").arg(tr("Click here to view the online rankings")));
QString clickToSpectate(QString("<a href='http://pokerth-live.pokerth.net'><b>%1</b></a>").arg(tr("Spectate")));
label_pokerthDotNet->setText(pokerthDotNet); label_pokerthDotNet->setText(pokerthDotNet);
label_rankings->setText(clickToRanking); label_rankings->setText(clickToRanking);
label_spectate->setText(clickToSpectate);
waitStartGameMsgBoxTimer = new QTimer(this); waitStartGameMsgBoxTimer = new QTimer(this);
waitStartGameMsgBoxTimer->setSingleShot(true); waitStartGameMsgBoxTimer->setSingleShot(true);
@@ -219,7 +221,6 @@ gameLobbyDialogImpl::gameLobbyDialogImpl(startWindowImpl *parent, ConfigFile *c)
connect( pushButton_CreateGame, SIGNAL( clicked() ), this, SLOT( createGame() ) ); connect( pushButton_CreateGame, SIGNAL( clicked() ), this, SLOT( createGame() ) );
connect( pushButton_JoinGame, SIGNAL( clicked() ), this, SLOT( joinGame() ) ); connect( pushButton_JoinGame, SIGNAL( clicked() ), this, SLOT( joinGame() ) );
connect( pushButton_joinAnyGame, SIGNAL( clicked() ), this, SLOT( joinAnyGame() ) );
connect( pushButton_StartGame, SIGNAL( clicked() ), this, SLOT( startGame() ) ); connect( pushButton_StartGame, SIGNAL( clicked() ), this, SLOT( startGame() ) );
connect( pushButton_Kick, SIGNAL( clicked() ), this, SLOT( kickPlayer() ) ); connect( pushButton_Kick, SIGNAL( clicked() ), this, SLOT( kickPlayer() ) );
connect( pushButton_Leave, SIGNAL( clicked() ), this, SLOT( leaveGame() ) ); connect( pushButton_Leave, SIGNAL( clicked() ), this, SLOT( leaveGame() ) );
@@ -414,37 +415,6 @@ void gameLobbyDialogImpl::joinGame()
} }
} }
void gameLobbyDialogImpl::joinAnyGame()
{
if(comboBox_gameListFilter->currentIndex() != 3 && comboBox_gameListFilter->currentIndex() != 0 && comboBox_gameListFilter->currentIndex() != 5) comboBox_gameListFilter->setCurrentIndex(0);
bool found = false;
int it = 0;
int gameToJoinId = 0;
int mostConnectedPlayers = 0;
while (myGameListModel->item(it)) {
int players = myGameListModel->item(it, 1)->data(Qt::DisplayRole).toString().section("/",0,0).toInt();
int maxPlayers = myGameListModel->item(it, 1)->data(Qt::DisplayRole).toString().section("/",1,1).toInt();
if (myGameListModel->item(it, 2)->data(16) == "open" && myGameListModel->item(it, 4)->data(16) == "nonpriv" && players < maxPlayers) {
if(players > mostConnectedPlayers) {
mostConnectedPlayers = players;
gameToJoinId = it;
}
found = true;
}
it++;
}
if(found) {
treeView_GameList->setCurrentIndex(myGameListSortFilterProxyModel->mapFromSource(myGameListModel->item(gameToJoinId)->index()));
joinGame();
}
}
void gameLobbyDialogImpl::refresh(int actionID) void gameLobbyDialogImpl::refresh(int actionID)
{ {
@@ -773,9 +743,6 @@ void gameLobbyDialogImpl::refreshGameStats()
label_openGamesCounter->setText(" | "+tr("running games: %1").arg(runningGamesCounter)); label_openGamesCounter->setText(" | "+tr("running games: %1").arg(runningGamesCounter));
label_runningGamesCounter->setText(" | "+tr("open games: %1").arg(openGamesCounter)); label_runningGamesCounter->setText(" | "+tr("open games: %1").arg(openGamesCounter));
//refresh joinAnyGameButton state
joinAnyGameButtonRefresh();
} }
void gameLobbyDialogImpl::refreshPlayerStats() void gameLobbyDialogImpl::refreshPlayerStats()
@@ -910,8 +877,6 @@ void gameLobbyDialogImpl::clearDialog()
pushButton_CreateGame->show(); pushButton_CreateGame->show();
pushButton_JoinGame->show(); pushButton_JoinGame->show();
pushButton_JoinGame->setEnabled(false); pushButton_JoinGame->setEnabled(false);
pushButton_joinAnyGame->show();
pushButton_joinAnyGame->setEnabled(false);
QStringList headerList; QStringList headerList;
headerList << tr("Game") << tr("Players") << tr("State") << tr("T") << tr("P") << tr("Time"); headerList << tr("Game") << tr("Players") << tr("State") << tr("T") << tr("P") << tr("Time");
@@ -1245,7 +1210,6 @@ void gameLobbyDialogImpl::joinedGameDialogUpdate()
treeWidget_connectedPlayers->clear(); treeWidget_connectedPlayers->clear();
pushButton_CreateGame->hide(); pushButton_CreateGame->hide();
pushButton_JoinGame->hide(); pushButton_JoinGame->hide();
pushButton_joinAnyGame->hide();
pushButton_Leave->show(); pushButton_Leave->show();
pushButton_Leave->setEnabled(true); pushButton_Leave->setEnabled(true);
@@ -1315,8 +1279,6 @@ void gameLobbyDialogImpl::leftGameDialogUpdate()
pushButton_CreateGame->show(); pushButton_CreateGame->show();
pushButton_JoinGame->show(); pushButton_JoinGame->show();
pushButton_JoinGame->setEnabled(false); pushButton_JoinGame->setEnabled(false);
pushButton_joinAnyGame->show();
joinAnyGameButtonRefresh();
lineEdit_ChatInput->setFocus(); lineEdit_ChatInput->setFocus();
} }
@@ -1502,26 +1464,6 @@ void gameLobbyDialogImpl::hideWaitStartGameMsgBox()
waitRejoinStartGameMsgBox->hide(); waitRejoinStartGameMsgBox->hide();
} }
void gameLobbyDialogImpl::joinAnyGameButtonRefresh()
{
int openNonPrivateNonFullGamesCounter = 0;
int it = 0;
while (myGameListModel->item(it)) {
int players = myGameListModel->item(it, 1)->data(Qt::DisplayRole).toString().section("/",0,0).toInt();
int maxPlayers = myGameListModel->item(it, 1)->data(Qt::DisplayRole).toString().section("/",1,1).toInt();
if (myGameListModel->item(it, 2)->data(16) == "open" && myGameListModel->item(it, 4)->data(16) == "nonpriv" && players < maxPlayers) {
openNonPrivateNonFullGamesCounter++;
}
++it;
}
if(openNonPrivateNonFullGamesCounter) pushButton_joinAnyGame->setEnabled(true);
else pushButton_joinAnyGame->setEnabled(false);
}
void gameLobbyDialogImpl::reject() void gameLobbyDialogImpl::reject()
{ {
myStartWindow->show(); myStartWindow->show();
src/gui/qt/gamelobbydialog/gamelobbydialogimpl.h
-2
View File
@@ -84,7 +84,6 @@ public slots:
void createGame(); void createGame();
void joinGame(); void joinGame();
void joinAnyGame();
void gameSelected(const QModelIndex &); void gameSelected(const QModelIndex &);
void updateGameItem(QList <QStandardItem*>, unsigned gameId); void updateGameItem(QList <QStandardItem*>, unsigned gameId);
void addGame(unsigned gameId); void addGame(unsigned gameId);
@@ -131,7 +130,6 @@ public slots:
void showWaitStartGameMsgBox(); void showWaitStartGameMsgBox();
void hideWaitStartGameMsgBox(); void hideWaitStartGameMsgBox();
void stopWaitStartGameMsgBoxTimer(); void stopWaitStartGameMsgBoxTimer();
void joinAnyGameButtonRefresh();
void reject(); void reject();
void closeEvent(QCloseEvent *event); void closeEvent(QCloseEvent *event);
void accept(); void accept();
src/gui/qt/gui_800x480/gamelobbydialog_800x480.ui
+86 -44
View File
@@ -63,7 +63,16 @@
<string>Games</string> <string>Games</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_5"> <layout class="QGridLayout" name="gridLayout_5">
<property name="margin"> <property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<property name="spacing"> <property name="spacing">
@@ -306,11 +315,20 @@
<property name="spacing"> <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<property name="margin"> <property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<widget class="QPushButton" name="pushButton_joinAnyGame"> <widget class="QPushButton" name="pushButton_JoinGame">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
@@ -327,11 +345,18 @@
<string notr="true">QObject {font: bold 20px}</string> <string notr="true">QObject {font: bold 20px}</string>
</property> </property>
<property name="text"> <property name="text">
<string>Join &amp;any game</string> <string>&amp;Join Game</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../resources/pokerth.qrc"> <iconset resource="../resources/pokerth.qrc">
<normaloff>:/gfx/transform-rotate.png</normaloff>:/gfx/transform-rotate.png</iconset> <normaloff>:/gfx/go-next-view.png</normaloff>:/gfx/go-next-view.png</iconset>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label">
<property name="openExternalLinks">
<bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
@@ -374,32 +399,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QPushButton" name="pushButton_JoinGame">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="styleSheet">
<string notr="true">QObject {font: bold 20px}</string>
</property>
<property name="text">
<string>&amp;Join Game</string>
</property>
<property name="icon">
<iconset resource="../resources/pokerth.qrc">
<normaloff>:/gfx/go-next-view.png</normaloff>:/gfx/go-next-view.png</iconset>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
@@ -465,10 +464,19 @@
<string>Game Info</string> <string>Game Info</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_7"> <layout class="QGridLayout" name="gridLayout_7">
<property name="verticalSpacing"> <property name="leftMargin">
<number>0</number> <number>0</number>
</property> </property>
<property name="margin"> <property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<property name="verticalSpacing">
<number>0</number> <number>0</number>
</property> </property>
<item row="0" column="0"> <item row="0" column="0">
@@ -481,7 +489,16 @@
<string>Players</string> <string>Players</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<property name="margin"> <property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item row="0" column="0"> <item row="0" column="0">
@@ -533,7 +550,16 @@
<string>Spectators</string> <string>Spectators</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_6"> <layout class="QGridLayout" name="gridLayout_6">
<property name="margin"> <property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item row="0" column="0"> <item row="0" column="0">
@@ -577,20 +603,29 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>288</width> <width>292</width>
<height>195</height> <height>199</height>
</rect> </rect>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<property name="leftMargin">
<number>4</number>
</property>
<property name="topMargin">
<number>4</number>
</property>
<property name="rightMargin">
<number>4</number>
</property>
<property name="bottomMargin">
<number>4</number>
</property>
<property name="horizontalSpacing"> <property name="horizontalSpacing">
<number>-1</number> <number>6</number>
</property> </property>
<property name="verticalSpacing"> <property name="verticalSpacing">
<number>2</number> <number>2</number>
</property> </property>
<property name="margin">
<number>4</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label_gameType"> <widget class="QLabel" name="label_gameType">
<property name="styleSheet"> <property name="styleSheet">
@@ -858,7 +893,16 @@
<string>Lobby-Chat</string> <string>Lobby-Chat</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_4"> <layout class="QGridLayout" name="gridLayout_4">
<property name="margin"> <property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<property name="spacing"> <property name="spacing">
@@ -1159,9 +1203,7 @@ p, li { white-space: pre-wrap; }
</layout> </layout>
</widget> </widget>
<tabstops> <tabstops>
<tabstop>pushButton_joinAnyGame</tabstop>
<tabstop>pushButton_CreateGame</tabstop> <tabstop>pushButton_CreateGame</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>treeWidget_connectedPlayers</tabstop>