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

equal deleted inserted replaced

-:ae724a111993
+:7cc7d74059f9
 #include <QGraphicsLinearLayout>
 #include <QGraphicsSceneResizeEvent>
 #include <QStringList>
 #include <QStandardItemModel>
-#include <QDebug>
 #include <QKeyEvent>
 #include <QDir>
 #include <cntservicescontact.h>
 #include <qtcontacts.h>
+#include <hbapplication.h>
 #include <hbscrollarea.h>
 #include <hblabel.h>
 #include <hbmenu.h>
 #include <hbview.h>
 #include <hbtoolbar.h>
 #include "cntvcarddetailhandler.h"
 #include "cntsavemanager.h"
 #include <cntabstractengine.h>
 #include <cntuicontactcardextension.h>
-#define CNT_MAPTILE_PROGRESS_TIMER  100 //100 msec
+#define CNT_MAPTILE_PROGRESS_TIMER  100 // 100 msec
-#define CNT_UNKNOWN_MAPTILE_STATUS  -1
+#define CNT_UNKNOWN_MAPTILE_STATUS   -1
+// A few list items (CntInitialPopulation) will be populated before the first view;
+// if there are more list items, they will be fetched and added one by one after the
+// first view has been shown to the user
+static const int CntListPopulationNotInProgress = -1;
+static const QEvent::Type ProcessPopulateListEvent = QEvent::User;
+static const int CntInitialPopulation = 8;
 const char *CNT_CONTACTCARDVIEW_XML = ":/xml/contacts_contactcard.docml";
 const char *CNT_MAPTILE_INPROGRESS_ICON = "qtg_anim_small_loading_1";
 const char *CNT_MAPTILE_SEARCH_STOP_ICON = "qtg_mono_search_stop";
 /*!
 \a viewManager is the parent that creates this view. \a parent is a pointer to parent QGraphicsItem (by default this is 0)
 */
 CntContactCardViewPrivate::CntContactCardViewPrivate(bool isTemporary) :
 QObject(),
 mContainerLayout(NULL),
+mContainerWidget(NULL),
 mContact(NULL),
 mDataContainer(NULL),
 mAvatar(NULL),
 mLoader(NULL),
 mVCardIcon(NULL),
 mAcceptSendKey(true),
 mPresenceListener(NULL),
 	mIsTemporary(isTemporary),
 	mIsExecutingAction(false),
 mMyCardId(0),
-mSaveManager(NULL)
+mSaveManager(NULL),
+mListPopulationProgress(CntListPopulationNotInProgress),
+mStopListPopulation(false)
 {
 bool ok;
 document()->load(CNT_CONTACTCARDVIEW_XML, &ok);
 if (!ok)
 {
 /*!
 Activates a previous view
 */
 void CntContactCardViewPrivate::showPreviousView()
 {
+// stop list population, if it is still in progress
+mStopListPopulation = true;
 int returnValue = KCntServicesReturnValueContactNotModified;
 //save the contact if avatar has been changed.
 QContact contact = contactManager()->contact(mContact->localId());
 if ( contact != *mContact && contactManager()->error() == QContactManager::NoError)
 {
 disconnect(contactManager(), SIGNAL(contactsRemoved(const QList<QContactLocalId>&)),
 /*!
 Activates the root view
 */
 void CntContactCardViewPrivate::showRootView()
 {
+// stop list population, if it is still in progress
+mStopListPopulation = true;
 mViewManager->back( mArgs, true );
 }
 /*
 Activates a default view and setup name label texts
 */
 void CntContactCardViewPrivate::activate(const CntViewParameters aArgs)
 {
 CNT_ENTRY
 mArgs = aArgs;
 mViewManager = &mEngine->viewManager();
 mThumbnailManager = &mEngine->thumbnailManager();
 connect(mThumbnailManager, SIGNAL(thumbnailReady(QPixmap, void*, int, int)),
 this, SLOT(thumbnailReady(QPixmap, void*, int, int)));
 HbMainWindow* window = mView->mainWindow();
 if (window)
 {
 connect(window, SIGNAL(orientationChanged(Qt::Orientation)), this, SLOT(setOrientation(Qt::Orientation)));
 window->installEventFilter(this);
 setOrientation(window->orientation());
 }
 qApp->installEventFilter(this);
 QContact contact = aArgs.value(ESelectedContact).value<QContact>();
 mContact = new QContact( contact );
 //my card
 mMyCardId = contactManager()->selfContactId();
 populateHeadingItem();
 populateListItems();
 bool myCard = mContact->localId() == mMyCardId;
 if (myCard)
 {
 CNT_EXIT
 }
 void CntContactCardViewPrivate::populateHeadingItem()
 {
+CNT_ENTRY
 Q_ASSERT(mHeadingItem != NULL && mContact != NULL);
 mHeadingItem->setDetails(mContact);
 bool myCard = mContact->localId() == mMyCardId;
 {
 mHeadingItem->ungrabGesture(Qt::TapGesture);
 mImageLabel->ungrabGesture(Qt::TapGesture);
 }
 bool online;
 mInitiialPrecenceData = mPresenceListener->initialPresences(*mContact, online);
 mHeadingItem->setOnlineStatus(online);
-if (!myCard)
+if (!myCard) {
-{
+bool setAsFavorite = CntFavourite::isMemberOfFavouriteGroup(contactManager(), mContact);
-bool setAsFavorite( false );
+mHeadingItem->setFavoriteStatus(setAsFavorite); // if contact is part of favourites group
-setAsFavorite = CntFavourite::isMemberOfFavouriteGroup( contactManager(), mContact );
-mHeadingItem->setFavoriteStatus( setAsFavorite ); // if contact is part of favourites group
 static_cast<HbAction *>(document()->findObject("cnt:setasfavorite"))->setVisible( !setAsFavorite );
 static_cast<HbAction *>(document()->findObject("cnt:removefromfavorite"))->setVisible( setAsFavorite );
 }
 // avatar
 mThumbnailManager->getThumbnail(ThumbnailManager::ThumbnailLarge, mAvatar->imageUrl().toString());
 }
 break;
 }
 }
+CNT_EXIT
 }
 void CntContactCardViewPrivate::populateListItems()
 {
+CNT_ENTRY
 Q_ASSERT(mContact != NULL && mScrollArea != NULL);
-// data container
+if (mListPopulationProgress == CntListPopulationNotInProgress) {
-if (!mDataContainer) {
+mListPopulationProgress = 0;
-mDataContainer = new CntContactCardDataContainer(
-mMaptile,
+if (!mDataContainer) {
-mEngine->extensionManager(),
+mDataContainer = new CntContactCardDataContainer(
-mView->mainWindow()->orientation() );
+mMaptile,
-}
+mEngine->extensionManager(),
+mView->mainWindow()->orientation());
-// fill the data container with contact details
+}
-mDataContainer->setContactData(mContact);
+// fill the data container with contact details
-// scroll area + container widget
+mDataContainer->setContactData(mContact);
-QGraphicsWidget* containerWidget = mScrollArea->contentWidget();
-if (!containerWidget)
+// scroll area + container widget
-{
+mContainerWidget = mScrollArea->contentWidget();
-// initialize
+if (!mContainerWidget) {
-mScrollArea->setScrollDirections(Qt::Vertical);
+// initialize
+mScrollArea->setScrollDirections(Qt::Vertical);
-containerWidget = new QGraphicsWidget();
-mScrollArea->setContentWidget(containerWidget); // takes ownership.
-mContainerLayout = new QGraphicsLinearLayout(Qt::Vertical);
+mContainerWidget = new QGraphicsWidget();
-mContainerLayout->setContentsMargins(0, 0, 0, 0);
+mScrollArea->setContentWidget(mContainerWidget); // takes ownership. Old widget is deleted
-mContainerLayout->setSpacing(0);
-mContainerLayout->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
+mContainerLayout = new QGraphicsLinearLayout(Qt::Vertical);
+mContainerLayout->setContentsMargins(0, 0, 0, 0);
-containerWidget->setLayout(mContainerLayout);   // takes ownership.
+mContainerLayout->setSpacing(0);
-} else {
+mContainerLayout->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
-// Already initialized
-Q_ASSERT(mContainerLayout != NULL);
+mContainerWidget->setLayout(mContainerLayout);   // takes ownership. Old layout is deleted
+} else {
-// Clear the container
+// Already initialized
-int count = mContainerLayout->count();
+Q_ASSERT(mContainerLayout != NULL);
-for (int i=0; i<count; i++)
-{
+// Clear the container
-// do not delete items. They will be deleted automatically
+int count = mContainerLayout->count();
-mContainerLayout->removeAt(i);
+for (int i = 0; i < count; i++) {
-}
+// do not delete items. They will be deleted automatically
-}
+mContainerLayout->removeAt(i);
+}
-// Delete all the detail pointers if any
+}
-qDeleteAll(mDetailPtrs);
-mDetailPtrs.clear();
+// Delete all the detail pointers if any
-for(int index = 0; index < mDataContainer->itemCount(); index++)
+qDeleteAll(mDetailPtrs);
-{
+mDetailPtrs.clear();
-CntContactCardDataItem* dataItem = mDataContainer->dataItem(index);
+}
+do {
+if (mListPopulationProgress == mDataContainer->itemCount() || mStopListPopulation) {
+// population of the list has completed
+mListPopulationProgress = CntListPopulationNotInProgress;
+mStopListPopulation = false;
+return;
+}
+CntContactCardDataItem* dataItem = mDataContainer->dataItem(mListPopulationProgress);
 int pos = dataItem->position();
 // communication methods
 if (pos < CntContactCardDataItem::ESeparator && dataItem->isFocusable())
 {
-CntContactCardDetailItem* item = new CntContactCardDetailItem(index, containerWidget);
+CntContactCardDetailItem* item = new CntContactCardDetailItem(mListPopulationProgress, mContainerWidget);
 mDetailPtrs.append(item);
 connect(item, SIGNAL(clicked()), this, SLOT(onItemActivated()));
 if (!mIsTemporary)
 mMaptileLabelList.insert( addressType, maptileLabel );
 }
 //other details
 else
 {
-CntContactCardDetailItem* item = new CntContactCardDetailItem(index, containerWidget, false);
+CntContactCardDetailItem* item = new CntContactCardDetailItem(mListPopulationProgress, mContainerWidget, false);
 mDetailPtrs.append(item);
 //To check whether maptile status  icon is set with the address
 if( ( dataItem->titleText() == hbTrId("txt_phob_formlabel_address") ||
 dataItem->titleText() == hbTrId("txt_phob_formlabel_address_home")||
 }
 item->setDetails(dataItem);
 mContainerLayout->addItem(item);
 }
 }
-}
+++mListPopulationProgress;
+} while (mListPopulationProgress < CntInitialPopulation);
+if (mListPopulationProgress <= CntInitialPopulation) {
+QObject::connect(mView->mainWindow(), SIGNAL(viewReady()), this, SLOT(populateListItems()));
+} else {
+HbApplication::instance()->postEvent(this, new QEvent(ProcessPopulateListEvent));
+}
+CNT_EXIT
 }
 /*
 Connects the action with a slot and also sets the view as the parent for the action.
 */
 void CntContactCardViewPrivate::setAsFavorite()
 {
 QContactId id = mContact->id();
 CntFavourite::addContactToFavouriteGroup( contactManager(), id );
+QContact c = contactManager()->contact(mContact->localId());
+delete mContact;
+mContact = NULL;
+mContact = new QContact(c);
 qobject_cast<HbAction *>(document()->findObject("cnt:removefromfavorite"))->setVisible(true);
 qobject_cast<HbAction *>(document()->findObject("cnt:setasfavorite"))->setVisible(false);
 mHeadingItem->setFavoriteStatus(true);
 }
 void CntContactCardViewPrivate::removeFromFavorite()
 {
 QContactId id = mContact->id();
 CntFavourite::removeContactFromFavouriteGroup( contactManager(), id );
+QContact c = contactManager()->contact(mContact->localId());
+delete mContact;
+mContact = NULL;
+mContact = new QContact(c);
 qobject_cast<HbAction *>(document()->findObject("cnt:removefromfavorite"))->setVisible(false);
 qobject_cast<HbAction *>(document()->findObject("cnt:setasfavorite"))->setVisible(true);
 mHeadingItem->setFavoriteStatus(false);
 }
 QContact tmpContact( *mContact );
 foreach ( QContactAvatar a, tmpContact.details<QContactAvatar>() )
 {
 tmpContact.removeDetail( &a );
 }
+//temproral solution for a contact without name - add an empty name,
+//so vcard construction doesn't fail
+//TODO: use custom handler again when new QVersitContactExporterDetailHandlerV2
+//(part of QtVersit) is available in the platform
+QList<QContactName> names = tmpContact.details<QContactName>();
+if (names.count() > 0)
+{
+QContactName name = names.at(0);
+if (name.firstName().isEmpty() && name.lastName().isEmpty())
+{
+//empty first and last names - update with empty string
+name.setFirstName(QString(""));
+tmpContact.saveDetail(&name);
+}
+}
+else
+{
+//no name detail - create one
+QContactName name;
+name.setFirstName(QString(""));
+tmpContact.saveDetail(&name);
+} //temproral solution for a contact without name - add an empty name,
+//so vcard construction doesn't fail - end
 list.append( tmpContact );
 QString tempDir = QDir::tempPath().append("/tempcntvcard");
 QDir dir(tempDir);
 QString vCardPath = dir.absolutePath().append(QDir::separator());
 vCardPath.append(vCardName);
 vCardPath = QDir::toNativeSeparators(vCardPath);
 QVersitContactExporter exporter;
-CntVCardDetailHandler hanlder;
+//TODO: use custom handler again when new QVersitContactExporterDetailHandlerV2
-exporter.setDetailHandler(&hanlder);
+//(part of QtVersit) is available in the platform
+//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))
 {
 CNT_LOG_ARGS("VCard21Type");
 QList<QVersitDocument> docs = exporter.documents();
 if (!mShareUi) {
 mShareUi = new ShareUi();
 }
 QStringList l;
 l << vCardPath;
-mShareUi->send(l,false);
+mShareUi->send(l, true);
 }
 }
 CNT_EXIT
 }
 return &mEngine->contactManager(SYMBIAN_BACKEND);
 }
 bool CntContactCardViewPrivate::eventFilter(QObject *obj, QEvent *event)
 {
+if (event->type() == ProcessPopulateListEvent && obj == this) {
+populateListItems();
+return true;
+}
 if (event->type() == QEvent::KeyPress && obj == mView->mainWindow())
 {
 QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);
 if (keyEvent->key() == Qt::Key_Yes)
 {

changeset 71	7cc7d74059f9
parent 65	ae724a111993