Merge branch 'changes/UI'

diff --combined Client/carmainwindow.cpp
index 1d17649,9057ab7..807159f
--- 1/Client/carmainwindow.cpp
--- 2/Client/carmainwindow.cpp
+++ b/Client/carmainwindow.cpp
@@@ -19,6 -19,7 +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();
@@@ -202,6 -203,7 +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: ";
@@@ -212,6 -214,15 +214,6 @@@
      //ui->tabWidget->setCurrentWidget(this->ui->tabMeasureResult);
  }
  
 -
 -/**
 -  *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.
    */
@@@ -253,6 -264,9 +255,6 @@@ void CarMainWindow::on_comboBoxTopCateg
  void CarMainWindow::on_setUserPushButton_clicked()
  {
      myLogin->show();
 -
 -    ui->userNameLabel->setText( "User: " + myLogin->getUserName());
 -    ui->setUserPushButton->setText( "Change User");
  }
  
  /**
@@@ -571,7 -585,7 +573,7 @@@ void CarMainWindow::on_pushButtonMeasur
  void CarMainWindow::on_pushButtonSendResult_clicked()
  {
      sendXml();
- 
+     ui->pushButtonSendResult->setEnabled(false);
  }
  
  void CarMainWindow::updateUserName()