diff --git a/pokerth.pro b/pokerth.pro index 4e1ef438..963dc03f 100755 --- a/pokerth.pro +++ b/pokerth.pro @@ -40,7 +40,8 @@ HEADERS += tinystr.h \ riverinterface.h \ enginefactory.h \ localenginefactory.h \ - startsplash.h + startsplash.h \ + mycardspixmaplabel.h SOURCES += pokerth.cpp \ tinystr.cpp \ tinyxml.cpp \ @@ -74,12 +75,13 @@ SOURCES += pokerth.cpp \ riverinterface.cpp \ enginefactory.cpp \ localenginefactory.cpp \ - startsplash.cpp + startsplash.cpp \ + mycardspixmaplabel.cpp TEMPLATE = vcapp RESOURCES = src/gui/qt/deck.qrc TEMPLATE = app -DEPENDPATH += . src uics src/config src/config/tinyxml src/gui src/gui/qt src/gui/qt/startsplash src/engine src/engine/local_engine src/engine/network_engine -INCLUDEPATH += . src uics src/config src/config/tinyxml src/gui src/gui/qt src/gui/qt/startsplash src/engine src/engine/local_engine src/engine/network_engine +DEPENDPATH += . src uics src/config src/config/tinyxml src/gui src/gui/qt src/gui/qt/startsplash src/gui/qt/cards src/engine src/engine/local_engine src/engine/network_engine +INCLUDEPATH += . src uics src/config src/config/tinyxml src/gui src/gui/qt src/gui/qt/startsplash src/gui/qt/cards src/engine src/engine/local_engine src/engine/network_engine CONFIG += qt release UI_DIR = uics TARGET = bin/pokerth diff --git a/src/gui/qt/cards/logo1-140x100_neu.png b/src/gui/qt/cards/logo1-140x100_neu.png deleted file mode 100644 index c0439f45..00000000 Binary files a/src/gui/qt/cards/logo1-140x100_neu.png and /dev/null differ diff --git a/src/gui/qt/cards/mycardspixmaplabel.cpp b/src/gui/qt/cards/mycardspixmaplabel.cpp new file mode 100644 index 00000000..4837dc8f --- /dev/null +++ b/src/gui/qt/cards/mycardspixmaplabel.cpp @@ -0,0 +1,56 @@ +// +// C++ Implementation: mycardspixmaplabel +// +// Description: +// +// +// Author: FThauer FHammer , (C) 2007 +// +// Copyright: See COPYING file that comes with this distribution +// +// +#include "mycardspixmaplabel.h" + +MyCardsPixmapLabel::MyCardsPixmapLabel(QFrame* parent) + : QLabel(parent) +{ + + frameOpacity = 0.0; + + timer = new QTimer; + connect(timer, SIGNAL(timeout()), this, SLOT(nextFadeOutFrame())); + +} + + +MyCardsPixmapLabel::~MyCardsPixmapLabel() +{ +} + +void MyCardsPixmapLabel::startFadeOut() { timer->start(40); } + + +void MyCardsPixmapLabel::nextFadeOutFrame() { + + if (frameOpacity < 0.7) { + frameOpacity += 0.01; + update(); + } + else { timer->stop(); } + +} + +void MyCardsPixmapLabel::paintEvent(QPaintEvent * event) { + + QLabel::paintEvent(event); + + QPainter painter(this); + painter.setPen(QColor(74,131,83)); + painter.setBrush(QColor(74,131,83)); +// painter.setBrush(QColor(0,0,0)); + + painter.setOpacity(frameOpacity); +// painter.drawRect(this->geometry()); + painter.drawRect(0,0,57,80); + +} diff --git a/src/gui/qt/cards/mycardspixmaplabel.h b/src/gui/qt/cards/mycardspixmaplabel.h new file mode 100644 index 00000000..4b147b9e --- /dev/null +++ b/src/gui/qt/cards/mycardspixmaplabel.h @@ -0,0 +1,41 @@ +// +// C++ Interface: mycardspixmaplabel +// +// Description: +// +// +// Author: FThauer FHammer , (C) 2007 +// +// Copyright: See COPYING file that comes with this distribution +// +// +#ifndef MYCARDSPIXMAPLABEL_H +#define MYCARDSPIXMAPLABEL_H + +#include +#include + +#include + +class MyCardsPixmapLabel : public QLabel +{ +Q_OBJECT +public: + MyCardsPixmapLabel(QFrame*); + + ~MyCardsPixmapLabel(); + + qreal frameOpacity; + QTimer *timer; + + + void startFadeOut(); + void paintEvent(QPaintEvent * event); + +public slots: + + void nextFadeOutFrame(); + +}; + +#endif diff --git a/src/gui/qt/mainwindow.ui b/src/gui/qt/mainwindow.ui index 03b9340a..e063d03f 100644 --- a/src/gui/qt/mainwindow.ui +++ b/src/gui/qt/mainwindow.ui @@ -515,14 +515,1968 @@ 6 - + + + + 0 + + + 6 + + + + + Qt::Horizontal + + + + 20 + 20 + + + + + + + + + 566 + 136 + + + + + 566 + 136 + + + + + + + + + 0 + 0 + 0 + + + + + + + 221 + 223 + 228 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 85 + 85 + 85 + + + + + + + 199 + 199 + 199 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 74 + 131 + 83 + + + + + + + 0 + 0 + 0 + + + + + + + 103 + 141 + 178 + + + + + + + 255 + 255 + 255 + + + + + + + 0 + 0 + 238 + + + + + + + 82 + 24 + 139 + + + + + + + 232 + 232 + 232 + + + + + + + + + 0 + 0 + 0 + + + + + + + 221 + 223 + 228 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 85 + 85 + 85 + + + + + + + 199 + 199 + 199 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 74 + 131 + 83 + + + + + + + 0 + 0 + 0 + + + + + + + 103 + 141 + 178 + + + + + + + 255 + 255 + 255 + + + + + + + 0 + 0 + 238 + + + + + + + 82 + 24 + 139 + + + + + + + 232 + 232 + 232 + + + + + + + + + 128 + 128 + 128 + + + + + + + 221 + 223 + 228 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 85 + 85 + 85 + + + + + + + 199 + 199 + 199 + + + + + + + 199 + 199 + 199 + + + + + + + 255 + 255 + 255 + + + + + + + 128 + 128 + 128 + + + + + + + 74 + 131 + 83 + + + + + + + 74 + 131 + 83 + + + + + + + 0 + 0 + 0 + + + + + + + 86 + 117 + 148 + + + + + + + 255 + 255 + 255 + + + + + + + 0 + 0 + 238 + + + + + + + 82 + 24 + 139 + + + + + + + 232 + 232 + 232 + + + + + + + + true + + + + + + + 9 + + + 6 + + + + + + 0 + 0 + 0 + 0 + + + + + 331 + 102 + + + + + 331 + 102 + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 9 + + + 6 + + + + + + + + + 0 + 0 + 0 + 0 + + + + + 104 + 114 + + + + true + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 4 + + + 4 + + + + + true + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 4 + + + 0 + + + + + + 0 + 30 + + + + + 16777215 + 30 + + + + true + + + + + + + + + + + 0 + 25 + + + + + 16777215 + 25 + + + + true + + + + + + + + + + 0 + + + 4 + + + + + + 0 + 26 + + + + + 16777215 + 26 + + + + + + + + + 0 + 26 + + + + + 16777215 + 26 + + + + + + + + + + + + + 0 + + + 6 + + + + + + 95 + 16 + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 2 + + + 0 + + + + + + 12 + + + + Qt::AlignCenter + + + + + + + + + + + 95 + 36 + + + + true + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 3 + + + 0 + + + + + + 15 + 75 + true + + + + Qt::AlignCenter + + + + + + + + + + + + + + + Qt::Horizontal + + + + 20 + 20 + + + + + + + + + + 0 + + + 6 + + + + + false + + + + 209 + 162 + + + + + 209 + 5555555 + + + + true + + + + + + + 9 + + + 6 + + + + + + 127 + 92 + + + + + 127 + 92 + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 0 + + + 3 + + + + + + + + + 54 + 60 + + + + + 16777215 + 60 + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 3 + + + 0 + + + + + + 35 + 0 + + + + + + + + + 35 + 0 + + + + + + + + + + + 0 + + + 6 + + + + + + 16 + 28 + + + + + 28 + 16777215 + + + + false + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 2 + + + 0 + + + + + + 0 + 20 + + + + + 20 + 16777215 + + + + true + + + + + + + + + + + + + + 16 + 28 + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 2 + + + 0 + + + + + + 0 + 20 + + + + + + + Qt::AlignCenter + + + + + + + + + + + 16 + 28 + + + + true + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 2 + + + 0 + + + + + + 0 + 20 + + + + + + + Qt::AlignCenter + + + + + + + + + + + + QFrame::HLine + + + QFrame::Sunken + + + Qt::Horizontal + + + + + + + Qt::Vertical + + + QSizePolicy::Expanding + + + + 46 + 28 + + + + + + + + + + + false + + + + 209 + 162 + + + + + 209 + 5555555 + + + + true + + + + + + + 9 + + + 6 + + + + + + 127 + 92 + + + + + 127 + 92 + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 0 + + + 3 + + + + + + + + Qt::Vertical + + + QSizePolicy::Expanding + + + + 46 + 28 + + + + + + + + QFrame::HLine + + + QFrame::Sunken + + + Qt::Horizontal + + + + + + + 0 + + + 6 + + + + + + 16 + 28 + + + + + 28 + 16777215 + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 2 + + + 0 + + + + + + 0 + 20 + + + + + 20 + 16777215 + + + + + + + + + + + + + + + 16 + 28 + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 2 + + + 0 + + + + + + 0 + 20 + + + + + + + Qt::AlignCenter + + + + + + + + + + + 16 + 28 + + + + true + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 2 + + + 0 + + + + + + 0 + 20 + + + + + + + Qt::AlignCenter + + + + + + + + + + + + + 54 + 60 + + + + + 16777215 + 60 + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 3 + + + 0 + + + + + + 35 + 0 + + + + + + + + + 35 + 0 + + + + + + + + + + + + + + false + + + + 209 + 162 + + + + + 209 + 5555555 + + + + true + + + + + + + 9 + + + 6 + + + + + + 127 + 92 + + + + + 127 + 92 + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 0 + + + 3 + + + + + + + + QFrame::HLine + + + QFrame::Sunken + + + Qt::Horizontal + + + + + + + 0 + + + 6 + + + + + + 16 + 28 + + + + + 28 + 16777215 + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 2 + + + 0 + + + + + + 0 + 20 + + + + + 20 + 16777215 + + + + + + + + + + + + + + + 16 + 28 + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 2 + + + 0 + + + + + + 0 + 20 + + + + + + + Qt::AlignCenter + + + + + + + + + + + 16 + 28 + + + + true + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 2 + + + 0 + + + + + + 0 + 20 + + + + + + + Qt::AlignCenter + + + + + + + + + + + + Qt::Vertical + + + QSizePolicy::Expanding + + + + 46 + 28 + + + + + + + + + 54 + 60 + + + + + 16777215 + 60 + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 3 + + + 0 + + + + + + 35 + 0 + + + + + + + + + 35 + 0 + + + + + + + + + + + + + + false + + + + 209 + 162 + + + + + 209 + 7777777 + + + + true + + + + + + + 9 + + + 6 + + + + + + 127 + 92 + + + + + 127 + 92 + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 0 + + + 3 + + + + + + + + 0 + + + 6 + + + + + + 16 + 28 + + + + + 28 + 16777215 + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 2 + + + 0 + + + + + + 0 + 20 + + + + + 20 + 16777215 + + + + + + + + + + + + + + + 16 + 28 + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 2 + + + 0 + + + + + + 0 + 20 + + + + + + + Qt::AlignCenter + + + + + + + + + + + 16 + 28 + + + + true + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 2 + + + 0 + + + + + + 0 + 20 + + + + + + + Qt::AlignCenter + + + + + + + + + + + + QFrame::HLine + + + QFrame::Sunken + + + Qt::Horizontal + + + + + + + Qt::Vertical + + + QSizePolicy::Expanding + + + + 46 + 28 + + + + + + + + + 54 + 60 + + + + + 16777215 + 60 + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 3 + + + 0 + + + + + + 35 + 0 + + + + + + + + + 35 + 0 + + + + + + + + + + + + + Qt::Vertical + + QSizePolicy::MinimumExpanding + - 861 + 20 20 @@ -1287,13 +3241,17 @@ - - - 4 - 4 - 0 - 0 - + + + 192 + 142 + + + + + 192 + 142 + QFrame::StyledPanel @@ -1308,60 +3266,6 @@ 6 - - - - - 4 - 4 - 0 - 0 - - - - - 80 - 112 - - - - - 80 - 112 - - - - true - - - - - - - - 4 - 4 - 0 - 0 - - - - - 80 - 112 - - - - - 80 - 112 - - - - true - - - @@ -2006,2148 +3910,19 @@ - + Qt::Vertical - - QSizePolicy::MinimumExpanding - - 20 + 861 20 - - - - 0 - - - 6 - - - - - false - - - - 209 - 178 - - - - true - - - - - - - 9 - - - 6 - - - - - Qt::Vertical - - - QSizePolicy::Expanding - - - - 46 - 28 - - - - - - - - QFrame::HLine - - - QFrame::Sunken - - - Qt::Horizontal - - - - - - - 0 - - - 6 - - - - - - 16 - 28 - - - - - 28 - 16777215 - - - - false - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 2 - - - 0 - - - - - - 0 - 20 - - - - - 20 - 16777215 - - - - true - - - - - - - - - - - - - - 16 - 28 - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 2 - - - 0 - - - - - - 0 - 20 - - - - - - - Qt::AlignCenter - - - - - - - - - - - 16 - 28 - - - - true - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 2 - - - 0 - - - - - - 0 - 20 - - - - - - - Qt::AlignCenter - - - - - - - - - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 3 - - - 3 - - - - - - 4 - 4 - 0 - 0 - - - - - 57 - 80 - - - - true - - - - - - - - 4 - 4 - 0 - 0 - - - - - 57 - 80 - - - - true - - - - - - - - - - - 54 - 60 - - - - - 16777215 - 60 - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 3 - - - 0 - - - - - - 35 - 0 - - - - - - - - - 35 - 0 - - - - - - - - - - - - - - false - - - - 209 - 178 - - - - true - - - - - - - 9 - - - 6 - - - - - - 54 - 60 - - - - - 16777215 - 60 - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 3 - - - 0 - - - - - - 35 - 0 - - - - - - - - - 35 - 0 - - - - - - - - - - - 0 - - - 6 - - - - - - 16 - 28 - - - - - 28 - 16777215 - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 2 - - - 0 - - - - - - 0 - 20 - - - - - 20 - 16777215 - - - - - - - - - - - - - - - 16 - 28 - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 2 - - - 0 - - - - - - 0 - 20 - - - - - - - Qt::AlignCenter - - - - - - - - - - - 16 - 28 - - - - true - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 2 - - - 0 - - - - - - 0 - 20 - - - - - - - Qt::AlignCenter - - - - - - - - - - - - QFrame::HLine - - - QFrame::Sunken - - - Qt::Horizontal - - - - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 3 - - - 3 - - - - - - 4 - 4 - 0 - 0 - - - - - 57 - 80 - - - - true - - - - - - - - 4 - 4 - 0 - 0 - - - - - 57 - 80 - - - - true - - - - - - - - - - Qt::Vertical - - - QSizePolicy::Expanding - - - - 46 - 28 - - - - - - - - - - - false - - - - 209 - 178 - - - - true - - - - - - - 9 - - - 6 - - - - - - 54 - 60 - - - - - 16777215 - 60 - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 3 - - - 0 - - - - - - 35 - 0 - - - - - - - - - 35 - 0 - - - - - - - - - - - Qt::Vertical - - - QSizePolicy::Expanding - - - - 46 - 28 - - - - - - - - 0 - - - 6 - - - - - - 16 - 28 - - - - - 28 - 16777215 - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 2 - - - 0 - - - - - - 0 - 20 - - - - - 20 - 16777215 - - - - - - - - - - - - - - - 16 - 28 - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 2 - - - 0 - - - - - - 0 - 20 - - - - - - - Qt::AlignCenter - - - - - - - - - - - 16 - 28 - - - - true - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 2 - - - 0 - - - - - - 0 - 20 - - - - - - - Qt::AlignCenter - - - - - - - - - - - - QFrame::HLine - - - QFrame::Sunken - - - Qt::Horizontal - - - - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 3 - - - 3 - - - - - - 4 - 4 - 0 - 0 - - - - - 57 - 80 - - - - true - - - - - - - - 4 - 4 - 0 - 0 - - - - - 57 - 80 - - - - true - - - - - - - - - - - - - false - - - - 209 - 178 - - - - true - - - - - - - 9 - - - 6 - - - - - - 54 - 60 - - - - - 16777215 - 60 - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 3 - - - 0 - - - - - - 35 - 0 - - - - - - - - - 35 - 0 - - - - - - - - - - - Qt::Vertical - - - QSizePolicy::Expanding - - - - 46 - 28 - - - - - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 3 - - - 3 - - - - - - 4 - 4 - 0 - 0 - - - - - 57 - 80 - - - - true - - - - - - - - 4 - 4 - 0 - 0 - - - - - 57 - 80 - - - - true - - - - - - - - - - QFrame::HLine - - - QFrame::Sunken - - - Qt::Horizontal - - - - - - - 0 - - - 6 - - - - - - 16 - 28 - - - - - 28 - 16777215 - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 2 - - - 0 - - - - - - 0 - 20 - - - - - 20 - 16777215 - - - - - - - - - - - - - - - 16 - 28 - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 2 - - - 0 - - - - - - 0 - 20 - - - - - - - Qt::AlignCenter - - - - - - - - - - - 16 - 28 - - - - true - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 2 - - - 0 - - - - - - 0 - 20 - - - - - - - Qt::AlignCenter - - - - - - - - - - - - - - - - - 0 - - - 6 - - - - - Qt::Horizontal - - - - 20 - 20 - - - - - - - - - 0 - 0 - 0 - 0 - - - - - - - - - 0 - 0 - 0 - - - - - - - 221 - 223 - 228 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 85 - 85 - 85 - - - - - - - 199 - 199 - 199 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 74 - 131 - 83 - - - - - - - 0 - 0 - 0 - - - - - - - 103 - 141 - 178 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 238 - - - - - - - 82 - 24 - 139 - - - - - - - 232 - 232 - 232 - - - - - - - - - 0 - 0 - 0 - - - - - - - 221 - 223 - 228 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 85 - 85 - 85 - - - - - - - 199 - 199 - 199 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 74 - 131 - 83 - - - - - - - 0 - 0 - 0 - - - - - - - 103 - 141 - 178 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 238 - - - - - - - 82 - 24 - 139 - - - - - - - 232 - 232 - 232 - - - - - - - - - 128 - 128 - 128 - - - - - - - 221 - 223 - 228 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 85 - 85 - 85 - - - - - - - 199 - 199 - 199 - - - - - - - 199 - 199 - 199 - - - - - - - 255 - 255 - 255 - - - - - - - 128 - 128 - 128 - - - - - - - 74 - 131 - 83 - - - - - - - 74 - 131 - 83 - - - - - - - 0 - 0 - 0 - - - - - - - 86 - 117 - 148 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 238 - - - - - - - 82 - 24 - 139 - - - - - - - 232 - 232 - 232 - - - - - - - - true - - - - - - - 9 - - - 6 - - - - - - 0 - 0 - 0 - 0 - - - - - 104 - 114 - - - - true - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 4 - - - 4 - - - - - true - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 4 - - - 0 - - - - - - 0 - 30 - - - - - 16777215 - 30 - - - - true - - - - - - - - - - - 0 - 25 - - - - - 16777215 - 25 - - - - true - - - - - - - - - - 0 - - - 4 - - - - - - 0 - 26 - - - - - 16777215 - 26 - - - - - - - - - 0 - 26 - - - - - 16777215 - 26 - - - - - - - - - - - - - - 0 - 0 - 0 - 0 - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 9 - - - 6 - - - - - - 57 - 80 - - - - - 57 - 80 - - - - - - - - - - - - 57 - 80 - - - - - 57 - 80 - - - - - - - - - - - - 57 - 80 - - - - - 57 - 80 - - - - - - - - - - - - 57 - 80 - - - - - 57 - 80 - - - - - - - - - - - - 57 - 80 - - - - - 57 - 80 - - - - - - - - - - - - - - 0 - - - 6 - - - - - - 95 - 16 - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 2 - - - 0 - - - - - - 12 - - - - Qt::AlignCenter - - - - - - - - - - - 95 - 36 - - - - true - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 3 - - - 0 - - - - - - 15 - 75 - true - - - - Qt::AlignCenter - - - - - - - - - - - - - - - Qt::Horizontal - - - - 20 - 20 - - - - - - diff --git a/src/gui/qt/mainwindowimpl.cpp b/src/gui/qt/mainwindowimpl.cpp index 946e83e9..8fa98e17 100755 --- a/src/gui/qt/mainwindowimpl.cpp +++ b/src/gui/qt/mainwindowimpl.cpp @@ -22,7 +22,9 @@ #include "newgamedialogimpl.h" #include "aboutpokerthimpl.h" #include "settingsdialogimpl.h" + #include "startsplash.h" +#include "mycardspixmaplabel.h" #include "handinterface.h" #include "playerinterface.h" @@ -64,6 +66,110 @@ mainWindowImpl::mainWindowImpl(QMainWindow *parent, const char *name) setupUi(this); + //pixmapCardsLabel erstellen und ins Layout einfügen! + MyCardsPixmapLabel *pixmapLabel_cardBoard0 = new MyCardsPixmapLabel(frame_5); + pixmapLabel_cardBoard0->setObjectName(QString::fromUtf8("pixmapLabel_cardBoard0")); + pixmapLabel_cardBoard0->setMinimumSize(QSize(57, 80)); + pixmapLabel_cardBoard0->setMaximumSize(QSize(57, 80)); + gridLayout2->addWidget(pixmapLabel_cardBoard0, 0, 0, 1, 1); + + MyCardsPixmapLabel *pixmapLabel_cardBoard1 = new MyCardsPixmapLabel(frame_5); + pixmapLabel_cardBoard1->setObjectName(QString::fromUtf8("pixmapLabel_cardBoard1")); + pixmapLabel_cardBoard1->setMinimumSize(QSize(57, 80)); + pixmapLabel_cardBoard1->setMaximumSize(QSize(57, 80)); + gridLayout2->addWidget(pixmapLabel_cardBoard1, 0, 1, 1, 1); + + MyCardsPixmapLabel *pixmapLabel_cardBoard2 = new MyCardsPixmapLabel(frame_5); + pixmapLabel_cardBoard2->setObjectName(QString::fromUtf8("pixmapLabel_cardBoard2")); + pixmapLabel_cardBoard2->setMinimumSize(QSize(57, 80)); + pixmapLabel_cardBoard2->setMaximumSize(QSize(57, 80)); + gridLayout2->addWidget(pixmapLabel_cardBoard2, 0, 2, 1, 1); + + MyCardsPixmapLabel *pixmapLabel_cardBoard3 = new MyCardsPixmapLabel(frame_5); + pixmapLabel_cardBoard3->setObjectName(QString::fromUtf8("pixmapLabel_cardBoard3")); + pixmapLabel_cardBoard3->setMinimumSize(QSize(57, 80)); + pixmapLabel_cardBoard3->setMaximumSize(QSize(57, 80)); + gridLayout2->addWidget(pixmapLabel_cardBoard3, 0, 3, 1, 1); + + MyCardsPixmapLabel *pixmapLabel_cardBoard4 = new MyCardsPixmapLabel(frame_5); + pixmapLabel_cardBoard4->setObjectName(QString::fromUtf8("pixmapLabel_cardBoard4")); + pixmapLabel_cardBoard4->setMinimumSize(QSize(57, 80)); + pixmapLabel_cardBoard4->setMaximumSize(QSize(57, 80)); + gridLayout2->addWidget(pixmapLabel_cardBoard4, 0, 4, 1, 1); + + MyCardsPixmapLabel *pixmapLabel_card0a = new MyCardsPixmapLabel(frame5); + pixmapLabel_card0a->setObjectName(QString::fromUtf8("pixmapLabel_card0a")); +// QSizePolicy sizePolicy2(static_cast(4), static_cast(4)); +// sizePolicy2.setHorizontalStretch(0); +// sizePolicy2.setVerticalStretch(0); +// sizePolicy2.setHeightForWidth(pixmapLabel_card0a->sizePolicy().hasHeightForWidth()); +// pixmapLabel_card0a->setSizePolicy(sizePolicy2); + pixmapLabel_card0a->setMinimumSize(QSize(80, 112)); + pixmapLabel_card0a->setMaximumSize(QSize(80, 112)); + pixmapLabel_card0a->setScaledContents(true); + gridLayout35->addWidget(pixmapLabel_card0a, 0, 0, 1, 1); + + MyCardsPixmapLabel *pixmapLabel_card0b = new MyCardsPixmapLabel(frame5); + pixmapLabel_card0b->setObjectName(QString::fromUtf8("pixmapLabel_card0b")); +// QSizePolicy sizePolicy3(static_cast(4), static_cast(4)); +// sizePolicy3.setHorizontalStretch(0); +// sizePolicy3.setVerticalStretch(0); +// sizePolicy3.setHeightForWidth(pixmapLabel_card0b->sizePolicy().hasHeightForWidth()); +// pixmapLabel_card0b->setSizePolicy(sizePolicy3); + pixmapLabel_card0b->setMinimumSize(QSize(80, 112)); + pixmapLabel_card0b->setMaximumSize(QSize(80, 112)); + pixmapLabel_card0b->setScaledContents(true); + gridLayout35->addWidget(pixmapLabel_card0b, 0, 1, 1, 1); + + MyCardsPixmapLabel *pixmapLabel_card1a = new MyCardsPixmapLabel(frame8_2_2_2_5); + pixmapLabel_card1a->setObjectName(QString::fromUtf8("pixmapLabel_card1a")); + pixmapLabel_card1a->setMinimumSize(QSize(57, 80)); + pixmapLabel_card1a->setMaximumSize(QSize(57, 80)); + gridLayout9->addWidget(pixmapLabel_card1a, 0, 0, 1, 1); + + MyCardsPixmapLabel *pixmapLabel_card1b = new MyCardsPixmapLabel(frame8_2_2_2_5); + pixmapLabel_card1b->setObjectName(QString::fromUtf8("pixmapLabel_card1b")); + pixmapLabel_card1b->setMinimumSize(QSize(57, 80)); + pixmapLabel_card1b->setMaximumSize(QSize(57, 80)); + gridLayout9->addWidget(pixmapLabel_card1b, 0, 1, 1, 1); + + MyCardsPixmapLabel *pixmapLabel_card2a = new MyCardsPixmapLabel(frame8_2_2_2_4); + pixmapLabel_card2a->setObjectName(QString::fromUtf8("pixmapLabel_card2a")); + pixmapLabel_card2a->setMinimumSize(QSize(57, 80)); + pixmapLabel_card2a->setMaximumSize(QSize(57, 80)); + gridLayout15->addWidget(pixmapLabel_card2a, 0, 0, 1, 1); + + MyCardsPixmapLabel *pixmapLabel_card2b = new MyCardsPixmapLabel(frame8_2_2_2_4); + pixmapLabel_card2b->setObjectName(QString::fromUtf8("pixmapLabel_card2b")); + pixmapLabel_card2b->setMinimumSize(QSize(57, 80)); + pixmapLabel_card2b->setMaximumSize(QSize(57, 80)); + gridLayout15->addWidget(pixmapLabel_card2b, 0, 1, 1, 1); + + MyCardsPixmapLabel *pixmapLabel_card3a = new MyCardsPixmapLabel(frame8_2_2_2_6); + pixmapLabel_card3a->setObjectName(QString::fromUtf8("pixmapLabel_card3a")); + pixmapLabel_card3a->setMinimumSize(QSize(57, 80)); + pixmapLabel_card3a->setMaximumSize(QSize(57, 80)); + gridLayout21->addWidget(pixmapLabel_card3a, 0, 0, 1, 1); + + MyCardsPixmapLabel *pixmapLabel_card3b = new MyCardsPixmapLabel(frame8_2_2_2_6); + pixmapLabel_card3b->setObjectName(QString::fromUtf8("pixmapLabel_card3b")); + pixmapLabel_card3b->setMinimumSize(QSize(57, 80)); + pixmapLabel_card3b->setMaximumSize(QSize(57, 80)); + gridLayout21->addWidget(pixmapLabel_card3b, 0, 1, 1, 1); + + MyCardsPixmapLabel *pixmapLabel_card4a = new MyCardsPixmapLabel(frame8_2_2_2_7); + pixmapLabel_card4a->setObjectName(QString::fromUtf8("pixmapLabel_card4a")); + pixmapLabel_card4a->setMinimumSize(QSize(57, 80)); + pixmapLabel_card4a->setMaximumSize(QSize(57, 80)); + gridLayout27->addWidget(pixmapLabel_card4a, 0, 0, 1, 1); + + MyCardsPixmapLabel *pixmapLabel_card4b = new MyCardsPixmapLabel(frame8_2_2_2_7); + pixmapLabel_card4b->setObjectName(QString::fromUtf8("pixmapLabel_card4b")); + pixmapLabel_card4b->setMinimumSize(QSize(57, 80)); + pixmapLabel_card4b->setMaximumSize(QSize(57, 80)); + gridLayout27->addWidget(pixmapLabel_card4b, 0, 1, 1, 1); + + int i; //Toolbox verstecken? @@ -427,11 +533,8 @@ void mainWindowImpl::refreshButton() { void mainWindowImpl::refreshPlayerName() { -// cout << "refresh" << endl; int i; - for (i=1; isetTitle(QString::fromStdString(actualHand->getPlayerArray()[i]->getMyName())); - } - + for (i=1; isetTitle(QString::fromStdString(actualHand->getPlayerArray()[i]->getMyName())); } } void mainWindowImpl::refreshAction() { @@ -622,6 +725,8 @@ void mainWindowImpl::dealHoleCards() { } } + //Groupbox repaint() hline-bug?; + refreshGroupbox(); } void mainWindowImpl::dealFlopCards0() { dealFlopCards0Timer->start(dealCardsSpeed*2); } @@ -1157,9 +1262,57 @@ void mainWindowImpl::postRiverRunAnimation3() { tempPalette.setColor(QPalette::Window, highlight); groupBoxArray[i]->setPalette(tempPalette); actionLabelArray[i]->setText("

- Winner -

"); + + //nicht gewonnene Karten ausblenden + int j; + + //index 0 testen + bool index0 = TRUE; + for(j=0; j<=6; j++) { + if ((actualHand->getPlayerArray()[i]->getMyBestHandPosition())[j] == 0 ) { index0 = FALSE; } + } + if (index0) { holeCardsArray[i][0]->startFadeOut(); } + //index 1 testen + bool index1 = TRUE; + for(j=0; j<=6; j++) { + if ((actualHand->getPlayerArray()[i]->getMyBestHandPosition())[j] == 1 ) { index1 = FALSE; } + } + if (index1) { holeCardsArray[i][1]->startFadeOut(); } + //index 2 testen + bool index2 = TRUE; + for(j=0; j<=6; j++) { + if ((actualHand->getPlayerArray()[i]->getMyBestHandPosition())[j] == 2 ) { index2 = FALSE; } + } + if (index2) { boardCardsArray[0]->startFadeOut(); } + //index 3 testen + bool index3 = TRUE; + for(j=0; j<=6; j++) { + if ((actualHand->getPlayerArray()[i]->getMyBestHandPosition())[j] == 3 ) { index3 = FALSE; } + } + if (index3) { boardCardsArray[1]->startFadeOut(); } + //index 4 testen + bool index4 = TRUE; + for(j=0; j<=6; j++) { + if ((actualHand->getPlayerArray()[i]->getMyBestHandPosition())[j] == 4 ) { index4 = FALSE; } + } + if (index4) { boardCardsArray[2]->startFadeOut(); } + //index 5 testen + bool index5 = TRUE; + for(j=0; j<=6; j++) { + if ((actualHand->getPlayerArray()[i]->getMyBestHandPosition())[j] == 5 ) { index5 = FALSE; } + } + if (index5) { boardCardsArray[3]->startFadeOut(); } + //index 6 testen + bool index6 = TRUE; + for(j=0; j<=6; j++) { + if ((actualHand->getPlayerArray()[i]->getMyBestHandPosition())[j] == 6 ) { index6 = FALSE; } + } + if (index6) { boardCardsArray[4]->startFadeOut(); } + } } + //Hintergrundfarbe der userWidgets anpassen; userWidgetsBackgroudColor(); diff --git a/src/gui/qt/mainwindowimpl.h b/src/gui/qt/mainwindowimpl.h index 03ca36d0..9706653f 100755 --- a/src/gui/qt/mainwindowimpl.h +++ b/src/gui/qt/mainwindowimpl.h @@ -36,6 +36,8 @@ class BoardInterface; class HandInterface; class PlayerInterface; +class MyCardsPixmapLabel; + class QColor; @@ -201,8 +203,8 @@ private: QLabel *setLabelArray[5]; QLabel *actionLabelArray[5]; QGroupBox *groupBoxArray[5]; - QLabel *boardCardsArray[5]; - QLabel *holeCardsArray[5][2]; + MyCardsPixmapLabel *boardCardsArray[5]; + MyCardsPixmapLabel *holeCardsArray[5][2]; int maxQuantityPlayers;