save forced libraries internally

2 files changed, 56 insertions, 30 deletions

diff --git a/src/editexecutablesdialog.cpp b/src/editexecutablesdialog.cpp
index 2c376cd1..5fbb30dd 100644
--- a/src/editexecutablesdialog.cpp
+++ b/src/editexecutablesdialog.cpp
@@ -48,18 +48,22 @@ EditExecutablesDialog::EditExecutablesDialog(
   ui->splitter->setStretchFactor(1, 1);
 
   for (const auto& e : m_executablesList) {
+    // custom overwrites
     QString customOverwrite = m_profile->setting("custom_overwrites", e.title()).toString();
-
     if (!customOverwrite.isEmpty()) {
       m_customOverwrites[e.title()] = customOverwrite;
     }
+
+    // forced libraries
+    if (m_profile->forcedLibrariesEnabled(e.title())) {
+      m_forcedLibraries[e.title()] = m_profile->determineForcedLibraries(e.title());
+    }
   }
 
 
   fillExecutableList();
   ui->mods->addItems(modList.allMods());
 
-  m_forcedLibraries = m_profile->determineForcedLibraries(ui->title->text());
 
   // some widgets need to do more than just save() and have their own handler
 
@@ -168,26 +172,32 @@ void EditExecutablesDialog::setEdits(const Executable& e)
   ui->steamAppID->setText(e.steamAppID());
   ui->useApplicationIcon->setChecked(e.usesOwnIcon());
 
-  int modIndex = -1;
+  {
+    int modIndex = -1;
 
-  auto itor = m_customOverwrites.find(e.title());
-  if (itor != m_customOverwrites.end()) {
-    modIndex = ui->mods->findText(itor->second);
+    auto itor = m_customOverwrites.find(e.title());
+    if (itor != m_customOverwrites.end()) {
+      modIndex = ui->mods->findText(itor->second);
 
-    if (modIndex == -1) {
-      qWarning().nospace()
-        << "executable '" << e.title() << "' uses mod '" << itor->second << "' "
-        << "as a custom overwrite, but that mod doesn't exist";
+      if (modIndex == -1) {
+        qWarning().nospace()
+          << "executable '" << e.title() << "' uses mod '" << itor->second << "' "
+          << "as a custom overwrite, but that mod doesn't exist";
+      }
     }
+
+    ui->createFilesInMod->setChecked(modIndex != -1);
+    ui->mods->setEnabled(modIndex != -1);
+    ui->mods->setCurrentIndex(modIndex);
   }
 
-  ui->createFilesInMod->setChecked(modIndex != -1);
-  ui->mods->setEnabled(modIndex != -1);
-  ui->mods->setCurrentIndex(modIndex);
+  {
+    auto itor = m_forcedLibraries.find(e.title());
+    const auto hasForcedLibraries = (itor != m_forcedLibraries.end());
 
-  const bool forcedLibraries = m_profile->forcedLibrariesEnabled(e.title());
-  ui->forceLoadLibraries->setChecked(forcedLibraries);
-  ui->configureLibraries->setEnabled(forcedLibraries);
+    ui->forceLoadLibraries->setChecked(hasForcedLibraries);
+    ui->configureLibraries->setEnabled(hasForcedLibraries);
+  }
 
   ui->pluginProvidedLabel->setVisible(!e.isCustom());
 
@@ -230,6 +240,8 @@ void EditExecutablesDialog::save()
     }
   }
 
+  // forced libraries are saved in on_configureLibraries_clicked()
+
   e->title(ui->title->text());
   e->binaryInfo(ui->binary->text());
   e->workingDirectory(ui->workingDirectory->text());
@@ -289,6 +301,26 @@ void EditExecutablesDialog::on_forceLoadLibraries_toggled(bool checked)
   save();
 }
 
+void EditExecutablesDialog::on_configureLibraries_clicked()
+{
+  auto* e = selectedExe();
+  if (!e) {
+    qWarning("trying to configure libraries but nothing is selected");
+    return;
+  }
+
+  ForcedLoadDialog dialog(m_gamePlugin, this);
+
+  auto itor = m_forcedLibraries.find(e->title());
+  if (itor != m_forcedLibraries.end()) {
+    dialog.setValues(itor->second);
+  }
+
+  if (dialog.exec() == QDialog::Accepted) {
+    m_forcedLibraries[e->title()] = dialog.values();
+    save();
+  }
+}
 
 
 
@@ -372,9 +404,9 @@ void EditExecutablesDialog::saveExecutable()
 	  m_profile->removeSetting("custom_overwrites", ui->title->text());
   }
 
-  m_profile->removeForcedLibraries(ui->title->text());
-  m_profile->storeForcedLibraries(ui->title->text(), m_forcedLibraries);
-  m_profile->setForcedLibrariesEnabled(ui->title->text(), ui->forceLoadLibraries->isChecked());
+  //m_profile->removeForcedLibraries(ui->title->text());
+  //m_profile->storeForcedLibraries(ui->title->text(), m_forcedLibraries);
+  //m_profile->setForcedLibrariesEnabled(ui->title->text(), ui->forceLoadLibraries->isChecked());
 }
 
 
@@ -387,14 +419,6 @@ void EditExecutablesDialog::delayedRefresh()
 }
 
 
-void EditExecutablesDialog::on_configureLibraries_clicked()
-{
-  ForcedLoadDialog dialog(m_gamePlugin, this);
-  dialog.setValues(m_forcedLibraries);
-  if (dialog.exec() == QDialog::Accepted) {
-    m_forcedLibraries = dialog.values();
-  }
-}
 
 
 void EditExecutablesDialog::on_add_clicked()
@@ -488,7 +512,7 @@ void EditExecutablesDialog::on_remove_clicked()
 
 bool EditExecutablesDialog::executableChanged()
 {
-  if (m_currentItem != nullptr) {
+  /*if (m_currentItem != nullptr) {
     const auto& title = m_currentItem->text();
     auto itor = m_executablesList.find(title);
 
@@ -533,7 +557,9 @@ bool EditExecutablesDialog::executableChanged()
         && !ui->title->text().isEmpty()
         && fileInfo.exists()
         && fileInfo.isFile();
-  }
+  }*/
+
+  return false;
 }
 
 void EditExecutablesDialog::on_list_itemSelectionChanged()
diff --git a/src/editexecutablesdialog.h b/src/editexecutablesdialog.h
index 8ee56e3e..37b50127 100644
--- a/src/editexecutablesdialog.h
+++ b/src/editexecutablesdialog.h
@@ -82,12 +82,12 @@ private:
   std::unique_ptr<Ui::EditExecutablesDialog> ui;

   ExecutablesList m_executablesList;

   std::map<QString, QString> m_customOverwrites;

+  std::map<QString, QList<MOBase::ExecutableForcedLoadSetting>> m_forcedLibraries;

   Profile *m_profile;

   const MOBase::IPluginGame *m_gamePlugin;

   bool m_settingUI;

 

   QListWidgetItem *m_currentItem;

-  QList<MOBase::ExecutableForcedLoadSetting> m_forcedLibraries;

 

 

   QListWidgetItem* selectedItem();