Merge branch 'master' into download-issues

readme.md

@@ -12,15 +12,15 @@ The project took up speed again after a few more coders showed up in late 2017,
 ## Help Wanted!
 Mod Organizer 2 is an open project in the hands of the community, there are problems that need to be solved and things that could be added. MO2 really needs developers and if you have the programming skills and some free time you can really improve the experience of the modding community.
 
-To have more information, please join the open MO2 Development discord server: [Mod Organizer 2](https://discord.gg/6GKR9jZ)
+To have more information, please join the open MO2 Development discord server: [Mod Organizer 2](https://discord.gg/ewUVAqyrQX)
 If you want to help translate MO2 to your language you should join the discord server too and head to the #translation channel.
 To setup a development environment on your machine, there is the [mob project](https://github.com/modorganizer2/mob) that handles that.
 If you want to submit your code changes, please use a good formatting style like the default one in Visual Studio.
 
 Through the work of a few people of the community MO2 has come quite far, now it needs some more of those people to go further.
 
 ## Reporting Issues:
-Issues should be reported to the GitHub page or on the open discord server: [Mod Organizer 2](https://discord.gg/6GKR9jZ). Here is also where dev builds are tested, bugs are reported and investigated, suggestions are discussed and a lot more.
+Issues should be reported to the GitHub page or on the open discord server: [Mod Organizer 2](https://discord.gg/ewUVAqyrQX). Here is also where dev builds are tested, bugs are reported and investigated, suggestions are discussed and a lot more.
 
 Credits to Tannin, LePresidente, Silarn, erasmux, AL12, LostDragonist, AnyOldName3, isa, Holt59 and many others for the development.
 

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

src/aboutdialog.h

@@ -61,7 +61,8 @@ class AboutDialog : public QDialog
     LICENSE_SIP,
     LICENSE_CASTLE,
     LICENSE_ANTLR,
-    LICENSE_DXTEX
+    LICENSE_DXTEX,
+    LICENSE_VDF,
   };
 
 private:

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