Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Starfield Support #1863

Merged
merged 16 commits into from
Sep 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/aboutdialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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>")
Expand Down
3 changes: 2 additions & 1 deletion src/aboutdialog.h
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ class AboutDialog : public QDialog
LICENSE_SIP,
LICENSE_CASTLE,
LICENSE_ANTLR,
LICENSE_DXTEX
LICENSE_DXTEX,
LICENSE_VDF,
};

private:
Expand Down
8 changes: 8 additions & 0 deletions src/directoryrefresher.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
});
Expand Down
Loading
Loading