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

equal deleted inserted replaced

-:2a11b5b00470
+:fd64c38c277d
 mHeadingItem(NULL),
 mModel(NULL),
 mImageLabel(NULL),
 mListView(NULL),
 mFetchView(NULL),
-mIsPreviousImageEditorView(false),
 mAvatar(NULL)
 {
 mDocument = new CntDocumentLoader;
 mSoftkey = new HbAction(Hb::BackNaviAction, mView);
 connect(mSoftkey, SIGNAL(triggered()), this, SLOT(showPreviousView()));
 mImageLabel = static_cast<CntImageLabel*>(mDocument->findWidget("editViewImage"));
 connect( mImageLabel, SIGNAL(iconClicked()), this, SLOT(openImageEditor()) );
+connect( mImageLabel, SIGNAL(iconLongPressed(const QPointF&)), this, SLOT(drawImageMenu(const QPointF&)) );
 mListView = static_cast<HbListView*>( mDocument->findWidget("listView") );
 connect(mListView, SIGNAL(longPressed(HbAbstractViewItem*,QPointF)), this,
 SLOT(showContextMenu(HbAbstractViewItem*,QPointF)));
 connect(mListView, SIGNAL(activated (const QModelIndex&)), this,
 SLOT(showContactView(const QModelIndex&)));
 mHeadingItem = static_cast<CntContactCardHeadingItem*>( mDocument->findWidget("editViewHeading") );
+connect(mHeadingItem, SIGNAL(passShortPressed(const QPointF&)), this, SLOT(openImageEditor()) );
 connect(mHeadingItem, SIGNAL(passLongPressed(const QPointF&)), this, SLOT(drawImageMenu(const QPointF&)));
 // menu actions
 mEditGroupAction = static_cast<HbAction*>( mDocument->findObject("cnt:editgroupdetails"));
 connect(mEditGroupAction, SIGNAL(triggered()), this, SLOT(editGroup()));
 if (mView->navigationAction() != mSoftkey)
 {
 mView->setNavigationAction(mSoftkey);
 }
-QVariant contact = aArgs.value( ESelectedContact );
+QVariant contact = aArgs.value( ESelectedGroupContact );
 mGroupContact = new QContact( contact.value<QContact>() );
-if (aArgs.value(ECustomParam).toInt() == imageEditorView)
-{
-mIsPreviousImageEditorView = true;
-}
 HbMainWindow* window = mView->mainWindow();
 if ( window )
 {
 connect(window, SIGNAL(orientationChanged(Qt::Orientation)), this, SLOT(setOrientation(Qt::Orientation)));
 HbFrameBackground frame;
 frame.setFrameGraphicsName("qtg_fr_list_normal");
 frame.setFrameType(HbFrameDrawer::NinePieces);
 mListView->itemPrototypes().first()->setDefaultFrame(frame);
-QContactRelationshipFilter rFilter;
+createModel();
-rFilter.setRelationshipType(QContactRelationship::HasMember);
-rFilter.setRelatedContactRole(QContactRelationship::First);
-rFilter.setRelatedContactId(mGroupContact->id());
-QContactSortOrder sortOrderFirstName;
-sortOrderFirstName.setDetailDefinitionName(QContactName::DefinitionName,
-QContactName::FieldFirst);
-sortOrderFirstName.setCaseSensitivity(Qt::CaseInsensitive);
-QContactSortOrder sortOrderLastName;
-sortOrderLastName.setDetailDefinitionName(QContactName::DefinitionName,
-QContactName::FieldLast);
-sortOrderLastName.setCaseSensitivity(Qt::CaseInsensitive);
-QList<QContactSortOrder> sortOrders;
-sortOrders.append(sortOrderFirstName);
-sortOrders.append(sortOrderLastName);
-mModel = new MobCntModel(getContactManager(), rFilter, sortOrders, false);
-mListView->setModel(mModel);
 if (aArgs.value(ESelectedAction).toString() == "save")
 {
 QString name = getContactManager()->synthesizedDisplayLabel(*mGroupContact);
 HbNotificationDialog::launchDialog(hbTrId("Group \"%1\" saved").arg(name));
 }
 void CntGroupMemberView::showPreviousView()
 {
-//save an avatar
+//save the contact if avatar has been changed.
-if (mIsPreviousImageEditorView)
+QContact contact = mViewManager->contactManager( SYMBIAN_BACKEND )->contact(mGroupContact->localId());
-{
+if ( contact != *mGroupContact )
-if (!mAvatar->imageUrl().isEmpty())
+{
+QList<QContactAvatar> details = mGroupContact->details<QContactAvatar>();
+for (int i = 0; i < details.count(); i++)
 {
-mViewManager->contactManager( SYMBIAN_BACKEND )->saveContact(mGroupContact);
+if (!details.at(i).imageUrl().isEmpty())
+{
+getContactManager()->saveContact(mGroupContact);
+break;
+}
 }
 }
 CntViewParameters viewParameters;
 mViewManager->back(viewParameters);
 {
 CntViewParameters viewParameters;
 viewParameters.insert(EViewId, groupActionsView);
 QVariant var;
 var.setValue(*mGroupContact);
-viewParameters.insert(ESelectedContact, var);
+viewParameters.insert(ESelectedGroupContact, var);
 mViewManager->changeView(viewParameters);
 }
 void CntGroupMemberView::manageMembers()
 {
 QContactRelationshipFilter membersFilter;
 membersFilter.setRelationshipType(QContactRelationship::HasMember);
-membersFilter.setRelatedContactRole(QContactRelationshipFilter::First);
+membersFilter.setRelatedContactRole(QContactRelationship::First);
 membersFilter.setRelatedContactId(mGroupContact->id());
 mOriginalGroupMembers = getContactManager()->contactIds(membersFilter);
 QSet<QContactLocalId> contactsSet = mOriginalGroupMembers.toSet();
 QContactName groupContactName = mGroupContact->detail( QContactName::DefinitionName );
 QString groupName(groupContactName.value( QContactName::FieldCustomLabel ));
+if (!mFetchView) {
+mFetchView = new CntFetchContacts(mViewManager->contactManager( SYMBIAN_BACKEND ));
+connect(mFetchView, SIGNAL(clicked()), this, SLOT(handleManageMembers()));
+}
 mFetchView->setDetails(HbParameterLengthLimiter(hbTrId("txt_phob_subtitle_1_group")).arg(groupName),
-hbTrId("Save"));
+hbTrId("txt_common_button_save"));
 mFetchView->displayContacts(CntFetchContacts::popup,
 HbAbstractItemView::MultiSelection,
 contactsSet);
 }
 void CntGroupMemberView::handleManageMembers()
 {
 QSet<QContactLocalId> selectedContacts = mFetchView->getSelectedContacts();
 if (mFetchView->wasCanceled()) {
 delete mFetchView;
 mFetchView = 0;
 membership.setRelationshipType(QContactRelationship::HasMember);
 membership.setFirst(mGroupContact->id());
 membership.setSecond(contact.id());
 addedMemberships.append(membership);
 }
+QMap<int, QContactManager::Error> errors;
 if (!addedMemberships.isEmpty()) {
-getContactManager()->saveRelationships(&addedMemberships);
+getContactManager()->saveRelationships(&addedMemberships, &errors);
 }
 if (!removedMemberships.isEmpty()) {
-getContactManager()->removeRelationships(removedMemberships);
+getContactManager()->removeRelationships(removedMemberships, &errors);
 }
+// delete the model and recreate it with relationship changes
+delete mModel;
+mModel = 0;
+createModel();
+}
+void CntGroupMemberView::createModel()
+{
+QContactRelationshipFilter rFilter;
+rFilter.setRelationshipType(QContactRelationship::HasMember);
+rFilter.setRelatedContactRole(QContactRelationship::First);
+rFilter.setRelatedContactId(mGroupContact->id());
+QContactSortOrder sortOrderFirstName;
+sortOrderFirstName.setDetailDefinitionName(QContactName::DefinitionName,
+QContactName::FieldFirst);
+sortOrderFirstName.setCaseSensitivity(Qt::CaseInsensitive);
+QContactSortOrder sortOrderLastName;
+sortOrderLastName.setDetailDefinitionName(QContactName::DefinitionName,
+QContactName::FieldLast);
+sortOrderLastName.setCaseSensitivity(Qt::CaseInsensitive);
+QList<QContactSortOrder> sortOrders;
+sortOrders.append(sortOrderFirstName);
+sortOrders.append(sortOrderLastName);
+mModel = new MobCntModel(getContactManager(), rFilter, sortOrders, false);
+mListView->setModel(mModel);
 }
 void CntGroupMemberView::editGroup()
 {
 CntViewParameters viewParameters;
 viewParameters.insert(EViewId, groupEditorView);
 QVariant var;
 var.setValue(*mGroupContact);
-viewParameters.insert(ESelectedContact, var);
+viewParameters.insert(ESelectedGroupContact, var);
 mViewManager->changeView(viewParameters);
 }
 void CntGroupMemberView::deleteGroup()
 {
 void CntGroupMemberView::handleMenu(HbAction* action)
 {
 int row = action->data().toInt();
 HbMenu *menuItem = static_cast<HbMenu*>(sender());
-QModelIndex index = mModel->index(row, 0);
+QModelIndex index = mModel->index(row);
-int id = index.data(Qt::UserRole).toInt();
 if ( action == menuItem->actions().first() )
 {
 showContactView(index);
 }
 var.setValue(mModel->contact(index));
 viewParameters.insert(ESelectedContact, var);
 QVariant varGroup;
 varGroup.setValue(*mGroupContact);
 viewParameters.insert(ESelectedGroupContact, varGroup);
-viewParameters.insert(ESelectedAction, "FromGroupMemberView");
 mViewManager->changeView(viewParameters);
 }
 void CntGroupMemberView::removeFromGroup(const QModelIndex &index)
 QContactRelationship relationship;
 relationship.setRelationshipType(QContactRelationship::HasMember);
 relationship.setFirst(mGroupContact->id());
 relationship.setSecond(selectedContact.id());
 getContactManager()->removeRelationship(relationship);
+// delete the model and recreate it with relationship changes
+delete mModel;
+mModel = NULL;
+createModel();
 }
 void CntGroupMemberView::editContact(const QModelIndex &index)
 {
 CntViewParameters viewParameters;
 {
 QVariant var;
 var.setValue(*mGroupContact);
 CntViewParameters viewParameters;
+// SelectedGroupContact is needed so we know which group to show
+// when we come back to this view, and selected contact is needed
+// for image editor to be able to assign the image to correct contact.
+viewParameters.insert(ESelectedGroupContact, var);
 viewParameters.insert(ESelectedContact, var);
 viewParameters.insert(EViewId, imageEditorView );
 mViewManager->changeView( viewParameters );
 }
 QContactManager* CntGroupMemberView::getContactManager()
 {
-if (!mViewManager) return NULL;
 return mViewManager->contactManager(SYMBIAN_BACKEND);
 }
 /*!
 Draw the image specific content menu
 */
 void CntGroupMemberView::drawImageMenu(const QPointF &aCoords)
 {
 HbMenu *menu = new HbMenu();
-HbAction *changeImageAction = menu->addAction(hbTrId("txt_phob_menu_change_picture"));
+HbAction *changeImageAction = menu->addAction(hbTrId("txt_phob_menu_change_picture"), this, SLOT(openImageEditor()));
-HbAction *removeAction = menu->addAction(hbTrId("txt_phob_menu_remove_image"));
+if (mAvatar)
+{
+HbAction *removeAction = menu->addAction(hbTrId("txt_phob_menu_remove_image"), this, SLOT(removeImage()));
+}
 menu->setPreferredPos(aCoords);
-menu->open(this, SLOT(handleImageMenu(HbAction*)));
+menu->open();
 }
-void CntGroupMemberView::handleImageMenu(HbAction* action)
-{
-HbMenu *menuItem = static_cast<HbMenu*>(sender());
-if ( action == menuItem->actions().first() ) {
-changeImage();
-}
-else if (action == menuItem->actions().at(1)) {
-removeImage();
-}
-}
-void CntGroupMemberView::changeImage()
-{
-CntViewParameters viewParameters;
-viewParameters.insert(EViewId, imageEditorView);
-QVariant var;
-var.setValue(*mGroupContact);
-viewParameters.insert(ESelectedContact, var);
-mViewManager->changeView(viewParameters);
-}
 void CntGroupMemberView::removeImage()
 {
 if (mAvatar)
 {
 if (!mAvatar->imageUrl().isEmpty())
+{
+mGroupContact->removeDetail(mAvatar);
+// Check if image removable.
+CntImageUtility imageUtility;
+if(imageUtility.isImageRemovable(mAvatar->imageUrl().toString()))
 {
-mGroupContact->removeDetail(mAvatar);
+imageUtility.removeImage(mAvatar->imageUrl().toString());
-// Check if image removable.
-CntImageUtility imageUtility;
-if(imageUtility.isImageRemovable(mAvatar->imageUrl().toString()))
-{
-imageUtility.removeImage(mAvatar->imageUrl().toString());
-}
-mViewManager->contactManager( SYMBIAN_BACKEND )->saveContact(mGroupContact);
-mHeadingItem->setIcon(HbIcon("qtg_large_avatar"));
 }
+mViewManager->contactManager( SYMBIAN_BACKEND )->saveContact(mGroupContact);
+mHeadingItem->setIcon(HbIcon("qtg_large_avatar"));
+}
 }
 }

changeset 37	fd64c38c277d
parent 31	2a11b5b00470
child 40	b46a585f6909