Merge branch 'feature/popups'

Conflicts:
	Client/mainwindow.cpp
	Client/mainwindow.h

diff --cc Client/accelerationstart.cpp
Simple merge

diff --cc Client/accelerationstart.h
Simple merge

diff --cc Client/mainwindow.cpp
index cbe7846,1844859..bb1e671
--- 1/Client/mainwindow.cpp
--- 2/Client/mainwindow.cpp
+++ b/Client/mainwindow.cpp
@@@ -25,12 -24,15 +25,16 @@@ MainWindow::MainWindow(QWidget *parent
      QCoreApplication::setOrganizationDomain("fudeco.com");
      QCoreApplication::setApplicationName("Speed Freak");
  
 +    routeDialog = new RouteDialog;
+     accstart = NULL;
+ 
      creditsDialog = new CreditsDialog;
      routeSaveDialog = new RouteSaveDialog;
+     routeDialog = new RouteDialog;
+     connect(routeDialog,SIGNAL(sendroute()),this,SLOT(clientSendRoute()));
      settingsDialog = new SettingsDialog;
-     connect(settingsDialog,SIGNAL(sendregistration()),this,SLOT(regUserToServer()));
-     connect(settingsDialog,SIGNAL(userNameChanged()),this,SLOT(userLogin()));
+     connect(settingsDialog,SIGNAL(sendregistration()),this,SLOT(clientRegUserToServer()));
+     connect(settingsDialog,SIGNAL(userNameChanged()),this,SLOT(clientUserLogin()));
      topResultDialog = new TopResultDialog;
      connect(topResultDialog, SIGNAL(refreshCategoryList()), this, SLOT(clientRequestCategoryList()));
      connect(topResultDialog, SIGNAL(refreshTopList(int)), this, SLOT(clientRequestTopList(int)));
@@@ -190,10 -153,7 +187,10 @@@ void MainWindow::clientRegUserToServer(
      httpClient->requestRegistration();
  }
  
 +/**
 +  * This function performs login to server
 +  */
- void MainWindow::userLogin()
+ void MainWindow::clientUserLogin()
  {
      httpClient->checkLogin();
  }

diff --cc Client/mainwindow.h
index 16272c0,b4f1d27..f8eea7c
--- 1/Client/mainwindow.h
--- 2/Client/mainwindow.h
+++ b/Client/mainwindow.h
@@@ -21,8 -22,8 +22,10 @@@
  #include "accelerationstart.h"
  #include "topresultdialog.h"
  #include "httpclient.h"
 +#include "routedialog.h"
+ #include "resultdialog.h"
+ 
 +
  namespace Ui {
      class MainWindow;
  }
@@@ -40,7 -42,7 +44,8 @@@ public
      accelerationstart* accstart;
      TopResultDialog *topResultDialog;
      HttpClient *httpClient;
 +    RouteDialog *routeDialog;
+     ResultDialog *resultDialog;
  
  protected:
      void changeEvent(QEvent *e);

diff --cc Client/resultdialog.cpp
Simple merge

diff --cc Client/routedialog.cpp
Simple merge

diff --cc Client/settingsdialog.cpp
index 51d3565,b62335b..b619576
--- 1/Client/settingsdialog.cpp
--- 2/Client/settingsdialog.cpp
+++ b/Client/settingsdialog.cpp
@@@ -16,23 -7,8 +16,23 @@@ SettingsDialog::SettingsDialog(QWidget 
  {
      ui->setupUi(this);
      this->setWindowTitle("Settings");
-     this->ui->regEMailLineEdit->setText("@meili.fi");
+     this->ui->regEMailLineEdit->setText("@");
      instructionsDialog = new InstructionsDialog;
 +
 +    if (loginSaved())
 +    {
 +        QString uName, pWord;
 +
 +        getLoginInfo( &uName, &pWord);
 +        this->username = uName;
 +        this->password = pWord;
 +
 +        ui->setUserPasswordLineEdit->setText(this->password);
 +        ui->setUserUsernameLineEdit->setText(this->username);
 +
 +        // Already someone as user - change button text to "Change"
 +        ui->setUserPushButton->setText("Change user");
 +    }
  }
  
  SettingsDialog::~SettingsDialog()
@@@ -115,21 -91,9 +115,22 @@@ void SettingsDialog::on_setUserPushButt
      this->username = ui->setUserUsernameLineEdit->text();
      this->password = ui->setUserPasswordLineEdit->text();
  
 +    // Save these also to usersettings
 +    saveLogin( this->username, this->password);
 +
 +    // Set "Set/Change User" button text
 +    if (this->username.length() > 0)
 +    {
 +        ui->setUserPushButton->setText("Change user");
 +    }
 +    else
 +    {   // Username "cleared"
 +        ui->setUserPushButton->setText("Set user");
 +    }
 +
      emit userNameChanged();
-     close();
+ 
+     //close();  //using close() hides popup-window which reports error from server
  }
  
  // Next 4 functions can be removed if Settingsdialog is implemented without

diff --cc Client/settingsdialog.h
Simple merge