diff -r 81c360d47083 -r e6aff7b69165 phonebookui/pbkcommonui/src/cntfavoritesmemberview.cpp --- a/phonebookui/pbkcommonui/src/cntfavoritesmemberview.cpp Wed Jul 21 11:37:51 2010 +0300 +++ b/phonebookui/pbkcommonui/src/cntfavoritesmemberview.cpp Fri Jul 23 12:43:48 2010 +0300 @@ -16,7 +16,7 @@ */ #include "cntfavoritesmemberview.h" -#include "cntfetchcontactsview.h" +#include "cntfetchcontactpopup.h" #include "cntglobal.h" #include @@ -137,16 +137,26 @@ membersFilter.setRelatedContactId(mContact->id()); mOriginalGroupMembers = getContactManager()->contactIds(membersFilter).toSet(); + /* if (!mFetchView) { mFetchView = new CntFetchContacts(*getContactManager()); connect(mFetchView, SIGNAL(clicked()), this, SLOT(handleManageFavorites())); } mFetchView->setDetails(hbTrId("txt_phob_subtitle_favorites"), hbTrId("txt_common_button_save")); mFetchView->displayContacts(HbAbstractItemView::MultiSelection, mOriginalGroupMembers); + */ + CntFetchContactPopup* popup = CntFetchContactPopup::createMultiSelectionPopup( + hbTrId("txt_phob_subtitle_favorites"), + hbTrId("txt_common_button_save"), + *getContactManager()); + connect( popup, SIGNAL(fetchReady(QSet)), this, SLOT(handleManageFavorites(QSet)) ); + popup->setSelectedContacts( mOriginalGroupMembers ); + popup->showPopup(); } -void CntFavoritesMemberView::handleManageFavorites() +void CntFavoritesMemberView::handleManageFavorites(QSet aIds) { +/* QSet selectedContacts = mFetchView->getSelectedContacts(); bool saveChanges = !mFetchView->wasCanceled(); @@ -156,11 +166,11 @@ if (!saveChanges) { return; } - +*/ for (int i = 0; i < 2; ++i) { // first iteration processes added members, second removed members - QSet members = (i == 0 ? selectedContacts - mOriginalGroupMembers - : mOriginalGroupMembers - selectedContacts); + QSet members = (i == 0 ? aIds - mOriginalGroupMembers + : mOriginalGroupMembers - aIds); QList memberships; foreach (QContactLocalId id, members) { @@ -261,7 +271,7 @@ QContact selectedContact = mModel->contact(index); CntViewParameters viewParameters; - viewParameters.insert(EViewId, commLauncherView); + viewParameters.insert(EViewId, contactCardView); QVariant var; var.setValue(selectedContact); viewParameters.insert(ESelectedContact, var); @@ -280,6 +290,9 @@ QVariant var; var.setValue(selectedContact); viewParameters.insert(ESelectedContact, var); + QVariant varGroup; + varGroup.setValue(*mContact); + viewParameters.insert(ESelectedGroupContact, varGroup); mViewManager->changeView(viewParameters); }