FCL/sf/app/contacts: comparison phonebookui/cntcommonui/views/cntimageeditorview.cpp

equal deleted inserted replaced

-:c18f9fa7f42e
+:640d30f4fb64
 #include "cntthumbnailmanager.h"
 #include "cntimageutility.h"
 #include "cntsavemanager.h"
 #include "cntimagelabel.h"
-#include <hblabel.h>
-#include <xqaiwrequest.h>
-#include <xqaiwdecl.h>
 #include "cntdebug.h"
 #include "cntglobal.h"
 #include <hbaction.h>
 #include <hbview.h>
 #include <hblistviewitem.h>
 #include <hbframebackground.h>
 #include <hbdevicenotificationdialog.h>
 #include <hbparameterlengthlimiter.h>
+#include <xqaiwrequest.h>
+#include <xqaiwdecl.h>
 #include <QStandardItemModel>
 #include <QApplication>
 const char *CNT_IMAGE_XML = ":/xml/contacts_if.docml";
 mAvatar(NULL),
 mImageLabel(NULL),
 mRequest(NULL),
 mViewManager(NULL),
 mListView(NULL),
-mModel(NULL),
+mModel(NULL)
-mSaveManager(NULL)
 {
 bool ok = false;
 mDocumentLoader.load(CNT_IMAGE_XML, &ok);
 if (ok)
 CNT_ENTRY
 mView->deleteLater();
 delete mAvatar;
-mAvatar = NULL;
 delete mContact;
-mContact = NULL;
 delete mRequest;
-mRequest = NULL;
 delete mRemoveImage;
-mRemoveImage = NULL;
 delete mModel;
-mModel = NULL;
-delete mSaveManager;
-mSaveManager = NULL;
 CNT_EXIT
 }
 /*!
 if ( mArgs.contains(ESelectedGroupContact) && !mContact )
 {
 mContact = new QContact(mArgs.value(ESelectedGroupContact).value<QContact>());
 }
-QString myCard = mArgs.value( EMyCard ).toString();
-QContactLocalId localId = mContact->localId();
-QContactLocalId selfContactId = mEngine->contactManager(SYMBIAN_BACKEND).selfContactId();
-bool isMyCard = ( localId == selfContactId && localId != 0 ) || !myCard.isEmpty();
-if (isMyCard)
-{
-mSaveManager = new CntSaveManager(CntSaveManager::EMyCard);
-}
-else if (mContact->type() == QContactType::TypeGroup)
-{
-mSaveManager = new CntSaveManager(CntSaveManager::EGroup);
-}
-else
-{
-mSaveManager = new CntSaveManager();
-}
 // set the correct image if the contact already has an image set
 mImageLabel = static_cast<CntImageLabel*>(mDocumentLoader.findWidget(QString("cnt_image_label")));
 mImageLabel->ungrabGesture(Qt::TapGesture);
 QList<QContactAvatar> details = mContact->details<QContactAvatar>();
 if (details.count() > 0)
 {
 for (int i = 0;i < details.count();i++)
+{
+if (details.at(i).imageUrl().isValid())
 {
-if (details.at(i).imageUrl().isValid())
+mAvatar = new QContactAvatar(details.at(i));
-{
+mThumbnailManager->getThumbnail(ThumbnailManager::ThumbnailLarge, mAvatar->imageUrl().toString());
-mAvatar = new QContactAvatar(details.at(i));
+break;
-mThumbnailManager->getThumbnail(ThumbnailManager::ThumbnailLarge, mAvatar->imageUrl().toString());
-break;
-}
 }
 }
+}
 else
 {
 mAvatar = new QContactAvatar();
 mRemoveImage->setEnabled(false);
 if (mContact->type() == QContactType::TypeGroup)
 {
 mImageLabel->setAvatarIcon(HbIcon("qtg_large_add_group_picture"));
 }
 }
 // set up the list
 mListView = static_cast<HbListView*>(mDocumentLoader.findWidget(QString("cnt_listview")));
 connect(mListView, SIGNAL(activated(const QModelIndex&)), this,
 void CntImageEditorView::deactivate()
 {
 }
+/*!
+Populate the list model
+*/
 void CntImageEditorView::populateModel(QStandardItemModel *model)
 {
 QStandardItem *newPhoto = new QStandardItem();
 newPhoto->setText(hbTrId("txt_phob_list_take_a_new_photo"));
 newPhoto->setData(HbIcon("qtg_large_camera"), Qt::DecorationRole);
 if (mRequest)
 {
 delete mRequest;
 mRequest = 0;
 }
 mRequest = mAppManager.create(XQI_CAMERA_CAPTURE, XQOP_CAMERA_CAPTURE, false);
 if ( mRequest )
 {
 int mode = 0; //image mode
 QVariantMap map;
 // Set function parameters
 QList<QVariant> args;
 args << mode;
 args << map;
 mRequest->setArguments(args);
+mRequest->setSynchronous(false);    // this must be an Asynchronus request, If symchronous it crashes
 connect(mRequest, SIGNAL(requestOk(const QVariant&)), this, SLOT(handleImageChange(const QVariant&)));
-connect(mRequest, SIGNAL(requestError(int,const QString&)), this, SLOT(handleError(int,const QString&)));
 mRequest->send();
 }
 CNT_EXIT
 }
 }
 mRequest = mAppManager.create(XQI_IMAGE_FETCH, XQOP_IMAGE_FETCH, true);
 if ( mRequest )
 {
+mRequest->setSynchronous(false);
 connect(mRequest, SIGNAL(requestOk(const QVariant&)), this, SLOT(handleImageChange(const QVariant&)));
 mRequest->send();
 }
 }
 mArgs.insert(ECustomParam, viewId());
 mViewManager->back( mArgs );
 }
+/*!
+Called when user selects to remove the image
+*/
 void CntImageEditorView::removeImage()
 {
-QString filePath=mAvatar->imageUrl().toString();
+QString filePath = mAvatar->imageUrl().toString();
 if(!filePath.isEmpty())
 {
 // Check if image removable.
 CntImageUtility imageUtility;
 if(imageUtility.isImageRemovable(filePath))
 }
 CNT_EXIT
 }
+/*!
+Called when thumbnailmanager is ready with the icon handling
+*/
 void CntImageEditorView::thumbnailReady(const QPixmap& pixmap, void *data, int id, int error)
 {
 CNT_ENTRY_ARGS("error code = " << error)
 Q_UNUSED(data);
 }
 CNT_EXIT
 }
+/*!
+Load the layout according to orientation
+*/
 void CntImageEditorView::setOrientation(Qt::Orientation orientation)
 {
 if (orientation == Qt::Vertical)
 {
 // reading "portrait" section
 break;
 }
 }
 }
-void CntImageEditorView::handleError(int errorCode, const QString& errorMessage)
+/*!
-{
+Saves the whole contact, called when user exits phonebook (via task switcher or end key)
-Q_UNUSED(errorCode);
+*/
-Q_UNUSED(errorMessage);
-CNT_LOG_ARGS("error code = " << errorCode << "errorMessage=" << errorMessage)
-}
 void CntImageEditorView::saveContact()
 {
 mContact->saveDetail(mAvatar);
 if ( mAvatar->imageUrl().isEmpty())
 {
 mContact->removeDetail(mAvatar);
 }
-QString name = mEngine->contactManager(SYMBIAN_BACKEND).synthesizedContactDisplayLabel(*mContact);
+QContactManager& mgr = mEngine->contactManager( SYMBIAN_BACKEND );
+QString name = mgr.synthesizedContactDisplayLabel(*mContact);
 if (name.isEmpty())
 {
 name = hbTrId("txt_phob_list_unnamed");
 }
-CntSaveManager::CntSaveResult result = mSaveManager->saveContact(mContact, &mEngine->contactManager(SYMBIAN_BACKEND));
+QString myCard = mArgs.value( EMyCard ).toString();
+QContactLocalId localId = mContact->localId();
+QContactLocalId selfContactId = mgr.selfContactId();
+bool isMyCard = ( localId == selfContactId && localId != 0 ) || !myCard.isEmpty();
+CntSaveManager::CntSaveResult result;
+CntSaveManager& save = mEngine->saveManager();
+if (isMyCard)
+{
+result = save.saveMyCard( mContact, &mgr );
+}
+else if (mContact->type() == QContactType::TypeGroup)
+{
+result = save.saveGroup( mContact, &mgr );
+}
+else
+{
+result = save.saveContact( mContact, &mgr );
+}
 if (mContact->type() != QContactType::TypeGroup)
 {
 switch (result)
 {
 case CntSaveManager::ESaved:
-HbDeviceNotificationDialog::notification(QString(),HbParameterLengthLimiter(hbTrId("txt_phob_dpophead_contact_1_saved")).arg(name));
+HbDeviceNotificationDialog::notification(QString(),HbParameterLengthLimiter("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));
+HbDeviceNotificationDialog::notification(QString(),HbParameterLengthLimiter("txt_phob_dpophead_contacts_1_updated").arg(name));
 break;
 case CntSaveManager::EFailed:
 HbDeviceNotificationDialog::notification(QString(),hbTrId("SAVING FAILED!"));
 break;
 case CntSaveManager::EDeleted:

changeset 81	640d30f4fb64
parent 72	6abfb1094884