Added functionality to change user in settingsdialog.

diff --git a/Client/settingsdialog.cpp b/Client/settingsdialog.cpp
index e19e4e6..51d3565 100644 (file)
--- a/Client/settingsdialog.cpp
+++ b/Client/settingsdialog.cpp
@@ -1,5 +1,14 @@
+/*
+ * SettingsDialog class
+ *
+ * @author     Olavi Pulkkinen <olavi.pulkkinen@fudeco.com>
+ * @copyright  (c) 2010 Speed Freak team
+ * @license    http://opensource.org/licenses/gpl-license.php GNU Public License
+ */
+

 #include "settingsdialog.h"
 #include "ui_settingsdialog.h"
 #include "settingsdialog.h"
 #include "ui_settingsdialog.h"

+#include "usersettings.h"

 
 SettingsDialog::SettingsDialog(QWidget *parent) :
     QDialog(parent),
 
 SettingsDialog::SettingsDialog(QWidget *parent) :
     QDialog(parent),

@@ -9,6 +18,21 @@ SettingsDialog::SettingsDialog(QWidget *parent) :
     this->setWindowTitle("Settings");
     this->ui->regEMailLineEdit->setText("@meili.fi");
     instructionsDialog = new InstructionsDialog;
     this->setWindowTitle("Settings");
     this->ui->regEMailLineEdit->setText("@meili.fi");
     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()
 }
 
 SettingsDialog::~SettingsDialog()

@@ -91,6 +115,19 @@ void SettingsDialog::on_setUserPushButton_clicked()
     this->username = ui->setUserUsernameLineEdit->text();
     this->password = ui->setUserPasswordLineEdit->text();
 
     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();
 }
     emit userNameChanged();
     close();
 }

diff --git a/Client/settingsdialog.h b/Client/settingsdialog.h
index 09e76f4..b6fdd8b 100644 (file)
--- a/Client/settingsdialog.h
+++ b/Client/settingsdialog.h
@@ -1,3 +1,11 @@
+/*
+ * SettingsDialog class
+ *
+ * @author     Olavi Pulkkinen <olavi.pulkkinen@fudeco.com>
+ * @copyright  (c) 2010 Speed Freak team
+ * @license    http://opensource.org/licenses/gpl-license.php GNU Public License
+ */
+

 #ifndef SETTINGSDIALOG_H
 #define SETTINGSDIALOG_H
 
 #ifndef SETTINGSDIALOG_H
 #define SETTINGSDIALOG_H
 

diff --git a/Client/usersettings.cpp b/Client/usersettings.cpp
index fa6527f..20046cc 100644 (file)
--- a/Client/usersettings.cpp
+++ b/Client/usersettings.cpp
@@ -47,6 +47,12 @@ void UserSettings::writeLoginSettings( QString userName, QString password)
     settings.setValue("password", password);
 }
 
     settings.setValue("password", password);
 }
 

+void getLoginInfo(QString *userName, QString *password)
+{
+    UserSettings myLogin;
+    myLogin.readLoginSettings( userName, password);
+}
+

 void saveLogin( QString userName, QString password)
 {
     UserSettings myLogin;
 void saveLogin( QString userName, QString password)
 {
     UserSettings myLogin;

diff --git a/Client/usersettings.h b/Client/usersettings.h
index 6465fb6..e19341f 100644 (file)
--- a/Client/usersettings.h
+++ b/Client/usersettings.h
@@ -21,5 +21,6 @@ public:
 
 bool loginSaved( void);
 void saveLogin( QString userName, QString password);
 
 bool loginSaved( void);
 void saveLogin( QString userName, QString password);

+void getLoginInfo( QString *userName, QString *password);

 
 #endif // USERSETTINGS_H
 
 #endif // USERSETTINGS_H