FCL/sf/app/commonemail: comparison emailuis/nmailui/src/nmeditorview.cpp

equal deleted inserted replaced

-:139d4b7b2938
+:99bcbff212ad
 */
 NmEditorView::NmEditorView(
 NmApplication &application,
 NmUiStartParam* startParam,
 NmUiEngine &uiEngine,
+NmAttachmentManager &attaManager,
 QGraphicsItem *parent)
 : NmBaseView(startParam, application, parent),
 mApplication(application),
 mUiEngine(uiEngine),
+mAttaManager(attaManager),
 mDocumentLoader(NULL),
 mScrollArea(NULL),
 mEditWidget(NULL),
 mHeaderWidget(NULL),
 mMessage(NULL),
 mContentWidget(NULL),
 mAttachmentListContextMenu(NULL),
 mMessageCreationOperation(NULL),
 mAddAttachmentOperation(NULL),
 mRemoveAttachmentOperation(NULL),
-mCheckOutboxOperation(NULL),
 mWaitDialog(NULL),
 mQueryDialog(NULL),
 mAttachmentPicker(NULL),
-mCcBccFieldVisible(false)
+mCcBccFieldVisible(false),
-{
+mServiceSendingDialog(NULL)
+{
+NM_FUNCTION;
 mDocumentLoader	= new HbDocumentLoader();
 // Set object name
 setObjectName("NmEditorView");
 // Set mailbox name to title pane
 setMailboxName();
 /*!
 Destructor
 */
 NmEditorView::~NmEditorView()
 {
+NM_FUNCTION;
 if (mRemoveAttachmentOperation && mRemoveAttachmentOperation->isRunning()) {
 mRemoveAttachmentOperation->cancelOperation();
 }
 if (mAddAttachmentOperation && mAddAttachmentOperation->isRunning()) {
 mAddAttachmentOperation->cancelOperation();
 }
 if (mMessageCreationOperation && mMessageCreationOperation->isRunning()) {
 mMessageCreationOperation->cancelOperation();
-}
-if (mCheckOutboxOperation && mCheckOutboxOperation->isRunning()) {
-mCheckOutboxOperation->cancelOperation();
 }
 delete mMessage;
 mWidgetList.clear();
 delete mDocumentLoader;
 delete mContentWidget;
 delete mAttachmentListContextMenu;
 }
 delete mWaitDialog;
 delete mQueryDialog;
 delete mAttachmentPicker;
+mAttaManager.clearObserver();
+mAttaManager.cancelFetch();
 }
 /*!
 View layout loading from XML
 */
 void NmEditorView::loadViewLayout()
 {
+NM_FUNCTION;
 mPrioritySubMenu = NULL;
 // Use document loader to load the view
 bool ok = false;
 mWidgetList = mDocumentLoader->load(NMUI_EDITOR_VIEW_XML, &ok);
 Typically when view is already open and external view activation occurs
 for this same view
 */
 void NmEditorView::reloadViewContents(NmUiStartParam* startParam)
 {
+NM_FUNCTION;
 // Check start parameter validity.
 if (startParam&&startParam->viewId()==NmUiViewMessageEditor) {
 // Delete existing start parameter data
 delete mStartParam;
 mStartParam=NULL;
 mStartParam=startParam;
 // Store existing edited message to drafts and reload
 // editor with new start parameters.
 // ..
 // Reload editor with new message data
-setMessageData();
+fetchMessageIfNeeded();
 }
 else {
-NMLOG("nmailui: Invalid editor start parameter");
+NM_ERROR(1,"nmailui: Invalid editor start parameter");
 // Unused start parameter needs to be deleted
 delete startParam;
 startParam = NULL;
 }
 }
 landscape <-> portrait switch occurs because text needs to
 be wrapped again.
 */
 void NmEditorView::orientationChanged(Qt::Orientation orientation)
 {
+NM_FUNCTION;
 Q_UNUSED(orientation);
 // Adjust content height
 QTimer::singleShot(NmOrientationTimer, this, SLOT(adjustViewDimensions()));
 QTimer::singleShot(NmOrientationTimer, mHeaderWidget, SLOT(sendHeaderHeightChanged()));
 }
 /*!
 Set new dimensions after orientation change.
 */
 void NmEditorView::adjustViewDimensions()
 {
+NM_FUNCTION;
 if (mScrollAreaContents) {
 const QSize reso = mApplication.screenSize();
 mScrollAreaContents->setMinimumWidth(reso.width());
 mScrollAreaContents->setMaximumWidth(reso.width());
 }
 /*!
 View id
 */
 NmUiViewId NmEditorView::nmailViewId() const
 {
+NM_FUNCTION;
 return NmUiViewMessageEditor;
 }
 /*!
 ScrollArea contents
 */
 HbWidget* NmEditorView::scrollAreaContents()
 {
+NM_FUNCTION;
 return mScrollAreaContents;
 }
 /*
 Launch dialog for query user if we want to exit the editor
 */
 void NmEditorView::okToExitView()
 {
+NM_FUNCTION;
 NmEditorHeader *header = mContentWidget->header();
 bool okToExit = true;
 // show the query if the message has not been sent
 if (mMessage && header) {
 // see if editor has any content
-int toTextLength = 0;
-if (header->toEdit()) {
-toTextLength = header->toEdit()->text().length();
-}
-int ccTextLength = 0;
-if (header->ccEdit()) {
-ccTextLength = header->ccEdit()->text().length();
-}
-int bccTextLength = 0;
-if (header->bccEdit()) {
-bccTextLength = header->bccEdit()->text().length();
-}
 int subjectLength = 0;
 if (header->subjectEdit()) {
 subjectLength = header->subjectEdit()->text().length();
 }
 QList<NmMessagePart*> attachmentList;
 mMessage->attachmentList(attachmentList);
-okToExit = (toTextLength == 0 && ccTextLength == 0 && bccTextLength == 0 &&
+okToExit = (subjectLength == 0 && mContentWidget->editor()->document()->isEmpty());
-subjectLength == 0 && mContentWidget->editor()->document()->isEmpty() &&
-attachmentList.count() < 1);
 // content exists, verify exit from user
 if (!okToExit) {
 if (mQueryDialog) {
 delete mQueryDialog;
 mQueryDialog = 0;
 }
 // Launch query dialog.
-mQueryDialog = NmUtilities::displayQuestionNote(hbTrId("txt_mail_dialog_delete_message"),
+mQueryDialog =
+NmUtilities::displayQuestionNote(hbTrId("txt_mail_dialog_save_message_to_drafts"),
 this,
 SLOT(okToExitQuery(HbAction*)));
 }
 }
 /*!
 Handle the user selection is it ok to exit.
 */
 void NmEditorView::okToExitQuery(HbAction* action)
 {
-// Check that 'Yes' button was pressed. Use loc string 'txt_mail_dialog_yes' when possible.
+NM_FUNCTION;
-if (action->text() == "Yes") {
-QMetaObject::invokeMethod(&mApplication,
+HbMessageBox *dlg = static_cast<HbMessageBox*>(sender());
-"popView",
+// The first action in dialogs action list is for the "Yes"-button.
-Qt::QueuedConnection);
+if (action == dlg->actions().at(0)) {
-}
+// Save message to drafts
+QList<NmOperation *> preliminaryOperations;
+if (mAddAttachmentOperation && mAddAttachmentOperation->isRunning()) {
+preliminaryOperations.append(mAddAttachmentOperation);
+}
+if (mRemoveAttachmentOperation && mRemoveAttachmentOperation->isRunning()) {
+preliminaryOperations.append(mRemoveAttachmentOperation);
+}
+// ownership of mMessage is transferred
+// NmOperations are automatically deleted after completion
+mUiEngine.saveDraftMessage(mMessage, preliminaryOperations);
+mMessage = NULL;
+preliminaryOperations.clear();
+}
+// Close the view
+QMetaObject::invokeMethod(&mApplication,
+"popView",
+Qt::QueuedConnection);
 }
 /*!
 About to exit view. Application calls this function when user has
 pressed back key and editor needs to delete the draft message. This is
 called when "auto-exiting" after a successful mail sending.
 */
 void NmEditorView::aboutToExitView()
 {
-if (mStartParam && mStartParam->service() && mUiEngine.isSendingMessage()) {
+NM_FUNCTION;
-// The application was started as a service and is about to close.
-// A message is still being sent and in order to make sure that the
-// send operation is not cancelled, let us display a modal wait dialog.
-// When the send operation is completed, the dialog is automatically
-// closed.
-connect(&mUiEngine, SIGNAL(sendOperationCompleted()),
-this, SLOT(handleSendOperationCompleted()));
-// Close and delete the previous wait dialog if one exists.
-if (mWaitDialog) {
-mWaitDialog->close();
-delete mWaitDialog;
-}
-// Construct and setup the wait dialog.
-mWaitDialog = new HbProgressDialog();
-mWaitDialog->setText(hbTrId("txt_mail_shareui_sending_please_wait"));
-if (!XQServiceUtil::isEmbedded()) {
-// Hide the application.
-XQServiceUtil::toBackground(true);
-}
-// Display the wait dialog.
-mWaitDialog->setModal(false);
-mWaitDialog->setBackgroundFaded(false);
-mWaitDialog->show();
-delete mWaitDialog;
-mWaitDialog = NULL;
-}
 // These operations need to be stopped before message can be deleted
 if (mAddAttachmentOperation && mAddAttachmentOperation->isRunning()) {
 mAddAttachmentOperation->cancelOperation();
 }
 if (mRemoveAttachmentOperation && mRemoveAttachmentOperation->isRunning()) {
 mRemoveAttachmentOperation->cancelOperation();
 }
 if (mMessage) { // this is NULL if sending is started
 // Delete message from drafts
-NmId mailboxId = mMessage->envelope().mailboxId();
+mUiEngine.removeDraftMessage(mMessage);
-NmId folderId = mMessage->envelope().folderId();
+mMessage = NULL;
-NmId msgId = mMessage->envelope().messageId();
-mUiEngine.removeMessage(mailboxId, folderId, msgId);
 }
 }
 /*!
 Lazy loading when view layout has been loaded
 */
 void NmEditorView::viewReady()
 {
-// Connect signals from background scroll area
+NM_FUNCTION;
-connect(mScrollArea, SIGNAL(handleMousePressEvent(QGraphicsSceneMouseEvent*)),
-this, SLOT(sendMousePressEventToScroll(QGraphicsSceneMouseEvent*)));
-connect(mScrollArea, SIGNAL(handleMouseReleaseEvent(QGraphicsSceneMouseEvent*)),
-this, SLOT(sendMouseReleaseEventToScroll(QGraphicsSceneMouseEvent*)));
-connect(mScrollArea, SIGNAL(handleMouseMoveEvent(QGraphicsSceneMouseEvent*)),
-this, SLOT(sendMouseMoveEventToScroll(QGraphicsSceneMouseEvent*)));
-connect(mScrollArea, SIGNAL(handleLongPressGesture(const QPointF &)),
-this, SLOT(sendLongPressGesture(const QPointF &)));
 // Connect options menu about to show to create options menu function
 // Menu needs to be create "just-in-time"
 connect(menu(), SIGNAL(aboutToShow()), this, SLOT(createOptionsMenu()));
 NmAction *dummy = new NmAction(0);
 menu()->addAction(dummy);
 // Signal for handling the attachment list selection
 connect(mHeaderWidget, SIGNAL(attachmentLongPressed(NmId, QPointF)),
 this, SLOT(attachmentLongPressed(NmId, QPointF)));
 // Set message data
-setMessageData();
+fetchMessageIfNeeded();
 }
 /*!
-Find message data based on start parameters.  Method is called
+If entering editor for forwarding or replying, use attachment manager
-when editor is started. If message data is found it means that
+to check that we have all message parts fetched. Also show dialog for
-operation is forward or reply message.
+fetching progress.
 */
-void NmEditorView::setMessageData()
+void NmEditorView::fetchMessageIfNeeded()
 {
-// Check the outbox.
+NM_FUNCTION;
-if (mCheckOutboxOperation && mCheckOutboxOperation->isRunning()) {
-mCheckOutboxOperation->cancelOperation();
+if (mStartParam->editorStartMode() == NmUiEditorForward ||
-NMLOG("NmEditorView::setMessageData old mCheckOutboxOperation running");
+mStartParam->editorStartMode() == NmUiEditorReply ||
-}
+mStartParam->editorStartMode() == NmUiEditorReplyAll) {
-mCheckOutboxOperation = mUiEngine.checkOutbox(mStartParam->mailboxId());
+fetchProgressDialogShow();
+mAttaManager.clearObserver();
-if (mCheckOutboxOperation) {
+mAttaManager.setObserver(this);
-connect(mCheckOutboxOperation, SIGNAL(operationCompleted(int)),
+mAttaManager.fetchAllMessageParts(
-this, SLOT(outboxChecked(int)));
+mStartParam->mailboxId(),
+mStartParam->folderId(),
+mStartParam->messageId());
 }
 else {
-startMessageCreation( mStartParam->editorStartMode() );
+startMessageCreation(mStartParam->editorStartMode());
 }
 }
 /*!
-*/
+Slot. Called when attachments fetch progress changes.
+*/
+void NmEditorView::progressChanged(int value)
+{
+NM_FUNCTION;
+Q_UNUSED(value);
+}
+/*!
+Slot. Called when attachments fetch is completed. We can start
+message creation.
+*/
+void NmEditorView::fetchCompleted(int result)
+{
+NM_FUNCTION;
+if (result == NmNoError) {
+startMessageCreation(mStartParam->editorStartMode());
+}
+else {
+mWaitDialog->close();
+QMetaObject::invokeMethod(&mApplication, "popView", Qt::QueuedConnection);
+}
+}
+void NmEditorView::fetchProgressDialogShow()
+{
+NM_FUNCTION;
+delete mWaitDialog;
+mWaitDialog = NULL;
+// Create new wait dialog and set it to me modal with dimmed background
+mWaitDialog = new HbProgressDialog(HbProgressDialog::WaitDialog);
+mWaitDialog->setModal(true);
+mWaitDialog->setBackgroundFaded(true);
+connect(mWaitDialog, SIGNAL(cancelled()), this, SLOT(fetchProgressDialogCancelled()));
+mWaitDialog->setText(hbTrId("txt_mail_dialog_loading_mail_content"));
+// Display wait dialog
+mWaitDialog->show();
+}
+/*!
+This is called by mFetchProgressDialog when the note is cancelled
+*/
+void NmEditorView::fetchProgressDialogCancelled()
+{
+NM_FUNCTION;
+if (mAttaManager.isFetching()) {
+mAttaManager.cancelFetch();
+mAttaManager.clearObserver();
+}
+QMetaObject::invokeMethod(&mApplication, "popView", Qt::QueuedConnection);
+}
 void NmEditorView::startMessageCreation(NmUiEditorStartMode startMode)
 {
-NMLOG("NmEditorView::startMessageCreation ");
+NM_FUNCTION;
 NmId mailboxId = mStartParam->mailboxId();
 NmId folderId = mStartParam->folderId();
 NmId msgId = mStartParam->messageId();
 if (mMessageCreationOperation && mMessageCreationOperation->isRunning()) {
 /*!
 Starting the message sending is handled here.
 */
 void NmEditorView::startSending()
 {
+NM_FUNCTION;
 // The message contents should be verified
 updateMessageWithEditorContents();
 // verify addresses before sending
 QList<NmAddress> invalidAddresses;
 /*!
 Send the message after all checks have been done.
 */
 void NmEditorView::finalizeSending()
 {
+NM_FUNCTION;
 QList<NmOperation *> preliminaryOperations;
-preliminaryOperations.append(mAddAttachmentOperation);
+if (mAddAttachmentOperation && mAddAttachmentOperation->isRunning()) {
-preliminaryOperations.append(mRemoveAttachmentOperation);
+preliminaryOperations.append(mAddAttachmentOperation);
+}
+if (mRemoveAttachmentOperation && mRemoveAttachmentOperation->isRunning()) {
+preliminaryOperations.append(mRemoveAttachmentOperation);
+}
 // ownership of mMessage is transferred
 // NmOperations are automatically deleted after completion
 mUiEngine.sendMessage(mMessage, preliminaryOperations);
 mMessage = NULL;
 preliminaryOperations.clear();
-// Must use delayed editor view destruction so that query dialog
-// (which has signaled this) gets time to complete.
+#ifndef NM_WINS_ENV
-QMetaObject::invokeMethod(&mApplication,
+bool service = XQServiceUtil::isService();
-"popView",
+#else
-Qt::QueuedConnection);
+bool service = false;
+#endif
+// If sending is started as a service, progress dialog needs to be shown
+// so long that sending is finished otherwise we can close pop current view.
+if (service && mUiEngine.isSendingMessage()) {
+connect(&mUiEngine, SIGNAL(sendOperationCompleted()),
+this, SLOT(handleSendOperationCompleted()), Qt::UniqueConnection);
+// Construct and setup the wait dialog.
+mServiceSendingDialog = new HbProgressDialog(HbProgressDialog::WaitDialog);
+mServiceSendingDialog->setAttribute(Qt::WA_DeleteOnClose);
+mServiceSendingDialog->setText(hbTrId("txt_mail_shareui_sending_please_wait"));
+connect(mServiceSendingDialog, SIGNAL(cancelled()),
+this, SLOT(sendProgressDialogCancelled()));
+#ifndef NM_WINS_ENV
+if (!XQServiceUtil::isEmbedded()) {
+// Hide the application.
+XQServiceUtil::toBackground(true);
+}
+#endif
+// Display the wait dialog.
+mServiceSendingDialog->setModal(true);
+mServiceSendingDialog->setBackgroundFaded(true);
+mServiceSendingDialog->show();
+} else {
+// Must use delayed editor view destruction so that query dialog
+// (which has signaled this) gets time to complete.
+QMetaObject::invokeMethod(&mApplication, "popView", Qt::QueuedConnection);
+}
 }
 /*!
 Handle the user selection for invalid address query which was started by startSending.
 */
 void NmEditorView::invalidAddressQuery(HbAction* action)
 {
-// Check that 'Yes' button was pressed. Use loc string 'txt_mail_dialog_yes' when possible.
+NM_FUNCTION;
-if (action->text() == "Yes") {
+HbMessageBox *dlg = static_cast<HbMessageBox*>(sender());
+// The first action in dialogs action list is for the "Yes"-button.
+if (action == dlg->actions().at(0)) {
 finalizeSending();
 }
 }
 /*!
 This is signalled by mMessageCreationOperation when message is created.
 */
 void NmEditorView::messageCreated(int result)
 {
+NM_FUNCTION;
 delete mMessage;
 mMessage = NULL;
+// Close wait dialog here
+if (mWaitDialog) {
+mWaitDialog->close();
+}
 if (result == NmNoError && mMessageCreationOperation) {
 NmUiEditorStartMode startMode = mStartParam->editorStartMode();
 // get message "again" from engine to update the message contents
 mMessage = mUiEngine.message(
 /*!
 Updates the message with the editor contents.
 */
 void NmEditorView::updateMessageWithEditorContents()
 {
+NM_FUNCTION;
 if (mMessage) {
 if (mContentWidget && mContentWidget->editor()) {
 NmMessagePart* bodyPart = mMessage->htmlBodyPart();
 if (bodyPart) {
 bodyPart->setTextContent(mContentWidget->editor()->toHtml(), NmContentTypeTextHtml);
 Updates the message with the editor contents. Called only once when the
 editor is launched.
 */
 void NmEditorView::fillEditorWithMessageContents()
 {
+NM_FUNCTION;
 if (!mMessage || !mContentWidget) {
 return;
 }
 NmMessageEnvelope messageEnvelope(mMessage->envelope());
 if (subject) {
 mContentWidget->header()->subjectEdit()->setPlainText(*subject);
 }
 }
 else {
-// If a message is taken from the outbox, no subject formatting is done.
-NmId notUsed(0);
-if (mCheckOutboxOperation &&
-mCheckOutboxOperation->getMessageId(notUsed)) {
-editorStartMode = NmUiEditorCreateNew;
-}
 // Construct the subject field.
 mContentWidget->header()->subjectEdit()->setPlainText(
 addSubjectPrefix(editorStartMode, messageEnvelope.subject()));
 }
 // Set priority.
 mHeaderWidget->setPriority(messageEnvelope.priority());
 // Set the message body.
-// Fetch plain text part form message store.
-NmMessagePart *plainPart = mMessage->plainTextBodyPart();
-if (plainPart) {
-mUiEngine.contentToMessagePart(mMessage->envelope().mailboxId(),
-mMessage->envelope().folderId(),
-mMessage->envelope().messageId(),
-*plainPart);
-}
-// Fetch html part form message store.
-NmMessagePart *htmlPart = mMessage->htmlBodyPart();
-if (htmlPart) {
-mUiEngine.contentToMessagePart(mMessage->envelope().mailboxId(),
-mMessage->envelope().folderId(),
-mMessage->envelope().messageId(),
-*htmlPart);
-}
-// Fetch attachment.html part form message store if such exists.
-QList<NmMessagePart*> parts;
-mMessage->attachmentList(parts);
-NmMessagePart *attachmentHtml = NULL;
-foreach(NmMessagePart *part, parts) {
-if (part->contentDescription().startsWith(NmContentDescrAttachmentHtml)) {
-attachmentHtml = part;
-}
-}
-if (attachmentHtml) {
-mUiEngine.contentToMessagePart(mMessage->envelope().mailboxId(),
-mMessage->envelope().folderId(),
-mMessage->envelope().messageId(),
-*attachmentHtml);
-}
-// Set content data
 if (editorStartMode==NmUiEditorReply||
 editorStartMode==NmUiEditorReplyAll||
 editorStartMode==NmUiEditorForward){
-// Pass envelope ptr only when needed for reaply header creation
+// Use the body from the original message.
 NmMessage *originalMessage = mUiEngine.message(mStartParam->mailboxId(),
 mStartParam->folderId(),
 mStartParam->messageId());
-mContentWidget->setMessageData(*mMessage, &originalMessage->envelope());
+if (originalMessage) {
+NmMessagePart *plainPart = originalMessage->plainTextBodyPart();
+if (plainPart) {
+mUiEngine.contentToMessagePart(originalMessage->envelope().mailboxId(),
+originalMessage->envelope().folderId(),
+originalMessage->envelope().messageId(),
+*plainPart);
+}
+NmMessagePart *htmlPart = originalMessage->htmlBodyPart();
+if (htmlPart) {
+mUiEngine.contentToMessagePart(originalMessage->envelope().mailboxId(),
+originalMessage->envelope().folderId(),
+originalMessage->envelope().messageId(),
+*htmlPart);
+}
+mContentWidget->setMessageData(*originalMessage);
+}
 delete originalMessage;
-}
+originalMessage = NULL;
-else{
-// Reply header not needed, do not pass envelope ptr
-mContentWidget->setMessageData(*mMessage);
 }
 // Get list of attachments from the message and set those into UI attachment list
 QList<NmMessagePart*> attachments;
 mMessage->attachmentList(attachments);
 createToolBar. Function asks menu commands from extension
 to be added to toolbar owned by the HbView.
 */
 void NmEditorView::createToolBar()
 {
+NM_FUNCTION;
 HbToolBar *tb = toolBar();
 NmUiExtensionManager &extMngr = mApplication.extManager();
 if (tb && &extMngr && mStartParam) {
 tb->clearActions();
 NmActionRequest request(this, NmActionToolbar, NmActionContextViewEditor,
 HbAction* actionMusic =
 extension->addAction(hbTrId("txt_mail_list_music"), extension, SLOT(close()));
 connect(actionMusic, SIGNAL(triggered()), mAttachmentPicker, SLOT(fetchAudio()));
 HbAction* actionVideo =
 extension->addAction(hbTrId("txt_mail_list_video"), extension, SLOT(close()));
+connect(actionVideo, SIGNAL(triggered()), mAttachmentPicker, SLOT(fetchVideo()));
 HbAction* actionOther =
 extension->addAction(hbTrId("txt_mail_list_other"), extension, SLOT(close()));
+connect(actionOther, SIGNAL(triggered()), mAttachmentPicker, SLOT(fetchOther()));
+HbAction* actionCameraStill =
+extension->addAction(hbTrId("txt_mail_list_new_photo"), extension, SLOT(close()));
+connect(actionCameraStill, SIGNAL(triggered()), mAttachmentPicker, SLOT(fetchCameraStill()));
+HbAction* actionCameraVideo =
+extension->addAction(hbTrId("txt_mail_list_new_video"), extension, SLOT(close()));
+connect(actionCameraVideo, SIGNAL(triggered()), mAttachmentPicker, SLOT(fetchCameraVideo()));
 list[i]->setToolBarExtension(extension);
 }
 }
 }
 }
 createOptionsMenu. Functions asks menu commands from extension
 to be added to options menu.
 */
 void NmEditorView::createOptionsMenu()
 {
+NM_FUNCTION;
 menu()->clearActions();
 	// Create CC/BCC options menu object
 if (mCcBccFieldVisible) {
 menu()->addAction(hbTrId("txt_mail_opt_hide_cc_bcc"), this, SLOT(switchCcBccFieldVisibility()));
 /*!
 Show or hide Cc field
 */
 void NmEditorView::switchCcBccFieldVisibility()
 {
+NM_FUNCTION;
 if (mCcBccFieldVisible) {
 	mCcBccFieldVisible = false;
 }
 else {
 	mCcBccFieldVisible = true;
 handleActionCommand. From NmActionObserver, extension manager calls this
 call to handle menu command in the UI.
 */
 void NmEditorView::handleActionCommand(NmActionResponse &actionResponse)
 {
+NM_FUNCTION;
 NmActionResponseCommand responseCommand = actionResponse.responseCommand();
 // Handle options menu
 if (actionResponse.menuType() == NmActionOptionsMenu) {
 setPriority(responseCommand);
 else if (actionResponse.menuType() == NmActionToolbar) {
 switch (responseCommand) {
 case NmActionResponseCommandSendMail: {
 // Just in case send mail would be somehow accessible during message creation or
 // outobox checking
-if ((!mCheckOutboxOperation || !mCheckOutboxOperation->isRunning())
+if (!mMessageCreationOperation || !mMessageCreationOperation->isRunning()) {
-&& (!mMessageCreationOperation || !mMessageCreationOperation->isRunning())) {
 startSending();
 }
 break;
 }
 default:
 }
 }
 }
 /*!
-This function converts background scroll area coordinate point into
+Slot. Cancelled sending progress dialog.
-body text editor coordinate point.
+*/
-*/
+void NmEditorView::sendProgressDialogCancelled()
-QPointF NmEditorView::viewCoordinateToEditCoordinate(QPointF orgPoint)
+{
-{
+// Needs to be called before closing the application otherwise nmail panics
-QPointF contentWidgetPos = mScrollAreaContents->pos();
+// in destruction.
-qreal y = orgPoint.y() - mHeaderWidget->headerHeight();
+QGraphicsScene *graphicsScene = scene();
-y -= contentWidgetPos.y();
+if (graphicsScene) {
-qreal x = orgPoint.x() - contentWidgetPos.x();
+graphicsScene->clearFocus();
-return QPointF(x, y);
+}
-}
+// Must use delayed editor view destruction so that dialog
-/*!
+// gets time to complete, closes also nmail.
-Send mouse press event to body edit widget
+QMetaObject::invokeMethod(&mApplication, "popView", Qt::QueuedConnection);
-*/
+}
-void NmEditorView::sendMousePressEventToScroll(QGraphicsSceneMouseEvent *event)
-{
-if (event && mEditWidget && mHeaderWidget) {
-event->setPos(viewCoordinateToEditCoordinate(event->pos()));
-event->setAccepted(true);
-mEditWidget->sendMousePressEvent(event);
-}
-}
-/*!
-Send mouse release event to body edit widget
-*/
-void NmEditorView::sendMouseReleaseEventToScroll(QGraphicsSceneMouseEvent *event)
-{
-if (event&& mEditWidget && mHeaderWidget) {
-event->setPos(viewCoordinateToEditCoordinate(event->pos()));
-event->setAccepted(true);
-mEditWidget->sendMouseReleaseEvent(event);
-}
-}
-/*!
-Send mouse move event to body edit widget
-*/
-void NmEditorView::sendMouseMoveEventToScroll(QGraphicsSceneMouseEvent *event)
-{
-if (event&& mEditWidget && mHeaderWidget) {
-event->setPos(viewCoordinateToEditCoordinate(event->pos()));
-event->setAccepted(true);
-mEditWidget->sendMouseMoveEvent(event);
-}
-}
-void NmEditorView::sendLongPressGesture(const QPointF &point)
-{
-if (mEditWidget && mHeaderWidget) {
-QPointF scenePos = mEditWidget->scenePos();
-QPointF newPoint = QPointF(point.x()-scenePos.x(), point.y()-scenePos.y());
-if(mEditWidget->contains(newPoint)) {
-mEditWidget->sendLongPressEvent(point);
-}
-}
-}
 /*!
 Sets all toolbar and VKB buttons dimmed state. All actions that have the
 availability condition NmSendable set, will be enabled/disabled.
 */
 void NmEditorView::setButtonsDimming(bool enabled)
 {
+NM_FUNCTION;
 // Set the toolbar action states
 HbToolBar *tb = toolBar();
 if (tb) {
 QList<QAction *> toolbarList = tb->actions();
 int count = toolbarList.count();
 Initialize the Virtual Keyboard to show the "Send" button
 for all editors of the view.
 */
 void NmEditorView::initializeVKB()
 {
+NM_FUNCTION;
 NmActionRequest request(this, NmActionVKB, NmActionContextViewEditor,
 NmActionContextDataNone, mStartParam->mailboxId(), mStartParam->folderId() );
 NmUiExtensionManager &extMngr = mApplication.extManager();
 if (&extMngr) {
 QList<NmAction *> list;
 /*!
 Set mailbox name to title
 */
 void NmEditorView::setMailboxName()
 {
+NM_FUNCTION;
 if (mStartParam){
 NmMailboxMetaData *meta = mUiEngine.mailboxById(mStartParam->mailboxId());
 if (meta){
 setTitle(meta->name());
 }
 Adds a prefix to the subject for reply or forward.
 Strips other occurrences of the prefix from the beginning.
 */
 QString NmEditorView::addSubjectPrefix( NmUiEditorStartMode startMode, const QString &subject )
 {
+NM_FUNCTION;
 QString newSubject(subject.trimmed());
 if (startMode == NmUiEditorReply || startMode == NmUiEditorReplyAll ||
 startMode == NmUiEditorForward) {
 QString rePrefix(hbTrId("txt_nmailui_reply_subject_prefix"));
 This slot is called when 'attachment picker' request has been performed succesfully
 Parameter 'value' contains file currently one file name but later list of the files.
 */
 void NmEditorView::onAttachmentReqCompleted(const QVariant &value)
 {
+NM_FUNCTION;
 //temporary fix for music picker back button:
 //it shouldn't emit requestOk signal when nothing is selected
 	if (value.canConvert<QStringList>()) {
 	    QStringList list = value.toStringList();
 if (!list.at(0).isEmpty()) {
 addAttachments(list);
 }
 }
 }
+/*!
+This slot is called when 'attachment picker' request has been unsuccesfull
+Parameter 'errorCode' is the error code returned by the service
+Parameter 'errorMessage' is the error message returned by the service
+*/
+void NmEditorView::onAttachmentsFetchError(int errorCode, const QString& errorMessage)
+{
+NM_FUNCTION;
+NM_COMMENT(QString("Error code: %1").arg(errorCode));
+NM_COMMENT(QString("Error message: %1").arg(errorMessage));
+}
 /*!
 Closes the wait dialog if one exists.
 This slot is called if the mail application has been started as a service
 and is about to close. Closing the application while still sending a message
 may cause unwanted cancelling of the operation.
 */
 void NmEditorView::handleSendOperationCompleted()
 {
-if (mWaitDialog) {
+NM_FUNCTION;
-mWaitDialog->close();
-}
+if (mServiceSendingDialog) {
-}
+mServiceSendingDialog->close();
+}
+// Needs to be called before closing the application otherwise nmail panics
+// in destruction.
+QGraphicsScene *graphicsScene = scene();
+if (graphicsScene) {
+graphicsScene->clearFocus();
+}
+// Must use delayed editor view destruction so that dialog
+// gets time to complete, closes also nmail.
+QMetaObject::invokeMethod(&mApplication, "popView", Qt::QueuedConnection);
+}
 /*!
 Add list of attachments
 */
 void NmEditorView::addAttachments(const QStringList& fileNames)
 {
-NMLOG("NmEditorView::addAttachments");
+NM_FUNCTION;
 // Add attachment name into UI
 foreach (QString fileName, fileNames)  {
 // At this phase attachment size and nmid are not known
 mHeaderWidget->addAttachment(fileName, QString("0"), NmId(0));
-NMLOG(fileName);
+NM_COMMENT(fileName);
 }
 //  Cancel previous operation if it's not running.
 if (mAddAttachmentOperation) {
 if (!mAddAttachmentOperation->isRunning()) {
 mAddAttachmentOperation->cancelOperation();
 This slot is called to create context menu when attachment has been selected
 from UI by longpress.
 */
 void NmEditorView::attachmentLongPressed(NmId attachmentPartId, QPointF point)
 {
+NM_FUNCTION;
 // Store id of the attachment to be removed into member.
 // It is used by removeAttachmentTriggered later if 'remove' selected.
 mSelectedAttachment = attachmentPartId;
 if (!mAttachmentListContextMenu) {
 This is signalled by mAddAttachmentOperation when the operation is
 completed for one attachment.
 */
 void NmEditorView::oneAttachmentAdded(const QString &fileName, const NmId &msgPartId, int result)
 {
+NM_FUNCTION;
 if (result == NmNoError && mMessage) {
 // Need to get the message again because new attachment part has been added.
 NmId mailboxId = mMessage->envelope().mailboxId();
 NmId folderId = mMessage->envelope().folderId();
 NmId msgId = mMessage->envelope().messageId();
 }
 }
 }
 else {
 // Attachment adding failed. Show an error note and remove from UI attachment list.
-NMLOG(QString("nmailui: attachment adding into message failed: %1").arg(fileName));
+NM_ERROR(1,QString("nmailui: attachment adding into message failed: %1").arg(fileName));
 mHeaderWidget->removeAttachment(fileName);
 }
 }
 /*!
 This is signalled by mAddAttachmentOperation when the operation is
 completed totally.
 */
 void NmEditorView::allAttachmentsAdded(int result)
 {
+NM_FUNCTION;
 enableToolBarAttach(true);
 if (result != NmNoError) {
 NmUtilities::displayWarningNote(hbTrId("txt_mail_dialog_unable_to_add_attachment"));
 }
 }
 /*!
-This is signalled by mCheckOutboxOperation when the operation is complete.
-*/
-void NmEditorView::outboxChecked(int result)
-{
-bool messageInOutbox = false;
-if (result == NmNoError && mCheckOutboxOperation) {
-NmId messageId;
-messageInOutbox = mCheckOutboxOperation->getMessageId(messageId);
-if (messageInOutbox) {
-delete mMessage;
-mMessage = NULL;
-mMessage = mUiEngine.message(
-mStartParam->mailboxId(),
-mUiEngine.standardFolderId(
-mStartParam->mailboxId(), NmFolderOutbox),
-messageId);
-fillEditorWithMessageContents();
-if (mMessage) {
-NmUtilities::displayWarningNote(
-hbTrId("txt_mail_dialog_sending failed").arg(
-NmUtilities::truncate(
-mMessage->envelope().subject(), 20)));
-}
-}
-}
-if (!messageInOutbox) {
-startMessageCreation(mStartParam->editorStartMode());
-}
-}
-/*!
 Sets priority for the message object that is being edited
 */
 void NmEditorView::setPriority(NmActionResponseCommand priority)
 {
+NM_FUNCTION;
 mHeaderWidget->setPriority(priority);
 if (mMessage) {
 NmMessagePriority messagePriority = NmMessagePriorityNormal;
 \param list The list containing the addresses.
 \return String containing the addresses.
 */
 QString NmEditorView::addressListToString(const QList<NmAddress*> &list) const
 {
+NM_FUNCTION;
 QString addressesString;
 QList<NmAddress*>::const_iterator i = list.constBegin();
 while (i != list.constEnd() && *i) {
 if (i > list.constBegin()) {
 \param list The list containing the addresses.
 \return String containing the addresses.
 */
 QString NmEditorView::addressListToString(const QList<NmAddress> &list) const
 {
+NM_FUNCTION;
 QString addressesString;
 QList<NmAddress>::const_iterator i = list.constBegin();
 while (i != list.constEnd()) {
 if (i > list.constBegin()) {
 /*!
 This slot is called when 'remove' is selected from attachment list context menu.
 */
 void NmEditorView::removeAttachmentTriggered()
 {
+NM_FUNCTION;
 // Cancel will delete previous operation
 if (mRemoveAttachmentOperation) {
 if (!mRemoveAttachmentOperation->isRunning()) {
 mRemoveAttachmentOperation->cancelOperation();
 }
 This slot is called by mRemoveAttachmentOperation when the operation is
 completed. There is no need to update UI because it was already updated.
 */
 void NmEditorView::attachmentRemoved(int result)
 {
+NM_FUNCTION;
 // It is not desided yet what to do if operation fails
 Q_UNUSED(result);
 if (mMessage) {
 // Reload message because one attachment has been removed
 /*!
 This slot is called when 'open' is selected from attachment list context menu.
 */
 void NmEditorView::openAttachmentTriggered()
 {
+NM_FUNCTION;
 mHeaderWidget->launchAttachment(mSelectedAttachment);
 }
 /*!
 Enables/disables toolbar extension for attach
 */
 void NmEditorView::enableToolBarAttach(bool enable)
 {
+NM_FUNCTION;
 HbToolBar *tb = toolBar();
 if (tb) {
 QList<QAction *> toolbarList = tb->actions();
 int count = toolbarList.count();
 for (int i = 0; i < count; i++) {

changeset 43	99bcbff212ad
parent 40	2c62ef3caffd
child 44	c2d07d913565