- bugfix: nameprefix-flag incorrectly interpreted on oblivion-style bsas

- bugfix: optimization for missing inis fixed
- bugfix: fixmods didn't search for esps in overwrite
- bugfix: configurator didn't work for fallout new vegas because of a missing cast
- bugfix: configurator attempted parameter formatting on ini files instead of using the raw data
- bugfix: searching for a path in the directory structure could cause a crash when not using the directory output
- optimization to findfirstfile for cases where a single file is searched
- display of bsas changed. hopefully it is more understandable now
- cache for the test whether a mod is in conflict. Should speed ab scrolling in mod list
- mod list has now an additional column for the installation time
- nmm importer no longer cancels in cases where a data file references an undeclared mod.
- integrated improved settings.json for the configurator contributed by "delta534"

1 files changed, 63 insertions, 20 deletions

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 99b37feb..84e5b094 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -256,6 +256,8 @@ MainWindow::MainWindow(const QString &exeName, QSettings &initSettings, QWidget
   connect(ui->espFilterEdit, SIGNAL(textChanged(QString)), this, SLOT(espFilterChanged(QString)));
   connect(&m_PluginList, SIGNAL(saveTimer()), this, SLOT(savePluginList()));
 
+  connect(ui->bsaWarning, SIGNAL(linkActivated(QString)), this, SLOT(linkClicked(QString)));
+
   connect(&m_DirectoryRefresher, SIGNAL(refreshed()), this, SLOT(directory_refreshed()));
   connect(&m_DirectoryRefresher, SIGNAL(progress(int)), this, SLOT(refresher_progress(int)));
   connect(&m_DirectoryRefresher, SIGNAL(error(QString)), this, SLOT(showError(QString)));
@@ -1648,7 +1650,8 @@ void MainWindow::refreshBSAList()
       QTreeWidgetItem *newItem = new QTreeWidgetItem(strings);
       newItem->setData(0, Qt::UserRole, index);
       newItem->setData(1, Qt::UserRole, origin);
-      newItem->setFlags(newItem->flags() & ~Qt::ItemIsDropEnabled | Qt::ItemIsUserCheckable);
+//      newItem->setFlags(newItem->flags() & ~Qt::ItemIsDropEnabled | Qt::ItemIsUserCheckable);
+      newItem->setFlags(newItem->flags() | Qt::ItemIsUserCheckable);
       newItem->setCheckState(0, (index != -1) ? Qt::Checked : Qt::Unchecked);
       if (m_Settings.forceEnableCoreFiles() && m_DefaultArchives.contains(filename)) {
         newItem->setCheckState(0, Qt::Checked);
@@ -1658,6 +1661,7 @@ void MainWindow::refreshBSAList()
       }
 
       if (index < 0) index = 0;
+
       UINT32 sortValue = ((m_DirectoryStructure->getOriginByID(origin).getPriority() & 0xFFFF) << 16) | (index & 0xFFFF);
       items.push_back(std::make_pair(sortValue, newItem));
     }
@@ -1666,7 +1670,18 @@ void MainWindow::refreshBSAList()
   std::sort(items.begin(), items.end(), BySortValue);
 
   for (std::vector<std::pair<UINT32, QTreeWidgetItem*> >::iterator iter = items.begin(); iter != items.end(); ++iter) {
-    ui->bsaList->addTopLevelItem(iter->second);
+    int originID = iter->second->data(1, Qt::UserRole).toInt();
+    FilesOrigin origin = m_DirectoryStructure->getOriginByID(originID);
+    QList<QTreeWidgetItem*> items = ui->bsaList->findItems(ToQString(origin.getName()), Qt::MatchFixedString);
+    QTreeWidgetItem *subItem = NULL;
+    if (items.length() > 0) {
+      subItem = items.at(0);
+    } else {
+      subItem = new QTreeWidgetItem(QStringList(ToQString(origin.getName())));
+      ui->bsaList->addTopLevelItem(subItem);
+    }
+    subItem->addChild(iter->second);
+    //ui->bsaList->addTopLevelItem(iter->second);
   }
 
   checkBSAList();
@@ -1681,27 +1696,35 @@ void MainWindow::checkBSAList()
   bool warning = false;
 
   for (int i = 0; i < ui->bsaList->topLevelItemCount(); ++i) {
-    QTreeWidgetItem *item = ui->bsaList->topLevelItem(i);
-    QString filename = item->text(0);
-    item->setIcon(0, QIcon());
-    item->setToolTip(0, QString());
+    bool modWarning = false;
+    QTreeWidgetItem *tlItem = ui->bsaList->topLevelItem(i);
+    for (int j = 0; j < tlItem->childCount(); ++j) {
+      QTreeWidgetItem *item = tlItem->child(j);
+      QString filename = item->text(0);
+      item->setIcon(0, QIcon());
+      item->setToolTip(0, QString());
 
-    if (item->checkState(0) == Qt::Unchecked) {
-      if (m_DefaultArchives.contains(filename)) {
-        item->setIcon(0, QIcon(":/MO/gui/resources/dialog-warning.png"));
-        item->setToolTip(0, tr("This bsa is enabled in the ini file so it may be required!"));
-        warning = true;
-      } else {
-        QString espName = filename.mid(0, filename.length() - 3).append("esp").toLower();
-        QString esmName = filename.mid(0, filename.length() - 3).append("esm").toLower();
-        if (m_PluginList.isEnabled(espName) || m_PluginList.isEnabled(esmName)) {
+      if (item->checkState(0) == Qt::Unchecked) {
+        if (m_DefaultArchives.contains(filename)) {
           item->setIcon(0, QIcon(":/MO/gui/resources/dialog-warning.png"));
-          item->setToolTip(0, tr("This archive will still be loaded since there is a plugin of the same name but "
-                                    "its files will not follow installation order!"));
-          warning = true;
+          item->setToolTip(0, tr("This bsa is enabled in the ini file so it may be required!"));
+          modWarning = true;
+        } else {
+          QString espName = filename.mid(0, filename.length() - 3).append("esp").toLower();
+          QString esmName = filename.mid(0, filename.length() - 3).append("esm").toLower();
+          if (m_PluginList.isEnabled(espName) || m_PluginList.isEnabled(esmName)) {
+            item->setIcon(0, QIcon(":/MO/gui/resources/dialog-warning.png"));
+            item->setToolTip(0, tr("This archive will still be loaded since there is a plugin of the same name but "
+                                      "its files will not follow installation order!"));
+            modWarning = true;
+          }
         }
       }
     }
+    if (modWarning) {
+      ui->bsaList->expandItem(ui->bsaList->topLevelItem(i));
+      warning = true;
+    }
   }
 
   if (warning) {
@@ -2072,7 +2095,6 @@ void MainWindow::issueTriggered()
   ::ShellExecuteW(NULL, L"open", L"http://issue.tannin.eu/tbg", NULL, NULL, SW_SHOWNORMAL);
 }
 
-
 void MainWindow::tutorialTriggered()
 {
   QAction *tutorialAction = qobject_cast<QAction*>(sender());
@@ -3312,6 +3334,7 @@ void MainWindow::fixMods_clicked()
   QStringList espFilter("*.esp");
   espFilter.append("*.esm");
 
+  // search in data
   {
     QDir dataDir(m_GamePath + "/data");
     QStringList esps = dataDir.entryList(espFilter);
@@ -3323,6 +3346,7 @@ void MainWindow::fixMods_clicked()
     }
   }
 
+  // search in mods
   for (unsigned int i = 0; i < m_CurrentProfile->numRegularMods(); ++i) {
     int modIndex = m_CurrentProfile->modIndexByPriority(i);
     ModInfo::Ptr modInfo = ModInfo::getByIndex(modIndex);
@@ -3336,12 +3360,25 @@ void MainWindow::fixMods_clicked()
     }
   }
 
+  // search in overwrite
+  {
+    QDir overwriteDir(ToQString(GameInfo::instance().getOverwriteDir()));
+    QStringList esps = overwriteDir.entryList(espFilter);
+    foreach (const QString &esp, esps) {
+      std::map<QString, std::vector<QString> >::iterator iter = missingPlugins.find(esp);
+      if (iter != missingPlugins.end()) {
+        iter->second.push_back("<overwrite>");
+      }
+    }
+  }
+
+
   ActivateModsDialog dialog(missingPlugins, this);
   if (dialog.exec() == QDialog::Accepted) {
     // activate the required mods, then enable all esps
     std::set<QString> modsToActivate = dialog.getModsToActivate();
     for (std::set<QString>::iterator iter = modsToActivate.begin(); iter != modsToActivate.end(); ++iter) {
-      if (*iter != "<data>") {
+      if ((*iter != "<data>") && (*iter != "<overwrite>")) {
         unsigned int modIndex = ModInfo::getIndex(*iter);
         m_CurrentProfile->setModEnabled(modIndex, true);
       }
@@ -3496,6 +3533,12 @@ void MainWindow::nexusLinkActivated(const QString &link)
 }
 
 
+void MainWindow::linkClicked(const QString &url)
+{
+  ::ShellExecuteW(NULL, L"open", ToWString(url).c_str(), NULL, NULL, SW_SHOWNORMAL);
+}
+
+
 void MainWindow::downloadRequestedNXM(const QString &url)
 {
   QString username, password;