Route and Results buttons updated.

[speedfreak] / Client / mainwindow.h

diff --git a/Client/mainwindow.h b/Client/mainwindow.h
index 58975a4..4fbdb0d 100644 (file)
--- 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,7 +15,7 @@
 #include <QNetworkRequest>
 #include <QNetworkReply>
 #include <QMessageBox>
-#include "creditsdialog.h"
+//#include "creditsdialog.h"
 #include "routesavedialog.h"
 #include "routedialog.h"
 #include "welcomedialog.h"
@@ -24,6 +25,8 @@
 #include "httpclient.h"
 #include "routedialog.h"
 #include "resultdialog.h"
+#include "helpdialog.h"
+#include "custombutton.h"
 
 
 namespace Ui {
@@ -36,15 +39,15 @@ public:
     MainWindow(QWidget *parent = 0);
     ~MainWindow();
 
-    CreditsDialog *creditsDialog;
+    //CreditsDialog *creditsDialog;
     RouteSaveDialog *routeSaveDialog;
-    RouteDialog *routeDialog;
+    //RouteDialog *routeDialog;
     WelcomeDialog *welcomeDialog;
     SettingsDialog *settingsDialog;
     accelerationstart* accstart;
     TopResultDialog *topResultDialog;
     HttpClient *httpClient;
-    ResultDialog *resultDialog;
+    HelpDialog *helpDialog;
 
 protected:
     void changeEvent(QEvent *e);
@@ -53,11 +56,12 @@ private:
     Ui::MainWindow *ui;
     void setListViewTopList(QString category, int size);
 
+    CustomButton* customButtonAccelerate;
+    CustomButton* customButtonRoute;
+    CustomButton* customButtonResults;
+
 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 clientRequestCategoryList();
@@ -65,9 +69,15 @@ private slots:
     void clientSendRoute();
     void clientRegUserToServer();
     void clientUserLogin();
-    void clientSendResult(double result);
+    void clientSendResult(QString category, double result);
     void setCategoryCompoBox();
     void showTop10();
+    void killDialog();
+    void setUsernameToMainPanel();
+    void OpenAccStartDialog();
+    void OpenRouteDialog();
+    void OpenResultDialog();
+
 };
 
 #endif // MAINWINDOW_H