Merge branch 'changes/UI'

[speedfreak] / Client / carmainwindow.cpp

diff --git a/Client/carmainwindow.cpp b/Client/carmainwindow.cpp
index 9eb26ee..807159f 100644 (file)
--- a/Client/carmainwindow.cpp
+++ b/Client/carmainwindow.cpp
@@ -19,6 +19,7 @@
 CarMainWindow::CarMainWindow(QWidget *parent):QMainWindow(parent), ui(new Ui::CarMainWindow)
 {
     ui->setupUi(this);
+    ui->tabWidget->setCurrentWidget(this->ui->StartTab);
     //result = new ResultDialog();
     //measure = new MeasureDialog();
     xmlreader = new XmlReader();
@@ -30,9 +31,7 @@ CarMainWindow::CarMainWindow(QWidget *parent):QMainWindow(parent), ui(new Ui::Ca
     myRegistration = new Registration(this);
     xmlwriter = new XmlWriter();
     manager = new QNetworkAccessManager(this);
-    connect(manager,SIGNAL(finished(QNetworkReply*)),this,SLOT(networkResponse(QNetworkReply*)));
     connect(myRegistration,SIGNAL(sendregistration()),this,SLOT(registrate()));
-    connect(this,SIGNAL(sendresult()),this,SLOT(sendXml()));
 
     time = 0;
     speed = 0;
@@ -51,7 +50,7 @@ CarMainWindow::CarMainWindow(QWidget *parent):QMainWindow(parent), ui(new Ui::Ca
 
     ui->labelMeasureTabResult->hide();
 
-    this->setWindowTitle("Speed bfreak");
+    this->setWindowTitle("Speed freak");
 
 }
 
@@ -204,6 +203,7 @@ void CarMainWindow::openResultView()
     //result->saveMeasuresToArray(measure->measures);
     // Show result dialog.
     //result->show();
+    ui->pushButtonSendResult->setEnabled(true);
     QString timeInteger;
     timeInteger.setNum(this->measures->getTime40kmh());
     //time = "0 - 40 km/h: ";
@@ -215,23 +215,6 @@ void CarMainWindow::openResultView()
 }
 
 /**
-  *This slot function is called when the user will to send data to server.
-  *@todo Where is this callback connected?
-  */
-void CarMainWindow::on_pushButton_clicked()
-{
-     sendXml();
-}
-
-/**
-  *This slot function is called when login/logout button is clicked.
-  */
-void CarMainWindow::on_loginLogoutButton_clicked()
-{
-    myLogin->show();
-}
-
-/**
   *This slot function is called when registrate button is clicked.
   */
 void CarMainWindow::on_registratePushButton_clicked()
@@ -272,9 +255,6 @@ void CarMainWindow::on_comboBoxTopCategory_activated(QString category)
 void CarMainWindow::on_setUserPushButton_clicked()
 {
     myLogin->show();
-
-    ui->userNameLabel->setText( "User: " + myLogin->getUserName());
-    ui->setUserPushButton->setText( "Change User");
 }
 
 /**
@@ -306,7 +286,7 @@ void CarMainWindow::registrate()
 
     //ackOfRegistration function gets called when HTTP request is completed
     connect(manager,SIGNAL(finished(QNetworkReply*)),this,SLOT(ackOfRegistration(QNetworkReply*)));
-    connect(manager,SIGNAL(sslErrors(QNetworkReply*)),this,SLOT(errorFromServer(QNetworkReply*)));
+    //connect(manager,SIGNAL(sslErrors(QNetworkReply*)),this,SLOT(errorFromServer(QNetworkReply*)));
     regbuffer->close();
 }
 
@@ -334,15 +314,15 @@ void CarMainWindow::sendXml()
     qDebug() << "carmainwindow: xmlbuffer->data(): " << xmlbuffer->data();
 
     manager->post(request, ("data=" + xmlbuffer->data()));
-    connect(manager,SIGNAL(finished(QNetworkReply*)),this,SLOT(ackOfResult(QNetworkReply*)));
-    connect(manager,SIGNAL(sslErrors(QNetworkReply*)),this,SLOT(errorFromServer(QNetworkReply*)));
+    //connect(manager,SIGNAL(finished(QNetworkReply*)),this,SLOT(ackOfResult(QNetworkReply*)));
+    //connect(manager,SIGNAL(sslErrors(QNetworkReply*)),this,SLOT(errorFromServer(QNetworkReply*)));
 
-    //QString data("abcdefg");
     //QNetworkReply *currentDownload;
+    //QString data("abcdefg");
     //currentDownload = manager->post(request,"data=" + QUrl::toPercentEncoding(data));   //testing
     //currentDownload = manager->post(request, ("data=" + xmlbuffer->data()));
     //ackOfResult function gets called when HTTP request is completed
-    //connect(currentDownload, SIGNAL(finished()), this, SLOT(ackOfResult()));
+    //connect(currentDownload, SIGNAL(finished()), SLOT(ackOfResult()));
 
     xmlbuffer->close();
 }
@@ -370,8 +350,8 @@ void CarMainWindow::requestTopList()
 
     request.setRawHeader(QByteArray("Authorization"),credentials.toAscii());
     manager->post(request, ("data=" ));
-    connect(manager,SIGNAL(finished(QNetworkReply*)),this,SLOT(networkResponse(QNetworkReply*)));
-    connect(manager,SIGNAL(sslErrors(QNetworkReply*)),this,SLOT(errorFromServer(QNetworkReply*)));
+    //connect(manager,SIGNAL(finished(QNetworkReply*)),this,SLOT(networkResponse(QNetworkReply*)));
+    //connect(manager,SIGNAL(sslErrors(QNetworkReply*)),this,SLOT(errorFromServer(QNetworkReply*)));
 
     //QNetworkReply *currentDownload;
     //currentDownload = manager->post(request, ("data=" ));
@@ -415,8 +395,6 @@ void CarMainWindow::ackOfRegistration(QNetworkReply* reply)
     }
 }
 
-
-
 void CarMainWindow::errorFromServer(QNetworkReply* reply)
 {
     qDebug() << "_errorFromServer";
@@ -594,7 +572,8 @@ void CarMainWindow::on_pushButtonMeasureTabAbort_clicked()
 
 void CarMainWindow::on_pushButtonSendResult_clicked()
 {
-    emit sendresult();
+    sendXml();
+    ui->pushButtonSendResult->setEnabled(false);
 }
 
 void CarMainWindow::updateUserName()