Conflict fixed: mainwindow.cpp and httpclient.cpp

[speedfreak] / Client / settingsdialog.cpp

diff --git a/Client/settingsdialog.cpp b/Client/settingsdialog.cpp
index b619576..8e96b2f 100644 (file)
--- a/Client/settingsdialog.cpp
+++ b/Client/settingsdialog.cpp
@@ -9,6 +9,7 @@
 #include "settingsdialog.h"
 #include "ui_settingsdialog.h"
 #include "usersettings.h"
+#include <QMessageBox>
 
 SettingsDialog::SettingsDialog(QWidget *parent) :
     QDialog(parent),
@@ -17,7 +18,6 @@ SettingsDialog::SettingsDialog(QWidget *parent) :
     ui->setupUi(this);
     this->setWindowTitle("Settings");
     this->ui->regEMailLineEdit->setText("@");
-    instructionsDialog = new InstructionsDialog;
 
     if (loginSaved())
     {
@@ -31,7 +31,7 @@ SettingsDialog::SettingsDialog(QWidget *parent) :
         ui->setUserUsernameLineEdit->setText(this->username);
 
         // Already someone as user - change button text to "Change"
-        ui->setUserPushButton->setText("Change user");
+        ui->setUserPushButton->setText("Log out");
     }
 }
 
@@ -53,14 +53,6 @@ void SettingsDialog::changeEvent(QEvent *e)
 }
 
 //
-// Help
-//
-void SettingsDialog::on_pushButtonHelp_clicked()
-{
-    instructionsDialog->show();
-}
-
-//
 // Registrate
 //
 void SettingsDialog::on_registratePushButton_clicked()
@@ -70,7 +62,15 @@ void SettingsDialog::on_registratePushButton_clicked()
     this->regPassword = ui->regPasswordLineEdit->text();
     this->regEmail = ui->regEMailLineEdit->text();
 
-    emit sendregistration();
+    if (this->regUsername.compare("") && this->regPassword.compare("") && this->regEmail.compare("") && this->regEmail.compare("@"))
+    {
+        emit sendregistration();
+
+    }
+    else
+    {
+        QMessageBox::about(this, "One or more of the fields is empty", "Set username (3-12 characters), password (at least 6 characters) and valid email address");
+    }
 
     //close();      //using close() hides popup-window which reports error from server
 }
@@ -112,24 +112,57 @@ QString SettingsDialog::getRegEmail()
 //
 void SettingsDialog::on_setUserPushButton_clicked()
 {
-    this->username = ui->setUserUsernameLineEdit->text();
-    this->password = ui->setUserPasswordLineEdit->text();
-
+    if (!ui->setUserPushButton->text().compare("Log out"))
+    {
+        ui->setUserUsernameLineEdit->setDisabled(false);
+        ui->setUserPasswordLineEdit->setDisabled(false);
+        //ui->setUserUsernameLineEdit->setText("");
+        //ui->setUserPasswordLineEdit->setText("");
+        ui->setUserUsernameLineEdit->clear();
+        ui->setUserPasswordLineEdit->clear();
+        this->username = ui->setUserUsernameLineEdit->text();
+        this->password = ui->setUserPasswordLineEdit->text();
+        ui->setUserPushButton->setText("Log in");
+        saveLogin( this->username, this->password);
+        emit logout();
+    }
+    else
+    {
+        this->username = ui->setUserUsernameLineEdit->text();
+        this->password = ui->setUserPasswordLineEdit->text();
+        saveLogin( this->username, this->password);
+        ui->setUserPushButton->setText("Log out");
+
+        if(this->username.compare(""))
+        {
+            emit userNameChanged();
+            //ui->setUserPushButton->setText("Log out");
+        }
+
+        else
+        {
+            QMessageBox::about(this, "Username field is empty", "Set username and log in again");
+            ui->setUserPushButton->setText("Log in");
+        }
+    }
     // Save these also to usersettings
-    saveLogin( this->username, this->password);
+    //saveLogin( this->username, this->password);
+
+
 
+    /*
     // Set "Set/Change User" button text
     if (this->username.length() > 0)
     {
-        ui->setUserPushButton->setText("Change user");
+        ui->setUserPushButton->setText("Log out");
     }
     else
     {   // Username "cleared"
-        ui->setUserPushButton->setText("Set user");
+        ui->setUserPushButton->setText("Log in");
     }
 
     emit userNameChanged();
-
+    */
     //close();  //using close() hides popup-window which reports error from server
 }
 
@@ -159,3 +192,23 @@ void SettingsDialog::setLabelInfoToUser(QString infoText)
 {
     this->ui->labelInfoToUser->setText(infoText);
 }
+
+void SettingsDialog::usernameOk(bool isOk)
+{
+    if (isOk)
+    {
+        ui->setUserPushButton->setText("Log out");
+        ui->setUserUsernameLineEdit->setDisabled(true);
+        ui->setUserPasswordLineEdit->setDisabled(true);
+    }
+
+    else
+    {
+        ui->setUserPushButton->setText("Log in");
+        ui->setUserUsernameLineEdit->clear();
+        ui->setUserPasswordLineEdit->clear();
+        this->username = ui->setUserUsernameLineEdit->text();
+        this->password = ui->setUserPasswordLineEdit->text();
+        saveLogin( this->username, this->password);
+    }
+}