diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/inc/cntcontactcardview_p.h --- a/phonebookui/pbkcommonui/inc/cntcontactcardview_p.h Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/inc/cntcontactcardview_p.h Wed Aug 18 09:39:00 2010 +0300 @@ -79,8 +79,11 @@ Q_DECLARE_PUBLIC(CntContactCardView) public: - CntContactCardViewPrivate(); - virtual ~CntContactCardViewPrivate(); + CntContactCardViewPrivate(bool isTemporary); + virtual ~CntContactCardViewPrivate(); + +protected: + bool eventFilter(QObject *obj, QEvent *event); public slots: void onItemActivated(); @@ -91,14 +94,14 @@ void thumbnailReady(const QPixmap& pixmap, void *data, int id, int error); void drawMenu(const QPointF &aCoords); void sendToHs(); + void onAddedToContacts(); void mapTileStatusReceived(int contactid, int addressType, int status); - void keyPressed(QKeyEvent *event); private slots: void sendBusinessCard(); void addToGroup(); void deleteContact(); - void handleDeleteContact(HbAction *action); + void handleDeleteContact(int action); void setAsFavorite(); void removeFromFavorite(); void actionExecuted(CntActionLauncher* aAction); @@ -106,11 +109,13 @@ void showPreviousView(); void doChangeImage(); void doRemoveImage(); + void showRootView(); void handleMenuAction(HbAction* aAction); void handleSendBusinessCard( HbAction* aAction ); void executeAction(QContact& aContact, const QContactDetail& aDetail, const QString& aAction); void sendKeyCancelSlot(); + void contactDeletedFromOtherSource(const QList& contactIds); #ifdef PBK_UNIT_TEST public slots: @@ -123,7 +128,9 @@ void setMaptileLabel( HbLabel*& mapLabel, const HbIcon& icon ); void updateMaptileImage(); HbLabel* loadMaptileLabel( int addressType ); - + + // Presence related function + void updateItemPresence(const QString& accountUri, bool online); public: CntContactCardView* q_ptr; @@ -136,7 +143,7 @@ void preferredUpdated(); void backPressed(); void viewActivated(CntAbstractViewManager* aMgr, const CntViewParameters aArgs); - + void addToContacts(); #ifdef PBK_UNIT_TEST public: @@ -147,7 +154,7 @@ void executeAction(QContact& aContact, const QContactDetail& aDetail, const QString& aAction, CntContactCardDetailItem* aItem); void executeDynamicAction(QContact& aContact, QContactDetail aDetail, QContactActionDescriptor aActionDescriptor); - void sendKeyPressed(); + bool sendKeyPressed(); #ifdef PBK_UNIT_TEST public: #else @@ -166,12 +173,14 @@ QContactAvatar *mAvatar; bool mIsHandlingMenu; QMap mPreferredItems; + /// maps a QContactOnlineAccount (for example "sip:sip@sip.com") to a detail item + QMap mPresenceItems; int mFavoriteGroupId; CntDocumentLoader *mLoader; QContactAction *mContactAction; HbAction *mBackKey; CntImageLabel *mImageLabel; - XQServiceRequest *mHighwayService; + XQServiceRequest *mHighwayService; HbIcon *mVCardIcon; CntViewParameters mArgs; ShareUi *mShareUi; @@ -183,6 +192,8 @@ QTimer *mProgressTimer; QList mAddressList; QMap mMaptileLabelList; + bool mIsTemporary; + bool mIsExecutingAction; }; #endif // CNTCOMMLAUNCHERVIEW_H