- moved shared and uibase libraries to namespaces

- bugfix: the "fix mods" function was accessing the save game data incorrectly, causing a crash

1 files changed, 134 insertions, 130 deletions

diff --git a/src/settingsdialog.cpp b/src/settingsdialog.cpp
index 855acdf1..8fb990c1 100644
--- a/src/settingsdialog.cpp
+++ b/src/settingsdialog.cpp
@@ -17,133 +17,137 @@ You should have received a copy of the GNU General Public License
 along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "settingsdialog.h"

-#include "ui_settingsdialog.h"

-#include "categoriesdialog.h"

-#include "helper.h"

-#include <gameinfo.h>

-#include <QDirIterator>

-#include <QFileDialog>

-#include <QMessageBox>

-#define WIN32_LEAN_AND_MEAN

-#include <Windows.h>

-

-

-SettingsDialog::SettingsDialog(QWidget *parent)

-  : TutorableDialog("SettingsDialog", parent), ui(new Ui::SettingsDialog)

-{

-  ui->setupUi(this);

-}

-

-SettingsDialog::~SettingsDialog()

-{

-  delete ui;

-}

-

-void SettingsDialog::addPlugins(const std::vector<IPlugin*> &plugins)

-{

-  foreach (IPlugin *plugin, plugins) {

-    ui->pluginsList->addItem(plugin->name());

-  }

-}

-

-void SettingsDialog::accept()

-{

-  storeSettings(ui->pluginsList->currentItem());

-  TutorableDialog::accept();

-}

-

-

-void SettingsDialog::on_loginCheckBox_toggled(bool checked)

-{

-  QLineEdit *usernameEdit = findChild<QLineEdit*>("usernameEdit");

-  QLineEdit *passwordEdit = findChild<QLineEdit*>("passwordEdit");

-  if (checked) {

-    passwordEdit->setEnabled(true);

-    usernameEdit->setEnabled(true);

-  } else {

-    passwordEdit->setEnabled(false);

-    usernameEdit->setEnabled(false);

-  }

-}

-

-void SettingsDialog::on_categoriesBtn_clicked()

-{

-  CategoriesDialog dialog(this);

-  if (dialog.exec() == QDialog::Accepted) {

-    dialog.commitChanges();

-  }

-}

-

-void SettingsDialog::on_bsaDateBtn_clicked()

-{

-  Helper::backdateBSAs(GameInfo::instance().getOrganizerDirectory(), GameInfo::instance().getGameDirectory().append(L"\\data"));

-}

-

-void SettingsDialog::on_browseDownloadDirBtn_clicked()

-{

-  QString temp = QFileDialog::getExistingDirectory(this, tr("Select download directory"), ui->downloadDirEdit->text());

-  if (!temp.isEmpty()) {

-    ui->downloadDirEdit->setText(temp);

-  }

-}

-

-void SettingsDialog::on_browseModDirBtn_clicked()

-{

-  QString temp = QFileDialog::getExistingDirectory(this, tr("Select mod directory"), ui->downloadDirEdit->text());

-  if (!temp.isEmpty()) {

-    ui->modDirEdit->setText(temp);

-  }

-}

-

-void SettingsDialog::on_browseCacheDirBtn_clicked()

-{

-  QString temp = QFileDialog::getExistingDirectory(this, tr("Select cache directory"), ui->cacheDirEdit->text());

-  if (!temp.isEmpty()) {

-    ui->cacheDirEdit->setText(temp);

-  }

-}

-

-void SettingsDialog::on_resetDialogsButton_clicked()

-{

-  if (QMessageBox::question(this, tr("Confirm?"),

-          tr("This will make all dialogs show up again where you checked the \"Remember selection\"-box. Continue?"),

-          QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {

-    emit resetDialogs();

-  }

-}

-

-void SettingsDialog::storeSettings(QListWidgetItem *pluginItem)

-{

-  if (pluginItem != NULL) {

-    QMap<QString, QVariant> settings = pluginItem->data(Qt::UserRole + 1).toMap();

-

-    for (int i = 0; i < ui->pluginSettingsList->topLevelItemCount(); ++i) {

-      const QTreeWidgetItem *item = ui->pluginSettingsList->topLevelItem(i);

-      settings[item->text(0)] = item->data(1, Qt::DisplayRole);

-    }

-

-    pluginItem->setData(Qt::UserRole + 1, settings);

-  }

-}

-

-void SettingsDialog::on_pluginsList_currentItemChanged(QListWidgetItem *current, QListWidgetItem *previous)

-{

-  storeSettings(previous);

-

-  ui->pluginSettingsList->clear();

-  IPlugin *plugin = static_cast<IPlugin*>(current->data(Qt::UserRole).value<void*>());

-  ui->authorLabel->setText(plugin->author());

-  ui->versionLabel->setText(plugin->version().canonicalString());

-  ui->descriptionLabel->setText(plugin->description());

-

-  QMap<QString, QVariant> settings = current->data(Qt::UserRole + 1).toMap();

-  ui->pluginSettingsList->setEnabled(settings.count() != 0);

-  for (auto iter = settings.begin(); iter != settings.end(); ++iter) {

-    QTreeWidgetItem *newItem = new QTreeWidgetItem(QStringList(iter.key()));

-    newItem->setData(1, Qt::DisplayRole, *iter);

-    newItem->setData(1, Qt::EditRole, *iter);

-    newItem->setFlags(newItem->flags() | Qt::ItemIsEditable);

-    ui->pluginSettingsList->addTopLevelItem(newItem);

-  }

-}

+#include "settingsdialog.h"
+#include "ui_settingsdialog.h"
+#include "categoriesdialog.h"
+#include "helper.h"
+#include <gameinfo.h>
+#include <QDirIterator>
+#include <QFileDialog>
+#include <QMessageBox>
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
+
+
+using namespace MOBase;
+using namespace MOShared;
+
+
+SettingsDialog::SettingsDialog(QWidget *parent)
+  : TutorableDialog("SettingsDialog", parent), ui(new Ui::SettingsDialog)
+{
+  ui->setupUi(this);
+}
+
+SettingsDialog::~SettingsDialog()
+{
+  delete ui;
+}
+
+void SettingsDialog::addPlugins(const std::vector<IPlugin*> &plugins)
+{
+  foreach (IPlugin *plugin, plugins) {
+    ui->pluginsList->addItem(plugin->name());
+  }
+}
+
+void SettingsDialog::accept()
+{
+  storeSettings(ui->pluginsList->currentItem());
+  TutorableDialog::accept();
+}
+
+
+void SettingsDialog::on_loginCheckBox_toggled(bool checked)
+{
+  QLineEdit *usernameEdit = findChild<QLineEdit*>("usernameEdit");
+  QLineEdit *passwordEdit = findChild<QLineEdit*>("passwordEdit");
+  if (checked) {
+    passwordEdit->setEnabled(true);
+    usernameEdit->setEnabled(true);
+  } else {
+    passwordEdit->setEnabled(false);
+    usernameEdit->setEnabled(false);
+  }
+}
+
+void SettingsDialog::on_categoriesBtn_clicked()
+{
+  CategoriesDialog dialog(this);
+  if (dialog.exec() == QDialog::Accepted) {
+    dialog.commitChanges();
+  }
+}
+
+void SettingsDialog::on_bsaDateBtn_clicked()
+{
+  Helper::backdateBSAs(GameInfo::instance().getOrganizerDirectory(), GameInfo::instance().getGameDirectory().append(L"\\data"));
+}
+
+void SettingsDialog::on_browseDownloadDirBtn_clicked()
+{
+  QString temp = QFileDialog::getExistingDirectory(this, tr("Select download directory"), ui->downloadDirEdit->text());
+  if (!temp.isEmpty()) {
+    ui->downloadDirEdit->setText(temp);
+  }
+}
+
+void SettingsDialog::on_browseModDirBtn_clicked()
+{
+  QString temp = QFileDialog::getExistingDirectory(this, tr("Select mod directory"), ui->downloadDirEdit->text());
+  if (!temp.isEmpty()) {
+    ui->modDirEdit->setText(temp);
+  }
+}
+
+void SettingsDialog::on_browseCacheDirBtn_clicked()
+{
+  QString temp = QFileDialog::getExistingDirectory(this, tr("Select cache directory"), ui->cacheDirEdit->text());
+  if (!temp.isEmpty()) {
+    ui->cacheDirEdit->setText(temp);
+  }
+}
+
+void SettingsDialog::on_resetDialogsButton_clicked()
+{
+  if (QMessageBox::question(this, tr("Confirm?"),
+          tr("This will make all dialogs show up again where you checked the \"Remember selection\"-box. Continue?"),
+          QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {
+    emit resetDialogs();
+  }
+}
+
+void SettingsDialog::storeSettings(QListWidgetItem *pluginItem)
+{
+  if (pluginItem != NULL) {
+    QMap<QString, QVariant> settings = pluginItem->data(Qt::UserRole + 1).toMap();
+
+    for (int i = 0; i < ui->pluginSettingsList->topLevelItemCount(); ++i) {
+      const QTreeWidgetItem *item = ui->pluginSettingsList->topLevelItem(i);
+      settings[item->text(0)] = item->data(1, Qt::DisplayRole);
+    }
+
+    pluginItem->setData(Qt::UserRole + 1, settings);
+  }
+}
+
+void SettingsDialog::on_pluginsList_currentItemChanged(QListWidgetItem *current, QListWidgetItem *previous)
+{
+  storeSettings(previous);
+
+  ui->pluginSettingsList->clear();
+  IPlugin *plugin = static_cast<IPlugin*>(current->data(Qt::UserRole).value<void*>());
+  ui->authorLabel->setText(plugin->author());
+  ui->versionLabel->setText(plugin->version().canonicalString());
+  ui->descriptionLabel->setText(plugin->description());
+
+  QMap<QString, QVariant> settings = current->data(Qt::UserRole + 1).toMap();
+  ui->pluginSettingsList->setEnabled(settings.count() != 0);
+  for (auto iter = settings.begin(); iter != settings.end(); ++iter) {
+    QTreeWidgetItem *newItem = new QTreeWidgetItem(QStringList(iter.key()));
+    newItem->setData(1, Qt::DisplayRole, *iter);
+    newItem->setData(1, Qt::EditRole, *iter);
+    newItem->setFlags(newItem->flags() | Qt::ItemIsEditable);
+    ui->pluginSettingsList->addTopLevelItem(newItem);
+  }
+}