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

waitforgame-message. guifixes.

Browse Source
This commit is contained in:
doitux
2007-10-16 23:07:59 +00:00
parent f5ea14fb9e
commit fed0fc78eb
6 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
+17
View File
@@ -26,6 +26,14 @@ gameLobbyDialogImpl::gameLobbyDialogImpl(QWidget *parent, ConfigFile *c)
myAppDataPath = QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str()); myAppDataPath = QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str());
//wait start game message
waitStartGameMsgBox.setText(tr("Starting game. Please wait ..."));
waitStartGameMsgBox.setWindowModality(Qt::NonModal);
waitStartGameMsgBox.setStandardButtons(QMessageBox::NoButton);
waitStartGameMsgBoxTimer = new QTimer(this);
waitStartGameMsgBoxTimer->setSingleShot(TRUE);
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( treeWidget_GameList, SIGNAL( currentItemChanged ( QTreeWidgetItem*, QTreeWidgetItem*) ), this, SLOT( gameSelected(QTreeWidgetItem*, QTreeWidgetItem*) ) ); connect( treeWidget_GameList, SIGNAL( currentItemChanged ( QTreeWidgetItem*, QTreeWidgetItem*) ), this, SLOT( gameSelected(QTreeWidgetItem*, QTreeWidgetItem*) ) );
@@ -36,6 +44,7 @@ gameLobbyDialogImpl::gameLobbyDialogImpl(QWidget *parent, ConfigFile *c)
connect( lineEdit_ChatInput, SIGNAL( returnPressed () ), this, SLOT( sendChatMessage() ) ); connect( lineEdit_ChatInput, SIGNAL( returnPressed () ), this, SLOT( sendChatMessage() ) );
connect( lineEdit_ChatInput, SIGNAL( textChanged (QString) ), this, SLOT( checkChatInputLength(QString) ) ); connect( lineEdit_ChatInput, SIGNAL( textChanged (QString) ), this, SLOT( checkChatInputLength(QString) ) );
connect( lineEdit_ChatInput, SIGNAL( textEdited (QString) ), myChat, SLOT( setChatTextEdited() ) ); connect( lineEdit_ChatInput, SIGNAL( textEdited (QString) ), myChat, SLOT( setChatTextEdited() ) );
connect( waitStartGameMsgBoxTimer, SIGNAL(timeout()), this, SLOT( showWaitStartGameMsgBox() ));
lineEdit_ChatInput->installEventFilter(this); lineEdit_ChatInput->installEventFilter(this);
@@ -160,6 +169,8 @@ void gameLobbyDialogImpl::refresh(int actionID) {
if (actionID == MSG_NET_GAME_CLIENT_START) if (actionID == MSG_NET_GAME_CLIENT_START)
{ {
waitStartGameMsgBoxTimer->stop();
waitStartGameMsgBox.hide();
QTimer::singleShot(500, this, SLOT(accept())); QTimer::singleShot(500, this, SLOT(accept()));
} }
} }
@@ -526,6 +537,7 @@ void gameLobbyDialogImpl::playerSelected(QTreeWidgetItem* item, QTreeWidgetItem*
void gameLobbyDialogImpl::startGame() { void gameLobbyDialogImpl::startGame() {
assert(mySession); assert(mySession);
waitStartGameMsgBoxTimer->start(500);
mySession->sendStartEvent(checkBox_fillUpWithComputerOpponents->isChecked()); mySession->sendStartEvent(checkBox_fillUpWithComputerOpponents->isChecked());
} }
@@ -620,3 +632,8 @@ void gameLobbyDialogImpl::hideShowGameDescription(bool show) {
label_gameDesc7->hide(); label_gameDesc7->hide();
} }
} }
void gameLobbyDialogImpl::showWaitStartGameMsgBox() { waitStartGameMsgBox.show(); }
src/gui/qt/gamelobbydialog/gamelobbydialogimpl.h
+4
View File
@@ -93,6 +93,8 @@ public slots:
bool event(QEvent * event); bool event(QEvent * event);
void hideShowGameDescription(bool show); void hideShowGameDescription(bool show);
void showWaitStartGameMsgBox();
private: private:
@@ -107,6 +109,8 @@ private:
LobbyChat *myChat; LobbyChat *myChat;
QString myAppDataPath; QString myAppDataPath;
int keyUpCounter; int keyUpCounter;
QMessageBox waitStartGameMsgBox;
QTimer *waitStartGameMsgBoxTimer;
protected: protected:
bool eventFilter(QObject *obj, QEvent *event); bool eventFilter(QObject *obj, QEvent *event);
src/gui/qt/mainwindow.ui
+1 -4
View File
@@ -2009,10 +2009,7 @@
<number>99999</number> <number>99999</number>
</property> </property>
<property name="singleStep" > <property name="singleStep" >
<number>5</number> <number>10</number>
</property>
<property name="value" >
<number>99990</number>
</property> </property>
</widget> </widget>
</item> </item>
src/gui/qt/mainwindow/mainwindowimpl.cpp
+3 -1
View File
@@ -2345,6 +2345,7 @@ void mainWindowImpl::myBet(){
spinBox_set->setMaximum(currentHand->getSeatsList()->front()->getMyCash()); spinBox_set->setMaximum(currentHand->getSeatsList()->front()->getMyCash());
horizontalSlider_bet->setMaximum(currentHand->getSeatsList()->front()->getMyCash()); horizontalSlider_bet->setMaximum(currentHand->getSeatsList()->front()->getMyCash());
spinBox_set->setValue(spinBox_set->minimum()); spinBox_set->setValue(spinBox_set->minimum());
horizontalSlider_bet->setSingleStep(10);
if(lineEdit_ChatInput->text() == "") { if(lineEdit_ChatInput->text() == "") {
spinBox_set->setFocus(); spinBox_set->setFocus();
spinBox_set->selectAll(); spinBox_set->selectAll();
@@ -2362,6 +2363,7 @@ void mainWindowImpl::myRaise(){
spinBox_set->setMaximum(currentHand->getSeatsList()->front()->getMyCash()); spinBox_set->setMaximum(currentHand->getSeatsList()->front()->getMyCash());
horizontalSlider_bet->setMaximum(currentHand->getSeatsList()->front()->getMyCash()); horizontalSlider_bet->setMaximum(currentHand->getSeatsList()->front()->getMyCash());
spinBox_set->setValue(spinBox_set->minimum()); spinBox_set->setValue(spinBox_set->minimum());
horizontalSlider_bet->setSingleStep(10);
if(lineEdit_ChatInput->text() == "") { if(lineEdit_ChatInput->text() == "") {
spinBox_set->setFocus(); spinBox_set->setFocus();
spinBox_set->selectAll(); spinBox_set->selectAll();
@@ -3681,7 +3683,7 @@ void mainWindowImpl::keyPressEvent ( QKeyEvent * event ) {
bool ctrlPressed = FALSE; bool ctrlPressed = FALSE;
if (event->key() == Qt::Key_Enter || event->key() == Qt::Key_Return ) { if(spinBox_set->hasFocus()) pushButton_CallCheckSet->click(); } //ENTER if (event->key() == Qt::Key_Enter || event->key() == Qt::Key_Return ) { if(spinBox_set->hasFocus()) pushButton_BetRaise->click(); } //ENTER
if (event->key() == Qt::Key_F1) { if (event->key() == Qt::Key_F1) {
if (myConfig->readConfigInt("AlternateFKeysUserActionMode") == 0) { if (myConfig->readConfigInt("AlternateFKeysUserActionMode") == 0) {
pushButton_FoldAllin->click(); pushButton_FoldAllin->click();
src/gui/qt/mainwindow/mylefttabwidget.cpp
+2 -3
View File
@@ -32,13 +32,12 @@ MyLeftTabWidget::MyLeftTabWidget(QGroupBox *parent)
#else #else
QString font1String("font-family: \"Nimbus Sans L\";"); QString font1String("font-family: \"Nimbus Sans L\";");
int paddingTop = 0; int paddingTop = 0;
int paddingSide = 0; int paddingSide = 1;
#endif #endif
QTabBar *myTabBar = this->tabBar(); QTabBar *myTabBar = this->tabBar();
myTabBar->setStyleSheet("QTabBar::tab{ "+ font1String +" font-size: 11px; color: white; background-color: #145300; border: 2px solid #286400; border-bottom-color: #286400; border-top-left-radius: 4px; border-top-right-radius: 4px; min-width: 8ex; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:selected, QTabBar::tab:hover { background-color: #145300; } QTabBar::tab:selected { border-color: #286400; border-bottom-color: #145300; } QTabBar::tab:!selected { margin-top: 2px; } QTabBar::tab:selected { margin-left: -4px; margin-right: -4px; } QTabBar::tab:first:selected { margin-left: 0; } QTabBar::tab:last:selected { margin-right: 0; } QTabBar::tab:only-one { margin: 0; } QTabBar::tab:disabled { font-size: 11px; font-weight: 900; color: #144D03; background-color: #144D03; border-left-color: #255704; border-right-color: #255704; border-top-color: #255704; }"); myTabBar->setStyleSheet("QTabBar::tab{ "+ font1String +" font-size: 11px; color: white; background-color: #145300; border: 2px solid #286400; border-bottom-color: #286400; border-top-left-radius: 4px; border-top-right-radius: 4px; min-width: 8ex; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:selected, QTabBar::tab:hover { background-color: #145300; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:selected { border-color: #286400; border-bottom-color: #145300; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:!selected { margin-top: 2px; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:selected { margin-left: -4px; margin-right: -4px; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:first:selected { margin-left: 0; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:last:selected { margin-right: 0; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:only-one { margin: 0; } QTabBar::tab:disabled { font-size: 11px; font-weight: 900; color: #144D03; background-color: #144D03; border-left-color: #255704; border-right-color: #255704; border-top-color: #255704; }");
} }
src/gui/qt/mainwindow/myrighttabwidget.cpp
+2 -2
View File
@@ -32,12 +32,12 @@ MyRightTabWidget::MyRightTabWidget(QGroupBox *parent)
#else #else
QString font1String("font-family: \"Nimbus Sans L\";"); QString font1String("font-family: \"Nimbus Sans L\";");
int paddingTop = 0; int paddingTop = 0;
int paddingSide = 0; int paddingSide = 1;
#endif #endif
QTabBar *myTabBar = this->tabBar(); QTabBar *myTabBar = this->tabBar();
myTabBar->setStyleSheet("QTabBar::tab{ "+ font1String +" font-size: 11px; color: white; background-color: #145300; border: 2px solid #286400; border-bottom-color: #286400; border-top-left-radius: 4px; border-top-right-radius: 4px; min-width: 8ex; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:selected, QTabBar::tab:hover { background-color: #145300; } QTabBar::tab:selected { border-color: #286400; border-bottom-color: #145300; } QTabBar::tab:!selected { margin-top: 2px; } QTabBar::tab:selected { margin-left: -4px; margin-right: -4px; } QTabBar::tab:first:selected { margin-left: 0; } QTabBar::tab:last:selected { margin-right: 0; } QTabBar::tab:only-one { margin: 0; } QTabBar::tab:disabled { font-size: 11px; font-weight: 900; color: #144D03; background-color: #144D03; border-left-color: #255704; border-right-color: #255704; border-top-color: #255704; }"); myTabBar->setStyleSheet("QTabBar::tab{ "+ font1String +" font-size: 11px; color: white; background-color: #145300; border: 2px solid #286400; border-bottom-color: #286400; border-top-left-radius: 4px; border-top-right-radius: 4px; min-width: 8ex; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:selected, QTabBar::tab:hover { background-color: #145300; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:selected { border-color: #286400; border-bottom-color: #145300; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:!selected { margin-top: 2px; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:selected { margin-left: -4px; margin-right: -4px; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:first:selected { margin-left: 0; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:last:selected { margin-right: 0; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:only-one { margin: 0; } QTabBar::tab:disabled { font-size: 11px; font-weight: 900; color: #144D03; background-color: #144D03; border-left-color: #255704; border-right-color: #255704; border-top-color: #255704; }");
} }