Merge branch 'feature/routesavedialog'

diff --combined Client/mainwindow.cpp
index 02a7e54,c19d5d1..91ca8a4
--- 1/Client/mainwindow.cpp
--- 2/Client/mainwindow.cpp
+++ b/Client/mainwindow.cpp
@@@ -1,11 -1,3 +1,11 @@@
 +/*
 + * Mainwindow for speedFreak project
 + *
 + * @author      Rikhard Kuutti <rikhard.kuutti@fudeco.com>
 + * @copyright   (c) 2010 Speed Freak team
 + * @license     http://opensource.org/licenses/gpl-license.php GNU Public License
 + */
 +
  #include "mainwindow.h"
  #include "ui_mainwindow.h"
  
@@@ -19,11 -11,14 +19,14 @@@ MainWindow::MainWindow(QWidget *parent
      ui->setupUi(this);
  
      creditsDialog = new CreditsDialog;
+     routeSaveDialog = new RouteSaveDialog;
  }
  
  MainWindow::~MainWindow()
  {
      delete ui;
+ 
+     delete routeSaveDialog;
  }
  
  void MainWindow::changeEvent(QEvent *e)
@@@ -47,3 -42,8 +50,8 @@@ void MainWindow::on_pushButtonCredits_c
  {
      creditsDialog->show();
  }
+ 
+ void MainWindow::on_pushButtonRoute_clicked()
+ {
+     routeSaveDialog->show();
+ }

diff --combined Client/mainwindow.h
index 2b4e191,f949630..3299ba8
--- 1/Client/mainwindow.h
--- 2/Client/mainwindow.h
+++ b/Client/mainwindow.h
@@@ -1,16 -1,9 +1,17 @@@
 +/*
 + * Mainwindow for speedFreak project
 + *
 + * @author      Rikhard Kuutti <rikhard.kuutti@fudeco.com>
 + * @copyright   (c) 2010 Speed Freak team
 + * @license     http://opensource.org/licenses/gpl-license.php GNU Public License
 + */
 +
  #ifndef MAINWINDOW_H
  #define MAINWINDOW_H
  
  #include <QMainWindow>
  #include "creditsdialog.h"
+ #include "routesavedialog.h"
  
  namespace Ui {
      class MainWindow;
@@@ -23,6 -16,7 +24,7 @@@ public
      ~MainWindow();
  
      CreditsDialog *creditsDialog;
+     RouteSaveDialog *routeSaveDialog;
  
  protected:
      void changeEvent(QEvent *e);
@@@ -31,6 -25,7 +33,7 @@@ private
      Ui::MainWindow *ui;
  
  private slots:
+     void on_pushButtonRoute_clicked();
      void on_pushButtonCredits_clicked();
      void on_pushButtonWWW_clicked();
  };