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

equal deleted inserted replaced

-:7cbcb2896f0e
+:a642906a277a
 * Description:
 *
 */
 #include "cntcollectionview.h"
-#include "cntfetchcontactsview.h"
+#include "cntfetchcontactpopup.h"
 #include "cntgroupdeletepopup.h"
 #include "cntcollectionlistmodel.h"
 #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>
 #include <hbmenu.h>
-#include <hbnotificationdialog.h>
+#include <hbdevicenotificationdialog.h>
 #include <hbinputdialog.h>
 #include <hbdialog.h>
 #include <hbaction.h>
 #include <hbview.h>
 #include <hbframebackground.h>
 #include <hbgroupbox.h>
 #include <hbmessagebox.h>
 #include <hbparameterlengthlimiter.h>
 #include <QActionGroup>
+#include <QApplication>
 #include <QList>
 const char *CNT_COLLECTIONVIEW_XML = ":/xml/contacts_collections.docml";
 /*!
 mFindAction(NULL),
 mExtensionAction(NULL),
 mNewGroupAction(NULL),
 mDeleteGroupsAction(NULL),
 mHandledContact(NULL),
-mFetchView(NULL),
 mActionGroup(NULL)
 {
 bool ok = false;
 mDocumentLoader.load(CNT_COLLECTIONVIEW_XML, &ok);
 groups->setActionGroup(mActionGroup);
 mNamesAction->setActionGroup(mActionGroup);
 groups->setChecked(true);
 mFindAction = static_cast<HbAction*>(mDocumentLoader.findObject("cnt:find"));
-mFindAction->setEnabled(false);
+connect(mFindAction, SIGNAL(triggered()), this, SLOT(showNamesViewWithFinder()));
 mExtensionAction = static_cast<HbAction*> (mDocumentLoader.findObject("cnt:activity"));
+connect( qApp, SIGNAL(aboutToQuit()), this, SLOT(notifyNewGroup()));
 }
 /*!
 */
 {
 mView->deleteLater();
 delete mHandledContact;
 mHandledContact = NULL;
-delete mFetchView;
-mFetchView = NULL;
 }
 /*!
 Called when activating the view
 */
 mListView->listItemPrototype()->setGraphicsSize(HbListViewItem::LargeIcon);
 mListView->listItemPrototype()->setStretchingStyle(HbListViewItem::StretchLandscape);
 mModel = new CntCollectionListModel(getContactManager(), mExtensionManager, this);
 mListView->setModel(mModel);
-mFetchView = new CntFetchContacts(*mViewManager->contactManager( SYMBIAN_BACKEND ));
-connect(mFetchView, SIGNAL(clicked()), this, SLOT(handleNewGroupMembers()));
 CNT_EXIT
 }
 void CntCollectionView::deactivate()
 {
 Go back to previous view
 */
 void CntCollectionView::showPreviousView()
 {
 CntViewParameters viewParameters;
+mViewManager->back(viewParameters);
+}
+/*!
+Go back to previous view
+*/
+void CntCollectionView::showNamesViewWithFinder()
+{
+CntViewParameters viewParameters;
+viewParameters.insert(EExtraAction, CNT_FIND_ACTION);
 mViewManager->back(viewParameters);
 }
 /*!
 Called after user clicked on the listview.
 mViewManager->changeView(viewParameters);
 }
 else
 {
 CntViewParameters viewParameters;
-viewParameters.insert(EViewId, FavoritesMemberView);
+viewParameters.insert(EViewId, favoritesMemberView);
 QVariant var;
 var.setValue(favoriteGroup);
 viewParameters.insert(ESelectedGroupContact, var);
 mViewManager->changeView(viewParameters);
 }
 mModel->extensionGroupLongPressed(item->modelIndex().row(), coords, this);
 }
 else
 {
 int id = item->modelIndex().data(Qt::UserRole).toInt();
-QVariant data( item->modelIndex().row() );
+QVariant data( id );
 int favoriteGrpId = CntFavourite::favouriteGroupId(mViewManager->contactManager(SYMBIAN_BACKEND));
 HbMenu *menu = new HbMenu();
 menu->setAttribute(Qt::WA_DeleteOnClose);
 }
 }
 void CntCollectionView::handleMenu(HbAction* action)
 {
-int row = action->data().toInt();
 HbMenu *menuItem = static_cast<HbMenu*>(sender());
-QModelIndex index = mModel->index(row, 0);
-int id = index.data(Qt::UserRole).toInt();
 if ( action == menuItem->actions().first() )
 {
+int id = action->data().toInt();
+QModelIndex index = mModel->indexOfGroup(id);
 openGroup(index);
 }
 else if (action == menuItem->actions().at(1))
 {
+int id = action->data().toInt();
 QContact groupContact = getContactManager()->contact(id);
 deleteGroup(groupContact);
 }
 }
 void CntCollectionView::newGroup()
 HbInputDialog *popup = new HbInputDialog();
 popup->setAttribute(Qt::WA_DeleteOnClose, true);
 HbLineEdit *lineEdit = popup->lineEdit();
 lineEdit->setInputMethodHints(Qt::ImhNoPredictiveText);
+lineEdit->setMaxLength( CNT_GROUPNAME_MAXLENGTH );
 popup->setPromptText(hbTrId("txt_phob_title_new_group_name"));
 popup->clearActions();
 HbAction* primaryAction = new HbAction(hbTrId("txt_phob_button_create"));
 popup->addAction(primaryAction);
 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());
+QString groupNameCreated = mHandledContact->displayLabel();
-mFetchView->setDetails(HbParameterLengthLimiter(hbTrId("txt_phob_title_members_of_1_group")).arg(groupNameCreated),
+if (groupNameCreated.isEmpty())
-hbTrId("txt_common_button_save"));
+{
-mFetchView->displayContacts(HbAbstractItemView::MultiSelection, contactsSet);
+groupNameCreated = hbTrId("txt_phob_list_unnamed");
 }
-}
+CntFetchContactPopup* popup = CntFetchContactPopup::createMultiSelectionPopup(
-void CntCollectionView::handleNewGroupMembers()
+HbParameterLengthLimiter(hbTrId("txt_phob_title_members_of_1_group")).arg(groupNameCreated),
-{
+hbTrId("txt_common_button_save"),
-mSelectedContactsSet = mFetchView->getSelectedContacts();
+*mViewManager->contactManager(SYMBIAN_BACKEND));
-if ( !mFetchView->wasCanceled() && mSelectedContactsSet.size() ) {
+connect( popup, SIGNAL(fetchReady(QSet<QContactLocalId>)), this, SLOT(handleNewGroupMembers(QSet<QContactLocalId>)) );
+connect( popup, SIGNAL(fetchCancelled()), this, SLOT(handleCancelGroupMembers()) );
+popup->setSelectedContacts( contactsSet );
+popup->showPopup();
+}
+}
+void CntCollectionView::handleNewGroupMembers( QSet<QContactLocalId> aIds )
+{
+mSelectedContactsSet = aIds;
+if ( aIds.size() > 0 )
+{
 saveNewGroup(mHandledContact);
 CntViewParameters viewParameters;
 viewParameters.insert(EViewId, groupMemberView);
 QVariant var;
 var.setValue(*mHandledContact);
 viewParameters.insert(ESelectedGroupContact, var);
 mViewManager->changeView(viewParameters);
 }
+else
-QString groupNameCreated(mHandledContact->displayLabel());
+{
-HbNotificationDialog::launchDialog(HbParameterLengthLimiter(hbTrId("txt_phob_dpophead_new_group_1_created")).arg(groupNameCreated));
+mModel->addGroup(mHandledContact->localId());
+mDeleteGroupsAction->setEnabled(true);
-// Refresh the page
+}
-refreshDataModel();
+notifyNewGroup();
+}
+void CntCollectionView::handleCancelGroupMembers()
+{
+mSelectedContactsSet.clear();
+mModel->addGroup(mHandledContact->localId());
 mDeleteGroupsAction->setEnabled(true);
-delete mHandledContact;
+notifyNewGroup();
-mHandledContact = NULL;
+}
+void CntCollectionView::notifyNewGroup()
+{
+if (mHandledContact != NULL)
+{
+QString groupNameCreated = mHandledContact->displayLabel();
+if (groupNameCreated.isEmpty())
+{
+groupNameCreated = hbTrId("txt_phob_list_unnamed");
+}
+HbDeviceNotificationDialog::notification(QString(),
+HbParameterLengthLimiter(hbTrId("txt_phob_dpophead_new_group_1_created")).arg(groupNameCreated));
+delete mHandledContact;
+mHandledContact = NULL;
+}
 }
 void CntCollectionView::refreshDataModel()
 {
 mListView->setModel(0);
 delete mModel;
-mModel = 0;
+mModel = NULL;
 mModel = new CntCollectionListModel(getContactManager(), mExtensionManager, this);
 mListView->setModel(mModel);
 }
 void CntCollectionView::deleteGroup(QContact group)
 {
 mHandledContact = new QContact(group);
 QString name = mHandledContact->displayLabel();
+if (name.isEmpty())
+{
+name = hbTrId("txt_phob_list_unnamed");
+}
 HbLabel *headingLabel = new HbLabel();
 headingLabel->setPlainText(HbParameterLengthLimiter(hbTrId("txt_phob_dialog_delete_1_group")).arg(name));
 HbMessageBox::question(hbTrId("txt_phob_dialog_only_group_will_be_removed_contac")
-, this, SLOT(handleDeleteGroup(HbAction*)),
+, this, SLOT(handleDeleteGroup(int)), HbMessageBox::Delete | HbMessageBox::Cancel,
-hbTrId("txt_common_button_delete"), hbTrId("txt_common_button_cancel"), headingLabel);
+headingLabel);
 }
-void CntCollectionView::handleDeleteGroup(HbAction* action)
+void CntCollectionView::handleDeleteGroup(int action)
 {
-HbMessageBox *note = static_cast<HbMessageBox*>(sender());
+if (action == HbMessageBox::Delete)
-if (note && action == note->actions().first())
 {
 getContactManager()->removeContact(mHandledContact->localId());
 mModel->removeGroup(mHandledContact->localId());
 // disable delete group(s) button if only favorites group is present

changeset 59	a642906a277a
parent 47	7cbcb2896f0e
child 65	ae724a111993