Route and Results buttons updated.

[speedfreak] / Client / mainwindow.h

diff --git a/Client/mainwindow.h b/Client/mainwindow.h
index d09cc51..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
  */
@@ -25,6 +26,7 @@
 #include "routedialog.h"
 #include "resultdialog.h"
 #include "helpdialog.h"
+#include "custombutton.h"
 
 
 namespace Ui {
@@ -39,13 +41,12 @@ public:
 
     //CreditsDialog *creditsDialog;
     RouteSaveDialog *routeSaveDialog;
-    RouteDialog *routeDialog;
+    //RouteDialog *routeDialog;
     WelcomeDialog *welcomeDialog;
     SettingsDialog *settingsDialog;
     accelerationstart* accstart;
     TopResultDialog *topResultDialog;
     HttpClient *httpClient;
-    ResultDialog *resultDialog;
     HelpDialog *helpDialog;
 
 protected:
@@ -55,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();
@@ -67,9 +69,14 @@ private slots:
     void clientSendRoute();
     void clientRegUserToServer();
     void clientUserLogin();
-    void clientSendResult(QString, double);
+    void clientSendResult(QString category, double result);
     void setCategoryCompoBox();
     void showTop10();
+    void killDialog();
+    void setUsernameToMainPanel();
+    void OpenAccStartDialog();
+    void OpenRouteDialog();
+    void OpenResultDialog();
 
 };