Merge branch 'feature/XMLreader'

Conflicts:
	Client/UI.pro
	Client/carmainwindow.cpp
	Client/carmainwindow.h
	Client/carmainwindow.ui

diff --cc Client/UI.pro
index e19d071,dfacc94..590687e
--- 1/Client/UI.pro
--- 2/Client/UI.pro
+++ b/Client/UI.pro
@@@ -12,22 -12,14 +12,26 @@@ SOURCES += main.cpp 
      measuredialog.cpp \
      calculate.cpp \
      accelerometer.cpp \
 +    loginwindow.cpp \
 +    registration.cpp \
 +    measures.cpp \
-     xmlwriter.cpp
++    xmlwriter.cpp \
+     xmlreader.cpp
++
  HEADERS += carmainwindow.h \
      resultdialog.h \
      stringlistmodel.h \
      measuredialog.h \
      accelerometer.h \
      calculate.h \
 +    loginwindow.h \
 +    registration.h \
 +    measures.h \
-     xmlwriter.h
++    xmlwriter.h \
+     xmlreader.h
++
  FORMS += carmainwindow.ui \
      resultdialog.ui \
 -    measuredialog.ui
 +    measuredialog.ui \
 +    loginwindow.ui \
 +    registration.ui

diff --cc Client/carmainwindow.cpp
index c698f4c,b730a69..d340d19
--- 1/Client/carmainwindow.cpp
--- 2/Client/carmainwindow.cpp
+++ b/Client/carmainwindow.cpp
@@@ -19,13 -13,6 +13,16 @@@ CarMainWindow::CarMainWindow(QWidget *p
  
      initUnitCompoBox();
      initSpeedListView();
++<<<<<<< HEAD:Client/carmainwindow.cpp
 +    initCategoryCompoBox();
 +
 +    myLogin = new LoginWindow(this);
 +    myRegistration = new Registration(this);
 +    manager = new QNetworkAccessManager(this);
 +    connect(manager,SIGNAL(finished(QNetworkReply*)),this,SLOT(networkResponse(QNetworkReply*)));
 +
++=======
++>>>>>>> feature/XMLreader:Client/carmainwindow.cpp
  }
  
  /**
@@@ -116,7 -106,7 +113,11 @@@ void CarMainWindow::setUnitCompoBox(QSt
    */
  void CarMainWindow::initSpeedListView()
  {
++<<<<<<< HEAD:Client/carmainwindow.cpp
 +    numbers << "0-40 km/h" << "0-1/4 mil" << "0-50 km" << "50-100 mil" << "0-100 m" << "0-50 ft" << "0-50 yrd" << "0-500 in";
++=======
+     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";
++>>>>>>> feature/XMLreader:Client/carmainwindow.cpp
      QAbstractItemModel *model = new StringListModel(numbers);
      ui->listView->setModel(model);
  }
@@@ -176,38 -165,18 +177,55 @@@ void CarMainWindow::openResultView(
  }
  
  /**
++<<<<<<< HEAD:Client/carmainwindow.cpp
 +  *This slot function is called when the server has finished guery.
 +  */
 +void CarMainWindow::networkResponse(QNetworkReply *reply)
 +{
 +}
 +
 +/**
 +  *This slot function is called when the user will to send data to server.
 +  */
 +void CarMainWindow::on_pushButton_clicked()
 +{
 +     QNetworkRequest postData;
 +     postData.setUrl(QString("http://weather.yahooapis.com/forecastrss?p=FIXX0013&u=c"));
 +     manager->get(postData);
 +
 +}
 +
 +/**
 +  *This slot function is called when login/logout button is clicked.
 +  */
 +void CarMainWindow::on_loginLogoutButton_clicked()
 +{
 +    //LoginWindow myLogin;
 +
 +    myLogin->show();
 +    //ui->loginLogoutButton->setText("logout");
 +}
 +
 +/**
 +  *This slot function is called when registrate button is clicked.
 +  */
 +void CarMainWindow::on_registratePushButton_clicked()
 +{
 +    myRegistration->show();
++=======
+   *This slot function is called when ever refresh button clicked. Top-tab view.
+   */
+ void CarMainWindow::on_buttonTopRefresh_clicked()
+ {
+     setCategoryCompoBox();
+ }
+ 
+ /**
+   *This slot function is called when ever category combobox current index changed. Top-tab view.
+   *@param QString category
+   */
+ void CarMainWindow::on_comboBoxTopCategory_currentIndexChanged(QString category)
+ {
+     setListViewTopList(category);
++>>>>>>> feature/XMLreader:Client/carmainwindow.cpp
  }

diff --cc Client/carmainwindow.h
index 8ed6d9b,8071d08..c6c0963
--- 1/Client/carmainwindow.h
--- 2/Client/carmainwindow.h
+++ b/Client/carmainwindow.h
@@@ -1,20 -1,16 +1,21 @@@
  #ifndef CARMAINWINDOW_H
  #define CARMAINWINDOW_H
  
- /**
-   *This class
-   *@author Toni Jussila
-   *@version 0.0.1
-   */
- 
  #include <QMainWindow>
+ #include <QStandardItemModel>
  #include <QModelIndex>
  #include <QStringList>
+ #include <QString>
 +#include <QNetworkAccessManager>
++#include <QStandardItemModel>
++#include <QNetworkRequest>
  #include "resultdialog.h"
  #include "measuredialog.h"
 +#include "loginwindow.h"
 +#include "registration.h"
+ #include "xmlreader.h"
+ #include "ui_carmainwindow.h"
+ #include "stringlistmodel.h"
  
  namespace Ui {
      class CarMainWindow;
@@@ -37,31 -34,24 +39,31 @@@ private
      Ui::CarMainWindow *ui;
      ResultDialog *result;
      MeasureDialog *measure;
- 
+     XmlReader *xmlreader;
 -
 +    QNetworkAccessManager* manager;
 +    LoginWindow *myLogin;
 +    Registration *myRegistration;
- 
-     void initUnitCompoBox();
-     void initSpeedListView();
 +    void initCategoryCompoBox();
+     void initUnitCompoBox();    //Start-tab
+     void initSpeedListView();   //Start-tab
  
  private:
-     QStringList numbers;
-     QStringList units;
-     QStringList categories;
+     QStringList numbers; //Start-tab
+     QStringList units;  //Start-tab
+     QStringList categories; //Top-tab
  
  private slots:
 +    void on_registratePushButton_clicked();
 +    void on_loginLogoutButton_clicked();
 +    void on_comboBoxTopCategory_activated(QString );
-     void on_autoStartButton_clicked();
-     void on_listView_clicked(QModelIndex index);
-     void updateUnitCompoBox(QString unit);
-     void openResultView();
- 
 +    void on_pushButton_clicked();
 +    void networkResponse(QNetworkReply*);
+     void on_comboBoxTopCategory_currentIndexChanged(QString category); //Top-tab
+     void on_listView_clicked(QModelIndex index); //Start-tab
+     void updateUnitCompoBox(QString unit);  //Start-tab
+     void openResultView();
+     void on_buttonTopRefresh_clicked(); //Top-tab: button
+     void on_autoStartButton_clicked();  //Start-tab: button
 -
  };
  
  #endif // CARMAINWINDOW_H

diff --cc Client/carmainwindow.ui
Simple merge