Merge remote-tracking branch 'origin/qt6' into qt6-category

ModOrganizer2 · Sep 5, 2023 · f850654 · f850654
2 parents 46e0a11 + 3f33571
commit f850654
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/src/aboutdialog.cpp b/src/aboutdialog.cpp
@@ -56,6 +56,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);
@@ -76,6 +77,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>").arg(ui->nameLabel->text()).arg(version));
 #if defined(HGID)

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
@@ -489,6 +489,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/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-alpha5\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