X-Git-Url: http://git.maemo.org/git/?p=speedfreak;a=blobdiff_plain;f=Client%2Fmainwindow.h;h=9a5854e292f6ac39398d81b828a5b9156779be46;hp=f05a62cc33ed2defca7d9db2ed75634bb3f21618;hb=e5d88e68d49f961be9edd1ee1a390c6b0fb88094;hpb=9bcfcd7c2bf5ae2071d8d9d0d2242ab97789f78e

diff --git a/Client/mainwindow.h b/Client/mainwindow.h
index f05a62c..9a5854e 100644
--- a/Client/mainwindow.h
+++ b/Client/mainwindow.h
@@ -1,7 +1,8 @@
 /*
  * Mainwindow for speedFreak project
  *
- * @author      Rikhard Kuutti <rikhard.kuutti@fudeco.com>
+ * @author      Rikhard Kuutti  <rikhard.kuutti@fudeco.com>
+ * @author      Toni Jussila 	<toni.jussila@fudeco.com>
  * @copyright   (c) 2010 Speed Freak team
  * @license     http://opensource.org/licenses/gpl-license.php GNU Public License
  */
@@ -14,13 +15,20 @@
 #include <QNetworkRequest>
 #include <QNetworkReply>
 #include <QMessageBox>
-#include "creditsdialog.h"
+//#include "creditsdialog.h"
 #include "routesavedialog.h"
+#include "routedialog.h"
 #include "welcomedialog.h"
 #include "settingsdialog.h"
 #include "accelerationstart.h"
 #include "topresultdialog.h"
 #include "httpclient.h"
+#include "routedialog.h"
+#include "resultdialog.h"
+#include "helpdialog.h"
+#include "custombutton.h"
+#include "usersdialog.h"
+
 
 namespace Ui {
     class MainWindow;
@@ -32,13 +40,16 @@ public:
     MainWindow(QWidget *parent = 0);
     ~MainWindow();
 
-    CreditsDialog *creditsDialog;
+    //CreditsDialog *creditsDialog;
     RouteSaveDialog *routeSaveDialog;
+    //RouteDialog *routeDialog;
     WelcomeDialog *welcomeDialog;
     SettingsDialog *settingsDialog;
     accelerationstart* accstart;
     TopResultDialog *topResultDialog;
     HttpClient *httpClient;
+    HelpDialog *helpDialog;
+    UsersDialog *usersDialog;
 
 protected:
     void changeEvent(QEvent *e);
@@ -47,19 +58,34 @@ private:
     Ui::MainWindow *ui;
     void setListViewTopList(QString category, int size);
 
+    CustomButton* customButtonAccelerate;
+    CustomButton* customButtonRoute;
+    CustomButton* customButtonResults;
+    CustomButton* customButtonSettings;
+    CustomButton* customButtonWWW;
+    CustomButton* customButtonHelp;
+
 private slots:
-    void on_pushButtonResults_clicked();
-    void on_pushButtonAccelerate_clicked();
-    void on_pushButtonSettings_clicked();
-    void on_pushButtonRoute_clicked();
-    void on_pushButtonCredits_clicked();
-    void on_pushButtonWWW_clicked();
+    void on_pushButtonUsers_clicked();    
     void clientRequestCategoryList();
     void clientRequestTopList(int index);
+    void clientSendRoute(QString,QString,int);
+    void clientRegUserToServer();
+    void clientUserLogin();
+    void clientSendResult(QString category, double result);
     void setCategoryCompoBox();
     void showTop10();
-    void regUserToServer();
-    void userLogin();
+    void killDialog();
+    void setUsernameToMainPanel();
+    void OpenAccStartDialog();
+    void OpenRouteDialog();
+    void OpenResultDialog();
+    void saveProfile();
+    void OpenWWWPage();
+    void OpenHelpDialog();
+    void OpenSettingsDialog();
+    void requestGetUserInfo(QString);
+    void requestGetUsers();
 };
 
 #endif // MAINWINDOW_H