More connecting client-server functionality to GUI.

[speedfreak] / Client / settingsdialog.cpp

diff --git a/Client/settingsdialog.cpp b/Client/settingsdialog.cpp
index e19e4e6..b62335b 100644 (file)
--- a/Client/settingsdialog.cpp
+++ b/Client/settingsdialog.cpp
@@ -7,7 +7,7 @@ SettingsDialog::SettingsDialog(QWidget *parent) :
 {
     ui->setupUi(this);
     this->setWindowTitle("Settings");
-    this->ui->regEMailLineEdit->setText("@meili.fi");
+    this->ui->regEMailLineEdit->setText("@");
     instructionsDialog = new InstructionsDialog;
 }
 
@@ -48,7 +48,7 @@ void SettingsDialog::on_registratePushButton_clicked()
 
     emit sendregistration();
 
-    close();
+    //close();      //using close() hides popup-window which reports error from server
 }
 
 // Next 6 functions can be removed if Settingsdialog is implemented without
@@ -92,7 +92,8 @@ void SettingsDialog::on_setUserPushButton_clicked()
     this->password = ui->setUserPasswordLineEdit->text();
 
     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
@@ -117,3 +118,7 @@ QString SettingsDialog::getPassword()
     return this->password;
 }
 
+void SettingsDialog::setLabelInfoToUser(QString infoText)
+{
+    this->ui->labelInfoToUser->setText(infoText);
+}