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

equal deleted inserted replaced

-:81c360d47083
+:e6aff7b69165
 #include "cntdetailpopup.h"
 #include "cnteditviewheadingitem.h"
 #include "cntimagelabel.h"
 #include "cntsavemanager.h"
 #include "cntglobal.h"
+#include "cntdebug.h"
 #include <qtcontacts.h>
 #include <hbdocumentloader.h>
 #include <thumbnailmanager_qt.h>
 #include <hbabstractviewitem.h>
 #include <xqaiwdecl.h>
 #include <cntservicescontact.h>
 #include <QFileInfo>
 #include <QApplication>
+#include <QTimer>
 const char *CNT_EDIT_XML = ":/xml/contacts_ev.docml";
 CntEditViewPrivate::CntEditViewPrivate() :
 mModel( NULL ),
 mImageLabel( NULL ),
 mThumbnailManager( NULL ),
 mContact( NULL ),
-mReq(0),
+mReq(NULL),
 mMenu(NULL),
 mSaveManager(NULL)
 {
 mDocument = new CntDocumentLoader;
 }
 }
 void CntEditViewPrivate::activate( CntAbstractViewManager* aMgr, const CntViewParameters aArgs )
 {
+CNT_ENTRY
 mMgr = aMgr;
 mArgs = aArgs;
 if ( mView->navigationAction() != mSoftkey)
 {
 connect( mThumbnailManager, SIGNAL(thumbnailReady(QPixmap, void*, int, int)),
 this, SLOT(thumbnailReady(QPixmap, void*, int, int)) );
 loadAvatar();
+CNT_EXIT
 }
 void CntEditViewPrivate::deactivate()
 {
 }
 void CntEditViewPrivate::handleAddDetailItem(HbAction *aAction)
 {
 CntDetailPopup *popup = static_cast<CntDetailPopup*>(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 );
 switch ( id )
 HbMessageBox::Yes | HbMessageBox::No);
 }
 else
 {
 QContactManager* cm = mMgr->contactManager( SYMBIAN_BACKEND );
-QString name = cm->synthesizedDisplayLabel( *mContact );
+QString name = cm->synthesizedContactDisplayLabel( *mContact );
 if (name.isEmpty())
 {
 name = hbTrId("txt_phob_list_unnamed");
 }
 if(action == HbMessageBox::Yes || action == HbMessageBox::Delete)
 {
 QContactManager* cm = mMgr->contactManager( SYMBIAN_BACKEND );
+disconnect(cm, SIGNAL(contactsRemoved(const QList<QContactLocalId>&)),
+this, SLOT(contactDeletedFromOtherSource(const QList<QContactLocalId>&)));
 emit q->contactRemoved(cm->removeContact( mContact->localId() ));
-mMgr->back( mArgs );
+mMgr->back( mArgs, true );
 }
 }
 void CntEditViewPrivate::discardChanges()
 {
 emit q->changesDiscarded();
 // 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);
-QString name = mMgr->contactManager(SYMBIAN_BACKEND)->synthesizedDisplayLabel(*mContact);
+QString name = mMgr->contactManager(SYMBIAN_BACKEND)->synthesizedContactDisplayLabel(*mContact);
 if (name.isEmpty())
 {
 name = hbTrId("txt_phob_list_unnamed");
 }
 CntSaveManager::CntSaveResult result = mSaveManager->saveContact(mContact, mMgr->contactManager(SYMBIAN_BACKEND));
 QVariant var;
+bool backToRoot(false);
 switch (result)
 {
 case CntSaveManager::ESaved:
 emit q->contactUpdated(KCntServicesReturnValueContactSaved);
 case CntSaveManager::EFailed:
 emit q->contactUpdated(KCntServicesReturnValueContactNotModified);
 HbDeviceNotificationDialog::notification(QString(),hbTrId("SAVING FAILED!"));
 break;
 case CntSaveManager::EDeleted:
-emit q->contactUpdated(KCntServicesReturnValueContactDeleted);
+emit q->contactRemoved(true);
+backToRoot = true;
 break;
 case CntSaveManager::ENothingDone:
 default:
 emit q->contactUpdated(KCntServicesReturnValueContactNotModified);
 break;
 }
-mMgr->back( mArgs );
+if ( mArgs.value( EExtraAction ).toString() == CNT_ROOT_ACTION )
+{
+backToRoot = true;
+}
+mMgr->back( mArgs, backToRoot );
 }
 void CntEditViewPrivate::openNameEditor()
 {
 QVariant var;
 {
 HbIcon icon(pixmap);
 mHeading->setIcon(icon);
 mImageLabel->clear();
-mImageLabel->setIcon(icon);
+mImageLabel->setIcon(pixmap);
 }
 }
 HbMenu* CntEditViewPrivate::createPopup( const QModelIndex aIndex, CntEditViewItem* aDetail )
 {
 }
 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 );
+mArgs.insert(ESelectedContact, var);
-mMgr->changeView( viewParameters );
+mMgr->changeView( mArgs );
 }
 void CntEditViewPrivate::editDetail( CntEditViewItem* aDetail )
 {
 QVariant id = aDetail->data( ERoleEditorViewId );
 {
 delete mContact;
 mContact = NULL;
 }
 mContact = new QContact( aContact );
-/*
-mListView->setModel( NULL );
+QContactManager* cm = mMgr->contactManager( SYMBIAN_BACKEND );
+connect(cm, SIGNAL(contactsRemoved(const QList<QContactLocalId>&)),
-if ( mModel )
+this, SLOT(contactDeletedFromOtherSource(const QList<QContactLocalId>&)), Qt::UniqueConnection);
-{
+}
-delete mModel;
-mModel = NULL;
+void CntEditViewPrivate::contactDeletedFromOtherSource(const QList<QContactLocalId>& contactIds)
-}
+{
-mModel = new CntEditViewListModel( mContact );
+CNT_ENTRY
-if ( mListView )
+if ( contactIds.contains(mContact->localId()) )
-mListView->setModel( mModel );
+{
-*/
+// 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
+}
+void CntEditViewPrivate::showRootView()
+{
+CNT_ENTRY
+Q_Q(CntEditView);
+emit q->contactRemoved(true);
+mMgr->back( mArgs, true );
+CNT_EXIT
+}
 // End of File

changeset 53	e6aff7b69165
parent 50	77bc263e1626
child 61	d30183af6ca6