krageon
/
openmw-tes3coop
forked from teamnwah/openmw-tes3coop
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'mike-sc/sel_widget' into settings_selwidget

Browse Source 
Conflicts:
	apps/launcher/datafilespage.cpp
	components/fileorderlist/datafileslist.cpp
actorid
Pieter van der Kloet 12 years ago
parent ee27e3bb58 f4d60ae7b2
commit fd430dc5a9
6 changed files with 105 additions and 263 deletions
Show Stats Download Patch File Download Diff File

2
apps/launcher/datafilespage.cpp
Unescape Escape View File

@ -742,6 +742,8 @@ void DataFilesPage::showContextMenu(const QPoint &point)
: mCheckAction->setEnabled(true);
}
// Show menu
mContextMenu->exec(globalPos);
}

171
components/fileorderlist/datafileslist.cpp
Unescape Escape View File

@ -7,7 +7,6 @@
#include "model/esm/esmfile.hpp"
#include "utils/lineedit.hpp"
#include "utils/naturalsort.hpp"
#include "datafileslist.hpp"
@ -47,13 +46,12 @@ DataFilesList::DataFilesList(Files::ConfigurationManager &cfg, QWidget *parent)
: QWidget(parent)
, mCfgMgr(cfg)
{
// Models
mMastersModel = new DataFilesModel(this);
mPluginsModel = new DataFilesModel(this);
// Model
mFilesModel = new DataFilesModel(this);
mPluginsProxyModel = new QSortFilterProxyModel();
mPluginsProxyModel->setDynamicSortFilter(true);
mPluginsProxyModel->setSourceModel(mPluginsModel);
mFilesProxyModel = new QSortFilterProxyModel();
mFilesProxyModel->setDynamicSortFilter(true);
mFilesProxyModel->setSourceModel(mFilesModel);
// Filter toolbar
QLabel *filterLabel = new QLabel(tr("&Filter:"), this);
@ -77,76 +75,41 @@ DataFilesList::DataFilesList(Files::ConfigurationManager &cfg, QWidget *parent)
QCheckBox checkBox;
unsigned int height = checkBox.sizeHint().height() + 4;
mMastersTable = new QTableView(this);
mMastersTable->setModel(mMastersModel);
mMastersTable->setObjectName("MastersTable");
mMastersTable->setSelectionBehavior(QAbstractItemView::SelectRows);
mMastersTable->setSelectionMode(QAbstractItemView::SingleSelection);
mMastersTable->setEditTriggers(QAbstractItemView::NoEditTriggers);
mMastersTable->setAlternatingRowColors(true);
mMastersTable->horizontalHeader()->setStretchLastSection(true);
mMastersTable->horizontalHeader()->hide();
// Set the row height to the size of the checkboxes
mMastersTable->verticalHeader()->setDefaultSectionSize(height);
mMastersTable->verticalHeader()->setResizeMode(QHeaderView::Fixed);
mMastersTable->verticalHeader()->hide();
mMastersTable->setColumnHidden(1, true);
mMastersTable->setColumnHidden(2, true);
mMastersTable->setColumnHidden(3, true);
mMastersTable->setColumnHidden(4, true);
mMastersTable->setColumnHidden(5, true);
mMastersTable->setColumnHidden(6, true);
mMastersTable->setColumnHidden(7, true);
mMastersTable->setColumnHidden(8, true);
mPluginsTable = new QTableView(this);
mPluginsTable->setModel(mPluginsProxyModel);
mPluginsTable->setObjectName("PluginsTable");
mPluginsTable->setContextMenuPolicy(Qt::CustomContextMenu);
mPluginsTable->setSelectionBehavior(QAbstractItemView::SelectRows);
mPluginsTable->setSelectionMode(QAbstractItemView::SingleSelection);
mPluginsTable->setEditTriggers(QAbstractItemView::NoEditTriggers);
mPluginsTable->setAlternatingRowColors(true);
mPluginsTable->setVerticalScrollMode(QAbstractItemView::ScrollPerItem);
mPluginsTable->horizontalHeader()->setStretchLastSection(true);
mPluginsTable->horizontalHeader()->hide();
mPluginsTable->verticalHeader()->setDefaultSectionSize(height);
mPluginsTable->verticalHeader()->setResizeMode(QHeaderView::Fixed);
mPluginsTable->setColumnHidden(1, true);
mPluginsTable->setColumnHidden(2, true);
mPluginsTable->setColumnHidden(3, true);
mPluginsTable->setColumnHidden(4, true);
mPluginsTable->setColumnHidden(5, true);
mPluginsTable->setColumnHidden(6, true);
mPluginsTable->setColumnHidden(7, true);
mPluginsTable->setColumnHidden(8, true);
// Add both tables to a splitter
QSplitter *splitter = new QSplitter(this);
splitter->setOrientation(Qt::Horizontal);
splitter->addWidget(mMastersTable);
splitter->addWidget(mPluginsTable);
// Adjust the default widget widths inside the splitter
QList<int> sizeList;
sizeList << 175 << 200;
splitter->setSizes(sizeList);
mFilesTable = new QTableView(this);
mFilesTable->setModel(mFilesProxyModel);
mFilesTable->setObjectName("PluginsTable");
mFilesTable->setContextMenuPolicy(Qt::CustomContextMenu);
mFilesTable->setSelectionBehavior(QAbstractItemView::SelectRows);
mFilesTable->setSelectionMode(QAbstractItemView::SingleSelection);
mFilesTable->setEditTriggers(QAbstractItemView::NoEditTriggers);
mFilesTable->setAlternatingRowColors(true);
mFilesTable->setVerticalScrollMode(QAbstractItemView::ScrollPerItem);
mFilesTable->horizontalHeader()->setStretchLastSection(true);
mFilesTable->horizontalHeader()->hide();
mFilesTable->verticalHeader()->setDefaultSectionSize(height);
mFilesTable->verticalHeader()->setResizeMode(QHeaderView::Fixed);
mFilesTable->setColumnHidden(1, true);
mFilesTable->setColumnHidden(2, true);
mFilesTable->setColumnHidden(3, true);
mFilesTable->setColumnHidden(4, true);
mFilesTable->setColumnHidden(5, true);
mFilesTable->setColumnHidden(6, true);
mFilesTable->setColumnHidden(7, true);
mFilesTable->setColumnHidden(8, true);
QVBoxLayout *pageLayout = new QVBoxLayout(this);
pageLayout->addWidget(filterToolBar);
pageLayout->addWidget(splitter);
pageLayout->addWidget(mFilesTable);
connect(mPluginsTable, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(setCheckState(QModelIndex)));
connect(mMastersTable, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(setCheckState(QModelIndex)));
connect(mMastersModel, SIGNAL(checkedItemsChanged(QStringList,QStringList)), mPluginsModel, SLOT(slotcheckedItemsChanged(QStringList,QStringList)));
connect(mFilesTable, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(setCheckState(QModelIndex)));
connect(mFilesModel, SIGNAL(checkedItemsChanged(QStringList,QStringList)), mFilesModel, SLOT(slotcheckedItemsChanged(QStringList,QStringList)));
connect(filterLineEdit, SIGNAL(textChanged(QString)), this, SLOT(filterChanged(QString)));
connect(mPluginsTable, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(showContextMenu(QPoint)));
connect(mFilesTable, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(showContextMenu(QPoint)));
createActions();
}
@ -177,20 +140,17 @@ bool DataFilesList::setupDataFiles(Files::PathContainer dataDirs, const QString
{
// Set the charset for reading the esm/esp files
if (!encoding.isEmpty() && encoding != QLatin1String("win1252")) {
mMastersModel->setEncoding(encoding);
mPluginsModel->setEncoding(encoding);
mFilesModel->setEncoding(encoding);
}
// Add the paths to the respective models
for (Files::PathContainer::iterator it = dataDirs.begin(); it != dataDirs.end(); ++it) {
QString path = QString::fromStdString(it->string());
path.remove(QChar('\"'));
mMastersModel->addMasters(path);
mPluginsModel->addPlugins(path);
mFilesModel->addFiles(path);
}
mMastersModel->sort(0);
mPluginsModel->sort(0);
mFilesModel->sort(0);
// mMastersTable->sortByColumn(3, Qt::AscendingOrder);
// mPluginsTable->sortByColumn(3, Qt::AscendingOrder);
@ -199,12 +159,7 @@ bool DataFilesList::setupDataFiles(Files::PathContainer dataDirs, const QString
void DataFilesList::selectedFiles(std::vector<boost::filesystem::path>& paths)
{
QStringList masterPaths = mMastersModel->checkedItemsPaths();
foreach (const QString &path, masterPaths)
{
paths.push_back(path.toStdString());
}
QStringList pluginPaths = mPluginsModel->checkedItemsPaths();
QStringList pluginPaths = mFilesModel->checkedItemsPaths();
foreach (const QString &path, pluginPaths)
{
paths.push_back(path.toStdString());
@ -214,11 +169,11 @@ void DataFilesList::selectedFiles(std::vector<boost::filesystem::path>& paths)
void DataFilesList::check()
{
// Check the current selection
if (!mPluginsTable->selectionModel()->hasSelection()) {
if (!mFilesTable->selectionModel()->hasSelection()) {
return;
}
QModelIndexList indexes = mPluginsTable->selectionModel()->selectedIndexes();
QModelIndexList indexes = mFilesTable->selectionModel()->selectedIndexes();
//sort selection ascending because selectedIndexes returns an unsorted list
//qSort(indexes.begin(), indexes.end(), rowSmallerThan);
@ -227,18 +182,18 @@ void DataFilesList::check()
if (!index.isValid())
return;
mPluginsModel->setCheckState(index, Qt::Checked);
mFilesModel->setCheckState(index, Qt::Checked);
}
}
void DataFilesList::uncheck()
{
// uncheck the current selection
if (!mPluginsTable->selectionModel()->hasSelection()) {
if (!mFilesTable->selectionModel()->hasSelection()) {
return;
}
QModelIndexList indexes = mPluginsTable->selectionModel()->selectedIndexes();
QModelIndexList indexes = mFilesTable->selectionModel()->selectedIndexes();
//sort selection ascending because selectedIndexes returns an unsorted list
//qSort(indexes.begin(), indexes.end(), rowSmallerThan);
@ -247,17 +202,17 @@ void DataFilesList::uncheck()
if (!index.isValid())
return;
mPluginsModel->setCheckState(index, Qt::Unchecked);
mFilesModel->setCheckState(index, Qt::Unchecked);
}
}
void DataFilesList::refresh()
{
mPluginsModel->sort(0);
mFilesModel->sort(0);
// Refresh the plugins table
mPluginsTable->scrollToTop();
mFilesTable->scrollToTop();
}
@ -273,17 +228,11 @@ void DataFilesList::setCheckState(QModelIndex index)
return;
if (object->objectName() == QLatin1String("PluginsTable")) {
QModelIndex sourceIndex = mPluginsProxyModel->mapToSource(index);
QModelIndex sourceIndex = mFilesProxyModel->mapToSource(index);
(mPluginsModel->checkState(sourceIndex) == Qt::Checked)
? mPluginsModel->setCheckState(sourceIndex, Qt::Unchecked)
: mPluginsModel->setCheckState(sourceIndex, Qt::Checked);
}
if (object->objectName() == QLatin1String("MastersTable")) {
(mMastersModel->checkState(index) == Qt::Checked)
? mMastersModel->setCheckState(index, Qt::Unchecked)
: mMastersModel->setCheckState(index, Qt::Checked);
(mFilesModel->checkState(sourceIndex) == Qt::Checked)
? mFilesModel->setCheckState(sourceIndex, Qt::Unchecked)
: mFilesModel->setCheckState(sourceIndex, Qt::Checked);
}
return;
@ -292,26 +241,25 @@ void DataFilesList::setCheckState(QModelIndex index)
void DataFilesList::uncheckAll()
{
mMastersModel->uncheckAll();
mPluginsModel->uncheckAll();
mFilesModel->uncheckAll();
}
void DataFilesList::filterChanged(const QString filter)
{
QRegExp regExp(filter, Qt::CaseInsensitive, QRegExp::FixedString);
mPluginsProxyModel->setFilterRegExp(regExp);
mFilesProxyModel->setFilterRegExp(regExp);
}
void DataFilesList::showContextMenu(const QPoint &point)
{
// Make sure there are plugins in the view
if (!mPluginsTable->selectionModel()->hasSelection()) {
if (!mFilesTable->selectionModel()->hasSelection()) {
return;
}
QPoint globalPos = mPluginsTable->mapToGlobal(point);
QPoint globalPos = mFilesTable->mapToGlobal(point);
QModelIndexList indexes = mPluginsTable->selectionModel()->selectedIndexes();
QModelIndexList indexes = mFilesTable->selectionModel()->selectedIndexes();
// Show the check/uncheck actions depending on the state of the selected items
mUncheckAction->setEnabled(false);
@ -321,7 +269,7 @@ void DataFilesList::showContextMenu(const QPoint &point)
if (!index.isValid())
return;
(mPluginsModel->checkState(index) == Qt::Checked)
(mFilesModel->checkState(index) == Qt::Checked)
? mUncheckAction->setEnabled(true)
: mCheckAction->setEnabled(true);
}
@ -332,19 +280,14 @@ void DataFilesList::showContextMenu(const QPoint &point)
void DataFilesList::setCheckState(const QString& element, Qt::CheckState state)
{
EsmFile *file = mPluginsModel->findItem(element);
EsmFile *file = mFilesModel->findItem(element);
if (file)
{
mPluginsModel->setCheckState(mPluginsModel->indexFromItem(file), Qt::Checked);
}
else
{
file = mMastersModel->findItem(element);
mMastersModel->setCheckState(mMastersModel->indexFromItem(file), Qt::Checked);
mFilesModel->setCheckState(mFilesModel->indexFromItem(file), Qt::Checked);
}
}
QStringList DataFilesList::checkedFiles()
{
return mMastersModel->checkedItems() + mPluginsModel->checkedItems();
return mFilesModel->checkedItems();
}

8
components/fileorderlist/datafileslist.hpp
Unescape Escape View File

@ -49,13 +49,11 @@ public slots:
void refresh();
private:
DataFilesModel *mMastersModel;
DataFilesModel *mPluginsModel;
DataFilesModel *mFilesModel;
QSortFilterProxyModel *mPluginsProxyModel;
QSortFilterProxyModel *mFilesProxyModel;
QTableView *mMastersTable;
QTableView *mPluginsTable;
QTableView *mFilesTable;
QMenu *mContextMenu;

152
components/fileorderlist/model/datafilesmodel.cpp
Unescape Escape View File

@ -8,8 +8,6 @@
#include "esm/esmfile.hpp"
#include "../utils/naturalsort.hpp"
#include "datafilesmodel.hpp"
DataFilesModel::DataFilesModel(QObject *parent) :
@ -159,7 +157,7 @@ Qt::ItemFlags DataFilesModel::flags(const QModelIndex &index) const
if (!file)
return Qt::NoItemFlags;
if (mAvailableFiles.contains(file->fileName())) {
if (canBeChecked(file)) {
if (index.column() == 0) {
return Qt::ItemIsUserCheckable | Qt::ItemIsEnabled | Qt::ItemIsSelectable;
} else {
@ -212,7 +210,6 @@ bool DataFilesModel::setData(const QModelIndex &index, const QVariant &value, in
QString name = item(index.row())->fileName();
mCheckStates[name] = static_cast<Qt::CheckState>(value.toInt());
emit checkedItemsChanged(checkedItems(), uncheckedItems());
emit layoutChanged();
return true;
}
@ -220,39 +217,21 @@ bool DataFilesModel::setData(const QModelIndex &index, const QVariant &value, in
return false;
}
bool lessThanEsmFile(const EsmFile *e1, const EsmFile *e2)
{
//Masters first then alphabetically
if (e1->fileName().endsWith(".esm") && !e2->fileName().endsWith(".esm"))
return true;
if (!e1->fileName().endsWith(".esm") && e2->fileName().endsWith(".esm"))
return false;
return e1->fileName().toLower() < e2->fileName().toLower();
}
void DataFilesModel::sort(int column, Qt::SortOrder order)
{
// TODO: Make this more efficient
emit layoutAboutToBeChanged();
QList<EsmFile *> sortedFiles;
QMultiMap<QString, QString> timestamps;
foreach (EsmFile *file, mFiles)
timestamps.insert(file->modified().toString(Qt::ISODate), file->fileName());
QMapIterator<QString, QString> ti(timestamps);
while (ti.hasNext()) {
ti.next();
QModelIndex index = indexFromItem(findItem(ti.value()));
if (!index.isValid())
continue;
EsmFile *file = item(index.row());
if (!file)
continue;
sortedFiles.append(file);
}
mFiles.clear();
mFiles = sortedFiles;
qSort(mFiles.begin(), mFiles.end(), lessThanEsmFile);
emit layoutChanged();
}
@ -263,73 +242,12 @@ void DataFilesModel::addFile(EsmFile *file)
emit endInsertRows();
}
void DataFilesModel::addMasters(const QString &path)
void DataFilesModel::addFiles(const QString &path)
{
QDir dir(path);
dir.setNameFilters(QStringList(QLatin1String("*.esp")));
// Read the dependencies from the plugins
foreach (const QString &path, dir.entryList()) {
try {
ESM::ESMReader fileReader;
ToUTF8::Utf8Encoder encoder (ToUTF8::calculateEncoding(mEncoding.toStdString()));
fileReader.setEncoder(&encoder);
fileReader.open(dir.absoluteFilePath(path).toStdString());
ESM::ESMReader::MasterList mlist = fileReader.getMasters();
for (unsigned int i = 0; i < mlist.size(); ++i) {
QString master = QString::fromStdString(mlist[i].name);
// Add the plugin to the internal dependency map
mDependencies[master].append(path);
// Don't add esps
if (master.endsWith(".esp", Qt::CaseInsensitive))
continue;
QFileInfo info(dir.absoluteFilePath(master));
EsmFile *file = new EsmFile(master);
file->setDates(info.lastModified(), info.lastRead());
file->setPath(info.absoluteFilePath());
// Add the master to the table
if (findItem(master) == 0)
addFile(file);
}
} catch(std::runtime_error &e) {
// An error occurred while reading the .esp
qWarning() << "Error reading esp: " << e.what();
continue;
}
}
// See if the masters actually exist in the filesystem
dir.setNameFilters(QStringList(QLatin1String("*.esm")));
foreach (const QString &path, dir.entryList()) {
QFileInfo info(dir.absoluteFilePath(path));
if (findItem(path) == 0) {
EsmFile *file = new EsmFile(path);
file->setDates(info.lastModified(), info.lastRead());
addFile(file);
}
// Make the master selectable
mAvailableFiles.append(path);
}
}
void DataFilesModel::addPlugins(const QString &path)
{
QDir dir(path);
dir.setNameFilters(QStringList(QLatin1String("*.esp")));
QStringList filters;
filters << "*.esp" << "*.esm";
dir.setNameFilters(filters);
foreach (const QString &path, dir.entryList()) {
QFileInfo info(dir.absoluteFilePath(path));
@ -348,9 +266,6 @@ void DataFilesModel::addPlugins(const QString &path)
for (unsigned int i = 0; i < mlist.size(); ++i) {
QString master = QString::fromStdString(mlist[i].name);
masters.append(master);
// Add the plugin to the internal dependency map
mDependencies[master].append(path);
}
file->setAuthor(QString::fromStdString(fileReader.getAuthor()));
@ -423,7 +338,7 @@ QStringList DataFilesModel::checkedItems()
QString name = file->fileName();
// Only add the items that are in the checked list and available
if (mCheckStates[name] == Qt::Checked && mAvailableFiles.contains(name))
if (mCheckStates[name] == Qt::Checked && canBeChecked(file))
list << name;
}
@ -441,8 +356,8 @@ QStringList DataFilesModel::checkedItemsPaths()
for (it = mFiles.constBegin(); it != itEnd; ++it) {
EsmFile *file = item(i);
++i;
if (mCheckStates[file->fileName()] == Qt::Checked && mAvailableFiles.contains(file->fileName()))
if (mCheckStates[file->fileName()] == Qt::Checked && canBeChecked(file))
list << file->path();
}
@ -477,24 +392,17 @@ QStringList DataFilesModel::uncheckedItems()
return list;
}
void DataFilesModel::slotcheckedItemsChanged(const QStringList &checkedItems, const QStringList &unCheckedItems)
bool DataFilesModel::canBeChecked(EsmFile *file) const
{
emit layoutAboutToBeChanged();
QStringList list;
foreach (const QString &file, checkedItems) {
list << mDependencies[file];
}
foreach (const QString &file, unCheckedItems) {
foreach (const QString &remove, mDependencies[file]) {
list.removeAll(remove);
//element can be checked if all its dependencies are
bool canBeChecked = true;
foreach (const QString &master, file->masters())
{
if (!mCheckStates.contains(master) || mCheckStates[master] != Qt::Checked)
{
canBeChecked = false;
break;
}
}
mAvailableFiles.clear();
mAvailableFiles.append(list);
emit layoutChanged();
return canBeChecked;
}

17
components/fileorderlist/model/datafilesmodel.hpp
Unescape Escape View File

@ -34,10 +34,7 @@ public:
void setEncoding(const QString &encoding);
void addFile(EsmFile *file);
void addMasters(const QString &path);
void addPlugins(const QString &path);
void addFiles(const QString &path);
void uncheckAll();
@ -51,18 +48,12 @@ public:
QModelIndex indexFromItem(EsmFile *item) const;
EsmFile* findItem(const QString &name);
EsmFile* item(int row) const;
signals:
void checkedItemsChanged(const QStringList checkedItems, const QStringList unCheckedItems);
public slots:
void slotcheckedItemsChanged(const QStringList &checkedItems, const QStringList &unCheckedItems);
private:
bool canBeChecked(EsmFile *file) const;
void addFile(EsmFile *file);
QList<EsmFile *> mFiles;
QStringList mAvailableFiles;
QHash<QString, QStringList> mDependencies;
QHash<QString, Qt::CheckState> mCheckStates;
QString mEncoding;

18
components/fileorderlist/model/esm/esmfile.hpp
Unescape Escape View File

@ -26,15 +26,15 @@ public:
void setMasters(const QStringList &masters);
void setDescription(const QString &description);
inline QString fileName() { return mFileName; }
inline QString author() { return mAuthor; }
inline int size() { return mSize; }
inline QDateTime modified() { return mModified; }
inline QDateTime accessed() { return mAccessed; }
inline float version() { return mVersion; }
inline QString path() { return mPath; }
inline QStringList masters() { return mMasters; }
inline QString description() { return mDescription; }
inline QString fileName() const { return mFileName; }
inline QString author() const { return mAuthor; }
inline int size() const { return mSize; }
inline QDateTime modified() const { return mModified; }
inline QDateTime accessed() const { return mAccessed; }
inline float version() const { return mVersion; }
inline QString path() const { return mPath; }
inline QStringList masters() const { return mMasters; }
inline QString description() const { return mDescription; }
private:

Write Preview
Loading…
Cancel
Save