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

Merge branch 'feature_groupview' into integration_derpstances_groupview

Browse Source
This commit is contained in:
Petr Mrázek
2014-02-08 22:18:32 +01:00
parent 53069205fa aa41b891f0
commit af33b96684
24 changed files with 1542 additions and 3099 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
logic/lists/InstanceList.cpp
View File

@ -33,6 +33,7 @@
#include "logic/BaseInstance.h"
#include "logic/InstanceFactory.h"
#include "logger/QsLog.h"
#include <gui/groupview/GroupView.h>
const static int GROUP_FILE_FORMAT_VERSION = 1;
@ -96,8 +97,7 @@ QVariant InstanceList::data(const QModelIndex &index, int role) const
return MMC->icons()->getIcon(key);
}
// for now.
case KCategorizedSortFilterProxyModel::CategorySortRole:
case KCategorizedSortFilterProxyModel::CategoryDisplayRole:
case GroupViewRoles::GroupRole:
{
return pdata->group();
}
@ -585,10 +585,8 @@ void InstanceList::propertiesChanged(BaseInstance *inst)
}
InstanceProxyModel::InstanceProxyModel(QObject *parent)
: KCategorizedSortFilterProxyModel(parent)
: GroupedProxyModel(parent)
{
// disable since by default we are globally sorting by date:
setCategorizedModel(true);
}
bool InstanceProxyModel::subSortLessThan(const QModelIndex &left,

4
logic/lists/InstanceList.h
View File

@ -18,7 +18,7 @@
#include <QObject>
#include <QAbstractListModel>
#include <QSet>
#include "categorizedsortfilterproxymodel.h"
#include <gui/groupview/GroupedProxyModel.h>
#include <QIcon>
#include "logic/BaseInstance.h"
@ -129,7 +129,7 @@ protected:
QSet<QString> m_groups;
};
class InstanceProxyModel : public KCategorizedSortFilterProxyModel
class InstanceProxyModel : public GroupedProxyModel
{
public:
explicit InstanceProxyModel(QObject *parent = 0);