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

Browse Source
This commit is contained in:
doitux
2007-05-28 18:48:12 +00:00
parent 0c4648e194
commit 0e1abc3656
6 changed files with 174 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/qt/mainwindow.ui
+141 -33
View File
@@ -44,9 +44,9 @@
<colorrole role="Button" > <colorrole role="Button" >
<brush brushstyle="SolidPattern" > <brush brushstyle="SolidPattern" >
<color alpha="255" > <color alpha="255" >
<red>221</red> <red>20</red>
<green>223</green> <green>83</green>
<blue>228</blue> <blue>0</blue>
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
@@ -116,8 +116,8 @@
<colorrole role="Base" > <colorrole role="Base" >
<brush brushstyle="SolidPattern" > <brush brushstyle="SolidPattern" >
<color alpha="255" > <color alpha="255" >
<red>40</red> <red>20</red>
<green>82</green> <green>83</green>
<blue>0</blue> <blue>0</blue>
</color> </color>
</brush> </brush>
@@ -125,8 +125,8 @@
<colorrole role="Window" > <colorrole role="Window" >
<brush brushstyle="SolidPattern" > <brush brushstyle="SolidPattern" >
<color alpha="255" > <color alpha="255" >
<red>40</red> <red>20</red>
<green>82</green> <green>83</green>
<blue>0</blue> <blue>0</blue>
</color> </color>
</brush> </brush>
@@ -199,9 +199,9 @@
<colorrole role="Button" > <colorrole role="Button" >
<brush brushstyle="SolidPattern" > <brush brushstyle="SolidPattern" >
<color alpha="255" > <color alpha="255" >
<red>221</red> <red>20</red>
<green>223</green> <green>83</green>
<blue>228</blue> <blue>0</blue>
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
@@ -271,8 +271,8 @@
<colorrole role="Base" > <colorrole role="Base" >
<brush brushstyle="SolidPattern" > <brush brushstyle="SolidPattern" >
<color alpha="255" > <color alpha="255" >
<red>40</red> <red>20</red>
<green>82</green> <green>83</green>
<blue>0</blue> <blue>0</blue>
</color> </color>
</brush> </brush>
@@ -280,8 +280,8 @@
<colorrole role="Window" > <colorrole role="Window" >
<brush brushstyle="SolidPattern" > <brush brushstyle="SolidPattern" >
<color alpha="255" > <color alpha="255" >
<red>40</red> <red>20</red>
<green>82</green> <green>83</green>
<blue>0</blue> <blue>0</blue>
</color> </color>
</brush> </brush>
@@ -354,9 +354,9 @@
<colorrole role="Button" > <colorrole role="Button" >
<brush brushstyle="SolidPattern" > <brush brushstyle="SolidPattern" >
<color alpha="255" > <color alpha="255" >
<red>221</red> <red>20</red>
<green>223</green> <green>83</green>
<blue>228</blue> <blue>0</blue>
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
@@ -426,8 +426,8 @@
<colorrole role="Base" > <colorrole role="Base" >
<brush brushstyle="SolidPattern" > <brush brushstyle="SolidPattern" >
<color alpha="255" > <color alpha="255" >
<red>40</red> <red>20</red>
<green>82</green> <green>83</green>
<blue>0</blue> <blue>0</blue>
</color> </color>
</brush> </brush>
@@ -435,8 +435,8 @@
<colorrole role="Window" > <colorrole role="Window" >
<brush brushstyle="SolidPattern" > <brush brushstyle="SolidPattern" >
<color alpha="255" > <color alpha="255" >
<red>40</red> <red>20</red>
<green>82</green> <green>83</green>
<blue>0</blue> <blue>0</blue>
</color> </color>
</brush> </brush>
@@ -614,8 +614,26 @@
<colorrole role="Button" > <colorrole role="Button" >
<brush brushstyle="SolidPattern" > <brush brushstyle="SolidPattern" >
<color alpha="255" > <color alpha="255" >
<red>40</red> <red>20</red>
<green>82</green> <green>83</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
<colorrole role="Base" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>20</red>
<green>83</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>20</red>
<green>83</green>
<blue>0</blue> <blue>0</blue>
</color> </color>
</brush> </brush>
@@ -634,8 +652,26 @@
<colorrole role="Button" > <colorrole role="Button" >
<brush brushstyle="SolidPattern" > <brush brushstyle="SolidPattern" >
<color alpha="255" > <color alpha="255" >
<red>40</red> <red>20</red>
<green>82</green> <green>83</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
<colorrole role="Base" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>20</red>
<green>83</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>20</red>
<green>83</green>
<blue>0</blue> <blue>0</blue>
</color> </color>
</brush> </brush>
@@ -654,8 +690,26 @@
<colorrole role="Button" > <colorrole role="Button" >
<brush brushstyle="SolidPattern" > <brush brushstyle="SolidPattern" >
<color alpha="255" > <color alpha="255" >
<red>40</red> <red>20</red>
<green>82</green> <green>83</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
<colorrole role="Base" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>20</red>
<green>83</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>20</red>
<green>83</green>
<blue>0</blue> <blue>0</blue>
</color> </color>
</brush> </brush>
@@ -2254,8 +2308,26 @@
<colorrole role="Button" > <colorrole role="Button" >
<brush brushstyle="SolidPattern" > <brush brushstyle="SolidPattern" >
<color alpha="255" > <color alpha="255" >
<red>40</red> <red>20</red>
<green>82</green> <green>83</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
<colorrole role="Base" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>20</red>
<green>83</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>20</red>
<green>83</green>
<blue>0</blue> <blue>0</blue>
</color> </color>
</brush> </brush>
@@ -2274,8 +2346,26 @@
<colorrole role="Button" > <colorrole role="Button" >
<brush brushstyle="SolidPattern" > <brush brushstyle="SolidPattern" >
<color alpha="255" > <color alpha="255" >
<red>40</red> <red>20</red>
<green>82</green> <green>83</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
<colorrole role="Base" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>20</red>
<green>83</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>20</red>
<green>83</green>
<blue>0</blue> <blue>0</blue>
</color> </color>
</brush> </brush>
@@ -2294,8 +2384,26 @@
<colorrole role="Button" > <colorrole role="Button" >
<brush brushstyle="SolidPattern" > <brush brushstyle="SolidPattern" >
<color alpha="255" > <color alpha="255" >
<red>40</red> <red>20</red>
<green>82</green> <green>83</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
<colorrole role="Base" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>20</red>
<green>83</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>20</red>
<green>83</green>
<blue>0</blue> <blue>0</blue>
</color> </color>
</brush> </brush>
src/gui/qt/mainwindow/mainwindowimpl.cpp
+27 -3
View File
@@ -672,8 +672,8 @@ void mainWindowImpl::startNewLocalGame(newGameDialogImpl *v) {
Tools::getRandNumber(0, gameData.numberOfPlayers-1, 1, &tmpDealerPos, 0); Tools::getRandNumber(0, gameData.numberOfPlayers-1, 1, &tmpDealerPos, 0);
startData.startDealerPlayerId = static_cast<unsigned>(tmpDealerPos); startData.startDealerPlayerId = static_cast<unsigned>(tmpDealerPos);
//remove ChatWindow //some gui modifications
tab_Chat->hide(); localGameModification();
//Start Game!!! //Start Game!!!
mySession->startLocalGame(gameData, startData); mySession->startLocalGame(gameData, startData);
@@ -720,7 +720,11 @@ void mainWindowImpl::callCreateNetworkGameDialog() {
if (myStartNetworkGameDialog->result() == QDialog::Accepted ) { if (myStartNetworkGameDialog->result() == QDialog::Accepted ) {
//some gui modifications
networkGameModification();
myServerGuiInterface->getSession().initiateNetworkServerGame(); myServerGuiInterface->getSession().initiateNetworkServerGame();
} }
else { else {
mySession->terminateNetworkClient(); mySession->terminateNetworkClient();
@@ -731,7 +735,7 @@ void mainWindowImpl::callCreateNetworkGameDialog() {
} }
void mainWindowImpl::callJoinNetworkGameDialog() { void mainWindowImpl::callJoinNetworkGameDialog() {
myJoinNetworkGameDialog->exec(); myJoinNetworkGameDialog->exec();
if (myJoinNetworkGameDialog->result() == QDialog::Accepted ) { if (myJoinNetworkGameDialog->result() == QDialog::Accepted ) {
@@ -761,6 +765,10 @@ void mainWindowImpl::callJoinNetworkGameDialog() {
if (myWaitingForServerGameDialog->result() == QDialog::Rejected) { if (myWaitingForServerGameDialog->result() == QDialog::Rejected) {
mySession->terminateNetworkClient(); mySession->terminateNetworkClient();
} }
else {
//some gui modifications
networkGameModification();
}
} }
} }
} }
@@ -2535,3 +2543,19 @@ void mainWindowImpl::closeEvent(QCloseEvent *event) {
event->accept(); event->accept();
} }
void mainWindowImpl::localGameModification() {
tabWidget_Left->setCurrentIndex(0);
tabWidget_Left->disableTab(1, TRUE);
}
void mainWindowImpl::networkGameModification() {
tabWidget_Left->disableTab(1, FALSE);
tabWidget_Left->setCurrentIndex(1);
textBrowser_Chat->clear();
}
src/gui/qt/mainwindow/mainwindowimpl.h
+3
View File
@@ -245,6 +245,9 @@ public slots:
void networkStart(boost::shared_ptr<Game> game); void networkStart(boost::shared_ptr<Game> game);
void closeEvent(QCloseEvent*); void closeEvent(QCloseEvent*);
void localGameModification();
void networkGameModification();
private: private:
src/gui/qt/mainwindow/mylefttabwidget.cpp
+1
View File
@@ -32,6 +32,7 @@ MyLeftTabWidget::~MyLeftTabWidget()
void MyLeftTabWidget::startBlinkChatTab() { chatBlinkTimer->start(500); } void MyLeftTabWidget::startBlinkChatTab() { chatBlinkTimer->start(500); }
void MyLeftTabWidget::stopBlinkChatTab() { chatBlinkTimer->stop(); } void MyLeftTabWidget::stopBlinkChatTab() { chatBlinkTimer->stop(); }
void MyLeftTabWidget::showDefaultChatTab() { myTabBar->setTabTextColor(1, QColor(240,240,240)); } void MyLeftTabWidget::showDefaultChatTab() { myTabBar->setTabTextColor(1, QColor(240,240,240)); }
void MyLeftTabWidget::disableTab(int tabIndex, bool yesNo) { myTabBar->setTabEnabled(tabIndex, !yesNo); }
void MyLeftTabWidget::blinkChatTab() { void MyLeftTabWidget::blinkChatTab() {
src/gui/qt/mainwindow/mylefttabwidget.h
+1
View File
@@ -30,6 +30,7 @@ public:
void startBlinkChatTab(); void startBlinkChatTab();
void stopBlinkChatTab(); void stopBlinkChatTab();
void showDefaultChatTab(); void showDefaultChatTab();
void disableTab(int tabIndex, bool yesNO);
public slots: public slots:
src/gui/qt/waitforservertostartgamedialog/waitforservertostartgamedialogimpl.cpp
+1
View File
@@ -32,6 +32,7 @@ waitForServerToStartGameDialogImpl::waitForServerToStartGameDialogImpl(QWidget *
} }
void waitForServerToStartGameDialogImpl::refresh(int actionID) { void waitForServerToStartGameDialogImpl::refresh(int actionID) {
QTimer::singleShot(1000, this, SLOT(accept())); QTimer::singleShot(1000, this, SLOT(accept()));
} }