Merge branch 'feature/XMLreader'

[speedfreak] / Client / carmainwindow.h

diff --git a/Client/carmainwindow.h b/Client/carmainwindow.h
index 8ed6d9b..c6c0963 100644 (file)
--- a/Client/carmainwindow.h
+++ b/Client/carmainwindow.h
@@ -1,20 +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;
@@ -26,9 +27,10 @@ public:
     CarMainWindow(QWidget *parent = 0);
     ~CarMainWindow();
 
-    void setUnitCompoBox(QStringList units);
-    void setSpeedListView(QStringList numbers);
-    void setCategoryCompoBox(QStringList categories);
+    void setUnitCompoBox(QStringList units);    //Start-tab
+    void setSpeedListView(QStringList numbers); //Start-tab
+    void setListViewTopList(QString category);  //Top-tab
+    void setCategoryCompoBox(); //Top-tab
 
 protected:
     void changeEvent(QEvent *e);
@@ -37,31 +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