mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-10 12:39:53 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'cc9cii/editor-gamefiles'

Browse Source
This commit is contained in:
Marc Zinnschlag 2015-03-02 19:57:46 +01:00
commit 928bb234ce
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/opencs/view/doc/filedialog.cpp
View File

@ -147,7 +147,7 @@ void CSVDoc::FileDialog::slotUpdateAcceptButton(int)
void CSVDoc::FileDialog::slotUpdateAcceptButton(const QString &name, bool)
{
bool success = (mSelector->selectedFiles().size() > 0);
bool success = !mSelector->selectedFiles().empty();
bool isNew = (mAction == ContentAction_New);

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

@ -110,9 +110,9 @@ Qt::ItemFlags ContentSelectorModel::ContentModel::flags(const QModelIndex &index
if (!file)
return Qt::NoItemFlags;
//game files are not shown
//game files can always be checked
if (file->isGameFile())
return Qt::NoItemFlags;
return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsUserCheckable;
Qt::ItemFlags returnFlags;
@ -463,7 +463,7 @@ void ContentSelectorModel::ContentModel::addFiles(const QString &path)
file->setDescription(QString::fromUtf8(fileReader.getDesc().c_str()));
// HACK
// Load order constraint of Bloodmoon.esm needing Tribunal.esm is missing
// Load order constraint of Bloodmoon.esm needing Tribunal.esm is missing
// from the file supplied by Bethesda, so we have to add it ourselves
if (file->fileName().compare("Bloodmoon.esm", Qt::CaseInsensitive) == 0)
{