From: Rikhard Kuutti Date: Tue, 30 Mar 2010 08:05:56 +0000 (+0300) Subject: Added welcome dialog X-Git-Tag: v0.2-RC1~34^2~10 X-Git-Url: http://vcs.maemo.org/git/?a=commitdiff_plain;h=1f36faa8f303b72492ad538f571f1fa07b5151fe;p=speedfreak Added welcome dialog --- diff --git a/Client/mainwindow.cpp b/Client/mainwindow.cpp index 91ca8a4..09ce0f0 100644 --- a/Client/mainwindow.cpp +++ b/Client/mainwindow.cpp @@ -20,6 +20,9 @@ MainWindow::MainWindow(QWidget *parent) : creditsDialog = new CreditsDialog; routeSaveDialog = new RouteSaveDialog; + + welcomeDialog = new WelcomeDialog; + welcomeDialog->show(); } MainWindow::~MainWindow() diff --git a/Client/mainwindow.h b/Client/mainwindow.h index 3299ba8..ae7c0d0 100644 --- a/Client/mainwindow.h +++ b/Client/mainwindow.h @@ -12,6 +12,7 @@ #include #include "creditsdialog.h" #include "routesavedialog.h" +#include "welcomedialog.h" namespace Ui { class MainWindow; @@ -25,6 +26,7 @@ public: CreditsDialog *creditsDialog; RouteSaveDialog *routeSaveDialog; + WelcomeDialog *welcomeDialog; protected: void changeEvent(QEvent *e); diff --git a/Client/speedfreak.pro b/Client/speedfreak.pro index 3d53060..78c2985 100644 --- a/Client/speedfreak.pro +++ b/Client/speedfreak.pro @@ -7,13 +7,16 @@ SOURCES += main.cpp \ mainwindow.cpp \ creditsdialog.cpp \ routedialog.cpp \ - routesavedialog.cpp + routesavedialog.cpp \ + welcomedialog.cpp HEADERS += mainwindow.h \ creditsdialog.h \ routedialog.h \ - routesavedialog.h + routesavedialog.h \ + welcomedialog.h FORMS += mainwindow.ui \ creditsdialog.ui \ routedialog.ui \ - routesavedialog.ui + routesavedialog.ui \ + welcomedialog.ui RESOURCES += graphics.qrc diff --git a/Client/start.gif b/Client/start.gif new file mode 100644 index 0000000..fd8ba3d Binary files /dev/null and b/Client/start.gif differ diff --git a/Client/welcomedialog.cpp b/Client/welcomedialog.cpp new file mode 100644 index 0000000..a84c618 --- /dev/null +++ b/Client/welcomedialog.cpp @@ -0,0 +1,50 @@ +/* + * Welcome dialog + * + * @author Toni Jussila + * @copyright (c) 2010 Speed Freak team + * @license http://opensource.org/licenses/gpl-license.php GNU Public License + */ + +#include "welcomedialog.h" +#include "ui_welcomedialog.h" + +WelcomeDialog::WelcomeDialog(QWidget *parent) : + QDialog(parent), + ui(new Ui::WelcomeDialog) +{ + ui->setupUi(this); + this->setWindowTitle(" "); + movie = new QMovie("start.gif"); + ui->labelWelcome->setMovie(movie); + movie->start(); + connect(movie,SIGNAL(frameChanged(int)),this,SLOT(stop(int))); +} + +WelcomeDialog::~WelcomeDialog() +{ + delete ui; + movie->stop(); + delete movie; +} + +void WelcomeDialog::changeEvent(QEvent *e) +{ + QDialog::changeEvent(e); + switch (e->type()) { + case QEvent::LanguageChange: + ui->retranslateUi(this); + break; + default: + break; + } +} + +void WelcomeDialog::stop(int currentFrame) +{ + if (currentFrame == 21) + { + movie->stop(); + this->close(); + } +} diff --git a/Client/welcomedialog.h b/Client/welcomedialog.h new file mode 100644 index 0000000..788a7ad --- /dev/null +++ b/Client/welcomedialog.h @@ -0,0 +1,36 @@ +/* + * Welcome dialog + * + * @author Toni Jussila + * @copyright (c) 2010 Speed Freak team + * @license http://opensource.org/licenses/gpl-license.php GNU Public License + */ + +#ifndef WELCOMEDIALOG_H +#define WELCOMEDIALOG_H + +#include +#include + +namespace Ui { + class WelcomeDialog; +} + +class WelcomeDialog : public QDialog { + Q_OBJECT +public: + WelcomeDialog(QWidget *parent = 0); + ~WelcomeDialog(); + +protected: + void changeEvent(QEvent *e); + +private: + Ui::WelcomeDialog *ui; + QMovie *movie; + +private slots: + void stop(int currentFrame); +}; + +#endif // WELCOMEDIALOG_H diff --git a/Client/welcomedialog.ui b/Client/welcomedialog.ui new file mode 100644 index 0000000..9aea76b --- /dev/null +++ b/Client/welcomedialog.ui @@ -0,0 +1,35 @@ + + + WelcomeDialog + + + + 0 + 0 + 800 + 480 + + + + + + + + + 10 + 10 + 781 + 461 + + + + TextLabel + + + Qt::AlignCenter + + + + + +