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

equal deleted inserted replaced

-:81c360d47083
+:e6aff7b69165
 #include <thumbnailmanager_qt.h>
 #include <cntmaptileservice.h>  //For maptile processing
 #include <qversitcontactexporter.h>
 #include <qversitwriter.h>
 #include <xqservicerequest.h>
+#include <xqaiwrequest.h>
+#include <xqaiwdecl.h>
 #include <QTimer>  //Progress indication icon
+#include <logsservices.h>
 #include <cntdebug.h>
 #include "cntcontactcarddatacontainer.h"
 #include "cntcontactcarddetailitem.h"
 #include "cntcontactcardheadingitem.h"
 const char *CNT_MAPTILE_SEARCH_STOP_ICON = "qtg_mono_search_stop";
 /*!
 Constructor, initialize member variables.
 \a viewManager is the parent that creates this view. \a parent is a pointer to parent QGraphicsItem (by default this is 0)
 */
-CntContactCardViewPrivate::CntContactCardViewPrivate() :
+CntContactCardViewPrivate::CntContactCardViewPrivate(bool isTemporary) :
 QObject(),
 mScrollArea(NULL),
 mContainerWidget(NULL),
 mContainerLayout(NULL),
 mContact(NULL),
 mFavoriteGroupId(-1),
 mLoader(NULL),
 mContactAction(NULL),
 mBackKey(NULL),
 mImageLabel(NULL),
+mRequest(NULL),
 mVCardIcon(NULL),
 mShareUi(NULL),
 mAcceptSendKey(true),
 mSendKeyListModel(NULL),
 mPresenceListener(NULL),
 mMaptile(NULL),
-	mProgressTimer(NULL)
+	mProgressTimer(NULL),
+	mIsTemporary(isTemporary),
+	mIsExecutingAction(false)
 {
 bool ok;
 document()->load(CNT_CONTACTCARDVIEW_XML, &ok);
 if (!ok)
 {
 //back button
 mBackKey = new HbAction(Hb::BackNaviAction, mView);
 mView->setNavigationAction(mBackKey);
 connect(mBackKey, SIGNAL(triggered()), this, SLOT(showPreviousView()));
 mProgressTimer = new QTimer(this);
 mProgressTimer->setSingleShot(true);
 connect(mProgressTimer, SIGNAL(timeout()),this, SLOT(updateSpinningIndicator()));
 mMaptile = new CntMapTileService;
 delete mSendKeyListModel;
 mSendKeyListModel = NULL;
 delete mPresenceListener;
 mPresenceListener = NULL;
-	delete mMaptile;
+delete mRequest;
+mRequest = NULL;
+delete mMaptile;
 mMaptile = NULL;
 delete mProgressTimer;
 mProgressTimer = NULL;
 {
 emit backPressed();
 //save the contact if avatar has been changed.
 QContact contact = contactManager()->contact(mContact->localId());
-if ( contact != *mContact )
+if ( contact != *mContact && contactManager()->error() == QContactManager::NoError)
 {
 contactManager()->saveContact(mContact);
 }
 mViewManager->back( mArgs );
+}
+/*!
+Activates the root view
+*/
+void CntContactCardViewPrivate::showRootView()
+{
+mViewManager->back( mArgs, true );
 }
 /*
 Activates a default view and setup name label texts
 */
 {
 CNT_ENTRY
 mViewManager = aMgr;
 mArgs = aArgs;
-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*)));
 }
 else
 {
 mView->toolBar()->removeAction(static_cast<HbAction*>(document()->findObject(QString("cnt:sendMyCard"))));
 }
+if (mIsTemporary)
+{
+mView->menu()->clearActions();
+mView->toolBar()->clearActions();
+mView->toolBar()->addAction(static_cast<HbAction*>(document()->findObject(QString("cnt:addtocontact"))));
+}
 // add heading widget to the content
 QGraphicsWidget *c = document()->findWidget(QString("content"));
 QGraphicsLinearLayout* l = static_cast<QGraphicsLinearLayout*>(c->layout());
 mHeadingItem = static_cast<CntContactCardHeadingItem*>(document()->findWidget(QString("cnt_contactcard_heading")));
 mHeadingItem->setDetails(mContact);
-connect(mHeadingItem, SIGNAL(passLongPressed(const QPointF&)), this, SLOT(drawMenu(const QPointF&)));
-connect(mHeadingItem, SIGNAL(passShortPressed(const QPointF&)), this, SLOT(doChangeImage()));
+mImageLabel = static_cast<CntImageLabel*>(document()->findWidget("cnt_contactcard_image"));
+if (!mIsTemporary)
+{
+connect(mHeadingItem, SIGNAL(passLongPressed(const QPointF&)), this, SLOT(drawMenu(const QPointF&)));
+connect(mHeadingItem, SIGNAL(passShortPressed(const QPointF&)), this, SLOT(doChangeImage()));
+connect(mImageLabel, SIGNAL(iconClicked()), this, SLOT(doChangeImage()));
+connect(mImageLabel, SIGNAL(iconLongPressed(const QPointF&)), this, SLOT(drawMenu(const QPointF&)));
+}
+else
+{
+mHeadingItem->ungrabGesture(Qt::TapGesture);
+mImageLabel->ungrabGesture(Qt::TapGesture);
+}
 // presence listener
 mPresenceListener = new CntPresenceListener(*mContact);
 connect(mPresenceListener, SIGNAL(fullPresenceUpdated(bool)), mHeadingItem, SLOT(setOnlineStatus(bool)));
 connect(mPresenceListener, SIGNAL(accountPresenceUpdated(const QString&, bool)),
 this, SLOT(updateItemPresence(const QString&, bool)));
 bool online;
 QMap<QString, bool> presences = mPresenceListener->initialPresences(online);
 mHeadingItem->setOnlineStatus(online);
-mImageLabel = static_cast<CntImageLabel*>(document()->findWidget("cnt_contactcard_image"));
-connect(mImageLabel, SIGNAL(iconClicked()), this, SLOT(doChangeImage()));
-connect(mImageLabel, SIGNAL(iconLongPressed(const QPointF&)), this, SLOT(drawMenu(const QPointF&)));
 // avatar
 QList<QContactAvatar> details = mContact->details<QContactAvatar>();
 for (int i = 0;i < details.count();i++)
 {
 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&)));
+if (!mIsTemporary)
+{
+connect(item, SIGNAL(longPressed(const QPointF&)), this, SLOT(onLongPressed(const QPointF&)));
+}
 if (mContact->isPreferredDetail(dataItem->action(), dataItem->detail()))
 {
 dataItem->setSecondaryIcon(HbIcon("qtg_mono_favourites"));
 mPreferredItems.insert(dataItem->action(), item);
 }
 //Information for displaying maptile fetching progress bar.
 //Memory will be deleted from the queue.
 CntContactCardMapTileDetail* detail = new CntContactCardMapTileDetail;
 if( detail )
 {
-detail->mContactId = mContact->id().localId();
+detail->mContactId = mContact->localId();
 if( dataItem->titleText() == hbTrId("txt_phob_formlabel_address") )
 {
 detail->mAddressType = CntMapTileService::AddressPreference;
 }
 if( favouriteGroupId != 0 )
 {
 setAsFavorite = CntFavourite::isMemberOfFavouriteGroup( contactManager(), mContact );
 mHeadingItem->setFavoriteStatus( setAsFavorite ); // if contact is part of favourites group
 }
-qobject_cast<HbAction *>(document()->findObject("cnt:setasfavorite"))->setVisible( !setAsFavorite );
+static_cast<HbAction *>(document()->findObject("cnt:setasfavorite"))->setVisible( !setAsFavorite );
-qobject_cast<HbAction *>(document()->findObject("cnt:removefromfavorite"))->setVisible( setAsFavorite );
+static_cast<HbAction *>(document()->findObject("cnt:removefromfavorite"))->setVisible( setAsFavorite );
 }
 document()->findWidget("viewToolbar")->setParent(mView);
 document()->findWidget("viewMenu")->setParent(mView);
 // Menu items
 connectAction("cnt:removefromfavorite", SLOT(removeFromFavorite()));
 connectAction("cnt:placecontacttohs", SLOT(sendToHs()));
 connectAction("cnt:edit", SLOT(editContact()));
 connectAction("cnt:history", SLOT(viewHistory()));
 connectAction("cnt:sendMyCard", SLOT(sendBusinessCard()));
+connectAction("cnt:addtocontact", SLOT(onAddedToContacts()));
 connectAction("cnt:activityStream", NULL);      // placeholder until this action is implemented (needed to avoid memory leak)
+// disabled until this action is implemented
+static_cast<HbAction *>(document()->findObject("cnt:activityStream"))->setEnabled(false);
+connect(contactManager(), SIGNAL(contactsRemoved(const QList<QContactLocalId>&)),
+this, SLOT(contactDeletedFromOtherSource(const QList<QContactLocalId>&)));
 emit viewActivated( mViewManager, aArgs );
 CNT_EXIT
 }
 {
 //Maptile status received. Show the maptile image if available
 CntMapTileService::ContactAddressType sourceAddressType =
 static_cast <CntMapTileService::ContactAddressType>( mAddressList[index]->mAddressType );
-QContactLocalId contactId = mContact->id().localId();
+QContactLocalId contactId = mContact->localId();
 if( mAddressList[index]->mDetailItem != NULL )
 {
 if( mAddressList[index]->maptileStatus == CntMapTileService::MapTileFetchingCompleted )
 {
 void CntContactCardViewPrivate::updateMaptileImage()
 {
 //If there is no maptile displayed, return immediately
 if( mMaptileLabelList.count() > 0 )
 {
-QContactLocalId contactId = mContact->id().localId();
+QContactLocalId contactId = mContact->localId();
 QList<QContactAddress> addressDetails = mContact->details<QContactAddress>();
 //address
 QString contextHome(QContactAddress::ContextHome.operator QString());
 {
 HbIcon icon(pixmap);
 mHeadingItem->setIcon(icon);
 mVCardIcon = new HbIcon(pixmap);
 mImageLabel->clear();
-mImageLabel->setIcon(icon);
+mImageLabel->setIcon(pixmap);
 }
 CNT_EXIT
 }
 Place contact to homescreen as widget
 */
 void CntContactCardViewPrivate::sendToHs()
 {
 QVariantHash preferences;
-preferences["contactId"] = mContact->id().localId();
+preferences["contactId"] = mContact->localId();
 XQServiceRequest snd("com.nokia.symbian.IHomeScreenClient",
 "addWidget(QString,QVariantHash)"
 ,false);
 snd << QString("contactwidgethsplugin");
 snd << preferences;
 snd.send();
+/*
+if (mRequest)
+{
+delete mRequest;
+mRequest = 0;
+}
+mRequest = mAppManager.create("com.nokia.symbian.IHomeScreenClient", "addWidget(QString,QVariantHash)", false);
+if (mRequest)
+{
+QList<QVariant> args;
+QVariantHash preferences;
+preferences["contactId"] = mContact->localId();
+args << preferences;
+args << QString("contactwidgethsplugin");
+mRequest->setArguments(args);
+mRequest->send();
+}
+*/
 }
 /*!
 Launch contact editor
 */
 /*!
 Delete contact
 */
 void CntContactCardViewPrivate::deleteContact()
 {
-QString name = contactManager()->synthesizedDisplayLabel(*mContact);
+QString name = contactManager()->synthesizedContactDisplayLabel(*mContact);
 if (name.isEmpty())
 {
 name = hbTrId("txt_phob_list_unnamed");
 }
 */
 void CntContactCardViewPrivate::handleDeleteContact(int action)
 {
 if (action == HbMessageBox::Delete)
 {
+disconnect(contactManager(), SIGNAL(contactsRemoved(const QList<QContactLocalId>&)),
+this, SLOT(contactDeletedFromOtherSource(const QList<QContactLocalId>&)));
 contactManager()->removeContact(mContact->localId());
 emit backPressed();
-mViewManager->back( mArgs );
+mViewManager->back( mArgs, true );
 }
 }
 /*!
 Launch history view
 /*!
 Deactivate the view
 */
 void CntContactCardViewPrivate::deactivate()
 {
-mView->removeEventFilter(this);
 }
 /*!
 Send the business card / my card
 */
 void CntContactCardViewPrivate::sendBusinessCard()
 {
-qDebug() << "CntContactCardViewPrivate::sendBusinessCard - IN";
+CNT_ENTRY
 // Check if the contact has an image.
 QList<QContactAvatar> avatars = mContact->details<QContactAvatar>();
 bool imageExists( false );
 /*foreach(QContactAvatar a, mContact->details<QContactAvatar>())
 {
 }
 }*/
 if ( !imageExists )
 {
-qDebug() << "CntContactCardViewPrivate::sendBusinessCard without image";
+CNT_LOG_ARGS("snd vCard without image")
 handleSendBusinessCard( NULL ); // no image
 }
-qDebug() << "CntContactCardViewPrivate::sendBusinessCard - OUT";
+CNT_EXIT
 }
 /*!
 Set orientation of the view
 */
 /*!
 Execute the call / message / email action
 */
 void CntContactCardViewPrivate::executeAction(QContact& aContact, const QContactDetail& aDetail, const QString& aAction, CntContactCardDetailItem* aItem)
 {
+if (mIsExecutingAction)
+{
+return;
+}
+else
+{
+mIsExecutingAction = true;
+}
 CntActionLauncher* other = new CntActionLauncher(*contactManager(), aAction);
 connect(other, SIGNAL(actionExecuted(CntActionLauncher*)), this, SLOT(actionExecuted(CntActionLauncher*)));
 if (aItem && aContact.preferredDetail(aAction).isEmpty())
 {
 setPreferredAction(aAction, aDetail, aItem);
 QContactDetail detail = mDataContainer->dataItem(index)->detail();
 QString action = mDataContainer->dataItem(index)->action();
 if (detail == aDetail && action == aAction)
 {
 detailItem = static_cast<CntContactCardDetailItem*>(mContainerLayout->itemAt(index));
+break;
 }
 }
 executeAction(aContact, aDetail, aAction, detailItem);
 mAcceptSendKey=true;
 }
 /*!
 Execute dynamic action
 */
 void CntContactCardViewPrivate::executeDynamicAction(QContact& aContact, QContactDetail aDetail, QContactActionDescriptor aActionDescriptor)
 {
+if (mIsExecutingAction)
+{
+return;
+}
+else
+{
+mIsExecutingAction = true;
+}
 CntActionLauncher* other = new CntActionLauncher(*contactManager());
 connect(other, SIGNAL(actionExecuted(CntActionLauncher*)), this, SLOT(actionExecuted(CntActionLauncher*)));
 other->execute(aContact, aDetail, aActionDescriptor);
 }
 void CntContactCardViewPrivate::actionExecuted(CntActionLauncher* aAction)
 {
 aAction->deleteLater();
+mIsExecutingAction = false;
 }
 /*!
 Item specific menu
 */
 }
 void CntContactCardViewPrivate::handleSendBusinessCard( HbAction* aAction )
 {
+CNT_ENTRY
 Q_UNUSED(aAction);
-qDebug() << "CntContactCardViewPrivate::handleSendBusinessCard - IN";
 QList<QContact> list;
 /*if ( aAction && aAction->objectName() == "cancel" )
 {
 QContact tmpContact( *mContact );
 foreach ( QContactAvatar a, tmpContact.details<QContactAvatar>() )
 QVersitContactExporter exporter;
 // The vCard version needs to be 2.1 due to backward compatiblity when sending
 if (exporter.exportContacts(list, QVersitDocument::VCard21Type))
 {
-qDebug() << "CntContactCardViewPrivate::handleSendBusinessCard, VCard21Type";
+CNT_LOG_ARGS("VCard21Type");
 QList<QVersitDocument> docs = exporter.documents();
 QFile f(vCardPath);
 if ( f.open(QIODevice::WriteOnly) )
 {
-qDebug() << "CntContactCardViewPrivate::handleSendBusinessCard write VCard";
+CNT_LOG_ARGS("write VCard");
 // Start creating the vCard
 QVersitWriter writer;
 writer.setDevice(&f);
 bool ret = writer.startWriting(docs);
 QStringList l;
 l << vCardPath;
 mShareUi->send(l,false);
 }
 }
-qDebug() << "CntContactCardViewPrivate::handleSendBusinessCard - OUT";
+CNT_EXIT
 }
 /*!
 Called after the user clicked "Change Image" from popup menu after
 imageUtility.removeImage(filePath);
 }
 }
 mAvatar->setImageUrl(QUrl());
 mImageLabel->clear();
-mImageLabel->setIcon(HbIcon("qtg_large_add_contact_picture"));
+mImageLabel->setAvatarIcon(HbIcon("qtg_large_add_contact_picture"));
 mHeadingItem->setIcon(HbIcon("qtg_large_add_contact_picture"));
 contactManager()->saveContact(mContact);
 }
 }
 }
 count++;
 }
 }
 if (!count)
 {
-XQServiceRequest snd("com.nokia.services.logsservices.starter", "start(int,bool)", false);
+if (mRequest)
-snd << 0; // all calls
+{
-snd << true; // show dialpad
+delete mRequest;
-snd.send();
+mRequest = 0;
+}
+mRequest = mAppManager.create("com.nokia.symbian.ILogsView", "show(QVariantMap)", false);
+if (mRequest)
+{
+QList<QVariant> args;
+QVariantMap map;
+map.insert("view_index", QVariant(int(LogsServices::ViewAll)));
+map.insert("show_dialpad", QVariant(true));
+map.insert("dialpad_text", QVariant(QString()));
+args.append(QVariant(map));
+mRequest->setArguments(args);
+mRequest->send();
+}
 }
 else
 {
 QContactDetail preferredDetail = mContact->preferredDetail("call");
 if (!preferredDetail.isEmpty())
 {
-executeAction(*mContact, preferredDetail, "call", NULL);
+executeAction(*mContact, preferredDetail, "call");
 }
 else if (count == 1 )
 {
-mContact->setPreferredDetail("call", mContact->details<QContactPhoneNumber>().first());
+executeAction( *mContact, mContact->details<QContactPhoneNumber>().first(), "call");
-executeAction( *mContact, mContact->details<QContactPhoneNumber>().first(), "call", NULL);
 }
 else if(count >= 2 && mAcceptSendKey)
 {
 mAcceptSendKey = false;
 CntActionPopup *actionPopup = new CntActionPopup(mContact);
 actionPopup->showActionPopup("call");
 connect( actionPopup, SIGNAL(executeContactAction(QContact&, QContactDetail, QString)), this,
 SLOT(executeAction(QContact&, QContactDetail, QString)));
 connect( actionPopup, SIGNAL(actionPopupCancelPressed()), this,
 SLOT(sendKeyCancelSlot()));
+}
+else
+{
+//ignore
 }
 }
 }
 void CntContactCardViewPrivate::sendKeyCancelSlot()
 {
 mAcceptSendKey = true;
 }
+void CntContactCardViewPrivate::onAddedToContacts()
+{
+emit addToContacts();
+}
+void CntContactCardViewPrivate::contactDeletedFromOtherSource(const QList<QContactLocalId>& contactIds)
+{
+if ( contactIds.contains(mContact->localId()) )
+{
+// Do not switch to the previous view immediately. List views are
+// not updated properly if this is not done in the event loop
+QTimer::singleShot(0, this, SLOT(showRootView()));
+}
+}
 // end of file

changeset 53	e6aff7b69165
parent 50	77bc263e1626
child 54	47627ab5d7a4