From 0c4648e194dbd18c4b060d112edbabc842c1e852 Mon Sep 17 00:00:00 2001 From: doitux Date: Mon, 28 May 2007 13:13:48 +0000 Subject: [PATCH] bigger toolboxes. chat --> left --- pokerth.pro | 2 + src/gui/qt/changehumanplayernamedialog.ui | 82 ++ src/gui/qt/mainwindow.ui | 839 ++++++++++++--------- src/gui/qt/mainwindow/chat/chat.cpp | 8 +- src/gui/qt/mainwindow/mainwindowimpl.cpp | 4 +- src/gui/qt/mainwindow/mylefttabwidget.cpp | 49 ++ src/gui/qt/mainwindow/mylefttabwidget.h | 45 ++ src/gui/qt/mainwindow/myrighttabwidget.cpp | 22 +- src/gui/qt/mainwindow/myrighttabwidget.h | 10 +- 9 files changed, 669 insertions(+), 392 deletions(-) create mode 100644 src/gui/qt/changehumanplayernamedialog.ui create mode 100644 src/gui/qt/mainwindow/mylefttabwidget.cpp create mode 100644 src/gui/qt/mainwindow/mylefttabwidget.h diff --git a/pokerth.pro b/pokerth.pro index 4daa5c87..ba3279a0 100755 --- a/pokerth.pro +++ b/pokerth.pro @@ -112,6 +112,7 @@ HEADERS += src/game.h \ src/gui/qt/mainwindow/mainwindowimpl.h \ src/gui/qt/mainwindow/mycardspixmaplabel.h \ src/gui/qt/mainwindow/myrighttabwidget.h \ + src/gui/qt/mainwindow/mylefttabwidget.h \ src/gui/qt/mainwindow/startsplash/startsplash.h \ src/gui/qt/mainwindow/log/log.h \ src/gui/qt/mainwindow/chat/chat.h \ @@ -201,6 +202,7 @@ SOURCES += src/game.cpp \ src/gui/qt/mainwindow/mainwindowimpl.cpp \ src/gui/qt/mainwindow/mycardspixmaplabel.cpp \ src/gui/qt/mainwindow/myrighttabwidget.cpp \ + src/gui/qt/mainwindow/mylefttabwidget.cpp \ src/gui/qt/mainwindow/startsplash/startsplash.cpp \ src/gui/qt/mainwindow/log/log.cpp \ src/gui/qt/mainwindow/chat/chat.cpp \ diff --git a/src/gui/qt/changehumanplayernamedialog.ui b/src/gui/qt/changehumanplayernamedialog.ui new file mode 100644 index 00000000..c65d2a4b --- /dev/null +++ b/src/gui/qt/changehumanplayernamedialog.ui @@ -0,0 +1,82 @@ + + changeHumanPlayerNameDialog + + + + 0 + 0 + 374 + 134 + + + + Dialog + + + + 9 + + + 6 + + + + + + + + + + + Human Player: + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Save + + + + + + + + + buttonBox + accepted() + changeHumanPlayerNameDialog + accept() + + + 248 + 254 + + + 157 + 274 + + + + + buttonBox + rejected() + changeHumanPlayerNameDialog + reject() + + + 316 + 260 + + + 286 + 274 + + + + + diff --git a/src/gui/qt/mainwindow.ui b/src/gui/qt/mainwindow.ui index d0ba3eb0..b967bd05 100644 --- a/src/gui/qt/mainwindow.ui +++ b/src/gui/qt/mainwindow.ui @@ -551,7 +551,7 @@ - 197 + 230 0 @@ -577,35 +577,473 @@ - 197 - 180 + 230 + 195 197 - 180 + 195 QGroupBox { background-image: url(:/graphics/resources/graphics/toolboxFrameBG.png) } - - - - 10 - 20 - 181 - 133 - + + + 9 - - :/graphics/resources/graphics/handRanking_release.png + + 5 - - Qt::AlignCenter - - + + + + + + + + + 240 + 240 + 240 + + + + + + + 40 + 82 + 0 + + + + + + + + + 240 + 240 + 240 + + + + + + + 40 + 82 + 0 + + + + + + + + + 128 + 128 + 128 + + + + + + + 40 + 82 + 0 + + + + + + + + + 8 + + + + QTabWidget::Rounded + + + 0 + + + + Hands + + + + 0 + + + 0 + + + + + :/graphics/resources/graphics/handRanking_release.png + + + Qt::AlignCenter + + + + + + + + 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 + + + + + + + + + + + + + @@ -620,7 +1058,7 @@ - 23 + 106 40 @@ -639,7 +1077,7 @@ - 404 + 310 195 @@ -1211,7 +1649,7 @@ - 23 + 106 40 @@ -1235,7 +1673,7 @@ - 200 + 230 0 @@ -1261,14 +1699,14 @@ - 197 - 172 + 230 + 195 197 - 180 + 195 @@ -1800,7 +2238,7 @@ - + @@ -2125,350 +2563,6 @@ - - - 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 - - - - - - - - - - @@ -5859,6 +5953,11 @@ + + MyLeftTabWidget + QTabWidget +
mylefttabwidget.h
+ MyRightTabWidget QTabWidget diff --git a/src/gui/qt/mainwindow/chat/chat.cpp b/src/gui/qt/mainwindow/chat/chat.cpp index e7731d58..d0b0fe68 100644 --- a/src/gui/qt/mainwindow/chat/chat.cpp +++ b/src/gui/qt/mainwindow/chat/chat.cpp @@ -51,13 +51,13 @@ void Chat::receiveMessage(QString playerName, QString message) { void Chat::checkInvisible() { - switch (myW->tabWidget->currentIndex()) { + switch (myW->tabWidget_Left->currentIndex()) { - case 1: { myW->tabWidget->stopBlinkChatTab(); - myW->tabWidget->showDefaultChatTab(); + case 1: { myW->tabWidget_Left->stopBlinkChatTab(); + myW->tabWidget_Left->showDefaultChatTab(); } break; - default: { myW->tabWidget->startBlinkChatTab(); } + default: { myW->tabWidget_Left->startBlinkChatTab(); } } } diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp index fba1a63f..879ad8f4 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.cpp +++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp @@ -558,7 +558,7 @@ mainWindowImpl::mainWindowImpl(ConfigFile *c, QMainWindow *parent) connect ( horizontalSlider_speed, SIGNAL( valueChanged(int)), this, SLOT ( setGameSpeed(int) ) ); connect ( pushButton_break, SIGNAL( clicked()), this, SLOT ( breakButtonClicked() ) ); // auch wieder starten!!!! - connect( tabWidget, SIGNAL( currentChanged(int) ), this, SLOT( tabSwitchAction() ) ); + connect( tabWidget_Left, SIGNAL( currentChanged(int) ), this, SLOT( tabSwitchAction() ) ); connect( lineEdit_ChatInput, SIGNAL( returnPressed () ), this, SLOT( sendChatMessage() ) ); connect( lineEdit_ChatInput, SIGNAL( textChanged (QString) ), this, SLOT( checkChatInputLength(QString) ) ); @@ -2516,7 +2516,7 @@ void mainWindowImpl::checkChatInputLength(QString string) { myChat->checkInputLe void mainWindowImpl::tabSwitchAction() { - switch(tabWidget->currentIndex()) { + switch(tabWidget_Left->currentIndex()) { case 1: { lineEdit_ChatInput->setFocus(); myChat->checkInvisible(); diff --git a/src/gui/qt/mainwindow/mylefttabwidget.cpp b/src/gui/qt/mainwindow/mylefttabwidget.cpp new file mode 100644 index 00000000..0b65b79e --- /dev/null +++ b/src/gui/qt/mainwindow/mylefttabwidget.cpp @@ -0,0 +1,49 @@ +// +// C++ Implementation: MyLeftTabWidget +// +// Description: +// +// +// Author: FThauer FHammer , (C) 2007 +// +// Copyright: See COPYING file that comes with this distribution +// +// +#include "mylefttabwidget.h" + +// using namespace std; + +MyLeftTabWidget::MyLeftTabWidget(QGroupBox *parent) + : QTabWidget(parent), chatBlinkTimer(0), myTabBar(0) +{ +// fadeOutTimer = new QTimer; +// connect(flipCardsTimer, SIGNAL(timeout()), this, SLOT(nextFlipCardsFrame())); + myTabBar = this->tabBar(); + + chatBlinkTimer = new QTimer; + connect(chatBlinkTimer, SIGNAL(timeout()), this, SLOT( blinkChatTab() )); +} + + +MyLeftTabWidget::~MyLeftTabWidget() +{ +} + +void MyLeftTabWidget::startBlinkChatTab() { chatBlinkTimer->start(500); } +void MyLeftTabWidget::stopBlinkChatTab() { chatBlinkTimer->stop(); } +void MyLeftTabWidget::showDefaultChatTab() { myTabBar->setTabTextColor(1, QColor(240,240,240)); } + +void MyLeftTabWidget::blinkChatTab() { + + if(myTabBar->tabTextColor(1).red() == 240) myTabBar->setTabTextColor(1, QColor(113,162,0)); + else myTabBar->setTabTextColor(1, QColor(240,240,240)); +} + +void MyLeftTabWidget::paintEvent(QPaintEvent * event) { + + QTabWidget::paintEvent(event); + +} + + + diff --git a/src/gui/qt/mainwindow/mylefttabwidget.h b/src/gui/qt/mainwindow/mylefttabwidget.h new file mode 100644 index 00000000..4205fb20 --- /dev/null +++ b/src/gui/qt/mainwindow/mylefttabwidget.h @@ -0,0 +1,45 @@ +// +// C++ Interface: MyLeftTabWidget +// +// Description: +// +// +// Author: FThauer FHammer , (C) 2007 +// +// Copyright: See COPYING file that comes with this distribution +// +// +#ifndef MYLEFTTABWIDGET_H +#define MYLEFTTABWIDGET_H + +#include +#include + +#include + +class MyLeftTabWidget : public QTabWidget +{ +Q_OBJECT +public: + MyLeftTabWidget(QGroupBox*); + + ~MyLeftTabWidget(); + + + void paintEvent(QPaintEvent * event); + void startBlinkChatTab(); + void stopBlinkChatTab(); + void showDefaultChatTab(); + +public slots: + + void blinkChatTab(); + +private: + + QTimer *chatBlinkTimer; + QTabBar *myTabBar; + +}; + +#endif diff --git a/src/gui/qt/mainwindow/myrighttabwidget.cpp b/src/gui/qt/mainwindow/myrighttabwidget.cpp index 349e1fc2..6e1f2b1c 100644 --- a/src/gui/qt/mainwindow/myrighttabwidget.cpp +++ b/src/gui/qt/mainwindow/myrighttabwidget.cpp @@ -14,14 +14,14 @@ // using namespace std; MyRightTabWidget::MyRightTabWidget(QGroupBox *parent) - : QTabWidget(parent), chatBlinkTimer(0), myTabBar(0) + : QTabWidget(parent), myTabBar(0) { // fadeOutTimer = new QTimer; // connect(flipCardsTimer, SIGNAL(timeout()), this, SLOT(nextFlipCardsFrame())); myTabBar = this->tabBar(); - chatBlinkTimer = new QTimer; - connect(chatBlinkTimer, SIGNAL(timeout()), this, SLOT( blinkChatTab() )); +// chatBlinkTimer = new QTimer; +// connect(chatBlinkTimer, SIGNAL(timeout()), this, SLOT( blinkChatTab() )); } @@ -29,15 +29,15 @@ MyRightTabWidget::~MyRightTabWidget() { } -void MyRightTabWidget::startBlinkChatTab() { chatBlinkTimer->start(500); } -void MyRightTabWidget::stopBlinkChatTab() { chatBlinkTimer->stop(); } -void MyRightTabWidget::showDefaultChatTab() { myTabBar->setTabTextColor(1, QColor(240,240,240)); } +// // void MyRightTabWidget::startBlinkChatTab() { chatBlinkTimer->start(500); } +// void MyRightTabWidget::stopBlinkChatTab() { chatBlinkTimer->stop(); } +// void MyRightTabWidget::showDefaultChatTab() { myTabBar->setTabTextColor(1, QColor(240,240,240)); } -void MyRightTabWidget::blinkChatTab() { - - if(myTabBar->tabTextColor(1).red() == 240) myTabBar->setTabTextColor(1, QColor(113,162,0)); - else myTabBar->setTabTextColor(1, QColor(240,240,240)); -} +// void MyRightTabWidget::blinkChatTab() { +// +// if(myTabBar->tabTextColor(1).red() == 240) myTabBar->setTabTextColor(1, QColor(113,162,0)); +// else myTabBar->setTabTextColor(1, QColor(240,240,240)); +// } void MyRightTabWidget::paintEvent(QPaintEvent * event) { diff --git a/src/gui/qt/mainwindow/myrighttabwidget.h b/src/gui/qt/mainwindow/myrighttabwidget.h index 0dac57e7..0d9801d4 100644 --- a/src/gui/qt/mainwindow/myrighttabwidget.h +++ b/src/gui/qt/mainwindow/myrighttabwidget.h @@ -27,17 +27,17 @@ public: void paintEvent(QPaintEvent * event); - void startBlinkChatTab(); - void stopBlinkChatTab(); - void showDefaultChatTab(); +// void startBlinkChatTab(); +// void stopBlinkChatTab(); +// void showDefaultChatTab(); public slots: - void blinkChatTab(); +// void blinkChatTab(); private: - QTimer *chatBlinkTimer; +// QTimer *chatBlinkTimer; QTabBar *myTabBar; };