Settings dialog changed. Log in/Log out functionality improved.

[speedfreak] / Client / routesavedialog.cpp

diff --git a/Client/routesavedialog.cpp b/Client/routesavedialog.cpp
index fd9853f..253784e 100644 (file)
--- a/Client/routesavedialog.cpp
+++ b/Client/routesavedialog.cpp
@@ -14,23 +14,22 @@
   *@param QWidget pointer to parent object. By default the value is NULL.
   */
 RouteSaveDialog::RouteSaveDialog(QWidget *parent) :
-    QDialog(parent),
-    ui(new Ui::RouteSaveDialog)
-{
+    QDialog(parent), ui(new Ui::RouteSaveDialog){
+
     ui->setupUi(this);
     this->setWindowTitle("Tracking");
 
-    routeDialog = new RouteDialog;
+    routeDialog = NULL;
 
     //Button settings
     buttonStatus = true;
     pixmapRouteStop = new QPixmap("Graphics/route_stop.png");
-    pixmapRoutePlay = new QPixmap("Graphics/route_play.png");
+    pixmapRouteStart = new QPixmap("Graphics/route_start.png");
     iconRouteStop = new QIcon(*pixmapRouteStop);
-    iconRoutePlay = new QIcon(*pixmapRoutePlay);
+    iconRouteStart = new QIcon(*pixmapRouteStart);
     QSize iconSize(125, 125);
     ui->buttonRouteStartStop->setIconSize(iconSize);
-    ui->buttonRouteStartStop->setIcon(*iconRoutePlay);
+    ui->buttonRouteStartStop->setIcon(*iconRouteStart);
     ui->buttonRouteStartStop->setAutoFillBackground(true);
     ui->buttonRouteStartStop->setStyleSheet("background-color: rgb(0, 0, 0); color: rgb(255, 255, 255)");
 
@@ -52,6 +51,9 @@ RouteSaveDialog::RouteSaveDialog(QWidget *parent) :
     //GPS speed label
     ui->labelGpsSpeed->setVisible(0);
 
+    //User info label
+    ui->labelUserInfo->setText("");
+
     //GPS
     location = new Maemo5Location(this);
     gpsData = new GPSData(location);
@@ -70,11 +72,14 @@ RouteSaveDialog::~RouteSaveDialog()
     delete gpsData;
     delete routeDialog;
     delete pixmapRouteStop;
-    delete pixmapRoutePlay;
+    delete pixmapRouteStart;
     delete iconRouteStop;
-    delete iconRoutePlay;
+    delete iconRouteStart;
 }
 
+/**
+  *
+  */
 void RouteSaveDialog::changeEvent(QEvent *e)
 {
     QDialog::changeEvent(e);
@@ -103,7 +108,7 @@ void RouteSaveDialog::on_buttonRouteStartStop_clicked()
     else
     {
         buttonStatus = true;
-        ui->buttonRouteStartStop->setIcon(*iconRoutePlay);
+        ui->buttonRouteStartStop->setIcon(*iconRouteStart);
 
         //Satellite picture and label
         ui->labelRouteSatelliteStatus->setText("Searching satellite");
@@ -118,8 +123,11 @@ void RouteSaveDialog::on_buttonRouteStartStop_clicked()
         location->stopPollingGPS();
 
         QString routeFile = QString("routetemp.xml");
-        if (routeDialog->readRouteFromFile( routeFile) == true)
+        if (routeDialog->readRouteFromFile( routeFile ) == true)
         {
+            if(!routeDialog)
+                routeDialog = new RouteDialog;
+            connect(routeDialog, SIGNAL(sendroute()), this, SLOT(sendRoute()));
             routeDialog->show();
         }
 
@@ -169,6 +177,9 @@ void RouteSaveDialog::timerRoutePictureTimeout()
     timerRoutePicture->start();
 }
 
+/**
+  *
+  */
 void RouteSaveDialog::gpsStatus()
 {
     //IF GPS start button clicked
@@ -233,3 +244,11 @@ void RouteSaveDialog::gpsStatus()
         ui->labelGpsSpeed->setVisible(0);
     }
 }
+
+/**
+  * This slot function is called when routeDialog emit sendroute (sendPushButton).
+  */
+void RouteSaveDialog::sendRoute()
+{
+    emit sendroute(); //Emit mainwindow clientSendRoute
+}