0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NOISSUE allow user to sort mod list by clicking on column headers

Browse Source
This commit is contained in:
Petr Mrázek 2016-08-05 00:10:33 +02:00
parent b76d4573cd
commit cf0694a0cb
4 changed files with 12 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
api/logic/minecraft/ModList.cpp
View File

@ -29,14 +29,16 @@ ModList::ModList(const QString &dir) : QAbstractListModel(), m_dir(dir)
QDir::NoSymLinks);
m_dir.setSorting(QDir::Name | QDir::IgnoreCase | QDir::LocaleAware);
m_watcher = new QFileSystemWatcher(this);
is_watching = false;
connect(m_watcher, SIGNAL(directoryChanged(QString)), this,
SLOT(directoryChanged(QString)));
connect(m_watcher, SIGNAL(directoryChanged(QString)), this, SLOT(directoryChanged(QString)));
}
void ModList::startWatching()
{
if(is_watching)
return;
update();
is_watching = m_watcher->addPath(m_dir.absolutePath());
if (is_watching)
{
@ -50,6 +52,9 @@ void ModList::startWatching()
void ModList::stopWatching()
{
if(!is_watching)
return;
is_watching = !m_watcher->removePath(m_dir.absolutePath());
if (!is_watching)
{
@ -61,19 +66,6 @@ void ModList::stopWatching()
}
}
void ModList::internalSort(QList<Mod> &what)
{
auto predicate = [](const Mod &left, const Mod &right)
{
if (left.name() == right.name())
{
return left.mmc_id().localeAwareCompare(right.mmc_id()) < 0;
}
return left.name().localeAwareCompare(right.name()) < 0;
};
std::sort(what.begin(), what.end(), predicate);
}
bool ModList::update()
{
if (!isValid())
@ -93,7 +85,6 @@ bool ModList::update()
{
newMods.append(Mod(entry));
}
internalSort(newMods);
orderedMods.append(newMods);
orderOrStateChanged = true;
}
@ -363,13 +354,6 @@ bool ModList::dropMimeData(const QMimeData* data, Qt::DropAction action, int, in
added = true;
}
}
if(added)
{
// re-sort the list
beginResetModel();
internalSort(mods);
endResetModel();
}
if (was_watching)
{
startWatching();

10
api/logic/minecraft/ModList.h
View File

@ -104,13 +104,6 @@ public:
return mods;
}
private:
void internalSort(QList<Mod> & what);
struct OrderItem
{
QString id;
bool enabled = false;
};
private
slots:
void directoryChanged(QString path);
@ -120,8 +113,7 @@ signals:
protected:
QFileSystemWatcher *m_watcher;
bool is_watching;
bool is_watching = false;
QDir m_dir;
QString m_list_id;
QList<Mod> mods;
};

2
application/pages/ModFolderPage.cpp
View File

@ -47,10 +47,12 @@ ModFolderPage::ModFolderPage(BaseInstance *inst, std::shared_ptr<ModList> mods,
m_filterModel = new QSortFilterProxyModel(this);
m_filterModel->setDynamicSortFilter(true);
m_filterModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
m_filterModel->setSortCaseSensitivity(Qt::CaseInsensitive);
m_filterModel->setSourceModel(m_mods.get());
m_filterModel->setFilterKeyColumn(-1);
ui->modTreeView->setModel(m_filterModel);
ui->modTreeView->installEventFilter(this);
ui->modTreeView->sortByColumn(1, Qt::AscendingOrder);
auto smodel = ui->modTreeView->selectionModel();
connect(smodel, &QItemSelectionModel::currentChanged, this, &ModFolderPage::modCurrent);
connect(ui->filterEdit, &QLineEdit::textChanged, this, &ModFolderPage::on_filterTextChanged );

2
application/widgets/ModListView.cpp
View File

@ -26,7 +26,7 @@ ModListView::ModListView ( QWidget* parent )
setAllColumnsShowFocus ( true );
setExpandsOnDoubleClick ( false );
setRootIsDecorated ( false );
setSortingEnabled ( false );
setSortingEnabled ( true );
setAlternatingRowColors ( true );
setSelectionMode ( QAbstractItemView::ExtendedSelection );
setHeaderHidden ( false );