Merge branch 'master' into qt6

ModOrganizer2 · Sep 18, 2023 · 1ffcc6f · 1ffcc6f
2 parents 1c6ad48 + a6879e2
commit 1ffcc6f
Show file tree

Hide file tree

Showing 8 changed files with 1,356 additions and 1,297 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,14 @@ 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;
     });