From 0cf73d2bc984b92000ce38c4df9af1df411196a1 Mon Sep 17 00:00:00 2001 From: doitux Date: Sun, 8 Jun 2008 10:50:08 +0000 Subject: [PATCH] next startwindow steps --- data/gfx/gui/misc/welcomepokerth.png | Bin 0 -> 22887 bytes src/gui/qt/gametable/gametableimpl.cpp | 26 +- .../qt/gametable/startsplash/startsplash.cpp | 257 +----------------- .../qt/gametable/startsplash/startsplash.h | 20 +- src/gui/qt/guiwrapper.cpp | 6 +- src/gui/qt/guiwrapper.h | 2 + src/pokerth.cpp | 18 +- 7 files changed, 38 insertions(+), 291 deletions(-) create mode 100644 data/gfx/gui/misc/welcomepokerth.png diff --git a/data/gfx/gui/misc/welcomepokerth.png b/data/gfx/gui/misc/welcomepokerth.png new file mode 100644 index 0000000000000000000000000000000000000000..3d015a584683f07b59fa90da9c5f2ee509bef4fc GIT binary patch literal 22887 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 literal 0 HcmV?d00001 diff --git a/src/gui/qt/gametable/gametableimpl.cpp b/src/gui/qt/gametable/gametableimpl.cpp index 64290ba5..de78c6de 100755 --- a/src/gui/qt/gametable/gametableimpl.cpp +++ b/src/gui/qt/gametable/gametableimpl.cpp @@ -111,9 +111,9 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent) } //Intro abspielen? - if (myConfig->readConfigInt("ShowIntro")) { -// label_logo->hide(); - QTimer::singleShot(100, this, SLOT( paintStartSplash() )); } +// if (myConfig->readConfigInt("ShowIntro")) { +// // label_logo->hide(); +// QTimer::singleShot(100, this, SLOT( paintStartSplash() )); } // userWidgetsArray init userWidgetsArray[0] = pushButton_BetRaise; @@ -3045,16 +3045,16 @@ void gameTableImpl::breakButtonClicked() { void gameTableImpl::paintStartSplash() { - StartSplash *mySplash = new StartSplash(this, myConfig); - -#ifdef __APPLE__ - int offset = 305; -#else - int offset = 237; -#endif - mySplash->setGeometry(this->pos().x()+offset,this->pos().y()+210,400,250); -// mySplash->setWindowFlags(Qt::SplashScreen); - mySplash->show(); +// StartSplash *mySplash = new StartSplash(this, myConfig); +// +// #ifdef __APPLE__ +// int offset = 305; +// #else +// int offset = 237; +// #endif +// mySplash->setGeometry(this->pos().x()+offset,this->pos().y()+210,400,250); +// // mySplash->setWindowFlags(Qt::SplashScreen); +// mySplash->show(); } diff --git a/src/gui/qt/gametable/startsplash/startsplash.cpp b/src/gui/qt/gametable/startsplash/startsplash.cpp index 9b5fa0a0..05daeb87 100755 --- a/src/gui/qt/gametable/startsplash/startsplash.cpp +++ b/src/gui/qt/gametable/startsplash/startsplash.cpp @@ -19,25 +19,10 @@ ***************************************************************************/ #include "startsplash.h" -#include "configfile.h" -#include "gametableimpl.h" - -StartSplash::StartSplash(gameTableImpl *parent, ConfigFile *c) - : QSplashScreen(parent), myW(parent), myConfig(c) +StartSplash::StartSplash(QPixmap &p) + : QSplashScreen(p) { - - myAppDataPath = QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str()); - - logo = myAppDataPath+"gfx/gui/misc/logoChip3D.png"; - - - frameNo = 52; - opacityCounter = 13; - opacity = 1.0; - - QTimer *timer = new QTimer; - connect(timer, SIGNAL(timeout()), this, SLOT(nextAnimationFrame())); - timer->start(40); + QTimer::singleShot(3000, this, SLOT(closeThis())); } @@ -45,238 +30,4 @@ StartSplash::~StartSplash() { } -void StartSplash::nextAnimationFrame() { - - ++frameNo; - update(); - } - -void StartSplash::paintEvent(QPaintEvent * /*event*/) { - - QPainter painter(this); - -#ifdef _WIN32 - QFont welcomeFont; - welcomeFont.setFamily("Times New Roman"); - welcomeFont.setPixelSize(42); -#else -#ifdef __APPLE__ - QFont welcomeFont; - welcomeFont.setFamily("Century Schoolbook L"); - welcomeFont.setPixelSize(42); -#else - QFont welcomeFont; - welcomeFont.setFamily("Century Schoolbook L"); - welcomeFont.setPixelSize(35); -#endif -#endif -#ifdef __APPLE__ - QFont haveFont; - haveFont.setFamily("Century Schoolbook L"); - haveFont.setPixelSize(24); -#else - QFont haveFont; - haveFont.setFamily("Century Schoolbook L"); - haveFont.setPixelSize(24); -#endif - - QFont versionFont; - versionFont.setFamily("Nimbus Sans L"); - versionFont.setPixelSize(12); - - if(frameNo >= 52 && frameNo < 55) { - - painter.setBrush(QColor(35,71,0)); - painter.drawRect(0,0,399,249); - } - - if(frameNo >= 55 && frameNo < 57) { - - painter.setBrush(QColor(35,71,0)); - painter.drawRect(0,0,399,249); - - - painter.setRenderHint(QPainter::Antialiasing, TRUE); - painter.setFont(welcomeFont); - painter.setPen(QColor(255,255,255)); - painter.drawText(48,27,300,45,4,"W"); - - } - - if(frameNo >= 57 && frameNo < 59) { - - painter.setBrush(QColor(35,71,0)); - painter.drawRect(0,0,399,249); - - painter.setRenderHint(QPainter::Antialiasing, TRUE); - painter.setFont(welcomeFont); - painter.setPen(QColor(255,255,255)); - painter.drawText(48,27,300,45,4,"We"); - - } - - if(frameNo >= 59 && frameNo < 61) { - - painter.setBrush(QColor(35,71,0)); - painter.drawRect(0,0,399,249); - - painter.setRenderHint(QPainter::Antialiasing, TRUE); - painter.setFont(welcomeFont); - painter.setPen(QColor(255,255,255)); - painter.drawText(48,27,300,45,4,"Wel"); - - } - - if(frameNo >= 61 && frameNo < 63) { - - painter.setBrush(QColor(35,71,0)); - painter.drawRect(0,0,399,249); - - painter.setRenderHint(QPainter::Antialiasing, TRUE); - painter.setFont(welcomeFont); - painter.setPen(QColor(255,255,255)); - painter.drawText(48,27,300,45,4,"Welc"); - - } - - if(frameNo >= 63 && frameNo < 65) { - - painter.setBrush(QColor(35,71,0)); - painter.drawRect(0,0,399,249); - - painter.setRenderHint(QPainter::Antialiasing, TRUE); - painter.setFont(welcomeFont); - painter.setPen(QColor(255,255,255)); - painter.drawText(48,27,300,45,4,"Welco"); - - } - - if(frameNo >= 65 && frameNo < 67) { - - painter.setBrush(QColor(35,71,0)); - painter.drawRect(0,0,399,249); - - painter.setRenderHint(QPainter::Antialiasing, TRUE); - painter.setFont(welcomeFont); - painter.setPen(QColor(255,255,255)); - painter.drawText(48,27,300,45,4,"Welcom"); - - } - - if(frameNo >= 67 && frameNo < 72) { - - painter.setBrush(QColor(35,71,0)); - painter.drawRect(0,0,399,249); - - painter.setRenderHint(QPainter::Antialiasing, TRUE); - painter.setFont(welcomeFont); - painter.setPen(QColor(255,255,255)); - painter.drawText(48,27,300,45,4,"Welcome"); - - } - - if(frameNo >= 72 && frameNo < 74) { - - painter.setBrush(QColor(35,71,0)); - painter.drawRect(0,0,399,249); - - painter.setRenderHint(QPainter::Antialiasing, TRUE); - painter.setFont(welcomeFont); - painter.setPen(QColor(255,255,255)); - painter.drawText(48,27,300,45,4,"Welcome t"); - - } - - if(frameNo >= 74 && frameNo < 79 ) { - - painter.setBrush(QColor(35,71,0)); - painter.drawRect(0,0,399,249); - - painter.setRenderHint(QPainter::Antialiasing, TRUE); - painter.setFont(welcomeFont); - painter.setPen(QColor(255,255,255)); - painter.drawText(48,27,300,45,4,"Welcome to"); - - } - - if(frameNo >= 79 && frameNo < 91) { -// - painter.setBrush(QColor(35,71,0)); - painter.drawRect(0,0,399,249); - - painter.setRenderHint(QPainter::Antialiasing, TRUE); - painter.setFont(welcomeFont); - painter.setPen(QColor(255,255,255)); - painter.drawText(48,27,300,45,4,"Welcome to"); - - --opacityCounter; -// std::cout << opacity << " " << opacityCounter << "\n"; - opacity = 1.0/opacityCounter; -// std::cout << opacity << "\n"; - painter.setOpacity(opacity); - painter.drawPixmap(150,85,100,100,logo); - - } - - if(frameNo >= 91 && frameNo < 106) { -// - painter.setBrush(QColor(35,71,0)); - painter.drawRect(0,0,399,249); - - painter.setRenderHint(QPainter::Antialiasing, TRUE); - painter.setFont(welcomeFont); - painter.setPen(QColor(255,255,255)); - painter.drawText(48,27,300,45,4,"Welcome to"); - - painter.drawPixmap(150,85,100,100,logo); - - } - - if(frameNo >= 106 && frameNo < 136) { -// - painter.setBrush(QColor(35,71,0)); - painter.drawRect(0,0,399,249); - - painter.setRenderHint(QPainter::Antialiasing, TRUE); - painter.setFont(welcomeFont); - painter.setPen(QColor(255,255,255)); - painter.drawText(48,27,300,45,4,"Welcome to"); - - painter.drawPixmap(150,85,100,100,logo); - - painter.setFont(haveFont); - painter.setPen(QColor(255,255,255)); - painter.drawText(3,190,390,40,4,"Have a lot of fun!"); - - } - - if(frameNo >= 136 && frameNo < 190) { -// - painter.setBrush(QColor(35,71,0)); - painter.drawRect(0,0,399,249); - - painter.setRenderHint(QPainter::Antialiasing, TRUE); - painter.setFont(welcomeFont); - painter.setPen(QColor(255,255,255)); - painter.drawText(48,27,300,45,4,"Welcome to"); - - painter.drawPixmap(150,85,100,100,logo); - - painter.setFont(haveFont); - painter.setPen(QColor(255,255,255)); - painter.drawText(3,190,390,40,4,"Have a lot of fun! ;-)"); - - } - - //even draw version number - painter.setOpacity(1.0); - painter.setFont(versionFont); - painter.setPen(QColor(153,213,0)); - painter.drawText(309,227,100,20,4,QString("Version %1").arg(POKERTH_BETA_RELEASE_STRING)); - painter.setOpacity(opacity); - - if(frameNo >=190) { - this->close(); - } -} - +void StartSplash::closeThis() { this->close(); } diff --git a/src/gui/qt/gametable/startsplash/startsplash.h b/src/gui/qt/gametable/startsplash/startsplash.h index 8e5d6514..9f189eba 100755 --- a/src/gui/qt/gametable/startsplash/startsplash.h +++ b/src/gui/qt/gametable/startsplash/startsplash.h @@ -15,32 +15,18 @@ #include #include -class gameTableImpl; -class ConfigFile; + class StartSplash : public QSplashScreen { Q_OBJECT public: - StartSplash(gameTableImpl *, ConfigFile*); + StartSplash(QPixmap& p); ~StartSplash(); - - int frameNo; - int opacityCounter; - qreal opacity; - - void paintEvent(QPaintEvent * event); public slots: - void nextAnimationFrame(); - -private: - - gameTableImpl *myW; - QString myAppDataPath; - QPixmap logo; - ConfigFile *myConfig; + void closeThis(); }; diff --git a/src/gui/qt/guiwrapper.cpp b/src/gui/qt/guiwrapper.cpp index 9f1039d3..be5869eb 100644 --- a/src/gui/qt/guiwrapper.cpp +++ b/src/gui/qt/guiwrapper.cpp @@ -23,18 +23,22 @@ #include "log.h" #include "chat.h" #include "gametableimpl.h" +#include "startwindowimpl.h" #include "configfile.h" using namespace std; -GuiWrapper::GuiWrapper(ConfigFile *c) : myLog(0), myW(0), myConfig(c) +GuiWrapper::GuiWrapper(ConfigFile *c) : myLog(NULL), myW(NULL), myConfig(c), myStartWindow(NULL) { myW = new gameTableImpl(myConfig); myW->show(); myLog = new Log(myW, myConfig); + + myStartWindow = new startWindowImpl(myW, myConfig); +// myStartWindow-> show(); } diff --git a/src/gui/qt/guiwrapper.h b/src/gui/qt/guiwrapper.h index 9851f2ce..82cdb226 100644 --- a/src/gui/qt/guiwrapper.h +++ b/src/gui/qt/guiwrapper.h @@ -26,6 +26,7 @@ class Session; class gameTableImpl; +class startWindowImpl; class Log; class Chat; class ConfigFile; @@ -146,6 +147,7 @@ private: Chat *myChat; gameTableImpl *myW; ConfigFile *myConfig; + startWindowImpl *myStartWindow; }; diff --git a/src/pokerth.cpp b/src/pokerth.cpp index ff1e2604..32cd0c7f 100755 --- a/src/pokerth.cpp +++ b/src/pokerth.cpp @@ -18,18 +18,17 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -/////// can be removed for non-qt-guis //////////// #include #ifdef __APPLE__ #include #endif -/////////////////////////////////////////////////// #include "session.h" #include "guiwrapper.h" -#include "startwindowimpl.h" #include "configfile.h" +#include "startsplash.h" +#include "game_defs.h" #include #include @@ -105,6 +104,12 @@ int main( int argc, char **argv ) // #endif a.setStyleSheet("QApplication, QWidget, QDialog { " + font1String + " font-size: 12px; }"); #endif + + QPixmap *pixmap = new QPixmap(myAppDataPath + "gfx/gui/misc/welcomepokerth.png"); + StartSplash splash(*pixmap); + splash.show(); + splash.showMessage(QString("Version %1").arg(POKERTH_BETA_RELEASE_STRING), 0x0042, QColor(153,213,0)); + //Set translations QTranslator qtTranslator; qtTranslator.load(QString(myAppDataPath +"translations/qt_") + QString::fromStdString(myConfig->readConfigString("Language"))); @@ -134,12 +139,11 @@ int main( int argc, char **argv ) session->init(); // TODO handle error myGuiInterface->setSession(session); } - -// boost::shared_ptr myStartWindow(new startWindowImpl(myGuiInterface.get(), myConfig)); - + int retVal = a.exec(); - + curl_global_cleanup(); socket_cleanup(); return retVal; + }