FCL/sf/app/contacts: comparison phonebookui/pbkcommonui/src/cntcollectionlistmodel.cpp

equal deleted inserted replaced

-:ae724a111993
+:7cc7d74059f9
 #include <qtcontacts.h>
 #include <hbglobal.h>
 #include <hbicon.h>
+#include <QtAlgorithms>
+namespace
+{
+bool caseInsensitiveLessThan(const QContact &c1, const QContact &c2)
+{
+return c1.displayLabel().toLower() < c2.displayLabel().toLower();
+}
+}
 /*!
 Constructor
 */
 CntCollectionListModel::CntCollectionListModel(CntAbstractEngine* aEngine, QObject *parent)
 : QAbstractListModel(parent)
 QString unnamed = hbTrId("txt_phob_dblist_unnamed");
 QString noFavs = hbTrId("txt_phob_dblist_favorites_val_no_favorites_selecte");
 QString noMembers = hbTrId("txt_phob_dblist_val_no_members_selected");
 mThread = new CntCollectionListModelWorker(unnamed, noFavs, noMembers, order);
-connect(mThread, SIGNAL(fetchDone(int, const QString&, int)), this, SLOT(informationUpdated(int, const QString&, int)));
+connect(mThread, SIGNAL(fetchDone(int, const QString&, const QList<int>&)), this,
+SLOT(informationUpdated(int, const QString&, const QList<int>&)));
 connect(d->mThumbnailManager, SIGNAL(thumbnailReady(QPixmap, void *, int, int)),
 this, SLOT(onIconReady(QPixmap, void *, int, int)));
 doConstruct();
 \param role the requested role
 \return QVariant with requested data
 */
 QVariant CntCollectionListModel::data(const QModelIndex& index, int role) const
 {
+CNT_ENTRY_ARGS(index << role)
 int row = index.row();
 if ( !validateRowIndex(row) )
 return QVariant();
 /*!
 Remove given group from the model. Ignore plugin groups.
 \param localId QContactLocalId of the group that should be removed
 */
-void CntCollectionListModel::removeGroup(int localId)
+bool CntCollectionListModel::removeGroup(int localId)
 {
-CNT_ENTRY
+CNT_ENTRY_ARGS(localId)
+bool groupRemoved = false;
 for (int i = 0;i < rowCount();i++)
 {
 if (!d->mList.at(i)->isPlugin && d->mList.at(i)->id == localId)
 {
 removeRow(i);
+groupRemoved = true;
 break;
 }
 }
-CNT_EXIT
+CNT_EXIT_ARGS(groupRemoved)
+return groupRemoved;
 }
 /*!
 Add a new group to the model. This also takes care of putting it in the
 correct row.
 \param localId QContactLocalId of the group that should be added
 */
 void CntCollectionListModel::addGroup(int localId)
 {
-CNT_ENTRY
+CNT_ENTRY_ARGS(localId)
 QContactDetailFilter groupFilter;
 groupFilter.setDetailDefinitionName(QContactType::DefinitionName, QContactType::FieldType);
 groupFilter.setValue(QString(QLatin1String(QContactType::TypeGroup)));
 \param row the row of the activated plugin item
 \return view parameters used for view switching
 */
 CntViewParameters CntCollectionListModel::extensionGroupActivated(int row)
 {
+CNT_ENTRY_ARGS(row)
 CntViewParameters params;
 for(int i = 0;i < d->mExtensions.value(row)->groupCount();i++)
 {
 CntUiExtensionGroup& group = d->mExtensions.value(row)->groupAt(i);
 if (group.serviceId() == d->mList.at(row)->id)
 {
 group.activated(params);
 break;
 }
 }
+CNT_EXIT_ARGS(params)
 return params;
 }
 /*!
 Called when a list item from a plugin is long pressed. Callback is done asynch, as HbMenu usage
 \param coords the coordinates of the long tap gesture
 \param interface callback interface for asynch handling
 */
 void CntCollectionListModel::extensionGroupLongPressed(int row, const QPointF& coords, CntExtensionGroupCallback* interface)
 {
-CNT_ENTRY
+CNT_ENTRY_ARGS(row << coords << interface)
 for(int i = 0;i < d->mExtensions.value(row)->groupCount();i++)
 {
 CntUiExtensionGroup& group = d->mExtensions.value(row)->groupAt(i);
 if (group.serviceId() == d->mList.at(row)->id)
 \param localId the id of the group
 \return QModelIndex of the group
 */
 QModelIndex CntCollectionListModel::indexOfGroup(int localId)
 {
+CNT_ENTRY_ARGS(localId)
+QModelIndex groupIndex;
 for (int i = 0;i < d->mList.count();i++)
 {
 if (d->mList.at(i)->id == localId && !d->mList.at(i)->isPlugin)
 {
-return index(i);
+groupIndex = index(i);
-}
+break;
 }
+}
-return QModelIndex();
+CNT_EXIT_ARGS(groupIndex)
+return groupIndex;
 }
 /*!
 Initialize different groups.
 */
 CNT_ENTRY
 initializeStaticGroups();
 initializeExtensions();
 initializeUserGroups();
+connect(d->mContactManager, SIGNAL(contactsAdded(const QList<QContactLocalId>&)), this, SLOT(handleAdded(const QList<QContactLocalId>&)));
+connect(d->mContactManager, SIGNAL(contactsChanged(const QList<QContactLocalId>&)), this, SLOT(handleChanged(const QList<QContactLocalId>&)));
+connect(d->mContactManager, SIGNAL(contactsRemoved(const QList<QContactLocalId>&)), this, SLOT(handleRemoved(const QList<QContactLocalId>&)));
+connect(d->mContactManager, SIGNAL(relationshipsAdded(const QList<QContactLocalId>&)), this, SLOT(handleAddedRelationship(const QList<QContactLocalId>&)));
+connect(d->mContactManager, SIGNAL(relationshipsRemoved(const QList<QContactLocalId>&)), this, SLOT(handleRemovedRelationship(const QList<QContactLocalId>&)));
 CNT_EXIT
 }
 /*!
 \param item the collection item from where data is read
 \return QVariant containing the requested data
 */
 QVariant CntCollectionListModel::displayRoleData(const CntCollectionItem& item) const
 {
+CNT_ENTRY
 QStringList list;
 list << item.groupName << item.secondLineText;
 if (item.memberCount > 0)
 }
 else if (item.memberCount < 0)
 {
 list << " ";
 }
+CNT_EXIT
 return QVariant(list);
 }
 /*!
 \param item the collection item from where data is read
 \return QVariant containing the requested data
 */
 QVariant CntCollectionListModel::decorationRoleData(const CntCollectionItem& item) const
 {
+CNT_ENTRY
 QList<QVariant> icons;
 icons << item.icon;
 if (!item.secondaryIcon.isNull())
 {
 icons << item.secondaryIcon;
 }
+CNT_EXIT
 return QVariant(icons);
 }
 /*!
 \param row the row receiving the updated information
 \param secondRowText text to be shown in the second row
 \param memberCount the amount of members the group has (shown in text-3 in HbListViewItem)
 */
-void CntCollectionListModel::informationUpdated(int id, const QString& secondRowText, int memberCount)
+void CntCollectionListModel::informationUpdated(int id, const QString& secondRowText, const QList<int>& members)
 {
-CNT_ENTRY
+CNT_ENTRY_ARGS(id << secondRowText << members)
 for (int i = 0;i < d->mList.count();i++)
 {
 if (d->mList.at(i)->id == id && !d->mList.at(i)->isPlugin)
 {
 CollectionItemPointer item = d->mList.at(i);
 item->secondLineText = secondRowText;
-item->memberCount = memberCount;
+item->memberCount = members.count();
+item->members = members;
 int idx = d->mList.indexOf(item);
 emit dataChanged(index(idx, 0), index(idx, 0));
 break;
 \param id the id of the request
 \param error 0 if no error happened
 */
 void CntCollectionListModel::onIconReady(const QPixmap& pixmap, void *data, int id, int error)
 {
-CNT_ENTRY
+CNT_ENTRY_ARGS(pixmap << data << id << error)
 Q_UNUSED(data);
 if (error == 0)
 {
 also care of updating the mapping between row and CntUiGroupSuppliers
 in case there was already some synchronously loaded extension groups.
 */
 void CntCollectionListModel::extensionGroupsReady()
 {
+CNT_ENTRY
 CntUiGroupSupplier* groupSupplier = static_cast<CntUiGroupSupplier*>(sender());
 int addedCount = groupSupplier->groupCount();
 if (addedCount > 0)
 d->mList.insert(1 + j, item);
 }
 endInsertRows();
 }
-}
+CNT_EXIT
+}
+void CntCollectionListModel::handleAdded(const QList<QContactLocalId>& contactIds)
+{
+CNT_ENTRY_ARGS(contactIds)
+if (contactIds.count() == 1)
+{
+QContactFetchHint noRelationshipsFetchHint;
+noRelationshipsFetchHint.setOptimizationHints(QContactFetchHint::NoRelationships);
+QContact contact = d->mContactManager->contact(contactIds.first(), noRelationshipsFetchHint);
+if (contact.type() == QContactType::TypeGroup)
+{
+addGroup(contactIds.first());
+emit groupCountChanged();
+}
+}
+else
+{
+QList<QContact> addedGroups;
+foreach (QContactLocalId id, contactIds)
+{
+QContactFetchHint noRelationshipsFetchHint;
+noRelationshipsFetchHint.setOptimizationHints(QContactFetchHint::NoRelationships);
+QContact contact = d->mContactManager->contact(id, noRelationshipsFetchHint);
+if (contact.type() == QContactType::TypeGroup)
+{
+addedGroups << contact;
+}
+}
+if (addedGroups.count() == 1)
+{
+addGroup(addedGroups.first().localId());
+emit groupCountChanged();
+}
+else if (addedGroups.count() > 1)
+{
+qSort(addedGroups.begin(), addedGroups.end(), caseInsensitiveLessThan);
+foreach (QContact c, addedGroups)
+{
+addGroup(c.localId());
+}
+emit groupCountChanged();
+}
+}
+CNT_EXIT
+}
+void CntCollectionListModel::handleRemoved(const QList<QContactLocalId>& contactIds)
+{
+CNT_ENTRY_ARGS(contactIds)
+foreach (QContactLocalId id, contactIds)
+{
+if (removeGroup(id))
+{
+emit groupCountChanged();
+}
+else
+{
+for (int i = 0;i < d->mList.count();i++)
+{
+if (d->mList.at(i)->members.contains(id))
+{
+CollectionItemPointer item = d->mList.at(i);
+item->fetched = false;
+int idx = d->mList.indexOf(item);
+emit dataChanged(index(idx, 0), index(idx, 0));
+}
+}
+}
+}
+CNT_EXIT
+}
+void CntCollectionListModel::handleChanged(const QList<QContactLocalId>& contactIds)
+{
+CNT_ENTRY_ARGS(contactIds)
+foreach (QContactLocalId id, contactIds)
+{
+QContact contact = d->mContactManager->contact(id);
+if (contact.type() == QContactType::TypeGroup)
+{
+for (int i = 0;i < d->mList.count();i++)
+{
+if (d->mList.at(i)->id == id && !d->mList.at(i)->isPlugin)
+{
+CollectionItemPointer item = d->mList.at(i);
+QContactName contactName = contact.detail<QContactName>();
+QString groupName = contactName.customLabel();
+if (groupName != item->groupName)
+{
+if (groupName.isNull())
+{
+item->groupName = hbTrId("txt_phob_dblist_unnamed");
+}
+else
+{
+item->groupName = groupName;
+}
+int idx = d->mList.indexOf(item);
+emit dataChanged(index(idx, 0), index(idx, 0));
+}
+break;
+}
+}
+}
+else if (contact.type() == QContactType::TypeContact)
+{
+for (int i = 0;i < d->mList.count();i++)
+{
+if (d->mList.at(i)->members.contains(id))
+{
+CollectionItemPointer item = d->mList.at(i);
+item->fetched = false;
+int idx = d->mList.indexOf(item);
+emit dataChanged(index(idx, 0), index(idx, 0));
+}
+}
+}
+}
+CNT_EXIT
+}
+void CntCollectionListModel::handleAddedRelationship(const QList<QContactLocalId>& contactIds)
+{
+CNT_ENTRY_ARGS(contactIds)
+foreach (QContactLocalId id, contactIds)
+{
+for (int i = 0;i < d->mList.count();i++)
+{
+if (d->mList.at(i)->id == id && !d->mList.at(i)->isPlugin)
+{
+CollectionItemPointer item = d->mList.at(i);
+item->fetched = false;
+int idx = d->mList.indexOf(item);
+emit dataChanged(index(idx, 0), index(idx, 0));
+break;
+}
+}
+}
+CNT_EXIT
+}
+void CntCollectionListModel::handleRemovedRelationship(const QList<QContactLocalId>& contactIds)
+{
+CNT_ENTRY_ARGS(contactIds)
+foreach (QContactLocalId id, contactIds)
+{
+for (int i = 0;i < d->mList.count();i++)
+{
+if (d->mList.at(i)->id == id && !d->mList.at(i)->isPlugin)
+{
+CollectionItemPointer item = d->mList.at(i);
+item->fetched = false;
+int idx = d->mList.indexOf(item);
+emit dataChanged(index(idx, 0), index(idx, 0));
+break;
+}
+}
+}
+CNT_EXIT
+}

changeset 71	7cc7d74059f9
parent 65	ae724a111993