Added instructions dialog

diff --git a/Client/instructionsdialog.cpp b/Client/instructionsdialog.cpp
new file mode 100644 (file)
index 0000000..6946f27
--- /dev/null
+++ b/Client/instructionsdialog.cpp
@@ -0,0 +1,27 @@
+#include "instructionsdialog.h"
+#include "ui_instructionsdialog.h"
+
+InstructionsDialog::InstructionsDialog(QWidget *parent) :
+    QDialog(parent),
+    ui(new Ui::InstructionsDialog)
+{
+    ui->setupUi(this);
+    this->setWindowTitle("Help");
+}
+
+InstructionsDialog::~InstructionsDialog()
+{
+    delete ui;
+}
+
+void InstructionsDialog::changeEvent(QEvent *e)
+{
+    QDialog::changeEvent(e);
+    switch (e->type()) {
+    case QEvent::LanguageChange:
+        ui->retranslateUi(this);
+        break;
+    default:
+        break;
+    }
+}

diff --git a/Client/instructionsdialog.h b/Client/instructionsdialog.h
new file mode 100644 (file)
index 0000000..ecdf6a6
--- /dev/null
+++ b/Client/instructionsdialog.h
@@ -0,0 +1,23 @@
+#ifndef INSTRUCTIONSDIALOG_H
+#define INSTRUCTIONSDIALOG_H
+
+#include <QDialog>
+
+namespace Ui {
+    class InstructionsDialog;
+}
+
+class InstructionsDialog : public QDialog {
+    Q_OBJECT
+public:
+    InstructionsDialog(QWidget *parent = 0);
+    ~InstructionsDialog();
+
+protected:
+    void changeEvent(QEvent *e);
+
+private:
+    Ui::InstructionsDialog *ui;
+};
+
+#endif // INSTRUCTIONSDIALOG_H

diff --git a/Client/instructionsdialog.ui b/Client/instructionsdialog.ui
new file mode 100644 (file)
index 0000000..7306ca7
--- /dev/null
+++ b/Client/instructionsdialog.ui
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>InstructionsDialog</class>
+ <widget class="QDialog" name="InstructionsDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>800</width>
+    <height>480</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Dialog</string>
+  </property>
+  <widget class="QLabel" name="label">
+   <property name="geometry">
+    <rect>
+     <x>20</x>
+     <y>30</y>
+     <width>751</width>
+     <height>311</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin pellentesque imperdiet risus. Morbi nec ligula eget magna posuere consectetur nec cursus turpis. In hac habitasse platea dictumst. Nunc egestas porta dictum. Phasellus feugiat, libero nec vulputate rhoncus, mi massa tincidunt lorem, accumsan auctor leo nulla nec mauris. Pellentesque mauris lectus, sodales at viverra in, gravida sit amet lacus. Duis et lectus eu turpis luctus rutrum. Aenean blandit orci at odio placerat luctus. Nulla volutpat lacinia sem egestas auctor. Etiam quis dui purus, ac feugiat tortor. Integer et auctor risus. Aliquam purus dolor, placerat in consequat vitae, ullamcorper a augue. In hac habitasse platea dictumst. Cras convallis, ipsum eget tincidunt laoreet, tellus enim ullamcorper velit, vitae suscipit ipsum orci nec nisi. Aenean leo turpis, lacinia eget venenatis id, ullamcorper blandit tortor. Proin pharetra sem nec sapien luctus dictum accumsan mi vehicula. Mauris in diam massa. Nam a arcu sit amet metus adipiscing fringilla et vitae arcu.
+
+Maecenas fringilla ornare elit, laoreet malesuada nisi semper non. Aenean ut leo erat, a pulvinar leo. Fusce at felis libero, non molestie quam. Duis nec est a est posuere iaculis. Integer lectus augue, iaculis et tristique ut, elementum ut ante. Morbi hendrerit commodo mauris, a pretium lorem malesuada nec. Donec convallis tristique libero non commodo. Integer ornare dolor at leo consequat sed aliquet dolor dapibus. Praesent eget libero est. Donec elit erat, facilisis et semper et, rutrum vel tortor. Vivamus luctus laoreet arcu, in hendrerit sapien feugiat non. </string>
+   </property>
+   <property name="wordWrap">
+    <bool>true</bool>
+   </property>
+  </widget>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

diff --git a/Client/mainwindow.cpp b/Client/mainwindow.cpp
index 09ce0f0..0419a60 100644 (file)
--- a/Client/mainwindow.cpp
+++ b/Client/mainwindow.cpp
@@ -11,6 +11,7 @@
 
 #include <QDesktopServices>
 #include <QUrl>
 
 #include <QDesktopServices>
 #include <QUrl>

+#include <QSettings>

 
 MainWindow::MainWindow(QWidget *parent) :
     QMainWindow(parent),
 
 MainWindow::MainWindow(QWidget *parent) :
     QMainWindow(parent),

@@ -18,6 +19,10 @@ MainWindow::MainWindow(QWidget *parent) :
 {
     ui->setupUi(this);
 
 {
     ui->setupUi(this);
 

+    QCoreApplication::setOrganizationName("Fudeco Oy");
+    QCoreApplication::setOrganizationDomain("fudeco.com");
+    QCoreApplication::setApplicationName("Speed Freak");
+

     creditsDialog = new CreditsDialog;
     routeSaveDialog = new RouteSaveDialog;
 
     creditsDialog = new CreditsDialog;
     routeSaveDialog = new RouteSaveDialog;
 

diff --git a/Client/speedfreak.pro b/Client/speedfreak.pro
index 78c2985..20a323d 100644 (file)
--- a/Client/speedfreak.pro
+++ b/Client/speedfreak.pro
@@ -8,15 +8,18 @@ SOURCES += main.cpp \
     creditsdialog.cpp \
     routedialog.cpp \
     routesavedialog.cpp \
     creditsdialog.cpp \
     routedialog.cpp \
     routesavedialog.cpp \

-    welcomedialog.cpp
+    welcomedialog.cpp \
+    instructionsdialog.cpp

 HEADERS += mainwindow.h \
     creditsdialog.h \
     routedialog.h \
     routesavedialog.h \
 HEADERS += mainwindow.h \
     creditsdialog.h \
     routedialog.h \
     routesavedialog.h \

-    welcomedialog.h
+    welcomedialog.h \
+    instructionsdialog.h

 FORMS += mainwindow.ui \
     creditsdialog.ui \
     routedialog.ui \
     routesavedialog.ui \
 FORMS += mainwindow.ui \
     creditsdialog.ui \
     routedialog.ui \
     routesavedialog.ui \

-    welcomedialog.ui
+    welcomedialog.ui \
+    instructionsdialog.ui

 RESOURCES += graphics.qrc
 RESOURCES += graphics.qrc

diff --git a/Client/welcomedialog.cpp b/Client/welcomedialog.cpp
index a84c618..eea387b 100644 (file)
--- a/Client/welcomedialog.cpp
+++ b/Client/welcomedialog.cpp
@@ -8,6 +8,9 @@
 
 #include "welcomedialog.h"
 #include "ui_welcomedialog.h"
 
 #include "welcomedialog.h"
 #include "ui_welcomedialog.h"

+#include "instructionsdialog.h"
+
+#include <QSettings>

 
 WelcomeDialog::WelcomeDialog(QWidget *parent) :
     QDialog(parent),
 
 WelcomeDialog::WelcomeDialog(QWidget *parent) :
     QDialog(parent),

@@ -46,5 +49,16 @@ void WelcomeDialog::stop(int currentFrame)
     {
         movie->stop();
         this->close();
     {
         movie->stop();
         this->close();

+
+        // Show instructionsDialog if this is
+        // the first time the application is run
+        QSettings settings;
+        bool firstRunGone = settings.value("firstRunGone").toBool();
+        if (!firstRunGone) {
+            // show instructions
+            InstructionsDialog *instructionsDialog = new InstructionsDialog;
+            instructionsDialog->show();
+            settings.setValue("firstRunGone", true);
+        }

     }
 }
     }
 }