1 files changed, 128 insertions, 348 deletions

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 096ce94b..dcff139a 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -71,14 +71,16 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "previewdialog.h"

 #include "browserdialog.h"

 #include "aboutdialog.h"

-#include "safewritefile.h"

+#include <safewritefile.h>

 #include "nxmaccessmanager.h"

 #include "appconfig.h"

+#include "eventfilter.h"

 #include <utility.h>

 #include <dataarchives.h>

 #include <bsainvalidation.h>

 #include <taskprogressmanager.h>

 #include <scopeguard.h>

+#include <usvfs.h>

 

 #include <QAbstractItemDelegate>

 #include <QAbstractProxyModel>

@@ -142,15 +144,10 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include <QWhatsThis>

 #include <QWidgetAction>

 

-#include <QtDebug>

+#include <QDebug>

 #include <QtGlobal>

 

-

-#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)

 #include <QtConcurrent/QtConcurrentRun>

-#else

-#include <QtConcurrentRun>

-#endif

 

 #ifndef Q_MOC_RUN

 #include <boost/thread.hpp>

@@ -180,8 +177,7 @@ using namespace MOBase;
 using namespace MOShared;

 

 

-MainWindow::MainWindow(const QString &exeName

-                       , QSettings &initSettings

+MainWindow::MainWindow(QSettings &initSettings

                        , OrganizerCore &organizerCore

                        , PluginContainer &pluginContainer

                        , QWidget *parent)

@@ -189,7 +185,6 @@ MainWindow::MainWindow(const QString &exeName
   , ui(new Ui::MainWindow)

   , m_WasVisible(false)

   , m_Tutorial(this, "MainWindow")

-  , m_ExeName(exeName)

   , m_OldProfileIndex(-1)

   , m_ModListGroupingProxy(nullptr)

   , m_ModListSortProxy(nullptr)

@@ -201,7 +196,6 @@ MainWindow::MainWindow(const QString &exeName
   , m_OrganizerCore(organizerCore)

   , m_PluginContainer(pluginContainer)

   , m_DidUpdateMasterList(false)

-  , m_ArchiveListWriter(std::bind(&MainWindow::saveArchiveList, this))

 {

   ui->setupUi(this);

   updateWindowTitle(QString(), false);

@@ -226,6 +220,7 @@ MainWindow::MainWindow(const QString &exeName
   m_RefreshProgress->setVisible(false);

   statusBar()->addWidget(m_RefreshProgress, 1000);

   statusBar()->clearMessage();

+  statusBar()->hide();

 

   ui->actionEndorseMO->setVisible(false);

 

@@ -273,8 +268,6 @@ MainWindow::MainWindow(const QString &exeName
   }

   ui->espList->installEventFilter(m_OrganizerCore.pluginList());

 

-  ui->bsaList->setLocalMoveOnly(true);

-

   ui->splitter->setStretchFactor(0, 3);

   ui->splitter->setStretchFactor(1, 2);

 

@@ -293,6 +286,17 @@ MainWindow::MainWindow(const QString &exeName
   ui->savegameList->installEventFilter(this);

   ui->savegameList->setMouseTracking(true);

 

+  // don't allow mouse wheel to switch grouping, too many people accidentally

+  // turn on grouping and then don't understand what happened

+

+  EventFilter *noWheel

+      = new EventFilter(this, [](QObject *, QEvent *event) -> bool {

+          return event->type() == QEvent::Wheel;

+        });

+

+  ui->groupCombo->installEventFilter(noWheel);

+  ui->profileBox->installEventFilter(noWheel);

+

   connect(ui->savegameList, SIGNAL(itemEntered(QListWidgetItem*)), this, SLOT(saveSelectionChanged(QListWidgetItem*)));

 

   connect(ui->modList, SIGNAL(dropModeUpdate(bool)), m_OrganizerCore.modList(), SLOT(dropModeUpdate(bool)));

@@ -304,8 +308,6 @@ MainWindow::MainWindow(const QString &exeName
   connect(ui->espFilterEdit, SIGNAL(textChanged(QString)), m_PluginListSortProxy, SLOT(updateFilter(QString)));

   connect(ui->espFilterEdit, SIGNAL(textChanged(QString)), this, SLOT(espFilterChanged(QString)));

 

-  connect(ui->bsaList, SIGNAL(itemsMoved()), this, SLOT(bsaList_itemMoved()));

-

   connect(ui->dataTree, SIGNAL(itemExpanded(QTreeWidgetItem*)), this, SLOT(expandDataTreeItem(QTreeWidgetItem*)));

 

   connect(m_OrganizerCore.directoryRefresher(), SIGNAL(refreshed()), this, SLOT(directory_refreshed()));

@@ -327,11 +329,8 @@ MainWindow::MainWindow(const QString &exeName
   connect(NexusInterface::instance(), SIGNAL(nxmDownloadURLsAvailable(int,int,QVariant,QVariant,int)), this, SLOT(nxmDownloadURLs(int,int,QVariant,QVariant,int)));

   connect(NexusInterface::instance(), SIGNAL(needLogin()), &m_OrganizerCore, SLOT(nexusLogin()));

   connect(NexusInterface::instance()->getAccessManager(), SIGNAL(loginFailed(QString)), this, SLOT(loginFailed(QString)));

-  connect(NexusInterface::instance()->getAccessManager(), &NXMAccessManager::credentialsReceived,

-          [this] (const QString &accountName, bool premium) {

-    qDebug("user %s premium", premium ? "is" : "is not");

-    updateWindowTitle(accountName, premium);

-  });

+  connect(NexusInterface::instance()->getAccessManager(), SIGNAL(credentialsReceived(const QString&, bool)),

+          this, SLOT(updateWindowTitle(const QString&, bool)));

 

   connect(&TutorialManager::instance(), SIGNAL(windowTutorialFinished(QString)), this, SLOT(windowTutorialFinished(QString)));

   connect(ui->tabWidget, SIGNAL(currentChanged(int)), &TutorialManager::instance(), SIGNAL(tabChanged(int)));

@@ -339,14 +338,12 @@ MainWindow::MainWindow(const QString &exeName
   connect(ui->toolBar, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(toolBar_customContextMenuRequested(QPoint)));

 

   connect(&m_OrganizerCore, &OrganizerCore::modInstalled, this, &MainWindow::modInstalled);

+  connect(&m_OrganizerCore, &OrganizerCore::close, this, &QMainWindow::close);

 

   connect(&m_IntegratedBrowser, SIGNAL(requestDownload(QUrl,QNetworkReply*)), &m_OrganizerCore, SLOT(requestDownload(QUrl,QNetworkReply*)));

 

   connect(this, SIGNAL(styleChanged(QString)), this, SLOT(updateStyle(QString)));

 

-  m_CheckBSATimer.setSingleShot(true);

-  connect(&m_CheckBSATimer, SIGNAL(timeout()), this, SLOT(checkBSAList()));

-

   m_UpdateProblemsTimer.setSingleShot(true);

   connect(&m_UpdateProblemsTimer, SIGNAL(timeout()), this, SLOT(updateProblemsButton()));

 

@@ -388,6 +385,8 @@ MainWindow::MainWindow(const QString &exeName
 

 MainWindow::~MainWindow()

 {

+  cleanup();

+

   m_PluginContainer.setUserInterface(nullptr, nullptr);

   m_OrganizerCore.setUserInterface(nullptr, nullptr);

   m_IntegratedBrowser.close();

@@ -401,9 +400,7 @@ void MainWindow::updateWindowTitle(const QString &accountName, bool premium)
         m_OrganizerCore.managedGame()->gameName(),

         m_OrganizerCore.getVersion().displayString());

 

-  if (accountName.isEmpty()) {

-    title.append(" (not logged in)");

-  } else {

+  if (!accountName.isEmpty()) {

     title.append(QString(" (%1%2)").arg(accountName, premium ? "*" : ""));

   }

 

@@ -574,7 +571,7 @@ void MainWindow::scheduleUpdateButton()
 

 void MainWindow::updateProblemsButton()

 {

-  int numProblems = checkForProblems();

+  size_t numProblems = checkForProblems();

   if (numProblems > 0) {

     ui->actionProblems->setEnabled(true);

     ui->actionProblems->setIconText(tr("Problems"));

@@ -626,9 +623,9 @@ bool MainWindow::errorReported(QString &logFile)
 }

 

 

-int MainWindow::checkForProblems()

+size_t MainWindow::checkForProblems()

 {

-  int numProblems = 0;

+  size_t numProblems = 0;

   for (IPluginDiagnose *diagnose : m_PluginContainer.plugins<IPluginDiagnose>()) {

     numProblems += diagnose->activeProblems().size();

   }

@@ -853,6 +850,14 @@ void MainWindow::closeEvent(QCloseEvent* event)
   }

 

   setCursor(Qt::WaitCursor);

+}

+

+void MainWindow::cleanup()

+{

+  if (ui->logList->model() != nullptr) {

+    disconnect(ui->logList->model(), nullptr, nullptr, nullptr);

+    ui->logList->setModel(nullptr);

+  }

 

   m_IntegratedBrowser.close();

 }

@@ -999,14 +1004,8 @@ void MainWindow::startExeAction()
 {

   QAction *action = qobject_cast<QAction*>(sender());

   if (action != nullptr) {

-    const Executable &selectedExecutable(m_OrganizerCore.executablesList()->find(action->text()));

     m_OrganizerCore.spawnBinary(

-          selectedExecutable.m_BinaryInfo,

-          selectedExecutable.m_Arguments,

-          selectedExecutable.m_WorkingDirectory.length() != 0 ? selectedExecutable.m_WorkingDirectory

-                                                              : selectedExecutable.m_BinaryInfo.absolutePath(),

-          selectedExecutable.m_CloseMO == ExecutableInfo::CloseMOStyle::DEFAULT_CLOSE,

-          selectedExecutable.m_SteamAppID);

+        m_OrganizerCore.executablesList()->find(action->text()));

   } else {

     qCritical("not an action?");

   }

@@ -1067,9 +1066,7 @@ void MainWindow::on_profileBox_currentIndexChanged(int index)
 void MainWindow::updateTo(QTreeWidgetItem *subTree, const std::wstring &directorySoFar, const DirectoryEntry &directoryEntry, bool conflictsOnly)

 {

   {

-    std::vector<FileEntry::Ptr> files = directoryEntry.getFiles();

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

-      FileEntry::Ptr current = *iter;

+    for (const FileEntry::Ptr current : directoryEntry.getFiles()) {

       if (conflictsOnly && (current->getAlternatives().size() == 0)) {

         continue;

       }

@@ -1164,7 +1161,7 @@ void MainWindow::updateTo(QTreeWidgetItem *subTree, const std::wstring &director
 

 void MainWindow::delayedRemove()

 {

-  foreach (QTreeWidgetItem *item, m_RemoveWidget) {

+  for (QTreeWidgetItem *item : m_RemoveWidget) {

     item->removeChild(item->child(0));

   }

   m_RemoveWidget.clear();

@@ -1201,7 +1198,7 @@ bool MainWindow::refreshProfiles(bool selectProfile)
   profileBox->clear();

   profileBox->addItem(QObject::tr("<Manage...>"));

 

-  QDir profilesDir(qApp->property("dataPath").toString() + "/" + QString::fromStdWString(AppConfig::profilesPath()));

+  QDir profilesDir(Settings::instance().getProfileDirectory());

   profilesDir.setFilter(QDir::AllDirs | QDir::NoDotAndDotDot);

 

   QDirIterator profileIter(profilesDir);

@@ -1319,9 +1316,10 @@ void MainWindow::refreshSaveList()
 

   QDir savesDir = currentSavesDir();

   savesDir.setNameFilters(filters);

+  qDebug("reading save games from %s", qPrintable(savesDir.absolutePath()));

 

   QFileInfoList files = savesDir.entryInfoList(QDir::Files, QDir::Time);

-  foreach (const QFileInfo &file, files) {

+  for (const QFileInfo &file : files) {

     QListWidgetItem *item = new QListWidgetItem(file.fileName());

     item->setData(Qt::UserRole, file.absoluteFilePath());

     ui->savegameList->addItem(item);

@@ -1344,163 +1342,6 @@ static QStringList toStringList(InputIterator current, InputIterator end)
   return result;

 }

 

-void MainWindow::updateBSAList(const QStringList &defaultArchives, const QStringList &activeArchives)

-{

-  m_DefaultArchives = defaultArchives;

-  ui->bsaList->clear();

-#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)

-  ui->bsaList->header()->setSectionResizeMode(QHeaderView::ResizeToContents);

-#else

-  ui->bsaList->header()->setResizeMode(QHeaderView::ResizeToContents);

-#endif

-

-  std::vector<std::pair<UINT32, QTreeWidgetItem*>> items;

-

-  BSAInvalidation *invalidation = m_OrganizerCore.managedGame()->feature<BSAInvalidation>();

-  std::vector<FileEntry::Ptr> files = m_OrganizerCore.directoryStructure()->getFiles();

-

-  QStringList plugins = m_OrganizerCore.findFiles("", [] (const QString &fileName) -> bool {

-    return fileName.endsWith(".esp", Qt::CaseInsensitive)

-        || fileName.endsWith(".esm", Qt::CaseInsensitive);

-  });

-

-  auto hasAssociatedPlugin = [&](const QString &bsaName) -> bool {

-    for (const QString &pluginName : plugins) {

-      QFileInfo pluginInfo(pluginName);

-      if (bsaName.startsWith(QFileInfo(pluginName).baseName(), Qt::CaseInsensitive)

-          && (m_OrganizerCore.pluginList()->state(pluginInfo.fileName()) == IPluginList::STATE_ACTIVE)) {

-        return true;

-      }

-    }

-    return false;

-  };

-

-  for (FileEntry::Ptr current : files) {

-    QFileInfo fileInfo(ToQString(current->getName().c_str()));

-

-    if (fileInfo.suffix().toLower() == "bsa") {

-      int index = activeArchives.indexOf(fileInfo.fileName());

-      if (index == -1) {

-        index = 0xFFFF;

-      } else {

-        index += 2;

-      }

-

-      if ((invalidation != nullptr) && invalidation->isInvalidationBSA(fileInfo.fileName())) {

-        index = 1;

-      }

-

-      int originId = current->getOrigin();

-      FilesOrigin &origin = m_OrganizerCore.directoryStructure()->getOriginByID(originId);

-

-      QTreeWidgetItem *newItem = new QTreeWidgetItem(QStringList()

-                                                     << fileInfo.fileName()

-                                                     << ToQString(origin.getName()));

-      newItem->setData(0, Qt::UserRole, index);

-      newItem->setData(1, Qt::UserRole, originId);

-      newItem->setFlags(newItem->flags() & ~Qt::ItemIsDropEnabled | Qt::ItemIsUserCheckable);

-      newItem->setCheckState(0, (index != -1) ? Qt::Checked : Qt::Unchecked);

-      newItem->setData(0, Qt::UserRole, false);

-      if (m_OrganizerCore.settings().forceEnableCoreFiles()

-          && defaultArchives.contains(fileInfo.fileName())) {

-        newItem->setCheckState(0, Qt::Checked);

-        newItem->setDisabled(true);

-        newItem->setData(0, Qt::UserRole, true);

-      } else if (fileInfo.fileName().compare("update.bsa", Qt::CaseInsensitive) == 0) {

-        newItem->setCheckState(0, Qt::Checked);

-        newItem->setDisabled(true);

-      } else if (hasAssociatedPlugin(fileInfo.fileName())) {

-        newItem->setCheckState(0, Qt::Checked);

-        newItem->setDisabled(true);

-      } else {

-        if (ui->manageArchivesBox->isChecked()) {

-          newItem->setCheckState(0, (index != 0xFFFF) ? Qt::Checked : Qt::Unchecked);

-        } else {

-          newItem->setCheckState(0, Qt::Unchecked);

-          newItem->setDisabled(true);

-        }

-      }

-

-      if (index < 0) index = 0;

-

-      UINT32 sortValue = ((origin.getPriority() & 0xFFFF) << 16) | (index & 0xFFFF);

-      items.push_back(std::make_pair(sortValue, newItem));

-    }

-  }

-

-  std::sort(items.begin(), items.end(), BySortValue);

-

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

-    int originID = iter->second->data(1, Qt::UserRole).toInt();

-

-    FilesOrigin origin = m_OrganizerCore.directoryStructure()->getOriginByID(originID);

-    QString modName("data");

-    unsigned int modIndex = ModInfo::getIndex(ToQString(origin.getName()));

-    if (modIndex != UINT_MAX) {

-      ModInfo::Ptr modInfo = ModInfo::getByIndex(modIndex);

-      modName = modInfo->name();

-    }

-    QList<QTreeWidgetItem*> items = ui->bsaList->findItems(modName, Qt::MatchFixedString);

-    QTreeWidgetItem *subItem = nullptr;

-    if (items.length() > 0) {

-      subItem = items.at(0);

-    } else {

-      subItem = new QTreeWidgetItem(QStringList(modName));

-      subItem->setFlags(subItem->flags() & ~Qt::ItemIsDragEnabled);

-      ui->bsaList->addTopLevelItem(subItem);

-    }

-    subItem->addChild(iter->second);

-    subItem->setExpanded(true);

-  }

-

-  checkBSAList();

-}

-

-

-void MainWindow::checkBSAList()

-{

-  DataArchives *archives = m_OrganizerCore.managedGame()->feature<DataArchives>();

-

-  if (archives != nullptr) {

-    ui->bsaList->blockSignals(true);

-    ON_BLOCK_EXIT([&] () { ui->bsaList->blockSignals(false); });

-

-    QStringList defaultArchives = archives->archives(m_OrganizerCore.currentProfile());

-

-    bool warning = false;

-

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

-      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 (defaultArchives.contains(filename)) {

-            item->setIcon(0, QIcon(":/MO/gui/warning"));

-            item->setToolTip(0, tr("This bsa is enabled in the ini file so it may be required!"));

-            modWarning = true;

-          }

-        }

-      }

-      if (modWarning) {

-        ui->bsaList->expandItem(ui->bsaList->topLevelItem(i));

-        warning = true;

-      }

-    }

-

-    if (warning) {

-      ui->tabWidget->setTabIcon(1, QIcon(":/MO/gui/warning"));

-    } else {

-      ui->tabWidget->setTabIcon(1, QIcon());

-    }

-  }

-}

-

-

 void MainWindow::saveModMetas()

 {

   for (unsigned int i = 0; i < ModInfo::getNumMods(); ++i) {

@@ -1509,7 +1350,6 @@ void MainWindow::saveModMetas()
   }

 }

 

-

 void MainWindow::fixCategories()

 {

   for (unsigned int i = 0; i < ModInfo::getNumMods(); ++i) {

@@ -1580,10 +1420,6 @@ void MainWindow::readSettings()
   if (settings.value("Settings/use_proxy", false).toBool()) {

     activateProxy(true);

   }

-

-  ui->manageArchivesBox->blockSignals(true);

-  ui->manageArchivesBox->setChecked(settings.value("manage_bsas", true).toBool());

-  ui->manageArchivesBox->blockSignals(false);

 }

 

 

@@ -1601,7 +1437,6 @@ void MainWindow::storeSettings(QSettings &settings)
   settings.setValue("browser_geometry", m_IntegratedBrowser.saveGeometry());

 

   settings.setValue("filters_visible", ui->displayCategoriesBtn->isChecked());

-  settings.setValue("manage_bsas", ui->manageArchivesBox->isChecked());

 

   settings.setValue("selected_executable", ui->executablesListBox->currentIndex());

 }

@@ -1641,12 +1476,10 @@ void MainWindow::on_tabWidget_currentChanged(int index)
   if (index == 0) {

     m_OrganizerCore.refreshESPList();

   } else if (index == 1) {

-    m_OrganizerCore.refreshBSAList();

-  } else if (index == 2) {

     refreshDataTree();

-  } else if (index == 3) {

+  } else if (index == 2) {

     refreshSaveList();

-  } else if (index == 4) {

+  } else if (index == 3) {

     ui->downloadView->scrollToBottom();

   }

 }

@@ -1678,15 +1511,7 @@ void MainWindow::installMod(QString fileName)
 

 void MainWindow::on_startButton_clicked()

 {

-  const Executable &selectedExecutable(getSelectedExecutable());

-

-  m_OrganizerCore.spawnBinary(

-        selectedExecutable.m_BinaryInfo,

-        selectedExecutable.m_Arguments,

-        selectedExecutable.m_WorkingDirectory.length() != 0 ? selectedExecutable.m_WorkingDirectory

-                                                            : selectedExecutable.m_BinaryInfo.absolutePath(),

-        selectedExecutable.m_CloseMO == ExecutableInfo::CloseMOStyle::DEFAULT_CLOSE,

-        selectedExecutable.m_SteamAppID);

+  m_OrganizerCore.spawnBinary(getSelectedExecutable());

 }

 

 

@@ -1776,7 +1601,9 @@ bool MainWindow::modifyExecutablesDialog()
 {

   bool result = false;

   try {

-    EditExecutablesDialog dialog(*m_OrganizerCore.executablesList());

+    EditExecutablesDialog dialog(*m_OrganizerCore.executablesList(),

+                                 *m_OrganizerCore.modList(),

+                                 m_OrganizerCore.currentProfile());

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

       m_OrganizerCore.setExecutablesList(dialog.getExecutablesList());

       result = true;

@@ -1896,8 +1723,10 @@ void MainWindow::setESPListSorting(int index)
 void MainWindow::refresher_progress(int percent)

 {

   if (percent == 100) {

-//    m_RefreshProgress->setVisible(false);

+    m_RefreshProgress->setVisible(false);

+    statusBar()->hide();

   } else if (!m_RefreshProgress->isVisible()) {

+    statusBar()->show();

     m_RefreshProgress->setVisible(true);

     m_RefreshProgress->setRange(0, 100);

     m_RefreshProgress->setValue(percent);

@@ -1925,7 +1754,6 @@ void MainWindow::modorder_changed()
   }

   m_OrganizerCore.refreshBSAList();

   m_OrganizerCore.currentProfile()->modlistWriter().write();

-  m_ArchiveListWriter.write();

   m_OrganizerCore.directoryStructure()->getFileRegister()->sortOrigins();

 

   { // refresh selection

@@ -2116,11 +1944,14 @@ void MainWindow::addContentFilters()
 

 void MainWindow::addCategoryFilters(QTreeWidgetItem *root, const std::set<int> &categoriesUsed, int targetID)

 {

-  for (size_t i = 1; i < m_CategoryFactory.numCategories(); ++i) {

+  for (unsigned int i = 1;

+       i < static_cast<unsigned int>(m_CategoryFactory.numCategories()); ++i) {

     if ((m_CategoryFactory.getParentID(i) == targetID)) {

       int categoryID = m_CategoryFactory.getCategoryID(i);

       if (categoriesUsed.find(categoryID) != categoriesUsed.end()) {

-        QTreeWidgetItem *item = addFilterItem(root, m_CategoryFactory.getCategoryName(i), categoryID, ModListSortProxy::TYPE_CATEGORY);

+        QTreeWidgetItem *item =

+            addFilterItem(root, m_CategoryFactory.getCategoryName(i),

+                          categoryID, ModListSortProxy::TYPE_CATEGORY);

         if (m_CategoryFactory.hasChildren(i)) {

           addCategoryFilters(item, categoriesUsed, categoryID);

         }

@@ -2256,7 +2087,7 @@ void MainWindow::removeMod_clicked()
     if (selection->hasSelection() && selection->selectedRows().count() > 1) {

       QString mods;

       QStringList modNames;

-      foreach (QModelIndex idx, selection->selectedRows()) {

+      for (QModelIndex idx : selection->selectedRows()) {

         QString name = idx.data().toString();

         if (!ModInfo::getByIndex(idx.data(Qt::UserRole + 1).toInt())->isRegular()) {

           continue;

@@ -2268,7 +2099,7 @@ void MainWindow::removeMod_clicked()
                                 tr("Remove the following mods?<br><ul>%1</ul>").arg(mods),

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

         // use mod names instead of indexes because those become invalid during the removal

-        foreach (QString name, modNames) {

+        for (QString name : modNames) {

           m_OrganizerCore.modList()->removeRowForce(ModInfo::getIndex(name), QModelIndex());

         }

       }

@@ -2582,7 +2413,32 @@ void MainWindow::information_clicked()
   }

 }

 

+void MainWindow::createEmptyMod_clicked()

+{

+  GuessedValue<QString> name;

+  name.setFilter(&fixDirectoryName);

 

+  while (name->isEmpty()) {

+    bool ok;

+    name.update(QInputDialog::getText(this, tr("Create Mod..."),

+                                      tr("This will create an empty mod.\n"

+                                         "Please enter a name:"), QLineEdit::Normal, "", &ok),

+                GUESS_USER);

+    if (!ok) {

+      return;

+    }

+  }

+

+  if (m_OrganizerCore.getMod(name) != nullptr) {

+    reportError(tr("A mod with this name already exists"));

+    return;

+  }

+

+  IModInterface *newMod = m_OrganizerCore.createMod(name);

+  if (newMod == nullptr) {

+    return;

+  }

+}

 

 void MainWindow::createModFromOverwrite()

 {

@@ -2661,7 +2517,7 @@ bool MainWindow::populateMenuCategories(QMenu *menu, int targetID)
 

   bool childEnabled = false;

 

-  for (size_t i = 1; i < m_CategoryFactory.numCategories(); ++i) {

+  for (unsigned int i = 1; i < m_CategoryFactory.numCategories(); ++i) {

     if (m_CategoryFactory.getParentID(i) == targetID) {

       QMenu *targetMenu = menu;

       if (m_CategoryFactory.hasChildren(i)) {

@@ -2695,7 +2551,7 @@ bool MainWindow::populateMenuCategories(QMenu *menu, int targetID)
 void MainWindow::replaceCategoriesFromMenu(QMenu *menu, int modRow)

 {

   ModInfo::Ptr modInfo = ModInfo::getByIndex(modRow);

-  foreach (QAction* action, menu->actions()) {

+  for (QAction* action : menu->actions()) {

     if (action->menu() != nullptr) {

       replaceCategoriesFromMenu(action->menu(), modRow);

     } else {

@@ -2820,55 +2676,6 @@ void MainWindow::replaceCategories_MenuHandler() {
   refreshFilters();

 }

 

-void MainWindow::savePrimaryCategory()

-{

-  QMenu *menu = qobject_cast<QMenu*>(sender());

-  if (menu == nullptr) {

-    qCritical("not a menu?");

-    return;

-  }

-

-  foreach (QAction* action, menu->actions()) {

-    QWidgetAction *widgetAction = qobject_cast<QWidgetAction*>(action);

-    if (widgetAction != nullptr) {

-      QRadioButton *btn = qobject_cast<QRadioButton*>(widgetAction->defaultWidget());

-      if (btn->isChecked()) {

-        QModelIndexList selected = ui->modList->selectionModel()->selectedRows();

-        for (int i = 0; i < selected.size(); ++i) {

-          ModInfo::Ptr modInfo = ModInfo::getByIndex(m_ModListSortProxy->mapToSource(selected.at(i)).row());

-          modInfo->setPrimaryCategory(widgetAction->data().toInt());

-        }

-        break;

-      }

-    }

-  }

-}

-

-void MainWindow::saveArchiveList()

-{

-  if (m_OrganizerCore.isArchivesInit()) {

-    SafeWriteFile archiveFile(m_OrganizerCore.currentProfile()->getArchivesFileName());

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

-      QTreeWidgetItem *tlItem = ui->bsaList->topLevelItem(i);

-      for (int j = 0; j < tlItem->childCount(); ++j) {

-        QTreeWidgetItem *item = tlItem->child(j);

-        if (item->checkState(0) == Qt::Checked) {

-          // in managed mode, "register" all enabled archives, otherwise register only the files registered in the ini

-          if (ui->manageArchivesBox->isChecked()

-              || item->data(0, Qt::UserRole).toBool()) {

-            archiveFile->write(item->text(0).toUtf8().append("\r\n"));

-          }

-        }

-      }

-    }

-    if (archiveFile.commitIfDifferent(m_ArchiveListHash)) {

-      qDebug("%s saved", qPrintable(QDir::toNativeSeparators(m_OrganizerCore.currentProfile()->getArchivesFileName())));

-    }

-  } else {

-    qWarning("archive list not initialised");

-  }

-}

-

 void MainWindow::checkModsForUpdates()

 {

   statusBar()->show();

@@ -2928,15 +2735,21 @@ void MainWindow::unignoreUpdate()
   info->ignoreUpdate(false);

 }

 

-void MainWindow::addPrimaryCategoryCandidates(QMenu *primaryCategoryMenu, ModInfo::Ptr info)

-{

+void MainWindow::addPrimaryCategoryCandidates(QMenu *primaryCategoryMenu,

+                                              ModInfo::Ptr info) {

   const std::set<int> &categories = info->getCategories();

-  foreach (int categoryID, categories) {

+  for (int categoryID : categories) {

     int catIdx = m_CategoryFactory.getCategoryIndex(categoryID);

     QWidgetAction *action = new QWidgetAction(primaryCategoryMenu);

     try {

-      QRadioButton *categoryBox = new QRadioButton(m_CategoryFactory.getCategoryName(catIdx).replace('&', "&&"),

-                                             primaryCategoryMenu);

+      QRadioButton *categoryBox = new QRadioButton(

+          m_CategoryFactory.getCategoryName(catIdx).replace('&', "&&"),

+          primaryCategoryMenu);

+      connect(categoryBox, &QRadioButton::toggled, [info, categoryID](bool enable) {

+        if (enable) {

+          info->setPrimaryCategory(categoryID);

+        }

+      });

       categoryBox->setChecked(categoryID == info->getPrimaryCategory());

       action->setDefaultWidget(categoryBox);

     } catch (const std::exception &e) {

@@ -3045,6 +2858,8 @@ QMenu *MainWindow::modListContextMenu()
   QMenu *menu = new QMenu(this);

   menu->addAction(tr("Install Mod..."), this, SLOT(installMod_clicked()));

 

+  menu->addAction(tr("Create empty mod"), this, SLOT(createEmptyMod_clicked()));

+

   menu->addAction(tr("Enable all visible"), this, SLOT(enableVisibleMods()));

   menu->addAction(tr("Disable all visible"), this, SLOT(disableVisibleMods()));

 

@@ -3098,7 +2913,6 @@ void MainWindow::on_modList_customContextMenuRequested(const QPoint &pos)
 

         QMenu *primaryCategoryMenu = new QMenu(tr("Primary Category"));

         connect(primaryCategoryMenu, SIGNAL(aboutToShow()), this, SLOT(addPrimaryCategoryCandidates()));

-        connect(primaryCategoryMenu, SIGNAL(aboutToHide()), this, SLOT(savePrimaryCategory()));

         addMenuAsPushButton(menu, primaryCategoryMenu);

 

         menu->addSeparator();

@@ -3144,11 +2958,7 @@ void MainWindow::on_modList_customContextMenuRequested(const QPoint &pos)
 

         if (info->getNexusID() > 0)  {

           menu->addAction(tr("Visit on Nexus"), this, SLOT(visitOnNexus_clicked()));

-        }

-

-        //If a URL is specified which is not the game's URL, pop up 'visit web page'

-        if (info->getURL() != "" &&

-            !NexusInterface::instance()->isModURL(info->getNexusID(), info->getURL())) {

+        } else if ((info->getURL() != "")) {

           menu->addAction(tr("Visit web page"), this, SLOT(visitWebPage_clicked()));

         }

 

@@ -3175,7 +2985,7 @@ void MainWindow::on_categoriesList_itemSelectionChanged()
   QModelIndexList indices = ui->categoriesList->selectionModel()->selectedRows();

   std::vector<int> categories;

   std::vector<int> content;

-  foreach (const QModelIndex &index, indices) {

+  for (const QModelIndex &index : indices) {

     int filterType = index.data(Qt::UserRole + 1).toInt();

     if ((filterType == ModListSortProxy::TYPE_CATEGORY)

         || (filterType == ModListSortProxy::TYPE_SPECIAL)) {

@@ -3191,7 +3001,7 @@ void MainWindow::on_categoriesList_itemSelectionChanged()
 

   m_ModListSortProxy->setCategoryFilter(categories);

   m_ModListSortProxy->setContentFilter(content);

-  ui->clickBlankLabel->setEnabled(categories.size() > 0);

+  ui->clickBlankButton->setEnabled(categories.size() > 0);

   if (indices.count() == 0) {

     ui->currentCategoryLabel->setText(QString("(%1)").arg(tr("<All>")));

   } else if (indices.count() > 1) {

@@ -3239,6 +3049,7 @@ void MainWindow::deleteSavegame_clicked()
                               .arg(savesMsgLabel),

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

     shellDelete(deleteFiles, true); // recycle bin delete.

+    refreshSaveList();

   }

 }

 

@@ -3326,7 +3137,7 @@ QString getStartMenuLinkfile(const Executable &exec)
 

 void MainWindow::addWindowsLink(const ShortcutType mapping)

 {

-  Executable const &selectedExecutable(getSelectedExecutable());

+  const Executable &selectedExecutable(getSelectedExecutable());

   QString const linkName = getLinkfile(mapping == ShortcutType::Desktop ? getDesktopDirectory() : getStartMenuDirectory(),

                                        selectedExecutable);

 

@@ -3450,7 +3261,7 @@ void MainWindow::installTranslator(const QString &name)
 

 void MainWindow::languageChange(const QString &newLanguage)

 {

-  foreach (QTranslator *trans, m_Translators) {

+  for (QTranslator *trans : m_Translators) {

     qApp->removeTranslator(trans);

   }

   m_Translators.clear();

@@ -3584,7 +3395,6 @@ void MainWindow::addAsExecutable()
                                                            binaryInfo.absoluteFilePath(),

                                                            arguments,

                                                            targetInfo.absolutePath(),

-                                                           ExecutableInfo::CloseMOStyle::DEFAULT_STAY,

                                                            QString(),

                                                            Executable::CustomExecutable);

           refreshExecutablesList();

@@ -3695,7 +3505,7 @@ void MainWindow::previewDataFile()
     };

 

   addFunc(file->getOrigin());

-  foreach (int i, file->getAlternatives()) {

+  for (int i : file->getAlternatives()) {

     addFunc(i);

   }

   if (preview.numVariants() > 0) {

@@ -3713,10 +3523,14 @@ void MainWindow::openDataFile()
     QString arguments;

     switch (getBinaryExecuteInfo(targetInfo, binaryInfo, arguments)) {

       case 1: {

-        m_OrganizerCore.spawnBinaryDirect(binaryInfo, arguments, m_OrganizerCore.currentProfile()->name(), targetInfo.absolutePath(), "");

+        m_OrganizerCore.spawnBinaryDirect(

+            binaryInfo, arguments, m_OrganizerCore.currentProfile()->name(),

+            targetInfo.absolutePath(), "", "");

       } break;

       case 2: {

-        ::ShellExecuteW(nullptr, L"open", ToWString(targetInfo.absoluteFilePath()).c_str(), nullptr, nullptr, SW_SHOWNORMAL);

+        ::ShellExecuteW(nullptr, L"open",

+                        ToWString(targetInfo.absoluteFilePath()).c_str(),

+                        nullptr, nullptr, SW_SHOWNORMAL);

       } break;

       default: {

         // nop

@@ -3854,8 +3668,7 @@ void MainWindow::updateDownloadListDelegate()
 

 void MainWindow::modDetailsUpdated(bool)

 {

-  --m_ModsToUpdate;

-  if (m_ModsToUpdate == 0) {

+  if (--m_ModsToUpdate == 0) {

     statusBar()->hide();

     m_ModListSortProxy->setCategoryFilter(boost::assign::list_of(CategoryFactory::CATEGORY_SPECIAL_UPDATEAVAILABLE));

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

@@ -3872,7 +3685,7 @@ void MainWindow::modDetailsUpdated(bool)
 

 void MainWindow::nxmUpdatesAvailable(const std::vector<int> &modIDs, QVariant userData, QVariant resultData, int)

 {

-  m_ModsToUpdate -= modIDs.size();

+  m_ModsToUpdate -= static_cast<int>(modIDs.size());

   QVariantList resultList = resultData.toList();

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

     QVariantMap result = iter->toMap();

@@ -3926,7 +3739,7 @@ void MainWindow::nxmDownloadURLs(int, int, QVariant, QVariant resultData, int)
   QVariantList serverList = resultData.toList();

 

   QList<ServerInfo> servers;

-  foreach (const QVariant &server, serverList) {

+  for (const QVariant &server : serverList) {

     QVariantMap serverInfo = server.toMap();

     ServerInfo info;

     info.name = serverInfo["Name"].toString();

@@ -4049,7 +3862,7 @@ void MainWindow::displayColumnSelection(const QPoint &pos)
 

   // view/hide columns depending on check-state

   int i = 1;

-  foreach (const QAction *action, menu.actions()) {

+  for (const QAction *action : menu.actions()) {

     const QWidgetAction *widgetAction = qobject_cast<const QWidgetAction*>(action);

     if (widgetAction != nullptr) {

       const QCheckBox *checkBox = qobject_cast<const QCheckBox*>(widgetAction->defaultWidget());

@@ -4061,32 +3874,6 @@ void MainWindow::displayColumnSelection(const QPoint &pos)
   }

 }

 

-

-void MainWindow::on_bsaList_customContextMenuRequested(const QPoint &pos)

-{

-  m_ContextItem = ui->bsaList->itemAt(pos);

-

-//  m_ContextRow = ui->bsaList->indexOfTopLevelItem(ui->bsaList->itemAt(pos));

-

-  QMenu menu;

-  menu.addAction(tr("Extract..."), this, SLOT(extractBSATriggered()));

-

-  menu.exec(ui->bsaList->mapToGlobal(pos));

-}

-

-void MainWindow::bsaList_itemMoved()

-{

-  m_ArchiveListWriter.write();

-  m_CheckBSATimer.start(500);

-}

-

-

-void MainWindow::on_bsaList_itemChanged(QTreeWidgetItem*, int)

-{

-  m_ArchiveListWriter.write();

-  m_CheckBSATimer.start(500);

-}

-

 void MainWindow::on_actionProblems_triggered()

 {

   ProblemsDialog problems(m_PluginContainer.plugins<IPluginDiagnose>(), this);

@@ -4404,10 +4191,15 @@ void MainWindow::on_bossButton_clicked()
     HANDLE stdOutWrite = INVALID_HANDLE_VALUE;

     HANDLE stdOutRead = INVALID_HANDLE_VALUE;

     createStdoutPipe(&stdOutRead, &stdOutWrite);

+    try {

+      m_OrganizerCore.prepareVFS();

+    } catch (const std::exception &e) {

+      QMessageBox::warning(qApp->activeWindow(), tr("Error"), e.what());

+      return;

+    }

+

     HANDLE loot = startBinary(QFileInfo(qApp->applicationDirPath() + "/loot/lootcli.exe"),

                               parameters.join(" "),

-                              m_OrganizerCore.currentProfile()->name(),

-                              m_OrganizerCore.settings().logLevel(),

                               qApp->applicationDirPath() + "/loot",

                               true,

                               stdOutWrite);

@@ -4502,6 +4294,7 @@ void MainWindow::on_bossButton_clicked()
   } catch (const std::exception &e) {

     reportError(tr("failed to run loot: %1").arg(e.what()));

   }

+

   if (errorMessages.length() > 0) {

     QMessageBox *warn = new QMessageBox(QMessageBox::Warning, tr("Errors occured"), errorMessages.c_str(), QMessageBox::Ok, this);

     warn->setModal(false);

@@ -4515,11 +4308,7 @@ void MainWindow::on_bossButton_clicked()
       QStringList temp = report.split("?");

       QUrl url = QUrl::fromLocalFile(temp.at(0));

       if (temp.size() > 1) {

-#if QT_VERSION >= 0x050000

         url.setQuery(temp.at(1).toUtf8());

-#else

-        url.setEncodedQuery(temp.at(1).toUtf8());

-#endif

       }

       m_IntegratedBrowser.openUrl(url);

     }

@@ -4531,10 +4320,7 @@ void MainWindow::on_bossButton_clicked()
       QFile::remove(m_OrganizerCore.currentProfile()->getLoadOrderFileName());

     }

     m_OrganizerCore.refreshESPList();

-    if (m_OrganizerCore.managedGame()->loadOrderMechanism() == IPluginGame::LoadOrderMechanism::FileTime) {

-      // the load order should have been retrieved from file time, now save it to our own format

-      m_OrganizerCore.savePluginList();

-    }

+    m_OrganizerCore.savePluginList();

   }

 }

 

@@ -4576,7 +4362,7 @@ QString MainWindow::queryRestore(const QString &filePath)
   SelectionDialog dialog(tr("Choose backup to restore"), this);

   QRegExp exp(pluginFileInfo.fileName() + PATTERN_BACKUP_REGEX);

   QRegExp exp2(pluginFileInfo.fileName() + "\\.(.*)");

-  foreach(const QFileInfo &info, files) {

+  for(const QFileInfo &info : files) {

     if (exp.exactMatch(info.fileName())) {

       QDateTime time = QDateTime::fromString(exp.cap(1), PATTERN_BACKUP_DATE);

       dialog.addChoice(time.toString(), "", exp.cap(1));

@@ -4662,17 +4448,6 @@ void MainWindow::on_categoriesOrBtn_toggled(bool checked)
   }

 }

 

-void MainWindow::on_managedArchiveLabel_linkHovered(const QString&)

-{

-  QToolTip::showText(QCursor::pos(),

-                     ui->managedArchiveLabel->toolTip());

-}

-

-void MainWindow::on_manageArchivesBox_toggled(bool)

-{

-  m_OrganizerCore.refreshBSAList();

-}

-

 void MainWindow::dragEnterEvent(QDragEnterEvent *event)

 {

   //Accept copy or move drags to the download window. Link drags are not

@@ -4778,3 +4553,8 @@ void MainWindow::dropEvent(QDropEvent *event)
   event->accept();

 }

 

+

+void MainWindow::on_clickBlankButton_clicked()

+{

+  deselectFilters();

+}