Added help and setting dialog's fonts changed bigger.

diff --git a/Client/Graphics/measuringDialog.png b/Client/Graphics/measuringDialog.png
new file mode 100644 (file)
index 0000000..e03072e
Binary files /dev/null and b/Client/Graphics/measuringDialog.png differ

diff --git a/Client/graphics.qrc b/Client/graphics.qrc
index 8bb1603..cf5b651 100644 (file)
--- a/Client/graphics.qrc
+++ b/Client/graphics.qrc
@@ -20,5 +20,6 @@
         <file>Graphics/route_stop.png</file>
         <file>Graphics/trophy_gold_refresh.png</file>
         <file>Graphics/sf_2.png</file>
+       <file>Graphics/measuringDialog.png</file>
     </qresource>
 </RCC>

diff --git a/Client/helpaccelerationdialog.cpp b/Client/helpaccelerationdialog.cpp
new file mode 100644 (file)
index 0000000..940e022
--- /dev/null
+++ b/Client/helpaccelerationdialog.cpp
@@ -0,0 +1,134 @@
+#include "helpaccelerationdialog.h"
+#include "ui_helpaccelerationdialog.h"
+
+HelpAccelerationDialog::HelpAccelerationDialog(QWidget *parent) :
+    QDialog(parent),
+    ui(new Ui::HelpAccelerationDialog)
+{
+    ui->setupUi(this);
+    pageCounter = 0;
+    ui->labelLast->hide();
+    ui->pushButtonLast->hide();
+
+    ui->labelInfo2->hide();
+    ui->labelStartPic->hide();
+
+    ui->labelInfo3->hide();
+    ui->labelMeasurePic->hide();
+
+    ui->labelInfo4->hide();
+}
+
+HelpAccelerationDialog::~HelpAccelerationDialog()
+{
+    delete ui;
+}
+
+void HelpAccelerationDialog::changeEvent(QEvent *e)
+{
+    QDialog::changeEvent(e);
+    switch (e->type()) {
+    case QEvent::LanguageChange:
+        ui->retranslateUi(this);
+        break;
+    default:
+        break;
+    }
+}
+
+void HelpAccelerationDialog::on_pushButtonNext_clicked()
+{
+    pageCounter ++;
+
+    if(pageCounter == 1)
+    {
+        ui->labelCalibratePic->hide();
+        ui->labelInfo1->hide();
+
+        ui->labelLast->show();
+        ui->pushButtonLast->show();
+        ui->labelInfo2->show();
+        ui->labelStartPic->show();
+    }
+
+    if(pageCounter == 2)
+    {
+        ui->labelCalibratePic->hide();
+        ui->labelInfo1->hide();
+        ui->labelInfo2->hide();
+        ui->labelStartPic->hide();
+
+        ui->labelLast->show();
+        ui->pushButtonLast->show();
+        ui->labelInfo3->show();
+        ui->labelMeasurePic->show();
+    }
+
+    if(pageCounter == 3)
+    {
+        ui->labelCalibratePic->hide();
+        ui->labelInfo1->hide();
+        ui->labelInfo2->hide();
+        ui->labelStartPic->hide();
+
+        //ui->labelLast->hide();
+        //ui->pushButtonLast->hide();
+        ui->labelInfo3->hide();
+        ui->labelMeasurePic->hide();
+
+        ui->pushButtonNext->hide();
+        ui->labelNext->hide();
+
+        ui->labelInfo4->show();
+    }
+}
+
+void HelpAccelerationDialog::on_pushButtonLast_clicked()
+{
+    pageCounter --;
+
+    if(pageCounter == 0)
+    {
+        ui->labelCalibratePic->show();
+        ui->labelInfo1->show();
+        ui->labelStartPic->hide();
+        ui->labelLast->hide();
+        ui->pushButtonLast->hide();
+        ui->labelInfo2->hide();
+        ui->labelInfo3->hide();
+        ui->labelMeasurePic->hide();
+    }
+
+    if(pageCounter == 1)
+    {
+        ui->labelCalibratePic->hide();
+        ui->labelInfo1->hide();
+        ui->labelInfo3->hide();
+        ui->labelMeasurePic->hide();
+
+        ui->labelLast->show();
+        ui->pushButtonLast->show();
+        ui->labelInfo2->show();
+        ui->labelStartPic->show();
+    }
+
+    if(pageCounter == 2)
+    {
+        ui->labelCalibratePic->hide();
+        ui->labelInfo1->hide();
+        ui->labelInfo3->hide();
+        ui->labelMeasurePic->hide();
+        ui->labelInfo4->hide();
+
+        ui->pushButtonNext->show();
+        ui->labelNext->show();
+
+        ui->labelLast->show();
+        ui->pushButtonLast->show();
+        ui->labelInfo2->hide();
+        ui->labelStartPic->hide();
+
+        ui->labelInfo3->show();
+        ui->labelMeasurePic->show();
+    }
+}

diff --git a/Client/helpaccelerationdialog.h b/Client/helpaccelerationdialog.h
new file mode 100644 (file)
index 0000000..d18092b
--- /dev/null
+++ b/Client/helpaccelerationdialog.h
@@ -0,0 +1,28 @@
+#ifndef HELPACCELERATIONDIALOG_H
+#define HELPACCELERATIONDIALOG_H
+
+#include <QDialog>
+
+namespace Ui {
+    class HelpAccelerationDialog;
+}
+
+class HelpAccelerationDialog : public QDialog {
+    Q_OBJECT
+public:
+    HelpAccelerationDialog(QWidget *parent = 0);
+    ~HelpAccelerationDialog();
+
+protected:
+    void changeEvent(QEvent *e);
+
+private:
+    Ui::HelpAccelerationDialog *ui;
+    int pageCounter;
+
+private slots:
+    void on_pushButtonLast_clicked();
+    void on_pushButtonNext_clicked();
+};
+
+#endif // HELPACCELERATIONDIALOG_H

diff --git a/Client/helpaccelerationdialog.ui b/Client/helpaccelerationdialog.ui
new file mode 100644 (file)
index 0000000..ead0753
--- /dev/null
+++ b/Client/helpaccelerationdialog.ui
@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>HelpAccelerationDialog</class>
+ <widget class="QDialog" name="HelpAccelerationDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>800</width>
+    <height>380</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Help for acceleration</string>
+  </property>
+  <widget class="QLabel" name="labelInfo1">
+   <property name="geometry">
+    <rect>
+     <x>40</x>
+     <y>10</y>
+     <width>441</width>
+     <height>341</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>1. First you need to calibrate device 
+for reliable results. To calibrate the 
+device, please mount the device securely 
+e.g. to your cars dashboard. The device 
+must be oriented so that the device's 
+backside is pointing towards your driving 
+direction. Then press calibrate button and 
+wait while calibrating is done. After that 
+do not change device position.</string>
+   </property>
+  </widget>
+  <widget class="QLabel" name="labelCalibratePic">
+   <property name="geometry">
+    <rect>
+     <x>570</x>
+     <y>130</y>
+     <width>81</width>
+     <height>81</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string/>
+   </property>
+   <property name="pixmap">
+    <pixmap resource="graphics.qrc">:/new/prefix1/Graphics/Speedometer_calibrate.png</pixmap>
+   </property>
+   <property name="scaledContents">
+    <bool>true</bool>
+   </property>
+  </widget>
+  <widget class="QPushButton" name="pushButtonNext">
+   <property name="geometry">
+    <rect>
+     <x>670</x>
+     <y>320</y>
+     <width>81</width>
+     <height>61</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>&gt;</string>
+   </property>
+  </widget>
+  <widget class="QLabel" name="labelNext">
+   <property name="geometry">
+    <rect>
+     <x>690</x>
+     <y>290</y>
+     <width>62</width>
+     <height>17</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>Next</string>
+   </property>
+  </widget>
+  <widget class="QPushButton" name="pushButtonLast">
+   <property name="geometry">
+    <rect>
+     <x>540</x>
+     <y>320</y>
+     <width>81</width>
+     <height>61</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>&lt;</string>
+   </property>
+  </widget>
+  <widget class="QLabel" name="labelLast">
+   <property name="geometry">
+    <rect>
+     <x>560</x>
+     <y>290</y>
+     <width>62</width>
+     <height>17</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>Last</string>
+   </property>
+  </widget>
+  <widget class="QLabel" name="labelInfo2">
+   <property name="geometry">
+    <rect>
+     <x>40</x>
+     <y>-10</y>
+     <width>441</width>
+     <height>341</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>2. Choose category from list 
+which you want to complete. 
+
+3. Press start button for starting measuring. 
+Measuring view opens and then all you need to do is to accelerate 
+your car to the speed you have choosed.</string>
+   </property>
+  </widget>
+  <widget class="QLabel" name="labelStartPic">
+   <property name="geometry">
+    <rect>
+     <x>570</x>
+     <y>130</y>
+     <width>81</width>
+     <height>81</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string/>
+   </property>
+   <property name="pixmap">
+    <pixmap resource="graphics.qrc">:/new/prefix1/Graphics/Speedometer_start.png</pixmap>
+   </property>
+   <property name="scaledContents">
+    <bool>true</bool>
+   </property>
+  </widget>
+  <widget class="QLabel" name="labelInfo3">
+   <property name="geometry">
+    <rect>
+     <x>40</x>
+     <y>0</y>
+     <width>441</width>
+     <height>341</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>4. Measuring view shows your current 
+speed and time elapsed. When you 
+have reached the target speed view 
+automatic switch to the result view.
+
+If you want to stop measuring before the 
+target speed has been reached push Abort 
+button and you'll get back to the acceleration 
+start view.</string>
+   </property>
+  </widget>
+  <widget class="QLabel" name="labelMeasurePic">
+   <property name="geometry">
+    <rect>
+     <x>520</x>
+     <y>50</y>
+     <width>241</width>
+     <height>211</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string/>
+   </property>
+   <property name="pixmap">
+    <pixmap resource="graphics.qrc">:/new/prefix1/Graphics/measuringDialog.png</pixmap>
+   </property>
+   <property name="scaledContents">
+    <bool>true</bool>
+   </property>
+  </widget>
+  <widget class="QLabel" name="labelInfo4">
+   <property name="geometry">
+    <rect>
+     <x>40</x>
+     <y>10</y>
+     <width>441</width>
+     <height>341</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>5. Result view shows information about 
+your acceleration.
+
+6. Push Send to server -button for sending 
+your time to the server. You have to 
+be log in for that.
+
+7. Push New run -button for start 
+measuring at beginning.</string>
+   </property>
+  </widget>
+ </widget>
+ <resources>
+  <include location="graphics.qrc"/>
+ </resources>
+ <connections/>
+</ui>

diff --git a/Client/helpdialog.cpp b/Client/helpdialog.cpp
new file mode 100644 (file)
index 0000000..92ffcc2
--- /dev/null
+++ b/Client/helpdialog.cpp
@@ -0,0 +1,67 @@
+#include "helpdialog.h"
+#include "ui_helpdialog.h"
+
+HelpDialog::HelpDialog(QWidget *parent) :
+    QDialog(parent),
+    ui(new Ui::HelpDialog)
+{
+    ui->setupUi(this);
+    helpResultsDialog = NULL;
+    helpAccelerationDialog = NULL;
+    helpRoutingDialog = NULL;
+    creditsDialog = NULL;
+}
+
+HelpDialog::~HelpDialog()
+{
+    delete ui;
+}
+
+void HelpDialog::changeEvent(QEvent *e)
+{
+    QDialog::changeEvent(e);
+    switch (e->type()) {
+    case QEvent::LanguageChange:
+        ui->retranslateUi(this);
+        break;
+    default:
+        break;
+    }
+}
+
+
+void HelpDialog::on_pushButtonHelpResults_clicked()
+{
+    if(!helpResultsDialog)
+    {
+        helpResultsDialog = new HelpResultsDialog;
+    }
+    helpResultsDialog->show();
+}
+
+void HelpDialog::on_pushButtonHelpAccelerate_clicked()
+{
+    if(!helpAccelerationDialog)
+    {
+        helpAccelerationDialog = new HelpAccelerationDialog;
+    }
+    helpAccelerationDialog->show();
+}
+
+void HelpDialog::on_pushButtonHelpRoute_clicked()
+{
+    if(!helpRoutingDialog)
+    {
+        helpRoutingDialog = new HelpRoutingDialog;
+    }
+    helpRoutingDialog->show();
+}
+
+void HelpDialog::on_pushButtonCredits_clicked()
+{
+    if(!creditsDialog)
+    {
+        creditsDialog = new CreditsDialog;
+    }
+    creditsDialog->show();
+}

diff --git a/Client/helpdialog.h b/Client/helpdialog.h
new file mode 100644 (file)
index 0000000..2348d5c
--- /dev/null
+++ b/Client/helpdialog.h
@@ -0,0 +1,39 @@
+#ifndef HELPDIALOG_H
+#define HELPDIALOG_H
+
+#include <QDialog>
+#include <helpresultsdialog.h>
+#include <helpaccelerationdialog.h>
+#include <helproutingdialog.h>
+#include "creditsdialog.h"
+
+namespace Ui {
+    class HelpDialog;
+}
+
+class HelpDialog : public QDialog {
+    Q_OBJECT
+public:
+    HelpDialog(QWidget *parent = 0);
+    ~HelpDialog();
+
+   HelpResultsDialog *helpResultsDialog;
+   HelpAccelerationDialog *helpAccelerationDialog;
+   HelpRoutingDialog *helpRoutingDialog;
+   CreditsDialog *creditsDialog;
+
+protected:
+    void changeEvent(QEvent *e);
+
+private:
+    Ui::HelpDialog *ui;
+
+
+private slots:
+    void on_pushButtonCredits_clicked();
+    void on_pushButtonHelpRoute_clicked();
+    void on_pushButtonHelpAccelerate_clicked();
+    void on_pushButtonHelpResults_clicked();
+};
+
+#endif // HELPDIALOG_H

diff --git a/Client/helpdialog.ui b/Client/helpdialog.ui
new file mode 100644 (file)
index 0000000..89c3412
--- /dev/null
+++ b/Client/helpdialog.ui
@@ -0,0 +1,249 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>HelpDialog</class>
+ <widget class="QDialog" name="HelpDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>800</width>
+    <height>380</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Help for speed freak application</string>
+  </property>
+  <property name="autoFillBackground">
+   <bool>false</bool>
+  </property>
+  <widget class="QLabel" name="labelHelpAcc">
+   <property name="geometry">
+    <rect>
+     <x>230</x>
+     <y>30</y>
+     <width>231</width>
+     <height>41</height>
+    </rect>
+   </property>
+   <property name="font">
+    <font>
+     <family>Bitstream Charter</family>
+    </font>
+   </property>
+   <property name="text">
+    <string>Help for acceleration</string>
+   </property>
+  </widget>
+  <widget class="QPushButton" name="pushButtonHelpAccelerate">
+   <property name="geometry">
+    <rect>
+     <x>140</x>
+     <y>20</y>
+     <width>61</width>
+     <height>61</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string/>
+   </property>
+   <property name="icon">
+    <iconset resource="graphics.qrc">
+     <normaloff>:/new/prefix1/Graphics/Speedometer.png</normaloff>
+     <normalon>:/new/prefix1/Graphics/Speedometer2.png</normalon>
+     <disabledon>:/new/prefix1/Graphics/Speedometer2.png</disabledon>
+     <activeon>:/new/prefix1/Graphics/Speedometer2.png</activeon>
+     <selectedon>:/new/prefix1/Graphics/Speedometer2.png</selectedon>:/new/prefix1/Graphics/Speedometer.png</iconset>
+   </property>
+   <property name="iconSize">
+    <size>
+     <width>60</width>
+     <height>60</height>
+    </size>
+   </property>
+  </widget>
+  <widget class="QPushButton" name="pushButtonHelpRoute">
+   <property name="geometry">
+    <rect>
+     <x>140</x>
+     <y>90</y>
+     <width>61</width>
+     <height>61</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string/>
+   </property>
+   <property name="icon">
+    <iconset resource="graphics.qrc">
+     <normaloff>:/new/prefix1/Graphics/route.png</normaloff>:/new/prefix1/Graphics/route.png</iconset>
+   </property>
+   <property name="iconSize">
+    <size>
+     <width>60</width>
+     <height>60</height>
+    </size>
+   </property>
+  </widget>
+  <widget class="QPushButton" name="pushButtonHelpResults">
+   <property name="geometry">
+    <rect>
+     <x>140</x>
+     <y>160</y>
+     <width>61</width>
+     <height>61</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string/>
+   </property>
+   <property name="icon">
+    <iconset resource="graphics.qrc">
+     <normaloff>:/new/prefix1/Graphics/trophy_gold.png</normaloff>:/new/prefix1/Graphics/trophy_gold.png</iconset>
+   </property>
+   <property name="iconSize">
+    <size>
+     <width>60</width>
+     <height>60</height>
+    </size>
+   </property>
+  </widget>
+  <widget class="QPushButton" name="pushButtonHelpSettings">
+   <property name="geometry">
+    <rect>
+     <x>140</x>
+     <y>230</y>
+     <width>61</width>
+     <height>61</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string/>
+   </property>
+   <property name="icon">
+    <iconset resource="graphics.qrc">
+     <normaloff>:/new/prefix1/Graphics/settings.png</normaloff>:/new/prefix1/Graphics/settings.png</iconset>
+   </property>
+   <property name="iconSize">
+    <size>
+     <width>55</width>
+     <height>55</height>
+    </size>
+   </property>
+  </widget>
+  <widget class="QPushButton" name="pushButtonHelpWWW">
+   <property name="geometry">
+    <rect>
+     <x>140</x>
+     <y>300</y>
+     <width>61</width>
+     <height>61</height>
+    </rect>
+   </property>
+   <property name="autoFillBackground">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string/>
+   </property>
+   <property name="icon">
+    <iconset resource="graphics.qrc">
+     <normaloff>:/new/prefix1/Graphics/applications_internet.png</normaloff>:/new/prefix1/Graphics/applications_internet.png</iconset>
+   </property>
+   <property name="iconSize">
+    <size>
+     <width>55</width>
+     <height>55</height>
+    </size>
+   </property>
+  </widget>
+  <widget class="QLabel" name="labelHelpRoute">
+   <property name="geometry">
+    <rect>
+     <x>230</x>
+     <y>100</y>
+     <width>261</width>
+     <height>41</height>
+    </rect>
+   </property>
+   <property name="font">
+    <font>
+     <family>Bitstream Charter</family>
+    </font>
+   </property>
+   <property name="text">
+    <string>Help for route drawing</string>
+   </property>
+  </widget>
+  <widget class="QLabel" name="labelHelpResults">
+   <property name="geometry">
+    <rect>
+     <x>230</x>
+     <y>170</y>
+     <width>171</width>
+     <height>41</height>
+    </rect>
+   </property>
+   <property name="font">
+    <font>
+     <family>Bitstream Charter</family>
+    </font>
+   </property>
+   <property name="text">
+    <string>Results view</string>
+   </property>
+  </widget>
+  <widget class="QLabel" name="labelHelpSettings">
+   <property name="geometry">
+    <rect>
+     <x>230</x>
+     <y>240</y>
+     <width>171</width>
+     <height>41</height>
+    </rect>
+   </property>
+   <property name="font">
+    <font>
+     <family>Bitstream Charter</family>
+    </font>
+   </property>
+   <property name="text">
+    <string>Settings view</string>
+   </property>
+  </widget>
+  <widget class="QLabel" name="labelHelpWww">
+   <property name="geometry">
+    <rect>
+     <x>230</x>
+     <y>310</y>
+     <width>171</width>
+     <height>41</height>
+    </rect>
+   </property>
+   <property name="font">
+    <font>
+     <family>Bitstream Charter</family>
+    </font>
+   </property>
+   <property name="text">
+    <string>WWW-page</string>
+   </property>
+  </widget>
+  <widget class="QPushButton" name="pushButtonCredits">
+   <property name="geometry">
+    <rect>
+     <x>432</x>
+     <y>306</y>
+     <width>111</width>
+     <height>51</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>Credits</string>
+   </property>
+  </widget>
+ </widget>
+ <resources>
+  <include location="graphics.qrc"/>
+ </resources>
+ <connections/>
+</ui>

diff --git a/Client/helpresultsdialog.cpp b/Client/helpresultsdialog.cpp
new file mode 100644 (file)
index 0000000..415bcd1
--- /dev/null
+++ b/Client/helpresultsdialog.cpp
@@ -0,0 +1,26 @@
+#include "helpresultsdialog.h"
+#include "ui_helpresultsdialog.h"
+
+HelpResultsDialog::HelpResultsDialog(QWidget *parent) :
+    QDialog(parent),
+    ui(new Ui::HelpResultsDialog)
+{
+    ui->setupUi(this);
+}
+
+HelpResultsDialog::~HelpResultsDialog()
+{
+    delete ui;
+}
+
+void HelpResultsDialog::changeEvent(QEvent *e)
+{
+    QDialog::changeEvent(e);
+    switch (e->type()) {
+    case QEvent::LanguageChange:
+        ui->retranslateUi(this);
+        break;
+    default:
+        break;
+    }
+}

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

diff --git a/Client/helpresultsdialog.ui b/Client/helpresultsdialog.ui
new file mode 100644 (file)
index 0000000..7c870e8
--- /dev/null
+++ b/Client/helpresultsdialog.ui
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>HelpResultsDialog</class>
+ <widget class="QDialog" name="HelpResultsDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>800</width>
+    <height>380</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Dialog</string>
+  </property>
+  <widget class="QLabel" name="labelRefreshPic">
+   <property name="geometry">
+    <rect>
+     <x>630</x>
+     <y>50</y>
+     <width>81</width>
+     <height>71</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string/>
+   </property>
+   <property name="pixmap">
+    <pixmap resource="graphics.qrc">:/new/prefix1/Graphics/trophy_gold_refresh.png</pixmap>
+   </property>
+   <property name="scaledContents">
+    <bool>true</bool>
+   </property>
+  </widget>
+  <widget class="QLabel" name="labelInfo">
+   <property name="geometry">
+    <rect>
+     <x>140</x>
+     <y>50</y>
+     <width>401</width>
+     <height>81</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>1. Press refresh button for categories 
+list seeking from server.</string>
+   </property>
+  </widget>
+  <widget class="QLabel" name="labelInfo2">
+   <property name="geometry">
+    <rect>
+     <x>140</x>
+     <y>150</y>
+     <width>401</width>
+     <height>81</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>2. Choose the category from drop box
+which results you want to see. </string>
+   </property>
+  </widget>
+ </widget>
+ <resources>
+  <include location="graphics.qrc"/>
+ </resources>
+ <connections/>
+</ui>

diff --git a/Client/helproutingdialog.cpp b/Client/helproutingdialog.cpp
new file mode 100644 (file)
index 0000000..b1ead53
--- /dev/null
+++ b/Client/helproutingdialog.cpp
@@ -0,0 +1,109 @@
+#include "helproutingdialog.h"
+#include "ui_helproutingdialog.h"
+
+HelpRoutingDialog::HelpRoutingDialog(QWidget *parent) :
+    QDialog(parent),
+    ui(new Ui::HelpRoutingDialog)
+{
+    ui->setupUi(this);
+    pageCounter = 0;
+
+    ui->labelInfo2->hide();
+    ui->labelLast->hide();
+    ui->pushButtonLast->hide();
+    ui->labelStopPic->hide();
+
+    ui->labelInfo3->hide();
+    ui->labelNewPic->hide();
+    ui->labelSavePic->hide();
+}
+
+HelpRoutingDialog::~HelpRoutingDialog()
+{
+    delete ui;
+}
+
+void HelpRoutingDialog::changeEvent(QEvent *e)
+{
+    QDialog::changeEvent(e);
+    switch (e->type()) {
+    case QEvent::LanguageChange:
+        ui->retranslateUi(this);
+        break;
+    default:
+        break;
+    }
+}
+
+void HelpRoutingDialog::on_pushButtonNext_clicked()
+{
+    pageCounter ++;
+
+    if(pageCounter == 1)
+    {
+        ui->labelStartPic->hide();
+        ui->labelSatellitePic->hide();
+        ui->labelInfo1->hide();
+
+        ui->labelLast->show();
+        ui->pushButtonLast->show();
+        ui->labelInfo2->show();
+        ui->labelStopPic->show();
+    }
+
+    if(pageCounter == 2)
+    {
+        ui->labelStartPic->hide();
+        ui->labelSatellitePic->hide();
+        ui->labelInfo1->hide();
+
+        ui->labelInfo2->hide();
+        ui->labelStopPic->hide();
+
+        ui->labelNext->hide();
+        ui->pushButtonNext->hide();
+
+        ui->labelLast->show();
+        ui->pushButtonLast->show();
+        ui->labelInfo3->show();
+        ui->labelSavePic->show();
+        ui->labelNewPic->show();
+    }
+}
+
+void HelpRoutingDialog::on_pushButtonLast_clicked()
+{
+    pageCounter --;
+
+    if(pageCounter == 0)
+    {
+        ui->labelInfo2->hide();
+        ui->labelLast->hide();
+        ui->pushButtonLast->hide();
+        ui->labelStopPic->hide();
+
+        ui->labelStartPic->show();
+        ui->labelSatellitePic->show();
+        ui->labelInfo1->show();
+
+        ui->labelNext->show();
+        ui->pushButtonNext->show();
+    }
+
+    if(pageCounter == 1)
+    {
+        ui->labelLast->hide();
+        ui->pushButtonLast->hide();
+        ui->labelInfo3->hide();
+        ui->labelSavePic->hide();
+        ui->labelNewPic->hide();
+
+        ui->labelNext->show();
+        ui->pushButtonNext->show();
+
+        ui->labelInfo2->show();
+        ui->labelLast->show();
+        ui->pushButtonLast->show();
+        ui->labelStopPic->show();
+    }
+}

diff --git a/Client/helproutingdialog.h b/Client/helproutingdialog.h
new file mode 100644 (file)
index 0000000..38c588d
--- /dev/null
+++ b/Client/helproutingdialog.h
@@ -0,0 +1,28 @@
+#ifndef HELPROUTINGDIALOG_H
+#define HELPROUTINGDIALOG_H
+
+#include <QDialog>
+
+namespace Ui {
+    class HelpRoutingDialog;
+}
+
+class HelpRoutingDialog : public QDialog {
+    Q_OBJECT
+public:
+    HelpRoutingDialog(QWidget *parent = 0);
+    ~HelpRoutingDialog();
+
+protected:
+    void changeEvent(QEvent *e);
+
+private:
+    Ui::HelpRoutingDialog *ui;
+    int pageCounter;
+
+private slots:
+    void on_pushButtonLast_clicked();
+    void on_pushButtonNext_clicked();
+};
+
+#endif // HELPROUTINGDIALOG_H

diff --git a/Client/helproutingdialog.ui b/Client/helproutingdialog.ui
new file mode 100644 (file)
index 0000000..d512dc4
--- /dev/null
+++ b/Client/helproutingdialog.ui
@@ -0,0 +1,222 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>HelpRoutingDialog</class>
+ <widget class="QDialog" name="HelpRoutingDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>800</width>
+    <height>380</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Help for route recording</string>
+  </property>
+  <widget class="QPushButton" name="pushButtonNext">
+   <property name="geometry">
+    <rect>
+     <x>670</x>
+     <y>320</y>
+     <width>81</width>
+     <height>61</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>&gt;</string>
+   </property>
+  </widget>
+  <widget class="QLabel" name="labelLast">
+   <property name="geometry">
+    <rect>
+     <x>560</x>
+     <y>290</y>
+     <width>62</width>
+     <height>17</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>Last</string>
+   </property>
+  </widget>
+  <widget class="QLabel" name="labelNext">
+   <property name="geometry">
+    <rect>
+     <x>690</x>
+     <y>290</y>
+     <width>62</width>
+     <height>17</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>Next</string>
+   </property>
+  </widget>
+  <widget class="QPushButton" name="pushButtonLast">
+   <property name="geometry">
+    <rect>
+     <x>540</x>
+     <y>320</y>
+     <width>81</width>
+     <height>61</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>&lt;</string>
+   </property>
+  </widget>
+  <widget class="QLabel" name="labelInfo1">
+   <property name="geometry">
+    <rect>
+     <x>50</x>
+     <y>40</y>
+     <width>451</width>
+     <height>271</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>Route recording gives you change to 
+record your driwing.
+
+1. Push start icon for searching the 
+satellites. Satellite icon starts flickering 
+on screen. When satellites have been found 
+satellite icon stops flickering and you can 
+start driwing. </string>
+   </property>
+  </widget>
+  <widget class="QLabel" name="labelStartPic">
+   <property name="geometry">
+    <rect>
+     <x>610</x>
+     <y>80</y>
+     <width>81</width>
+     <height>81</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string/>
+   </property>
+   <property name="pixmap">
+    <pixmap resource="graphics.qrc">:/new/prefix1/Graphics/route_start.png</pixmap>
+   </property>
+   <property name="scaledContents">
+    <bool>true</bool>
+   </property>
+  </widget>
+  <widget class="QLabel" name="labelSatellitePic">
+   <property name="geometry">
+    <rect>
+     <x>610</x>
+     <y>180</y>
+     <width>81</width>
+     <height>81</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string/>
+   </property>
+   <property name="pixmap">
+    <pixmap resource="graphics.qrc">:/new/prefix1/Graphics/satellite_vista.png</pixmap>
+   </property>
+   <property name="scaledContents">
+    <bool>true</bool>
+   </property>
+  </widget>
+  <widget class="QLabel" name="labelInfo2">
+   <property name="geometry">
+    <rect>
+     <x>50</x>
+     <y>20</y>
+     <width>491</width>
+     <height>271</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>2. When you have driven route push stop 
+icon for stop recording and route view opens.
+
+3. Route view draws your route to the screen
+ and gives you information about your driving.</string>
+   </property>
+  </widget>
+  <widget class="QLabel" name="labelStopPic">
+   <property name="geometry">
+    <rect>
+     <x>610</x>
+     <y>80</y>
+     <width>81</width>
+     <height>81</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string/>
+   </property>
+   <property name="pixmap">
+    <pixmap resource="graphics.qrc">:/new/prefix1/Graphics/route_stop.png</pixmap>
+   </property>
+   <property name="scaledContents">
+    <bool>true</bool>
+   </property>
+  </widget>
+  <widget class="QLabel" name="labelInfo3">
+   <property name="geometry">
+    <rect>
+     <x>50</x>
+     <y>20</y>
+     <width>491</width>
+     <height>271</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>4. Push save button for sending your route 
+to server. You have to be log in for that.
+
+5. Push new button for start 
+routing at beginning.</string>
+   </property>
+  </widget>
+  <widget class="QLabel" name="labelSavePic">
+   <property name="geometry">
+    <rect>
+     <x>610</x>
+     <y>80</y>
+     <width>81</width>
+     <height>81</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string/>
+   </property>
+   <property name="pixmap">
+    <pixmap resource="graphics.qrc">:/new/prefix1/Graphics/route_save.png</pixmap>
+   </property>
+   <property name="scaledContents">
+    <bool>true</bool>
+   </property>
+  </widget>
+  <widget class="QLabel" name="labelNewPic">
+   <property name="geometry">
+    <rect>
+     <x>610</x>
+     <y>170</y>
+     <width>81</width>
+     <height>81</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string/>
+   </property>
+   <property name="pixmap">
+    <pixmap resource="graphics.qrc">:/new/prefix1/Graphics/route_new.png</pixmap>
+   </property>
+   <property name="scaledContents">
+    <bool>true</bool>
+   </property>
+  </widget>
+ </widget>
+ <resources>
+  <include location="graphics.qrc"/>
+ </resources>
+ <connections/>
+</ui>

diff --git a/Client/mainwindow.cpp b/Client/mainwindow.cpp
index 0b78399..75171e6 100644 (file)
--- a/Client/mainwindow.cpp
+++ b/Client/mainwindow.cpp
@@ -29,6 +29,7 @@ MainWindow::MainWindow(QWidget *parent) :
     connect(routeDialog,SIGNAL(sendroute()),this,SLOT(clientSendRoute()));
 
     routeSaveDialog = new RouteSaveDialog;
+    helpDialog = NULL;
 
     settingsDialog = new SettingsDialog;
     connect(settingsDialog,SIGNAL(sendregistration()),this,SLOT(clientRegUserToServer()));
@@ -46,7 +47,7 @@ MainWindow::MainWindow(QWidget *parent) :
 
     accstart = NULL;
 
-    creditsDialog = new CreditsDialog;
+    //creditsDialog = new CreditsDialog;
 
     welcomeDialog = new WelcomeDialog;
     welcomeDialog->show();
@@ -101,7 +102,10 @@ void MainWindow::on_pushButtonWWW_clicked()
   */
 void MainWindow::on_pushButtonCredits_clicked()
 {
-    creditsDialog->show();
+    if(!helpDialog)
+        helpDialog = new HelpDialog;
+    helpDialog->show();
+    //creditsDialog->show();
 }
 
 /**

diff --git a/Client/mainwindow.h b/Client/mainwindow.h
index b9924d1..d09cc51 100644 (file)
--- a/Client/mainwindow.h
+++ b/Client/mainwindow.h
@@ -14,7 +14,7 @@
 #include <QNetworkRequest>
 #include <QNetworkReply>
 #include <QMessageBox>
-#include "creditsdialog.h"
+//#include "creditsdialog.h"
 #include "routesavedialog.h"
 #include "routedialog.h"
 #include "welcomedialog.h"
@@ -24,6 +24,7 @@
 #include "httpclient.h"
 #include "routedialog.h"
 #include "resultdialog.h"
+#include "helpdialog.h"
 
 
 namespace Ui {
@@ -36,7 +37,7 @@ public:
     MainWindow(QWidget *parent = 0);
     ~MainWindow();
 
-    CreditsDialog *creditsDialog;
+    //CreditsDialog *creditsDialog;
     RouteSaveDialog *routeSaveDialog;
     RouteDialog *routeDialog;
     WelcomeDialog *welcomeDialog;
@@ -45,6 +46,7 @@ public:
     TopResultDialog *topResultDialog;
     HttpClient *httpClient;
     ResultDialog *resultDialog;
+    HelpDialog *helpDialog;
 
 protected:
     void changeEvent(QEvent *e);

diff --git a/Client/settingsdialog.cpp b/Client/settingsdialog.cpp
index b619576..3ded2bb 100644 (file)
--- a/Client/settingsdialog.cpp
+++ b/Client/settingsdialog.cpp
@@ -17,7 +17,6 @@ SettingsDialog::SettingsDialog(QWidget *parent) :
     ui->setupUi(this);
     this->setWindowTitle("Settings");
     this->ui->regEMailLineEdit->setText("@");
-    instructionsDialog = new InstructionsDialog;
 
     if (loginSaved())
     {
@@ -53,14 +52,6 @@ void SettingsDialog::changeEvent(QEvent *e)
 }
 
 //
-// Help
-//
-void SettingsDialog::on_pushButtonHelp_clicked()
-{
-    instructionsDialog->show();
-}
-
-//
 // Registrate
 //
 void SettingsDialog::on_registratePushButton_clicked()

diff --git a/Client/settingsdialog.h b/Client/settingsdialog.h
index b496c41..8263515 100644 (file)
--- a/Client/settingsdialog.h
+++ b/Client/settingsdialog.h
@@ -43,7 +43,6 @@ protected:
 
 private:
     Ui::SettingsDialog *ui;
-    InstructionsDialog *instructionsDialog;
     QString regUsername;
     QString regPassword;
     QString regEmail;
@@ -53,7 +52,6 @@ private:
 private slots:
     void on_setUserPushButton_clicked();
     void on_registratePushButton_clicked();
-    void on_pushButtonHelp_clicked();
 };
 
 #endif // SETTINGSDIALOG_H

diff --git a/Client/settingsdialog.ui b/Client/settingsdialog.ui
index d4d8732..a136090 100644 (file)
--- a/Client/settingsdialog.ui
+++ b/Client/settingsdialog.ui
@@ -13,23 +13,10 @@
   <property name="windowTitle">
    <string>Dialog</string>
   </property>
-  <widget class="QPushButton" name="pushButtonHelp">
-   <property name="geometry">
-    <rect>
-     <x>540</x>
-     <y>180</y>
-     <width>221</width>
-     <height>51</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string>About Speed Freak</string>
-   </property>
-  </widget>
   <widget class="QLabel" name="setUserLabel">
    <property name="geometry">
     <rect>
-     <x>40</x>
+     <x>50</x>
      <y>210</y>
      <width>371</width>
      <height>31</height>
@@ -110,7 +97,7 @@
       <property name="font">
        <font>
         <family>Bitstream Charter</family>
-        <pointsize>10</pointsize>
+        <pointsize>14</pointsize>
        </font>
       </property>
       <property name="maxLength">
@@ -130,7 +117,7 @@
       <property name="font">
        <font>
         <family>Bitstream Charter</family>
-        <pointsize>10</pointsize>
+        <pointsize>14</pointsize>
        </font>
       </property>
       <property name="maxLength">
@@ -146,8 +133,8 @@
   <widget class="QLabel" name="labelInfoToUser">
    <property name="geometry">
     <rect>
-     <x>10</x>
-     <y>320</y>
+     <x>100</x>
+     <y>340</y>
      <width>501</width>
      <height>41</height>
     </rect>
@@ -160,9 +147,9 @@
    <property name="geometry">
     <rect>
      <x>100</x>
-     <y>28</y>
+     <y>37</y>
      <width>401</width>
-     <height>151</height>
+     <height>141</height>
     </rect>
    </property>
    <layout class="QGridLayout" name="gridLayout">
@@ -178,7 +165,7 @@
       <property name="font">
        <font>
         <family>Bitstream Charter</family>
-        <pointsize>10</pointsize>
+        <pointsize>14</pointsize>
        </font>
       </property>
       <property name="maxLength">
@@ -198,7 +185,7 @@
       <property name="font">
        <font>
         <family>Bitstream Charter</family>
-        <pointsize>10</pointsize>
+        <pointsize>14</pointsize>
        </font>
       </property>
       <property name="maxLength">
@@ -221,7 +208,7 @@
       <property name="font">
        <font>
         <family>Bitstream Charter</family>
-        <pointsize>10</pointsize>
+        <pointsize>14</pointsize>
        </font>
       </property>
       <property name="maxLength">
@@ -248,7 +235,6 @@
    </property>
   </widget>
   <zorder>label</zorder>
-  <zorder>pushButtonHelp</zorder>
   <zorder>setUserLabel</zorder>
   <zorder>setUserPushButton</zorder>
   <zorder>registrateLabel</zorder>
@@ -265,7 +251,6 @@
   <tabstop>setUserUsernameLineEdit</tabstop>
   <tabstop>setUserPasswordLineEdit</tabstop>
   <tabstop>setUserPushButton</tabstop>
-  <tabstop>pushButtonHelp</tabstop>
  </tabstops>
  <resources>
   <include location="graphics.qrc"/>

diff --git a/Client/speedfreak.pro b/Client/speedfreak.pro
index f16e7aa..ce4c5e7 100644 (file)
--- a/Client/speedfreak.pro
+++ b/Client/speedfreak.pro
@@ -32,7 +32,11 @@ SOURCES += main.cpp \
     xmlwriter.cpp \
     gpsdata.cpp \
     maemo5locationprivate.cpp \
-    maemo5location.cpp
+    maemo5location.cpp \
+    helpdialog.cpp \
+    helpresultsdialog.cpp \
+    helpaccelerationdialog.cpp \
+    helproutingdialog.cpp
 HEADERS += mainwindow.h \
     creditsdialog.h \
     routedialog.h \
@@ -55,8 +59,11 @@ HEADERS += mainwindow.h \
     xmlwriter.h \
     maemo5locationprivate.h \
     maemo5location.h \
-    gpsdata.h
-
+    gpsdata.h \
+    helpdialog.h \
+    helpresultsdialog.h \
+    helpaccelerationdialog.h \
+    helproutingdialog.h
 FORMS += mainwindow.ui \
     creditsdialog.ui \
     routedialog.ui \
@@ -68,7 +75,11 @@ FORMS += mainwindow.ui \
     accelerationstartdialog.ui \
     accrealtimedialog.ui \
     calibratedialog.ui \
-    topresultdialog.ui
+    topresultdialog.ui \
+    helpdialog.ui \
+    helpresultsdialog.ui \
+    helpaccelerationdialog.ui \
+    helproutingdialog.ui
 RESOURCES += graphics.qrc
 contains(QT_CONFIG, hildon):CONFIG += hildon
 CONFIG += link_pkgconfig