Merge branch 'development/carmainwindow'

diff --combined Client/carmainwindow.cpp
index cd88257,9b54df5..26cb811
--- 1/Client/carmainwindow.cpp
--- 2/Client/carmainwindow.cpp
+++ b/Client/carmainwindow.cpp
@@@ -11,8 -11,8 +11,8 @@@ CarMainWindow::CarMainWindow(QWidget *p
      measure = new MeasureDialog();
      xmlreader = new XmlReader();
  
-     initUnitCompoBox();
-     initSpeedListView();
+     initComboBoxStartTabUnits();
+     initListViewStartTabAccelerationCategories();
  
      myLogin = new LoginWindow(this);
      myRegistration = new Registration(this);
@@@ -50,15 -50,15 +50,15 @@@ void CarMainWindow::changeEvent(QEvent 
  /**
    *This slot function is called when ever list view is update. Start-tab view.
    */
- void CarMainWindow::on_listView_clicked(QModelIndex index)
+ void CarMainWindow::on_listViewStartTabAccelerationCategories_clicked(QModelIndex index)
  {
      QString str = index.data().toString();
      QStringList list = str.split("-");
      QStringList list2 = list[1].split(" ");
  
-     ui->minLineEdit->setText(list[0]);
-     ui->maxLineEdit->setText(list2[0]);
-     updateUnitCompoBox(list2[1]);
+     ui->lineEditStartTabMin->setText(list[0]);
+     ui->lineEditStartTabMax->setText(list2[0]);
+     updateComboBoxStartTabUnits(list2[1]);
  }
  
  /**
@@@ -80,47 -80,47 +80,47 @@@ void CarMainWindow::on_autoStartButton_
    *This slot function is called when ever list view is update. Start-tab view.
    *@param QString unit.
    */
- void CarMainWindow::updateUnitCompoBox(QString unit)
+ void CarMainWindow::updateComboBoxStartTabUnits(QString unit)
  {
-     ui->unitComboBox->setCurrentIndex(ui->unitComboBox->findText(unit, Qt::MatchExactly));
+     ui->comboBoxStartTabUnits->setCurrentIndex(ui->comboBoxStartTabUnits->findText(unit, Qt::MatchExactly));
  }
  
  /**
    *This function is used to init unit combobox. Start-tab view.
    */
- void CarMainWindow::initUnitCompoBox()
+ void CarMainWindow::initComboBoxStartTabUnits()
  {
      units << "km/h" << "km" << "h" << "m" << "min" << "Mile" << "Mph" << "in" << "ft" << "yrd";
-     ui->unitComboBox->addItems(units);
+     ui->comboBoxStartTabUnits->addItems(units);
  }
  
  /**
    *This function is used to set items to unit combobox. Start-tab view.
-   *@param QStringlist numbers
+   *@param QStringlist units
    */
- void CarMainWindow::setUnitCompoBox(QStringList units)
+ void CarMainWindow::setComboBoxStartTabUnits(QStringList units)
  {
-     ui->unitComboBox->addItems(units);
+     ui->comboBoxStartTabUnits->addItems(units);
  }
  
  /**
-   *This function is used to init speed listview. Start-tab view.
+   *This function is used to init listViewStartTabAccelerationCategories. Start-tab view.
    */
- void CarMainWindow::initSpeedListView()
+ void CarMainWindow::initListViewStartTabAccelerationCategories()
  {
-     numbers << "0-40 km/h" << "0-1/4 Mile" << "0-1/8 Mile" << "0-50 km" << "50-100 Mile" << "0-60 Mph" << "0-100 m" << "0-50 ft" << "0-50 yrd" << "0-500 in";
-     QAbstractItemModel *model = new StringListModel(numbers);
-     ui->listView->setModel(model);
+     accelerationCategoriesStartTab << "0-40 km/h" << "0-100 km/h"; //<< "0-1/4 Mile" << "0-1/8 Mile" << "0-50 km" << "50-100 Mile" << "0-60 Mph" << "0-100 m" << "0-50 ft" << "0-50 yrd" << "0-500 in";
+     QAbstractItemModel *model = new StringListModel(accelerationCategoriesStartTab);
+     ui->listViewStartTabAccelerationCategories->setModel(model);
  }
  
  /**
-   *This function is used to set items to speed listview. Start-tab view.
-   *@param QStringlist numbers
+   *This function is used to set items to listViewStartTabAccelerationCategories. Start-tab view.
+   *@param QStringlist accelerationCategoriesStartTab
    */
- void CarMainWindow::setSpeedListView(QStringList numbers)
+ void CarMainWindow::setListViewStartTabAccelerationCategories(QStringList accelerationCategoriesStartTab)
  {
-     QAbstractItemModel *model = new StringListModel(numbers);
-     ui->listView->setModel(model);
+     QAbstractItemModel *model = new StringListModel(accelerationCategoriesStartTab);
+     ui->listViewStartTabAccelerationCategories->setModel(model);
  }
  
  /**
@@@ -229,14 -229,3 +229,14 @@@ void CarMainWindow::on_comboBoxTopCateg
  {
      setListViewTopList(category);
  }
 +
 +/**
 +  *This slot function is called when set/change user button is clicked.
 +  */
 +void CarMainWindow::on_setUserPushButton_clicked()
 +{
 +    myLogin->show();
 +
 +    ui->userNameLabel->setText( "User: " + myLogin->getUserName());
 +    ui->setUserPushButton->setText( "Change User");
 +}

diff --combined Client/carmainwindow.ui
index f338cb3,43adb32..0df2dae
--- 1/Client/carmainwindow.ui
--- 2/Client/carmainwindow.ui
+++ b/Client/carmainwindow.ui
@@@ -11,7 -11,7 +11,7 @@@
     </rect>
    </property>
    <property name="windowTitle">
-    <string>CarMainWindow</string>
+    <string>Speed freak</string>
    </property>
    <widget class="QWidget" name="centralWidget">
     <widget class="QTabWidget" name="tabWidget">
@@@ -24,7 -24,7 +24,7 @@@
       </rect>
      </property>
      <property name="currentIndex">
 -     <number>0</number>
 +     <number>2</number>
      </property>
      <widget class="QWidget" name="StartTab">
       <attribute name="title">
@@@ -72,7 -72,7 +72,7 @@@
         </item>
        </layout>
       </widget>
-      <widget class="QListView" name="listView">
+      <widget class="QListView" name="listViewStartTabAccelerationCategories">
        <property name="geometry">
         <rect>
          <x>0</x>
@@@ -100,7 -100,7 +100,7 @@@
          </widget>
         </item>
         <item>
-         <widget class="QLineEdit" name="minLineEdit"/>
+         <widget class="QLineEdit" name="lineEditStartTabMin"/>
         </item>
         <item>
          <widget class="QLabel" name="stopLabel">
@@@ -110,7 -110,7 +110,7 @@@
          </widget>
         </item>
         <item>
-         <widget class="QLineEdit" name="maxLineEdit"/>
+         <widget class="QLineEdit" name="lineEditStartTabMax"/>
         </item>
         <item>
          <widget class="QLabel" name="unitLabel">
@@@ -120,7 -120,7 +120,7 @@@
          </widget>
         </item>
         <item>
-         <widget class="QComboBox" name="unitComboBox"/>
+         <widget class="QComboBox" name="comboBoxStartTabUnits"/>
         </item>
        </layout>
       </widget>
@@@ -223,32 -223,6 +223,32 @@@
       <attribute name="title">
        <string>Settings</string>
       </attribute>
 +     <widget class="QLabel" name="userNameLabel">
 +      <property name="geometry">
 +       <rect>
 +        <x>20</x>
 +        <y>30</y>
 +        <width>141</width>
 +        <height>17</height>
 +       </rect>
 +      </property>
 +      <property name="text">
 +       <string>User:</string>
 +      </property>
 +     </widget>
 +     <widget class="QPushButton" name="setUserPushButton">
 +      <property name="geometry">
 +       <rect>
 +        <x>20</x>
 +        <y>60</y>
 +        <width>93</width>
 +        <height>27</height>
 +       </rect>
 +      </property>
 +      <property name="text">
 +       <string>Set User</string>
 +      </property>
 +     </widget>
      </widget>
     </widget>
     <widget class="QWidget" name="layoutWidget">
@@@ -291,10 -265,23 +291,10 @@@
       </item>
      </layout>
     </widget>
     <widget class="QPushButton" name="registratePushButton">
      <property name="geometry">
       <rect>
 -      <x>580</x>
 +      <x>690</x>
        <y>0</y>
        <width>93</width>
        <height>27</height>