forked from mirror/openmw-tes3mp
Merge pull request #166 from OpenMW/master
Add OpenMW commits up to 23 Feb 2017
This commit is contained in:
commit
0d6636018f
3 changed files with 8 additions and 2 deletions
|
@ -53,6 +53,7 @@ Programmers
|
|||
eroen
|
||||
escondida
|
||||
Evgeniy Mineev (sandstranger)
|
||||
Federico Guerra (FedeWar)
|
||||
Fil Krynicki (filkry)
|
||||
Gašper Sedej
|
||||
gugus/gus
|
||||
|
|
|
@ -37,13 +37,17 @@ int CSMTools::ReportModel::columnCount (const QModelIndex & parent) const
|
|||
|
||||
QVariant CSMTools::ReportModel::data (const QModelIndex & index, int role) const
|
||||
{
|
||||
if (role!=Qt::DisplayRole)
|
||||
if (role!=Qt::DisplayRole && role!=Qt::UserRole)
|
||||
return QVariant();
|
||||
|
||||
switch (index.column())
|
||||
{
|
||||
case Column_Type:
|
||||
|
||||
if(role == Qt::UserRole)
|
||||
return QString::fromUtf8 (
|
||||
mRows.at (index.row()).mId.getTypeName().c_str());
|
||||
else
|
||||
return static_cast<int> (mRows.at (index.row()).mId.getType());
|
||||
|
||||
case Column_Id:
|
||||
|
|
|
@ -157,6 +157,7 @@ CSVTools::ReportTable::ReportTable (CSMDoc::Document& document,
|
|||
|
||||
mProxyModel = new QSortFilterProxyModel (this);
|
||||
mProxyModel->setSourceModel (mModel);
|
||||
mProxyModel->setSortRole(Qt::UserRole);
|
||||
|
||||
setModel (mProxyModel);
|
||||
setColumnHidden (2, true);
|
||||
|
|
Loading…
Reference in a new issue