Welcome dialog added.

Merge branch 'feature/welcome'

Conflicts:
	Client/UI.pro
	Client/carmainwindow.cpp

diff --git a/Client/UI.pro b/Client/UI.pro
index ef6e351..88304df 100644 (file)
--- a/Client/UI.pro
+++ b/Client/UI.pro
@@ -22,7 +22,9 @@ SOURCES += main.cpp \
     xmlwriter.cpp \
     xmlreader.cpp \
     httpclient.cpp \
-    categorylist.cpp
+    categorylist.cpp \
+    welcomedialog.cpp
+
 HEADERS += carmainwindow.h \
     resultdialog.h \
     stringlistmodel.h \
@@ -35,9 +37,12 @@ HEADERS += carmainwindow.h \
     xmlwriter.h \
     xmlreader.h \
     httpclient.h \
-    categorylist.h
+    categorylist.h \
+    welcomedialog.h
+
 FORMS += carmainwindow.ui \
     resultdialog.ui \
     measuredialog.ui \
     loginwindow.ui \
-    registration.ui
+    registration.ui \
+    welcomedialog.ui

diff --git a/Client/carmainwindow.cpp b/Client/carmainwindow.cpp
index 19e6d09..0a8c350 100644 (file)
--- a/Client/carmainwindow.cpp
+++ b/Client/carmainwindow.cpp
@@ -22,6 +22,9 @@ CarMainWindow::CarMainWindow(QWidget *parent):QMainWindow(parent), ui(new Ui::Ca
     ui->tabWidget->setCurrentWidget(this->ui->StartTab);
     //result = new ResultDialog();
     //measure = new MeasureDialog();
+    welcomeDialog = new WelcomeDialog();
+    welcomeDialog->show();
+
     xmlreader = new XmlReader();
 
     initComboBoxStartTabUnits();
@@ -68,6 +71,7 @@ CarMainWindow::~CarMainWindow()
     delete xmlwriter;
     delete manager;
     delete categorylist;
+    delete welcomeDialog;
 }
 
 /**

diff --git a/Client/carmainwindow.h b/Client/carmainwindow.h
index 2c29c9a..8c7afa8 100644 (file)
--- a/Client/carmainwindow.h
+++ b/Client/carmainwindow.h
@@ -27,6 +27,7 @@
 #include <QDebug>
 //#include "resultdialog.h"
 //#include "measuredialog.h"
+#include "welcomedialog.h"
 #include "loginwindow.h"
 #include "registration.h"
 #include "xmlwriter.h"
@@ -59,6 +60,7 @@ private:
     Ui::CarMainWindow *ui;
     //ResultDialog *result;
     //MeasureDialog *measure;
+    WelcomeDialog *welcomeDialog;
     XmlReader *xmlreader;
     XmlWriter *xmlwriter;
     QNetworkAccessManager* manager;

diff --git a/Client/start.gif b/Client/start.gif
new file mode 100644 (file)
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 (file)
index 0000000..a84c618
--- /dev/null
+++ b/Client/welcomedialog.cpp
@@ -0,0 +1,50 @@
+/*
+ * Welcome dialog
+ *
+ * @author     Toni Jussila <toni.jussila@fudeco.com>
+ * @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 (file)
index 0000000..788a7ad
--- /dev/null
+++ b/Client/welcomedialog.h
@@ -0,0 +1,36 @@
+/*
+ * Welcome dialog
+ *
+ * @author     Toni Jussila <toni.jussila@fudeco.com>
+ * @copyright  (c) 2010 Speed Freak team
+ * @license    http://opensource.org/licenses/gpl-license.php GNU Public License
+ */
+
+#ifndef WELCOMEDIALOG_H
+#define WELCOMEDIALOG_H
+
+#include <QDialog>
+#include <QMovie>
+
+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 (file)
index 0000000..9aea76b
--- /dev/null
+++ b/Client/welcomedialog.ui
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>WelcomeDialog</class>
+ <widget class="QDialog" name="WelcomeDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>800</width>
+    <height>480</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string/>
+  </property>
+  <widget class="QLabel" name="labelWelcome">
+   <property name="geometry">
+    <rect>
+     <x>10</x>
+     <y>10</y>
+     <width>781</width>
+     <height>461</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>TextLabel</string>
+   </property>
+   <property name="alignment">
+    <set>Qt::AlignCenter</set>
+   </property>
+  </widget>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>