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

equal deleted inserted replaced

-:a642906a277a
+:ae724a111993
 #include "cntextensionmanager.h"
 #include "cntglobal.h"
 #include "cntfavourite.h"
 #include "cntdetailconst.h"
 #include "cntdebug.h"
 #include <cntuiextensionfactory.h>
 #include <cntuigroupsupplier.h>
 #include <hblabel.h>
 #include <hblistview.h>
 #include <hblistviewitem.h>
 const char *CNT_COLLECTIONVIEW_XML = ":/xml/contacts_collections.docml";
 /*!
 */
-CntCollectionView::CntCollectionView(CntExtensionManager &extensionManager) :
+CntCollectionView::CntCollectionView() :
-mExtensionManager(extensionManager),
 mView(NULL),
 mSoftkey(NULL),
 mViewManager(NULL),
 mModel(NULL),
 mListView(NULL),
 }
 /*!
 Called when activating the view
 */
-void CntCollectionView::activate( CntAbstractViewManager* aMgr, const CntViewParameters aArgs )
+void CntCollectionView::activate( const CntViewParameters aArgs )
 {
 CNT_ENTRY
 Q_UNUSED(aArgs)
 if (mView->navigationAction() != mSoftkey)
 mView->setNavigationAction(mSoftkey);
-mViewManager = aMgr;
+mViewManager = &mEngine->viewManager();
+mExtensionManager = &mEngine->extensionManager();
 // disable delete group(s) button if only favorites group is present
 QContactDetailFilter groupFilter;
 groupFilter.setDetailDefinitionName(QContactType::DefinitionName, QContactType::FieldType);
 groupFilter.setValue(QLatin1String(QContactType::TypeGroup));
 QList<QContactLocalId> groupContactIds = getContactManager()->contactIds(groupFilter);
 frame.setFrameType(HbFrameDrawer::NinePieces);
 mListView->itemPrototypes().first()->setDefaultFrame(frame);
 mListView->listItemPrototype()->setGraphicsSize(HbListViewItem::LargeIcon);
 mListView->listItemPrototype()->setStretchingStyle(HbListViewItem::StretchLandscape);
-mModel = new CntCollectionListModel(getContactManager(), mExtensionManager, this);
+mModel = new CntCollectionListModel( mEngine, this);
 mListView->setModel(mModel);
 CNT_EXIT
 }
 }
 }
 else
 {
 int id = index.data(Qt::UserRole).toInt();
-int favoriteGrpId = CntFavourite::favouriteGroupId(mViewManager->contactManager(SYMBIAN_BACKEND));
+int favoriteGrpId = CntFavourite::favouriteGroupId(getContactManager());
 if (id == favoriteGrpId )
 {
 QContact favoriteGroup = getContactManager()->contact(favoriteGrpId);
 QContactRelationshipFilter rFilter;
 else
 {
 int id = item->modelIndex().data(Qt::UserRole).toInt();
 QVariant data( id );
-int favoriteGrpId = CntFavourite::favouriteGroupId(mViewManager->contactManager(SYMBIAN_BACKEND));
+int favoriteGrpId = CntFavourite::favouriteGroupId(getContactManager());
 HbMenu *menu = new HbMenu();
 menu->setAttribute(Qt::WA_DeleteOnClose);
 menu->setPreferredPos( coords );
 groupName.setCustomLabel(text);
 mHandledContact->saveDetail(&groupName);
 getContactManager()->saveContact(mHandledContact);
-QContactDetailFilter filter;
-QList<QContactLocalId> contactsList = getContactManager()->contactIds(filter);
-QSet<QContactLocalId> contactsSet = contactsList.toSet();
 // Select some contact(s) to add to the group
 QString groupNameCreated = mHandledContact->displayLabel();
 if (groupNameCreated.isEmpty())
 {
 groupNameCreated = hbTrId("txt_phob_list_unnamed");
 }
-CntFetchContactPopup* popup = CntFetchContactPopup::createMultiSelectionPopup(
+// if no contacts are present, then dont call the fetch popup
-HbParameterLengthLimiter(hbTrId("txt_phob_title_members_of_1_group")).arg(groupNameCreated),
+QContactDetailFilter gFilter;
-hbTrId("txt_common_button_save"),
+gFilter.setDetailDefinitionName(QContactType::DefinitionName, QContactType::FieldType);
-*mViewManager->contactManager(SYMBIAN_BACKEND));
+gFilter.setValue(QLatin1String(QContactType::TypeContact));
-connect( popup, SIGNAL(fetchReady(QSet<QContactLocalId>)), this, SLOT(handleNewGroupMembers(QSet<QContactLocalId>)) );
-connect( popup, SIGNAL(fetchCancelled()), this, SLOT(handleCancelGroupMembers()) );
+QList<QContactLocalId> contactIds = getContactManager()->contactIds(gFilter);
+if (contactIds.isEmpty())
-popup->setSelectedContacts( contactsSet );
+{
-popup->showPopup();
+mModel->addGroup(mHandledContact->localId());
+mDeleteGroupsAction->setEnabled(true);
+notifyNewGroup();
+}
+else
+{
+CntFetchContactPopup* popup = CntFetchContactPopup::createMultiSelectionPopup(
+HbParameterLengthLimiter(hbTrId("txt_phob_title_members_of_1_group")).arg(groupNameCreated),
+hbTrId("txt_common_button_save"),
+mEngine->contactManager(SYMBIAN_BACKEND));
+connect( popup, SIGNAL(fetchReady(QSet<QContactLocalId>)), this, SLOT(handleNewGroupMembers(QSet<QContactLocalId>)) );
+connect( popup, SIGNAL(fetchCancelled()), this, SLOT(handleCancelGroupMembers()) );
+QSet<QContactLocalId> ids;
+popup->setSelectedContacts(ids);
+popup->showPopup();
+}
 }
 }
 void CntCollectionView::handleNewGroupMembers( QSet<QContactLocalId> aIds )
 {
 mListView->setModel(0);
 delete mModel;
 mModel = NULL;
-mModel = new CntCollectionListModel(getContactManager(), mExtensionManager, this);
+mModel = new CntCollectionListModel(mEngine, this);
 mListView->setModel(mModel);
 }
 void CntCollectionView::deleteGroup(QContact group)
 {
 }
 void CntCollectionView::deleteGroups()
 {
 // save the group here
-CntGroupDeletePopup *groupDeletePopup = new CntGroupDeletePopup(getContactManager());
+CntGroupDeletePopup *groupDeletePopup = new CntGroupDeletePopup( mEngine );
 groupDeletePopup->populateListOfGroup();
 groupDeletePopup->open(this, SLOT(handleDeleteGroups(HbAction*)));
 }
 }
 }
 QContactManager* CntCollectionView::getContactManager()
 {
-if (!mViewManager) return NULL;
+if (!mEngine) {
+return NULL;
-return mViewManager->contactManager(SYMBIAN_BACKEND);
+}
-}
+return &mEngine->contactManager( SYMBIAN_BACKEND );
+}
-void CntCollectionView::saveNewGroup(QContact* aContact)
-{
+void CntCollectionView::saveNewGroup(QContact* aGroup)
-if (!aContact) return;
+{
+if (!aGroup) {
+return;
+}
 // Save the relationship from the selection model of the member selection list
-QList<QContactLocalId> selectedList = mSelectedContactsSet.toList();
+QList<QContactRelationship> relationships;
-for (int i = 0; i < selectedList.size(); i++ ) {
+foreach (QContactLocalId localId, mSelectedContactsSet)
-QContact contact = getContactManager()->contact(selectedList.at(i));
+{
 QContactRelationship relationship;
+QContactId id;
+id.setLocalId(localId);
 relationship.setRelationshipType(QContactRelationship::HasMember);
-relationship.setFirst(aContact->id());
+relationship.setFirst(aGroup->id());
-relationship.setSecond(contact.id());
+relationship.setSecond(id);
+relationships.append(relationship);
-// Save relationship
+}
-getContactManager()->saveRelationship(&relationship);
+// Save relationships
+if (!relationships.isEmpty()) {
+getContactManager()->saveRelationships(&relationships, NULL);
 }
 }
 // EOF

changeset 65	ae724a111993
parent 59	a642906a277a
child 71	7cc7d74059f9