Merge from master

1 files changed, 39 insertions, 0 deletions

diff --git a/src/settings.cpp b/src/settings.cpp
index 54be183a..c5fa954c 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -257,6 +257,20 @@ bool Settings::getNexusLogin(QString &username, QString &password) const
   }
 }
 
+bool Settings::getSteamLogin(QString &username, QString &password) const
+{
+  if (m_Settings.contains("Settings/steam_username")) {
+    username = m_Settings.value("Settings/steam_username", "").toString();
+    if (m_Settings.contains("Settings/steam_password")) {
+      password = deObfuscate(m_Settings.value("Settings/steam_password", "").toString());
+    } else {
+      password = "";
+    }
+    return true;
+  } else {
+    return false;
+  }
+}
 bool Settings::compactDownloads() const
 {
   return m_Settings.value("Settings/compact_downloads", false).toBool();
@@ -285,6 +299,20 @@ void Settings::setNexusLogin(QString username, QString password)
   m_Settings.setValue("Settings/nexus_password", obfuscate(password));
 }
 
+void Settings::setSteamLogin(QString username, QString password)
+{
+  if (username == "") {
+    m_Settings.remove("Settings/steam_username");
+    password = "";
+  } else {
+    m_Settings.setValue("Settings/steam_username", username);
+  }
+  if (password == "") {
+    m_Settings.remove("Settings/steam_password");
+  } else {
+    m_Settings.setValue("Settings/steam_password", obfuscate(password));
+  }
+}
 
 LoadMechanism::EMechanism Settings::getLoadMechanism() const
 {
@@ -538,6 +566,9 @@ void Settings::query(QWidget *parent)
   QCheckBox *hideUncheckedBox = dialog.findChild<QCheckBox*>("hideUncheckedBox");
   QCheckBox *displayForeignBox = dialog.findChild<QCheckBox*>("displayForeignBox");
 
+  // steam login page
+  QLineEdit *steamUserEdit = dialog.findChild<QLineEdit*>("steamUserEdit");
+  QLineEdit *steamPassEdit = dialog.findChild<QLineEdit*>("steamPassEdit");
 
   //
   // set up current settings
@@ -605,6 +636,13 @@ void Settings::query(QWidget *parent)
     passwordEdit->setText(deObfuscate(m_Settings.value("Settings/nexus_password", "").toString()));
   }
 
+  if (m_Settings.contains("Settings/steam_username")) {
+    steamUserEdit->setText(m_Settings.value("Settings/steam_username", "").toString());
+    if (m_Settings.contains("Settings/steam_password")) {
+      steamPassEdit->setText(deObfuscate(m_Settings.value("Settings/steam_password", "").toString()));
+    }
+  }
+
   downloadDirEdit->setText(getDownloadDirectory());
   modDirEdit->setText(getModDirectory());
   cacheDirEdit->setText(getCacheDirectory());
@@ -734,6 +772,7 @@ void Settings::query(QWidget *parent)
       m_Settings.remove("Settings/nexus_username");
       m_Settings.remove("Settings/nexus_password");
     }
+    setSteamLogin(steamUserEdit->text(), steamPassEdit->text());
     m_Settings.setValue("Settings/offline_mode", offlineBox->isChecked());
     m_Settings.setValue("Settings/use_proxy", proxyBox->isChecked());
     m_Settings.setValue("Settings/display_foreign", displayForeignBox->isChecked());