FCL/sf/app/contacts: comparison phonebookui/pbkcommonui/src/cntcontactcardview

equal deleted inserted replaced

-:fd64c38c277d
+:b46a585f6909
 #include "cntcontactcardview_p.h"
 #include <QGraphicsLinearLayout>
 #include <QGraphicsSceneResizeEvent>
 #include <QStringList>
+#include <QStandardItemModel>
+#include <hblistview.h>
+#include <hblistviewitem.h>
 #include <QDebug>
+#include <QKeyEvent>
+#include <QDir>
 #include <qtcontacts.h>
 #include <hbscrollarea.h>
 #include <hblabel.h>
 #include <hbmenu.h>
 #include "cntstringmapper.h"
 #include "cntdocumentloader.h"
 #include "cntimagelabel.h"
 #include "cntimageutility.h"
 #include "cntfavourite.h"
+#include "cntactionlauncher.h"
+#include <hbselectiondialog.h>
 const char *CNT_CONTACTCARDVIEW_XML = ":/xml/contacts_contactcard.docml";
 /*!
 Constructor, initialize member variables.
 mFavoriteGroupId(-1),
 mLoader(NULL),
 mContactAction(NULL),
 mBackKey(NULL),
 mImageLabel(NULL),
-mVCardIcon(NULL)
+mVCardIcon(NULL),
+mShareUi(NULL),
+mAcceptSendKey(true),
+mSendKeyListModel(NULL)
 {
 bool ok;
 document()->load(CNT_CONTACTCARDVIEW_XML, &ok);
 if (!ok)
 {
 /*!
 Destructor
 */
 CntContactCardViewPrivate::~CntContactCardViewPrivate()
 {
+mView->deleteLater();
 delete mContact;
 mContact = 0;
 delete mDataContainer;
 mDataContainer = NULL;
 mAvatar = NULL;
 delete mLoader;
 mLoader = NULL;
-delete mVCardIcon;
+if (mVCardIcon) {
-mVCardIcon = NULL;
+delete mVCardIcon;
+mVCardIcon = NULL;
+}
+if (mShareUi) {
+delete mShareUi;
+mShareUi = NULL;
+}
+delete mSendKeyListModel;
+mSendKeyListModel = NULL;
 }
 /*!
 Activates a previous view
 */
 mView->installEventFilter(this);
 HbMainWindow* window = mView->mainWindow();
 connect(window, SIGNAL(orientationChanged(Qt::Orientation)), this, SLOT(setOrientation(Qt::Orientation)));
+connect(window, SIGNAL(keyPressed(QKeyEvent*)), this, SLOT(keyPressed(QKeyEvent*)));
 setOrientation(window->orientation());
 QContact contact = aArgs.value(ESelectedContact).value<QContact>();
 mContact = new QContact( contact );
 //my card
 mContainerWidget->setLayout(mContainerLayout);
 for (int index = 0; index < mDataContainer->itemCount(); index++)
 {
+CntContactCardDataItem* dataItem = mDataContainer->dataItem(index);
+int pos = dataItem->position();
 // communication methods
-if (mDataContainer->separatorIndex() == -1 || index < mDataContainer->separatorIndex())
+if (pos < CntContactCardDataItem::ESeparator && dataItem->isFocusable())
 {
 CntContactCardDetailItem* item = new CntContactCardDetailItem(index, mContainerWidget);
 connect(item, SIGNAL(clicked()), this, SLOT(onItemActivated()));
 connect(item, SIGNAL(longPressed(const QPointF&)), this, SLOT(onLongPressed(const QPointF&)));
-CntContactCardDataItem* dataItem = mDataContainer->dataItem(index);
 if (mContact->isPreferredDetail(dataItem->action(), dataItem->detail()))
 {
 dataItem->setSecondaryIcon(HbIcon("qtg_mono_favourites"));
 mPreferredItems.insert(dataItem->action(), item);
 }
 item->setDetails(dataItem);
 mContainerLayout->addItem(item);
 }
 // separator
-else if (index == mDataContainer->separatorIndex())
+else if (pos == CntContactCardDataItem::ESeparator)
 {
 HbFrameItem* frameItem = new HbFrameItem(QString("qtg_fr_list_separator"), HbFrameDrawer::NinePieces);
 HbLabel* label = static_cast<HbLabel*>(document()->findWidget(QString("separator")));
-label->setPlainText(mDataContainer->dataItem(index)->titleText());
+label->setPlainText(dataItem->titleText());
 label->setBackgroundItem(frameItem);
 mContainerLayout->addItem(label);
 }
 // details
 else
 {
-CntContactCardDataItem* dataItem = mDataContainer->dataItem(index);
+//map support (image only)
-if (!dataItem->icon().isNull())
+if (pos >= CntContactCardDataItem::EAddress && pos <= CntContactCardDataItem::EAddressWork && !dataItem->icon().isNull())
 {
 HbLabel* iconLabel = new HbLabel(mView);
 iconLabel->setIcon(dataItem->icon());
 int width = dataItem->icon().width();
 int height = dataItem->icon().height();
 iconLabel->setMaximumSize(QSizeF(width, height));
 iconLabel->setSizePolicy(QSizePolicy(QSizePolicy::Fixed,
 QSizePolicy::Fixed));
 mContainerLayout->addItem(iconLabel);
 }
+//other details
 else
 {
 CntContactCardDetailItem* item = new CntContactCardDetailItem(index, mContainerWidget, false);
 item->setDetails(dataItem);
 mContainerLayout->addItem(item);
 }
 }
 }
-bool setAsFavorite( false );
+if (!myCard)
-QContactLocalId favouriteGroupId = CntFavourite::favouriteGroupId( contactManager() );
+{
-if( favouriteGroupId != 0 )
+bool setAsFavorite( false );
-{
+QContactLocalId favouriteGroupId = CntFavourite::favouriteGroupId( contactManager() );
-setAsFavorite = CntFavourite::isMemberOfFavouriteGroup( contactManager(), mContact );
+if( favouriteGroupId != 0 )
-mHeadingItem->setSecondaryIcon( setAsFavorite ); // if contact is part of favourites group
+{
-}
+setAsFavorite = CntFavourite::isMemberOfFavouriteGroup( contactManager(), mContact );
-qobject_cast<HbAction *>(document()->findObject("cnt:setasfavorite"))->setVisible( !setAsFavorite );
+mHeadingItem->setSecondaryIcon( setAsFavorite ); // if contact is part of favourites group
-qobject_cast<HbAction *>(document()->findObject("cnt:removefromfavorite"))->setVisible( setAsFavorite );
+}
+qobject_cast<HbAction *>(document()->findObject("cnt:setasfavorite"))->setVisible( !setAsFavorite );
+qobject_cast<HbAction *>(document()->findObject("cnt:removefromfavorite"))->setVisible( setAsFavorite );
+}
 // Menu items
 connect(qobject_cast<HbAction *>(document()->findObject("cnt:sendbusinesscard")), SIGNAL(triggered()),
 this, SLOT (sendBusinessCard()));
 connect(qobject_cast<HbAction *>(document()->findObject("cnt:deletecontact")), SIGNAL(triggered()),
 preferences["contactId"] = mContact->id().localId();
 XQServiceRequest snd("com.nokia.services.hsapplication.IHomeScreenClient",
 "addWidget(QString,QVariantHash)"
 ,false);
-snd << QString("hscontactwidgetplugin");
+snd << QString("contactwidgethsplugin");
 snd << preferences;
 snd.send();
 }
 /*!
 {
 qDebug() << "CntContactCardViewPrivate::sendBusinessCard - IN";
 // Check if the contact has an image.
 QList<QContactAvatar> avatars = mContact->details<QContactAvatar>();
 bool imageExists( false );
-foreach(QContactAvatar a, mContact->details<QContactAvatar>())
+/*foreach(QContactAvatar a, mContact->details<QContactAvatar>())
 {
 if (!a.imageUrl().isEmpty())
 {
 imageExists = true;
 HbMessageBox *note = new HbMessageBox(
 hbTrId("txt_phob_info_add_contact_card_image_to_business_c"),
 HbMessageBox::MessageTypeQuestion);
 note->setIcon(*mVCardIcon);
+note->clearActions();
 HbAction* ok = new HbAction(hbTrId("txt_common_button_ok"), note);
 HbAction* cancel = new HbAction(hbTrId("txt_common_button_cancel"), note);
 ok->setObjectName( "ok" );
 note->setModal( true );
 note->setAttribute(Qt::WA_DeleteOnClose, true );
 note->open( this, SLOT(handleSendBusinessCard(HbAction*)));
 break;
 }
-}
+}*/
 if ( !imageExists )
 {
 qDebug() << "CntContactCardViewPrivate::sendBusinessCard without image";
 handleSendBusinessCard( NULL ); // no image
 // Check if action is internal
 QList<QContactActionDescriptor> actionDescriptors = QContactAction::actionDescriptors(action, "symbian", 1);
 if(0 < actionDescriptors.count())
 {
 // These actions are considered internal(vendor=symbian and version=1)
-launchAction(*mContact, mDataContainer->dataItem(index)->detail(), action);
+executeAction(*mContact, mDataContainer->dataItem(index)->detail(), action);
 }
 else
 {
 //Handle dynamic actions differently
-launchDynamicAction(*mContact, mDataContainer->dataItem(index)->detail(), mDataContainer->dataItem(index)->actionDescriptor());
+executeDynamicAction(*mContact, mDataContainer->dataItem(index)->detail(), mDataContainer->dataItem(index)->actionDescriptor());
 }
 }
 /*!
-Launch the call / message / email action
+Execute the call / message / email action
 */
-void CntContactCardViewPrivate::launchAction(QContact contact, QContactDetail detail, QString action)
+void CntContactCardViewPrivate::executeAction(QContact& aContact, QContactDetail aDetail, QString aAction)
 {
-// detail might be empty -> in that case engine uses the preferred detail for the selected action
+CntActionLauncher* other = new CntActionLauncher( aAction );
-QList<QContactActionDescriptor> actionDescriptors = QContactAction::actionDescriptors(action, "symbian");
+connect(other, SIGNAL(actionExecuted(CntActionLauncher*)), this, SLOT(actionExecuted(CntActionLauncher*)));
-if (actionDescriptors.isEmpty())
+other->execute(aContact, aDetail);
-{
+}
-return;
-}
+/*!
-mContactAction = QContactAction::action(actionDescriptors.first());
+Execute dynamic action
-connect(mContactAction, SIGNAL(stateChanged(QContactAction::State)),
+*/
-this, SLOT(progress(QContactAction::State)));
+void CntContactCardViewPrivate::executeDynamicAction(QContact& aContact, QContactDetail aDetail, QContactActionDescriptor aActionDescriptor)
-mContactAction->invokeAction(contact, detail);
+{
-}
+CntActionLauncher* other = new CntActionLauncher( );
+connect(other, SIGNAL(actionExecuted(CntAction*)), this, SLOT(actionExecuted(CntAction*)));
-/*!
+other->execute(aContact, aDetail, aActionDescriptor);
-Launch dynamic action
+}
-*/
-void CntContactCardViewPrivate::launchDynamicAction(QContact contact, QContactDetail detail, QContactActionDescriptor actionDescriptor)
+void CntContactCardViewPrivate::actionExecuted(CntActionLauncher* aAction)
 {
-// detail might be empty -> in that case engine uses the preferred detail for the selected action
+aAction->deleteLater();
-mContactAction = QContactAction::action(actionDescriptor);
-connect(mContactAction, SIGNAL(stateChanged(QContactAction::State)),
-this, SLOT(progress(QContactAction::State)));
-mContactAction->invokeAction(contact, detail);
-}
-void CntContactCardViewPrivate::progress(QContactAction::State status)
-{
-switch(status)
-{
-case QContactAction::FinishedState:
-case QContactAction::FinishedWithErrorState:
-mContactAction->deleteLater();
-break;
-default:
-break;
-}
 }
 /*!
 Set selected detail as preferred for selected action
 */
 QContactPhoneNumber number = static_cast<QContactPhoneNumber>(detail);
 QString context = number.contexts().isEmpty() ? QString() : number.contexts().first();
 QString subtype = number.subTypes().isEmpty() ? number.definitionName() : number.subTypes().first();
 communicationAction = menu->addAction(stringMapper.getItemSpecificMenuLocString(subtype, context));
+videoCommunicationAction = menu->addAction(hbTrId("txt_phob_menu_call_video_number"));
-// TODO : uncomment next line when videotelephony is released
-Q_UNUSED(videoCommunicationAction)
-//videoCommunicationAction = menu->addAction(QString("txt_phob_menu_call_video_number"));
 }
 }
 else if (action.compare("message", Qt::CaseInsensitive) == 0)
 {
 communicationAction = menu->addAction(hbTrId("txt_phob_menu_send_message"));
 }
 if ( communicationAction )
 {
 communicationAction->setObjectName( "communicationAction" );
+}
+if ( videoCommunicationAction )
+{
+videoCommunicationAction->setObjectName( "videoCommunicationAction" );
 }
 if ( dynamicAction )
 {
 dynamicAction->setObjectName( "dynamicAction" );
 QString name = aAction->objectName();
 if ( name == "communicationAction" )
 {
-launchAction( *mContact, detail, action );
+executeAction( *mContact, detail, action );
 }
+if ( name == "videoCommunicationAction" )
+{
+//service name latter on should come from service table.
+executeAction( *mContact, detail, "videocall" );
+}
 if ( name == "dynamicAction" )
 {
-launchDynamicAction(*mContact, detail, mDataContainer->dataItem(index)->actionDescriptor());
+executeDynamicAction(*mContact, detail, mDataContainer->dataItem(index)->actionDescriptor());
 }
 if ( name == "preferredAction" )
 {
 setPreferredAction(action, detail);
 void CntContactCardViewPrivate::handleSendBusinessCard( HbAction* aAction )
 {
 qDebug() << "CntContactCardViewPrivate::handleSendBusinessCard - IN";
 QList<QContact> list;
-if ( aAction && aAction->objectName() == "cancel" )
+/* if ( aAction && aAction->objectName() == "cancel" )
 {
 QContact tmpContact( *mContact );
 foreach ( QContactAvatar a, tmpContact.details<QContactAvatar>() )
 {
 tmpContact.removeDetail( &a );
 list.append( tmpContact );
 }
 else
 {
 list.append( *mContact );
-}
+}*/
+QContact tmpContact( *mContact );
+foreach ( QContactAvatar a, tmpContact.details<QContactAvatar>() )
+{
+tmpContact.removeDetail( &a );
+}
+list.append( tmpContact );
 QString tempDir = QDir::tempPath().append("/tempcntvcard");
 QDir dir(tempDir);
 // Temporary directory to store the vCard file
 if (!dir.exists())
 bool ret = writer.startWriting(docs);
 ret = writer.waitForFinished();
 // Create the vCard and send it to messaging service
-ShareUi s;
+if (!mShareUi) {
+mShareUi = new ShareUi();
+}
 QStringList l;
 l << vCardPath;
-s.send(l,false);
+mShareUi->send(l,false);
 }
 }
 qDebug() << "CntContactCardViewPrivate::handleSendBusinessCard - OUT";
 }
-/*!
-Event filter for green key
-*/
-bool CntContactCardViewPrivate::eventFilter(QObject *obj, QEvent *event)
-{
-if (event->type() == QEvent::KeyPress && static_cast<QKeyEvent*>(event)->key() == Qt::Key_Yes)
-{
-QList<QContactActionDescriptor> actionDescriptors = mContact->availableActions();
-QStringList availableActions;
-for (int i = 0; i < actionDescriptors.count();i++)
-{
-availableActions << actionDescriptors.at(i).actionName();
-}
-if (availableActions.contains("call", Qt::CaseInsensitive))
-{
-launchAction(*mContact, QContactDetail(), "call");
-}
-return true;
-}
-else
-{
-return QObject::eventFilter(obj,event);
-}
-}
 /*!
 Called after the user clicked "Change Image" from popup menu after
 longpressing the image in this view.
 */
 QContactManager* CntContactCardViewPrivate::contactManager()
 {
 return mViewManager->contactManager(SYMBIAN_BACKEND);
 }
+void CntContactCardViewPrivate::keyPressed(QKeyEvent *event)
+{
+if (event->key() == Qt::Key_Yes )
+{
+sendKeyPressed();
+}
+}
+void CntContactCardViewPrivate::sendKeyPressed()
+{
+QContactDetail preferredDetail = mContact->preferredDetail("call");
+if (!preferredDetail.isEmpty())
+{
+executeAction(*mContact, preferredDetail, "call");
+}
+else
+{
+if(!mSendKeyListModel)
+{
+mSendKeyListModel = new QStandardItemModel();
+}
+mSendKeyListModel->clear();
+for (int index = 0; index < mDataContainer->itemCount(); index++)
+{
+CntContactCardDataItem* dataItem = mDataContainer->dataItem(index);
+if (dataItem->action().compare("call", Qt::CaseInsensitive) == 0)
+{
+QStandardItem *labelItem = new QStandardItem();
+QStringList textList;
+textList << dataItem->titleText() << dataItem->valueText();
+labelItem->setData(textList, Qt::DisplayRole);
+labelItem->setData(dataItem->icon(), Qt::DecorationRole);
+labelItem->setData(index, Qt::UserRole);
+mSendKeyListModel->appendRow(labelItem);
+}
+}
+if (mSendKeyListModel->rowCount() == 0)
+{
+XQServiceRequest snd("com.nokia.services.logsservices.starter", "start(int,bool)", false);
+snd << 0; // all calls
+snd << true; // show dialpad
+snd.send();
+}
+else if (mSendKeyListModel->rowCount() ==1 )
+{
+QContactDetail detail = mDataContainer->dataItem(0)->detail();
+executeAction( *mContact, detail, "call" );
+}
+else if (mSendKeyListModel->rowCount() >= 2 && mAcceptSendKey)
+{
+mAcceptSendKey = false;
+// Instantiate a dialog
+mSendKeyPopup = new HbSelectionDialog();
+mSendKeyPopup->clearActions();
+mSendKeyPopup->setAttribute(Qt::WA_DeleteOnClose, true);
+mSendKeyPopup->setDismissPolicy(HbPopup::NoDismiss);
+mSendKeyPopup->setTimeout(HbPopup::NoTimeout);
+mSendKeyPopup->setModal(true);
+HbListView* listView = new HbListView(mSendKeyPopup);
+listView->setModel(mSendKeyListModel);
+listView->setScrollingStyle(HbScrollArea::PanWithFollowOn);
+listView->setFrictionEnabled(true);
+connect(listView, SIGNAL(activated (const QModelIndex&)), this,
+SLOT(launchSendKeyAction(const QModelIndex&)));
+QString contactName = mContact->displayLabel();
+HbLabel *headingText = new HbLabel(mSendKeyPopup);
+headingText->setPlainText(contactName);
+mSendKeyPopup->setHeadingWidget(headingText);
+mSendKeyPopup->setContentWidget(listView);
+HbAction *cancelAction = new HbAction(hbTrId("txt_phob_button_cancel"), mSendKeyPopup);
+mSendKeyPopup->addAction(cancelAction);
+// Launch dialog asyncronously
+mSendKeyPopup->open(this, SLOT(sendKeyDialogSlot(HbAction*)));
+}
+}
+}
+void CntContactCardViewPrivate::sendKeyDialogSlot(HbAction* action)
+{
+Q_UNUSED(action);
+mAcceptSendKey = true;
+}
+void CntContactCardViewPrivate::launchSendKeyAction(const QModelIndex &index)
+{
+mAcceptSendKey = true;
+mSendKeyPopup->close();
+if (index.isValid())
+{
+int row = index.row();
+int selectedDetail = mSendKeyListModel->item(index.row())->data(Qt::UserRole).toInt();
+executeAction(*mContact, mDataContainer->dataItem(selectedDetail)->detail(), "call");
+}
+}
 // end of file

changeset 40	b46a585f6909
parent 37	fd64c38c277d
child 46	efe85016a067