CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated required_by as dependency

Browse Source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97
2023-05-04 23:54:46 +03:00
parent 8b14b946e2
commit 107b470289
5 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
launcher/ui/dialogs/ResourceDownloadDialog.cpp
View File

@ -125,16 +125,17 @@ void ResourceDownloadDialog::connectButtons()
static ModPlatform::ProviderCapabilities ProviderCaps;
QStringList getReqiredBy(QList<ResourceDownloadDialog::DownloadTaskPtr> tasks, QList<QVariant> req_by)
QStringList getReqiredBy(QList<ResourceDownloadDialog::DownloadTaskPtr> tasks, QVariant addonId)
{
auto req = QStringList();
for (auto r : req_by) {
for (auto& task : tasks) {
auto selected = task->getPack();
if (selected.addonId == r) {
req.append(selected.name);
break;
}
for (auto& task : tasks) {
auto deps = task->getVersion().dependencies;
if (auto dep = std::find_if(deps.begin(), deps.end(),
[addonId](const ModPlatform::Dependency& d) {
return d.addonId == addonId && d.type == ModPlatform::DependencyType::REQUIRED;
});
dep) {
req.append(task->getName());
}
}
return req;
@ -178,7 +179,7 @@ void ResourceDownloadDialog::confirm()
});
for (auto& task : selected) {
confirm_dialog->appendResource({ task->getName(), task->getFilename(), task->getCustomPath(),
ProviderCaps.name(task->getProvider()), getReqiredBy(selected, task->getVersion().required_by) });
ProviderCaps.name(task->getProvider()), getReqiredBy(selected, task->getPack().addonId) });
}
if (confirm_dialog->exec()) {

17
launcher/ui/dialogs/ReviewMessageBox.cpp
View File

@ -62,12 +62,17 @@ void ReviewMessageBox::appendResource(ResourceInformation&& info)
if (!info.required_by.isEmpty()) {
auto requiredByItem = new QTreeWidgetItem(itemTop);
QString req;
if (info.required_by.length() == 1)
req = info.required_by.back();
else
req = QString("[%1]").arg(info.required_by.join(", "));
requiredByItem->setText(0, tr("Required by: %1").arg(req));
if (info.required_by.length() == 1) {
requiredByItem->setText(0, tr("Required by: %1").arg(info.required_by.back()));
} else {
requiredByItem->setText(0, tr("Required by:"));
auto i = 0;
for (auto req : info.required_by) {
auto reqItem = new QTreeWidgetItem(requiredByItem);
reqItem->setText(0, req);
reqItem->insertChildren(i++, { reqItem });
}
}
itemTop->insertChildren(childIndx++, { requiredByItem });
}