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

GH-328 overhaul all relevant version lists

Browse Source
This commit is contained in:
Petr Mrázek
2015-04-28 09:01:37 +02:00
parent 75dfbc61fc
commit aea51a0876
23 changed files with 688 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
application/dialogs/VersionSelectDialog.cpp
View File

@ -26,66 +26,8 @@
#include <tasks/Task.h>
#include <modutils.h>
#include <QDebug>
class VersionSelectProxyModel : public QSortFilterProxyModel
{
Q_OBJECT
public:
VersionSelectProxyModel(QObject *parent = 0) : QSortFilterProxyModel(parent)
{
}
struct Filter
{
QString string;
bool exact = false;
};
QHash<int, Filter> filters() const
{
return m_filters;
}
void setFilter(const int column, const QString &filter, const bool exact)
{
Filter f;
f.string = filter;
f.exact = exact;
m_filters[column] = f;
invalidateFilter();
}
void clearFilters()
{
m_filters.clear();
invalidateFilter();
}
protected:
bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const
{
for (auto it = m_filters.begin(); it != m_filters.end(); ++it)
{
const QString version =
sourceModel()->index(source_row, it.key()).data().toString();
if (it.value().exact)
{
if (version != it.value().string)
{
return false;
}
continue;
}
if (!Util::versionIsInInterval(version, it.value().string))
{
return false;
}
}
return true;
}
QHash<int, Filter> m_filters;
};
#include "MultiMC.h"
#include <VersionProxyModel.h>
VersionSelectDialog::VersionSelectDialog(BaseVersionList *vlist, QString title, QWidget *parent,
bool cancelable)
@ -98,7 +40,7 @@ VersionSelectDialog::VersionSelectDialog(BaseVersionList *vlist, QString title,
m_vlist = vlist;
m_proxyModel = new VersionSelectProxyModel(this);
m_proxyModel = new VersionProxyModel(this);
m_proxyModel->setSourceModel(vlist);
ui->listView->setModel(m_proxyModel);
@ -135,7 +77,12 @@ int VersionSelectDialog::exec()
{
loadList();
}
m_proxyModel->invalidate();
auto idx = m_proxyModel->getRecommended();
if(idx.isValid())
{
ui->listView->selectionModel()->setCurrentIndex(idx,QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows);
ui->listView->scrollTo(idx, QAbstractItemView::PositionAtCenter);
}
return QDialog::exec();
}
@ -164,14 +111,14 @@ void VersionSelectDialog::on_refreshButton_clicked()
loadList();
}
void VersionSelectDialog::setExactFilter(int column, QString filter)
void VersionSelectDialog::setExactFilter(BaseVersionList::ModelRoles role, QString filter)
{
m_proxyModel->setFilter(column, filter, true);
m_proxyModel->setFilter(role, filter, true);
}
void VersionSelectDialog::setFuzzyFilter(int column, QString filter)
void VersionSelectDialog::setFuzzyFilter(BaseVersionList::ModelRoles role, QString filter)
{
m_proxyModel->setFilter(column, filter, false);
m_proxyModel->setFilter(role, filter, false);
}
#include "VersionSelectDialog.moc"

12
application/dialogs/VersionSelectDialog.h
View File

@ -18,16 +18,14 @@
#include <QDialog>
#include <QSortFilterProxyModel>
#include "BaseVersion.h"
class BaseVersionList;
#include "BaseVersionList.h"
namespace Ui
{
class VersionSelectDialog;
}
class VersionSelectProxyModel;
class VersionProxyModel;
class VersionSelectDialog : public QDialog
{
@ -45,8 +43,8 @@ public:
BaseVersionPtr selectedVersion() const;
void setFuzzyFilter(int column, QString filter);
void setExactFilter(int column, QString filter);
void setFuzzyFilter(BaseVersionList::ModelRoles role, QString filter);
void setExactFilter(BaseVersionList::ModelRoles role, QString filter);
void setEmptyString(QString emptyString);
void setResizeOn(int column);
void setUseLatest(const bool useLatest);
@ -60,7 +58,7 @@ private:
BaseVersionList *m_vlist;
VersionSelectProxyModel *m_proxyModel;
VersionProxyModel *m_proxyModel;
int resizeOnColumn = 0;
};