Integrated registration & login dialogs to UI

diff --git a/Client/UI.pro b/Client/UI.pro
index 97de2a2..2d5e8c6 100644 (file)
--- a/Client/UI.pro
+++ b/Client/UI.pro
@@ -11,15 +11,19 @@ SOURCES += main.cpp \
     stringlistmodel.cpp \
     measuredialog.cpp \
     calculate.cpp \
-    accelerometer.cpp
-
+    accelerometer.cpp \
+    loginwindow.cpp \
+    registration.cpp
 HEADERS += carmainwindow.h \
     resultdialog.h \
     stringlistmodel.h \
     measuredialog.h \
     accelerometer.h \
-    calculate.h
-
+    calculate.h \
+    loginwindow.h \
+    registration.h
 FORMS += carmainwindow.ui \
     resultdialog.ui \
-    measuredialog.ui
+    measuredialog.ui \
+    loginwindow.ui \
+    registration.ui

diff --git a/Client/carmainwindow.cpp b/Client/carmainwindow.cpp
index b8af9fe..9b6c57e 100644 (file)
--- a/Client/carmainwindow.cpp
+++ b/Client/carmainwindow.cpp
@@ -1,9 +1,11 @@
 #include "carmainwindow.h"
 #include "ui_carmainwindow.h"
 #include "stringlistmodel.h"
+#include "loginwindow.h"
 #include <QStandardItemModel>
 #include <QStringList>
 #include <QString>
+#include <QNetworkRequest>
 
 /**
   *Constructor of this class.
@@ -18,6 +20,12 @@ CarMainWindow::CarMainWindow(QWidget *parent):QMainWindow(parent), ui(new Ui::Ca
     initUnitCompoBox();
     initSpeedListView();
     initCategoryCompoBox();
+
+    myLogin = new LoginWindow(this);
+    myRegistration = new Registration(this);
+    manager = new QNetworkAccessManager(this);
+    connect(manager,SIGNAL(finished(QNetworkReply*)),this,SLOT(networkResponse(QNetworkReply*)));
+
 }
 
 /**
@@ -168,3 +176,40 @@ void CarMainWindow::openResultView()
     // Show result dialog.
     result->show();
 }
+
+/**
+  *This slot function is called when the server has finished guery.
+  */
+void CarMainWindow::networkResponse(QNetworkReply *reply)
+{
+}
+
+/**
+  *This slot function is called when the user will to send data to server.
+  */
+void CarMainWindow::on_pushButton_clicked()
+{
+     QNetworkRequest postData;
+     postData.setUrl(QString("http://weather.yahooapis.com/forecastrss?p=FIXX0013&u=c"));
+     manager->get(postData);
+
+}
+
+/**
+  *This slot function is called when login/logout button is clicked.
+  */
+void CarMainWindow::on_loginLogoutButton_clicked()
+{
+    //LoginWindow myLogin;
+
+    myLogin->show();
+    //ui->loginLogoutButton->setText("logout");
+}
+
+/**
+  *This slot function is called when registrate button is clicked.
+  */
+void CarMainWindow::on_registratePushButton_clicked()
+{
+    myRegistration->show();
+}

diff --git a/Client/carmainwindow.h b/Client/carmainwindow.h
index 198bb30..8ed6d9b 100644 (file)
--- a/Client/carmainwindow.h
+++ b/Client/carmainwindow.h
@@ -10,8 +10,11 @@
 #include <QMainWindow>
 #include <QModelIndex>
 #include <QStringList>
+#include <QNetworkAccessManager>
 #include "resultdialog.h"
 #include "measuredialog.h"
+#include "loginwindow.h"
+#include "registration.h"
 
 namespace Ui {
     class CarMainWindow;
@@ -35,6 +38,10 @@ private:
     ResultDialog *result;
     MeasureDialog *measure;
 
+    QNetworkAccessManager* manager;
+    LoginWindow *myLogin;
+    Registration *myRegistration;
+
     void initUnitCompoBox();
     void initSpeedListView();
     void initCategoryCompoBox();
@@ -45,11 +52,16 @@ private:
     QStringList categories;
 
 private slots:
+    void on_registratePushButton_clicked();
+    void on_loginLogoutButton_clicked();
     void on_comboBoxTopCategory_activated(QString );
     void on_autoStartButton_clicked();
     void on_listView_clicked(QModelIndex index);
     void updateUnitCompoBox(QString unit);
     void openResultView();
+
+    void on_pushButton_clicked();
+    void networkResponse(QNetworkReply*);
 };
 
 #endif // CARMAINWINDOW_H

diff --git a/Client/carmainwindow.ui b/Client/carmainwindow.ui
index af62383..75ca6ab 100644 (file)
--- a/Client/carmainwindow.ui
+++ b/Client/carmainwindow.ui
@@ -24,7 +24,7 @@
      </rect>
     </property>
     <property name="currentIndex">
-     <number>1</number>
+     <number>2</number>
     </property>
     <widget class="QWidget" name="StartTab">
      <attribute name="title">
@@ -169,7 +169,7 @@
        <enum>QListView::LeftToRight</enum>
       </property>
      </widget>
-     <widget class="QWidget" name="">
+     <widget class="QWidget" name="layoutWidget">
       <property name="geometry">
        <rect>
         <x>10</x>
@@ -244,6 +244,32 @@
      </item>
     </layout>
    </widget>
+   <widget class="QPushButton" name="loginLogoutButton">
+    <property name="geometry">
+     <rect>
+      <x>690</x>
+      <y>0</y>
+      <width>93</width>
+      <height>27</height>
+     </rect>
+    </property>
+    <property name="text">
+     <string>Login</string>
+    </property>
+   </widget>
+   <widget class="QPushButton" name="registratePushButton">
+    <property name="geometry">
+     <rect>
+      <x>580</x>
+      <y>0</y>
+      <width>93</width>
+      <height>27</height>
+     </rect>
+    </property>
+    <property name="text">
+     <string>Registrate</string>
+    </property>
+   </widget>
   </widget>
   <widget class="QMenuBar" name="menuBar">
    <property name="geometry">

diff --git a/Client/loginwindow.cpp b/Client/loginwindow.cpp
index 28d53ab..0b4e6cf 100644 (file)
--- a/Client/loginwindow.cpp
+++ b/Client/loginwindow.cpp
@@ -1,5 +1,6 @@
 #include "loginwindow.h"
 #include "ui_loginwindow.h"
+#include <QMessageBox>
 
 LoginWindow::LoginWindow(QWidget *parent) :
     QDialog(parent),
@@ -36,6 +37,8 @@ void LoginWindow::on_loginPushButton_clicked()
     // To do
     //loginToServer(ui->userNameLineEdit->text(),
     //              ui->passwordLineEdit->text());
+    //close();
+    QMessageBox::about(this,"Login",ui->userNameLineEdit->text()+ui->passwordLineEdit->text());
 }
 
 

diff --git a/Client/registration.cpp b/Client/registration.cpp
index 10c610c..de79f57 100644 (file)
--- a/Client/registration.cpp
+++ b/Client/registration.cpp
@@ -1,5 +1,6 @@
 #include "registration.h"
 #include "ui_registration.h"
+#include <QMessageBox>
 
 Registration::Registration(QWidget *parent) :
     QDialog(parent),
@@ -29,10 +30,11 @@ void Registration::changeEvent(QEvent *e)
 void Registration::on_registratePushButton_clicked()
 {
     // Send username, password and email to SpeedFreak server
-    close();  // Needs some new signal/slot to go forward or ???
+    //close();  // Needs some new signal/slot to go forward or ???
     //registrateToServer(ui->newUsernameLineEdit->text(),
     //                   ui->newPasswordLineEdit->text(),
     //                   ui->eMailLineEdit->text());
+    QMessageBox::about(this,"Registrate",ui->newUsernameLineEdit->text()+ui->newPasswordLineEdit->text()+ui->eMailLineEdit->text());
 }
 
 void Registration::on_cancelPushButton_clicked()