AnarchistGamers/openmw
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-08-03 15:27:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Handle implicitly checked files more consistently (#8563)

Browse Source
This commit is contained in:
Alexei Kotov 2025-06-13 14:41:00 +03:00
parent 019af35278
commit 780a4904bd
3 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
components/contentselector/model/contentmodel.cpp
View File

@ -129,7 +129,7 @@ Qt::ItemFlags ContentSelectorModel::ContentModel::flags(const QModelIndex& index
{ {
if (depFile->isGameFile() && file->gameFiles().contains(depFile->fileName(), Qt::CaseInsensitive)) if (depFile->isGameFile() && file->gameFiles().contains(depFile->fileName(), Qt::CaseInsensitive))
{ {
if (!depFile->builtIn() && !depFile->fromAnotherConfigFile() && !mCheckedFiles.contains(depFile)) if (!isChecked(depFile))
break; break;
return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsUserCheckable | Qt::ItemIsDragEnabled; return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsUserCheckable | Qt::ItemIsDragEnabled;
@ -215,8 +215,7 @@ QVariant ContentSelectorModel::ContentModel::data(const QModelIndex& index, int
if (file == mGameFile) if (file == mGameFile)
return QVariant(); return QVariant();
return (file->builtIn() || file->fromAnotherConfigFile() || mCheckedFiles.contains(file)) ? Qt::Checked return isChecked(file) ? Qt::Checked : Qt::Unchecked;
: Qt::Unchecked;
} }
case Qt::UserRole: case Qt::UserRole:
@ -230,7 +229,7 @@ QVariant ContentSelectorModel::ContentModel::data(const QModelIndex& index, int
} }
case Qt::UserRole + 1: case Qt::UserRole + 1:
return mCheckedFiles.contains(file); return isChecked(file);
} }
return QVariant(); return QVariant();
} }
@ -264,9 +263,9 @@ bool ContentSelectorModel::ContentModel::setData(const QModelIndex& index, const
{ {
int checkValue = value.toInt(); int checkValue = value.toInt();
if (checkValue == Qt::Checked) if (checkValue == Qt::Checked)
return mCheckedFiles.contains(file) || setCheckState(file, true); return isChecked(file) || setCheckState(file, true);
if (checkValue == Qt::Unchecked) if (checkValue == Qt::Unchecked)
return !mCheckedFiles.contains(file) || setCheckState(file, false); return !isChecked(file) || setCheckState(file, false);
} }
} }
@ -606,6 +605,14 @@ void ContentSelectorModel::ContentModel::sortFiles()
emit layoutChanged(); emit layoutChanged();
} }
bool ContentSelectorModel::ContentModel::isChecked(const EsmFile* file) const
{
if (file == nullptr)
return false;
return file->builtIn() || file->fromAnotherConfigFile() || mCheckedFiles.contains(file);
}
bool ContentSelectorModel::ContentModel::isEnabled(const QModelIndex& index) const bool ContentSelectorModel::ContentModel::isEnabled(const QModelIndex& index) const
{ {
return (flags(index) & Qt::ItemIsEnabled); return (flags(index) & Qt::ItemIsEnabled);
@ -691,7 +698,7 @@ QList<ContentSelectorModel::LoadOrderError> ContentSelectorModel::ContentModel::
} }
else else
{ {
if (!mCheckedFiles.contains(dependentFile)) if (!isChecked(dependentFile))
{ {
errors.append(LoadOrderError(LoadOrderError::ErrorCode_InactiveDependency, dependentfileName)); errors.append(LoadOrderError(LoadOrderError::ErrorCode_InactiveDependency, dependentfileName));
} }
@ -706,7 +713,7 @@ QList<ContentSelectorModel::LoadOrderError> ContentSelectorModel::ContentModel::
{ {
// Warn the user if Bloodmoon is loaded before Tribunal (Tribunal is not a hard dependency) // Warn the user if Bloodmoon is loaded before Tribunal (Tribunal is not a hard dependency)
const EsmFile* tribunalFile = item("Tribunal.esm"); const EsmFile* tribunalFile = item("Tribunal.esm");
if (tribunalFile != nullptr && mCheckedFiles.contains(tribunalFile) && row < indexFromItem(tribunalFile).row()) if (isChecked(tribunalFile) && row < indexFromItem(tribunalFile).row())
errors.append(LoadOrderError(LoadOrderError::ErrorCode_LoadOrder, "Tribunal.esm")); errors.append(LoadOrderError(LoadOrderError::ErrorCode_LoadOrder, "Tribunal.esm"));
} }
@ -770,8 +777,9 @@ bool ContentSelectorModel::ContentModel::setCheckState(const EsmFile* file, bool
for (const QString& upstreamName : file->gameFiles()) for (const QString& upstreamName : file->gameFiles())
{ {
const EsmFile* upstreamFile = item(upstreamName); const EsmFile* upstreamFile = item(upstreamName);
if (upstreamFile == nullptr || !mCheckedFiles.insert(upstreamFile).second) if (upstreamFile == nullptr || isChecked(upstreamFile))
continue; continue;
mCheckedFiles.insert(upstreamFile);
QModelIndex upstreamIndex = indexFromItem(upstreamFile); QModelIndex upstreamIndex = indexFromItem(upstreamFile);
emit dataChanged(upstreamIndex, upstreamIndex); emit dataChanged(upstreamIndex, upstreamIndex);
} }

1
components/contentselector/model/contentmodel.hpp
View File

@ -58,6 +58,7 @@ namespace ContentSelectorModel
QStringList gameFiles() const; QStringList gameFiles() const;
void setCurrentGameFile(const EsmFile* file); void setCurrentGameFile(const EsmFile* file);
bool isChecked(const EsmFile* file) const;
bool isEnabled(const QModelIndex& index) const; bool isEnabled(const QModelIndex& index) const;
bool setCheckState(const EsmFile* file, bool isChecked); bool setCheckState(const EsmFile* file, bool isChecked);
bool isNew(const QString& filepath) const; bool isNew(const QString& filepath) const;

2
components/contentselector/view/contentselector.cpp
View File

@ -157,7 +157,7 @@ void ContentSelectorView::ContentSelector::setGameFile(const QString& filename)
index = ui->gameFileView->findText(file->fileName()); index = ui->gameFileView->findText(file->fileName());
// verify that the current index is also checked in the model // verify that the current index is also checked in the model
if (!mContentModel->setCheckState(file, true)) if (!mContentModel->isChecked(file) && !mContentModel->setCheckState(file, true))
{ {
// throw error in case file not found? // throw error in case file not found?
return; return;