FCL/sf/app/contacts: comparison phonebookengines/cntlistmodel/src/cntlistmodel.cpp

equal deleted inserted replaced

-:a642906a277a
+:ae724a111993
 CNT_ENTRY
 m_defaultIcon = HbIcon("qtg_large_avatar");
 m_defaultMyCardIcon = HbIcon("qtg_large_avatar_mycard");
 d = new CntListModelData(contactFilter, showMyCard);
 d->m_contactManager = manager;
 d->m_cache = CntCache::instance();
 connect(d->m_cache, SIGNAL(contactInfoUpdated(QContactLocalId)), this, SLOT(handleContactInfoUpdated(QContactLocalId)));
 d->m_myCardId = d->m_contactManager->selfContactId();
 if (doConstruct() != QContactManager::NoError) {
 throw("exception");
 }
 CNT_EXIT
 }
 }
 d->m_currentRow = row;
 }
 if (role == Qt::DisplayRole) {
-return dataForDisplayRole(row);
+return dataForRole(row, role);
 }
 else if (role == Hb::IndexFeedbackRole) {
 if (row == 0 && (d->m_myCardId == d->m_contactIds[0] || dummyMyCardId == d->m_contactIds[0])) {
 // do not include MyCard in index feedback
 return QVariant();
 }
 else {
-return dataForDisplayRole(row).toStringList().at(0).toUpper();
+return dataForRole(row, role).toStringList().at(0).toUpper();
 }
 }
 else if (role == Qt::BackgroundRole) {
 if (d->m_myCardId == d->m_contactIds[row] || dummyMyCardId == d->m_contactIds[row]) {
 return HbFrameBackground("qtg_fr_list_parent_normal", HbFrameDrawer::NinePieces);
 {
 return contact(index.row());
 }
 /*!
+* Returns the id for the contact at the requested row.
+*
+* \param index Index for the sought contact entry in this model.
+* \return The id for the contact, 0 if invalid index.
+*
+*/
+QContactLocalId CntListModel::contactId(const QModelIndex &index) const
+{
+CNT_ENTRY
+if (!validRowId(index.row())) {
+return 0;
+}
+CNT_EXIT
+return d->m_contactIds[index.row()];
+}
+/*!
 * Return an index that points to the row relating to the supplied contact.
 *  E.g. if the contact is at row 7, the index with the following properties
 *  is returned:
 *      index.row() == 7
 * \return a QModelIndex with the row set to match that of the contact.
 */
 QModelIndex CntListModel::indexOfContact(const QContact &contact) const
 {
 return createIndex(rowId(contact.localId()), 0);
+}
+/*!
+* Return an index that points to the row relating to the supplied contact id.
+*  E.g. if the contact with this id is at row 7, the index with the following
+*  properties is returned:
+*      index.row() == 7
+* \param contactId The id of the contact for whose row an index is required
+* \return a QModelIndex with the row set to match that of the contact id.
+*/
+QModelIndex CntListModel::indexOfContactId(const QContactLocalId &contactId) const
+{
+return createIndex(rowId(contactId), 0);
 }
 /*!
 * Return the contact manager used by this model.
 *
 connect(d->m_contactManager, SIGNAL(relationshipsAdded(const QList<QContactLocalId>&)), this, SLOT(handleAddedRelationship(const QList<QContactLocalId>&)));
 connect(d->m_contactManager, SIGNAL(relationshipsRemoved(const QList<QContactLocalId>&)), this, SLOT(handleRemovedRelationship(const QList<QContactLocalId>&)));
 // Get current setting how to show an item in the name list and subscribe for changes
 d->m_Settings = new XQSettingsManager;
 d->m_NameListRowSettingkey = new XQSettingsKey(XQSettingsKey::TargetCentralRepository,
 KCRCntSettings.iUid,
 KCntNameListRowSetting);
 d->m_currentRowSetting = d->m_Settings->readItemValue(*d->m_NameListRowSettingkey, XQSettingsManager::TypeInt).toInt();
 d->m_Settings->startMonitoring(*d->m_NameListRowSettingkey, XQSettingsManager::TypeInt);
 connect(d->m_Settings, SIGNAL(valueChanged(const XQSettingsKey&, const QVariant&)), this, SLOT(handleRowSettingChanged(const XQSettingsKey&, const QVariant&)));
 CNT_EXIT
 return error;
 }
 /*!
 * Initializes d->m_contactIds to contain contact Ids from the database.
 *
 * \param row The row of the item to return data about.
 * \param column The column of the item to return data about.
 * \return QVariant The data for the specified index.
 */
-QVariant CntListModel::dataForDisplayRole(int row) const
+QVariant CntListModel::dataForRole(int row, int role) const
 {
 CNT_ENTRY
 QStringList list;
 QString name;
 QString infoText;
 name = hbTrId("txt_phob_list_unnamed");
 }
 infoText = d->m_currentContact.text();
 }
-list << name;
+if ( role == Qt::DisplayRole )
+{
+list << d->m_Format->formattedText(name, d->m_filter);
+}
+else
+{
+list << name;
+}
 if (!isNonEmptySelfContact) {
 if (d->m_currentRowSetting == CntTwoRowsNameAndPhoneNumber) {
 //add additional text only if user wants 2 rows in each name list item
 list << infoText;
 }
 }
 // invalidate cached contact
 d->m_currentRow = -1;
-bool removeMyCard(false);
 int myCardRow = -1;
 if (contactIds.contains(d->m_myCardId)) {
-removeMyCard = true;
+myCardRow = rowId(d->m_myCardId);
-myCardRow = rowId(d->m_myCardId);
 d->m_myCardId = 0;
 }
-int removeRowsCount=removeRows.count();
+// remove rows starting from the bottom
-// no of rows
+qSort(removeRows.begin(), removeRows.end(), qGreater<int>());
-for(int j = 0; j < removeRows.count(); j++) {
+for (int j = 0; j < removeRows.count(); j++) {
-if (removeMyCard
+if (removeRows.at(j) != myCardRow || !d->m_showMyCard) {
-&& removeRows.at(j) == myCardRow
-&& d->m_showMyCard) {
-QModelIndex index = createIndex(0, 0);
-emit dataChanged(index, index);
-removeRowsCount--;
-}
-else {
 beginRemoveRows(QModelIndex(), removeRows.at(j), removeRows.at(j));
 endRemoveRows();
 }
 }
-updateContactIdsArray();
+foreach (QContactLocalId id, contactIds) {
-// check row count in new list
+d->m_contactIds.removeOne(id);
-// if there is a mismatch, probable late events. reset model
+}
-QList<QContactLocalId> updatedIdList = d->m_contactIds;
-int rowsRemoved = idList.count() - updatedIdList.count();
+if (myCardRow != -1 && d->m_showMyCard) {
-if (rowsRemoved != removeRowsCount) {
+d->m_contactIds.insert(0, dummyMyCardId);
-beginResetModel();
+QModelIndex index = createIndex(0, 0);
-reset();
+emit dataChanged(index, index);
-endResetModel();
+}
-}
 CNT_EXIT
 }
 /*!
 * Handle my card change.
 {
 CNT_ENTRY
 if (contactIds.contains(d->m_groupId)) {
 foreach (QContactLocalId id, contactIds) {
-if (!d->m_contactIds.contains(id)) {
+if (id != d->m_groupId && !d->m_contactIds.contains(id)) {
 // at least one new contact id has been added to this group,
 // so update the model
 updateRelationships();
 break;
 }

changeset 65	ae724a111993
parent 47	7cbcb2896f0e
child 72	6abfb1094884