Skip to content
Snippets Groups Projects
Commit 0513b3d2 authored by Stepan Salenikovich's avatar Stepan Salenikovich
Browse files

autocompletion: improve data roles

Add Qt::DecorationRole to Name column which retuns the contact photo.
Have the Account column Qt::DisplayRole return the alias instead of id.

Refs #71036
parent 6da5936f
Branches
Tags
No related merge requests found
......@@ -36,6 +36,7 @@
#include "availableaccountmodel.h"
#include "numbercategorymodel.h"
#include "delegates/pixmapmanipulationdelegate.h"
#include "person.h"
//Private
#include "private/phonedirectorymodel_p.h"
......@@ -145,12 +146,15 @@ QVariant NumberCompletionModel::data(const QModelIndex& index, int role ) const
switch (role) {
case Qt::DisplayRole:
return n->primaryName();
case Qt::DecorationRole:
if (n->contact())
return n->contact()->photo();
};
break;
case NumberCompletionModelPrivate::Columns::ACCOUNT:
switch (role) {
case Qt::DisplayRole:
return n->account()?n->account()->id():AvailableAccountModel::currentDefaultAccount()->id();
return n->account()?n->account()->alias():AvailableAccountModel::currentDefaultAccount()->alias();
};
break;
case NumberCompletionModelPrivate::Columns::WEIGHT:
......@@ -257,8 +261,6 @@ void NumberCompletionModelPrivate::updateModel()
q_ptr->beginInsertRows(QModelIndex(), m_hNumbers.size(), m_hNumbers.size());
m_hNumbers.insert(getWeight(n),n);
q_ptr->endInsertRows();
qDebug() << "inserting at" << getWeight(n) << n->primaryName();
qDebug() << "rows: " << m_hNumbers.size();
}
}
}
......
......@@ -53,7 +53,6 @@ public:
virtual bool setData ( const QModelIndex& index, const QVariant &value, int role ) override;
virtual int columnCount( const QModelIndex& parent = QModelIndex() ) const override;
virtual QVariant headerData ( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const override;
// virtual QModelIndex index ( int row, int column, const QModelIndex& parent=QModelIndex()) const override;
virtual QHash<int,QByteArray> roleNames() const override;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment