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

Browse Source
This commit is contained in:
doitux
2007-01-27 08:49:52 +00:00
parent f9becff196
commit f83394a2f0
3 changed files with 118 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/qt/mainwindowimpl.cpp
+12 -13
View File
@@ -72,7 +72,7 @@ mainWindowImpl::mainWindowImpl(QMainWindow *parent, const char *name)
//Toolbox verstecken? //Toolbox verstecken?
if (!myConfig->readConfigInt("ShowToolBox", 1)) { groupBox_tools->hide(); } if (!myConfig->readConfigInt("ShowToolBox", 1)) { groupBox_tools->hide(); }
if (myConfig->readConfigInt("ShowIntro", 1)) { paintStartSplash(); } // if (myConfig->readConfigInt("ShowIntro", 1)) { paintStartSplash(); }
pushButton_raise->setDisabled(TRUE); pushButton_raise->setDisabled(TRUE);
@@ -1257,7 +1257,7 @@ void mainWindowImpl::postRiverRunAnimation6() {
void mainWindowImpl::startSplashNextFrame() { void mainWindowImpl::startSplashNextFrame() {
++startSplashFrameNo; ++startSplashFrameNo;
update(); this->update();
} }
@@ -1397,15 +1397,7 @@ void mainWindowImpl::breakButtonClicked() {
} }
} }
void mainWindowImpl::paintStartSplash() { void mainWindowImpl::paintStartSplash() { startSplashAnimationTimer->start(40); }
// std::cout << this->geometry().x() << this->geometry().y() << "\n";
/*
StartSplash *mySplash = new StartSplash(this);
mySplash->show();*/
}
void mainWindowImpl::keyPressEvent ( QKeyEvent * event ) { void mainWindowImpl::keyPressEvent ( QKeyEvent * event ) {
@@ -1426,10 +1418,17 @@ void mainWindowImpl::keyPressEvent ( QKeyEvent * event ) {
} }
void mainWindowImpl::paintEvent(QPaintEvent* event) { void mainWindowImpl::paintEvent(QPaintEvent* event) {
QMainWindow::paintEvent(event); QMainWindow::paintEvent(event);
StartSplash startSplashPainter(this);
startSplashPainter.setFrameNo(startSplashFrameNo);
/* do your overlay painting here */ /* do your overlay painting here */
// StartSplash startSplashPainter(this, startSplashFrameNo);
// startSplashPainter.animateStartSplash();
QPainter p(this);
p.setBrush(QColor(0,0,0));
p.drawRect(200,200,399,249);
} }
src/gui/qt/startsplash/startsplash.cpp
+99 -106
View File
@@ -19,10 +19,10 @@
***************************************************************************/ ***************************************************************************/
#include "startsplash.h" #include "startsplash.h"
StartSplash::StartSplash(QMainWindow *parent) StartSplash::StartSplash(QMainWindow *parent, int frameNumber)
: QPainter() : QPainter(parent), frameNo(frameNumber)
{ {
frameNo += 51;
opacityCounter = 13; opacityCounter = 13;
opacity = 1.0; opacity = 1.0;
@@ -33,7 +33,7 @@ StartSplash::~StartSplash()
{ {
} }
void StartSplash::aanimateStartSplash() { void StartSplash::animateStartSplash() {
QFont welcomeFont("Century Schoolbook L",29); QFont welcomeFont("Century Schoolbook L",29);
QFont haveFont("Andy MT",30); QFont haveFont("Andy MT",30);
@@ -44,192 +44,185 @@ void StartSplash::aanimateStartSplash() {
setBrush(QColor(40,80,46)); setBrush(QColor(40,80,46));
drawRect(0,0,399,249); drawRect(0,0,399,249);
} }
/*
if(frameNo >= 65 && frameNo < 68) { if(frameNo >= 65 && frameNo < 68) {
painter.setBrush(QColor(40,80,46)); setBrush(QColor(40,80,46));
painter.drawRect(0,0,399,249); drawRect(0,0,399,249);
painter.setRenderHint(QPainter::Antialiasing, TRUE); setRenderHint(QPainter::Antialiasing, TRUE);
painter.setFont(welcomeFont); setFont(welcomeFont);
painter.setPen(QColor(255,255,255)); setPen(QColor(255,255,255));
painter.drawText(48,30,300,40,4,"W"); drawText(48,30,300,40,4,"W");
} }
if(frameNo >= 68 && frameNo < 71) { if(frameNo >= 68 && frameNo < 71) {
painter.setBrush(QColor(40,80,46)); setBrush(QColor(40,80,46));
painter.drawRect(0,0,399,249); drawRect(0,0,399,249);
painter.setRenderHint(QPainter::Antialiasing, TRUE); setRenderHint(QPainter::Antialiasing, TRUE);
painter.setFont(welcomeFont); setFont(welcomeFont);
painter.setPen(QColor(255,255,255)); setPen(QColor(255,255,255));
painter.drawText(48,30,300,40,4,"We"); drawText(48,30,300,40,4,"We");
} }
if(frameNo >= 71 && frameNo < 74) { if(frameNo >= 71 && frameNo < 74) {
painter.setBrush(QColor(40,80,46)); setBrush(QColor(40,80,46));
painter.drawRect(0,0,399,249); drawRect(0,0,399,249);
painter.setRenderHint(QPainter::Antialiasing, TRUE); setRenderHint(QPainter::Antialiasing, TRUE);
painter.setFont(welcomeFont); setFont(welcomeFont);
painter.setPen(QColor(255,255,255)); setPen(QColor(255,255,255));
painter.drawText(48,30,300,40,4,"Wel"); drawText(48,30,300,40,4,"Wel");
} }
if(frameNo >= 74 && frameNo < 77) { if(frameNo >= 74 && frameNo < 77) {
painter.setBrush(QColor(40,80,46)); setBrush(QColor(40,80,46));
painter.drawRect(0,0,399,249); drawRect(0,0,399,249);
painter.setRenderHint(QPainter::Antialiasing, TRUE); setRenderHint(QPainter::Antialiasing, TRUE);
painter.setFont(welcomeFont); setFont(welcomeFont);
painter.setPen(QColor(255,255,255)); setPen(QColor(255,255,255));
painter.drawText(48,30,300,40,4,"Welc"); drawText(48,30,300,40,4,"Welc");
} }
if(frameNo >= 77 && frameNo < 80) { if(frameNo >= 77 && frameNo < 80) {
painter.setBrush(QColor(40,80,46)); setBrush(QColor(40,80,46));
painter.drawRect(0,0,399,249); drawRect(0,0,399,249);
painter.setRenderHint(QPainter::Antialiasing, TRUE); setRenderHint(QPainter::Antialiasing, TRUE);
painter.setFont(welcomeFont); setFont(welcomeFont);
painter.setPen(QColor(255,255,255)); setPen(QColor(255,255,255));
painter.drawText(48,30,300,40,4,"Welco"); drawText(48,30,300,40,4,"Welco");
} }
if(frameNo >= 80 && frameNo < 83) { if(frameNo >= 80 && frameNo < 83) {
painter.setBrush(QColor(40,80,46)); setBrush(QColor(40,80,46));
painter.drawRect(0,0,399,249); drawRect(0,0,399,249);
painter.setRenderHint(QPainter::Antialiasing, TRUE); setRenderHint(QPainter::Antialiasing, TRUE);
painter.setFont(welcomeFont); setFont(welcomeFont);
painter.setPen(QColor(255,255,255)); setPen(QColor(255,255,255));
painter.drawText(48,30,300,40,4,"Welcom"); drawText(48,30,300,40,4,"Welcom");
} }
if(frameNo >= 83 && frameNo < 92) { if(frameNo >= 83 && frameNo < 92) {
painter.setBrush(QColor(40,80,46)); setBrush(QColor(40,80,46));
painter.drawRect(0,0,399,249); drawRect(0,0,399,249);
painter.setRenderHint(QPainter::Antialiasing, TRUE); setRenderHint(QPainter::Antialiasing, TRUE);
painter.setFont(welcomeFont); setFont(welcomeFont);
painter.setPen(QColor(255,255,255)); setPen(QColor(255,255,255));
painter.drawText(48,30,300,40,4,"Welcome"); drawText(48,30,300,40,4,"Welcome");
} }
if(frameNo >= 92 && frameNo < 95) { if(frameNo >= 92 && frameNo < 95) {
painter.setBrush(QColor(40,80,46)); setBrush(QColor(40,80,46));
painter.drawRect(0,0,399,249); drawRect(0,0,399,249);
painter.setRenderHint(QPainter::Antialiasing, TRUE); setRenderHint(QPainter::Antialiasing, TRUE);
painter.setFont(welcomeFont); setFont(welcomeFont);
painter.setPen(QColor(255,255,255)); setPen(QColor(255,255,255));
painter.drawText(48,30,300,40,4,"Welcome t"); drawText(48,30,300,40,4,"Welcome t");
} }
if(frameNo >= 95 && frameNo < 120 ) { if(frameNo >= 95 && frameNo < 120 ) {
painter.setBrush(QColor(40,80,46)); setBrush(QColor(40,80,46));
painter.drawRect(0,0,399,249); drawRect(0,0,399,249);
painter.setRenderHint(QPainter::Antialiasing, TRUE); setRenderHint(QPainter::Antialiasing, TRUE);
painter.setFont(welcomeFont); setFont(welcomeFont);
painter.setPen(QColor(255,255,255)); setPen(QColor(255,255,255));
painter.drawText(48,30,300,40,4,"Welcome to"); drawText(48,30,300,40,4,"Welcome to");
} }
if(frameNo >= 120 && frameNo < 132) { if(frameNo >= 120 && frameNo < 132) {
//
painter.setBrush(QColor(40,80,46));
painter.drawRect(0,0,399,249);
painter.setRenderHint(QPainter::Antialiasing, TRUE); setBrush(QColor(40,80,46));
painter.setFont(welcomeFont); drawRect(0,0,399,249);
painter.setPen(QColor(255,255,255));
painter.drawText(48,30,300,40,4,"Welcome to"); setRenderHint(QPainter::Antialiasing, TRUE);
setFont(welcomeFont);
setPen(QColor(255,255,255));
drawText(48,30,300,40,4,"Welcome to");
--opacityCounter; --opacityCounter;
// std::cout << opacity << " " << opacityCounter << "\n"; // std::cout << opacity << " " << opacityCounter << "\n";
opacity = 1.0/opacityCounter; opacity = 1.0/opacityCounter;
// std::cout << opacity << "\n"; // std::cout << opacity << "\n";
painter.setOpacity(opacity); setOpacity(opacity);
painter.drawPixmap(130,85,140,100,logo); drawPixmap(130,85,140,100,logo);
} }
if(frameNo >= 132 && frameNo < 145) { if(frameNo >= 132 && frameNo < 145) {
//
painter.setBrush(QColor(40,80,46));
painter.drawRect(0,0,399,249);
painter.setRenderHint(QPainter::Antialiasing, TRUE); setBrush(QColor(40,80,46));
painter.setFont(welcomeFont); drawRect(0,0,399,249);
painter.setPen(QColor(255,255,255));
painter.drawText(48,30,300,40,4,"Welcome to");
painter.drawPixmap(130,85,140,100,logo); setRenderHint(QPainter::Antialiasing, TRUE);
setFont(welcomeFont);
setPen(QColor(255,255,255));
drawText(48,30,300,40,4,"Welcome to");
drawPixmap(130,85,140,100,logo);
} }
if(frameNo >= 145 && frameNo < 185) { if(frameNo >= 145 && frameNo < 185) {
//
painter.setBrush(QColor(40,80,46));
painter.drawRect(0,0,399,249);
painter.setRenderHint(QPainter::Antialiasing, TRUE); setBrush(QColor(40,80,46));
painter.setFont(welcomeFont); drawRect(0,0,399,249);
painter.setPen(QColor(255,255,255));
painter.drawText(48,30,300,40,4,"Welcome to");
painter.drawPixmap(130,85,140,100,logo); setRenderHint(QPainter::Antialiasing, TRUE);
setFont(welcomeFont);
setPen(QColor(255,255,255));
drawText(48,30,300,40,4,"Welcome to");
painter.setFont(haveFont); drawPixmap(130,85,140,100,logo);
painter.setPen(QColor(255,255,255));
painter.drawText(48,190,300,40,4,"Have a lot of fun!"); setFont(haveFont);
setPen(QColor(255,255,255));
drawText(48,190,300,40,4,"Have a lot of fun!");
} }
if(frameNo >= 185 && frameNo < 260) { if(frameNo >= 185 && frameNo < 260) {
//
painter.setBrush(QColor(40,80,46));
painter.drawRect(0,0,399,249);
painter.setRenderHint(QPainter::Antialiasing, TRUE); setBrush(QColor(40,80,46));
painter.setFont(welcomeFont); drawRect(0,0,399,249);
painter.setPen(QColor(255,255,255));
painter.drawText(48,30,300,40,4,"Welcome to");
painter.drawPixmap(130,85,140,100,logo); setRenderHint(QPainter::Antialiasing, TRUE);
setFont(welcomeFont);
setPen(QColor(255,255,255));
drawText(48,30,300,40,4,"Welcome to");
painter.setFont(haveFont); drawPixmap(130,85,140,100,logo);
painter.setPen(QColor(255,255,255));
painter.drawText(48,190,300,40,4,"Have a lot of fun! ;-)"); setFont(haveFont);
setPen(QColor(255,255,255));
drawText(48,190,300,40,4,"Have a lot of fun! ;-)");
} }
if(frameNo >= 260 ) { this->hide(); }*/ // if(frameNo >= 260 ) { this->hide(); }
} }
/*
void StartSplash::mousePressEvent ( QMouseEvent * event ) {
if(event) this->hide();
}*/
src/gui/qt/startsplash/startsplash.h
+5 -6
View File
@@ -19,18 +19,17 @@
class StartSplash : public QPainter class StartSplash : public QPainter
{ {
Q_OBJECT
public:
StartSplash(QMainWindow *parent = 0);
~StartSplash(); public:
StartSplash(QMainWindow *parent = 0, int =0);
virtual ~StartSplash();
int frameNo; int frameNo;
int opacityCounter; int opacityCounter;
qreal opacity; qreal opacity;
void aanimateStartSplash(); void animateStartSplash();
void setFrameNo(int frameNumber) { frameNo = frameNumber+51; }
}; };
#endif #endif