1 files changed, 9 insertions, 246 deletions

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index f30e46f1..1a7d1564 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -167,7 +167,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);

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

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

   statusBar()->clearMessage();

+  statusBar()->hide();

 

   ui->actionEndorseMO->setVisible(false);

 

@@ -239,8 +239,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);

 

@@ -270,8 +268,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()));

@@ -310,9 +306,6 @@ MainWindow::MainWindow(const QString &exeName
 

   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()));

 

@@ -367,9 +360,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 ? "*" : ""));

   }

 

@@ -592,9 +583,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();

   }

@@ -989,7 +980,6 @@ void MainWindow::startExeAction()
           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);

   } else {

     qCritical("not an action?");

@@ -1328,163 +1318,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) {

@@ -1493,7 +1326,6 @@ void MainWindow::saveModMetas()
   }

 }

 

-

 void MainWindow::fixCategories()

 {

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

@@ -1564,10 +1396,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);

 }

 

 

@@ -1585,7 +1413,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());

 }

@@ -1669,7 +1496,6 @@ void MainWindow::on_startButton_clicked()
         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);

 }

 

@@ -1880,8 +1706,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);

@@ -1909,7 +1737,6 @@ void MainWindow::modorder_changed()
   }

   m_OrganizerCore.refreshBSAList();

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

-  m_ArchiveListWriter.write();

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

 

   { // refresh selection

@@ -2828,30 +2655,6 @@ void MainWindow::savePrimaryCategory()
   }

 }

 

-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()

 {

@@ -3618,7 +3421,6 @@ void MainWindow::addAsExecutable()
                                                            binaryInfo.absoluteFilePath(),

                                                            arguments,

                                                            targetInfo.absolutePath(),

-                                                           ExecutableInfo::CloseMOStyle::DEFAULT_STAY,

                                                            QString(),

                                                            Executable::CustomExecutable);

           refreshExecutablesList();

@@ -3888,8 +3690,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) {

@@ -4095,32 +3896,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);

@@ -4438,10 +4213,9 @@ void MainWindow::on_bossButton_clicked()
     HANDLE stdOutWrite = INVALID_HANDLE_VALUE;

     HANDLE stdOutRead = INVALID_HANDLE_VALUE;

     createStdoutPipe(&stdOutRead, &stdOutWrite);

+    m_OrganizerCore.prepareVFS();

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

                               parameters.join(" "),

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

-                              m_OrganizerCore.settings().logLevel(),

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

                               true,

                               stdOutWrite);

@@ -4696,17 +4470,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