Merge branch 'master' into 'master'

FIX: Handle openmw-cs plugin load order like the launcher

Closes #5712

See merge request OpenMW/openmw!5278

Author: Capostrophic

apps/opencs/editor.cpp

@@ -127,6 +127,11 @@ boost::program_options::variables_map CS::Editor::readConfiguration()
             ->multitoken()
             ->composing(),
         "fallback values");
+    addOption("content",
+        boost::program_options::value<std::vector<std::string>>()
+            ->default_value(std::vector<std::string>(), "")
+            ->multitoken()
+            ->composing());
     Files::ConfigurationManager::addCommonOptions(desc);
 
     boost::program_options::notify(variables);
@@ -187,13 +192,22 @@ std::pair<Files::PathContainer, std::vector<std::string>> CS::Editor::readConfig
         QApplication::exit(1);
     }
 
-    dataDirs.insert(dataDirs.end(), dataLocal.begin(), dataLocal.end());
+    if (!dataLocal.empty())
+        dataDirs.insert(dataDirs.begin(), dataLocal.begin(), dataLocal.end());
 
     dataDirs.insert(dataDirs.begin(), mResources / "vfs");
 
-    // iterate the data directories and add them to the file dialog for loading
     mFileDialog.addFiles(dataDirs);
 
+    if (!variables["content"].empty())
+    {
+        QStringList contentOrder;
+        for (const auto& c : variables["content"].as<std::vector<std::string>>())
+            contentOrder.append(QString::fromStdString(c));
+
+        mFileDialog.setContentList(contentOrder, true);
+    }
+
     return std::make_pair(dataDirs, variables["fallback-archive"].as<std::vector<std::string>>());
 }
 

apps/opencs/view/doc/filedialog.cpp

@@ -54,6 +54,11 @@ void CSVDoc::FileDialog::clearFiles()
     mSelector->clearFiles();
 }
 
+void CSVDoc::FileDialog::setContentList(const QStringList& fileList, bool orderOnly)
+{
+    mSelector->setContentList(fileList, orderOnly);
+}
+
 QStringList CSVDoc::FileDialog::selectedFilePaths()
 {
     QStringList filePaths;

apps/opencs/view/doc/filedialog.hpp

@@ -55,6 +55,7 @@ namespace CSVDoc
         void addFiles(const std::vector<std::filesystem::path>& dataDirs);
         void setEncoding(const QString& encoding);
         void clearFiles();
+        void setContentList(const QStringList& fileList, bool orderOnly = false);
 
         QString filename() const;
         QStringList selectedFilePaths();

components/contentselector/model/contentmodel.cpp

@@ -652,7 +652,7 @@ bool ContentSelectorModel::ContentModel::isLoadOrderError(const EsmFile* file) c
     return !errors.empty();
 }
 
-void ContentSelectorModel::ContentModel::setContentList(const QStringList& fileList)
+void ContentSelectorModel::ContentModel::setContentList(const QStringList& fileList, bool orderOnly)
 {
     QProgressDialog progressDialog("Setting content list", {}, 0, static_cast<int>(fileList.size()));
     progressDialog.setWindowModality(Qt::WindowModal);
@@ -662,7 +662,10 @@ void ContentSelectorModel::ContentModel::setContentList(const QStringList& fileL
     for (qsizetype i = 0, n = fileList.size(); i < n; ++i)
     {
         const EsmFile* file = item(fileList[i]);
-        if (setCheckState(file, true))
+        if (!file)
+            continue;
+
+        if (orderOnly || setCheckState(file, true))
         {
             // setCheckState already gracefully handles builtIn and fromAnotherConfigFile
             // as necessary, move plug-ins in visible list to match sequence of supplied filelist

components/contentselector/model/contentmodel.hpp

@@ -64,7 +64,7 @@ namespace ContentSelectorModel
         bool isNew(const QString& filepath) const;
         void setNew(const EsmFile* file, bool isChecked);
         void setNonUserContent(const QStringList& fileList);
-        void setContentList(const QStringList& fileList);
+        void setContentList(const QStringList& fileList, bool orderOnly = false);
         ContentFileList checkedItems() const;
         void uncheckAll();
 

components/contentselector/view/contentselector.cpp

@@ -178,14 +178,14 @@ void ContentSelectorView::ContentSelector::setEncoding(const QString& encoding)
     mContentModel->setEncoding(encoding);
 }
 
-void ContentSelectorView::ContentSelector::setContentList(const QStringList& list)
+void ContentSelectorView::ContentSelector::setContentList(const QStringList& list, bool orderOnly)
 {
-    if (list.isEmpty())
+    if (list.isEmpty() && !orderOnly)
     {
         slotCurrentGameFileIndexChanged(ui->gameFileView->currentIndex());
     }
     else
-        mContentModel->setContentList(list);
+        mContentModel->setContentList(list, orderOnly);
 }
 
 ContentSelectorModel::ContentFileList ContentSelectorView::ContentSelector::selectedFiles() const

components/contentselector/view/contentselector.hpp

@@ -45,7 +45,7 @@ namespace ContentSelectorView
 
         void clearCheckStates();
         void setEncoding(const QString& encoding);
-        void setContentList(const QStringList& list);
+        void setContentList(const QStringList& list, bool orderOnly = false);
 
         ContentSelectorModel::ContentFileList selectedFiles() const;