Contact

# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1282113540 -10800 # Node ID a642906a277a69d7f35a73715d1e5e5e736befeb # Parent 7cbcb2896f0e3e7d2c63938f5a337b5ce5539413 Revision: 201031 Kit: 201033 diff -r 7cbcb2896f0e -r a642906a277a contacts_plat/contacts_services_api/contacts_services_api.metaxml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/contacts_plat/contacts_services_api/contacts_services_api.metaxml Wed Aug 18 09:39:00 2010 +0300 @@ -0,0 +1,13 @@ + + + Contacts services API + Qt Highway services offered by Contacts package. + c++ + phonebookui + + + + no + no + + diff -r 7cbcb2896f0e -r a642906a277a contacts_plat/contacts_services_api/inc/cntservicescontact.h --- a/contacts_plat/contacts_services_api/inc/cntservicescontact.h Tue Jul 06 14:05:47 2010 +0300 +++ b/contacts_plat/contacts_services_api/inc/cntservicescontact.h Wed Aug 18 09:39:00 2010 +0300 @@ -11,7 +11,7 @@ * * Contributors: * -* Description: +* Description: Data container & constants for "phonebookservices" Qt Highway services. * */ @@ -22,21 +22,27 @@ #include #include -/*Supported actions*/ +//Action filter definitions: + +/// Action filter that DOES NOT filter away based on supported action. const QString KCntActionAll("all"); +/// Action filter for showing only contacts that support calling. const QString KCntActionCall("call"); +/// Action filter for showing only contacts that suppport SMS sending. const QString KCntActionSms("sms"); +// Action filter for showing only contacts that support emailing. const QString KCntActionEmail("email"); -/*Supported filters*/ -const QString KCntFilterDisplayAll("all"); -const QString KCntFilterDisplayFavorites("favorites"); -/*Supported Fetch Selection Modes*/ -const QString KCntNoSelectionMode("No Selection"); -const QString KCntSingleSelectionMode("SingleSelect"); -const QString KCntMultiSelectionMode("MultiSelect"); +/// Return values from editing service +const int KCntServicesReturnValueContactSaved = 1; +const int KCntServicesReturnValueContactDeleted = -1; +const int KCntServicesReturnValueContactNotModified = 0; +const int KCntServicesTerminated = -2; +/** + * A data container class to be used with "phonebookservices" Qt Highway services. + */ class CntServicesContact { public: @@ -70,6 +76,23 @@ typedef QList CntServicesContactList; +//------------------------------------------------------------------- +// These are DEPRECATED and will be removed soon: + +/// @deprecated +const QString KCntFilterDisplayAll("all"); +/// @deprecated +const QString KCntFilterDisplayFavorites("favorites"); + +/// @deprecated +const QString KCntNoSelectionMode("No Selection"); +/// @deprecated +const QString KCntSingleSelectionMode("SingleSelect"); +/// @deprecated +const QString KCntMultiSelectionMode("MultiSelect"); + +//------------------------------------------------------------------- + Q_DECLARE_USER_METATYPE(CntServicesContact) Q_DECLARE_USER_METATYPE_NO_OPERATORS(CntServicesContactList) diff -r 7cbcb2896f0e -r a642906a277a contacts_plat/contacts_ui_api/contacts_ui_api.metaxml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/contacts_plat/contacts_ui_api/contacts_ui_api.metaxml Wed Aug 18 09:39:00 2010 +0300 @@ -0,0 +1,13 @@ + + + Contacts UI API + Contacts UI related APIs. + c++ + phonebookui + + + + no + no + + diff -r 7cbcb2896f0e -r a642906a277a contacts_plat/contacts_ui_api/inc/cntabstractviewmanager.h --- a/contacts_plat/contacts_ui_api/inc/cntabstractviewmanager.h Tue Jul 06 14:05:47 2010 +0300 +++ b/contacts_plat/contacts_ui_api/inc/cntabstractviewmanager.h Wed Aug 18 09:39:00 2010 +0300 @@ -34,7 +34,7 @@ /* New API */ virtual void changeView( const CntViewParameters aArgs ) = 0; - virtual void back( const CntViewParameters aArgs ) = 0; + virtual void back( const CntViewParameters aArgs, bool toRoot = false ) = 0; virtual QContactManager* contactManager( const QString& aType ) = 0; }; diff -r 7cbcb2896f0e -r a642906a277a contacts_plat/contacts_ui_api/inc/cntviewparams.h --- a/contacts_plat/contacts_ui_api/inc/cntviewparams.h Tue Jul 06 14:05:47 2010 +0300 +++ b/contacts_plat/contacts_ui_api/inc/cntviewparams.h Wed Aug 18 09:39:00 2010 +0300 @@ -38,6 +38,7 @@ ESelectedDetail, ESelectionMode, EMyCard, + EExtraAction, ECustomParam = 100 }; @@ -45,7 +46,7 @@ { noView=0, //exit namesView, - commLauncherView, + contactCardView, serviceContactCardView, serviceAssignContactCardView, myCardView, @@ -53,7 +54,7 @@ serviceContactSelectionView, collectionView, collectionFavoritesView, - FavoritesMemberView, + favoritesMemberView, editView, serviceEditView, serviceSubEditView, @@ -76,6 +77,7 @@ importsView, settingsView, ringToneFetcherView, + serviceGroupMemberView, customPhonebookView = 100, // reserved for internal view plugins, DO NOT USE THESE customView = 200 // for all other view plugins }; diff -r 7cbcb2896f0e -r a642906a277a contacts_plat/contacts_ui_extensions_api/contacts_ui_extensions_api.metaxml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/contacts_plat/contacts_ui_extensions_api/contacts_ui_extensions_api.metaxml Wed Aug 18 09:39:00 2010 +0300 @@ -0,0 +1,13 @@ + + + Contacts UI extensions API + Plugin APIs for extending phonebook application. + c++ + phonebookui + + + + no + no + + diff -r 7cbcb2896f0e -r a642906a277a contacts_plat/contacts_ui_extensions_api/inc/cntuigroupsupplier.h --- a/contacts_plat/contacts_ui_extensions_api/inc/cntuigroupsupplier.h Tue Jul 06 14:05:47 2010 +0300 +++ b/contacts_plat/contacts_ui_extensions_api/inc/cntuigroupsupplier.h Wed Aug 18 09:39:00 2010 +0300 @@ -24,9 +24,18 @@ /** * UI extension class that supplies groups to phonebook groups UI. */ -class CntUiGroupSupplier +class CntUiGroupSupplier : public QObject { - public: +public: + CntUiGroupSupplier() {} + + /** + * Returns true if this supplier should be handled asynchronously and + * false otherwise. + * + * @return bool, asynchronity + */ + virtual bool isAsynch() const = 0; /** * Returns number of groups provided by the extension. @@ -49,6 +58,14 @@ { return NULL; } + +signals: + /** + * Asynchronous suppliers should re-implement this signal and emit it + * once group loading is ready. + */ + void groupsReady(); + protected: // prevent deleting by client virtual ~CntUiGroupSupplier() {} diff -r 7cbcb2896f0e -r a642906a277a contacts_plat/qt_mobility_contacts_api/qt_mobility_contacts_api.metaxml --- a/contacts_plat/qt_mobility_contacts_api/qt_mobility_contacts_api.metaxml Tue Jul 06 14:05:47 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ - - - Qt Mobility Contacts API - Qt Mobility Contacts API for managing contacts data. - c++ - phonebookengines - - - - - - no - no - - diff -r 7cbcb2896f0e -r a642906a277a contactwidgethsplugin/contactwidgeths/src/commlauncherwidget.cpp --- a/contactwidgethsplugin/contactwidgeths/src/commlauncherwidget.cpp Tue Jul 06 14:05:47 2010 +0300 +++ b/contactwidgethsplugin/contactwidgeths/src/commlauncherwidget.cpp Wed Aug 18 09:39:00 2010 +0300 @@ -113,7 +113,11 @@ CommLauncherWidget::~CommLauncherWidget() { // Deleting request cancels all pending requests - delete mRequest; + if (mRequest) { + delete mRequest; + mRequest = NULL; + } + } /*! @@ -518,17 +522,14 @@ */ void CommLauncherWidget::keyPressEvent(QKeyEvent *event) { + qDebug() << "keyPressEvent event=" << event->key(); if (event->key() == Qt::Key_Yes) { // Call key initializes a call makeCall(); event->accept(); - } else if (event->key() == Qt::Key_No || event->key() == Qt::Key_Select) { - // End key and Select key close the communication launcher and - // forward the key event to HbPopup - close(); - HbPopup::keyPressEvent(event); } else { - HbPopup::keyPressEvent(event); + close(); + //HbPopup::keyPressEvent(event); } } @@ -549,3 +550,4 @@ return width; } + diff -r 7cbcb2896f0e -r a642906a277a contactwidgethsplugin/contactwidgeths/src/contactwidgeths.cpp --- a/contactwidgethsplugin/contactwidgeths/src/contactwidgeths.cpp Tue Jul 06 14:05:47 2010 +0300 +++ b/contactwidgethsplugin/contactwidgeths/src/contactwidgeths.cpp Wed Aug 18 09:39:00 2010 +0300 @@ -41,6 +41,9 @@ #include "commlauncherwidget.h" #include "ihswidgetpreferenceservice.h" +const QString translationsPath = "/resource/qt/translations/"; +const QString translationsFile = "contactwidgethsplugin"; + const QString defaultAvatar = "qtg_large_avatar"; const QString addContactAvatar = "qtg_small_add"; const QString normalFrameName = "qtg_fr_hsshortcut_normal"; @@ -79,7 +82,7 @@ mTranslator(0) { // Localization file loading - mTranslator = new HbTranslator(); + mTranslator = new HbTranslator(translationsPath, translationsFile); mTranslator->loadCommon(); // UI creation done in onInitialize() @@ -132,15 +135,37 @@ */ ContactWidgetHs::~ContactWidgetHs() { - delete mLauncher; - delete mContactManager; - delete mAppManager; - delete mAvatar; - // Deleting request cancels all pending requests - delete mContactSelectRequest; - //,,first cancel? - delete mThumbnailManager; - delete mTranslator; + if (mLauncher) + { + delete mLauncher; + } + if (mContactManager) + { + delete mContactManager; + } + if (mAppManager) + { + delete mAppManager; + } + if (mAvatar) + { + delete mAvatar; + } + + // Deleting request cancels all pending requests + if (mContactSelectRequest) + { + delete mContactSelectRequest; + } + + if (mThumbnailManager) + { + delete mThumbnailManager; + } + if (mTranslator) + { + delete mTranslator; + } } /*! @@ -237,17 +262,38 @@ painter.end(); qDebug() << "setContactImage av 2"; //,, + int maxSize = (inputPixmap.width() > inputPixmap.height() ? inputPixmap.width():inputPixmap.height()); + int minSize = (inputPixmap.width() < inputPixmap.height() ? inputPixmap.width():inputPixmap.height()); + int sizeFrom = maxSize - minSize; // We may draw the icon when thumnail processing is still in progress, // so can't show the thumbnail yet. if (inputPixmap.width()>0) { + if (inputPixmap.width() < inputPixmap.height()) + { + QPixmap pm3 = inputPixmap.copy(0,sizeFrom/2,minSize,minSize); + QPixmap pm2 = pm3.scaled( QSize(contactIconSize, contactIconSize), Qt::KeepAspectRatio ); + qDebug() << "pm2 " << pm2.width() << " " << pm2.height(); + avatarPixmap = pm2; + } + else if (inputPixmap.width() > inputPixmap.height()) + { + QPixmap pm3 = inputPixmap.copy(sizeFrom/2,0,minSize,minSize); + QPixmap pm2 = pm3.scaled( QSize(contactIconSize, contactIconSize), Qt::KeepAspectRatio ); + qDebug() << "pm2 " << pm2.width() << " " << pm2.height(); + avatarPixmap = pm2; + }else + { QPixmap pm2 = inputPixmap.scaled( QSize(contactIconSize, contactIconSize), Qt::IgnoreAspectRatio ); qDebug() << "pm2 " << pm2.width() << " " << pm2.height(); avatarPixmap = pm2; // + } } HbIcon *avatarIcon = new HbIcon(QIcon(avatarPixmap)); mAvatarIconItem->setIcon(*avatarIcon); + mAvatarIconItem->setSize(QSize(contactIconSize, contactIconSize)); + mAvatarIconItem->setAspectRatioMode(Qt::KeepAspectRatio); // Then display the new image update(); @@ -411,7 +457,21 @@ */ void ContactWidgetHs::mousePressEvent(QGraphicsSceneMouseEvent *event) { - if (event && event->type() == QEvent::GraphicsSceneMousePress) { + Q_UNUSED(event); +} + +/*! + \fn void ContactWidgetHs::mouseReleaseEvent(QGraphicsSceneMouseEvent* event) + + Widget start is triggered from release \a event. + \sa +*/ +void ContactWidgetHs::mouseReleaseEvent(QGraphicsSceneMouseEvent* event) +{ + qDebug() << "mouseReleaseEvent event->type() = " << (int)event->type(); + + //Q_UNUSED(event); + if (event && event->type() == QEvent::GraphicsSceneMouseRelease) { // If the widget doesn't have contact yet and // there are contacts, select one. if (mContactLocalId == unUsedContactId) { @@ -444,17 +504,6 @@ } } -/*! - \fn void ContactWidgetHs::mouseReleaseEvent(QGraphicsSceneMouseEvent* event) - - Widget start is triggered from release \a event. - \sa -*/ -void ContactWidgetHs::mouseReleaseEvent(QGraphicsSceneMouseEvent* event) -{ - Q_UNUSED(event); -} - // Store contact data to member variables and to UI void ContactWidgetHs::getContactData() @@ -579,7 +628,11 @@ */ void ContactWidgetHs::onHide() { - qDebug() << "ContactWidgetHs::onHide()"; + qDebug() << "ContactWidgetHs::onHide()"; + // close the launcher if it's open + if (mLauncher->isVisible()) { + mLauncher->close(); + } } @@ -744,7 +797,17 @@ for(i=0; ideleteLater(); + mContactNameLabel->deleteLater(); + mAppManager->deleteLater(); + mLauncher->deleteLater(); + mContactLocalId = unUsedContactId; + delete mAvatar; + mContactHasAvatarDetail = false; + mContactManager->deleteLater(); + mThumbnailManager->deleteLater(); + emit finished(); break; } diff -r 7cbcb2896f0e -r a642906a277a contactwidgethsplugin/contactwidgethsplugin.pro --- a/contactwidgethsplugin/contactwidgethsplugin.pro Tue Jul 06 14:05:47 2010 +0300 +++ b/contactwidgethsplugin/contactwidgethsplugin.pro Wed Aug 18 09:39:00 2010 +0300 @@ -18,8 +18,7 @@ CONFIG += plugin hb mobility MOBILITY = serviceframework contacts -TRANSLATIONS = common.ts -TRANSLATIONS += contactwidgethsplugin.ts +TRANSLATIONS = contactwidgethsplugin.ts win32: PLUGIN_SUBDIR = /hsresources/import/widgetregistry/2002C353 symbian: PLUGIN_SUBDIR = /private/20022F35/import/widgetregistry/2002C353 @@ -57,11 +56,10 @@ BLD_INF_RULES.prj_exports += "./resource/contactwidgethsplugin.manifest z:$$PLUGIN_SUBDIR/contactwidgethsplugin.manifest" # xml files for emulator, sisx and hw rom BLD_INF_RULES.prj_exports += "./resource/contactwidgethsplugin.xml z:$$PLUGIN_SUBDIR/contactwidgethsplugin.xml" - # copy resources graphics png, svg - BLD_INF_RULES.prj_exports += "./resource/qtg_large_friend.svg z:$$PLUGIN_SUBDIR/qtg_large_friend.svg" # copy iby file - BLD_INF_RULES.prj_exports += "./rom/contactwidgeths.iby CORE_APP_LAYER_IBY_EXPORT_PATH( contactwidgeths.iby )" + BLD_INF_RULES.prj_exports += "./rom/contactwidgeths.iby CORE_APP_LAYER_IBY_EXPORT_PATH(contactwidgeths.iby)" + BLD_INF_RULES.prj_exports += "./rom/contactwidgeths_resources.iby LANGUAGE_APP_LAYER_IBY_EXPORT_PATH(contactwidgeths_resources.iby)" } symbian { diff -r 7cbcb2896f0e -r a642906a277a contactwidgethsplugin/resource/contactwidgethsplugin.manifest --- a/contactwidgethsplugin/resource/contactwidgethsplugin.manifest Tue Jul 06 14:05:47 2010 +0300 +++ b/contactwidgethsplugin/resource/contactwidgethsplugin.manifest Wed Aug 18 09:39:00 2010 +0300 @@ -1,9 +1,10 @@ contactwidgethsplugin - Contact - Contact widget. + txt_long_caption_friend + txt_friend_widget_dblist_friend_widget_val_quickly qtg_large_friend false contactwidgethsplugin.xml + contactwidgethsplugin diff -r 7cbcb2896f0e -r a642906a277a contactwidgethsplugin/rom/contactwidgeths.iby --- a/contactwidgethsplugin/rom/contactwidgeths.iby Tue Jul 06 14:05:47 2010 +0300 +++ b/contactwidgethsplugin/rom/contactwidgeths.iby Wed Aug 18 09:39:00 2010 +0300 @@ -17,6 +17,8 @@ #ifndef __CONTACTWIDGETHSPLUGIN_IBY__ #define __CONTACTWIDGETHSPLUGIN_IBY__ +#include + // -------- contactwidgethsplugin file=ABI_DIR\BUILD_DIR\contactwidgethsplugin.dll SHARED_LIB_DIR\contactwidgethsplugin.dll data=ZPRIVATE\20022f35\import\widgetregistry\2002C353\contactwidgethsplugin.qtplugin private\20022f35\import\widgetregistry\2002C353\contactwidgethsplugin.qtplugin @@ -25,4 +27,6 @@ data=ZPRIVATE\20022f35\import\widgetregistry\2002C353\qtg_large_friend.svg private\20022f35\import\widgetregistry\2002C353\qtg_large_friend.svg +data=DATAZ_\APP_RESOURCE_DIR\contactwidgethsplugin.rsc APP_RESOURCE_DIR\contactwidgethsplugin.rsc + #endif //__CONTACTWIDGETHSPLUGIN_IBY__ diff -r 7cbcb2896f0e -r a642906a277a contactwidgethsplugin/rom/contactwidgeths_resources.iby --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/contactwidgethsplugin/rom/contactwidgeths_resources.iby Wed Aug 18 09:39:00 2010 +0300 @@ -0,0 +1,24 @@ +/* +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ +#ifndef __CONTACTWIDGETHSPLUGIN_RESOURCES_IBY__ +#define __CONTACTWIDGETHSPLUGIN_RESOURCES_IBY__ + +#include + +data=DATAZ_\QT_TRANSLATIONS_DIR\contactwidgethsplugin.qm QT_TRANSLATIONS_DIR\contactwidgethsplugin.qm + +#endif //__CONTACTWIDGETHSPLUGIN_RESOURCES_IBY__ diff -r 7cbcb2896f0e -r a642906a277a inc/cntdebug.h --- a/inc/cntdebug.h Tue Jul 06 14:05:47 2010 +0300 +++ b/inc/cntdebug.h Wed Aug 18 09:39:00 2010 +0300 @@ -23,6 +23,8 @@ #include // qDebug() // #define TRACK_MEMORY_LEAKS +// #define TRACES +// #define TRACE2FILE /*! \def CNT_UNUSED(name) @@ -349,8 +351,13 @@ by the streaming operator <<. */ +// traces for debug builds by default, or if +// TRACES macro is defined +#if defined (_DEBUG) && !defined (TRACES) +#define TRACES +#endif -#ifdef _DEBUG +#if defined (TRACES) || defined (TRACE2FILE) #define CNT_UNUSED(name) #define CNT_STATIC_ENTRY qDebug() << __PRETTY_FUNCTION__ << "entry"; #define CNT_STATIC_ENTRY_ARGS(args) qDebug() << __PRETTY_FUNCTION__ << "entry," << args; @@ -360,6 +367,9 @@ #define CNT_EXIT_ARGS(args) qDebug() << __PRETTY_FUNCTION__ << "exit," << args; #define CNT_LOG qDebug() << __PRETTY_FUNCTION__ << "this" << (void *)this; #define CNT_LOG_ARGS(args) qDebug() << __PRETTY_FUNCTION__ << args; + #define CNT_WARNING(args) qWarning() << __PRETTY_FUNCTION__ << args; + #define CNT_CRITICAL(args) qCritical() << __PRETTY_FUNCTION__ << args; + #define CNT_FATAL(args) qFatal() << __PRETTY_FUNCTION__ << args; #else #define CNT_UNUSED(name) Q_UNUSED(name) #define CNT_STATIC_ENTRY @@ -370,8 +380,11 @@ #define CNT_EXIT_ARGS(args) #define CNT_LOG #define CNT_LOG_ARGS(args) -#endif // _DEBUG - + #define CNT_WARNING(args) + #define CNT_CRITICAL(args) + #define CNT_FATAL(args) +#endif // TRACES || TRACE2FILE + // for tracing memory leaks #ifdef TRACK_MEMORY_LEAKS #include @@ -406,4 +419,68 @@ #define CNT_TRACK_QOBJECTLIVES(obj) #endif +// filter phonebook app traces +#ifdef TRACE2FILE + #include + #include + static void cntCustomLog2File(QtMsgType type, const char *msg) + { + QFile logFile("c:/cnt_logs.log"); + if (!logFile.open(QIODevice::Append | QIODevice::Text)) + { + qFatal("error opening c:/cnt_logs.log file"); + return; + } + + QTextStream out(&logFile); + switch (type) + { + case QtDebugMsg: + out << "[CNT] Debug: " << msg; + break; + case QtWarningMsg: + out << "[CNT] Warning: " << msg; + break; + case QtCriticalMsg: + out << "[CNT] Critical: " << msg; + break; + case QtFatalMsg: + out << "[CNT] Fatal: " << msg; + abort(); + break; + default: + out << "[CNT] No Log Selection Type: " << msg; + break; + } + } + #define MSG_HANDLER cntCustomLog2File +#else + #ifdef Q_OS_SYMBIAN + #include + static void cntCustomLog(QtMsgType type, const char *msg) + { + switch (type) { + case QtDebugMsg: + RDebug::Printf("[CNT] Debug: %s\n", msg); + break; + case QtWarningMsg: + RDebug::Printf("[CNT] Warning: %s\n", msg); + break; + case QtCriticalMsg: + RDebug::Printf("[CNT] Critical: %s\n", msg); + break; + case QtFatalMsg: + RDebug::Printf("[CNT] Fatal: %s\n", msg); + abort(); + break; + default: + break; + } + } + #define MSG_HANDLER cntCustomLog + #else + #define MSG_HANDLER 0 + #endif // Q_OS_SYMBIAN +#endif // TRACE2FILE + #endif // CNTDEBUG_H diff -r 7cbcb2896f0e -r a642906a277a inc/cntglobal.h --- a/inc/cntglobal.h Tue Jul 06 14:05:47 2010 +0300 +++ b/inc/cntglobal.h Wed Aug 18 09:39:00 2010 +0300 @@ -47,5 +47,7 @@ #define CNT_ADD_ACTION "add" #define CNT_FOCUS_ACTION "focus" #define CNT_SAVE_ACTION "save" +#define CNT_FIND_ACTION "find" +#define CNT_ROOT_ACTION "root" #endif // CNTGLOBAL_H diff -r 7cbcb2896f0e -r a642906a277a phonebookengines/CntFindPlugin/group/CntFindPlugin.mmp --- a/phonebookengines/CntFindPlugin/group/CntFindPlugin.mmp Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookengines/CntFindPlugin/group/CntFindPlugin.mmp Wed Aug 18 09:39:00 2010 +0300 @@ -33,8 +33,6 @@ USERINCLUDE ../group APP_LAYER_SYSTEMINCLUDE -// Symbian uses #include in cntviewfindconfig.h -SYSTEMINCLUDE /epoc32/include/ecom START RESOURCE 101f85f4.rss TARGET cntfindplugin diff -r 7cbcb2896f0e -r a642906a277a phonebookengines/CntSortPlugin/group/CntSortPlugin.mmp --- a/phonebookengines/CntSortPlugin/group/CntSortPlugin.mmp Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookengines/CntSortPlugin/group/CntSortPlugin.mmp Wed Aug 18 09:39:00 2010 +0300 @@ -34,8 +34,6 @@ USERINCLUDE ../group APP_LAYER_SYSTEMINCLUDE -// Symbian uses #include in cntviewsortplugin.h -SYSTEMINCLUDE /epoc32/include/ecom START RESOURCE 101f85a9.rss TARGET cntsortplugin diff -r 7cbcb2896f0e -r a642906a277a phonebookengines/cntactions/inc/cntaction.h --- a/phonebookengines/cntactions/inc/cntaction.h Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookengines/cntactions/inc/cntaction.h Wed Aug 18 09:39:00 2010 +0300 @@ -79,6 +79,7 @@ QVariantMap m_result; //result returned to client QContact m_contact; //contact passed to invokeAction QContactDetail m_detail; //detail passed to invokeAction + QVariantMap m_data; //data passed to invokeAction QContactAction::State m_state; XQAiwRequest* m_request; XQApplicationManager m_AppManager; diff -r 7cbcb2896f0e -r a642906a277a phonebookengines/cntactions/inc/cntemailaction.h --- a/phonebookengines/cntactions/inc/cntemailaction.h Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookengines/cntactions/inc/cntemailaction.h Wed Aug 18 09:39:00 2010 +0300 @@ -35,8 +35,6 @@ QList supportedDetails(const QContact& contact) const; CntEmailAction* clone() const; void performAction(); -private: - XQAiwRequest *mRequest; }; #endif diff -r 7cbcb2896f0e -r a642906a277a phonebookengines/cntactions/src/cntaction.cpp --- a/phonebookengines/cntactions/src/cntaction.cpp Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookengines/cntactions/src/cntaction.cpp Wed Aug 18 09:39:00 2010 +0300 @@ -116,10 +116,11 @@ } -bool CntAction::invokeAction(const QContact& contact, const QContactDetail& detail, const QVariantMap& /*parameters*/) +bool CntAction::invokeAction(const QContact& contact, const QContactDetail& detail, const QVariantMap& data) { m_contact = contact; m_detail = detail; + m_data = data; QTimer::singleShot(1, this, SLOT(performAction())); m_state = QContactAction::ActiveState; @@ -159,77 +160,60 @@ //common code to perform a call, videocall and message action void CntAction::performNumberAction(const QString &interface, const QString &operation) { - XQApplicationManager appMng; QVariantList args; QVariant retValue; // TODO: Using XQApplicationManager is not working with calls // The factory method cannot create a request. Find out why - bool isCallAction = m_actionName == "call"; + //bool isCallAction = (m_actionName == "call" || m_actionName == "videocall"); XQServiceRequest snd(interface, operation, false); - delete m_request; - m_request = NULL; - m_request = appMng.create(interface, operation, false); // not embedded - if (!isCallAction) { - if (!m_request) { - emitResult(GeneralError, retValue); - return; - } + //QContactType == TypeGroup + if (QContactType::TypeGroup == m_contact.type()) { + QContactPhoneNumber conferenceCall = m_contact.detail(); + args << conferenceCall.number() << m_contact.localId() << m_contact.displayLabel(); + + // TODO remove once call action works + snd << conferenceCall.number() << m_contact.localId() << m_contact.displayLabel(); + snd.send(retValue); + emitResult(snd.latestError(), retValue); } - + //QContactType == TypeContact //detail exist use it - if (m_detail.definitionName() == QContactPhoneNumber::DefinitionName) - { + else if (m_detail.definitionName() == QContactPhoneNumber::DefinitionName) { const QContactPhoneNumber &phoneNumber = static_cast(m_detail); args << phoneNumber.number() << m_contact.localId() << m_contact.displayLabel(); - // TODO remove once call action works - if (isCallAction) { - snd << phoneNumber.number() << m_contact.localId() << m_contact.displayLabel(); - emitResult(snd.send(retValue), retValue); - } else { - m_request->setArguments(args); - m_request->setSynchronous(true); - emitResult(m_request->send(retValue), retValue); - } + snd << phoneNumber.number() << m_contact.localId() << m_contact.displayLabel(); + snd.send(retValue); + emitResult(snd.latestError(), retValue); } - - //if no detail, pick preferred - else if(m_detail.isEmpty()) + //QContactType == TypeContact + //if no detail, pick preferred + else if (m_detail.isEmpty()) { QContactDetail detail = m_contact.preferredDetail(m_actionName); QContactPhoneNumber phoneNumber; //if preferred is empty pick first phonenumber - if(detail.isEmpty()) - { + if (detail.isEmpty()) { phoneNumber = m_contact.detail(); } //if not empty, cast detail to phonenumber - else - { + else { phoneNumber = static_cast(detail); } args << phoneNumber.number() << m_contact.localId() << m_contact.displayLabel(); - // TODO remove once call action works - if (isCallAction) { - snd << phoneNumber.number() << m_contact.localId() << m_contact.displayLabel(); - emitResult(snd.send(retValue), retValue); - } else { - m_request->setArguments(args); - m_request->setSynchronous(true); - emitResult(m_request->send(retValue), retValue); - } + snd << phoneNumber.number() << m_contact.localId() << m_contact.displayLabel(); + snd.send(retValue); + emitResult(snd.latestError(), retValue); } - //else return an error - else - { + else { emitResult(GeneralError, retValue); } } @@ -244,11 +228,11 @@ m_result.insert("XQAiwRequest Error", m_request->lastError()); } - if (errorCode == 0){ + if (errorCode == 0) { m_state = QContactAction::FinishedState; } - else{ + else { m_state = QContactAction::FinishedWithErrorState; } diff -r 7cbcb2896f0e -r a642906a277a phonebookengines/cntactions/src/cntemailaction.cpp --- a/phonebookengines/cntactions/src/cntemailaction.cpp Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookengines/cntactions/src/cntemailaction.cpp Wed Aug 18 09:39:00 2010 +0300 @@ -29,12 +29,10 @@ CntEmailAction::CntEmailAction() : CntAction("email") { - mRequest = m_AppManager.create(XQI_EMAIL_MESSAGE_SEND, "send(QVariant)", true); } CntEmailAction::~CntEmailAction() { - delete mRequest; } QContactFilter CntEmailAction::contactFilter(const QVariant& value) const @@ -65,61 +63,58 @@ void CntEmailAction::performAction() { QVariant retValue; - - if (mRequest) - { + delete m_request; + m_request = NULL; + m_request = m_AppManager.create(XQI_EMAIL_MESSAGE_SEND, "send(QVariant)", true); + + if (m_request) { QMap map; QStringList recipients; QList data; + //QContactType == TypeGroup + if (QContactType::TypeGroup == m_contact.type()) { + QStringList emails; + QVariant value = m_data.value("email"); + if (value.canConvert()) { + emails = value.toStringList(); + } + + if (!emails.isEmpty()) { + for (int i=0;isetArguments(data); + m_request->send(retValue); + emitResult(m_request->lastError(), retValue); + } + else { + emitResult(GeneralError, retValue); + } + } + //QContactType == TypeContact // If detail exists use it. - if (m_detail.definitionName() == QContactEmailAddress::DefinitionName) - { + else if (m_detail.definitionName() == QContactEmailAddress::DefinitionName) { const QContactEmailAddress &email = static_cast(m_detail); recipients.append(email.emailAddress()); map.insert(EMAIL_SEND_TO_KEY, recipients); data.append(map); - mRequest->setArguments(data); - mRequest->send(retValue); - emitResult(mRequest->lastError(), retValue); + m_request->setArguments(data); + m_request->send(retValue); + emitResult(m_request->lastError(), retValue); } - - // If no detail, pick preferred. - // Todo : Temporary fix. Remove setting preferred when selection popup feature available. - else if (m_detail.isEmpty()) - { - QContactDetail detail = m_contact.preferredDetail(m_actionName); - QContactEmailAddress email; - - // If preferred is empty pick first email. - if(detail.isEmpty()) - { - email = m_contact.detail(); - } - else - { - email = static_cast(detail); - } - - recipients.append(email.emailAddress()); - map.insert(EMAIL_SEND_TO_KEY, recipients); - data.append(map); - - mRequest->setArguments(data); - mRequest->send(retValue); - emitResult(mRequest->lastError(), retValue); - } - else - { + else { emitResult(GeneralError, retValue); } } // Service not found. - else - { + else { emitResult(GeneralError, retValue); } } diff -r 7cbcb2896f0e -r a642906a277a phonebookengines/cntactions/src/cntmessageaction.cpp --- a/phonebookengines/cntactions/src/cntmessageaction.cpp Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookengines/cntactions/src/cntmessageaction.cpp Wed Aug 18 09:39:00 2010 +0300 @@ -66,10 +66,60 @@ void CntMessageAction::performAction() { - QString service("com.nokia.symbian.IMessageSend"); - QString type("send(QString,qint32,QString)"); + QList data; + QVariant retValue; - performNumberAction(service, type); + delete m_request; + m_request = NULL; + + //QContactType == TypeGroup + if (QContactType::TypeGroup == m_contact.type()) { + QString interface("com.nokia.symbian.IMessageSend"); + QString operation("send(QVariantMap,QString)"); + m_request = m_AppManager.create(interface, operation, false); // not embedded + if (m_request==NULL) { + emitResult(GeneralError, retValue); + return; + } + + QVariantMap recipientMap; + QVariant value = m_data.value("message"); + if (value.canConvert()) { + recipientMap = value.toMap(); + } + if (!recipientMap.isEmpty()) { + data.append(recipientMap); //recipients + data.append(QString()); //body text + + m_request->setArguments(data); + m_request->send(retValue); + emitResult(m_request->lastError(), retValue); + } + else { + emitResult(GeneralError, retValue); + } + } + //QContactType == TypeContact + //detail exist use it + else if (m_detail.definitionName() == QContactPhoneNumber::DefinitionName) { + QString interface("com.nokia.symbian.IMessageSend"); + QString operation("send(QString,qint32,QString)"); + m_request = m_AppManager.create(interface, operation, false); // not embedded + if (m_request==NULL) { + emitResult(GeneralError, retValue); + return; + } + + const QContactPhoneNumber &phoneNumber = static_cast(m_detail); + data << phoneNumber.number() << m_contact.localId() << m_contact.displayLabel(); + + m_request->setArguments(data); + m_request->send(retValue); + emitResult(m_request->lastError(), retValue); + } + else { + emitResult(GeneralError, retValue); + } } diff -r 7cbcb2896f0e -r a642906a277a phonebookengines/cntlistmodel/src/cntcache.cpp --- a/phonebookengines/cntlistmodel/src/cntcache.cpp Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookengines/cntlistmodel/src/cntcache.cpp Wed Aug 18 09:39:00 2010 +0300 @@ -439,9 +439,9 @@ bool foundContact = false; QContactFetchHint nameOnlyFetchHint; - QStringList details; + /*QStringList details; details << QContactDisplayLabel::DefinitionName; - nameOnlyFetchHint.setDetailDefinitionsHint(details); + nameOnlyFetchHint.setDetailDefinitionsHint(details);*/ nameOnlyFetchHint.setOptimizationHints(QContactFetchHint::NoRelationships); QContact contact = mContactManager->contact(contactId, nameOnlyFetchHint); @@ -648,7 +648,7 @@ { CNT_ENTRY - delete this; + deleteLater(); CNT_EXIT } diff -r 7cbcb2896f0e -r a642906a277a phonebookengines/cntmaptileservice/tsrc/ut_cntmaptileservice/ut_cntmaptileservice.pro --- a/phonebookengines/cntmaptileservice/tsrc/ut_cntmaptileservice/ut_cntmaptileservice.pro Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookengines/cntmaptileservice/tsrc/ut_cntmaptileservice/ut_cntmaptileservice.pro Wed Aug 18 09:39:00 2010 +0300 @@ -40,7 +40,6 @@ :BLD_INF_RULES.prj_exports += "data/preferredaddressmap.png /epoc32/winscw/c/maptiletest/preferredaddressmap.png" :BLD_INF_RULES.prj_exports += "data/workaddressmap.png /epoc32/winscw/c/maptiletest/workaddressmap.png" :BLD_INF_RULES.prj_exports += "data/homeaddressmap.png /epoc32/winscw/c/maptiletest/homeaddressmap.png" - SYSTEMINCLUDEPATH += \epoc32\include\stdapis } SOURCES += src/testrunner.cpp diff -r 7cbcb2896f0e -r a642906a277a phonebookengines_old/contactsmodel/groupsql/cntmodel.iby --- a/phonebookengines_old/contactsmodel/groupsql/cntmodel.iby Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookengines_old/contactsmodel/groupsql/cntmodel.iby Wed Aug 18 09:39:00 2010 +0300 @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include REM Log Engine contact matching plug-in implementation #include @@ -33,9 +33,9 @@ #define CONTACT_SERVER_MAX_HEAPSIZE 0x100000 #endif -file=ABI_DIR\BUILD_DIR\cntsrv.exe System\Programs\cntsrv.exe heapmax=CONTACT_SERVER_MAX_HEAPSIZE -file=ABI_DIR\BUILD_DIR\cntmodel.dll System\Libs\cntmodel.dll -file=ABI_DIR\BUILD_DIR\cntview.dll System\Libs\cntview.dll +file=ABI_DIR/BUILD_DIR/cntsrv.exe System/Programs/cntsrv.exe heapmax=CONTACT_SERVER_MAX_HEAPSIZE +file=ABI_DIR/BUILD_DIR/cntmodel.dll System/Libs/cntmodel.dll +file=ABI_DIR/BUILD_DIR/cntview.dll System/Libs/cntview.dll ECOM_PLUGIN(cntvcard.dll,102035f8.rsc) ECOM_PLUGIN(cntphone.dll,102035fb.rsc) diff -r 7cbcb2896f0e -r a642906a277a phonebookengines_old/contactsmodel/tsrc/Integration/TestStartUp/data/StartUpData.ini --- a/phonebookengines_old/contactsmodel/tsrc/Integration/TestStartUp/data/StartUpData.ini Tue Jul 06 14:05:47 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,317 +0,0 @@ -[initial_view_settings_in_centralrep_ROM] -ApiAction = GetDefaultViewSettings -ContactsDbAction = CheckExistingViewDefsInCntsServer -NumberofViews = 1 -ViewName1 = KMainContactsAppView -FirstViewSortOrder1 = 268440445 -SecondViewSortOrder1 = 268440444 -ThirdViewSortOrder1 = 268440333 -ViewPreferance1 = 0 -ViewType1 = 1 -SortPluginName1 = - - - -[set_initial_view_settings_in_centralrep] -ApiAction = SetNewDefaultViewSettings -NumberofViews = 1 -ViewName1 = KMainContactsAppView -FirstViewSortOrder1 = 268440445 -SecondViewSortOrder1 = 268440444 -ThirdViewSortOrder1 = 268440333 -ViewPreferance1 = 0 -ViewType1 = 1 -SortPluginName1 = - - - -[set_4_default_view_settings_in_centralrep] -ApiAction = SetNewDefaultViewSettings -NumberofViews = 4 -ViewName1 = KMainContactsAppView1 -FirstViewSortOrder1 = 268440445 -SecondViewSortOrder1 = 268440444 -ThirdViewSortOrder1 = 268440333 -ViewPreferance1 = 0 -ViewType1 = 1 -SortPluginName1 = -ViewName2 = KMainContactsAppView2 -FirstViewSortOrder2 = 268440445 -SecondViewSortOrder2 = 268440444 -ThirdViewSortOrder2 = 268440333 -ViewPreferance2 = 0 -ViewType2 = 1 -SortPluginName2 = -ViewName3 = KMainContactsAppView3 -FirstViewSortOrder3 = 268440445 -SecondViewSortOrder3 = 268440444 -ThirdViewSortOrder3 = 268440333 -ViewPreferance3 = 0 -ViewType3 = 1 -SortPluginName3 = -ViewName4 = KMainContactsAppView4 -FirstViewSortOrder4 = 268440445 -SecondViewSortOrder4 = 268440444 -ThirdViewSortOrder4 = 268440333 -ViewPreferance4 = 0 -ViewType4 = 1 -SortPluginName4 = - - - -[set_invalid_view_type] -ApiAction = SetNewDefaultViewSettings -NumberofViews = 1 -ViewName1 = invalid_view_type -FirstViewSortOrder1 = 268440445 -SecondViewSortOrder1 = 268440444 -ThirdViewSortOrder1 = 268440333 -ViewPreferance1 = 0 -ViewType1 = 99 -SortPluginName1 = - - - -[check_invalid_view_type] -ApiAction = GetDefaultViewSettings -ContactsDbAction = CheckExistingViewDefsInCntsServer -NumberofViews = 1 -ViewName1 = invalid_view_type -FirstViewSortOrder1 = 268440445 -SecondViewSortOrder1 = 268440444 -ThirdViewSortOrder1 = 268440333 -ViewPreferance1 = 0 -ViewType1 = 99 -SortPluginName1 = - - - -[set_invalid_preferance] -ApiAction = SetNewDefaultViewSettings -NumberofViews = 1 -ViewName1 = invalid_pref -FirstViewSortOrder1 = 268440445 -SecondViewSortOrder1 = 268440444 -ThirdViewSortOrder1 = 268440333 -ViewPreferance1 = 99 -ViewType1 = 1 -SortPluginName1 = - - - -[check_invalid_preferance] -ApiAction = GetDefaultViewSettings -ContactsDbAction = CheckExistingViewDefsInCntsServer -NumberofViews = 1 -ViewName1 = invalid_pref -FirstViewSortOrder1 = 268440445 -SecondViewSortOrder1 = 268440444 -ThirdViewSortOrder1 = 268440333 -ViewPreferance1 = 99 -ViewType1 = 1 -SortPluginName1 = - - - -[store_invalid_sort_orders] -ApiAction = SetNewDefaultViewSettings -NumberofViews = 1 -ViewName1 = invalid_sort_orders -FirstViewSortOrder1 = 0 -SecondViewSortOrder1 = 0 -ThirdViewSortOrder1 = 0 -ViewPreferance1 = 0 -ViewType1 = 1 -SortPluginName1 = - - - -[store_invalid_plugin_name] -ApiAction = SetNewDefaultViewSettings -NumberofViews = 1 -ViewName1 = invalid_plugin_name -FirstViewSortOrder1 = 268440445 -SecondViewSortOrder1 = 268440444 -ThirdViewSortOrder1 = 268440333 -ViewPreferance1 = 0 -ViewType1 = 1 -SortPluginName1 = xyz - - - -[invalid_rom_setting] -ApiAction = GetDefaultViewSettings -NumberofViews = 1 -ViewName1 = KMainContactsAppView -FirstViewSortOrder1 = 268440445 -SecondViewSortOrder1 = 268440444 -ThirdViewSortOrder1 = 268440333 -ViewPreferance1 = 0 -ViewType1 = 1 -SortPluginName1 = abc - - - -[Append_View_Setting_To_View_Setting_List] -ApiAction = AppendNewViewSetting - - - -[delete_named_view_setting] -ApiAction = DeleteViewSettings -ViewName = TempViewName - - - -[delete_default_view] -ApiAction = DeleteViewSettings -ViewName = KMainContactsAppView - - -[launch_cnts_server] -StartupAction = LaunchProcess -StartupExeName = CNTSRV.EXE -Mode = -nontransient - - -[terminate_cnts_server] -StartupAction = TerminateProcess - - - -[check_cnts_server_is_ok] -StartupAction = CheckProcess -StartUpExitType = 3 //EExitPending -StartUpExitReason = 0 - - - -[check_cnts_server_has_terminated_ok] -StartupAction = CheckProcess -StartUpExitType = 1 //EExitTerminate -StartUpExitReason = 0 - - - -[create_default_cnts_db] -ContactsDbAction = CreateDefCntsDb - - - -[add_20_contacts_to_default_db] -ContactsDbAction = AddItemstoCntsDb -NumberOfContacts = 20 - - - -[delete_default_cnts_db] -ContactsDbAction = DeleteDefCntsDb - - - -[open_default_cnts_db] -ContactsDbAction = OpenDefCntsDb - - - -[replace_default_cnts_db] -ContactsDbAction = ReplaceDefCntsDb - - -[check_4_default_view_settings_in_centralrep] -ContactsDbAction = CheckExistingViewDefsInCntsServer -ApiAction = GetDefaultViewSettings -NumberofViews = 4 -ViewName1 = KMainContactsAppView1 -FirstViewSortOrder1 = 268440445 -SecondViewSortOrder1 = 268440444 -ThirdViewSortOrder1 = 268440333 -ViewPreferance1 = 0 -ViewType1 = 1 -SortPluginName1 = -ViewName2 = KMainContactsAppView2 -FirstViewSortOrder2 = 268440445 -SecondViewSortOrder2 = 268440444 -ThirdViewSortOrder2 = 268440333 -ViewPreferance2 = 0 -ViewType2 = 1 -SortPluginName2 = -ViewName3 = KMainContactsAppView3 -FirstViewSortOrder3 = 268440445 -SecondViewSortOrder3 = 268440444 -ThirdViewSortOrder3 = 268440333 -ViewPreferance3 = 0 -ViewType3 = 1 -SortPluginName3 = -ViewName4 = KMainContactsAppView4 -FirstViewSortOrder4 = 268440445 -SecondViewSortOrder4 = 268440444 -ThirdViewSortOrder4 = 268440333 -ViewPreferance4 = 0 -ViewType4 = 1 -SortPluginName4 = - - - -[check_invalid_sort_orders] -ApiAction = GetDefaultViewSettings -ContactsDbAction = CheckExistingViewDefsInCntsServer -NumberofViews = 1 -ViewName1 = invalid_sort_orders -FirstViewSortOrder1 = 0 -SecondViewSortOrder1 = 0 -ThirdViewSortOrder1 = 0 -ViewPreferance1 = 0 -ViewType1 = 1 -SortPluginName1 = - - - -[check_invalid_plugin_name] -ApiAction = GetDefaultViewSettings -NumberofViews = 1 -ViewName1 = invalid_plugin_name -FirstViewSortOrder1 = 268440445 -SecondViewSortOrder1 = 268440444 -ThirdViewSortOrder1 = 268440333 -ViewPreferance1 = 0 -ViewType1 = 1 -SortPluginName1 = xyz - - - -[check_appended_view_Setting] -ContactsDbAction = CheckExistingViewDefsInCntsServer -ApiAction = GetDefaultViewSettings -NumberofViews = 2 -ViewName1 = KMainContactsAppView -FirstViewSortOrder1 = 268440445 -SecondViewSortOrder1 = 268440444 -ThirdViewSortOrder1 = 268440333 -ViewPreferance1 = 0 -ViewType1 = 1 -SortPluginName1 = -ViewName2 = TempViewName -FirstViewSortOrder2 = 268440445 -SecondViewSortOrder2 = 268440445 -ThirdViewSortOrder2 = 268440445 -ViewPreferance2 = 0 -ViewType2 = 1 -SortPluginName2 = - - - -[OOM_Test_GetDefaultView] -ApiAction = OutOfMemoryTestsForGetAPI - - - -[OOM_Test_SetDefaultView] -ApiAction = OutOfMemoryTestsForSetAPI -NumberofViews = 4 - - - -[check_empty_view_defs] -ContactsDbAction = CheckExistingViewDefsInCntsServer -NumberofViews = 0 diff -r 7cbcb2896f0e -r a642906a277a phonebookui/bwins/pbkcommonuiu.def --- a/phonebookui/bwins/pbkcommonuiu.def Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/bwins/pbkcommonuiu.def Wed Aug 18 09:39:00 2010 +0300 @@ -2,139 +2,172 @@ ?trUtf8@CntDefaultViewManager@@SA?AVQString@@PBD0@Z @ 1 NONAME ; class QString CntDefaultViewManager::trUtf8(char const *, char const *) ?setViewNavigator@CntDefaultViewManager@@QAEXPAVCntViewNavigator@@@Z @ 2 NONAME ; void CntDefaultViewManager::setViewNavigator(class CntViewNavigator *) ?tr@CntActionPopup@@SA?AVQString@@PBD0@Z @ 3 NONAME ; class QString CntActionPopup::tr(char const *, char const *) - ?cleanup@CntDefaultViewManager@@AAEXXZ @ 4 NONAME ; void CntDefaultViewManager::cleanup(void) - ??0CntDefaultViewFactory@@QAE@XZ @ 5 NONAME ; CntDefaultViewFactory::CntDefaultViewFactory(void) - ??1CntMainWindow@@UAE@XZ @ 6 NONAME ; CntMainWindow::~CntMainWindow(void) - ?viewActivated@CntContactCardView@@IAEXPAVCntAbstractViewManager@@V?$QMap@HVQVariant@@@@@Z @ 7 NONAME ; void CntContactCardView::viewActivated(class CntAbstractViewManager *, class QMap) - ?view@CntEditView@@UBEPAVHbView@@XZ @ 8 NONAME ; class HbView * CntEditView::view(void) const - ?qt_metacall@CntBaseSelectionView@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 9 NONAME ; int CntBaseSelectionView::qt_metacall(enum QMetaObject::Call, int, void * *) - ?closeView@CntBaseSelectionView@@AAEXXZ @ 10 NONAME ; void CntBaseSelectionView::closeView(void) + ?currentViewId@CntDefaultViewManager@@QAEHXZ @ 4 NONAME ; int CntDefaultViewManager::currentViewId(void) + ?cleanup@CntDefaultViewManager@@AAEXXZ @ 5 NONAME ; void CntDefaultViewManager::cleanup(void) + ??0CntDefaultViewFactory@@QAE@XZ @ 6 NONAME ; CntDefaultViewFactory::CntDefaultViewFactory(void) + ??1CntMainWindow@@UAE@XZ @ 7 NONAME ; CntMainWindow::~CntMainWindow(void) + ?viewActivated@CntContactCardView@@IAEXPAVCntAbstractViewManager@@V?$QMap@HVQVariant@@@@@Z @ 8 NONAME ; void CntContactCardView::viewActivated(class CntAbstractViewManager *, class QMap) + ?view@CntEditView@@UBEPAVHbView@@XZ @ 9 NONAME ; class HbView * CntEditView::view(void) const + ?qt_metacall@CntBaseSelectionView@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 10 NONAME ; int CntBaseSelectionView::qt_metacall(enum QMetaObject::Call, int, void * *) ?tr@CntMainWindow@@SA?AVQString@@PBD0@Z @ 11 NONAME ; class QString CntMainWindow::tr(char const *, char const *) ?staticMetaObject@CntBaseSelectionView@@2UQMetaObject@@B @ 12 NONAME ; struct QMetaObject const CntBaseSelectionView::staticMetaObject ?d_func@CntEditView@@AAEPAVCntEditViewPrivate@@XZ @ 13 NONAME ; class CntEditViewPrivate * CntEditView::d_func(void) ?changesDiscarded@CntEditView@@IAEXXZ @ 14 NONAME ; void CntEditView::changesDiscarded(void) - ?keyPressEvent@CntMainWindow@@UAEXPAVQKeyEvent@@@Z @ 15 NONAME ; void CntMainWindow::keyPressEvent(class QKeyEvent *) - ??_ECntDefaultViewManager@@UAE@I@Z @ 16 NONAME ; CntDefaultViewManager::~CntDefaultViewManager(unsigned int) - ??_ECntBaseSelectionView@@UAE@I@Z @ 17 NONAME ; CntBaseSelectionView::~CntBaseSelectionView(unsigned int) - ?view@CntBaseSelectionView@@UBEPAVHbView@@XZ @ 18 NONAME ; class HbView * CntBaseSelectionView::view(void) const - ??1CntDefaultViewFactory@@UAE@XZ @ 19 NONAME ; CntDefaultViewFactory::~CntDefaultViewFactory(void) - ??_ECntDefaultViewFactory@@UAE@I@Z @ 20 NONAME ; CntDefaultViewFactory::~CntDefaultViewFactory(unsigned int) - ?trUtf8@CntDefaultViewManager@@SA?AVQString@@PBD0H@Z @ 21 NONAME ; class QString CntDefaultViewManager::trUtf8(char const *, char const *, int) - ?qt_metacast@CntActionPopup@@UAEPAXPBD@Z @ 22 NONAME ; void * CntActionPopup::qt_metacast(char const *) - ?deleteOldView@CntDefaultViewManager@@AAEXXZ @ 23 NONAME ; void CntDefaultViewManager::deleteOldView(void) - ?trUtf8@CntMainWindow@@SA?AVQString@@PBD0H@Z @ 24 NONAME ; class QString CntMainWindow::trUtf8(char const *, char const *, int) - ?trUtf8@CntEditView@@SA?AVQString@@PBD0H@Z @ 25 NONAME ; class QString CntEditView::trUtf8(char const *, char const *, int) - ??1CntEditView@@UAE@XZ @ 26 NONAME ; CntEditView::~CntEditView(void) - ?qt_metacast@CntBaseSelectionView@@UAEPAXPBD@Z @ 27 NONAME ; void * CntBaseSelectionView::qt_metacast(char const *) - ?metaObject@CntBaseSelectionView@@UBEPBUQMetaObject@@XZ @ 28 NONAME ; struct QMetaObject const * CntBaseSelectionView::metaObject(void) const - ?backPressed@CntContactCardView@@IAEXXZ @ 29 NONAME ; void CntContactCardView::backPressed(void) - ?qt_metacall@CntViewNavigator@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 30 NONAME ; int CntViewNavigator::qt_metacall(enum QMetaObject::Call, int, void * *) - ?activate@CntBaseSelectionView@@UAEXPAVCntAbstractViewManager@@V?$QMap@HVQVariant@@@@@Z @ 31 NONAME ; void CntBaseSelectionView::activate(class CntAbstractViewManager *, class QMap) - ?tr@CntDefaultViewManager@@SA?AVQString@@PBD0H@Z @ 32 NONAME ; class QString CntDefaultViewManager::tr(char const *, char const *, int) - ?viewId@CntEditView@@UBEHXZ @ 33 NONAME ; int CntEditView::viewId(void) const - ?qt_metacast@CntContactCardView@@UAEPAXPBD@Z @ 34 NONAME ; void * CntContactCardView::qt_metacast(char const *) - ?activate@CntEditView@@UAEXPAVCntAbstractViewManager@@V?$QMap@HVQVariant@@@@@Z @ 35 NONAME ; void CntEditView::activate(class CntAbstractViewManager *, class QMap) - ?viewClosed@CntBaseSelectionView@@IAEXXZ @ 36 NONAME ; void CntBaseSelectionView::viewClosed(void) - ?showActionPopup@CntActionPopup@@QAE_NVQString@@@Z @ 37 NONAME ; bool CntActionPopup::showActionPopup(class QString) - ?trUtf8@CntActionPopup@@SA?AVQString@@PBD0@Z @ 38 NONAME ; class QString CntActionPopup::trUtf8(char const *, char const *) - ?keyPressed@CntMainWindow@@IAEXPAVQKeyEvent@@@Z @ 39 NONAME ; void CntMainWindow::keyPressed(class QKeyEvent *) - ?tr@CntBaseSelectionView@@SA?AVQString@@PBD0H@Z @ 40 NONAME ; class QString CntBaseSelectionView::tr(char const *, char const *, int) - ?metaObject@CntContactCardView@@UBEPBUQMetaObject@@XZ @ 41 NONAME ; struct QMetaObject const * CntContactCardView::metaObject(void) const - ??0CntViewNavigator@@QAE@PAVQObject@@@Z @ 42 NONAME ; CntViewNavigator::CntViewNavigator(class QObject *) - ?d_func@CntContactCardView@@ABEPBVCntContactCardViewPrivate@@XZ @ 43 NONAME ; class CntContactCardViewPrivate const * CntContactCardView::d_func(void) const - ?trUtf8@CntBaseSelectionView@@SA?AVQString@@PBD0H@Z @ 44 NONAME ; class QString CntBaseSelectionView::trUtf8(char const *, char const *, int) - ?getStaticMetaObject@CntBaseSelectionView@@SAABUQMetaObject@@XZ @ 45 NONAME ; struct QMetaObject const & CntBaseSelectionView::getStaticMetaObject(void) - ??0CntDefaultViewManager@@QAE@PAVHbMainWindow@@@Z @ 46 NONAME ; CntDefaultViewManager::CntDefaultViewManager(class HbMainWindow *) - ?getStaticMetaObject@CntActionPopup@@SAABUQMetaObject@@XZ @ 47 NONAME ; struct QMetaObject const & CntActionPopup::getStaticMetaObject(void) - ?next@CntViewNavigator@@QAEXABHAAV?$QFlags@W4ViewSwitchFlag@Hb@@@@@Z @ 48 NONAME ; void CntViewNavigator::next(int const &, class QFlags &) - ?createView@CntDefaultViewFactory@@UAEPAVCntAbstractView@@H@Z @ 49 NONAME ; class CntAbstractView * CntDefaultViewFactory::createView(int) - ?qt_metacast@CntEditView@@UAEPAXPBD@Z @ 50 NONAME ; void * CntEditView::qt_metacast(char const *) - ?contactRemoved@CntEditView@@IAEX_N@Z @ 51 NONAME ; void CntEditView::contactRemoved(bool) - ?d_func@CntActionPopup@@ABEPBVCntActionPopupPrivate@@XZ @ 52 NONAME ; class CntActionPopupPrivate const * CntActionPopup::d_func(void) const - ?trUtf8@CntContactCardView@@SA?AVQString@@PBD0@Z @ 53 NONAME ; class QString CntContactCardView::trUtf8(char const *, char const *) - ?metaObject@CntActionPopup@@UBEPBUQMetaObject@@XZ @ 54 NONAME ; struct QMetaObject const * CntActionPopup::metaObject(void) const - ?staticMetaObject@CntDefaultViewManager@@2UQMetaObject@@B @ 55 NONAME ; struct QMetaObject const CntDefaultViewManager::staticMetaObject - ?removeException@CntViewNavigator@@QAEXABH@Z @ 56 NONAME ; void CntViewNavigator::removeException(int const &) - ?trUtf8@CntViewNavigator@@SA?AVQString@@PBD0@Z @ 57 NONAME ; class QString CntViewNavigator::trUtf8(char const *, char const *) - ?metaObject@CntMainWindow@@UBEPBUQMetaObject@@XZ @ 58 NONAME ; struct QMetaObject const * CntMainWindow::metaObject(void) const - ??_ECntMainWindow@@UAE@I@Z @ 59 NONAME ; CntMainWindow::~CntMainWindow(unsigned int) - ?metaObject@CntDefaultViewManager@@UBEPBUQMetaObject@@XZ @ 60 NONAME ; struct QMetaObject const * CntDefaultViewManager::metaObject(void) const - ?back@CntViewNavigator@@QAEABHAAV?$QFlags@W4ViewSwitchFlag@Hb@@@@@Z @ 61 NONAME ; int const & CntViewNavigator::back(class QFlags &) - ?changeView@CntDefaultViewManager@@UAEXV?$QMap@HVQVariant@@@@@Z @ 62 NONAME ; void CntDefaultViewManager::changeView(class QMap) - ??_ECntContactCardView@@UAE@I@Z @ 63 NONAME ; CntContactCardView::~CntContactCardView(unsigned int) - ?staticMetaObject@CntViewNavigator@@2UQMetaObject@@B @ 64 NONAME ; struct QMetaObject const CntViewNavigator::staticMetaObject - ?qt_metacall@CntContactCardView@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 65 NONAME ; int CntContactCardView::qt_metacall(enum QMetaObject::Call, int, void * *) - ?qt_metacall@CntMainWindow@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 66 NONAME ; int CntMainWindow::qt_metacall(enum QMetaObject::Call, int, void * *) - ?trUtf8@CntMainWindow@@SA?AVQString@@PBD0@Z @ 67 NONAME ; class QString CntMainWindow::trUtf8(char const *, char const *) - ?staticMetaObject@CntMainWindow@@2UQMetaObject@@B @ 68 NONAME ; struct QMetaObject const CntMainWindow::staticMetaObject - ??1CntContactCardView@@UAE@XZ @ 69 NONAME ; CntContactCardView::~CntContactCardView(void) - ?isDefault@CntContactCardView@@UBE_NXZ @ 70 NONAME ; bool CntContactCardView::isDefault(void) const - ?qt_metacall@CntActionPopup@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 71 NONAME ; int CntActionPopup::qt_metacall(enum QMetaObject::Call, int, void * *) - ??0CntBaseSelectionView@@QAE@XZ @ 72 NONAME ; CntBaseSelectionView::CntBaseSelectionView(void) - ??0CntMainWindow@@QAE@PAVQWidget@@H@Z @ 73 NONAME ; CntMainWindow::CntMainWindow(class QWidget *, int) - ??1CntActionPopup@@UAE@XZ @ 74 NONAME ; CntActionPopup::~CntActionPopup(void) - ?viewId@CntContactCardView@@UBEHXZ @ 75 NONAME ; int CntContactCardView::viewId(void) const - ?removeEffect@CntViewNavigator@@QAEXABH@Z @ 76 NONAME ; void CntViewNavigator::removeEffect(int const &) - ?getStaticMetaObject@CntContactCardView@@SAABUQMetaObject@@XZ @ 77 NONAME ; struct QMetaObject const & CntContactCardView::getStaticMetaObject(void) - ?back@CntDefaultViewManager@@UAEXV?$QMap@HVQVariant@@@@@Z @ 78 NONAME ; void CntDefaultViewManager::back(class QMap) - ?activate@CntContactCardView@@UAEXPAVCntAbstractViewManager@@V?$QMap@HVQVariant@@@@@Z @ 79 NONAME ; void CntContactCardView::activate(class CntAbstractViewManager *, class QMap) - ?staticMetaObject@CntActionPopup@@2UQMetaObject@@B @ 80 NONAME ; struct QMetaObject const CntActionPopup::staticMetaObject - ?staticMetaObject@CntEditView@@2UQMetaObject@@B @ 81 NONAME ; struct QMetaObject const CntEditView::staticMetaObject - ?viewOpened@CntBaseSelectionView@@IAEXPAVCntAbstractViewManager@@V?$QMap@HVQVariant@@@@@Z @ 82 NONAME ; void CntBaseSelectionView::viewOpened(class CntAbstractViewManager *, class QMap) - ?isDefault@CntEditView@@UBE_NXZ @ 83 NONAME ; bool CntEditView::isDefault(void) const - ??_ECntViewNavigator@@UAE@I@Z @ 84 NONAME ; CntViewNavigator::~CntViewNavigator(unsigned int) - ?trUtf8@CntContactCardView@@SA?AVQString@@PBD0H@Z @ 85 NONAME ; class QString CntContactCardView::trUtf8(char const *, char const *, int) - ?addException@CntViewNavigator@@QAEXABH0@Z @ 86 NONAME ; void CntViewNavigator::addException(int const &, int const &) - ?closeApp@CntDefaultViewManager@@MAEXXZ @ 87 NONAME ; void CntDefaultViewManager::closeApp(void) - ?deactivate@CntBaseSelectionView@@UAEXXZ @ 88 NONAME ; void CntBaseSelectionView::deactivate(void) - ?d_func@CntEditView@@ABEPBVCntEditViewPrivate@@XZ @ 89 NONAME ; class CntEditViewPrivate const * CntEditView::d_func(void) const - ?setViewFactory@CntDefaultViewManager@@QAEXPAVCntAbstractViewFactory@@@Z @ 90 NONAME ; void CntDefaultViewManager::setViewFactory(class CntAbstractViewFactory *) - ?getStaticMetaObject@CntViewNavigator@@SAABUQMetaObject@@XZ @ 91 NONAME ; struct QMetaObject const & CntViewNavigator::getStaticMetaObject(void) - ?tr@CntViewNavigator@@SA?AVQString@@PBD0@Z @ 92 NONAME ; class QString CntViewNavigator::tr(char const *, char const *) - ?trUtf8@CntActionPopup@@SA?AVQString@@PBD0H@Z @ 93 NONAME ; class QString CntActionPopup::trUtf8(char const *, char const *, int) - ?tr@CntViewNavigator@@SA?AVQString@@PBD0H@Z @ 94 NONAME ; class QString CntViewNavigator::tr(char const *, char const *, int) - ?tr@CntActionPopup@@SA?AVQString@@PBD0H@Z @ 95 NONAME ; class QString CntActionPopup::tr(char const *, char const *, int) - ?qt_metacast@CntDefaultViewManager@@UAEPAXPBD@Z @ 96 NONAME ; void * CntDefaultViewManager::qt_metacast(char const *) - ?qt_metacall@CntDefaultViewManager@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 97 NONAME ; int CntDefaultViewManager::qt_metacall(enum QMetaObject::Call, int, void * *) - ??0CntEditView@@QAE@XZ @ 98 NONAME ; CntEditView::CntEditView(void) - ?qt_metacast@CntViewNavigator@@UAEPAXPBD@Z @ 99 NONAME ; void * CntViewNavigator::qt_metacast(char const *) - ?view@CntContactCardView@@UBEPAVHbView@@XZ @ 100 NONAME ; class HbView * CntContactCardView::view(void) const - ?tr@CntContactCardView@@SA?AVQString@@PBD0H@Z @ 101 NONAME ; class QString CntContactCardView::tr(char const *, char const *, int) - ?tr@CntContactCardView@@SA?AVQString@@PBD0@Z @ 102 NONAME ; class QString CntContactCardView::tr(char const *, char const *) - ?tr@CntEditView@@SA?AVQString@@PBD0@Z @ 103 NONAME ; class QString CntEditView::tr(char const *, char const *) - ?d_func@CntContactCardView@@AAEPAVCntContactCardViewPrivate@@XZ @ 104 NONAME ; class CntContactCardViewPrivate * CntContactCardView::d_func(void) - ?metaObject@CntViewNavigator@@UBEPBUQMetaObject@@XZ @ 105 NONAME ; struct QMetaObject const * CntViewNavigator::metaObject(void) const - ?staticMetaObject@CntContactCardView@@2UQMetaObject@@B @ 106 NONAME ; struct QMetaObject const CntContactCardView::staticMetaObject - ?tr@CntBaseSelectionView@@SA?AVQString@@PBD0@Z @ 107 NONAME ; class QString CntBaseSelectionView::tr(char const *, char const *) - ?trUtf8@CntBaseSelectionView@@SA?AVQString@@PBD0@Z @ 108 NONAME ; class QString CntBaseSelectionView::trUtf8(char const *, char const *) - ?switchView@CntDefaultViewManager@@AAEXV?$QMap@HVQVariant@@@@V?$QFlags@W4ViewSwitchFlag@Hb@@@@@Z @ 109 NONAME ; void CntDefaultViewManager::switchView(class QMap, class QFlags) - ?deactivate@CntEditView@@UAEXXZ @ 110 NONAME ; void CntEditView::deactivate(void) - ?contactManager@CntDefaultViewManager@@UAEPAVQContactManager@QtMobility@@ABVQString@@@Z @ 111 NONAME ; class QtMobility::QContactManager * CntDefaultViewManager::contactManager(class QString const &) - ?addEffect@CntViewNavigator@@QAEXABH0@Z @ 112 NONAME ; void CntViewNavigator::addEffect(int const &, int const &) - ??_ECntActionPopup@@UAE@I@Z @ 113 NONAME ; CntActionPopup::~CntActionPopup(unsigned int) - ?d_func@CntActionPopup@@AAEPAVCntActionPopupPrivate@@XZ @ 114 NONAME ; class CntActionPopupPrivate * CntActionPopup::d_func(void) - ?metaObject@CntEditView@@UBEPBUQMetaObject@@XZ @ 115 NONAME ; struct QMetaObject const * CntEditView::metaObject(void) const - ?contactUpdated@CntEditView@@IAEXH@Z @ 116 NONAME ; void CntEditView::contactUpdated(int) - ??1CntDefaultViewManager@@UAE@XZ @ 117 NONAME ; CntDefaultViewManager::~CntDefaultViewManager(void) - ??0CntContactCardView@@QAE@XZ @ 118 NONAME ; CntContactCardView::CntContactCardView(void) - ?deactivate@CntContactCardView@@UAEXXZ @ 119 NONAME ; void CntContactCardView::deactivate(void) - ?getStaticMetaObject@CntDefaultViewManager@@SAABUQMetaObject@@XZ @ 120 NONAME ; struct QMetaObject const & CntDefaultViewManager::getStaticMetaObject(void) - ?trUtf8@CntViewNavigator@@SA?AVQString@@PBD0H@Z @ 121 NONAME ; class QString CntViewNavigator::trUtf8(char const *, char const *, int) - ?qt_metacall@CntEditView@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 122 NONAME ; int CntEditView::qt_metacall(enum QMetaObject::Call, int, void * *) - ?tr@CntEditView@@SA?AVQString@@PBD0H@Z @ 123 NONAME ; class QString CntEditView::tr(char const *, char const *, int) - ?getStaticMetaObject@CntEditView@@SAABUQMetaObject@@XZ @ 124 NONAME ; struct QMetaObject const & CntEditView::getStaticMetaObject(void) - ??1CntViewNavigator@@UAE@XZ @ 125 NONAME ; CntViewNavigator::~CntViewNavigator(void) - ?qt_metacast@CntMainWindow@@UAEPAXPBD@Z @ 126 NONAME ; void * CntMainWindow::qt_metacast(char const *) - ?trUtf8@CntEditView@@SA?AVQString@@PBD0@Z @ 127 NONAME ; class QString CntEditView::trUtf8(char const *, char const *) - ?isDefault@CntBaseSelectionView@@UBE_NXZ @ 128 NONAME ; bool CntBaseSelectionView::isDefault(void) const - ??1CntBaseSelectionView@@UAE@XZ @ 129 NONAME ; CntBaseSelectionView::~CntBaseSelectionView(void) - ?tr@CntMainWindow@@SA?AVQString@@PBD0H@Z @ 130 NONAME ; class QString CntMainWindow::tr(char const *, char const *, int) - ?createPluginView@CntDefaultViewFactory@@AAEPAVCntAbstractView@@H@Z @ 131 NONAME ; class CntAbstractView * CntDefaultViewFactory::createPluginView(int) - ??_ECntEditView@@UAE@I@Z @ 132 NONAME ; CntEditView::~CntEditView(unsigned int) - ??0CntActionPopup@@QAE@PAVQContact@QtMobility@@@Z @ 133 NONAME ; CntActionPopup::CntActionPopup(class QtMobility::QContact *) - ?executeContactAction@CntActionPopup@@IAEXAAVQContact@QtMobility@@VQContactDetail@3@VQString@@@Z @ 134 NONAME ; void CntActionPopup::executeContactAction(class QtMobility::QContact &, class QtMobility::QContactDetail, class QString) - ?getStaticMetaObject@CntMainWindow@@SAABUQMetaObject@@XZ @ 135 NONAME ; struct QMetaObject const & CntMainWindow::getStaticMetaObject(void) - ?tr@CntDefaultViewManager@@SA?AVQString@@PBD0@Z @ 136 NONAME ; class QString CntDefaultViewManager::tr(char const *, char const *) - ?removeCurrentView@CntDefaultViewManager@@AAEXXZ @ 137 NONAME ; void CntDefaultViewManager::removeCurrentView(void) - ?actionPopupCancelPressed@CntActionPopup@@IAEXXZ @ 138 NONAME ; void CntActionPopup::actionPopupCancelPressed(void) + ??_ECntDefaultViewManager@@UAE@I@Z @ 15 NONAME ; CntDefaultViewManager::~CntDefaultViewManager(unsigned int) + ??_ECntBaseSelectionView@@UAE@I@Z @ 16 NONAME ; CntBaseSelectionView::~CntBaseSelectionView(unsigned int) + ?view@CntBaseSelectionView@@UBEPAVHbView@@XZ @ 17 NONAME ; class HbView * CntBaseSelectionView::view(void) const + ??1CntDefaultViewFactory@@UAE@XZ @ 18 NONAME ; CntDefaultViewFactory::~CntDefaultViewFactory(void) + ??_ECntDefaultViewFactory@@UAE@I@Z @ 19 NONAME ; CntDefaultViewFactory::~CntDefaultViewFactory(unsigned int) + ?trUtf8@CntDefaultViewManager@@SA?AVQString@@PBD0H@Z @ 20 NONAME ; class QString CntDefaultViewManager::trUtf8(char const *, char const *, int) + ?qt_metacast@CntActionPopup@@UAEPAXPBD@Z @ 21 NONAME ; void * CntActionPopup::qt_metacast(char const *) + ?deleteOldView@CntDefaultViewManager@@AAEXXZ @ 22 NONAME ; void CntDefaultViewManager::deleteOldView(void) + ?trUtf8@CntMainWindow@@SA?AVQString@@PBD0H@Z @ 23 NONAME ; class QString CntMainWindow::trUtf8(char const *, char const *, int) + ?trUtf8@CntEditView@@SA?AVQString@@PBD0H@Z @ 24 NONAME ; class QString CntEditView::trUtf8(char const *, char const *, int) + ??1CntEditView@@UAE@XZ @ 25 NONAME ; CntEditView::~CntEditView(void) + ?qt_metacast@CntBaseSelectionView@@UAEPAXPBD@Z @ 26 NONAME ; void * CntBaseSelectionView::qt_metacast(char const *) + ?metaObject@CntBaseSelectionView@@UBEPBUQMetaObject@@XZ @ 27 NONAME ; struct QMetaObject const * CntBaseSelectionView::metaObject(void) const + ?back@CntDefaultViewManager@@UAEXV?$QMap@HVQVariant@@@@_N@Z @ 28 NONAME ; void CntDefaultViewManager::back(class QMap, bool) + ??0CntKeyGrabber@@QAE@PAVHbMainWindow@@PAVQObject@@@Z @ 29 NONAME ; CntKeyGrabber::CntKeyGrabber(class HbMainWindow *, class QObject *) + ?backPressed@CntContactCardView@@IAEXXZ @ 30 NONAME ; void CntContactCardView::backPressed(void) + ?qt_metacall@CntViewNavigator@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 31 NONAME ; int CntViewNavigator::qt_metacall(enum QMetaObject::Call, int, void * *) + ?activate@CntBaseSelectionView@@UAEXPAVCntAbstractViewManager@@V?$QMap@HVQVariant@@@@@Z @ 32 NONAME ; void CntBaseSelectionView::activate(class CntAbstractViewManager *, class QMap) + ?tr@CntKeyGrabber@@SA?AVQString@@PBD0H@Z @ 33 NONAME ; class QString CntKeyGrabber::tr(char const *, char const *, int) + ?tr@CntDefaultViewManager@@SA?AVQString@@PBD0H@Z @ 34 NONAME ; class QString CntDefaultViewManager::tr(char const *, char const *, int) + ?viewId@CntEditView@@UBEHXZ @ 35 NONAME ; int CntEditView::viewId(void) const + ?qt_metacast@CntContactCardView@@UAEPAXPBD@Z @ 36 NONAME ; void * CntContactCardView::qt_metacast(char const *) + ?activate@CntEditView@@UAEXPAVCntAbstractViewManager@@V?$QMap@HVQVariant@@@@@Z @ 37 NONAME ; void CntEditView::activate(class CntAbstractViewManager *, class QMap) + ?viewClosed@CntBaseSelectionView@@IAEXXZ @ 38 NONAME ; void CntBaseSelectionView::viewClosed(void) + ??1CntKeyGrabber@@UAE@XZ @ 39 NONAME ; CntKeyGrabber::~CntKeyGrabber(void) + ?showActionPopup@CntActionPopup@@QAE_NVQString@@@Z @ 40 NONAME ; bool CntActionPopup::showActionPopup(class QString) + ?trUtf8@CntActionPopup@@SA?AVQString@@PBD0@Z @ 41 NONAME ; class QString CntActionPopup::trUtf8(char const *, char const *) + ?tr@CntBaseSelectionView@@SA?AVQString@@PBD0H@Z @ 42 NONAME ; class QString CntBaseSelectionView::tr(char const *, char const *, int) + ?metaObject@CntContactCardView@@UBEPBUQMetaObject@@XZ @ 43 NONAME ; struct QMetaObject const * CntContactCardView::metaObject(void) const + ??0CntViewNavigator@@QAE@PAVQObject@@@Z @ 44 NONAME ; CntViewNavigator::CntViewNavigator(class QObject *) + ?d_func@CntContactCardView@@ABEPBVCntContactCardViewPrivate@@XZ @ 45 NONAME ; class CntContactCardViewPrivate const * CntContactCardView::d_func(void) const + ?trUtf8@CntBaseSelectionView@@SA?AVQString@@PBD0H@Z @ 46 NONAME ; class QString CntBaseSelectionView::trUtf8(char const *, char const *, int) + ?getStaticMetaObject@CntBaseSelectionView@@SAABUQMetaObject@@XZ @ 47 NONAME ; struct QMetaObject const & CntBaseSelectionView::getStaticMetaObject(void) + ??0CntDefaultViewManager@@QAE@PAVHbMainWindow@@@Z @ 48 NONAME ; CntDefaultViewManager::CntDefaultViewManager(class HbMainWindow *) + ?actionPopupCancelPressed@CntActionPopup@@IAEXXZ @ 49 NONAME ; void CntActionPopup::actionPopupCancelPressed(void) + ?getStaticMetaObject@CntActionPopup@@SAABUQMetaObject@@XZ @ 50 NONAME ; struct QMetaObject const & CntActionPopup::getStaticMetaObject(void) + ?next@CntViewNavigator@@QAEXABHAAV?$QFlags@W4ViewSwitchFlag@Hb@@@@@Z @ 51 NONAME ; void CntViewNavigator::next(int const &, class QFlags &) + ?createView@CntDefaultViewFactory@@UAEPAVCntAbstractView@@H@Z @ 52 NONAME ; class CntAbstractView * CntDefaultViewFactory::createView(int) + ?qt_metacast@CntEditView@@UAEPAXPBD@Z @ 53 NONAME ; void * CntEditView::qt_metacast(char const *) + ??0CntContactCardView@@QAE@_N@Z @ 54 NONAME ; CntContactCardView::CntContactCardView(bool) + ?contactRemoved@CntEditView@@IAEX_N@Z @ 55 NONAME ; void CntEditView::contactRemoved(bool) + ?d_func@CntActionPopup@@ABEPBVCntActionPopupPrivate@@XZ @ 56 NONAME ; class CntActionPopupPrivate const * CntActionPopup::d_func(void) const + ?trUtf8@CntContactCardView@@SA?AVQString@@PBD0@Z @ 57 NONAME ; class QString CntContactCardView::trUtf8(char const *, char const *) + ?metaObject@CntActionPopup@@UBEPBUQMetaObject@@XZ @ 58 NONAME ; struct QMetaObject const * CntActionPopup::metaObject(void) const + ?staticMetaObject@CntDefaultViewManager@@2UQMetaObject@@B @ 59 NONAME ; struct QMetaObject const CntDefaultViewManager::staticMetaObject + ?removeException@CntViewNavigator@@QAEXABH@Z @ 60 NONAME ; void CntViewNavigator::removeException(int const &) + ?trUtf8@CntViewNavigator@@SA?AVQString@@PBD0@Z @ 61 NONAME ; class QString CntViewNavigator::trUtf8(char const *, char const *) + ?getStaticMetaObject@CntKeyGrabber@@SAABUQMetaObject@@XZ @ 62 NONAME ; struct QMetaObject const & CntKeyGrabber::getStaticMetaObject(void) + ?metaObject@CntMainWindow@@UBEPBUQMetaObject@@XZ @ 63 NONAME ; struct QMetaObject const * CntMainWindow::metaObject(void) const + ??_ECntMainWindow@@UAE@I@Z @ 64 NONAME ; CntMainWindow::~CntMainWindow(unsigned int) + ?metaObject@CntDefaultViewManager@@UBEPBUQMetaObject@@XZ @ 65 NONAME ; struct QMetaObject const * CntDefaultViewManager::metaObject(void) const + ?changeView@CntDefaultViewManager@@UAEXV?$QMap@HVQVariant@@@@@Z @ 66 NONAME ; void CntDefaultViewManager::changeView(class QMap) + ??_ECntContactCardView@@UAE@I@Z @ 67 NONAME ; CntContactCardView::~CntContactCardView(unsigned int) + ?staticMetaObject@CntViewNavigator@@2UQMetaObject@@B @ 68 NONAME ; struct QMetaObject const CntViewNavigator::staticMetaObject + ?qt_metacall@CntContactCardView@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 69 NONAME ; int CntContactCardView::qt_metacall(enum QMetaObject::Call, int, void * *) + ?qt_metacall@CntMainWindow@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 70 NONAME ; int CntMainWindow::qt_metacall(enum QMetaObject::Call, int, void * *) + ?trUtf8@CntMainWindow@@SA?AVQString@@PBD0@Z @ 71 NONAME ; class QString CntMainWindow::trUtf8(char const *, char const *) + ?trUtf8@CntKeyGrabber@@SA?AVQString@@PBD0H@Z @ 72 NONAME ; class QString CntKeyGrabber::trUtf8(char const *, char const *, int) + ?staticMetaObject@CntMainWindow@@2UQMetaObject@@B @ 73 NONAME ; struct QMetaObject const CntMainWindow::staticMetaObject + ?isDefault@CntContactCardView@@UBE_NXZ @ 74 NONAME ; bool CntContactCardView::isDefault(void) const + ??1CntContactCardView@@UAE@XZ @ 75 NONAME ; CntContactCardView::~CntContactCardView(void) + ?qt_metacall@CntActionPopup@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 76 NONAME ; int CntActionPopup::qt_metacall(enum QMetaObject::Call, int, void * *) + ??0CntBaseSelectionView@@QAE@XZ @ 77 NONAME ; CntBaseSelectionView::CntBaseSelectionView(void) + ?tr@CntKeyGrabber@@SA?AVQString@@PBD0@Z @ 78 NONAME ; class QString CntKeyGrabber::tr(char const *, char const *) + ??0CntMainWindow@@QAE@PAVQWidget@@H@Z @ 79 NONAME ; CntMainWindow::CntMainWindow(class QWidget *, int) + ??1CntActionPopup@@UAE@XZ @ 80 NONAME ; CntActionPopup::~CntActionPopup(void) + ?viewId@CntContactCardView@@UBEHXZ @ 81 NONAME ; int CntContactCardView::viewId(void) const + ?removeEffect@CntViewNavigator@@QAEXABH@Z @ 82 NONAME ; void CntViewNavigator::removeEffect(int const &) + ?getStaticMetaObject@CntContactCardView@@SAABUQMetaObject@@XZ @ 83 NONAME ; struct QMetaObject const & CntContactCardView::getStaticMetaObject(void) + ?activate@CntContactCardView@@UAEXPAVCntAbstractViewManager@@V?$QMap@HVQVariant@@@@@Z @ 84 NONAME ; void CntContactCardView::activate(class CntAbstractViewManager *, class QMap) + ?staticMetaObject@CntActionPopup@@2UQMetaObject@@B @ 85 NONAME ; struct QMetaObject const CntActionPopup::staticMetaObject + ?staticMetaObject@CntEditView@@2UQMetaObject@@B @ 86 NONAME ; struct QMetaObject const CntEditView::staticMetaObject + ?staticMetaObject@CntKeyGrabber@@2UQMetaObject@@B @ 87 NONAME ; struct QMetaObject const CntKeyGrabber::staticMetaObject + ?viewOpened@CntBaseSelectionView@@IAEXPAVCntAbstractViewManager@@V?$QMap@HVQVariant@@@@@Z @ 88 NONAME ; void CntBaseSelectionView::viewOpened(class CntAbstractViewManager *, class QMap) + ?isDefault@CntEditView@@UBE_NXZ @ 89 NONAME ; bool CntEditView::isDefault(void) const + ?qt_metacall@CntKeyGrabber@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 90 NONAME ; int CntKeyGrabber::qt_metacall(enum QMetaObject::Call, int, void * *) + ??_ECntViewNavigator@@UAE@I@Z @ 91 NONAME ; CntViewNavigator::~CntViewNavigator(unsigned int) + ?trUtf8@CntContactCardView@@SA?AVQString@@PBD0H@Z @ 92 NONAME ; class QString CntContactCardView::trUtf8(char const *, char const *, int) + ?metaObject@CntKeyGrabber@@UBEPBUQMetaObject@@XZ @ 93 NONAME ; struct QMetaObject const * CntKeyGrabber::metaObject(void) const + ?addException@CntViewNavigator@@QAEXABH0@Z @ 94 NONAME ; void CntViewNavigator::addException(int const &, int const &) + ?closeApp@CntDefaultViewManager@@MAEXXZ @ 95 NONAME ; void CntDefaultViewManager::closeApp(void) + ??_ECntKeyGrabber@@UAE@I@Z @ 96 NONAME ; CntKeyGrabber::~CntKeyGrabber(unsigned int) + ?deactivate@CntBaseSelectionView@@UAEXXZ @ 97 NONAME ; void CntBaseSelectionView::deactivate(void) + ?d_func@CntEditView@@ABEPBVCntEditViewPrivate@@XZ @ 98 NONAME ; class CntEditViewPrivate const * CntEditView::d_func(void) const + ?setViewFactory@CntDefaultViewManager@@QAEXPAVCntAbstractViewFactory@@@Z @ 99 NONAME ; void CntDefaultViewManager::setViewFactory(class CntAbstractViewFactory *) + ?getStaticMetaObject@CntViewNavigator@@SAABUQMetaObject@@XZ @ 100 NONAME ; struct QMetaObject const & CntViewNavigator::getStaticMetaObject(void) + ?tr@CntViewNavigator@@SA?AVQString@@PBD0@Z @ 101 NONAME ; class QString CntViewNavigator::tr(char const *, char const *) + ?trUtf8@CntActionPopup@@SA?AVQString@@PBD0H@Z @ 102 NONAME ; class QString CntActionPopup::trUtf8(char const *, char const *, int) + ?tr@CntViewNavigator@@SA?AVQString@@PBD0H@Z @ 103 NONAME ; class QString CntViewNavigator::tr(char const *, char const *, int) + ?tr@CntActionPopup@@SA?AVQString@@PBD0H@Z @ 104 NONAME ; class QString CntActionPopup::tr(char const *, char const *, int) + ?qt_metacast@CntDefaultViewManager@@UAEPAXPBD@Z @ 105 NONAME ; void * CntDefaultViewManager::qt_metacast(char const *) + ?qt_metacall@CntDefaultViewManager@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 106 NONAME ; int CntDefaultViewManager::qt_metacall(enum QMetaObject::Call, int, void * *) + ??0CntEditView@@QAE@XZ @ 107 NONAME ; CntEditView::CntEditView(void) + ?qt_metacast@CntViewNavigator@@UAEPAXPBD@Z @ 108 NONAME ; void * CntViewNavigator::qt_metacast(char const *) + ?view@CntContactCardView@@UBEPAVHbView@@XZ @ 109 NONAME ; class HbView * CntContactCardView::view(void) const + ?addToContacts@CntContactCardView@@IAEXXZ @ 110 NONAME ; void CntContactCardView::addToContacts(void) + ?tr@CntContactCardView@@SA?AVQString@@PBD0H@Z @ 111 NONAME ; class QString CntContactCardView::tr(char const *, char const *, int) + ?addRoot@CntViewNavigator@@QAEXABH@Z @ 112 NONAME ; void CntViewNavigator::addRoot(int const &) + ?tr@CntContactCardView@@SA?AVQString@@PBD0@Z @ 113 NONAME ; class QString CntContactCardView::tr(char const *, char const *) + ?tr@CntEditView@@SA?AVQString@@PBD0@Z @ 114 NONAME ; class QString CntEditView::tr(char const *, char const *) + ?d_func@CntContactCardView@@AAEPAVCntContactCardViewPrivate@@XZ @ 115 NONAME ; class CntContactCardViewPrivate * CntContactCardView::d_func(void) + ?metaObject@CntViewNavigator@@UBEPBUQMetaObject@@XZ @ 116 NONAME ; struct QMetaObject const * CntViewNavigator::metaObject(void) const + ?staticMetaObject@CntContactCardView@@2UQMetaObject@@B @ 117 NONAME ; struct QMetaObject const CntContactCardView::staticMetaObject + ?tr@CntBaseSelectionView@@SA?AVQString@@PBD0@Z @ 118 NONAME ; class QString CntBaseSelectionView::tr(char const *, char const *) + ?trUtf8@CntBaseSelectionView@@SA?AVQString@@PBD0@Z @ 119 NONAME ; class QString CntBaseSelectionView::trUtf8(char const *, char const *) + ?trUtf8@CntKeyGrabber@@SA?AVQString@@PBD0@Z @ 120 NONAME ; class QString CntKeyGrabber::trUtf8(char const *, char const *) + ?switchView@CntDefaultViewManager@@AAEXV?$QMap@HVQVariant@@@@V?$QFlags@W4ViewSwitchFlag@Hb@@@@@Z @ 121 NONAME ; void CntDefaultViewManager::switchView(class QMap, class QFlags) + ?deactivate@CntEditView@@UAEXXZ @ 122 NONAME ; void CntEditView::deactivate(void) + ?contactManager@CntDefaultViewManager@@UAEPAVQContactManager@QtMobility@@ABVQString@@@Z @ 123 NONAME ; class QtMobility::QContactManager * CntDefaultViewManager::contactManager(class QString const &) + ?addEffect@CntViewNavigator@@QAEXABH0@Z @ 124 NONAME ; void CntViewNavigator::addEffect(int const &, int const &) + ??_ECntActionPopup@@UAE@I@Z @ 125 NONAME ; CntActionPopup::~CntActionPopup(unsigned int) + ?d_func@CntActionPopup@@AAEPAVCntActionPopupPrivate@@XZ @ 126 NONAME ; class CntActionPopupPrivate * CntActionPopup::d_func(void) + ?metaObject@CntEditView@@UBEPBUQMetaObject@@XZ @ 127 NONAME ; struct QMetaObject const * CntEditView::metaObject(void) const + ?contactUpdated@CntEditView@@IAEXH@Z @ 128 NONAME ; void CntEditView::contactUpdated(int) + ??1CntDefaultViewManager@@UAE@XZ @ 129 NONAME ; CntDefaultViewManager::~CntDefaultViewManager(void) + ?deactivate@CntContactCardView@@UAEXXZ @ 130 NONAME ; void CntContactCardView::deactivate(void) + ?getStaticMetaObject@CntDefaultViewManager@@SAABUQMetaObject@@XZ @ 131 NONAME ; struct QMetaObject const & CntDefaultViewManager::getStaticMetaObject(void) + ?trUtf8@CntViewNavigator@@SA?AVQString@@PBD0H@Z @ 132 NONAME ; class QString CntViewNavigator::trUtf8(char const *, char const *, int) + ?qt_metacall@CntEditView@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 133 NONAME ; int CntEditView::qt_metacall(enum QMetaObject::Call, int, void * *) + ?tr@CntEditView@@SA?AVQString@@PBD0H@Z @ 134 NONAME ; class QString CntEditView::tr(char const *, char const *, int) + ?getStaticMetaObject@CntEditView@@SAABUQMetaObject@@XZ @ 135 NONAME ; struct QMetaObject const & CntEditView::getStaticMetaObject(void) + ?trUtf8@CntEditView@@SA?AVQString@@PBD0@Z @ 136 NONAME ; class QString CntEditView::trUtf8(char const *, char const *) + ??1CntViewNavigator@@UAE@XZ @ 137 NONAME ; CntViewNavigator::~CntViewNavigator(void) + ?qt_metacast@CntMainWindow@@UAEPAXPBD@Z @ 138 NONAME ; void * CntMainWindow::qt_metacast(char const *) + ?isDefault@CntBaseSelectionView@@UBE_NXZ @ 139 NONAME ; bool CntBaseSelectionView::isDefault(void) const + ?back@CntViewNavigator@@QAEABHAAV?$QFlags@W4ViewSwitchFlag@Hb@@@@_N@Z @ 140 NONAME ; int const & CntViewNavigator::back(class QFlags &, bool) + ??1CntBaseSelectionView@@UAE@XZ @ 141 NONAME ; CntBaseSelectionView::~CntBaseSelectionView(void) + ?tr@CntMainWindow@@SA?AVQString@@PBD0H@Z @ 142 NONAME ; class QString CntMainWindow::tr(char const *, char const *, int) + ?createPluginView@CntDefaultViewFactory@@AAEPAVCntAbstractView@@H@Z @ 143 NONAME ; class CntAbstractView * CntDefaultViewFactory::createPluginView(int) + ??_ECntEditView@@UAE@I@Z @ 144 NONAME ; CntEditView::~CntEditView(unsigned int) + ??0CntActionPopup@@QAE@PAVQContact@QtMobility@@@Z @ 145 NONAME ; CntActionPopup::CntActionPopup(class QtMobility::QContact *) + ?executeContactAction@CntActionPopup@@IAEXAAVQContact@QtMobility@@VQContactDetail@3@VQString@@@Z @ 146 NONAME ; void CntActionPopup::executeContactAction(class QtMobility::QContact &, class QtMobility::QContactDetail, class QString) + ?getStaticMetaObject@CntMainWindow@@SAABUQMetaObject@@XZ @ 147 NONAME ; struct QMetaObject const & CntMainWindow::getStaticMetaObject(void) + ?eventFilter@CntKeyGrabber@@MAE_NPAVQObject@@PAVQEvent@@@Z @ 148 NONAME ; bool CntKeyGrabber::eventFilter(class QObject *, class QEvent *) + ?qt_metacast@CntKeyGrabber@@UAEPAXPBD@Z @ 149 NONAME ; void * CntKeyGrabber::qt_metacast(char const *) + ?tr@CntDefaultViewManager@@SA?AVQString@@PBD0@Z @ 150 NONAME ; class QString CntDefaultViewManager::tr(char const *, char const *) + ?removeCurrentView@CntDefaultViewManager@@AAEXXZ @ 151 NONAME ; void CntDefaultViewManager::removeCurrentView(void) + ?trUtf8@CntGroupMemberView@@SA?AVQString@@PBD0H@Z @ 152 NONAME ; class QString CntGroupMemberView::trUtf8(char const *, char const *, int) + ?d_func@CntGroupMemberView@@AAEPAVCntGroupMemberViewPrivate@@XZ @ 153 NONAME ; class CntGroupMemberViewPrivate * CntGroupMemberView::d_func(void) + ?view@CntGroupMemberView@@UBEPAVHbView@@XZ @ 154 NONAME ; class HbView * CntGroupMemberView::view(void) const + ?staticMetaObject@CntGroupMemberView@@2UQMetaObject@@B @ 155 NONAME ; struct QMetaObject const CntGroupMemberView::staticMetaObject + ??1CntGroupMemberView@@UAE@XZ @ 156 NONAME ; CntGroupMemberView::~CntGroupMemberView(void) + ?tr@CntGroupMemberView@@SA?AVQString@@PBD0H@Z @ 157 NONAME ; class QString CntGroupMemberView::tr(char const *, char const *, int) + ?activate@CntGroupMemberView@@UAEXPAVCntAbstractViewManager@@V?$QMap@HVQVariant@@@@@Z @ 158 NONAME ; void CntGroupMemberView::activate(class CntAbstractViewManager *, class QMap) + ??_ECntGroupMemberView@@UAE@I@Z @ 159 NONAME ; CntGroupMemberView::~CntGroupMemberView(unsigned int) + ?viewId@CntGroupMemberView@@UBEHXZ @ 160 NONAME ; int CntGroupMemberView::viewId(void) const + ?isDefault@CntGroupMemberView@@UBE_NXZ @ 161 NONAME ; bool CntGroupMemberView::isDefault(void) const + ?qt_metacast@CntGroupMemberView@@UAEPAXPBD@Z @ 162 NONAME ; void * CntGroupMemberView::qt_metacast(char const *) + ?trUtf8@CntGroupMemberView@@SA?AVQString@@PBD0@Z @ 163 NONAME ; class QString CntGroupMemberView::trUtf8(char const *, char const *) + ?d_func@CntGroupMemberView@@ABEPBVCntGroupMemberViewPrivate@@XZ @ 164 NONAME ; class CntGroupMemberViewPrivate const * CntGroupMemberView::d_func(void) const + ?getStaticMetaObject@CntGroupMemberView@@SAABUQMetaObject@@XZ @ 165 NONAME ; struct QMetaObject const & CntGroupMemberView::getStaticMetaObject(void) + ??0CntGroupMemberView@@QAE@XZ @ 166 NONAME ; CntGroupMemberView::CntGroupMemberView(void) + ?deactivate@CntGroupMemberView@@UAEXXZ @ 167 NONAME ; void CntGroupMemberView::deactivate(void) + ?qt_metacall@CntGroupMemberView@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 168 NONAME ; int CntGroupMemberView::qt_metacall(enum QMetaObject::Call, int, void * *) + ?metaObject@CntGroupMemberView@@UBEPBUQMetaObject@@XZ @ 169 NONAME ; struct QMetaObject const * CntGroupMemberView::metaObject(void) const + ?tr@CntGroupMemberView@@SA?AVQString@@PBD0@Z @ 170 NONAME ; class QString CntGroupMemberView::tr(char const *, char const *) + ?backPressed@CntGroupMemberView@@IAEXXZ @ 171 NONAME ; void CntGroupMemberView::backPressed(void) diff -r 7cbcb2896f0e -r a642906a277a phonebookui/cnthistorymodel/inc/cnthistorymodelconsts.h --- a/phonebookui/cnthistorymodel/inc/cnthistorymodelconsts.h Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/cnthistorymodel/inc/cnthistorymodelconsts.h Wed Aug 18 09:39:00 2010 +0300 @@ -20,10 +20,8 @@ enum Attributes { CntIncoming = 1, - CntOutgoing = 2, - CntUnseen = 4, - CntSeen = 8, - CntAttachment = 16 + CntUnseen = 2, + CntAttachment = 4 }; enum ItemType diff -r 7cbcb2896f0e -r a642906a277a phonebookui/cnthistorymodel/src/cnthistorymodel_p.cpp --- a/phonebookui/cnthistorymodel/src/cnthistorymodel_p.cpp Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/cnthistorymodel/src/cnthistorymodel_p.cpp Wed Aug 18 09:39:00 2010 +0300 @@ -22,6 +22,7 @@ #include #include "cnthistorymodel_p.h" +#include "cntdebug.h" // Unnamed namespace for helper functions @@ -36,6 +37,33 @@ { return ((*t1).timeStamp < (*t2).timeStamp); } + +#ifdef TRACES +#define LOG_ITEM(i) logItem(i) +#else +#define LOG_ITEM(i) +#endif + + void logItem(const HistoryItem& item) + { + QStringList l; + + l << item.message << item.number << item.timeStamp.toString() << item.title; + l << (item.flags & CntIncoming ? "incoming" : "outgoing"); + l << (item.flags & CntUnseen ? "unseen" : "seen"); + l << (item.flags & CntAttachment ? "attachment" : ""); + l << (item.flags & CntCallLog ? "call" : "message"); + if (item.flags & CntReceivedCall) + l << "recieved"; + else if (item.flags & CntMissedCall) + l << "missed"; + else if (item.flags & CntDialledCall) + l << "dialled"; + + l.removeAll(""); + + qDebug() << l; + } } Q_DECLARE_METATYPE(LogsEvent *) @@ -382,16 +410,20 @@ } } - if ( event->direction() == LogsEvent::DirOut ) - item.flags |= CntOutgoing; - else + if ( event->direction() == LogsEvent::DirMissed + || event->direction() == LogsEvent::DirIn ) { item.flags |= CntIncoming; + } else { + item.flags &= ~CntIncoming; + } item.message = bodyText; item.title = title; item.timeStamp = event->time().toLocalTime(); item.flags |= CntCallLog; item.number = QString(event->number()); + + LOG_ITEM(item); } /*! @@ -604,7 +636,7 @@ else item.flags &= ~CntUnseen; } else if ( event.direction() == MsgItem::MsgDirectionOutgoing ) - item.flags |= CntOutgoing; + item.flags &= ~CntIncoming; // Attachment if (event.isAttributeSet(MsgItem::MsgAttributeAttachment)) @@ -623,6 +655,8 @@ } item.timeStamp = event.timeStamp().toLocalTime(); + + LOG_ITEM(item); } /*! diff -r 7cbcb2896f0e -r a642906a277a phonebookui/eabi/pbkcommonuiu.def --- a/phonebookui/eabi/pbkcommonuiu.def Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/eabi/pbkcommonuiu.def Wed Aug 18 09:39:00 2010 +0300 @@ -13,152 +13,190 @@ _ZN11CntEditViewD0Ev @ 12 NONAME _ZN11CntEditViewD1Ev @ 13 NONAME _ZN11CntEditViewD2Ev @ 14 NONAME - _ZN13CntMainWindow10keyPressedEP9QKeyEvent @ 15 NONAME - _ZN13CntMainWindow11qt_metacallEN11QMetaObject4CallEiPPv @ 16 NONAME - _ZN13CntMainWindow11qt_metacastEPKc @ 17 NONAME - _ZN13CntMainWindow13keyPressEventEP9QKeyEvent @ 18 NONAME - _ZN13CntMainWindow16staticMetaObjectE @ 19 NONAME DATA 16 - _ZN13CntMainWindow19getStaticMetaObjectEv @ 20 NONAME - _ZN13CntMainWindowC1EP7QWidgeti @ 21 NONAME - _ZN13CntMainWindowC2EP7QWidgeti @ 22 NONAME - _ZN13CntMainWindowD0Ev @ 23 NONAME - _ZN13CntMainWindowD1Ev @ 24 NONAME - _ZN13CntMainWindowD2Ev @ 25 NONAME - _ZN14CntActionPopup11qt_metacallEN11QMetaObject4CallEiPPv @ 26 NONAME - _ZN14CntActionPopup11qt_metacastEPKc @ 27 NONAME - _ZN14CntActionPopup15showActionPopupE7QString @ 28 NONAME - _ZN14CntActionPopup16staticMetaObjectE @ 29 NONAME DATA 16 - _ZN14CntActionPopup19getStaticMetaObjectEv @ 30 NONAME - _ZN14CntActionPopup20executeContactActionERN10QtMobility8QContactENS0_14QContactDetailE7QString @ 31 NONAME - _ZN14CntActionPopupC1EPN10QtMobility8QContactE @ 32 NONAME - _ZN14CntActionPopupC2EPN10QtMobility8QContactE @ 33 NONAME - _ZN14CntActionPopupD0Ev @ 34 NONAME - _ZN14CntActionPopupD1Ev @ 35 NONAME - _ZN14CntActionPopupD2Ev @ 36 NONAME - _ZN16CntViewNavigator11qt_metacallEN11QMetaObject4CallEiPPv @ 37 NONAME - _ZN16CntViewNavigator11qt_metacastEPKc @ 38 NONAME - _ZN16CntViewNavigator12addExceptionERKiS1_ @ 39 NONAME - _ZN16CntViewNavigator12removeEffectERKi @ 40 NONAME - _ZN16CntViewNavigator15removeExceptionERKi @ 41 NONAME - _ZN16CntViewNavigator16staticMetaObjectE @ 42 NONAME DATA 16 - _ZN16CntViewNavigator19getStaticMetaObjectEv @ 43 NONAME - _ZN16CntViewNavigator4backER6QFlagsIN2Hb14ViewSwitchFlagEE @ 44 NONAME - _ZN16CntViewNavigator4nextERKiR6QFlagsIN2Hb14ViewSwitchFlagEE @ 45 NONAME - _ZN16CntViewNavigator9addEffectERKiS1_ @ 46 NONAME - _ZN16CntViewNavigatorC1EP7QObject @ 47 NONAME - _ZN16CntViewNavigatorC2EP7QObject @ 48 NONAME - _ZN16CntViewNavigatorD0Ev @ 49 NONAME - _ZN16CntViewNavigatorD1Ev @ 50 NONAME - _ZN16CntViewNavigatorD2Ev @ 51 NONAME - _ZN18CntContactCardView10deactivateEv @ 52 NONAME - _ZN18CntContactCardView11backPressedEv @ 53 NONAME - _ZN18CntContactCardView11qt_metacallEN11QMetaObject4CallEiPPv @ 54 NONAME - _ZN18CntContactCardView11qt_metacastEPKc @ 55 NONAME - _ZN18CntContactCardView13viewActivatedEP22CntAbstractViewManager4QMapIi8QVariantE @ 56 NONAME - _ZN18CntContactCardView16staticMetaObjectE @ 57 NONAME DATA 16 - _ZN18CntContactCardView19getStaticMetaObjectEv @ 58 NONAME - _ZN18CntContactCardView8activateEP22CntAbstractViewManager4QMapIi8QVariantE @ 59 NONAME - _ZN18CntContactCardViewC1Ev @ 60 NONAME - _ZN18CntContactCardViewC2Ev @ 61 NONAME - _ZN18CntContactCardViewD0Ev @ 62 NONAME - _ZN18CntContactCardViewD1Ev @ 63 NONAME - _ZN18CntContactCardViewD2Ev @ 64 NONAME - _ZN20CntBaseSelectionView10deactivateEv @ 65 NONAME - _ZN20CntBaseSelectionView10viewClosedEv @ 66 NONAME - _ZN20CntBaseSelectionView10viewOpenedEP22CntAbstractViewManager4QMapIi8QVariantE @ 67 NONAME - _ZN20CntBaseSelectionView11qt_metacallEN11QMetaObject4CallEiPPv @ 68 NONAME - _ZN20CntBaseSelectionView11qt_metacastEPKc @ 69 NONAME - _ZN20CntBaseSelectionView16staticMetaObjectE @ 70 NONAME DATA 16 - _ZN20CntBaseSelectionView19getStaticMetaObjectEv @ 71 NONAME - _ZN20CntBaseSelectionView8activateEP22CntAbstractViewManager4QMapIi8QVariantE @ 72 NONAME - _ZN20CntBaseSelectionView9closeViewEv @ 73 NONAME - _ZN20CntBaseSelectionViewC2Ev @ 74 NONAME - _ZN20CntBaseSelectionViewD0Ev @ 75 NONAME - _ZN20CntBaseSelectionViewD1Ev @ 76 NONAME - _ZN20CntBaseSelectionViewD2Ev @ 77 NONAME - _ZN21CntDefaultViewFactory10createViewEi @ 78 NONAME - _ZN21CntDefaultViewFactory16createPluginViewEi @ 79 NONAME - _ZN21CntDefaultViewFactoryC1Ev @ 80 NONAME - _ZN21CntDefaultViewFactoryC2Ev @ 81 NONAME - _ZN21CntDefaultViewFactoryD0Ev @ 82 NONAME - _ZN21CntDefaultViewFactoryD1Ev @ 83 NONAME - _ZN21CntDefaultViewFactoryD2Ev @ 84 NONAME - _ZN21CntDefaultViewManager10changeViewE4QMapIi8QVariantE @ 85 NONAME - _ZN21CntDefaultViewManager10switchViewE4QMapIi8QVariantE6QFlagsIN2Hb14ViewSwitchFlagEE @ 86 NONAME - _ZN21CntDefaultViewManager11qt_metacallEN11QMetaObject4CallEiPPv @ 87 NONAME - _ZN21CntDefaultViewManager11qt_metacastEPKc @ 88 NONAME - _ZN21CntDefaultViewManager13deleteOldViewEv @ 89 NONAME - _ZN21CntDefaultViewManager14contactManagerERK7QString @ 90 NONAME - _ZN21CntDefaultViewManager14setViewFactoryEP22CntAbstractViewFactory @ 91 NONAME - _ZN21CntDefaultViewManager16setViewNavigatorEP16CntViewNavigator @ 92 NONAME - _ZN21CntDefaultViewManager16staticMetaObjectE @ 93 NONAME DATA 16 - _ZN21CntDefaultViewManager17removeCurrentViewEv @ 94 NONAME - _ZN21CntDefaultViewManager19getStaticMetaObjectEv @ 95 NONAME - _ZN21CntDefaultViewManager4backE4QMapIi8QVariantE @ 96 NONAME - _ZN21CntDefaultViewManager7cleanupEv @ 97 NONAME - _ZN21CntDefaultViewManager8closeAppEv @ 98 NONAME - _ZN21CntDefaultViewManagerC1EP12HbMainWindow @ 99 NONAME - _ZN21CntDefaultViewManagerC2EP12HbMainWindow @ 100 NONAME - _ZN21CntDefaultViewManagerD0Ev @ 101 NONAME - _ZN21CntDefaultViewManagerD1Ev @ 102 NONAME - _ZN21CntDefaultViewManagerD2Ev @ 103 NONAME - _ZNK11CntEditView10metaObjectEv @ 104 NONAME - _ZNK11CntEditView4viewEv @ 105 NONAME - _ZNK11CntEditView6viewIdEv @ 106 NONAME - _ZNK11CntEditView9isDefaultEv @ 107 NONAME - _ZNK13CntMainWindow10metaObjectEv @ 108 NONAME - _ZNK14CntActionPopup10metaObjectEv @ 109 NONAME - _ZNK16CntViewNavigator10metaObjectEv @ 110 NONAME - _ZNK18CntContactCardView10metaObjectEv @ 111 NONAME - _ZNK18CntContactCardView4viewEv @ 112 NONAME - _ZNK18CntContactCardView6viewIdEv @ 113 NONAME - _ZNK18CntContactCardView9isDefaultEv @ 114 NONAME - _ZNK20CntBaseSelectionView10metaObjectEv @ 115 NONAME - _ZNK20CntBaseSelectionView4viewEv @ 116 NONAME - _ZNK20CntBaseSelectionView9isDefaultEv @ 117 NONAME - _ZNK21CntDefaultViewManager10metaObjectEv @ 118 NONAME - _ZTI11CntEditView @ 119 NONAME - _ZTI13CntMainWindow @ 120 NONAME - _ZTI14CntActionPopup @ 121 NONAME - _ZTI16CntViewNavigator @ 122 NONAME - _ZTI18CntContactCardView @ 123 NONAME - _ZTI20CntBaseSelectionView @ 124 NONAME - _ZTI21CntDefaultViewFactory @ 125 NONAME - _ZTI21CntDefaultViewManager @ 126 NONAME - _ZTV11CntEditView @ 127 NONAME - _ZTV13CntMainWindow @ 128 NONAME - _ZTV14CntActionPopup @ 129 NONAME - _ZTV16CntViewNavigator @ 130 NONAME - _ZTV18CntContactCardView @ 131 NONAME - _ZTV20CntBaseSelectionView @ 132 NONAME - _ZTV21CntDefaultViewFactory @ 133 NONAME - _ZTV21CntDefaultViewManager @ 134 NONAME - _ZThn8_N11CntEditView10deactivateEv @ 135 NONAME - _ZThn8_N11CntEditView8activateEP22CntAbstractViewManager4QMapIi8QVariantE @ 136 NONAME - _ZThn8_N11CntEditViewD0Ev @ 137 NONAME - _ZThn8_N11CntEditViewD1Ev @ 138 NONAME - _ZThn8_N13CntMainWindowD0Ev @ 139 NONAME - _ZThn8_N13CntMainWindowD1Ev @ 140 NONAME - _ZThn8_N18CntContactCardView10deactivateEv @ 141 NONAME - _ZThn8_N18CntContactCardView8activateEP22CntAbstractViewManager4QMapIi8QVariantE @ 142 NONAME - _ZThn8_N18CntContactCardViewD0Ev @ 143 NONAME - _ZThn8_N18CntContactCardViewD1Ev @ 144 NONAME - _ZThn8_N20CntBaseSelectionView10deactivateEv @ 145 NONAME - _ZThn8_N20CntBaseSelectionView8activateEP22CntAbstractViewManager4QMapIi8QVariantE @ 146 NONAME - _ZThn8_N20CntBaseSelectionViewD0Ev @ 147 NONAME - _ZThn8_N20CntBaseSelectionViewD1Ev @ 148 NONAME - _ZThn8_N21CntDefaultViewManager10changeViewE4QMapIi8QVariantE @ 149 NONAME - _ZThn8_N21CntDefaultViewManager14contactManagerERK7QString @ 150 NONAME - _ZThn8_N21CntDefaultViewManager4backE4QMapIi8QVariantE @ 151 NONAME - _ZThn8_N21CntDefaultViewManagerD0Ev @ 152 NONAME - _ZThn8_N21CntDefaultViewManagerD1Ev @ 153 NONAME - _ZThn8_NK11CntEditView4viewEv @ 154 NONAME - _ZThn8_NK11CntEditView6viewIdEv @ 155 NONAME - _ZThn8_NK11CntEditView9isDefaultEv @ 156 NONAME - _ZThn8_NK18CntContactCardView4viewEv @ 157 NONAME - _ZThn8_NK18CntContactCardView6viewIdEv @ 158 NONAME - _ZThn8_NK18CntContactCardView9isDefaultEv @ 159 NONAME - _ZThn8_NK20CntBaseSelectionView4viewEv @ 160 NONAME - _ZThn8_NK20CntBaseSelectionView9isDefaultEv @ 161 NONAME - _ZN14CntActionPopup24actionPopupCancelPressedEv @ 162 NONAME + _ZN13CntKeyGrabber11eventFilterEP7QObjectP6QEvent @ 15 NONAME + _ZN13CntKeyGrabber11qt_metacallEN11QMetaObject4CallEiPPv @ 16 NONAME + _ZN13CntKeyGrabber11qt_metacastEPKc @ 17 NONAME + _ZN13CntKeyGrabber16staticMetaObjectE @ 18 NONAME DATA 16 + _ZN13CntKeyGrabber19getStaticMetaObjectEv @ 19 NONAME + _ZN13CntKeyGrabberC1EP12HbMainWindowP7QObject @ 20 NONAME + _ZN13CntKeyGrabberC2EP12HbMainWindowP7QObject @ 21 NONAME + _ZN13CntKeyGrabberD0Ev @ 22 NONAME + _ZN13CntKeyGrabberD1Ev @ 23 NONAME + _ZN13CntKeyGrabberD2Ev @ 24 NONAME + _ZN13CntMainWindow11qt_metacallEN11QMetaObject4CallEiPPv @ 25 NONAME + _ZN13CntMainWindow11qt_metacastEPKc @ 26 NONAME + _ZN13CntMainWindow16staticMetaObjectE @ 27 NONAME DATA 16 + _ZN13CntMainWindow19getStaticMetaObjectEv @ 28 NONAME + _ZN13CntMainWindowC1EP7QWidgeti @ 29 NONAME + _ZN13CntMainWindowC2EP7QWidgeti @ 30 NONAME + _ZN13CntMainWindowD0Ev @ 31 NONAME + _ZN13CntMainWindowD1Ev @ 32 NONAME + _ZN13CntMainWindowD2Ev @ 33 NONAME + _ZN14CntActionPopup11qt_metacallEN11QMetaObject4CallEiPPv @ 34 NONAME + _ZN14CntActionPopup11qt_metacastEPKc @ 35 NONAME + _ZN14CntActionPopup15showActionPopupE7QString @ 36 NONAME + _ZN14CntActionPopup16staticMetaObjectE @ 37 NONAME DATA 16 + _ZN14CntActionPopup19getStaticMetaObjectEv @ 38 NONAME + _ZN14CntActionPopup20executeContactActionERN10QtMobility8QContactENS0_14QContactDetailE7QString @ 39 NONAME + _ZN14CntActionPopup24actionPopupCancelPressedEv @ 40 NONAME + _ZN14CntActionPopupC1EPN10QtMobility8QContactE @ 41 NONAME + _ZN14CntActionPopupC2EPN10QtMobility8QContactE @ 42 NONAME + _ZN14CntActionPopupD0Ev @ 43 NONAME + _ZN14CntActionPopupD1Ev @ 44 NONAME + _ZN14CntActionPopupD2Ev @ 45 NONAME + _ZN16CntViewNavigator11qt_metacallEN11QMetaObject4CallEiPPv @ 46 NONAME + _ZN16CntViewNavigator11qt_metacastEPKc @ 47 NONAME + _ZN16CntViewNavigator12addExceptionERKiS1_ @ 48 NONAME + _ZN16CntViewNavigator12removeEffectERKi @ 49 NONAME + _ZN16CntViewNavigator15removeExceptionERKi @ 50 NONAME + _ZN16CntViewNavigator16staticMetaObjectE @ 51 NONAME DATA 16 + _ZN16CntViewNavigator19getStaticMetaObjectEv @ 52 NONAME + _ZN16CntViewNavigator4backER6QFlagsIN2Hb14ViewSwitchFlagEEb @ 53 NONAME + _ZN16CntViewNavigator4nextERKiR6QFlagsIN2Hb14ViewSwitchFlagEE @ 54 NONAME + _ZN16CntViewNavigator7addRootERKi @ 55 NONAME + _ZN16CntViewNavigator9addEffectERKiS1_ @ 56 NONAME + _ZN16CntViewNavigatorC1EP7QObject @ 57 NONAME + _ZN16CntViewNavigatorC2EP7QObject @ 58 NONAME + _ZN16CntViewNavigatorD0Ev @ 59 NONAME + _ZN16CntViewNavigatorD1Ev @ 60 NONAME + _ZN16CntViewNavigatorD2Ev @ 61 NONAME + _ZN18CntContactCardView10deactivateEv @ 62 NONAME + _ZN18CntContactCardView11backPressedEv @ 63 NONAME + _ZN18CntContactCardView11qt_metacallEN11QMetaObject4CallEiPPv @ 64 NONAME + _ZN18CntContactCardView11qt_metacastEPKc @ 65 NONAME + _ZN18CntContactCardView13addToContactsEv @ 66 NONAME + _ZN18CntContactCardView13viewActivatedEP22CntAbstractViewManager4QMapIi8QVariantE @ 67 NONAME + _ZN18CntContactCardView16staticMetaObjectE @ 68 NONAME DATA 16 + _ZN18CntContactCardView19getStaticMetaObjectEv @ 69 NONAME + _ZN18CntContactCardView8activateEP22CntAbstractViewManager4QMapIi8QVariantE @ 70 NONAME + _ZN18CntContactCardViewC1Eb @ 71 NONAME + _ZN18CntContactCardViewC2Eb @ 72 NONAME + _ZN18CntContactCardViewD0Ev @ 73 NONAME + _ZN18CntContactCardViewD1Ev @ 74 NONAME + _ZN18CntContactCardViewD2Ev @ 75 NONAME + _ZN20CntBaseSelectionView10deactivateEv @ 76 NONAME + _ZN20CntBaseSelectionView10viewClosedEv @ 77 NONAME + _ZN20CntBaseSelectionView10viewOpenedEP22CntAbstractViewManager4QMapIi8QVariantE @ 78 NONAME + _ZN20CntBaseSelectionView11qt_metacallEN11QMetaObject4CallEiPPv @ 79 NONAME + _ZN20CntBaseSelectionView11qt_metacastEPKc @ 80 NONAME + _ZN20CntBaseSelectionView16staticMetaObjectE @ 81 NONAME DATA 16 + _ZN20CntBaseSelectionView19getStaticMetaObjectEv @ 82 NONAME + _ZN20CntBaseSelectionView8activateEP22CntAbstractViewManager4QMapIi8QVariantE @ 83 NONAME + _ZN20CntBaseSelectionViewC2Ev @ 84 NONAME + _ZN20CntBaseSelectionViewD0Ev @ 85 NONAME + _ZN20CntBaseSelectionViewD1Ev @ 86 NONAME + _ZN20CntBaseSelectionViewD2Ev @ 87 NONAME + _ZN21CntDefaultViewFactory10createViewEi @ 88 NONAME + _ZN21CntDefaultViewFactory16createPluginViewEi @ 89 NONAME + _ZN21CntDefaultViewFactoryC1Ev @ 90 NONAME + _ZN21CntDefaultViewFactoryC2Ev @ 91 NONAME + _ZN21CntDefaultViewFactoryD0Ev @ 92 NONAME + _ZN21CntDefaultViewFactoryD1Ev @ 93 NONAME + _ZN21CntDefaultViewFactoryD2Ev @ 94 NONAME + _ZN21CntDefaultViewManager10changeViewE4QMapIi8QVariantE @ 95 NONAME + _ZN21CntDefaultViewManager10switchViewE4QMapIi8QVariantE6QFlagsIN2Hb14ViewSwitchFlagEE @ 96 NONAME + _ZN21CntDefaultViewManager11qt_metacallEN11QMetaObject4CallEiPPv @ 97 NONAME + _ZN21CntDefaultViewManager11qt_metacastEPKc @ 98 NONAME + _ZN21CntDefaultViewManager13currentViewIdEv @ 99 NONAME + _ZN21CntDefaultViewManager13deleteOldViewEv @ 100 NONAME + _ZN21CntDefaultViewManager14contactManagerERK7QString @ 101 NONAME + _ZN21CntDefaultViewManager14setViewFactoryEP22CntAbstractViewFactory @ 102 NONAME + _ZN21CntDefaultViewManager16setViewNavigatorEP16CntViewNavigator @ 103 NONAME + _ZN21CntDefaultViewManager16staticMetaObjectE @ 104 NONAME DATA 16 + _ZN21CntDefaultViewManager17removeCurrentViewEv @ 105 NONAME + _ZN21CntDefaultViewManager19getStaticMetaObjectEv @ 106 NONAME + _ZN21CntDefaultViewManager4backE4QMapIi8QVariantEb @ 107 NONAME + _ZN21CntDefaultViewManager7cleanupEv @ 108 NONAME + _ZN21CntDefaultViewManager8closeAppEv @ 109 NONAME + _ZN21CntDefaultViewManagerC1EP12HbMainWindow @ 110 NONAME + _ZN21CntDefaultViewManagerC2EP12HbMainWindow @ 111 NONAME + _ZN21CntDefaultViewManagerD0Ev @ 112 NONAME + _ZN21CntDefaultViewManagerD1Ev @ 113 NONAME + _ZN21CntDefaultViewManagerD2Ev @ 114 NONAME + _ZNK11CntEditView10metaObjectEv @ 115 NONAME + _ZNK11CntEditView4viewEv @ 116 NONAME + _ZNK11CntEditView6viewIdEv @ 117 NONAME + _ZNK11CntEditView9isDefaultEv @ 118 NONAME + _ZNK13CntKeyGrabber10metaObjectEv @ 119 NONAME + _ZNK13CntMainWindow10metaObjectEv @ 120 NONAME + _ZNK14CntActionPopup10metaObjectEv @ 121 NONAME + _ZNK16CntViewNavigator10metaObjectEv @ 122 NONAME + _ZNK18CntContactCardView10metaObjectEv @ 123 NONAME + _ZNK18CntContactCardView4viewEv @ 124 NONAME + _ZNK18CntContactCardView6viewIdEv @ 125 NONAME + _ZNK18CntContactCardView9isDefaultEv @ 126 NONAME + _ZNK20CntBaseSelectionView10metaObjectEv @ 127 NONAME + _ZNK20CntBaseSelectionView4viewEv @ 128 NONAME + _ZNK20CntBaseSelectionView9isDefaultEv @ 129 NONAME + _ZNK21CntDefaultViewManager10metaObjectEv @ 130 NONAME + _ZTI11CntEditView @ 131 NONAME + _ZTI13CntKeyGrabber @ 132 NONAME + _ZTI13CntMainWindow @ 133 NONAME + _ZTI14CntActionPopup @ 134 NONAME + _ZTI16CntViewNavigator @ 135 NONAME + _ZTI18CntContactCardView @ 136 NONAME + _ZTI20CntBaseSelectionView @ 137 NONAME + _ZTI21CntDefaultViewFactory @ 138 NONAME + _ZTI21CntDefaultViewManager @ 139 NONAME + _ZTV11CntEditView @ 140 NONAME + _ZTV13CntKeyGrabber @ 141 NONAME + _ZTV13CntMainWindow @ 142 NONAME + _ZTV14CntActionPopup @ 143 NONAME + _ZTV16CntViewNavigator @ 144 NONAME + _ZTV18CntContactCardView @ 145 NONAME + _ZTV20CntBaseSelectionView @ 146 NONAME + _ZTV21CntDefaultViewFactory @ 147 NONAME + _ZTV21CntDefaultViewManager @ 148 NONAME + _ZThn8_N11CntEditView10deactivateEv @ 149 NONAME + _ZThn8_N11CntEditView8activateEP22CntAbstractViewManager4QMapIi8QVariantE @ 150 NONAME + _ZThn8_N11CntEditViewD0Ev @ 151 NONAME + _ZThn8_N11CntEditViewD1Ev @ 152 NONAME + _ZThn8_N13CntMainWindowD0Ev @ 153 NONAME + _ZThn8_N13CntMainWindowD1Ev @ 154 NONAME + _ZThn8_N18CntContactCardView10deactivateEv @ 155 NONAME + _ZThn8_N18CntContactCardView8activateEP22CntAbstractViewManager4QMapIi8QVariantE @ 156 NONAME + _ZThn8_N18CntContactCardViewD0Ev @ 157 NONAME + _ZThn8_N18CntContactCardViewD1Ev @ 158 NONAME + _ZThn8_N20CntBaseSelectionView10deactivateEv @ 159 NONAME + _ZThn8_N20CntBaseSelectionView8activateEP22CntAbstractViewManager4QMapIi8QVariantE @ 160 NONAME + _ZThn8_N20CntBaseSelectionViewD0Ev @ 161 NONAME + _ZThn8_N20CntBaseSelectionViewD1Ev @ 162 NONAME + _ZThn8_N21CntDefaultViewManager10changeViewE4QMapIi8QVariantE @ 163 NONAME + _ZThn8_N21CntDefaultViewManager14contactManagerERK7QString @ 164 NONAME + _ZThn8_N21CntDefaultViewManager4backE4QMapIi8QVariantEb @ 165 NONAME + _ZThn8_N21CntDefaultViewManagerD0Ev @ 166 NONAME + _ZThn8_N21CntDefaultViewManagerD1Ev @ 167 NONAME + _ZThn8_NK11CntEditView4viewEv @ 168 NONAME + _ZThn8_NK11CntEditView6viewIdEv @ 169 NONAME + _ZThn8_NK11CntEditView9isDefaultEv @ 170 NONAME + _ZThn8_NK18CntContactCardView4viewEv @ 171 NONAME + _ZThn8_NK18CntContactCardView6viewIdEv @ 172 NONAME + _ZThn8_NK18CntContactCardView9isDefaultEv @ 173 NONAME + _ZThn8_NK20CntBaseSelectionView4viewEv @ 174 NONAME + _ZThn8_NK20CntBaseSelectionView9isDefaultEv @ 175 NONAME + _ZN18CntGroupMemberView10deactivateEv @ 176 NONAME + _ZN18CntGroupMemberView11backPressedEv @ 177 NONAME + _ZN18CntGroupMemberView11qt_metacallEN11QMetaObject4CallEiPPv @ 178 NONAME + _ZN18CntGroupMemberView11qt_metacastEPKc @ 179 NONAME + _ZN18CntGroupMemberView16staticMetaObjectE @ 180 NONAME DATA 16 + _ZN18CntGroupMemberView19getStaticMetaObjectEv @ 181 NONAME + _ZN18CntGroupMemberView8activateEP22CntAbstractViewManager4QMapIi8QVariantE @ 182 NONAME + _ZN18CntGroupMemberViewC1Ev @ 183 NONAME + _ZN18CntGroupMemberViewC2Ev @ 184 NONAME + _ZN18CntGroupMemberViewD0Ev @ 185 NONAME + _ZN18CntGroupMemberViewD1Ev @ 186 NONAME + _ZN18CntGroupMemberViewD2Ev @ 187 NONAME + _ZNK18CntGroupMemberView10metaObjectEv @ 188 NONAME + _ZNK18CntGroupMemberView4viewEv @ 189 NONAME + _ZNK18CntGroupMemberView6viewIdEv @ 190 NONAME + _ZNK18CntGroupMemberView9isDefaultEv @ 191 NONAME + _ZTI18CntGroupMemberView @ 192 NONAME + _ZTV18CntGroupMemberView @ 193 NONAME + _ZThn8_N18CntGroupMemberView10deactivateEv @ 194 NONAME + _ZThn8_N18CntGroupMemberView8activateEP22CntAbstractViewManager4QMapIi8QVariantE @ 195 NONAME + _ZThn8_N18CntGroupMemberViewD0Ev @ 196 NONAME + _ZThn8_N18CntGroupMemberViewD1Ev @ 197 NONAME + _ZThn8_NK18CntGroupMemberView4viewEv @ 198 NONAME + _ZThn8_NK18CntGroupMemberView6viewIdEv @ 199 NONAME + _ZThn8_NK18CntGroupMemberView9isDefaultEv @ 200 NONAME diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/inc/cntactionlauncher.h --- a/phonebookui/pbkcommonui/inc/cntactionlauncher.h Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/inc/cntactionlauncher.h Wed Aug 18 09:39:00 2010 +0300 @@ -34,6 +34,7 @@ public: bool execute( QContact aContact, QContactDetail aDetail ); + bool execute( QContact aContact, QContactDetail aDetail, QVariantMap aParameters ); bool execute( QContact aContact, QContactDetail aDetail, QContactActionDescriptor aActionDescriptor ); signals: diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/inc/cntactionpopup.h --- a/phonebookui/pbkcommonui/inc/cntactionpopup.h Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/inc/cntactionpopup.h Wed Aug 18 09:39:00 2010 +0300 @@ -36,7 +36,7 @@ /* * Class for showing popup for Call, Message and Email actions if preffered number is not set */ -class Q_DECL_EXPORT CntActionPopup : public QObject +class QTPBK_EXPORT CntActionPopup : public QObject { Q_OBJECT diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/inc/cntbaseselectionview.h --- a/phonebookui/pbkcommonui/inc/cntbaseselectionview.h Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/inc/cntbaseselectionview.h Wed Aug 18 09:39:00 2010 +0300 @@ -48,10 +48,7 @@ HbView* view() const; virtual int viewId() const = 0; - -private slots: - void closeView(); - + protected: HbDocumentLoader* mDocument; HbListView* mListView; diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/inc/cntcollectionlistmodel.h --- a/phonebookui/pbkcommonui/inc/cntcollectionlistmodel.h Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/inc/cntcollectionlistmodel.h Wed Aug 18 09:39:00 2010 +0300 @@ -46,17 +46,25 @@ CntCollectionListModel(QContactManager *manager, CntExtensionManager &extensionManager, QObject *parent = 0); ~CntCollectionListModel(); -public: // from QAbstractItemModel +public: + // from QAbstractItemModel QVariant data(const QModelIndex& index, int role) const; int rowCount(const QModelIndex& parent = QModelIndex()) const; bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()); + bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex()); public: + // removing and adding groups void removeGroup(int localId); + void addGroup(int localId); + + // extension (plugin) group handling bool isExtensionGroup(const QModelIndex &index); CntViewParameters extensionGroupActivated(int row); void extensionGroupLongPressed(int row, const QPointF& coords, CntExtensionGroupCallback* interface); + QModelIndex indexOfGroup(int localId); + private: void doConstruct(); void initializeStaticGroups(); @@ -69,8 +77,9 @@ bool validateRowIndex(const int index) const; private slots: - void informationUpdated(int row, const QString& secondRowText, int memberCount); + void informationUpdated(int id, const QString& secondRowText, int memberCount); void onIconReady(const QPixmap& pixmap, void *data, int id, int error); + void extensionGroupsReady(); private: QSharedDataPointer d; diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/inc/cntcollectionlistmodelworker.h --- a/phonebookui/pbkcommonui/inc/cntcollectionlistmodelworker.h Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/inc/cntcollectionlistmodelworker.h Wed Aug 18 09:39:00 2010 +0300 @@ -33,6 +33,7 @@ class CntCollectionListModelWorker : public QThread { Q_OBJECT + friend class TestCntCollectionListModelWorker; public: CntCollectionListModelWorker(QString unnamed, QString noFavs, QString noMembers, int sortOrder); @@ -41,14 +42,14 @@ void run(); bool event(QEvent *event); - void scheduleJob(int row, int id); + void scheduleJob(int id); private: void processJobs(); - void fetchInformation(int row, int id); + void fetchInformation(int id); signals: - void fetchDone(int row, const QString& secondRowText, int memberCount); + void fetchDone(int id, const QString& secondRowText, int memberCount); private: bool mStarted; @@ -56,7 +57,7 @@ bool mStopped; QMutex mMutex; - QList< QPair > mJobs; + QList mJobs; QContactManager *mManager; diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/inc/cntcollectionview.h --- a/phonebookui/pbkcommonui/inc/cntcollectionview.h Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/inc/cntcollectionview.h Wed Aug 18 09:39:00 2010 +0300 @@ -29,7 +29,6 @@ class HbView; class HbListView; class CntCollectionListModel; -class CntFetchContacts; class QModelIndex; class QActionGroup; class HbAbstractViewItem; @@ -58,6 +57,7 @@ private slots: void showPreviousView(); + void showNamesViewWithFinder(); void openGroup(const QModelIndex &index); void showContextMenu(HbAbstractViewItem *item, const QPointF &coords); @@ -65,12 +65,14 @@ void newGroup(); void handleNewGroup(HbAction* action); - void handleNewGroupMembers(); + void handleNewGroupMembers( QSet aMembers ); + void handleCancelGroupMembers(); + void notifyNewGroup(); void refreshDataModel(); void deleteGroup(QContact group); - void handleDeleteGroup(HbAction* action); + void handleDeleteGroup(int action); void deleteGroups(); void handleDeleteGroups(HbAction* action); @@ -95,7 +97,6 @@ HbAction* mDeleteGroupsAction; // owned by view QContact* mHandledContact; // own, needed for asynchronous popups - CntFetchContacts* mFetchView; QSet mSelectedContactsSet; QActionGroup* mActionGroup; diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/inc/cntcontactcardview.h --- a/phonebookui/pbkcommonui/inc/cntcontactcardview.h Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/inc/cntcontactcardview.h Wed Aug 18 09:39:00 2010 +0300 @@ -38,12 +38,13 @@ Q_OBJECT public: - CntContactCardView(); + CntContactCardView(bool isTemporary = false); ~CntContactCardView(); signals: void backPressed(); void viewActivated(CntAbstractViewManager* aMgr, const CntViewParameters aArgs); + void addToContacts(); public: // From CntAbstractView void activate(CntAbstractViewManager* aMgr, const CntViewParameters aArgs); 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 diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/inc/cntdefaultviewmanager.h --- a/phonebookui/pbkcommonui/inc/cntdefaultviewmanager.h Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/inc/cntdefaultviewmanager.h Wed Aug 18 09:39:00 2010 +0300 @@ -47,8 +47,11 @@ public: // From CntAbstractViewManager void changeView( const CntViewParameters aArgs ); - void back( const CntViewParameters aArgs ); + void back( const CntViewParameters aArgs, bool toRoot = false ); QContactManager* contactManager( const QString& aType ); + +public: + int currentViewId(); private slots: void removeCurrentView(); diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/inc/cntdetailconst.h --- a/phonebookui/pbkcommonui/inc/cntdetailconst.h Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/inc/cntdetailconst.h Wed Aug 18 09:39:00 2010 +0300 @@ -52,6 +52,8 @@ const int CNT_SPOUSE_MAXLENGTH = 50; const int CNT_CHILDREN_MAXLENGTH = 250; +const int CNT_GROUPNAME_MAXLENGTH = 50; + const QDate CNT_DATEPICKER_FROM(1900,0,0); const QDate CNT_DATEPICKER_TO(2050,0,0); diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/inc/cntdetaileditor.h --- a/phonebookui/pbkcommonui/inc/cntdetaileditor.h Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/inc/cntdetaileditor.h Wed Aug 18 09:39:00 2010 +0300 @@ -31,6 +31,7 @@ class HbView; class HbAction; class CntEditorFactory; +class CntSaveManager; class CntDetailEditor : public QObject, public CntAbstractView @@ -47,6 +48,10 @@ void insertField(); void handleItemShown(const QModelIndex& aIndex ); + void saveContact(); + void contactDeletedFromOtherSource(const QList& contactIds); + void showRootView(); + public: void setViewId( int aId ); void setHeader( QString aHeader ); @@ -79,6 +84,7 @@ HbAction *mSoftkey; HbAction *mCancel; CntViewParameters mArgs; + CntSaveManager *mSaveManager; // own friend class TestCntDetailEditor; }; diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/inc/cntdetailpopup.h --- a/phonebookui/pbkcommonui/inc/cntdetailpopup.h Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/inc/cntdetailpopup.h Wed Aug 18 09:39:00 2010 +0300 @@ -19,46 +19,29 @@ #define CNTDETAILPOPUP_H #include -#include +#include #include class QStandardItemModel; -class HbListView; typedef QList CntViewIdList; -class CntDetailPopup : public HbDialog +class CntDetailPopup : public HbSelectionDialog { + friend class TestCntDetailPopup; Q_OBJECT + public: static void selectDetail( CntViewIdList aList, QObject *receiver = 0, const char *member = 0 ); - int selectedDetail(); -#ifdef PBK_UNIT_TEST -public slots: -#else -private slots: -#endif - void listItemSelected(QModelIndex index); - -#ifdef PBK_UNIT_TEST -public: -#else private: -#endif CntDetailPopup(QGraphicsItem *parent, CntViewIdList aList ); ~CntDetailPopup(); void addListItem(QString aIcon, QString label, int aId); -#ifdef PBK_UNIT_TEST -public: -#else private: -#endif QStandardItemModel *mListModel; - HbListView *mListView; - int mSelectedDetail; CntViewIdList mViewIdList; }; diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/inc/cnteditview_p.h --- a/phonebookui/pbkcommonui/inc/cnteditview_p.h Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/inc/cnteditview_p.h Wed Aug 18 09:39:00 2010 +0300 @@ -43,6 +43,7 @@ class QAction; class HbMenu; class XQAiwRequest; +class CntSaveManager; QTM_BEGIN_NAMESPACE class QContact; @@ -76,9 +77,10 @@ void addDetailItem(); void handleAddDetailItem(HbAction *aAction); void deleteContact(); - void handleDeleteContact(HbAction *action); + void handleDeleteContact(int action); void discardChanges(); void saveChanges(); + void showRootView(); void openNameEditor(); void openImageEditor(); @@ -88,8 +90,8 @@ void setScrollPosition(); void ringToneFetchHandleError(int errorCode, const QString& errorMessage); void ringToneFetchHandleOk(const QVariant &result); + void contactDeletedFromOtherSource(const QList& contactIds); - private: void loadAvatar(); HbMenu* createPopup( const QModelIndex aIndex, CntEditViewItem* aDetail ); @@ -97,7 +99,6 @@ void editDetail( CntEditViewItem* aDetail ); void removeDetail( CntEditViewItem* aDetail, const QModelIndex& aIndex ); void setSelectedContact( QContact aContact ); - void setPreferredDetails( QContact* aContact ); void fetchTone(); void changeEditorView(); @@ -128,6 +129,7 @@ XQAiwRequest* mReq; XQApplicationManager mAppMgr; HbMenu *mMenu; + CntSaveManager* mSaveManager; // own }; #endif /* CNTEDITVIEW_P_H_ */ diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/inc/cnteditviewheadingitem.h --- a/phonebookui/pbkcommonui/inc/cnteditviewheadingitem.h Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/inc/cnteditviewheadingitem.h Wed Aug 18 09:39:00 2010 +0300 @@ -76,6 +76,7 @@ HbTextItem *mLabel; HbTextItem *mSecondLabel; HbFrameItem *mFrameItem; + HbFrameItem *mFocusItem; HbTouchArea *mIconTouchArea; bool mIconFocused; diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/inc/cntfavoritesmemberview.h --- a/phonebookui/pbkcommonui/inc/cntfavoritesmemberview.h Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/inc/cntfavoritesmemberview.h Wed Aug 18 09:39:00 2010 +0300 @@ -44,7 +44,7 @@ void deactivate(); bool isDefault() const { return false; } HbView* view() const { return mView; } - int viewId() const { return FavoritesMemberView; } + int viewId() const { return favoritesMemberView; } void createModel(); public: @@ -58,7 +58,7 @@ #endif void manageFavorites(); - void handleManageFavorites(); + void handleManageFavorites(QSet aIds); void onLongPressed (HbAbstractViewItem *item, const QPointF &coords); void handleMenu(HbAction* action); diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/inc/cntfavoritesview.h --- a/phonebookui/pbkcommonui/inc/cntfavoritesview.h Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/inc/cntfavoritesview.h Wed Aug 18 09:39:00 2010 +0300 @@ -21,10 +21,10 @@ #include #include #include +#include class HbAction; class HbView; -class CntFetchContacts; QTM_BEGIN_NAMESPACE class QContact; @@ -52,7 +52,7 @@ private slots: void showPreviousView(); void openSelectionPopup(); - void handleMemberSelection(); + void handleMemberSelection( QSet aIds ); void setOrientation(Qt::Orientation orientation); private: @@ -68,7 +68,6 @@ HbAction* mSoftkey; CntAbstractViewManager* mViewManager; HbDocumentLoader mDocumentLoader; - CntFetchContacts* mFetchView; }; #endif // CNTFAVORITESVIEW_H diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/inc/cntfetchcontactpopup.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phonebookui/pbkcommonui/inc/cntfetchcontactpopup.h Wed Aug 18 09:39:00 2010 +0300 @@ -0,0 +1,104 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + +#ifndef CNTFETCHCONTACTPOPUP_H_ +#define CNTFETCHCONTACTPOPUP_H_ + +#include +#include +#include + +class HbDialog; +class HbListView; +class HbTextItem; +class HbLabel; +class HbAction; +class HbSearchPanel; +class HbStaticVkbHost; + +class QGraphicsLinearLayout; +class QItemSelectionModel; + +class CntListModel; +class CntFetchMarkAll; +class CntDocumentLoader; + +QTM_BEGIN_NAMESPACE +class QContactManager; +QTM_END_NAMESPACE +QTM_USE_NAMESPACE + +/*! + CntFetchContactPopup is simple to use popup for fetching (selecting) number + of contacts. + + \code + \endcode + + Note that by default, CntFetchContactPopup deletes itself when closing the popup. +*/ +class CntFetchContactPopup : public QObject +{ + Q_OBJECT + +public: + ~CntFetchContactPopup(); + + static CntFetchContactPopup* createMultiSelectionPopup( QString aTitle, QString aAction, QContactManager& aContactMgr ); + static CntFetchContactPopup* createSingleSelectionPopup( QString aTitle, QContactManager& aContactMgr ); + + void setSelectedContacts( QSet aIds ); + void showPopup(); + +signals: + void fetchReady( QSet aIds ); + void fetchCancelled(); + +private slots: + void setFilter( const QString& aFilter ); + void contactSelected( const QModelIndex& aIndex ); + void contactsSelected( const QItemSelection & selected, const QItemSelection & deselected ); + void selectAll( int aState ); + void dialogDismissed( HbAction* aAction ); + void loadLayout( Qt::Orientation aOrientation ); + void handleKeypadOpen(); + void handleKeypadClosed(); + void closePopup(); + +private: + CntFetchContactPopup( QContactManager& aManager ); + void constructPopupDialog( QString aTitle, QString aAction, HbAbstractItemView::SelectionMode aMode ); + +private: + QContactManager& mManager; + QList mIdList; + + HbDialog* mPopup; // own + HbListView* mListView; // own + HbTextItem* mEmptyView; // own + HbLabel* mHeading; // own + HbAction* mPrimaryAction; // own + HbSearchPanel* mSearch; //own + CntListModel* mModel; // own + HbStaticVkbHost* mVirtualKeyboard; // own + CntFetchMarkAll* mMarkAll; // own + QItemSelectionModel* mSelectionModel; // own + CntDocumentLoader* mDoc; // own + QString mTitle; +}; + +#endif /* CNTFETCHCONTACTPOPUP_H_ */ diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/inc/cntfetchcontactsview.h --- a/phonebookui/pbkcommonui/inc/cntfetchcontactsview.h Tue Jul 06 14:05:47 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,102 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* -*/ - -#ifndef CntFetchContacts_H_ -#define CntFetchContacts_H_ - -#include -#include -#include -#include -#include - -class HbDialog; -class HbSearchPanel; -class HbAction; -class HbListView; -class HbLabel; -class HbStaticVkbHost; -class HbIndexFeedback; - -class CntListModel; -class QGraphicsLinearLayout; - -QTM_BEGIN_NAMESPACE -class QContact; -QTM_END_NAMESPACE - -QTM_USE_NAMESPACE - -class CntFetchContacts : public QObject - { - Q_OBJECT - -public: - CntFetchContacts(QContactManager &aManager); - ~CntFetchContacts(); - -private slots: - void memberSelectionChanged(const QModelIndex &index); - - void setFilter(const QString &filterString); - - void handleKeypadOpen(); - void handleKeypadClose(); - - void handleUserResponse(HbAction* action); - -public: - void displayContacts(HbAbstractItemView::SelectionMode aMode, - QSet aContacts); - - QSet getSelectedContacts() const; - bool wasCanceled() const; - void setDetails(QString aTitle, QString aButtonText); - -private: - void doInitialize(HbAbstractItemView::SelectionMode aMode, - QSet aContacts); - void showPopup(); - void markMembersInView(); - -signals: - void clicked(); - -private: - HbDialog* mPopup; - HbSearchPanel* mSearchPanel; - CntListModel* mCntModel; - HbListView* mListView; - QGraphicsLinearLayout* mLayout; - HbTextItem* mEmptyListLabel; - HbWidget* mContainerWidget; - HbAbstractItemView::SelectionMode mSelectionMode; - QSet mCurrentlySelected; - QContactManager* mManager; - bool mWasCanceled; - HbLabel* mLabel; - HbStaticVkbHost* mVirtualKeyboard; - QString mButtonText; - HbAction* mPrimaryAction; - HbAction* mSecondaryAction; - HbIndexFeedback* mIndexFeedback; - - friend class TestCntFetchUtility; - friend class TestCntMyCardView; - }; - -#endif /* CntFetchContacts_H_ */ diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/inc/cntfetchmarkall.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phonebookui/pbkcommonui/inc/cntfetchmarkall.h Wed Aug 18 09:39:00 2010 +0300 @@ -0,0 +1,53 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + +#ifndef CNTFETCHSELECTIONITEM_H +#define CNTFETCHSELECTIONITEM_H + +#include +#include + +class HbCheckBox; +class HbTextItem; +class HbFrameItem; + +class CntFetchMarkAll : public HbWidget +{ + Q_OBJECT + +public: + CntFetchMarkAll(QGraphicsItem *aParent = 0); + ~CntFetchMarkAll(); + + void setMaxContactCount( int aContactCount ); + void setSelectedContactCount( int aSelectedCount ); + +signals: + void markAll(int aState); + +private: + friend class TestCntFetchSelectionItems; + + HbCheckBox* mCheckBox; // not own + HbTextItem* mCounterLabel; // not own + HbFrameItem* mFrame; + + int mContactCount; + int mSelectionCount; +}; + +#endif // CNTFETCHSELECTIONITEM_H diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/inc/cntgroupactionsview.h --- a/phonebookui/pbkcommonui/inc/cntgroupactionsview.h Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/inc/cntgroupactionsview.h Wed Aug 18 09:39:00 2010 +0300 @@ -30,10 +30,12 @@ class HbAbstractViewItem; class QModelIndex; class QStandardItemModel; +class CntActionLauncher; QTM_BEGIN_NAMESPACE class QContact; +class QContactAction; QTM_END_NAMESPACE QTM_USE_NAMESPACE @@ -49,6 +51,9 @@ HbView* view() const { return mView; } int viewId() const { return groupActionsView; } +protected: + bool eventFilter(QObject *obj, QEvent *event); + public: CntGroupActionsView(); ~CntGroupActionsView(); @@ -61,13 +66,19 @@ void showPreviousView(); void editGroup(); + void listItemSelected(const QModelIndex &index); + void executeAction(QContact&, QContactDetail, QString); + void actionExecuted(CntActionLauncher* aAction); + void actionCancelled(); + void executeConferenceCallAction(QContact& aContact, const QContactDetail& aDetail, const QString& aAction); #ifdef PBK_UNIT_TEST public: #else private: #endif - void populatelist(QString label,HbIcon icon, QString secondaryText); + void populatelist(QString label,HbIcon icon, QString secondaryText, QString action); + bool sendKeyPressed(); #ifdef PBK_UNIT_TEST public: @@ -84,7 +95,10 @@ HbAction* mSoftkey; // owned by view HbListView* mListView; // owned by layout - + int mPopupCount; + QStringList mEmailActionParams; + QVariantMap mMessageActionParams; + bool mIsExecutingAction; }; #endif // CNTGROUPACTIONSVIEW_H diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/inc/cntgroupdeletepopup.h --- a/phonebookui/pbkcommonui/inc/cntgroupdeletepopup.h Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/inc/cntgroupdeletepopup.h Wed Aug 18 09:39:00 2010 +0300 @@ -35,6 +35,7 @@ class CntGroupDeletePopup : public HbSelectionDialog { Q_OBJECT + friend class TestCntGroupDeletePopup; public: CntGroupDeletePopup(QContactManager *manager, QGraphicsItem *parent = 0); @@ -43,12 +44,7 @@ void populateListOfGroup(); QList deleteGroup() const; -#ifdef PBK_UNIT_TEST -public: -#else private: -#endif - HbListView *mListView; QContactManager *mContactManager; CntGroupDeletePopupModel *mModel; }; diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/inc/cntgroupmemberview.h --- a/phonebookui/pbkcommonui/inc/cntgroupmemberview.h Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/inc/cntgroupmemberview.h Wed Aug 18 09:39:00 2010 +0300 @@ -19,33 +19,14 @@ #define CNTGROUPMEMBERVIEW_H #include -#include -#include - #include +#include "cntglobal.h" -class CntListModel; -class CntAbstractViewManager; -class CntContactCardHeadingItem; -class CntFetchContacts; +class CntGroupMemberViewPrivate; class HbView; -class HbAction; -class HbListView; -class HbAbstractViewItem; -class ThumbnailManager; -class QModelIndex; -class CntImageLabel; -class HbDocumentLoader; -QTM_BEGIN_NAMESPACE -class QContact; -QTM_END_NAMESPACE - -QTM_USE_NAMESPACE - -class CntGroupMemberView : public QObject, public CntAbstractView +class QTPBK_EXPORT CntGroupMemberView : public QObject, public CntAbstractView { - friend class TestCntGroupMemberView; Q_OBJECT public: @@ -55,62 +36,17 @@ public: // From CntAbstractView void activate( CntAbstractViewManager* aMgr, const CntViewParameters aArgs ); void deactivate(); - bool isDefault() const { return false; } - HbView* view() const { return mView; } - int viewId() const { return groupMemberView; } - -public slots: - void setOrientation(Qt::Orientation orientation); - - -private slots: - void showPreviousView(); - void openGroupActions(); - void manageMembers(); - void handleManageMembers(); - void editGroup(); - void deleteGroup(); - void handleDeleteGroup(HbAction *action); - - void showContextMenu(HbAbstractViewItem *item, const QPointF &coords); - void handleMenu(HbAction* action); + bool isDefault() const; + HbView* view() const; + int viewId() const; - void showContactView(const QModelIndex &index); - void removeFromGroup(const QModelIndex &index); - void editContact(const QModelIndex &index); - void thumbnailReady(const QPixmap& pixmap, void *data, int id, int error); - void openImageEditor(); - - void drawImageMenu(const QPointF &aCoords); - void createModel(); - - void removeImage(); - -private: - QContactManager* getContactManager(); - void setRelationship(QSet &aLocalId, - QList &aRelationshipList); - +signals: + void backPressed(); + private: - QContact* mGroupContact; // own - CntAbstractViewManager* mViewManager; - HbDocumentLoader mDocumentLoader; - HbView* mView; // own - HbAction* mSoftkey; // owned by view - CntContactCardHeadingItem* mHeadingItem; // owned by layout - ThumbnailManager* mThumbnailManager; // own - HbAction* mManageAction; // owned by view - HbAction* mDeleteAction; // owned by view - HbAction* mShowActionsAction; // owned by view - HbAction* mEditGroupAction; // owned by view - CntListModel* mModel; // own - CntImageLabel* mImageLabel; - HbListView* mListView; // owned by layout - HbDocumentLoader* mDocument; - CntFetchContacts* mFetchView; - QList mOriginalGroupMembers; - QContactAvatar* mAvatar; - CntViewParameters mArgs; + CntGroupMemberViewPrivate* const d_ptr; + Q_DECLARE_PRIVATE_D(d_ptr, CntGroupMemberView) + Q_DISABLE_COPY(CntGroupMemberView) }; #endif // CNTGROUPMEMBERVIEW_H diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/inc/cntgroupmemberview_p.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phonebookui/pbkcommonui/inc/cntgroupmemberview_p.h Wed Aug 18 09:39:00 2010 +0300 @@ -0,0 +1,119 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + +#ifndef CNTGROUPMEMBERVIEW_P_H +#define CNTGROUPMEMBERVIEW_P_H + +#include "cntgroupmemberview.h" +#include "cntglobal.h" + +#include +#include +#include +#include +#include + +class CntListModel; +class CntAbstractViewManager; +class CntContactCardHeadingItem; +class HbView; +class HbAction; +class HbListView; +class HbAbstractViewItem; +class ThumbnailManager; +class QModelIndex; +class CntImageLabel; +class HbDocumentLoader; + +QTM_BEGIN_NAMESPACE +class QContact; +QTM_END_NAMESPACE + +QTM_USE_NAMESPACE + +class CntGroupMemberViewPrivate : public QObject +{ + Q_OBJECT + +public: + CntGroupMemberViewPrivate(); + ~CntGroupMemberViewPrivate(); + + void activate( CntAbstractViewManager* aMgr, const CntViewParameters aArgs ); + void deactivate(); + +public: + CntGroupMemberView* q_ptr; + +private slots: + void showPreviousView(); + void openGroupActions(); + void manageMembers(); + void handleManageMembers(QSet aIds); + void editGroup(); + void deleteGroup(); + void handleDeleteGroup(int action); // Delete action + + void showContextMenu(HbAbstractViewItem *item, const QPointF &coords); // item owned by HbListView + void handleMenu(HbAction* action); + + void showContactView(const QModelIndex &index); + void removeFromGroup(const QModelIndex &index); + void editContact(const QModelIndex &index); + void thumbnailReady(const QPixmap& pixmap, void *data, int id, int error); + void openImageEditor(); + void setOrientation(Qt::Orientation orientation); + + void drawImageMenu(const QPointF &aCoords); + void createModel(); + + void removeImage(); + void sendToHs(const QModelIndex &index); + +private: + QContactManager* getContactManager(); + void setRelationship(QSet &aLocalId, + QList &aRelationshipList); + +private: + Q_DECLARE_PUBLIC(CntGroupMemberView) + friend class TestCntGroupMemberView; + +private: + QContact* mGroupContact; // own + CntAbstractViewManager* mViewManager; + HbDocumentLoader mDocumentLoader; + HbView* mView; // own + HbAction* mSoftkey; // owned by view + CntContactCardHeadingItem* mHeadingItem; // owned by layout + ThumbnailManager* mThumbnailManager; // own + HbAction* mManageAction; // owned by view + HbAction* mDeleteAction; // owned by view + HbAction* mShowActionsAction; // owned by view + HbAction* mEditGroupAction; // owned by view + CntListModel* mModel; // own + CntImageLabel* mImageLabel; + HbListView* mListView; // owned by layout + HbDocumentLoader* mDocument; + QList mOriginalGroupMembers; + QContactAvatar* mAvatar; + CntViewParameters mArgs; +}; + +#endif // CNTGROUPMEMBERVIEW_P_H + +// EOF diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/inc/cnthistoryview.h --- a/phonebookui/pbkcommonui/inc/cnthistoryview.h Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/inc/cnthistoryview.h Wed Aug 18 09:39:00 2010 +0300 @@ -20,6 +20,7 @@ #include #include +#include class HbListView; class CntHistoryModel; @@ -51,10 +52,12 @@ public slots: void updateScrollingPosition(); void clearHistory(); - void handleClearHistory(HbAction *action); + void handleClearHistory(int action); void itemActivated(const QModelIndex &index); void showPreviousView(); void showClearHistoryMenu(); + void showRootView(); + void contactDeletedFromOtherSource(const QList& contactIds); diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/inc/cnthistoryviewitem.h --- a/phonebookui/pbkcommonui/inc/cnthistoryviewitem.h Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/inc/cnthistoryviewitem.h Wed Aug 18 09:39:00 2010 +0300 @@ -50,6 +50,7 @@ * Overriden method to draw the custom item in the list view */ void updateChildItems(); + bool event(QEvent* e); bool getIncoming() const { return mIncoming; } bool isNewMessage() const { return mNewMessage; } diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/inc/cntimageeditorview.h --- a/phonebookui/pbkcommonui/inc/cntimageeditorview.h Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/inc/cntimageeditorview.h Wed Aug 18 09:39:00 2010 +0300 @@ -19,18 +19,19 @@ #define CNTIMAGEEDITORVIEW_H #include -#include +#include #include #include -class HbLabel; +class CntImageLabel; class HbListView; class XQAiwRequest; class ThumbnailManager; class HbAction; class QStandardItemModel; class QModelIndex; +class CntSaveManager; QTM_BEGIN_NAMESPACE class QContact; @@ -75,6 +76,7 @@ void setOrientation(Qt::Orientation orientation); void listViewActivated(const QModelIndex &index); void handleError(int errorCode, const QString& errorMessage); + void saveContact(); #ifdef PBK_UNIT_TEST @@ -84,7 +86,7 @@ #endif QContact *mContact; // own QContactAvatar *mAvatar; // own - HbLabel *mImageLabel; // owned by layout + CntImageLabel *mImageLabel; // owned by layout XQAiwRequest *mRequest; // own XQApplicationManager mAppManager; ThumbnailManager *mThumbnailManager; // own @@ -92,9 +94,10 @@ HbAction *mSoftkey; // owned by view HbAction *mRemoveImage; // own CntAbstractViewManager *mViewManager; - HbDocumentLoader mDocumentLoader; + CntDocumentLoader mDocumentLoader; HbListView *mListView; // owned by layout QStandardItemModel *mModel; // own + CntSaveManager *mSaveManager; // own CntViewParameters mArgs; }; diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/inc/cntimagelabel.h --- a/phonebookui/pbkcommonui/inc/cntimagelabel.h Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/inc/cntimagelabel.h Wed Aug 18 09:39:00 2010 +0300 @@ -19,24 +19,41 @@ #define CNTIMAGELABEL_H #include -#include +#include class QGesture; +class QPixmap; +class HbIconItem; +class HbIcon; -class CntImageLabel : public HbLabel +class CntImageLabel : public HbWidget { Q_OBJECT + Q_PROPERTY(HbIcon icon READ avatarIcon WRITE setAvatarIcon) public: CntImageLabel(QGraphicsItem *parent = 0); ~CntImageLabel(); + void setAvatarIcon(const HbIcon &icon); + HbIcon avatarIcon() const; + + void setIcon(const QPixmap &pixmap); + void clear(); + protected: void gestureEvent(QGestureEvent* event); + void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget); signals: void iconClicked(); void iconLongPressed(const QPointF&); + +private: + HbIconItem* mDefaultAvatar; + HbIcon mIcon; + QPixmap mPixmap; + }; #endif // CNTEDITVIEWHEADINGITEM_H diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/inc/cntimportsview.h --- a/phonebookui/pbkcommonui/inc/cntimportsview.h Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/inc/cntimportsview.h Wed Aug 18 09:39:00 2010 +0300 @@ -53,6 +53,7 @@ void importFetchResultReceivedADN(); void importFetchResultReceivedSDN(); void adnCacheStatusReady(CntSimUtility::CacheStatus& cacheStatus, int error); + void endKeyPressed(); public: CntImportsView(); @@ -117,6 +118,7 @@ int mSdnStoreEntries; bool mSimError; bool mWaitingForAdnCache; + bool mImportInProgress; }; #endif /* CNTIMPORTSVIEW_H_ */ diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/inc/cntkeygrabber.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phonebookui/pbkcommonui/inc/cntkeygrabber.h Wed Aug 18 09:39:00 2010 +0300 @@ -0,0 +1,46 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + +#ifndef CNTKEYGRABBER_H +#define CNTKEYGRABBER_H + +#include + +#include "cntglobal.h" + +class HbMainWindow; +class XQAiwRequest; + +class QTPBK_EXPORT CntKeyGrabber : public QObject +{ + Q_OBJECT + friend class TestCntKeyGrabber; + +public: + CntKeyGrabber(HbMainWindow *window, QObject *parent = NULL); + ~CntKeyGrabber(); + +protected: + bool eventFilter(QObject *obj, QEvent *event); + +private: + HbMainWindow *mMainWindow; + XQAiwRequest *mRequest; + +}; + +#endif // CNTKEYGRABBER_H diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/inc/cntmainwindow.h --- a/phonebookui/pbkcommonui/inc/cntmainwindow.h Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/inc/cntmainwindow.h Wed Aug 18 09:39:00 2010 +0300 @@ -19,7 +19,6 @@ #define CNTMAINWINDOW_H #include -#include #include "cntglobal.h" #include @@ -29,27 +28,15 @@ class QTPBK_EXPORT CntMainWindow : public HbMainWindow { Q_OBJECT + friend class TestCntMainWindow; public: CntMainWindow(QWidget *parent=0, int defaultView = namesView); virtual ~CntMainWindow(); - void keyPressEvent(QKeyEvent *event); - -signals: - - void keyPressed(QKeyEvent *event); - -public slots: - -private slots: - -#ifdef PBK_UNIT_TEST -public: -#else -protected: -#endif +private: CntDefaultViewManager *mViewManager; + int mDefaultView; }; diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/inc/cntmycardselectionview.h --- a/phonebookui/pbkcommonui/inc/cntmycardselectionview.h Tue Jul 06 14:05:47 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,46 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* -*/ - -#ifndef CNTMYCARDSELECTIONVIEW_H -#define CNTMYCARDSELECTIONVIEW_H - -#include "cntbaseselectionview.h" - -class QModelIndex; - -class CntMyCardSelectionView : public CntBaseSelectionView -{ - Q_OBJECT -public: - CntMyCardSelectionView(); - ~CntMyCardSelectionView(); - -public: - int viewId() const { return myCardSelectionView; } - -private slots: - void onListViewActivated(const QModelIndex& index); - -#ifdef PBK_UNIT_TEST -public: -#else -private: -#endif - void removeFromGroup(const QContact* contact); -}; - -#endif /* CNTMYCARDSELECTIONVIEW_H */ diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/inc/cntmycardview.h --- a/phonebookui/pbkcommonui/inc/cntmycardview.h Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/inc/cntmycardview.h Wed Aug 18 09:39:00 2010 +0300 @@ -19,12 +19,11 @@ #define CNTMYCARDVIEW_H_ #include +#include #include - #include class CntAbstractViewManager; -class CntFetchContacts; class HbView; class HbAction; @@ -55,7 +54,7 @@ void showPreviousView(); void openNameEditor(); void openMyCardSelectionView(); - void handleMultiCardSelection(); + void handleMultiCardSelection(QSet aIds); void setOrientation(Qt::Orientation orientation); private: @@ -68,7 +67,6 @@ HbDocumentLoader mDocumentLoader; HbView* mView; // own HbAction* mSoftkey; - CntFetchContacts* mFetchView; friend class TestCntMyCardView; }; diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/inc/cntnamesview_p.h --- a/phonebookui/pbkcommonui/inc/cntnamesview_p.h Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/inc/cntnamesview_p.h Wed Aug 18 09:39:00 2010 +0300 @@ -60,7 +60,7 @@ void deleteContact( QContact& aContact ); void deleteMultipleContacts(); - void handleDeleteMultipleContacts(); + void handleDeleteMultipleContacts( QSet aIds ); void showPreviousView(); void showCollectionView(); @@ -70,15 +70,18 @@ void showContextMenu(HbAbstractViewItem* aItem, QPointF aPoint); void showSettings(); - void executeAction( QContact& aContact, QContactDetail aDetail, QString aAction ); + void executeAction( QContact& aContact, QContactDetail aDetail, QString aAction ); void actionExecuted( CntActionLauncher* aAction ); - void handleDeleteContact( HbAction* aAction ); + void handleDeleteContact( int aAction ); void importSim(); void handleContactAddition(const QList & aAddedList); void handleContactRemoval(const QList & aRemovedList); void handleSelfContactIdChange(const QContactLocalId & aOldId, const QContactLocalId & aNewId); +private slots: + void switchOrientation(); + public: bool isFinderVisible(); void activate( CntAbstractViewManager* aMgr, const CntViewParameters aArgs ); @@ -114,7 +117,6 @@ HbAction* mNewContact; QContactLocalId mHandledContactId; HbAction* mMultipleDeleter; - CntFetchContacts* mFetchView; bool mIsDefault; int mId; QActionGroup* mActionGroup; diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/inc/cntpresencelistener.h --- a/phonebookui/pbkcommonui/inc/cntpresencelistener.h Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/inc/cntpresencelistener.h Wed Aug 18 09:39:00 2010 +0300 @@ -31,6 +31,11 @@ QTM_USE_NAMESPACE +/** + Presence listener for contact card. It provides aggregated + presence information for a contact and separately for each + valid QContactOnlineAccount. +*/ class CntPresenceListener : public QObject { friend class TestCntPresenceListener; @@ -50,7 +55,9 @@ bool parsePresence(QList buddyList); signals: - void accountPresenceUpdated(QString accountUri, bool online); + /// account-specific presence status + void accountPresenceUpdated(const QString& accountUri, bool online); + /// aggregated presence status for this contact void fullPresenceUpdated(bool online); private: diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/inc/cntsavemanager.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phonebookui/pbkcommonui/inc/cntsavemanager.h Wed Aug 18 09:39:00 2010 +0300 @@ -0,0 +1,73 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + +#ifndef CNTSAVEMANAGER_H +#define CNTSAVEMANAGER_H + +#include +#include + +QTM_BEGIN_NAMESPACE +class QContact; +class QContactAvatar; +QTM_END_NAMESPACE + +QTM_USE_NAMESPACE + +/*! + Contact saving helper class. Used mainly in edit view for contact saving, + but should also be used in other (special) cases a contact needs to be saved. + For example "forcing" phonebook to shut down (end key, from task swapper etc..) + in detail editors. +*/ +class CntSaveManager : public QObject +{ + friend class TestCntSaveManager; + Q_OBJECT + +public: + enum CntSaveResult + { + ESaved = 0, + EUpdated, + EDeleted, + EFailed, + ENothingDone + }; + + enum CntContactType + { + EContact = 0, + EMyCard, + EGroup + }; + +public: + CntSaveManager(CntContactType type = EContact, QObject* parent = NULL); + ~CntSaveManager(); + + CntSaveResult saveContact(QContact* aContact, QContactManager* aManager); + +private: + void setPreferredDetails(QContact* aContact); + +private: + CntContactType mContactType; + +}; + +#endif // CNTIMAGEEDITORVIEW_H diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/inc/cntvcarddetailhandler.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phonebookui/pbkcommonui/inc/cntvcarddetailhandler.h Wed Aug 18 09:39:00 2010 +0300 @@ -0,0 +1,69 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + +#include +#include +#include + +#ifndef CNTVCARDDETAILHANDLER_H +#define CNTVCARDDETAILHANDLER_H + +class CntVCardDetailHandler : public QVersitContactExporterDetailHandlerV2 +{ +public: + inline CntVCardDetailHandler(){} + inline void detailProcessed(const QContact& contact, + const QContactDetail& detail, + const QSet& processedFields, + const QVersitDocument& document, + QList* toBeRemoved, + QList* toBeAdded) + { + Q_UNUSED(contact) + Q_UNUSED(detail) + Q_UNUSED(processedFields) + Q_UNUSED(document) + Q_UNUSED(toBeRemoved) + Q_UNUSED(toBeAdded) + } + + inline void contactProcessed(const QContact& contact, + QVersitDocument* document) + { + Q_UNUSED(contact) + // If there is not a FN or N value use an empty FN value. This ensures + // that the vCard created is valid. vCard standard requires a vCard to + // have atlease a name (N) of formatted name (FN) field to be valid. + bool vCardValid(false); + foreach (const QVersitProperty& property, document->properties()) { + const QString& name = property.name(); + if (name == QLatin1String("FN") || name == QLatin1String("N")) { + vCardValid = true; + break; + } + } + + if (!vCardValid) { + QVersitProperty fnProperty; + fnProperty.setName(QLatin1String("FN")); + fnProperty.setValue(QString()); + document->addProperty(fnProperty); + } + } +}; + +#endif diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/inc/cntviewnavigator.h --- a/phonebookui/pbkcommonui/inc/cntviewnavigator.h Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/inc/cntviewnavigator.h Wed Aug 18 09:39:00 2010 +0300 @@ -50,7 +50,7 @@ /*! * Back view returns the previous view */ - const int& back( QFlags &flags ); + const int& back( QFlags &flags, bool toRoot ); /*! * Add exceptions to next/back mechanism. Function will use the aBack argument @@ -65,10 +65,16 @@ void addEffect( const int& aCurrent, const int& aBack ); void removeEffect( const int& aCurrent ); + /*! + * Set a view as a root view. + */ + void addRoot( const int& aCurrent ); + private: QStack iViewStack; QMap< int, int > iExceptions; QMap< int, int > iEffects; + QList iRoots; int iTop; }; #endif /* CNTVIEWNAVIGATOR_H_ */ diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/pbkcommonui.pro --- a/phonebookui/pbkcommonui/pbkcommonui.pro Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/pbkcommonui.pro Wed Aug 18 09:39:00 2010 +0300 @@ -29,6 +29,7 @@ INCLUDEPATH += ../../inc INCLUDEPATH += ../../phonebookengines/cntimageutility/inc INCLUDEPATH += ../../phonebookengines/cntsimutility/inc +INCLUDEPATH += ../phonebookapp/inc INCLUDEPATH += ../cnthistorymodel/inc INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE @@ -96,9 +97,9 @@ inc/cnteditviewdetailitem.h \ inc/cnteditviewheadingitem.h \ inc/cntstringmapper.h \ - inc/cntmycardselectionview.h \ inc/cntmycardview.h \ inc/cntgroupmemberview.h \ + inc/cntgroupmemberview_p.h \ inc/cntgroupactionsview.h \ inc/cntgroupeditormodel.h \ inc/cnthistoryview.h \ @@ -128,7 +129,8 @@ inc/cntgroupdeletepopup.h \ inc/cntextensionmanager.h \ inc/cntimagelabel.h \ - inc/cntfetchcontactsview.h \ + inc/cntfetchcontactpopup.h \ + inc/cntfetchmarkall.h \ inc/cntimportsview.h \ inc/cntsettingsview.h \ inc/cntpresencelistener.h \ @@ -137,8 +139,9 @@ inc/cntcommondetailviewitem.h \ ../../inc/cntdebug.h \ inc/cntactionpopup_p.h \ - inc/cntactionpopup.h - + inc/cntactionpopup.h \ + inc/cntsavemanager.h \ + inc/cntkeygrabber.h SOURCES += \ @@ -174,9 +177,9 @@ src/cnteditviewdetailitem.cpp \ src/cnteditviewheadingitem.cpp \ src/cnteditviewseparator.cpp \ - src/cntmycardselectionview.cpp \ src/cntmycardview.cpp \ src/cntgroupmemberview.cpp\ + src/cntgroupmemberview_p.cpp\ src/cntgroupactionsview.cpp \ src/cntgroupeditormodel.cpp \ src/cnthistoryview.cpp \ @@ -204,16 +207,37 @@ src/cntextensionmanager.cpp \ src/cntimagelabel.cpp \ src/cntimportsview.cpp \ - src/cntfetchcontactsview.cpp \ + src/cntfetchcontactpopup.cpp \ + src/cntfetchmarkall.cpp \ src/cntsettingsview.cpp \ src/cntpresencelistener.cpp \ src/cntdetailorderinghelper.cpp \ src/cntsettingsmodel.cpp \ src/cntcommondetailviewitem.cpp \ src/cntactionpopup_p.cpp \ - src/cntactionpopup.cpp + src/cntactionpopup.cpp \ + src/cntsavemanager.cpp \ + src/cntkeygrabber.cpp + +DOCML += resources/contacts_contactcard.docml \ + resources/contacts_ev.docml \ + resources/contacts_mc.docml \ + resources/contacts_if.docml \ + resources/contacts_list.docml \ + resources/contacts_namelist.docml \ + resources/contacts_groupactions.docml \ + resources/contacts_history.docml \ + resources/contacts_editor.docml \ + resources/contacts_sim.docml \ + resources/contacts_favorite.docml \ + resources/contacts_favmember.docml \ + resources/contacts_collections.docml \ + resources/contacts_groupmembers.docml \ + resources/contacts_detail_editor.docml \ + resources/contacts_fetchdialog.docml \ + resources/contacts_settings.docml -RESOURCES += resources\pbkcommonui.qrc +RESOURCES += resources/pbkcommonui.qrc LIBS+= -lhbcore \ -lxqservice \ diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/resources/contacts_actions.docml --- a/phonebookui/pbkcommonui/resources/contacts_actions.docml Tue Jul 06 14:05:47 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,180 +0,0 @@ - - -

- -

- - \ No newline at end of file diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/resources/contacts_contactcard.docml --- a/phonebookui/pbkcommonui/resources/contacts_contactcard.docml Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/resources/contacts_contactcard.docml Wed Aug 18 09:39:00 2010 +0300 @@ -12,6 +12,9 @@

@@ -33,10 +36,7 @@ - - - @@ -94,9 +94,9 @@ - - - + + + diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/resources/contacts_ev.docml --- a/phonebookui/pbkcommonui/resources/contacts_ev.docml Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/resources/contacts_ev.docml Wed Aug 18 09:39:00 2010 +0300 @@ -34,9 +34,6 @@ - - - @@ -72,9 +69,9 @@ - - - + + + diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/resources/contacts_fetchdialog.docml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phonebookui/pbkcommonui/resources/contacts_fetchdialog.docml Wed Aug 18 09:39:00 2010 +0300 @@ -0,0 +1,186 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ + + + + + + + + + + + + + + + + + + + + + +

+ +

+ + + + + + + + + + + + + + + + + + +

+ +

+ + + + + + + + + + + + + + + + + + + + + + + +

+ +

+ + + + + + + + + + + + + + + + + + + + + +

+ +

+ + + + + + + + + + + + + + + + + +

+ +

+ + + + + + + + + + + + + + + + + + + + + + + +

+ +

+ + + +

+ + + + + + + + diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/resources/contacts_groupmembers.docml --- a/phonebookui/pbkcommonui/resources/contacts_groupmembers.docml Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/resources/contacts_groupmembers.docml Wed Aug 18 09:39:00 2010 +0300 @@ -30,7 +30,7 @@ - + diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/resources/contacts_if.docml --- a/phonebookui/pbkcommonui/resources/contacts_if.docml Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/resources/contacts_if.docml Wed Aug 18 09:39:00 2010 +0300 @@ -1,41 +1,38 @@ - +

- + - - - - + + - - + - - + + - +

- - - - - + + + + +

@@ -45,9 +42,9 @@ - - - + + + diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/resources/pbkcommonui.qrc --- a/phonebookui/pbkcommonui/resources/pbkcommonui.qrc Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/resources/pbkcommonui.qrc Wed Aug 18 09:39:00 2010 +0300 @@ -1,23 +1,23 @@ - contacts_actions.docml - contacts_contactcard.docml - contacts_ev.docml - contacts_mc.docml - contacts_if.docml - contacts_list.docml - contacts_namelist.docml - contacts_groupactions.docml - contacts_history.docml - contacts_editor.docml - contacts_sim.docml - contacts_favorite.docml - contacts_favmember.docml - contacts_collections.docml - contacts_groupmembers.docml - contacts_detail_editor.docml - contacts_settings.docml + contacts_contactcard.docml.bin + contacts_ev.docml.bin + contacts_mc.docml.bin + contacts_if.docml.bin + contacts_list.docml.bin + contacts_namelist.docml.bin + contacts_groupactions.docml.bin + contacts_history.docml.bin + contacts_editor.docml.bin + contacts_sim.docml.bin + contacts_favorite.docml.bin + contacts_favmember.docml.bin + contacts_collections.docml.bin + contacts_groupmembers.docml.bin + contacts_detail_editor.docml.bin + contacts_fetchdialog.docml.bin + contacts_settings.docml.bin style/cnteditviewlistitem.hblistviewitem.widgetml @@ -34,9 +34,12 @@ style/cntcontactcardheadingitem_color.css style/cnthistoryviewitem.widgetml style/cnthistoryviewitem.css - style/cntlocationbutton.hbpushbutton.widgetml - style/cntlocationbutton.css style/cntcommondetailviewitem.widgetml style/cntcommondetailviewitem.css + style/cntimagelabel.widgetml + style/cntimagelabel.css + style/cntfetchmarkall.widgetml + style/cntfetchmarkall.css + style/cntfetchmarkall_color.css diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/resources/style/cntcontactcardheadingitem.widgetml --- a/phonebookui/pbkcommonui/resources/style/cntcontactcardheadingitem.widgetml Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/resources/style/cntcontactcardheadingitem.widgetml Wed Aug 18 09:39:00 2010 +0300 @@ -5,9 +5,9 @@ - - - + + + @@ -19,14 +19,14 @@ - + - - + + @@ -34,7 +34,7 @@ - + diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/resources/style/cnteditviewheadingitem.css --- a/phonebookui/pbkcommonui/resources/style/cnteditviewheadingitem.css Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/resources/style/cnteditviewheadingitem.css Wed Aug 18 09:39:00 2010 +0300 @@ -46,6 +46,13 @@ bottom:0.0un; } +CntEditViewHeadingItem::highlight{ + left:0.0un; + right:0.0un; + top:0.0un; + bottom:0.0un; +} + CntEditViewHeadingItem::iconArea{ left:0.0un; right:0.0un; diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/resources/style/cnteditviewheadingitem.widgetml --- a/phonebookui/pbkcommonui/resources/style/cnteditviewheadingitem.widgetml Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/resources/style/cnteditviewheadingitem.widgetml Wed Aug 18 09:39:00 2010 +0300 @@ -22,6 +22,11 @@ + + + + + @@ -42,6 +47,11 @@ + + + + + @@ -62,6 +72,11 @@ + + + + + @@ -78,6 +93,11 @@ + + + + + @@ -90,6 +110,11 @@ + + + + + @@ -102,6 +127,11 @@ + + + + + diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/resources/style/cnteditviewheadingitem_color.css --- a/phonebookui/pbkcommonui/resources/style/cnteditviewheadingitem_color.css Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/resources/style/cnteditviewheadingitem_color.css Wed Aug 18 09:39:00 2010 +0300 @@ -1,8 +1,16 @@ -CntEditViewHeadingItem::text{ +CntEditViewHeadingItem[state = "normal"]::text{ + color: var(qtc_groupbox_normal); +} + +CntEditViewHeadingItem[state = "normal"]::second_text{ color: var(qtc_groupbox_normal); } -CntEditViewHeadingItem::second_text{ - color: var(qtc_groupbox_normal); +CntEditViewHeadingItem[state = "pressed"]::text{ + color: var(qtc_groupbox_pressed); } +CntEditViewHeadingItem[state = "pressed"]::second_text{ + color: var(qtc_groupbox_pressed); +} + diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/resources/style/cntfetchmarkall.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phonebookui/pbkcommonui/resources/style/cntfetchmarkall.css Wed Aug 18 09:39:00 2010 +0300 @@ -0,0 +1,13 @@ +CntFetchMarkAll{ + layout:default; +} + +CntFetchMarkAll::counter +{ + text-align: right; + text-height: var(hb-param-text-height-tiny); + text-line-count-max: 1; + text-line-count-min: 1; + font-variant:secondary; + right:var(hb-param-margin-gene-popup); +} diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/resources/style/cntfetchmarkall.widgetml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phonebookui/pbkcommonui/resources/style/cntfetchmarkall.widgetml Wed Aug 18 09:39:00 2010 +0300 @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/resources/style/cntfetchmarkall_color.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phonebookui/pbkcommonui/resources/style/cntfetchmarkall_color.css Wed Aug 18 09:39:00 2010 +0300 @@ -0,0 +1,6 @@ +CntFetchMarkAll::counter +{ + color: var(qtc_viewtitle_normal); +} + + diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/resources/style/cnthistoryviewitem.widgetml --- a/phonebookui/pbkcommonui/resources/style/cnthistoryviewitem.widgetml Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/resources/style/cnthistoryviewitem.widgetml Wed Aug 18 09:39:00 2010 +0300 @@ -11,6 +11,7 @@ + @@ -38,6 +39,7 @@ + diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/resources/style/cntimagelabel.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phonebookui/pbkcommonui/resources/style/cntimagelabel.css Wed Aug 18 09:39:00 2010 +0300 @@ -0,0 +1,4 @@ +CntImageLabel +{ + layout: avatar_layout; +} diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/resources/style/cntimagelabel.widgetml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phonebookui/pbkcommonui/resources/style/cntimagelabel.widgetml Wed Aug 18 09:39:00 2010 +0300 @@ -0,0 +1,10 @@ + + + + + + + + + + diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/src/cntactionlauncher.cpp --- a/phonebookui/pbkcommonui/src/cntactionlauncher.cpp Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/src/cntactionlauncher.cpp Wed Aug 18 09:39:00 2010 +0300 @@ -49,6 +49,36 @@ this, SLOT(progress(QContactAction::State))); executed = mContactAction->invokeAction( aContact, aDetail ); } + else + { + progress(QContactAction::FinishedWithErrorState); + } + + return executed; + } + +bool CntActionLauncher::execute( QContact aContact, QContactDetail aDetail, QVariantMap aParameters ) + { + bool executed = false; + QList all = QContactAction::actionDescriptors(mAction, "symbian"); + mContactAction = QContactAction::action( all.first() ); + if ( mContactAction ) + { + if (aContact.preferredDetail(mAction).isEmpty() && (mAction == "call" || mAction == "message" || mAction == "email")) + { + aContact.setPreferredDetail(mAction, aDetail); + //return value will be ignored because we cannot do anything if it fails. + mContactManager->saveContact(&aContact); + } + + connect(mContactAction, SIGNAL(stateChanged(QContactAction::State)), + this, SLOT(progress(QContactAction::State))); + executed = mContactAction->invokeAction( aContact, aDetail, aParameters ); + } + else + { + progress(QContactAction::FinishedWithErrorState); + } return executed; } @@ -67,6 +97,10 @@ this, SLOT(progress(QContactAction::State))); executed = mContactAction->invokeAction( aContact, aDetail ); } + else + { + progress(QContactAction::FinishedWithErrorState); + } return executed; } diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/src/cntactionpopup_p.cpp --- a/phonebookui/pbkcommonui/src/cntactionpopup_p.cpp Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/src/cntactionpopup_p.cpp Wed Aug 18 09:39:00 2010 +0300 @@ -40,6 +40,7 @@ mListView = new HbListView(this); mListModel = new QStandardItemModel(this); setAttribute(Qt::WA_DeleteOnClose, true); + mDataItemList.clear(); } CntActionPopupPrivate::~CntActionPopupPrivate() @@ -169,12 +170,13 @@ { buildEmailActionPopup(); } - else + + if(mDataItemList.count()) { - return false; + showPopup(); + return true; } - showPopup(); - return true; + return false; } @@ -194,6 +196,10 @@ mListView->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Maximum ); QString contactName = mContact->displayLabel(); + if (contactName.isEmpty()) + { + contactName = hbTrId("txt_phob_list_unnamed"); + } HbLabel *label = new HbLabel(); label->setPlainText(contactName); diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/src/cntaddressviewitem.cpp --- a/phonebookui/pbkcommonui/src/cntaddressviewitem.cpp Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/src/cntaddressviewitem.cpp Wed Aug 18 09:39:00 2010 +0300 @@ -70,25 +70,21 @@ HbDataFormModelItem::DataItemType itemType = static_cast( modelIndex().data(HbDataFormModelItem::ItemTypeRole).toInt()); - HbWidget* widget = new HbWidget(); + HbWidget* widget = NULL; + if( itemType == HbDataFormModelItem::CustomItemBase ) { - QGraphicsLinearLayout* layout = new QGraphicsLinearLayout(Qt::Horizontal); - widget->setLayout(layout); - - HbStyleLoader::registerFilePath(":/style/cntlocationbutton.css"); - HbStyleLoader::registerFilePath(":/style/cntlocationbutton.hbpushbutton.widgetml"); - HbDataForm* form = static_cast (itemView()); - HbDataFormModel* model = static_cast (form->model()); + HbPushButton* locationButton = new HbPushButton(this); + + // Naming UI components for automation testability + locationButton->setObjectName("Select location button"); + locationButton->setText( hbTrId("txt_phob_button_select_location") ); + locationButton->setTextAlignment( Qt::AlignCenter ); + locationButton->setContentsMargins(0,0,0,0); - HbPushButton* mLocationButton = new HbPushButton(this); - mLocationButton->setObjectName("cntlocationbutton"); - mLocationButton->setText( hbTrId("txt_phob_button_select_location") ); - mLocationButton->setTextAlignment( Qt::AlignCenter ); + connect(locationButton, SIGNAL(clicked()), this, SLOT(launchLocationPicker())); - connect(mLocationButton, SIGNAL(clicked()), this, SLOT(launchLocationPicker())); - - layout->addItem(mLocationButton); + widget = locationButton; } return widget; @@ -151,6 +147,6 @@ } - Q_IMPLEMENT_USER_METATYPE(QLocationPickerItem) +Q_IMPLEMENT_USER_METATYPE(QLocationPickerItem) // End of File diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/src/cntbaseselectionview.cpp --- a/phonebookui/pbkcommonui/src/cntbaseselectionview.cpp Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/src/cntbaseselectionview.cpp Wed Aug 18 09:39:00 2010 +0300 @@ -52,7 +52,7 @@ indexFeedback->setItemView(mListView); mSoftkey = new HbAction(Hb::BackNaviAction, mView); - connect( mSoftkey, SIGNAL(triggered()), this, SLOT(closeView()) ); + connect( mSoftkey, SIGNAL(triggered()), this, SIGNAL(viewClosed()) ); } CntBaseSelectionView::~CntBaseSelectionView() @@ -105,12 +105,4 @@ return mView; } -void CntBaseSelectionView::closeView() -{ - emit viewClosed(); - - CntViewParameters args; - mMgr->back( args ); -} - // EOF diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/src/cntcollectionlistmodel.cpp --- a/phonebookui/pbkcommonui/src/cntcollectionlistmodel.cpp Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/src/cntcollectionlistmodel.cpp Wed Aug 18 09:39:00 2010 +0300 @@ -108,7 +108,7 @@ if (!p->fetched) { - mThread->scheduleJob(row, p->id); + mThread->scheduleJob(p->id); p->fetched = true; } @@ -163,6 +163,32 @@ } /*! + Adds a row to the model. This is called from addGroup(int localId), so no + real logic in here. + + \param row the first row which is added + \param count amount of rows to be added (not supported) + \param parent not used as all items share the same parent + \return success of the operation +*/ +bool CntCollectionListModel::insertRows(int row, int count, const QModelIndex &parent) +{ + Q_UNUSED(count); + Q_UNUSED(parent); + + if ( !validateRowIndex(row) ) + { + return false; + } + + beginInsertRows(parent, row, row); + + endInsertRows(); + + return true; +} + +/*! Remove given group from the model. Ignore plugin groups. \param localId QContactLocalId of the group that should be removed @@ -184,6 +210,87 @@ } /*! + Add a new group to the model. This also takes care of putting it in the + correct row. + + \param localId QContactLocalId of the group that should be added +*/ +void CntCollectionListModel::addGroup(int localId) +{ + CNT_ENTRY + + QContactDetailFilter groupFilter; + groupFilter.setDetailDefinitionName(QContactType::DefinitionName, QContactType::FieldType); + groupFilter.setValue(QString(QLatin1String(QContactType::TypeGroup))); + + QContactSortOrder sortOrderGroupName; + sortOrderGroupName.setDetailDefinitionName(QContactName::DefinitionName, + QContactName::FieldCustomLabel); + sortOrderGroupName.setCaseSensitivity(Qt::CaseInsensitive); + + QList groupsOrder; + groupsOrder.append(sortOrderGroupName); + + QList groupContactIds = d->mContactManager->contactIds(groupFilter, groupsOrder); + + int row = 1; + + for (int i = 0;i < groupContactIds.count();i++) + { + if (groupContactIds.at(i) == localId) + { + row += d->mExtensions.count(); + + CollectionItemPointer item(new CntCollectionItem()); + + QContactFetchHint noRelationshipsFetchHint; + noRelationshipsFetchHint.setOptimizationHints(QContactFetchHint::NoRelationships); + + QContact contact = d->mContactManager->contact(groupContactIds.at(i), noRelationshipsFetchHint); + QContactName contactName = contact.detail(); + QString groupName = contactName.customLabel(); + + if (groupName.isNull()) + { + item->groupName = hbTrId("txt_phob_dblist_unnamed"); + } + else + { + item->groupName = groupName; + } + + item->icon = HbIcon("qtg_large_custom"); + + QList details = contact.details(); + for (int k = 0;k < details.count();k++) + { + if (details.at(k).imageUrl().isValid()) + { + int id = d->mThumbnailManager->getThumbnail(details.at(k).imageUrl().toString()); + d->mIconRequests.insert(id, groupContactIds.at(i)); + break; + } + } + + // contact Id for identification + item->id = groupContactIds.at(i); + item->secondLineText = " "; + item->memberCount = -1; + + d->mList.insert(row, item); + insertRow(row); + break; + } + else if (groupContactIds.at(i) != d->mFavoriteGroupId) + { + row++; + } + } + + CNT_EXIT +} + +/*! Check if list item at given index is coming from an extension plugin or not. \param index the QModelIndex of the list item @@ -247,6 +354,25 @@ } /*! + Get the index for a given group id. + + \param localId the id of the group + \return QModelIndex of the group +*/ +QModelIndex CntCollectionListModel::indexOfGroup(int localId) +{ + for (int i = 0;i < d->mList.count();i++) + { + if (d->mList.at(i)->id == localId && !d->mList.at(i)->isPlugin) + { + return index(i); + } + } + + return QModelIndex(); +} + +/*! Initialize different groups. */ void CntCollectionListModel::doConstruct() @@ -295,24 +421,31 @@ CntUiGroupSupplier* groupSupplier = d->mExtensionManager.pluginAt(i)->groupSupplier(); if (groupSupplier) { - for(int j = 0;j < groupSupplier->groupCount();j++) + if (groupSupplier->isAsynch()) + { + connect(groupSupplier, SIGNAL(groupsReady()), this, SLOT(extensionGroupsReady())); + } + else { - const CntUiExtensionGroup& group = groupSupplier->groupAt(j); - - CollectionItemPointer item(new CntCollectionItem()); - - item->groupName = group.name(); - item->secondLineText = group.extraText(); - item->memberCount = group.memberCount(); - item->icon = HbIcon(group.groupIcon()); - item->secondaryIcon = HbIcon(group.extraIcon()); - - item->id = group.serviceId(); - item->isPlugin = true; - item->fetched = true; - - d->mExtensions.insert(rowCount(), groupSupplier); - d->mList.append(item); + for (int j = 0;j < groupSupplier->groupCount();j++) + { + const CntUiExtensionGroup& group = groupSupplier->groupAt(j); + + CollectionItemPointer item(new CntCollectionItem()); + + item->groupName = group.name(); + item->secondLineText = group.extraText(); + item->memberCount = group.memberCount(); + item->icon = HbIcon(group.groupIcon()); + item->secondaryIcon = HbIcon(group.extraIcon()); + + item->id = group.serviceId(); + item->isPlugin = true; + item->fetched = true; + + d->mExtensions.insert(rowCount(), groupSupplier); + d->mList.append(item); + } } } } @@ -371,7 +504,7 @@ if (details.at(k).imageUrl().isValid()) { int id = d->mThumbnailManager->getThumbnail(details.at(k).imageUrl().toString()); - d->mIconRequests.insert(id, rowCount()); + d->mIconRequests.insert(id, groupContactIds.at(i)); break; } } @@ -450,17 +583,25 @@ \param secondRowText text to be shown in the second row \param memberCount the amount of members the group has (shown in text-3 in HbListViewItem) */ -void CntCollectionListModel::informationUpdated(int row, const QString& secondRowText, int memberCount) +void CntCollectionListModel::informationUpdated(int id, const QString& secondRowText, int memberCount) { CNT_ENTRY - CollectionItemPointer item = d->mList.at(row); - - item->secondLineText = secondRowText; - item->memberCount = memberCount; - - int idx = d->mList.indexOf(item); - emit dataChanged(index(idx, 0), index(idx, 0)); + for (int i = 0;i < d->mList.count();i++) + { + if (d->mList.at(i)->id == id && !d->mList.at(i)->isPlugin) + { + CollectionItemPointer item = d->mList.at(i); + + item->secondLineText = secondRowText; + item->memberCount = memberCount; + + int idx = d->mList.indexOf(item); + emit dataChanged(index(idx, 0), index(idx, 0)); + + break; + } + } CNT_EXIT } @@ -482,15 +623,77 @@ if (error == 0) { - int row = d->mIconRequests.take(id); - - CollectionItemPointer item = d->mList.at(row); + int localId = d->mIconRequests.take(id); - item->icon = HbIcon(pixmap); - - int idx = d->mList.indexOf(item); - emit dataChanged(index(idx, 0), index(idx, 0)); + for (int i = 0;i < d->mList.count();i++) + { + if (d->mList.at(i)->id == localId && !d->mList.at(i)->isPlugin) + { + CollectionItemPointer item = d->mList.at(i); + + item->icon = HbIcon(pixmap); + + int idx = d->mList.indexOf(item); + emit dataChanged(index(idx, 0), index(idx, 0)); + + break; + } + } } CNT_EXIT } + +/*! + Slot to handle asynchronously initiated extension groups. As + these are added right after the static favorites group, this takes + also care of updating the mapping between row and CntUiGroupSuppliers + in case there was already some synchronously loaded extension groups. +*/ +void CntCollectionListModel::extensionGroupsReady() +{ + CntUiGroupSupplier* groupSupplier = static_cast(sender()); + + int addedCount = groupSupplier->groupCount(); + + if (addedCount > 0) + { + QList rowList = d->mExtensions.keys(); + QList supplierList = d->mExtensions.values(); + + d->mExtensions.clear(); + + for (int i = 0;i < rowList.count();i++) + { + int row = rowList.at(i) + addedCount; + CntUiGroupSupplier* supplier = supplierList.at(i); + + d->mExtensions.insert(row, supplier); + } + + + beginInsertRows(QModelIndex(), 1, groupSupplier->groupCount()); + + for (int j = 0;j < groupSupplier->groupCount();j++) + { + const CntUiExtensionGroup& group = groupSupplier->groupAt(j); + + CollectionItemPointer item(new CntCollectionItem()); + + item->groupName = group.name(); + item->secondLineText = group.extraText(); + item->memberCount = group.memberCount(); + item->icon = HbIcon(group.groupIcon()); + item->secondaryIcon = HbIcon(group.extraIcon()); + + item->id = group.serviceId(); + item->isPlugin = true; + item->fetched = true; + + d->mExtensions.insert(1 + j, groupSupplier); + d->mList.insert(1 + j, item); + } + + endInsertRows(); + } +} diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/src/cntcollectionlistmodelworker.cpp --- a/phonebookui/pbkcommonui/src/cntcollectionlistmodelworker.cpp Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/src/cntcollectionlistmodelworker.cpp Wed Aug 18 09:39:00 2010 +0300 @@ -109,12 +109,11 @@ } /*! - Schedule an asynch job for the given row (model) and contact id. + Schedule an asynch job for the given contact id. - \param row the row in the model - \param id the QContactLocalId of the group in the given row + \param id the QContactLocalId of the group */ -void CntCollectionListModelWorker::scheduleJob(int row, int id) +void CntCollectionListModelWorker::scheduleJob(int id) { CNT_ENTRY @@ -134,7 +133,7 @@ HbApplication::instance()->postEvent(this, new QEvent(QEvent::User)); } - mJobs.append(QPair(row, id)); + mJobs.append(id); mMutex.unlock(); @@ -163,12 +162,10 @@ else { // get next job - QPair pair = mJobs.takeFirst(); - int row = pair.first; - int id = pair.second; + int id = mJobs.takeFirst(); mMutex.unlock(); - fetchInformation(row, id); + fetchInformation(id); } HbApplication::processEvents(); @@ -182,10 +179,9 @@ and the amount of contacts in the group. Emits the result as a signal for CntCollectionListModel to handle. - \param row the row in the model \param id the QContactLocalId of the group in the given row */ -void CntCollectionListModelWorker::fetchInformation(int row, int id) +void CntCollectionListModelWorker::fetchInformation(int id) { CNT_ENTRY @@ -238,9 +234,9 @@ for(int i = 0;i < groupMemberIds.count();i++) { QContactFetchHint nameOnlyFetchHint; - QStringList details; + /*QStringList details; details << QContactDisplayLabel::DefinitionName; - nameOnlyFetchHint.setDetailDefinitionsHint(details); + nameOnlyFetchHint.setDetailDefinitionsHint(details);*/ nameOnlyFetchHint.setOptimizationHints(QContactFetchHint::NoRelationships); QContact contact = mManager->contact(groupMemberIds.at(i), nameOnlyFetchHint); @@ -275,7 +271,7 @@ } } - emit fetchDone(row, secondLineText, memberCount); + emit fetchDone(id, secondLineText, memberCount); CNT_EXIT } diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/src/cntcollectionview.cpp --- a/phonebookui/pbkcommonui/src/cntcollectionview.cpp Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/src/cntcollectionview.cpp Wed Aug 18 09:39:00 2010 +0300 @@ -16,12 +16,13 @@ */ #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 @@ -30,7 +31,7 @@ #include #include #include -#include +#include #include #include #include @@ -41,6 +42,7 @@ #include #include +#include #include const char *CNT_COLLECTIONVIEW_XML = ":/xml/contacts_collections.docml"; @@ -61,7 +63,6 @@ mNewGroupAction(NULL), mDeleteGroupsAction(NULL), mHandledContact(NULL), - mFetchView(NULL), mActionGroup(NULL) { bool ok = false; @@ -98,8 +99,10 @@ groups->setChecked(true); mFindAction = static_cast(mDocumentLoader.findObject("cnt:find")); - mFindAction->setEnabled(false); + connect(mFindAction, SIGNAL(triggered()), this, SLOT(showNamesViewWithFinder())); mExtensionAction = static_cast (mDocumentLoader.findObject("cnt:activity")); + + connect( qApp, SIGNAL(aboutToQuit()), this, SLOT(notifyNewGroup())); } /*! @@ -111,9 +114,6 @@ delete mHandledContact; mHandledContact = NULL; - - delete mFetchView; - mFetchView = NULL; } /*! @@ -159,9 +159,6 @@ 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 } @@ -188,6 +185,16 @@ } /*! +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. */ void CntCollectionView::openGroup(const QModelIndex &index) @@ -227,7 +234,7 @@ else { CntViewParameters viewParameters; - viewParameters.insert(EViewId, FavoritesMemberView); + viewParameters.insert(EViewId, favoritesMemberView); QVariant var; var.setValue(favoriteGroup); viewParameters.insert(ESelectedGroupContact, var); @@ -257,7 +264,7 @@ 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)); @@ -280,22 +287,20 @@ void CntCollectionView::handleMenu(HbAction* action) { - int row = action->data().toInt(); HbMenu *menuItem = static_cast(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); - } + } } @@ -307,6 +312,7 @@ HbLineEdit *lineEdit = popup->lineEdit(); lineEdit->setInputMethodHints(Qt::ImhNoPredictiveText); + lineEdit->setMaxLength( CNT_GROUPNAME_MAXLENGTH ); popup->setPromptText(hbTrId("txt_phob_title_new_group_name")); popup->clearActions(); @@ -343,43 +349,81 @@ QSet contactsSet = contactsList.toSet(); // Select some contact(s) to add to the group - QString groupNameCreated(mHandledContact->displayLabel()); - mFetchView->setDetails(HbParameterLengthLimiter(hbTrId("txt_phob_title_members_of_1_group")).arg(groupNameCreated), - hbTrId("txt_common_button_save")); - mFetchView->displayContacts(HbAbstractItemView::MultiSelection, contactsSet); + QString groupNameCreated = mHandledContact->displayLabel(); + if (groupNameCreated.isEmpty()) + { + groupNameCreated = hbTrId("txt_phob_list_unnamed"); + } + + CntFetchContactPopup* popup = CntFetchContactPopup::createMultiSelectionPopup( + HbParameterLengthLimiter(hbTrId("txt_phob_title_members_of_1_group")).arg(groupNameCreated), + hbTrId("txt_common_button_save"), + *mViewManager->contactManager(SYMBIAN_BACKEND)); + connect( popup, SIGNAL(fetchReady(QSet)), this, SLOT(handleNewGroupMembers(QSet)) ); + connect( popup, SIGNAL(fetchCancelled()), this, SLOT(handleCancelGroupMembers()) ); + + popup->setSelectedContacts( contactsSet ); + popup->showPopup(); } } -void CntCollectionView::handleNewGroupMembers() +void CntCollectionView::handleNewGroupMembers( QSet aIds ) { - mSelectedContactsSet = mFetchView->getSelectedContacts(); - if ( !mFetchView->wasCanceled() && mSelectedContactsSet.size() ) { + 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); } - - QString groupNameCreated(mHandledContact->displayLabel()); - HbNotificationDialog::launchDialog(HbParameterLengthLimiter(hbTrId("txt_phob_dpophead_new_group_1_created")).arg(groupNameCreated)); + else + { + mModel->addGroup(mHandledContact->localId()); + mDeleteGroupsAction->setEnabled(true); + } + notifyNewGroup(); +} - // Refresh the page - refreshDataModel(); +void CntCollectionView::handleCancelGroupMembers() +{ + mSelectedContactsSet.clear(); + mModel->addGroup(mHandledContact->localId()); mDeleteGroupsAction->setEnabled(true); + + notifyNewGroup(); +} - delete mHandledContact; - 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); } @@ -388,20 +432,22 @@ { 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*)), - hbTrId("txt_common_button_delete"), hbTrId("txt_common_button_cancel"), headingLabel); + , this, SLOT(handleDeleteGroup(int)), HbMessageBox::Delete | HbMessageBox::Cancel, + headingLabel); } -void CntCollectionView::handleDeleteGroup(HbAction* action) +void CntCollectionView::handleDeleteGroup(int action) { - HbMessageBox *note = static_cast(sender()); - - if (note && action == note->actions().first()) + if (action == HbMessageBox::Delete) { getContactManager()->removeContact(mHandledContact->localId()); mModel->removeGroup(mHandledContact->localId()); diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/src/cntcontactcardheadingitem.cpp --- a/phonebookui/pbkcommonui/src/cntcontactcardheadingitem.cpp Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/src/cntcontactcardheadingitem.cpp Wed Aug 18 09:39:00 2010 +0300 @@ -16,6 +16,7 @@ */ #include "cntcontactcardheadingitem.h" +#include "cntdebug.h" #include #include @@ -30,6 +31,8 @@ #include #include #include +#include +#include #include #include #include @@ -48,6 +51,7 @@ mIsFavorite(false), mIsOnline(false) { + HbEffect::add("icon", "groupbox_icon_click", "iconclick"); } CntContactCardHeadingItem::~CntContactCardHeadingItem() @@ -198,7 +202,7 @@ if (!mFrameItem) { mFrameItem = new HbFrameItem(this); - mFrameItem->frameDrawer().setFrameGraphicsName("qtg_fr_groupbox"); + mFrameItem->frameDrawer().setFrameGraphicsName("qtg_fr_groupbox_normal"); mFrameItem->frameDrawer().setFrameType(HbFrameDrawer::NinePieces); mFrameItem->setZValue(-2); style()->setItemName(mFrameItem, "background"); @@ -214,6 +218,10 @@ { initGesture(); } + else + { + ungrabGesture(Qt::TapGesture); + } } void CntContactCardHeadingItem::setIcon(const HbIcon newIcon) @@ -354,16 +362,18 @@ int setting = settingsMng.readItemValue(nameOrderKey, XQSettingsManager::TypeInt).toInt(); QStringList nameList; - QString last; + QString last_first; switch( setting ) { case CntOrderLastFirst: nameList << name.prefix() << name.lastName() << name.firstName() << name.middleName() << name.suffix(); break; case CntOrderLastCommaFirst: - if (!name.lastName().isEmpty()) - last = name.lastName() + ","; - nameList << name.prefix() << last << name.firstName() << name.middleName() << name.suffix(); + if (!name.firstName().isEmpty() && !name.lastName().isEmpty()) + last_first = name.lastName() + ", " + name.firstName(); + else + last_first = !name.firstName().isEmpty() ? name.firstName() : name.lastName(); + nameList << name.prefix() << last_first << name.middleName() << name.suffix(); break; default: // Default to first name last name nameList << name.prefix() << name.firstName() << name.middleName() << name.lastName() << name.suffix(); @@ -432,9 +442,17 @@ case Qt::GestureUpdated: if (tap->tapStyleHint() == HbTapGesture::TapAndHold && mIcon->rect().contains(mapFromScene(tap->position()))) { + HbEffect::cancel(mIcon, QString("iconclick")); processLongPress(tap->position()); } break; + case Qt::GestureStarted: + if (tap->tapStyleHint() == HbTapGesture::Tap && mIcon->rect().contains(mapFromScene(tap->position()))) + { + HbInstantFeedback::play(HbFeedback::Basic); + HbEffect::start(mIcon, QString("icon"), QString("iconclick")); + } + default: break; } diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/src/cntcontactcardview.cpp --- a/phonebookui/pbkcommonui/src/cntcontactcardview.cpp Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/src/cntcontactcardview.cpp Wed Aug 18 09:39:00 2010 +0300 @@ -20,12 +20,13 @@ #include -CntContactCardView::CntContactCardView() : d_ptr(new CntContactCardViewPrivate()) +CntContactCardView::CntContactCardView(bool isTemporary) : d_ptr(new CntContactCardViewPrivate(isTemporary)) { Q_D(CntContactCardView); connect(d_ptr, SIGNAL(backPressed()), this, SIGNAL(backPressed())); connect(d_ptr, SIGNAL(viewActivated(CntAbstractViewManager*, const CntViewParameters)), this, SIGNAL(viewActivated(CntAbstractViewManager*, const CntViewParameters))); + connect(d_ptr, SIGNAL(addToContacts()), this, SIGNAL(addToContacts())); } /*! @@ -62,7 +63,7 @@ int CntContactCardView::viewId() const { - return commLauncherView; + return contactCardView; } // end of file diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/src/cntcontactcardview_p.cpp --- a/phonebookui/pbkcommonui/src/cntcontactcardview_p.cpp Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/src/cntcontactcardview_p.cpp Wed Aug 18 09:39:00 2010 +0300 @@ -63,6 +63,7 @@ #include "cntactionlauncher.h" #include "cntpresencelistener.h" #include "cntactionpopup.h" +#include "cntvcarddetailhandler.h" #define CNT_MAPTILE_PROGRESS_TIMER 100 //100 msec #define CNT_UNKNOWN_MAPTILE_STATUS -1 @@ -74,7 +75,7 @@ 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), @@ -96,7 +97,9 @@ mSendKeyListModel(NULL), mPresenceListener(NULL), mMaptile(NULL), - mProgressTimer(NULL) + mProgressTimer(NULL), + mIsTemporary(isTemporary), + mIsExecutingAction(false) { bool ok; document()->load(CNT_CONTACTCARDVIEW_XML, &ok); @@ -119,7 +122,7 @@ 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())); @@ -169,7 +172,8 @@ delete mPresenceListener; mPresenceListener = NULL; - delete mMaptile; + + delete mMaptile; mMaptile = NULL; delete mProgressTimer; @@ -195,14 +199,22 @@ //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 */ @@ -213,13 +225,14 @@ 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*))); - - setOrientation(window->orientation()); + if (window) + { + connect(window, SIGNAL(orientationChanged(Qt::Orientation)), this, SLOT(setOrientation(Qt::Orientation))); + window->installEventFilter(this); + + setOrientation(window->orientation()); + } QContact contact = aArgs.value(ESelectedContact).value(); mContact = new QContact( contact ); @@ -234,6 +247,12 @@ { mView->toolBar()->removeAction(static_cast(document()->findObject(QString("cnt:sendMyCard")))); } + if (mIsTemporary) + { + mView->menu()->clearActions(); + mView->toolBar()->clearActions(); + mView->toolBar()->addAction(static_cast(document()->findObject(QString("cnt:addtocontact")))); + } // add heading widget to the content QGraphicsWidget *c = document()->findWidget(QString("content")); @@ -241,19 +260,32 @@ mHeadingItem = static_cast(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(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; - mPresenceListener->initialPresences(online); + QMap presences = mPresenceListener->initialPresences(online); mHeadingItem->setOnlineStatus(online); - mImageLabel = static_cast(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 details = mContact->details(); @@ -295,13 +327,36 @@ 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); } + + if (dataItem->detail().definitionName() == QContactOnlineAccount::DefinitionName) + { + for (int i = 0;i < presences.keys().count();i++) + { + QString fullAccount = presences.keys().at(i); + QContactOnlineAccount account = dataItem->detail(); + QString currentFullAccount = account.serviceProvider() + ':' + account.accountUri(); + if (fullAccount == currentFullAccount) + { + if (presences.values().at(i)) + { + dataItem->setSecondaryIcon(HbIcon("qtg_small_online")); + } + mPresenceItems.insert(fullAccount, item); + break; + } + } + } item->setDetails(dataItem); mContainerLayout->addItem(item); @@ -355,7 +410,7 @@ CntContactCardMapTileDetail* detail = new CntContactCardMapTileDetail; if( detail ) { - detail->mContactId = mContact->id().localId(); + detail->mContactId = mContact->localId(); if( dataItem->titleText() == hbTrId("txt_phob_formlabel_address") ) { @@ -395,8 +450,8 @@ setAsFavorite = CntFavourite::isMemberOfFavouriteGroup( contactManager(), mContact ); mHeadingItem->setFavoriteStatus( setAsFavorite ); // if contact is part of favourites group } - qobject_cast(document()->findObject("cnt:setasfavorite"))->setVisible( !setAsFavorite ); - qobject_cast(document()->findObject("cnt:removefromfavorite"))->setVisible( setAsFavorite ); + static_cast(document()->findObject("cnt:setasfavorite"))->setVisible( !setAsFavorite ); + static_cast(document()->findObject("cnt:removefromfavorite"))->setVisible( setAsFavorite ); } document()->findWidget("viewToolbar")->setParent(mView); document()->findWidget("viewMenu")->setParent(mView); @@ -410,8 +465,15 @@ 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(document()->findObject("cnt:activityStream"))->setEnabled(false); + + connect(contactManager(), SIGNAL(contactsRemoved(const QList&)), + this, SLOT(contactDeletedFromOtherSource(const QList&))); + emit viewActivated( mViewManager, aArgs ); CNT_EXIT @@ -458,7 +520,7 @@ CntMapTileService::ContactAddressType sourceAddressType = static_cast ( mAddressList[index]->mAddressType ); - QContactLocalId contactId = mContact->id().localId(); + QContactLocalId contactId = mContact->localId(); if( mAddressList[index]->mDetailItem != NULL ) { @@ -557,7 +619,7 @@ //If there is no maptile displayed, return immediately if( mMaptileLabelList.count() > 0 ) { - QContactLocalId contactId = mContact->id().localId(); + QContactLocalId contactId = mContact->localId(); QList addressDetails = mContact->details(); @@ -644,6 +706,27 @@ return maptileLabel; } +/* +* Update the presence status icon of action item with the given accountUri +*/ +void CntContactCardViewPrivate::updateItemPresence(const QString& accountUri, bool online) +{ + CntContactCardDetailItem* item = mPresenceItems.value(accountUri); + + if (item) + { + if (online) + { + mDataContainer->dataItem(item->index())->setSecondaryIcon(HbIcon("qtg_small_online")); + } + else + { + mDataContainer->dataItem(item->index())->setSecondaryIcon(HbIcon()); + } + item->setDetails(mDataContainer->dataItem(item->index())); + } +} + void CntContactCardViewPrivate::thumbnailReady(const QPixmap& pixmap, void *data, int id, int error) { CNT_ENTRY @@ -656,7 +739,7 @@ mHeadingItem->setIcon(icon); mVCardIcon = new HbIcon(pixmap); mImageLabel->clear(); - mImageLabel->setIcon(icon); + mImageLabel->setIcon(pixmap); } CNT_EXIT @@ -668,14 +751,35 @@ void CntContactCardViewPrivate::sendToHs() { QVariantHash preferences; - preferences["contactId"] = mContact->id().localId(); + preferences["contactId"] = mContact->localId(); - XQServiceRequest snd("com.nokia.services.hsapplication.IHomeScreenClient", + 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 args; + QVariantHash preferences; + preferences["contactId"] = mContact->localId(); + args << preferences; + args << QString("contactwidgethsplugin"); + mRequest->setArguments(args); + mRequest->send(); + } + */ } /*! @@ -721,23 +825,29 @@ */ void CntContactCardViewPrivate::deleteContact() { - QString name = contactManager()->synthesizedDisplayLabel(*mContact); + QString name = contactManager()->synthesizedContactDisplayLabel(*mContact); + if (name.isEmpty()) + { + name = hbTrId("txt_phob_list_unnamed"); + } - HbMessageBox::question(HbParameterLengthLimiter(hbTrId("txt_phob_info_delete_1")).arg(name), this, SLOT(handleDeleteContact(HbAction*)), - hbTrId("txt_common_button_delete"), hbTrId("txt_common_button_cancel")); + HbMessageBox::question(HbParameterLengthLimiter(hbTrId("txt_phob_info_delete_1")).arg(name), this, SLOT(handleDeleteContact(int)), + HbMessageBox::Delete | HbMessageBox::Cancel); } /*! Handle action for deleting a contact */ -void CntContactCardViewPrivate::handleDeleteContact(HbAction *action) +void CntContactCardViewPrivate::handleDeleteContact(int action) { - HbMessageBox *note = static_cast(sender()); - - if (note && action == note->actions().first()) + if (action == HbMessageBox::Delete) { - contactManager()->removeContact(mContact->localId()); - mViewManager->back( mArgs ); + disconnect(contactManager(), SIGNAL(contactsRemoved(const QList&)), + this, SLOT(contactDeletedFromOtherSource(const QList&))); + + contactManager()->removeContact(mContact->localId()); + emit backPressed(); + mViewManager->back( mArgs, true ); } } @@ -759,7 +869,7 @@ */ void CntContactCardViewPrivate::deactivate() { - mView->removeEventFilter(this); + } /*! @@ -767,7 +877,8 @@ */ void CntContactCardViewPrivate::sendBusinessCard() { - qDebug() << "CntContactCardViewPrivate::sendBusinessCard - IN"; + CNT_ENTRY + // Check if the contact has an image. QList avatars = mContact->details(); bool imageExists( false ); @@ -800,10 +911,11 @@ if ( !imageExists ) { - qDebug() << "CntContactCardViewPrivate::sendBusinessCard without image"; + CNT_LOG_ARGS("snd vCard without image") handleSendBusinessCard( NULL ); // no image } - qDebug() << "CntContactCardViewPrivate::sendBusinessCard - OUT"; + + CNT_EXIT } /*! @@ -852,6 +964,15 @@ */ 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()) @@ -876,6 +997,7 @@ if (detail == aDetail && action == aAction) { detailItem = static_cast(mContainerLayout->itemAt(index)); + break; } } executeAction(aContact, aDetail, aAction, detailItem); @@ -887,6 +1009,15 @@ */ 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); @@ -895,6 +1026,7 @@ void CntContactCardViewPrivate::actionExecuted(CntActionLauncher* aAction) { aAction->deleteLater(); + mIsExecutingAction = false; } /*! @@ -1063,8 +1195,9 @@ void CntContactCardViewPrivate::handleSendBusinessCard( HbAction* aAction ) { + CNT_ENTRY Q_UNUSED(aAction); - qDebug() << "CntContactCardViewPrivate::handleSendBusinessCard - IN"; + QList list; /*if ( aAction && aAction->objectName() == "cancel" ) { @@ -1111,21 +1244,28 @@ } } - QString vCardName = QString(mContact->displayLabel().append(".vcf")); + QString vCardName; + if ( mContact->displayLabel().isEmpty() ) { + vCardName = hbTrId("txt_phob_list_unnamed").append(".vcf"); + } else + vCardName = mContact->displayLabel().append(".vcf"); + QString vCardPath = dir.absolutePath().append(QDir::separator()); vCardPath.append(vCardName); vCardPath = QDir::toNativeSeparators(vCardPath); - + QVersitContactExporter exporter; + CntVCardDetailHandler hanlder; + exporter.setDetailHandler(&hanlder); // 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 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); @@ -1142,7 +1282,8 @@ mShareUi->send(l,false); } } - qDebug() << "CntContactCardViewPrivate::handleSendBusinessCard - OUT"; + + CNT_EXIT } @@ -1186,7 +1327,7 @@ } 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); } @@ -1200,7 +1341,7 @@ { HbMenu *menu = new HbMenu(); menu->addAction(hbTrId("txt_phob_menu_change_picture"), this, SLOT(doChangeImage()) ); - if (mAvatar) + if (mAvatar && !mAvatar->imageUrl().isEmpty()) { menu->addAction(hbTrId("txt_phob_menu_remove_image"), this, SLOT(doRemoveImage()) ); } @@ -1229,17 +1370,24 @@ return mViewManager->contactManager(SYMBIAN_BACKEND); } -void CntContactCardViewPrivate::keyPressed(QKeyEvent *event) +bool CntContactCardViewPrivate::eventFilter(QObject *obj, QEvent *event) { - if (event->key() == Qt::Key_Yes ) + if (event->type() == QEvent::KeyPress && obj == mView->mainWindow()) { - sendKeyPressed(); + QKeyEvent *keyEvent = static_cast(event); + if (keyEvent->key() == Qt::Key_Yes) + { + return sendKeyPressed(); + } } + return false; } -void CntContactCardViewPrivate::sendKeyPressed() +bool CntContactCardViewPrivate::sendKeyPressed() { int count = 0; + bool keyConsumed = false; + for (int index = 0; index < mDataContainer->itemCount(); index++) { CntContactCardDataItem* dataItem = mDataContainer->dataItem(index); @@ -1248,41 +1396,58 @@ count++; } } - if (!count) - { - XQServiceRequest snd("com.nokia.services.logsservices.starter", "start(int,bool)", false); - snd << 0; // all calls - snd << true; // show dialpad - snd.send(); - } - else + + if (count) { QContactDetail preferredDetail = mContact->preferredDetail("call"); if (!preferredDetail.isEmpty()) { - executeAction(*mContact, preferredDetail, "call", NULL); + keyConsumed = true; + executeAction(*mContact, preferredDetail, "call"); } else if (count == 1 ) { - mContact->setPreferredDetail("call", mContact->details().first()); - executeAction( *mContact, mContact->details().first(), "call", NULL); + keyConsumed = true; + executeAction( *mContact, mContact->details().first(), "call"); } else if(count >= 2 && mAcceptSendKey) - { + { + keyConsumed = true; 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())); - + SLOT(sendKeyCancelSlot())); + } + else + { + //ignore } } + + return keyConsumed; } void CntContactCardViewPrivate::sendKeyCancelSlot() { mAcceptSendKey = true; } + +void CntContactCardViewPrivate::onAddedToContacts() +{ + emit addToContacts(); +} + +void CntContactCardViewPrivate::contactDeletedFromOtherSource(const QList& 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 diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/src/cntdateeditorviewitem.cpp --- a/phonebookui/pbkcommonui/src/cntdateeditorviewitem.cpp Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/src/cntdateeditorviewitem.cpp Wed Aug 18 09:39:00 2010 +0300 @@ -58,13 +58,27 @@ if ( detail.definitionName() == QContactBirthday::DefinitionName ) { QContactBirthday bd = detail; - editDate( bd.date(), hbTrId("txt_phob_formlabel_birthday") ); + if (bd.date().isNull()) + { + editDate( QDate::currentDate(), hbTrId("txt_phob_formlabel_birthday") ); + } + else + { + editDate( bd.date(), hbTrId("txt_phob_formlabel_birthday") ); + } } if ( detail.definitionName() == QContactAnniversary::DefinitionName ) { QContactAnniversary anniversary = detail; - editDate( anniversary.originalDate(), hbTrId("txt_phob_formlabel_anniversary") ); + if (anniversary.originalDate().isNull()) + { + editDate( QDate::currentDate(), hbTrId("txt_phob_formlabel_anniversary") ); + } + else + { + editDate( anniversary.originalDate(), hbTrId("txt_phob_formlabel_anniversary") ); + } } } @@ -78,9 +92,11 @@ QContactDetail detail = item->detail(); QString text(hbTrId("txt_phob_formlabel_val_formlabel_val_no_date_set")); + QString buttonObjName; if ( detail.definitionName() == QContactBirthday::DefinitionName ) { + buttonObjName = detail.definitionName() + " button"; QContactBirthday birthday = detail; if ( !birthday.isEmpty() ) { @@ -90,6 +106,7 @@ if ( detail.definitionName() == QContactAnniversary::DefinitionName ) { + buttonObjName = detail.definitionName() + " button"; QContactAnniversary anniversary = detail; if ( !anniversary.isEmpty() ) { @@ -97,6 +114,8 @@ } } mButton->setText( text ); + // Naming UI components for automation testability + mButton->setObjectName(buttonObjName); return mButton; } diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/src/cntdefaultviewfactory.cpp --- a/phonebookui/pbkcommonui/src/cntdefaultviewfactory.cpp Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/src/cntdefaultviewfactory.cpp Wed Aug 18 09:39:00 2010 +0300 @@ -34,7 +34,6 @@ #include "cntgroupactionsview.h" #include "cnthistoryview.h" #include "cnteditview.h" -#include "cntmycardselectionview.h" #include "cntimportsview.h" #include "cntsettingsview.h" #include "cntextensionmanager.h" @@ -57,17 +56,15 @@ { case namesView: return new CntNamesView(*mExtensionManager); - case commLauncherView: + case contactCardView: return new CntContactCardView(); case myCardView: return new CntMyCardView(); - case myCardSelectionView: - return new CntMyCardSelectionView(); case collectionView: return new CntCollectionView(*mExtensionManager); case collectionFavoritesView: return new CntFavoritesView(); - case FavoritesMemberView: + case favoritesMemberView: return new CntFavoritesMemberView(); case editView: return new CntEditView(); diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/src/cntdefaultviewmanager.cpp --- a/phonebookui/pbkcommonui/src/cntdefaultviewmanager.cpp Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/src/cntdefaultviewmanager.cpp Wed Aug 18 09:39:00 2010 +0300 @@ -113,14 +113,14 @@ CNT_EXIT } -void CntDefaultViewManager::back(const CntViewParameters aArgs) +void CntDefaultViewManager::back(const CntViewParameters aArgs, bool toRoot) { CNT_ENTRY mArgs.clear(); QFlags flags; - int back = mNavigator->back( flags ); + int back = mNavigator->back( flags, toRoot ); foreach( int k, aArgs.keys() ) { @@ -132,7 +132,8 @@ { switchView( mArgs, flags ); } - else { + else + { // exiting application cleanup(); closeApp(); @@ -192,10 +193,6 @@ { connect(mMainWindow, SIGNAL(viewReady()), this, SLOT(deleteOldView())); } - else - { - mMainWindow->setInteractive( true ); - } CNT_EXIT } @@ -209,28 +206,22 @@ if (mOldView) { mOldView->deactivate(); - - // Due to something strange in wk16, this check will fail occationally and cause - // a memory leak... most likely when opening edit view for the first time - if (mCurrent == NULL || !mOldView->view()->isVisible()) + + HbView* oldView = mOldView->view(); + mMainWindow->removeView( oldView ); + + if (!mOldView->isDefault()) { - mMainWindow->removeView(mOldView->view()); - - if (!mOldView->isDefault()) - { - delete mOldView; - mOldView = NULL; - } - // If view id is not in defaults list, it means that view has changed - // its opinnion about preserving state to true. - else if ( !mDefaults.contains(mOldView->viewId()) ) - { - mDefaults.insert( mOldView->viewId(), mOldView ); - } + delete mOldView; + mOldView = NULL; + } + // If view id is not in defaults list, it means that view has changed + // its opinnion about preserving state to true. + else if ( !mDefaults.contains(mOldView->viewId()) ) + { + mDefaults.insert( mOldView->viewId(), mOldView ); } } - - mMainWindow->setInteractive(true); CNT_EXIT } @@ -238,8 +229,7 @@ void CntDefaultViewManager::switchView(const CntViewParameters aArgs, QFlags flags) { CNT_ENTRY - - mMainWindow->setInteractive(false); + int id = aArgs.value(EViewId).toInt(); if ( id != noView ) { @@ -268,4 +258,10 @@ CNT_EXIT } + +int CntDefaultViewManager::currentViewId() +{ + return mCurrent->viewId(); +} + // End of File diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/src/cntdetaileditor.cpp --- a/phonebookui/pbkcommonui/src/cntdetaileditor.cpp Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/src/cntdetaileditor.cpp Wed Aug 18 09:39:00 2010 +0300 @@ -17,7 +17,9 @@ #include "cntdetaileditor.h" #include "cnteditorfactory.h" #include "cntgroupeditormodel.h" +#include "cntsavemanager.h" #include "cntglobal.h" + #include #include #include @@ -29,6 +31,13 @@ #include #include #include +#include +#include +#include +#include + +#include +#include const char *CNT_DETAILEDITOR_XML = ":/xml/contacts_detail_editor.docml"; @@ -41,7 +50,8 @@ mLoader(NULL), mViewManager(NULL), mEditorFactory(NULL), - mCancel(NULL) + mCancel(NULL), + mSaveManager(NULL) { bool ok; document()->load(CNT_DETAILEDITOR_XML, &ok); @@ -57,16 +67,27 @@ mSoftkey = new HbAction(Hb::BackNaviAction, mView); connect( mSoftkey, SIGNAL(triggered()), this, SLOT(saveChanges()) ); + + // closing the application from task swapper or end key will cause the contact to be saved + connect( qApp, SIGNAL(aboutToQuit()), this, SLOT(saveContact())); } CntDetailEditor::~CntDetailEditor() { mView->deleteLater(); + delete mDataForm; + mDataForm = NULL; delete mDataFormModel; + mDataFormModel = NULL; delete mHeader; + mHeader = NULL; delete mLoader; + mLoader = NULL; delete mEditorFactory; + mEditorFactory = NULL; + delete mSaveManager; + mSaveManager = NULL; } void CntDetailEditor::setViewId( int aId ) @@ -106,8 +127,31 @@ selectedContact = aArgs.value(ESelectedContact).value(); connect( mDataForm, SIGNAL(itemShown(const QModelIndex&)), this, SLOT(handleItemShown(const QModelIndex&)) ); } + + QContactManager* cm = mViewManager->contactManager(SYMBIAN_BACKEND); + connect(cm, SIGNAL(contactsRemoved(const QList&)), + this, SLOT(contactDeletedFromOtherSource(const QList&))); + mEditorFactory->setupEditorView(*this, selectedContact); + QString myCard = mArgs.value( EMyCard ).toString(); + QContactLocalId localId = selectedContact.localId(); + QContactLocalId selfContactId = mViewManager->contactManager(SYMBIAN_BACKEND)->selfContactId(); + bool isMyCard = ( localId == selfContactId && localId != 0 ) || !myCard.isEmpty(); + + if (isMyCard) + { + mSaveManager = new CntSaveManager(CntSaveManager::EMyCard); + } + else if ( mId == groupEditorView ) + { + mSaveManager = new CntSaveManager(CntSaveManager::EGroup); + } + else + { + mSaveManager = new CntSaveManager(); + } + mDataForm->setItemRecycling(true); // add new field if required @@ -115,6 +159,9 @@ { mDataFormModel->insertDetailField(); } + mDataForm->setVerticalScrollBarPolicy(HbScrollArea::ScrollBarAsNeeded); + mDataForm->setScrollingStyle(HbScrollArea::PanWithFollowOn); + mDataForm->verticalScrollBar()->setInteractive(true); } void CntDetailEditor::deactivate() @@ -123,6 +170,10 @@ QContactManager* mgr = mViewManager->contactManager(SYMBIAN_BACKEND); mgr->saveContact( mDataFormModel->contact() ); } + + QContactManager *cm = mViewManager->contactManager(SYMBIAN_BACKEND); + disconnect(cm, SIGNAL(contactsRemoved(const QList&)), + this, SLOT(contactDeletedFromOtherSource(const QList&))); } bool CntDetailEditor::isDefault() const @@ -151,27 +202,42 @@ void CntDetailEditor::handleItemShown(const QModelIndex& aIndex ) { - if ( mId == groupEditorView ) - { - CntGroupEditorModel* groupModel = static_cast( mDataFormModel ); - if ( groupModel->isConferenceNumber(aIndex) ) - { - HbDataFormViewItem* viewItem = static_cast(mDataForm->itemByIndex( aIndex )); - HbLineEdit* edit = static_cast( viewItem->dataItemContentWidget() ); - edit->setInputMethodHints( Qt::ImhDialableCharactersOnly ); - } - } - else + HbDataFormModelItem* modelItem = mDataFormModel->itemFromIndex( aIndex ); + + if ( modelItem->type() == HbDataFormModelItem::TextItem ) { HbDataFormViewItem* viewItem = static_cast(mDataForm->itemByIndex( aIndex )); HbLineEdit* edit = static_cast( viewItem->dataItemContentWidget() ); - edit->setInputMethodHints( Qt::ImhNoPredictiveText ); + QString objName; - HbDataFormModelItem* modelItem = mDataFormModel->itemFromIndex( aIndex ); - if (modelItem->contentWidgetData( "preferDigits" ).toBool()) + if ( mId == groupEditorView ) { - edit->setInputMethodHints( Qt::ImhPreferNumbers ); + CntGroupEditorModel* groupModel = static_cast( mDataFormModel ); + if ( groupModel->isConferenceNumber(aIndex) ) + { + edit->setInputMethodHints( Qt::ImhDialableCharactersOnly ); + objName = "Conference number line edit %1"; + } + else + { + edit->setInputMethodHints( Qt::ImhNoPredictiveText ); + objName = "Group name line edit %1"; + } } + else + { + edit->setInputMethodHints( Qt::ImhNoPredictiveText ); + + if (modelItem->contentWidgetData( "preferDigits" ).toBool()) + { + edit->setInputMethodHints( Qt::ImhPreferNumbers ); + } + + objName = mDataFormModel->detail().definitionName() + " line edit %1"; + } + + // Naming UI components for automation testability + edit->setObjectName(objName.arg(aIndex.row())); } } @@ -184,6 +250,10 @@ mViewManager->back( mArgs ); } +/*! + Saves all changes made to details (type of details depends on + in which editor we are) of a contact. Doesn't save the contact. +*/ void CntDetailEditor::saveChanges() { mDataFormModel->saveContactDetails(); @@ -208,6 +278,46 @@ mViewManager->back( mArgs ); } +/*! + First saves all changes made to details (type of details depends on + in which editor we are) of a contact and then saves the contact. This + is only called when phonebook is being closed either from task swapper + or by end key. +*/ +void CntDetailEditor::saveContact() +{ + mDataFormModel->saveContactDetails(); + + QString name = mViewManager->contactManager(SYMBIAN_BACKEND)->synthesizedContactDisplayLabel(*mDataFormModel->contact()); + + if (name.isEmpty()) + { + name = hbTrId("txt_phob_list_unnamed"); + } + + CntSaveManager::CntSaveResult result = mSaveManager->saveContact(mDataFormModel->contact(), mViewManager->contactManager(SYMBIAN_BACKEND)); + + if (mId != groupEditorView) + { + switch (result) + { + case CntSaveManager::ESaved: + HbDeviceNotificationDialog::notification(QString(),HbParameterLengthLimiter(hbTrId("txt_phob_dpophead_contact_1_saved")).arg(name)); + break; + case CntSaveManager::EUpdated: + HbDeviceNotificationDialog::notification(QString(),HbParameterLengthLimiter(hbTrId("txt_phob_dpophead_contacts_1_updated")).arg(name)); + break; + case CntSaveManager::EFailed: + HbDeviceNotificationDialog::notification(QString(),hbTrId("SAVING FAILED!")); + break; + case CntSaveManager::EDeleted: + case CntSaveManager::ENothingDone: + default: + break; + } + } +} + void CntDetailEditor::setHeader(QString aHeader) { if (!mHeader) { @@ -236,4 +346,28 @@ return mId; } +/*! +Go back to the root view +*/ +void CntDetailEditor::showRootView() +{ + mViewManager->back( mArgs, true ); +} + + +void CntDetailEditor::contactDeletedFromOtherSource(const QList& contactIds) +{ + CNT_ENTRY + + QContact normalContact = mArgs.value(ESelectedContact).value(); + QContact groupContact = mArgs.value(ESelectedGroupContact).value(); + if ( contactIds.contains(normalContact.localId()) || contactIds.contains(groupContact.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())); + } + CNT_EXIT +} + // End of File diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/src/cntdetailpopup.cpp --- a/phonebookui/pbkcommonui/src/cntdetailpopup.cpp Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/src/cntdetailpopup.cpp Wed Aug 18 09:39:00 2010 +0300 @@ -18,23 +18,13 @@ #include "cntdetailpopup.h" #include -#include -#include -#include -#include -#include #include -QTM_USE_NAMESPACE - CntDetailPopup::CntDetailPopup(QGraphicsItem *parent, CntViewIdList aList ): - HbDialog(parent), + HbSelectionDialog(parent), mListModel(NULL), - mListView(NULL), - mSelectedDetail(0), mViewIdList( aList ) { - mListView = new HbListView(this); mListModel = new QStandardItemModel(this); addListItem("qtg_small_mobile", hbTrId("txt_phob_list_number"), phoneNumberEditorView ); @@ -47,41 +37,21 @@ addListItem("qtg_small_company_details", hbTrId("txt_phob_list_company_details"), companyEditorView); addListItem("qtg_small_family", hbTrId("txt_phob_list_family"), familyDetailEditorView); - mListView->setModel(mListModel); - mListView->setSelectionMode(HbAbstractItemView::NoSelection); - // ownership of prototype is not transferred - HbListViewItem* prototype = mListView->listItemPrototype(); - prototype->setGraphicsSize( HbListViewItem::SmallIcon ); - HbLabel *label = new HbLabel(this); label->setPlainText(hbTrId("txt_phob_title_add_field")); setHeadingWidget(label); - setContentWidget(mListView); - - HbAction *cancelAction = new HbAction(hbTrId("txt_common_button_cancel"), this); - addAction(cancelAction); setTimeout(HbDialog::NoTimeout); setDismissPolicy(HbDialog::NoDismiss); setAttribute(Qt::WA_DeleteOnClose, true); setModal(true); - - connect(mListView, SIGNAL(activated(const QModelIndex&)), this, SLOT(listItemSelected(QModelIndex))); + setSelectionMode(HbAbstractItemView::SingleSelection); + setModel(mListModel); } CntDetailPopup::~CntDetailPopup() { -} - -void CntDetailPopup::listItemSelected(QModelIndex index) -{ - mSelectedDetail = mListModel->item(index.row())->data(Qt::UserRole).toInt(); - close(); -} - -int CntDetailPopup::selectedDetail() -{ - return mSelectedDetail; + } void CntDetailPopup::selectDetail( CntViewIdList aList, QObject *receiver, const char *member ) diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/src/cntdocumentloader.cpp --- a/phonebookui/pbkcommonui/src/cntdocumentloader.cpp Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/src/cntdocumentloader.cpp Wed Aug 18 09:39:00 2010 +0300 @@ -21,6 +21,7 @@ #include "cntdocumentloader.h" #include "cnteditviewheadingitem.h" #include "cntcontactcardheadingitem.h" +#include "cntfetchmarkall.h" #include "cntimagelabel.h" CntDocumentLoader::CntDocumentLoader() @@ -59,6 +60,14 @@ result->setObjectName(name); } } + else if ( type == "CntFetchMarkAll" ) + { + result = new CntFetchMarkAll(); + if ( result ) + { + result->setObjectName(name); + } + } else { result = HbDocumentLoader::createObject(type,name); diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/src/cnteditview_p.cpp --- a/phonebookui/pbkcommonui/src/cnteditview_p.cpp Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/src/cnteditview_p.cpp Wed Aug 18 09:39:00 2010 +0300 @@ -21,7 +21,9 @@ #include "cntdetailpopup.h" #include "cnteditviewheadingitem.h" #include "cntimagelabel.h" +#include "cntsavemanager.h" #include "cntglobal.h" +#include "cntdebug.h" #include #include @@ -39,17 +41,22 @@ #include #include #include -#include +#include + +#include +#include +#include const char *CNT_EDIT_XML = ":/xml/contacts_ev.docml"; CntEditViewPrivate::CntEditViewPrivate() : -mModel( NULL ), -mImageLabel( NULL ), -mThumbnailManager( NULL ), -mContact( NULL ), -mReq(0), -mMenu(NULL) + mModel( NULL ), + mImageLabel( NULL ), + mThumbnailManager( NULL ), + mContact( NULL ), + mReq(NULL), + mMenu(NULL), + mSaveManager(NULL) { mDocument = new CntDocumentLoader; @@ -93,19 +100,30 @@ connect( mHeading, SIGNAL(iconClicked()), this, SLOT(openImageEditor()) ); connect( mListView, SIGNAL(activated(const QModelIndex&)), this, SLOT(activated(const QModelIndex&)) ); connect( mListView, SIGNAL(longPressed(HbAbstractViewItem*,const QPointF&)), this, SLOT(longPressed(HbAbstractViewItem*,const QPointF&)) ); + + // closing the application from task swapper or end key will cause the contact to be saved + connect( qApp, SIGNAL(aboutToQuit()), this, SLOT(saveChanges())); } CntEditViewPrivate::~CntEditViewPrivate() { mView->deleteLater(); + delete mDocument; + mDocument = NULL; delete mModel; + mModel = NULL; delete mContact; + mContact = NULL; if (mMenu) { delete mMenu; + mMenu = NULL; } delete mThumbnailManager; + mThumbnailManager = NULL; + delete mSaveManager; + mSaveManager = NULL; } void CntEditViewPrivate::setOrientation(Qt::Orientation orientation) @@ -124,6 +142,8 @@ void CntEditViewPrivate::activate( CntAbstractViewManager* aMgr, const CntViewParameters aArgs ) { + CNT_ENTRY + mMgr = aMgr; mArgs = aArgs; @@ -150,7 +170,16 @@ QContactLocalId localId = mContact->localId(); QContactManager* cm = mMgr->contactManager(SYMBIAN_BACKEND); QContactLocalId selfContactId = cm->selfContactId(); - mIsMyCard = ( localId == selfContactId && localId != 0 ) || myCard == "myCard"; + mIsMyCard = ( localId == selfContactId && localId != 0 ) || !myCard.isEmpty(); + + if (mIsMyCard) + { + mSaveManager = new CntSaveManager(CntSaveManager::EMyCard); + } + else + { + mSaveManager = new CntSaveManager(); + } if ( mHeading ) mHeading->setDetails( mContact, mIsMyCard ); @@ -195,6 +224,8 @@ this, SLOT(thumbnailReady(QPixmap, void*, int, int)) ); loadAvatar(); + + CNT_EXIT } void CntEditViewPrivate::deactivate() @@ -321,10 +352,12 @@ { CntDetailPopup *popup = static_cast(sender()); - if (popup && aAction != popup->actions().first()) + if (popup && aAction != popup->actions().first() && popup->selectedItems().count()) { - int id = popup->selectedDetail(); - + int row = popup->selectedItems().first().toInt(); + QModelIndex index = popup->model()->index(row, 0); + int id = popup->model()->data(index, Qt::UserRole).toInt(); + if (id != noView ) { mArgs.insert(EViewId, id ); @@ -423,31 +456,36 @@ if ( mIsMyCard ) { HbMessageBox::question(hbTrId("txt_phob_dialog_remove_all_personal_data_from_my_c"), this, - SLOT(handleDeleteContact(HbAction*)), - hbTrId("txt_common_button_yes"), - hbTrId("txt_common_button_no")); + SLOT(handleDeleteContact(int)), + HbMessageBox::Yes | HbMessageBox::No); } else { QContactManager* cm = mMgr->contactManager( SYMBIAN_BACKEND ); - QString name = cm->synthesizedDisplayLabel( *mContact ); - HbMessageBox::question(HbParameterLengthLimiter(hbTrId("txt_phob_info_delete_1")).arg(name), this, SLOT(handleDeleteContact(HbAction*)), - hbTrId("txt_common_button_delete"), hbTrId("txt_common_button_cancel")); + QString name = cm->synthesizedContactDisplayLabel( *mContact ); + if (name.isEmpty()) + { + name = hbTrId("txt_phob_list_unnamed"); + } + + HbMessageBox::question(HbParameterLengthLimiter(hbTrId("txt_phob_info_delete_1")).arg(name), this, SLOT(handleDeleteContact(int)), + HbMessageBox::Delete | HbMessageBox::Cancel); } } -void CntEditViewPrivate::handleDeleteContact(HbAction *action) +void CntEditViewPrivate::handleDeleteContact(int action) { Q_Q(CntEditView); - - HbMessageBox *dlg = static_cast(sender()); - if(dlg && action == dlg->actions().first()) + + if(action == HbMessageBox::Yes || action == HbMessageBox::Delete) { QContactManager* cm = mMgr->contactManager( SYMBIAN_BACKEND ); + disconnect(cm, SIGNAL(contactsRemoved(const QList&)), + this, SLOT(contactDeletedFromOtherSource(const QList&))); emit q->contactRemoved(cm->removeContact( mContact->localId() )); - mMgr->back( mArgs ); + mMgr->back( mArgs, true ); } } @@ -459,155 +497,79 @@ // get a fresh one from backend. QContactManager* mgr = mMgr->contactManager(SYMBIAN_BACKEND); - mContact = new QContact(mgr->contact( mContact->localId() )); + setSelectedContact( mgr->contact( mContact->localId()) ); QVariant var; var.setValue(*mContact); CntViewParameters viewParameters; viewParameters.insert(ESelectedContact, var); - - mMgr->back( viewParameters ); -} + + if ( mArgs.value( EExtraAction ).toString() == CNT_ROOT_ACTION ) + { + mMgr->back( viewParameters, true ); + } + else + { + mMgr->back( viewParameters ); + } + +} void CntEditViewPrivate::saveChanges() { Q_Q(CntEditView); - - QContactManager* mgr = mMgr->contactManager( SYMBIAN_BACKEND ); - bool isSavedContact = mContact->localId() > 0; - // if the contact is really changed or a new one - if ( (*mContact) != mgr->contact(mContact->localId()) || !isSavedContact ) + QString name = mMgr->contactManager(SYMBIAN_BACKEND)->synthesizedContactDisplayLabel(*mContact); + + if (name.isEmpty()) { - int detailCount = mContact->details().count(); - - setPreferredDetails( mContact ); - - // If its a new contact - if ( !isSavedContact ) - { - if ( detailCount > 2 ) - { - bool success = mgr->saveContact( mContact ); - if ( success && mIsMyCard ) - { - mgr->setSelfContactId( mContact->localId() ); - } - - QString name = mgr->synthesizedDisplayLabel( *mContact ); - if (name.isEmpty()) - { - name = hbTrId("txt_phob_dblist_unnamed"); - } - - if ( success ) - { - emit q->contactUpdated(1); - HbDeviceNotificationDialog::notification(QString(),HbParameterLengthLimiter(hbTrId("txt_phob_dpophead_contact_1_saved")).arg(name)); - } - else - { - emit q->contactUpdated(0); - //TODO: localization is missing - HbDeviceNotificationDialog::notification(QString(),qtTrId("SAVING FAILED!")); - } - - QVariant var; - var.setValue(*mContact); - mArgs.insert(ESelectedContact, var); - mArgs.insert(ESelectedAction, CNT_CREATE_ACTION); - } - else - { - // nothing happened to the contact. Flags should be used - emit q->contactUpdated(-2); - } - } - else - { - // contact details has been cleared out. - if ( detailCount <= 4 ) - { - // get the contact from database, it should have the name still in it, - // and show the delete notification to user - QContact c = mgr->contact( mContact->localId() ); - - bool success = mgr->removeContact( mContact->localId() ); - emit q->contactRemoved(success); - } - else - { - bool success = mgr->saveContact(mContact); - - QString name = mgr->synthesizedDisplayLabel( *mContact ); - if (name.isEmpty()) - { - name = hbTrId("txt_phob_dblist_unnamed"); - } - - if ( success ) - { - emit q->contactUpdated(1); - HbDeviceNotificationDialog::notification(QString(),HbParameterLengthLimiter(hbTrId("txt_phob_dpophead_contacts_1_updated")).arg(name)); - mArgs.insert(ESelectedAction, CNT_EDIT_ACTION); - } - else - { - emit q->contactUpdated(0); - //TODO: localization is missing - HbDeviceNotificationDialog::notification(QString(),qtTrId("SAVING FAILED!")); - } - - QVariant var; - var.setValue(*mContact); - mArgs.insert(ESelectedContact, var); - } - } - } - else - { - emit q->changesDiscarded(); + name = hbTrId("txt_phob_list_unnamed"); } - mMgr->back( mArgs ); -} - -void CntEditViewPrivate::setPreferredDetails( QContact* aContact ) -{ - QList numberList( aContact->details() ); - //set preferred number for call if there is only one phone number - if ( aContact->preferredDetail("call").isEmpty() && numberList.count() == 1 ) - { - aContact->setPreferredDetail( "call", numberList.first() ); - } - //set preferred number for message if there is only one mobile phone number - if ( aContact->preferredDetail("message").isEmpty() && numberList.count() >= 1 ) + CntSaveManager::CntSaveResult result = mSaveManager->saveContact(mContact, mMgr->contactManager(SYMBIAN_BACKEND)); + + QVariant var; + bool backToRoot(false); + + switch (result) { - int mobileNumbers = 0; - int mobileNumberIndex = -1; - for (int i = 0; i < numberList.count(); i++) - { - if (numberList.at(i).subTypes().count() && numberList.at(i).subTypes().first() == QContactPhoneNumber::SubTypeMobile) - { - mobileNumbers++; - mobileNumberIndex = i; - } - } - if ( mobileNumbers == 1 ) - { - aContact->setPreferredDetail( "message", numberList.at(mobileNumberIndex) ); - } + case CntSaveManager::ESaved: + emit q->contactUpdated(KCntServicesReturnValueContactSaved); + HbDeviceNotificationDialog::notification(QString(),HbParameterLengthLimiter(hbTrId("txt_phob_dpophead_contact_1_saved")).arg(name)); + var.setValue(*mContact); + mArgs.insert(ESelectedContact, var); + mArgs.insert(ESelectedAction, CNT_CREATE_ACTION); + break; + case CntSaveManager::EUpdated: + emit q->contactUpdated(KCntServicesReturnValueContactSaved); + HbDeviceNotificationDialog::notification(QString(),HbParameterLengthLimiter(hbTrId("txt_phob_dpophead_contacts_1_updated")).arg(name)); + var.setValue(*mContact); + mArgs.insert(ESelectedContact, var); + mArgs.insert(ESelectedAction, CNT_EDIT_ACTION); + break; + case CntSaveManager::EFailed: + emit q->contactUpdated(KCntServicesReturnValueContactNotModified); + HbDeviceNotificationDialog::notification(QString(),hbTrId("SAVING FAILED!")); + break; + case CntSaveManager::EDeleted: + emit q->contactRemoved(true); + backToRoot = true; + break; + case CntSaveManager::ENothingDone: + default: + emit q->contactUpdated(KCntServicesReturnValueContactNotModified); + break; } - QList emailList( aContact->details() ); - //set preferred number for email if there is only one email address - if ( aContact->preferredDetail("email").isEmpty() && emailList.count() == 1 ) + + if ( mArgs.value( EExtraAction ).toString() == CNT_ROOT_ACTION ) { - aContact->setPreferredDetail( "email", emailList.first() ); - } + backToRoot = true; + } + + mMgr->back( mArgs, backToRoot ); } - void CntEditViewPrivate::openNameEditor() { QVariant var; @@ -670,7 +632,7 @@ mHeading->setIcon(icon); mImageLabel->clear(); - mImageLabel->setIcon(icon); + mImageLabel->setIcon(pixmap); } } @@ -744,14 +706,15 @@ void CntEditViewPrivate::addDetail( CntEditViewItem* aDetail ) { QVariant id = aDetail->data( ERoleEditorViewId ); - CntViewParameters viewParameters; - viewParameters.insert(EViewId, id.toInt()); + + mArgs.insert(EViewId, id.toInt()); + mArgs.insert(ESelectedAction, CNT_ADD_ACTION ); QVariant var; var.setValue(*mContact); - viewParameters.insert(ESelectedContact, var); - viewParameters.insert(ESelectedAction, CNT_ADD_ACTION ); - - mMgr->changeView( viewParameters ); + + mArgs.insert(ESelectedContact, var); + + mMgr->changeView( mArgs ); } void CntEditViewPrivate::editDetail( CntEditViewItem* aDetail ) @@ -783,19 +746,37 @@ mContact = NULL; } mContact = new QContact( aContact ); - /* - mListView->setModel( NULL ); - if ( mModel ) + QContactManager* cm = mMgr->contactManager( SYMBIAN_BACKEND ); + connect(cm, SIGNAL(contactsRemoved(const QList&)), + this, SLOT(contactDeletedFromOtherSource(const QList&)), Qt::UniqueConnection); +} + +void CntEditViewPrivate::contactDeletedFromOtherSource(const QList& contactIds) +{ + CNT_ENTRY + + if ( contactIds.contains(mContact->localId()) ) { - delete mModel; - mModel = NULL; + // 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())); } - mModel = new CntEditViewListModel( mContact ); - if ( mListView ) - mListView->setModel( mModel ); - */ + CNT_EXIT } + +void CntEditViewPrivate::showRootView() +{ + CNT_ENTRY + + Q_Q(CntEditView); + + emit q->contactRemoved(true); + mMgr->back( mArgs, true ); + + CNT_EXIT +} + // End of File diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/src/cnteditviewheadingitem.cpp --- a/phonebookui/pbkcommonui/src/cnteditviewheadingitem.cpp Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/src/cnteditviewheadingitem.cpp Wed Aug 18 09:39:00 2010 +0300 @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -38,11 +39,13 @@ mLabel(NULL), mSecondLabel(NULL), mFrameItem(NULL), + mFocusItem(NULL), mIconTouchArea(NULL), mIconFocused(false), mTextFocused(false) { - + HbEffect::add("icon", "groupbox_icon_click", "iconclick"); + setProperty("state", "normal"); } CntEditViewHeadingItem::~CntEditViewHeadingItem() @@ -113,12 +116,22 @@ if (!mFrameItem) { mFrameItem = new HbFrameItem(this); - mFrameItem->frameDrawer().setFrameGraphicsName("qtg_fr_groupbox"); + mFrameItem->frameDrawer().setFrameGraphicsName("qtg_fr_groupbox_normal"); mFrameItem->frameDrawer().setFrameType(HbFrameDrawer::NinePieces); mFrameItem->setZValue(-2); style()->setItemName(mFrameItem, "background"); } + if (!mFocusItem) + { + mFocusItem = new HbFrameItem(this); + mFocusItem->frameDrawer().setFrameGraphicsName("qtg_fr_groupbox_pressed"); + mFocusItem->frameDrawer().setFrameType(HbFrameDrawer::NinePieces); + mFocusItem->setZValue(-1); + mFocusItem->setVisible(false); + style()->setItemName(mFocusItem, "highlight"); + } + if (!mIconTouchArea) { mIconTouchArea = new HbTouchArea(this); @@ -152,6 +165,20 @@ void CntEditViewHeadingItem::updatePrimitives() { HbWidget::updatePrimitives(); + if (mTextFocused) + { + mFocusItem->setVisible(true); + setProperty("state", "pressed"); + } + else if (mIconFocused) + { + HbEffect::start(mIcon, QString("icon"), QString("iconclick")); + } + else + { + mFocusItem->setVisible(false); + setProperty("state", "normal"); + } } void CntEditViewHeadingItem::setDetails(const QContact* contact, bool myCard) @@ -171,16 +198,18 @@ KCntNameOrdering); int setting = settingsMng.readItemValue(nameOrderKey, XQSettingsManager::TypeInt).toInt(); QStringList nameList = QStringList(); - QString last; + QString last_first; switch( setting ) { case CntOrderLastFirst: nameList << name.prefix() << name.lastName() << name.firstName() << name.middleName() << name.suffix(); break; case CntOrderLastCommaFirst: - if (!name.lastName().isEmpty()) - last = name.lastName() + ","; - nameList << name.prefix() << last << name.firstName() << name.middleName() << name.suffix(); + if (!name.firstName().isEmpty() && !name.lastName().isEmpty()) + last_first = name.lastName() + ", " + name.firstName(); + else + last_first = !name.firstName().isEmpty() ? name.firstName() : name.lastName(); + nameList << name.prefix() << last_first << name.middleName() << name.suffix(); break; default: // Default to first name last name nameList << name.prefix() << name.firstName() << name.middleName() << name.lastName() << name.suffix(); @@ -231,10 +260,12 @@ if (mIconTouchArea->rect().contains(event->pos())) { mIconFocused = true; + updatePrimitives(); } else if (rect().contains(event->pos())) { mTextFocused = true; + updatePrimitives(); } event->accept(); @@ -249,6 +280,7 @@ else if ((!rect().contains(event->pos()) || mIconTouchArea->rect().contains(event->pos())) && mTextFocused) { mTextFocused = false; + updatePrimitives(); } event->accept(); } @@ -259,11 +291,13 @@ if (mIconTouchArea->rect().contains(event->pos()) && mIconFocused) { mIconFocused = false; + updatePrimitives(); emit iconClicked(); } else if (rect().contains(event->pos()) && !mIconTouchArea->rect().contains(event->pos()) && mTextFocused) { mTextFocused = false; + updatePrimitives(); emit textClicked(); } event->accept(); diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/src/cntemaileditorviewitem.cpp --- a/phonebookui/pbkcommonui/src/cntemaileditorviewitem.cpp Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/src/cntemaileditorviewitem.cpp Wed Aug 18 09:39:00 2010 +0300 @@ -69,7 +69,13 @@ connect( mItem->comboBox(), SIGNAL(currentIndexChanged(int)), this, SLOT(indexChanged(int)) ); connect( mItem->editor(), SIGNAL(textChanged(QString)),this, SLOT(textChanged(QString)) ); - + + // Naming UI components for automation testability + QString editorObjName = detail.definitionName() + " line edit %1"; + mItem->editor()->setObjectName(editorObjName.arg(modelIndex().row())); + + QString comboBoxObjName = detail.definitionName() + " combo box %1"; + mItem->comboBox()->setObjectName(comboBoxObjName.arg(modelIndex().row())); return mItem; } diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/src/cntfavoritesmemberview.cpp --- a/phonebookui/pbkcommonui/src/cntfavoritesmemberview.cpp Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/src/cntfavoritesmemberview.cpp Wed Aug 18 09:39:00 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); } diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/src/cntfavoritesview.cpp --- a/phonebookui/pbkcommonui/src/cntfavoritesview.cpp Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/src/cntfavoritesview.cpp Wed Aug 18 09:39:00 2010 +0300 @@ -16,7 +16,7 @@ */ #include "cntfavoritesview.h" -#include "cntfetchcontactsview.h" +#include "cntfetchcontactpopup.h" #include "cntglobal.h" #include #include @@ -30,8 +30,7 @@ mContact(NULL), mView(NULL), mSoftkey(NULL), - mViewManager(NULL), - mFetchView(NULL) + mViewManager(NULL) { bool ok = false; mDocumentLoader.load(CNT_FAVORITE_UI_XML, &ok); @@ -57,10 +56,7 @@ mView->deleteLater(); delete mContact; - mContact = 0; - - delete mFetchView; - mFetchView = 0; + mContact = NULL; } void CntFavoritesView::activate( CntAbstractViewManager* aMgr, const CntViewParameters aArgs ) @@ -85,50 +81,61 @@ void CntFavoritesView::openSelectionPopup() { + /* QSet emptySet; - if (!mFetchView) { mFetchView = new CntFetchContacts(*getContactManager()); connect(mFetchView, SIGNAL(clicked()), this, SLOT(handleMemberSelection())); } mFetchView->setDetails(hbTrId("txt_phob_subtitle_favorites"), hbTrId("txt_common_button_save")); mFetchView->displayContacts(HbAbstractItemView::MultiSelection, emptySet); + */ + CntFetchContactPopup* popup = CntFetchContactPopup::createMultiSelectionPopup( + hbTrId("txt_phob_subtitle_favorites"), + hbTrId("txt_common_button_save"), + *getContactManager()); + connect(popup, SIGNAL(fetchReady(QSet)), + this, SLOT(handleMemberSelection(QSet))); + popup->showPopup(); } -void CntFavoritesView::handleMemberSelection() +void CntFavoritesView::handleMemberSelection( QSet aIds ) { - QSet members = mFetchView->getSelectedContacts(); - QList memberships; - bool saveChanges = !mFetchView->wasCanceled(); + //QSet members = mFetchView->getSelectedContacts(); + //bool saveChanges = !mFetchView->wasCanceled(); - delete mFetchView; - mFetchView = 0; - - if (!saveChanges || members.count() == 0) { - showPreviousView(); - return; - } + //delete mFetchView; + //mFetchView = 0; - foreach (QContactLocalId id, members) { - QContact contact = getContactManager()->contact(id); - QContactRelationship membership; - membership.setRelationshipType(QContactRelationship::HasMember); - membership.setFirst(mContact->id()); - membership.setSecond(contact.id()); - memberships.append(membership); + //if (!saveChanges || members.count() == 0) + if ( aIds.isEmpty() ) + { + showPreviousView(); } - - if (!memberships.isEmpty()) { - QMap errors; - getContactManager()->saveRelationships(&memberships, &errors); + else + { + QList memberships; + foreach (QContactLocalId id, aIds) { + QContact contact = getContactManager()->contact(id); + QContactRelationship membership; + membership.setRelationshipType(QContactRelationship::HasMember); + membership.setFirst(mContact->id()); + membership.setSecond(contact.id()); + memberships.append(membership); + } + + if (!memberships.isEmpty()) { + QMap errors; + getContactManager()->saveRelationships(&memberships, &errors); + } + + CntViewParameters viewParameters; + viewParameters.insert(EViewId, favoritesMemberView); + QVariant var; + var.setValue(*mContact); + viewParameters.insert(ESelectedGroupContact, var); + mViewManager->changeView(viewParameters); } - - CntViewParameters viewParameters; - viewParameters.insert(EViewId, FavoritesMemberView); - QVariant var; - var.setValue(*mContact); - viewParameters.insert(ESelectedGroupContact, var); - mViewManager->changeView(viewParameters); } void CntFavoritesView::setOrientation(Qt::Orientation orientation) diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/src/cntfetchcontactpopup.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phonebookui/pbkcommonui/src/cntfetchcontactpopup.cpp Wed Aug 18 09:39:00 2010 +0300 @@ -0,0 +1,407 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ +#include "cntfetchcontactpopup.h" +#include "cntdocumentloader.h" +#include "cntfetchmarkall.h" +#include "cntdebug.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +const char *CNT_FETCHLIST_XML = ":/xml/contacts_fetchdialog.docml"; + +CntFetchContactPopup::CntFetchContactPopup( QContactManager& aMgr ) : +mManager(aMgr), +mPopup( NULL ), +mListView( NULL ), +mEmptyView( NULL ), +mHeading( NULL ), +mPrimaryAction( NULL ), +mSearch( NULL ), +mModel( NULL ), +mMarkAll( NULL ), +mDoc( NULL ) +{ + mDoc = new CntDocumentLoader(); + + bool ok; + mDoc->load( CNT_FETCHLIST_XML, &ok ); + + if ( !ok ) + { + qFatal("Unable to read %S", CNT_FETCHLIST_XML ); + } + mPopup = static_cast( mDoc->findWidget( "dialog" ) ); + mSearch = static_cast( mDoc->findWidget( "searchPanel" ) ); + mMarkAll = static_cast( mDoc->findWidget("markAll") ); + mEmptyView = static_cast( mDoc->findWidget("emptyLabel" )); + mListView = static_cast( mDoc->findWidget("listView") ); + mHeading = static_cast( mDoc->findWidget("heading") ); + + connect(qApp, SIGNAL(aboutToQuit()), this, SLOT(closePopup()) ); + connect(mPopup, SIGNAL(aboutToClose()), this, SLOT(closePopup()) ); + connect(mSearch, SIGNAL(criteriaChanged(QString)), this, SLOT(setFilter(QString))); + connect(mMarkAll, SIGNAL(markAll(int)), this, SLOT(selectAll(int)) ); + + HbLineEdit *editor = static_cast( mSearch->primitive("lineedit")); + editor->setInputMethodHints(Qt::ImhNoPredictiveText); + mSearch->setCancelEnabled( false ); + + mVirtualKeyboard = new HbStaticVkbHost(editor); + connect(mVirtualKeyboard, SIGNAL(keypadOpened()), this, SLOT(handleKeypadOpen())); + connect(mVirtualKeyboard, SIGNAL(keypadClosed()), this, SLOT(handleKeypadClosed())); +} + +CntFetchContactPopup::~CntFetchContactPopup() +{ + delete mDoc; + delete mModel; +} + +CntFetchContactPopup* CntFetchContactPopup::createMultiSelectionPopup( QString aTitle, QString aAction, QContactManager& aManager ) +{ + CntFetchContactPopup* popup = new CntFetchContactPopup( aManager ); + popup->constructPopupDialog( aTitle, aAction, HbAbstractItemView::MultiSelection ); + + return popup; +} + +CntFetchContactPopup* CntFetchContactPopup::createSingleSelectionPopup( QString aTitle, QContactManager& aManager ) +{ + CntFetchContactPopup* popup = new CntFetchContactPopup( aManager ); + popup->constructPopupDialog( aTitle, "", HbAbstractItemView::NoSelection ); + + return popup; +} + +void CntFetchContactPopup::setSelectedContacts( QSet aIds ) +{ + CNT_ENTRY + if ( mListView->selectionMode() == HbAbstractItemView::MultiSelection ) + { + mIdList.clear(); + + foreach ( QContactLocalId id, aIds ) + { + mIdList.append( id ); + QContact contact = mManager.contact(id); + QModelIndex contactIndex = mModel->indexOfContact(contact); + mSelectionModel->select( contactIndex, QItemSelectionModel::Select ); + } + } + CNT_EXIT +} + +void CntFetchContactPopup::showPopup() +{ + CNT_ENTRY + HbMainWindow* window = mPopup->mainWindow(); + if ( window ) + { + connect(window, SIGNAL(orientationChanged(Qt::Orientation)), + this, SLOT(loadLayout(Qt::Orientation)) ); + } + + mPopup->open( this, SLOT(dialogDismissed(HbAction*)) ); + CNT_EXIT +} + +void CntFetchContactPopup::handleKeypadOpen() +{ + CNT_ENTRY + qreal height = mPopup->size().height() - + mVirtualKeyboard->keyboardArea().height() - + mSearch->size().height(); + + // in single selection we don't have the "mark all" option + if ( mMarkAll ) + { + height = height - mMarkAll->size().height(); + } + + mEmptyView->setMaximumHeight( height ); + mListView->setMaximumHeight( height ); + CNT_EXIT +} + +void CntFetchContactPopup::handleKeypadClosed() +{ + CNT_ENTRY + + qreal height = mPopup->size().height() - mSearch->size().height(); + if ( mMarkAll ) + { + height = height - mMarkAll->size().height(); + } + + mListView->setMaximumHeight( height ); + mEmptyView->setMaximumHeight( height ); + CNT_EXIT +} + +void CntFetchContactPopup::contactSelected( const QModelIndex& aIndex ) +{ + CNT_ENTRY + if ( aIndex.isValid() ) + { + QContact contact = mModel->contact( aIndex ); + mIdList.append( contact.localId() ); + + emit fetchReady( mIdList.toSet() ); + } + + disconnect(mListView, SIGNAL(activated(const QModelIndex&)), + this, SLOT(contactSelected(const QModelIndex&)) ); + mPopup->close(); + CNT_EXIT +} + +void CntFetchContactPopup::contactsSelected( + const QItemSelection& aSelected, + const QItemSelection& aDeselected ) +{ + CNT_ENTRY + + // remove all deselected items + foreach ( QModelIndex index, aDeselected.indexes() ) + { + QContact contact = mModel->contact( index ); + QContactLocalId id = contact.localId(); + if ( mIdList.contains(id) ) + { + mIdList.removeAll( id ); + } + } + + // add all selected items + foreach ( QModelIndex index, aSelected.indexes() ) + { + QContact contact = mModel->contact( index ); + QContactLocalId id = contact.localId(); + if ( !mIdList.contains(id) ) + { + mIdList.append( id ); + } + } + + mMarkAll->setSelectedContactCount( mIdList.size() ); + CNT_EXIT +} + +void CntFetchContactPopup::selectAll( int aState ) +{ + CNT_ENTRY + if ( mListView->selectionMode() == HbAbstractItemView::MultiSelection ) + { + switch ( aState ) + { + case Qt::Checked: + mListView->selectAll(); + mMarkAll->setSelectedContactCount( mIdList.count() ); + break; + + case Qt::Unchecked: + mListView->clearSelection(); + mMarkAll->setSelectedContactCount( 0 ); + break; + default: + break; + } + } + CNT_EXIT +} + +void CntFetchContactPopup::dialogDismissed( HbAction* aAction ) +{ + CNT_ENTRY + + if ( aAction != mPrimaryAction ) + { + emit fetchCancelled(); + } + else if ( aAction ) + { + disconnect(mSelectionModel, SIGNAL(selectionChanged(const QItemSelection&,const QItemSelection&)), + this, SLOT(contactsSelected(const QItemSelection&, const QItemSelection&)) ); + + QModelIndexList indexList = mSelectionModel->selectedIndexes(); + foreach ( QModelIndex index, indexList ) + { + QContact contact = mModel->contact( index ); + mIdList.append( contact.localId() ); + } + emit fetchReady( mIdList.toSet() ); + } + else + { + // ignore. + } + CNT_EXIT +} + +void CntFetchContactPopup::setFilter( const QString& aFilter ) +{ + CNT_ENTRY + QContactDetailFilter detailfilter; + detailfilter.setMatchFlags( QContactFilter::MatchStartsWith ); + detailfilter.setValue( aFilter.split(QRegExp("\\s+"), QString::SkipEmptyParts) ); + detailfilter.setDetailDefinitionName( + QContactDisplayLabel::DefinitionName, + QContactDisplayLabel::FieldLabel); + + mModel->setFilter(detailfilter); + + HbMainWindow* window = mPopup->mainWindow(); + if ( window ) + { + loadLayout( window->orientation() ); + } + + setSelectedContacts( mIdList.toSet() ); + CNT_EXIT +} + +void CntFetchContactPopup::constructPopupDialog( QString aTitle, QString aAction, HbAbstractItemView::SelectionMode aMode ) +{ + CNT_ENTRY + mIdList.clear(); + mTitle = aTitle; + + mPopup->setAttribute( Qt::WA_DeleteOnClose, true ); + + QContactDetailFilter contactsFilter; + contactsFilter.setDetailDefinitionName(QContactType::DefinitionName, QContactType::FieldType); + contactsFilter.setValue(QString(QLatin1String(QContactType::TypeContact))); + + mModel = new CntListModel( &mManager, contactsFilter, false); + mModel->showMyCard(false); + mSelectionModel = new QItemSelectionModel( mModel ); + + mListView->setFrictionEnabled(true); + mListView->setScrollingStyle(HbScrollArea::PanWithFollowOn); + mListView->verticalScrollBar()->setInteractive(true); + + HbIndexFeedback* indexFeedback = new HbIndexFeedback(mPopup); + indexFeedback->setIndexFeedbackPolicy(HbIndexFeedback::IndexFeedbackSingleCharacter); + indexFeedback->setItemView(mListView); + + HbListViewItem *prototype = mListView->listItemPrototype(); + prototype->setGraphicsSize(HbListViewItem::Thumbnail); + prototype->setStretchingStyle(HbListViewItem::StretchLandscape); + + mListView->setSelectionMode( aMode ); + mListView->setModel( mModel ); + mListView->setSelectionModel( mSelectionModel ); + + HbMainWindow* window = mPopup->mainWindow(); + if ( window ) + { + loadLayout( window->orientation() ); + } + + if ( !aAction.isEmpty() ) + { + mPrimaryAction = new HbAction( aAction, mPopup ); + mPopup->addAction( mPrimaryAction ); + } + + HbAction* secondaryAction = new HbAction(hbTrId("txt_common_button_cancel"), mPopup); + mPopup->addAction( secondaryAction ); + + if ( aMode != HbListView::MultiSelection ) + { + connect(mListView, SIGNAL(activated(const QModelIndex&)), + this, SLOT(contactSelected(const QModelIndex&)) ); + mMarkAll->setVisible( false ); + } + else + { + mMarkAll->setSelectedContactCount( 0 ); + mMarkAll->setMaxContactCount( mModel->rowCount() ); + connect(mSelectionModel, SIGNAL(selectionChanged(const QItemSelection&,const QItemSelection&)), + this, SLOT(contactsSelected(const QItemSelection&, const QItemSelection&)) ); + + } + + CNT_EXIT +} + +void CntFetchContactPopup::loadLayout( Qt::Orientation aOrientation ) +{ + CNT_ENTRY + + bool multi = mListView->selectionMode() == HbAbstractItemView::MultiSelection; + if ( mModel->rowCount() > 0 ) + { + if ( aOrientation == Qt::Horizontal ) + { + mPopup->setHeadingWidget( NULL ); + mDoc->load( CNT_FETCHLIST_XML, "find_list_landscape"); + } + else + { + mHeading = new HbLabel( mTitle ); + mPopup->setHeadingWidget( mHeading ); + qreal popupHeight = mPopup->mainWindow()->layoutRect().height(); + mPopup->setMinimumHeight(popupHeight); + mDoc->load( CNT_FETCHLIST_XML, multi ? "find_list" : "find_list_single"); + } + } + else + { + if ( aOrientation == Qt::Horizontal ) + { + mPopup->setHeadingWidget( NULL ); + mDoc->load( CNT_FETCHLIST_XML, "find_empty_landscape" ); + } + else + { + mHeading = new HbLabel( mTitle ); + mPopup->setHeadingWidget( mHeading ); + qreal popupHeight = mPopup->mainWindow()->layoutRect().height(); + mPopup->setMinimumHeight(popupHeight); + mDoc->load( CNT_FETCHLIST_XML, multi ? "find_empty" : "find_empty_single" ); + } + } + + CNT_EXIT +} + +void CntFetchContactPopup::closePopup() +{ + CNT_ENTRY + disconnect(mVirtualKeyboard, SIGNAL(keypadOpened()), this, SLOT(handleKeypadOpen())); + disconnect(mVirtualKeyboard, SIGNAL(keypadClosed()), this, SLOT(handleKeypadClosed())); + + deleteLater(); + CNT_EXIT +} +// End of File diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/src/cntfetchcontactsview.cpp --- a/phonebookui/pbkcommonui/src/cntfetchcontactsview.cpp Tue Jul 06 14:05:47 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,353 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* -*/ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "cntfetchcontactsview.h" - -/*! -Given a contact manager, CntFetchContacts is responsible for -retrieving a set of contacts, if any were chosen by the user. -*/ -CntFetchContacts::CntFetchContacts(QContactManager &aManager) : -QObject(), -mPopup(NULL), -mCntModel(NULL), -mListView(NULL), -mEmptyListLabel(NULL), -mSelectionMode(HbAbstractItemView::MultiSelection), -mManager(&aManager), -mWasCanceled(false), -mLabel(NULL), -mVirtualKeyboard(NULL), -mPrimaryAction(NULL), -mSecondaryAction(NULL), -mIndexFeedback(NULL) -{ - mSearchPanel = new HbSearchPanel(); - mSearchPanel->setVisible(false); - mSearchPanel->setCancelEnabled(false); - connect(mSearchPanel, SIGNAL(criteriaChanged(QString)), this, SLOT(setFilter(QString))); - - HbLineEdit *editor = static_cast(mSearchPanel->primitive("lineedit")); - editor->setInputMethodHints(Qt::ImhNoPredictiveText); - - mLayout = new QGraphicsLinearLayout(Qt::Vertical); - - mContainerWidget = new HbWidget(); -} - -CntFetchContacts::~CntFetchContacts() -{ - delete mCntModel; - mCntModel = NULL; - - delete mVirtualKeyboard; - mVirtualKeyboard = NULL; - - delete mIndexFeedback; - mIndexFeedback = NULL; -} - -/*! -Query to see if the user decided to press Cancel after selecting -group members. Must be called to see if results are valid. -*/ -bool CntFetchContacts::wasCanceled() const -{ - return mWasCanceled; -} - -void CntFetchContacts::setDetails(QString aTitle, QString aButtonText) -{ - mButtonText = aButtonText; - - if (!mLabel) { - mLabel = new HbLabel(aTitle); - } -} - -/*! -Brings up a list of contacts, awaiting user response. This function is asynchronous. -When a response is given, a clicked signal will be sent. -*/ -void CntFetchContacts::displayContacts(HbAbstractItemView::SelectionMode aMode, - QSet aContacts) -{ - doInitialize(aMode,aContacts); - markMembersInView(); - showPopup(); -} - -QSet CntFetchContacts::getSelectedContacts() const -{ - return mCurrentlySelected; -} - -void CntFetchContacts::setFilter(const QString &filterString) -{ - QStringList searchList = filterString.split(QRegExp("\\s+"), QString::SkipEmptyParts); - - QContactDetailFilter detailfilter; - detailfilter.setDetailDefinitionName(QContactDisplayLabel::DefinitionName, QContactDisplayLabel::FieldLabel); - detailfilter.setMatchFlags(QContactFilter::MatchStartsWith); - detailfilter.setValue(searchList); - - mCntModel->setFilter(detailfilter); - - markMembersInView(); - - if (mCntModel->rowCount() == 0) { - mLayout->removeItem(mListView); - - if (mEmptyListLabel) { - qreal searchHeight = mSearchPanel->size().height(); - HbLabel* heading = static_cast(mPopup->headingWidget()); - qreal heightToSet = mPopup->size().height() - mVirtualKeyboard->keyboardArea().height() - searchHeight - heading->size().height(); - mEmptyListLabel->setMaximumHeight(heightToSet); - mEmptyListLabel->setVisible(true); - mLayout->insertItem(0, mEmptyListLabel); - } - - mListView->setVisible(false); - mSearchPanel->setVisible(true); - } - else { - if (mEmptyListLabel) { - mEmptyListLabel->setVisible(false); - } - mLayout->removeItem(mEmptyListLabel); - mLayout->insertItem(0, mListView); - mListView->setVisible(true); - } -} - -void CntFetchContacts::handleKeypadOpen() -{ - qreal searchHeight = mSearchPanel->size().height(); - HbLabel* heading = static_cast(mPopup->headingWidget()); - qreal heightToSet = mPopup->size().height() - mVirtualKeyboard->keyboardArea().height() - searchHeight - heading->size().height(); - - if (mEmptyListLabel) { - mEmptyListLabel->setMaximumHeight( heightToSet - mEmptyListLabel->size().height() ); - } - - mListView->setMaximumHeight(heightToSet); -} - -void CntFetchContacts::handleKeypadClose() -{ - mListView->setMaximumHeight(mPopup->size().height()); - - if (mEmptyListLabel) { - mEmptyListLabel->setMaximumHeight(mPopup->size().height()); - } -} - -/*! -Notify client that we're done. -*/ -void CntFetchContacts::handleUserResponse(HbAction* action) -{ - bool userCanceled = (action == mSecondaryAction); - if (userCanceled) { - mCurrentlySelected.clear(); - - mWasCanceled = true; - } - else { - mWasCanceled = false; - } - - mPopup->setVisible(false); - mListView->setModel(NULL); - delete mCntModel; - mCntModel = NULL; - - emit clicked(); -} - -void CntFetchContacts::memberSelectionChanged(const QModelIndex &index) -{ - if (!index.isValid()) return; - - if (mSelectionMode == HbAbstractItemView::SingleSelection) { - mCurrentlySelected.clear(); - } - - QContactLocalId contactId = mCntModel->contact(index).localId(); - - bool isSelected = mListView->selectionModel()->isSelected(index); - if (isSelected != mCurrentlySelected.contains(contactId)) { - if (isSelected) { - mCurrentlySelected.insert(contactId); - } - else { - mCurrentlySelected.remove(contactId); - } - } - - // Check for the case where there is a cancel button only. If so, - // after selecting any contact, should dismiss the dialog immediately. - if (mButtonText.isEmpty() && mSelectionMode == HbAbstractItemView::SingleSelection) { - mPopup->close(); - } -} - -void CntFetchContacts::doInitialize(HbAbstractItemView::SelectionMode aMode, - QSet aContacts) -{ - mSelectionMode = aMode; - mCurrentlySelected = aContacts; - - if (!mPopup) { - mPopup = new HbDialog; - } - - QContactDetailFilter contactsFilter; - contactsFilter.setDetailDefinitionName(QContactType::DefinitionName, QContactType::FieldType); - contactsFilter.setValue(QString(QLatin1String(QContactType::TypeContact))); - if (!mCntModel) { - mCntModel = new CntListModel(mManager, contactsFilter, false); - } - - if (!mListView) { - mListView = new HbListView(mPopup); - mListView->setModel(mCntModel); - mListView->setSelectionMode(mSelectionMode); - mListView->setFrictionEnabled(true); - mListView->setScrollingStyle(HbScrollArea::PanWithFollowOn); - mListView->verticalScrollBar()->setInteractive(true); - - HbListViewItem *prototype = mListView->listItemPrototype(); - prototype->setGraphicsSize(HbListViewItem::Thumbnail); - prototype->setStretchingStyle(HbListViewItem::StretchLandscape); - - mIndexFeedback = new HbIndexFeedback(mPopup); - mIndexFeedback->setIndexFeedbackPolicy(HbIndexFeedback::IndexFeedbackSingleCharacter); - mIndexFeedback->setItemView(mListView); - - // Note that the layout takes ownership of the item(s) it contains. - if (mCntModel->rowCount()== 0) { - mListView->setVisible(false); - if (!mEmptyListLabel) { - mEmptyListLabel = new HbTextItem(hbTrId("txt_phob_info_no_matching_contacts")); - mEmptyListLabel->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); - mEmptyListLabel->setFontSpec(HbFontSpec(HbFontSpec::Primary)); - mEmptyListLabel->setAlignment(Qt::AlignCenter); - mLayout->insertItem(0, mEmptyListLabel); - } - } - else { - mLayout->addItem(mListView); - } - - mCntModel->showMyCard(false); - } - - // Handle the case where the model was removed for the list view - if (!mListView->model()) { - mListView->setModel(mCntModel); - } - - // Main window is NULL in unit tests - HbMainWindow* window = mListView->mainWindow(); - if (window) { - mContainerWidget->setPreferredHeight(mListView->mainWindow()->size().height()); - } - mContainerWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred); - - mSearchPanel->setVisible(true); - mLayout->addItem(mSearchPanel); - mContainerWidget->setLayout(mLayout); - - connect(mListView, SIGNAL(activated(const QModelIndex&)), - this, SLOT(memberSelectionChanged(const QModelIndex&)), Qt::UniqueConnection); -} - -void CntFetchContacts::showPopup() -{ - mPopup->setTimeout(HbPopup::NoTimeout); - mPopup->setDismissPolicy(HbPopup::NoDismiss); - mPopup->setModal(true); - mPopup->setContentWidget(mContainerWidget); - - if (!mVirtualKeyboard) { - mVirtualKeyboard = new HbStaticVkbHost(mPopup); - connect(mVirtualKeyboard, SIGNAL(keypadOpened()), this, SLOT(handleKeypadOpen())); - connect(mVirtualKeyboard, SIGNAL(keypadClosed()), this, SLOT(handleKeypadClose())); - } - - if (!mLabel) { - mLabel = new HbLabel(hbTrId("txt_phob_title_contacts")); - } - mPopup->setHeadingWidget(mLabel); - - if (!mButtonText.isEmpty() && !mPrimaryAction) { - mPrimaryAction = new HbAction(hbTrId(mButtonText.toAscii())); - mPopup->addAction(mPrimaryAction); - } - - if (!mSecondaryAction) { - mSecondaryAction = new HbAction(hbTrId("txt_common_button_cancel")); - mPopup->addAction(mSecondaryAction); - } - - mPopup->open(this, SLOT(handleUserResponse(HbAction*))); -} - -void CntFetchContacts::markMembersInView() -{ - // If there are no contacts matching the current filter, - // show "no matching contacts" label - if (mCntModel->rowCount() == 0) { - if (!mEmptyListLabel) { - mEmptyListLabel = new HbTextItem(hbTrId("txt_phob_info_no_matching_contacts")); - mEmptyListLabel->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); - mEmptyListLabel->setFontSpec(HbFontSpec(HbFontSpec::Primary)); - mEmptyListLabel->setAlignment(Qt::AlignCenter); - mLayout->insertItem(1, mEmptyListLabel); - } - } - else { - mLayout->removeItem(mEmptyListLabel); - delete mEmptyListLabel; - mEmptyListLabel = 0; - } - - // Mark group members in the listview - foreach (QContactLocalId id, mCurrentlySelected) { - QContact contact = mManager->contact(id); - QModelIndex contactIndex = mCntModel->indexOfContact(contact); - mListView->selectionModel()->select(contactIndex, QItemSelectionModel::Select); - } -} - -// End of file diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/src/cntfetchmarkall.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/phonebookui/pbkcommonui/src/cntfetchmarkall.cpp Wed Aug 18 09:39:00 2010 +0300 @@ -0,0 +1,81 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + +#include "cntfetchmarkall.h" + +#include +#include +#include +#include + +CntFetchMarkAll::CntFetchMarkAll(QGraphicsItem *aParent) +: HbWidget(aParent), + mCheckBox(NULL), + mCounterLabel(NULL), + mContactCount( 0 ), + mSelectionCount( 0 ) +{ + setSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::Fixed ); + + mCheckBox = new HbCheckBox(this); + mCheckBox->setText(hbTrId("txt_common_list_mark_all_items")); + mCheckBox->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); + + connect(mCheckBox, SIGNAL(stateChanged(int)), this, SIGNAL(markAll(int)) ); + + mCounterLabel = new HbTextItem( this ); + + mFrame = new HbFrameItem(this); + mFrame->frameDrawer().setFrameGraphicsName("qtg_fr_groupbox_normal"); + mFrame->frameDrawer().setFrameType(HbFrameDrawer::NinePieces); + mFrame->setZValue(-2); + style()->setItemName(mFrame, "background"); + + HbStyle::setItemName(mCheckBox,"checkbox"); + HbStyle::setItemName(mCounterLabel,"counter"); +} + +void CntFetchMarkAll::setMaxContactCount( int aContactCount ) +{ + mContactCount = aContactCount; + mCounterLabel->setText( QString("%1/%2").arg(mSelectionCount).arg(mContactCount) ); +} + +void CntFetchMarkAll::setSelectedContactCount( int aSelectedCount ) +{ + mSelectionCount = aSelectedCount; + mCounterLabel->setText( QString("%1/%2").arg(mSelectionCount).arg(mContactCount) ); + + if ( mSelectionCount < mContactCount ) + { + blockSignals( true ); + mCheckBox->setCheckState( Qt::Unchecked ); + blockSignals( false ); + } +} + +CntFetchMarkAll::~CntFetchMarkAll() +{ + delete mCheckBox; + mCheckBox = NULL; + delete mCounterLabel; + mCounterLabel = NULL; + delete mFrame; + mFrame = NULL; +} + +// EOF diff -r 7cbcb2896f0e -r a642906a277a phonebookui/pbkcommonui/src/cntgroupactionsview.cpp --- a/phonebookui/pbkcommonui/src/cntgroupactionsview.cpp Tue Jul 06 14:05:47 2010 +0300 +++ b/phonebookui/pbkcommonui/src/cntgroupactionsview.cpp Wed Aug 18 09:39:00 2010 +0300 @@ -16,6 +16,10 @@ */ #include "cntgroupactionsview.h" +#include "cntactionlauncher.h" +#include "cntglobal.h" + +#include #include #include @@ -30,7 +34,12 @@ #include #include #include +#include +#include +#include +#include "cntactionlauncher.h" +#include #include const char *CNT_GROUPACTIONSVIEW_XML = ":/xml/contacts_groupactions.docml"; @@ -39,7 +48,9 @@ mGroupContact(NULL), mModel(NULL), mViewManager(NULL), -mListView(NULL) +mListView(NULL), +mPopupCount(0), +mIsExecutingAction(false) { bool ok = false; mDocumentLoader.load(CNT_GROUPACTIONSVIEW_XML, &ok); @@ -120,9 +131,12 @@ mGroupContact = new QContact(aArgs.value(ESelectedGroupContact).value()); mViewManager = aMgr; - QContactName groupContactName = mGroupContact->detail( QContactName::DefinitionName ); - QString groupName(groupContactName.value( QContactName::FieldCustomLabel )); - + QContactName contactName = mGroupContact->detail( QContactName::DefinitionName ); + QString groupName = contactName.value( QContactName::FieldCustomLabel ); + if (groupName.isEmpty()) + { + groupName = hbTrId("txt_phob_list_unnamed"); + } //group box HbGroupBox* groupBox = static_cast(mDocumentLoader.findWidget(QString("groupBox"))); @@ -145,24 +159,32 @@ QContactPhoneNumber confCallNumber = mGroupContact->detail(); if(!confCallNumber.number().isEmpty()) - { + { /* * Internationalization support, activate the following code * when support available from Orbit */ //populatelist(hbTrId("txt_phob_dblist_conference_call"), HbIcon("qtg_large_call_group"),HbNumberGrouping::formatPhoneNumber(confCallNumber.number())); - populatelist(hbTrId("txt_phob_dblist_conference_call"), HbIcon("qtg_large_call_group"),confCallNumber.number()); - } + populatelist(hbTrId("txt_phob_dblist_conference_call"), HbIcon("qtg_large_call_group"),confCallNumber.number(),"call"); + } - populatelist(hbTrId("txt_phob_dblist_send_message"),HbIcon("qtg_large_message_group"),hbTrId("txt_phob_dblist_send_message_val_members")); - populatelist(hbTrId("txt_phob_dblist_email"),HbIcon("qtg_large_email_group"),hbTrId("txt_phob_dblist_send_message_val_members")); + populatelist(hbTrId("txt_phob_dblist_send_message"),HbIcon("qtg_large_message_group"),hbTrId("txt_phob_dblist_send_message_val_members"),"message"); + populatelist(hbTrId("txt_phob_dblist_email"),HbIcon("qtg_large_email_group"),hbTrId("txt_phob_dblist_send_message_val_members"),"email"); mListView->setModel(mModel); mListView->setSelectionMode(HbAbstractItemView::NoSelection); + connect(mListView, SIGNAL(activated(const QModelIndex&)), + this, SLOT(listItemSelected(const QModelIndex&))); + + HbMainWindow* window = mView->mainWindow(); + if (window) + { + window->installEventFilter(this); + } } -void CntGroupActionsView:: populatelist(QString primaryText,HbIcon icon,QString secondaryText) +void CntGroupActionsView::populatelist(QString primaryText,HbIcon icon,QString secondaryText,QString action) { QList items; QStandardItem *labelItem = new QStandardItem(); @@ -173,7 +195,172 @@ labelItem->setData(textList, Qt::DisplayRole); labelItem->setData(icon, Qt::DecorationRole); + labelItem->setData(action, Qt::UserRole+1); items << labelItem ; mModel->appendRow(items); } + +void CntGroupActionsView::listItemSelected(const QModelIndex &index) +{ + if (index.isValid()) { + //reset flags + mPopupCount=0; + mEmailActionParams.clear(); + mMessageActionParams.clear(); + + QString action = mModel->item(index.row())->data(Qt::UserRole+1).toString(); + + //conference call + if (action.compare("call", Qt::CaseInsensitive) == 0 ) { + CntActionLauncher* other = new CntActionLauncher(*mViewManager->contactManager(SYMBIAN_BACKEND), action); + connect(other, SIGNAL(actionExecuted(CntActionLauncher*)), this, SLOT(actionExecuted(CntActionLauncher*))); + other->execute(*mGroupContact, QContactDetail()); + } + //group email, message + else { + QContactRelationshipFilter relationshipFilter; + relationshipFilter.setRelationshipType(QContactRelationship::HasMember); + relationshipFilter.setRelatedContactRole(QContactRelationship::First); + relationshipFilter.setRelatedContactId(mGroupContact->id()); + QList groupMembers = mViewManager->contactManager(SYMBIAN_BACKEND)->contactIds(relationshipFilter); + + for (int i = 0;icontactManager(SYMBIAN_BACKEND)->contact(groupMembers.at(i)); + QContactDetail preferredDetail = contact.preferredDetail(action); + //use preferred detail if exits + if (!preferredDetail.isEmpty()) { + if(action.compare("message", Qt::CaseInsensitive) == 0) { + QContactPhoneNumber phoneNumber = contact.detail(); + mMessageActionParams.insert(phoneNumber.number(),QVariant(contact.displayLabel())); + } + else { + QContactEmailAddress email = contact.detail