Updated Set user & Registration

diff --git a/Client/carmainwindow.cpp b/Client/carmainwindow.cpp
index 4fc04f3..cd88257 100644 (file)
--- a/Client/carmainwindow.cpp
+++ b/Client/carmainwindow.cpp
@@ -229,3 +229,14 @@ void CarMainWindow::on_comboBoxTopCategory_activated(QString category)
 {
     setListViewTopList(category);
 }
+
+/**
+  *This slot function is called when set/change user button is clicked.
+  */
+void CarMainWindow::on_setUserPushButton_clicked()
+{
+    myLogin->show();
+
+    ui->userNameLabel->setText( "User: " + myLogin->getUserName());
+    ui->setUserPushButton->setText( "Change User");
+}

diff --git a/Client/carmainwindow.ui b/Client/carmainwindow.ui
index a7c48c1..f338cb3 100644 (file)
--- a/Client/carmainwindow.ui
+++ b/Client/carmainwindow.ui
@@ -24,7 +24,7 @@
      </rect>
     </property>
     <property name="currentIndex">
-     <number>0</number>
+     <number>2</number>
     </property>
     <widget class="QWidget" name="StartTab">
      <attribute name="title">
@@ -223,6 +223,32 @@
      <attribute name="title">
       <string>Settings</string>
      </attribute>
+     <widget class="QLabel" name="userNameLabel">
+      <property name="geometry">
+       <rect>
+        <x>20</x>
+        <y>30</y>
+        <width>141</width>
+        <height>17</height>
+       </rect>
+      </property>
+      <property name="text">
+       <string>User:</string>
+      </property>
+     </widget>
+     <widget class="QPushButton" name="setUserPushButton">
+      <property name="geometry">
+       <rect>
+        <x>20</x>
+        <y>60</y>
+        <width>93</width>
+        <height>27</height>
+       </rect>
+      </property>
+      <property name="text">
+       <string>Set User</string>
+      </property>
+     </widget>
     </widget>
    </widget>
    <widget class="QWidget" name="layoutWidget">
@@ -265,23 +291,10 @@
      </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>
+      <x>690</x>
       <y>0</y>
       <width>93</width>
       <height>27</height>

diff --git a/Client/loginwindow.cpp b/Client/loginwindow.cpp
index 0b4e6cf..e8b816b 100644 (file)
--- a/Client/loginwindow.cpp
+++ b/Client/loginwindow.cpp
@@ -32,14 +32,36 @@ void LoginWindow::on_cancelPushButton_clicked()
     close();
 }
 
+void setUser(QString uN, QString pW);
+
 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());
+    this->username = ui->userNameLineEdit->text();
+    this->password = ui->passwordLineEdit->text();
+    close();
+}
+
+void LoginWindow::setUserName(QString username)
+{
+    this->username = username;
+}
+
+void LoginWindow::setPassword(QString password)
+{
+    this->password = password;
 }
 
+QString LoginWindow::getUserName()
+{
+    return this->username;
+}
+
+QString LoginWindow::getPassword()
+{
+    return this->password;
+}
+
+
+
 
 

diff --git a/Client/loginwindow.h b/Client/loginwindow.h
index b5f9c1b..51c5a2c 100644 (file)
--- a/Client/loginwindow.h
+++ b/Client/loginwindow.h
@@ -12,12 +12,18 @@ class LoginWindow : public QDialog {
 public:
     LoginWindow(QWidget *parent = 0);
     ~LoginWindow();
+    void setUserName(QString username);
+    void setPassword(QString password);
+    QString getUserName();
+    QString getPassword();
 
 protected:
     void changeEvent(QEvent *e);
 
 private:
     Ui::LoginWindow *ui;
+    QString username;
+    QString password;
 
 private slots:
     void on_loginPushButton_clicked();

diff --git a/Client/registration.cpp b/Client/registration.cpp
index de79f57..eae469f 100644 (file)
--- a/Client/registration.cpp
+++ b/Client/registration.cpp
@@ -30,11 +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 ???
-    //registrateToServer(ui->newUsernameLineEdit->text(),
-    //                   ui->newPasswordLineEdit->text(),
-    //                   ui->eMailLineEdit->text());
-    QMessageBox::about(this,"Registrate",ui->newUsernameLineEdit->text()+ui->newPasswordLineEdit->text()+ui->eMailLineEdit->text());
+    this->username = ui->newUsernameLineEdit->text();
+    this->password = ui->newPasswordLineEdit->text();
+    this->email = ui->eMailLineEdit->text();
+
+    close();
 }
 
 void Registration::on_cancelPushButton_clicked()
@@ -42,3 +42,32 @@ void Registration::on_cancelPushButton_clicked()
     close();
 }
 
+void Registration::setUserName(QString username)
+{
+    this->username = username;
+}
+
+void Registration::setPassword(QString password)
+{
+    this->password = password;
+}
+
+void Registration::setEmail(QString password)
+{
+    this->email = email;
+}
+
+QString Registration::getUserName()
+{
+    return this->username;
+}
+
+QString Registration::getPassword()
+{
+    return this->password;
+}
+
+QString Registration::getEmail()
+{
+    return this->email;
+}

diff --git a/Client/registration.h b/Client/registration.h
index 6a7df95..87b049d 100644 (file)
--- a/Client/registration.h
+++ b/Client/registration.h
@@ -12,12 +12,21 @@ class Registration : public QDialog {
 public:
     Registration(QWidget *parent = 0);
     ~Registration();
+    void setUserName(QString username);
+    void setPassword(QString password);
+    void setEmail(QString email);
+    QString getUserName();
+    QString getPassword();
+    QString getEmail();
 
 protected:
     void changeEvent(QEvent *e);
 
 private:
     Ui::Registration *ui;
+    QString username;
+    QString password;
+    QString email;
 
 private slots:
     void on_cancelPushButton_clicked();