From 2321ce6f5055a4424bb986afdae295b8492e453f Mon Sep 17 00:00:00 2001 From: doitux Date: Thu, 24 May 2007 22:37:10 +0000 Subject: [PATCH] chat + groupboxfixes --- src/gui/qt/mainwindow.ui | 922 ++++++++++++++++------- src/gui/qt/mainwindow/mainwindowimpl.cpp | 17 +- 2 files changed, 680 insertions(+), 259 deletions(-) diff --git a/src/gui/qt/mainwindow.ui b/src/gui/qt/mainwindow.ui index 6f13fcd0..dbbf5ecc 100644 --- a/src/gui/qt/mainwindow.ui +++ b/src/gui/qt/mainwindow.ui @@ -578,13 +578,13 @@ 197 - 172 + 180 197 - 172 + 180 @@ -602,6 +602,9 @@ :/graphics/resources/graphics/handRanking_release.png + + Qt::AlignCenter + @@ -1265,7 +1268,7 @@ 197 - 172 + 180 @@ -1278,242 +1281,6 @@ 5 - - - - - - - - - 240 - 240 - 240 - - - - - - - 40 - 82 - 0 - - - - - - - 240 - 240 - 240 - - - - - - - 240 - 240 - 240 - - - - - - - 240 - 240 - 240 - - - - - - - 29 - 59 - 0 - - - - - - - 29 - 59 - 0 - - - - - - - 240 - 240 - 240 - - - - - - - - - 240 - 240 - 240 - - - - - - - 40 - 82 - 0 - - - - - - - 240 - 240 - 240 - - - - - - - 240 - 240 - 240 - - - - - - - 240 - 240 - 240 - - - - - - - 29 - 59 - 0 - - - - - - - 29 - 59 - 0 - - - - - - - 240 - 240 - 240 - - - - - - - - - 128 - 128 - 128 - - - - - - - 40 - 82 - 0 - - - - - - - 240 - 240 - 240 - - - - - - - 199 - 199 - 199 - - - - - - - 240 - 240 - 240 - - - - - - - 29 - 59 - 0 - - - - - - - 29 - 59 - 0 - - - - - - - 240 - 240 - 240 - - - - - - - - Qt::NoFocus - - - Qt::ScrollBarAlwaysOff - - - @@ -2032,6 +1799,651 @@ + + + + + + + + + 40 + 82 + 0 + + + + + + + + + 40 + 82 + 0 + + + + + + + + + 40 + 82 + 0 + + + + + + + + + 8 + + + + QTabWidget::Rounded + + + 1 + + + + Log + + + + 0 + + + 0 + + + + + + + + + + 240 + 240 + 240 + + + + + + + 40 + 82 + 0 + + + + + + + 240 + 240 + 240 + + + + + + + 240 + 240 + 240 + + + + + + + 240 + 240 + 240 + + + + + + + 29 + 59 + 0 + + + + + + + 29 + 59 + 0 + + + + + + + 240 + 240 + 240 + + + + + + + + + 240 + 240 + 240 + + + + + + + 40 + 82 + 0 + + + + + + + 240 + 240 + 240 + + + + + + + 240 + 240 + 240 + + + + + + + 240 + 240 + 240 + + + + + + + 29 + 59 + 0 + + + + + + + 29 + 59 + 0 + + + + + + + 240 + 240 + 240 + + + + + + + + + 128 + 128 + 128 + + + + + + + 40 + 82 + 0 + + + + + + + 240 + 240 + 240 + + + + + + + 199 + 199 + 199 + + + + + + + 240 + 240 + 240 + + + + + + + 29 + 59 + 0 + + + + + + + 29 + 59 + 0 + + + + + + + 240 + 240 + 240 + + + + + + + + Qt::NoFocus + + + Qt::ScrollBarAlwaysOff + + + + + + + + Chat + + + + 0 + + + 0 + + + + + + + + + + 240 + 240 + 240 + + + + + + + 40 + 82 + 0 + + + + + + + 240 + 240 + 240 + + + + + + + 240 + 240 + 240 + + + + + + + 240 + 240 + 240 + + + + + + + 29 + 59 + 0 + + + + + + + 29 + 59 + 0 + + + + + + + 240 + 240 + 240 + + + + + + + + + 240 + 240 + 240 + + + + + + + 40 + 82 + 0 + + + + + + + 240 + 240 + 240 + + + + + + + 240 + 240 + 240 + + + + + + + 240 + 240 + 240 + + + + + + + 29 + 59 + 0 + + + + + + + 29 + 59 + 0 + + + + + + + 240 + 240 + 240 + + + + + + + + + 128 + 128 + 128 + + + + + + + 40 + 82 + 0 + + + + + + + 240 + 240 + 240 + + + + + + + 199 + 199 + 199 + + + + + + + 240 + 240 + 240 + + + + + + + 29 + 59 + 0 + + + + + + + 29 + 59 + 0 + + + + + + + 240 + 240 + 240 + + + + + + + + Qt::NoFocus + + + Qt::ScrollBarAlwaysOff + + + + + + + + + + + + 29 + 59 + 0 + + + + + + + 29 + 59 + 0 + + + + + + + 29 + 59 + 0 + + + + + + + + + 29 + 59 + 0 + + + + + + + 29 + 59 + 0 + + + + + + + 29 + 59 + 0 + + + + + + + + + 29 + 59 + 0 + + + + + + + 29 + 59 + 0 + + + + + + + 29 + 59 + 0 + + + + + + + + + + + + @@ -2531,22 +2943,6 @@ true - - - - 274 - 60 - 90 - 124 - - - - :/guiv2/resources/guiv2/cardholder_05.png - - - true - - @@ -3276,6 +3672,22 @@ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + 274 + 60 + 90 + 124 + + + + :/guiv2/resources/guiv2/cardholder_05.png + + + true + + diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp index 2deeee3a..47d14506 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.cpp +++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp @@ -1057,9 +1057,10 @@ void mainWindowImpl::refreshCash() { void mainWindowImpl::refreshGroupbox(int playerID, int status) { + int i,j; + if(playerID == -1 || status == -1) { - int i,j; HandInterface *currentHand = mySession->getCurrentGame()->getCurrentHand(); for (i=0; isetStyleSheet("QGroupBox { background-image: url(:/guiv2/resources/guiv2/playerBoxInactiveGlow.png) }"); + groupBoxArray[playerID]->setStyleSheet("QGroupBox { background-image: url(:/guiv2/resources/guiv2/playerBoxInactiveGlow.png) }"); + //hide buttons + for(j=0; j<4; j++) { + userWidgetsArray[j]->hide(); + } } else { groupBoxArray[playerID]->setStyleSheet("QGroupBox { background-image: url(:/guiv2/resources/guiv2/opponentBoxInactiveGlow.png) }"); @@ -1118,7 +1123,11 @@ void mainWindowImpl::refreshGroupbox(int playerID, int status) { //active but fold case 1: { if (!playerID) { - groupBoxArray[playerID]->setStyleSheet("QGroupBox { background-image: url(:/guiv2/resources/guiv2/playerBoxInactiveGlow.png) }"); + groupBoxArray[playerID]->setStyleSheet("QGroupBox { background-image: url(:/guiv2/resources/guiv2/playerBoxInactiveGlow.png) }"); + //show buttons + for(j=0; j<3; j++) { + userWidgetsArray[j]->show(); + } } else { groupBoxArray[playerID]->setStyleSheet("QGroupBox { background-image: url(:/guiv2/resources/guiv2/opponentBoxInactiveGlow.png) }"); @@ -1128,7 +1137,7 @@ void mainWindowImpl::refreshGroupbox(int playerID, int status) { //active in action case 2: { if (!playerID) { - groupBoxArray[playerID]->setStyleSheet("QGroupBox { background-image: url(:/guiv2/resources/guiv2/playerBoxActiveGlow.png) }"); + groupBoxArray[playerID]->setStyleSheet("QGroupBox { background-image: url(:/guiv2/resources/guiv2/playerBoxActiveGlow.png) }"); } else { groupBoxArray[playerID]->setStyleSheet("QGroupBox { background-image: url(:/guiv2/resources/guiv2/opponentBoxActiveGlow.png) }");