Merge remote-tracking branch 'origin/qt6'

ModOrganizer2 · Sep 5, 2023 · 5bb4a2a · 5bb4a2a
2 parents c8e247f + fdc4ebd
commit 5bb4a2a
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 8 deletions.
diff --git a/src/aboutdialog.cpp b/src/aboutdialog.cpp
@@ -54,6 +54,7 @@ AboutDialog::AboutDialog(const QString& version, QWidget* parent)
   m_LicenseFiles[LICENSE_CASTLE]  = "Castle.txt";
   m_LicenseFiles[LICENSE_ANTLR]   = "AntlrBuildTask.txt";
   m_LicenseFiles[LICENSE_DXTEX]   = "DXTex.txt";
+  m_LicenseFiles[LICENSE_VDF]     = "ValveFileVDF.txt";
 
   addLicense("Qt", LICENSE_LGPL3);
   addLicense("Qt Json", LICENSE_GPL3);
@@ -75,6 +76,7 @@ AboutDialog::AboutDialog(const QString& version, QWidget* parent)
   addLicense("{fmt}", LICENSE_FMT);
   addLicense("SIP", LICENSE_SIP);
   addLicense("DXTex Headers", LICENSE_DXTEX);
+  addLicense("Valve File VDF Reader", LICENSE_VDF);
 
   ui->nameLabel->setText(
       QString("<span style=\"font-size:12pt; font-weight:600;\">%1 %2</span>")

diff --git a/src/aboutdialog.h b/src/aboutdialog.h
@@ -61,7 +61,8 @@ class AboutDialog : public QDialog
     LICENSE_SIP,
     LICENSE_CASTLE,
     LICENSE_ANTLR,
-    LICENSE_DXTEX
+    LICENSE_DXTEX,
+    LICENSE_VDF,
   };
 
 private:

diff --git a/src/directoryrefresher.cpp b/src/directoryrefresher.cpp
@@ -473,6 +473,11 @@ void DirectoryRefresher::refresh()
       m_Root->addFromOrigin(L"data", dataDirectory, 0, dummy);
     }
 
+    for (auto directory : game->secondaryDataDirectories().toStdMap()) {
+      DirectoryStats dummy;
+      m_Root->addFromOrigin(directory.first.toStdWString(), QDir::toNativeSeparators(directory.second.absolutePath()).toStdWString(), 0, dummy);
+    }
+
     std::sort(m_Mods.begin(), m_Mods.end(), [](auto lhs, auto rhs) {
       return lhs.priority < rhs.priority;
     });

diff --git a/src/organizercore.cpp b/src/organizercore.cpp
@@ -1992,7 +1992,12 @@ std::vector<Mapping> OrganizerCore::fileMapping(const QString& profileName,
 
   MappingType result;
 
-  QString dataPath = QDir::toNativeSeparators(game->dataDirectory().absolutePath());
+  QStringList dataPaths;
+  dataPaths.append(QDir::toNativeSeparators(game->dataDirectory().absolutePath()));
+
+  for (auto directory : game->secondaryDataDirectories()) {
+    dataPaths.append(directory.absolutePath());
+  }
 
   bool overwriteActive = false;
 
@@ -2009,8 +2014,10 @@ std::vector<Mapping> OrganizerCore::fileMapping(const QString& profileName,
     overwriteActive |= createTarget;
 
     if (modPtr->isRegular()) {
-      result.insert(result.end(), {QDir::toNativeSeparators(std::get<1>(mod)), dataPath,
-                                   true, createTarget});
+      for (auto dataPath : dataPaths) {
+        result.insert(result.end(), { QDir::toNativeSeparators(std::get<1>(mod)),
+                                     dataPath, true, createTarget });
+      }
     }
   }
 
@@ -2031,8 +2038,14 @@ std::vector<Mapping> OrganizerCore::fileMapping(const QString& profileName,
     }
   }
 
-  result.insert(result.end(), {QDir::toNativeSeparators(m_Settings.paths().overwrite()),
-                               dataPath, true, customOverwrite.isEmpty()});
+  for (auto dataPath : dataPaths) {
+    result.insert(result.end(), {
+                    QDir::toNativeSeparators(m_Settings.paths().overwrite()),
+                    dataPath,
+                    true,
+                    customOverwrite.isEmpty()
+      });
+  }
 
   for (MOBase::IPluginFileMapper* mapper :
        m_PluginContainer->plugins<MOBase::IPluginFileMapper>()) {

diff --git a/src/version.rc b/src/version.rc
@@ -4,7 +4,7 @@
 // Otherwise, if letters are used in VER_FILEVERSION_STR, uses the full MOBase::VersionInfo parser
 // Otherwise, uses the numbers from VER_FILEVERSION and sets the release type as pre-alpha
 #define VER_FILEVERSION     2,5,0
-#define VER_FILEVERSION_STR "2.5.0-alpha3\0"
+#define VER_FILEVERSION_STR "2.5.0-beta1\0"
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION     VER_FILEVERSION
@@ -24,7 +24,7 @@ BEGIN
         VALUE "FileDescription",  "Mod Organizer 2 GUI\0"
         VALUE "OriginalFilename", "ModOrganizer.exe\0"
         VALUE "InternalName", "ModOrganizer2\0"
-        VALUE "LegalCopyright", "Copyright 2011-2016 Sebastian Herbord\r\nCopyright 2016-2022 Mod Organizer 2 contributors\0"
+        VALUE "LegalCopyright", "Copyright 2011-2016 Sebastian Herbord\r\nCopyright 2016-2023 Mod Organizer 2 contributors\0"
         VALUE "ProductName",      "Mod Organizer 2\0"
         VALUE "ProductVersion", VER_FILEVERSION_STR
       END