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

equal deleted inserted replaced

-:99bcbff212ad
+:c2d07d913565
 mDocumentLoader	= new HbDocumentLoader();
 // Set object name
 setObjectName("NmEditorView");
 // Set mailbox name to title pane
 setMailboxName();
+// call the createToolBar on load view layout
+createToolBar();
 // Load view layout
 loadViewLayout();
 }
 /*!
 delete mWaitDialog;
 delete mQueryDialog;
 delete mAttachmentPicker;
 mAttaManager.clearObserver();
 mAttaManager.cancelFetch();
+// make sure virtual keyboard is closed
+QInputContext *ic = qApp->inputContext();
+if (ic) {
+QEvent *closeEvent = new QEvent(QEvent::CloseSoftwareInputPanel);
+ic->filterEvent(closeEvent);
+delete closeEvent;
+}
 }
 /*!
 View layout loading from XML
 */
 mApplication.networkAccessManager());
 mEditWidget = mContentWidget->editor();
 mHeaderWidget = mContentWidget->header();
 // Set default color for user - entered text if editor is in re/reAll/fw mode
-NmUiEditorStartMode mode = mStartParam->editorStartMode();
+if (mStartParam) {
-if (mode == NmUiEditorReply || mode == NmUiEditorReplyAll || mode == NmUiEditorForward) {
+NmUiEditorStartMode mode = mStartParam->editorStartMode();
-mEditWidget->setCustomTextColor(true, Qt::blue);
+if (mode == NmUiEditorReply
+|| mode == NmUiEditorReplyAll
+|| mode == NmUiEditorForward) {
+mEditWidget->setCustomTextColor(true, Qt::blue);
+}
 }
 // the rest of the view initialization is done in viewReady()
 }
 }
 mStartParam=startParam;
 // Store existing edited message to drafts and reload
 // editor with new start parameters.
 // ..
 // Reload editor with new message data
-fetchMessageIfNeeded();
+fetchMessageIfNeeded(*mStartParam);
 }
 else {
 NM_ERROR(1,"nmailui: Invalid editor start parameter");
 // Unused start parameter needs to be deleted
 delete startParam;
 HbMessageBox *dlg = static_cast<HbMessageBox*>(sender());
 // The first action in dialogs action list is for the "Yes"-button.
 if (action == dlg->actions().at(0)) {
+// Update draft message with content.
+updateMessageWithEditorContents();
 // Save message to drafts
 QList<NmOperation *> preliminaryOperations;
 if (mAddAttachmentOperation && mAddAttachmentOperation->isRunning()) {
 preliminaryOperations.append(mAddAttachmentOperation);
 }
 }
 if (mRemoveAttachmentOperation && mRemoveAttachmentOperation->isRunning()) {
 mRemoveAttachmentOperation->cancelOperation();
 }
-if (mMessage) { // this is NULL if sending is started
+if (mMessage) { // this is NULL if sending or saving is started
 // Delete message from drafts
 mUiEngine.removeDraftMessage(mMessage);
 mMessage = NULL;
 }
 }
 menu()->addAction(dummy);
 initializeVKB();
 connect(mContentWidget->header(), SIGNAL(recipientFieldsHaveContent(bool)),
 this, SLOT(setButtonsDimming(bool)) );
-// call the createToolBar on load view layout
-createToolBar();
 // Set dimensions
 adjustViewDimensions();
 // Connect to observe orientation change events
 connect(mApplication.mainWindow(), SIGNAL(orientationChanged(Qt::Orientation)),
 this, SLOT(orientationChanged(Qt::Orientation)));
 // Signal for handling the attachment list selection
+connect(mHeaderWidget, SIGNAL(attachmentShortPressed(NmId)),
+this, SLOT(openAttachmentTriggered(NmId)));
 connect(mHeaderWidget, SIGNAL(attachmentLongPressed(NmId, QPointF)),
 this, SLOT(attachmentLongPressed(NmId, QPointF)));
-// Set message data
+if (mStartParam) {
-fetchMessageIfNeeded();
+fetchMessageIfNeeded(*mStartParam);
+}
+else { // execution cannot proceed without start param
+QMetaObject::invokeMethod(&mApplication, "popView", Qt::QueuedConnection);
+}
 }
 /*!
 If entering editor for forwarding or replying, use attachment manager
 to check that we have all message parts fetched. Also show dialog for
 fetching progress.
 */
-void NmEditorView::fetchMessageIfNeeded()
+void NmEditorView::fetchMessageIfNeeded(NmUiStartParam &startParam)
 {
 NM_FUNCTION;
-if (mStartParam->editorStartMode() == NmUiEditorForward ||
+if (startParam.editorStartMode() == NmUiEditorForward
-mStartParam->editorStartMode() == NmUiEditorReply ||
+|| startParam.editorStartMode()== NmUiEditorReply
-mStartParam->editorStartMode() == NmUiEditorReplyAll) {
+|| startParam.editorStartMode() == NmUiEditorReplyAll) {
 fetchProgressDialogShow();
 mAttaManager.clearObserver();
 mAttaManager.setObserver(this);
 mAttaManager.fetchAllMessageParts(
-mStartParam->mailboxId(),
+startParam.mailboxId(),
-mStartParam->folderId(),
+startParam.folderId(),
-mStartParam->messageId());
+startParam.messageId());
 }
 else {
-startMessageCreation(mStartParam->editorStartMode());
+startMessageCreation(startParam);
 }
 }
 /*!
 Slot. Called when attachments fetch progress changes.
 */
 void NmEditorView::fetchCompleted(int result)
 {
 NM_FUNCTION;
-if (result == NmNoError) {
+if (result == NmNoError && mStartParam) {
-startMessageCreation(mStartParam->editorStartMode());
+startMessageCreation(*mStartParam);
 }
 else {
 mWaitDialog->close();
+// Show fetching failed note
+HbNotificationDialog *note = new HbNotificationDialog();
+note->setIcon(HbIcon(QLatin1String("note_warning")));
+QString noteText = hbTrId("txt_mail_dpopinfo_loading_failed");
+note->setTitle(noteText);
+note->setTitleTextWrapping(Hb::TextWordWrap);
+note->setDismissPolicy(HbPopup::TapAnywhere);
+note->setAttribute(Qt::WA_DeleteOnClose);
+note->setSequentialShow(true);
+note->show();
 QMetaObject::invokeMethod(&mApplication, "popView", Qt::QueuedConnection);
 }
 }
 void NmEditorView::fetchProgressDialogShow()
 mAttaManager.clearObserver();
 }
 QMetaObject::invokeMethod(&mApplication, "popView", Qt::QueuedConnection);
 }
-void NmEditorView::startMessageCreation(NmUiEditorStartMode startMode)
+void NmEditorView::startMessageCreation(NmUiStartParam &startParam)
 {
 NM_FUNCTION;
-NmId mailboxId = mStartParam->mailboxId();
+NmUiEditorStartMode startMode = startParam.editorStartMode();
-NmId folderId = mStartParam->folderId();
+NmId mailboxId = startParam.mailboxId();
-NmId msgId = mStartParam->messageId();
+NmId folderId = startParam.folderId();
+NmId msgId = startParam.messageId();
 if (mMessageCreationOperation && mMessageCreationOperation->isRunning()) {
 mMessageCreationOperation->cancelOperation();
 }
 }
 else if (startMode == NmUiEditorReply || startMode == NmUiEditorReplyAll) {
 mMessageCreationOperation = mUiEngine.createReplyMessage(mailboxId,
 msgId,
 startMode == NmUiEditorReplyAll);
+}
+else if (startMode == NmUiEditorFromDrafts) {
+// Draft opened, so reload message and fill editor with message data.
+mMessage = mUiEngine.message(
+mStartParam->mailboxId(),
+mStartParam->folderId(),
+mStartParam->messageId());
+fillEditorWithMessageContents();
 }
 else {
 mMessageCreationOperation = mUiEngine.createNewMessage(mailboxId);
 }
 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()) {
+if (service && mStartParam && mStartParam->service() &&
+mUiEngine.isSendingMessage()) {
 connect(&mUiEngine, SIGNAL(sendOperationCompleted()),
 this, SLOT(handleSendOperationCompleted()), Qt::UniqueConnection);
 // Construct and setup the wait dialog.
 mServiceSendingDialog = new HbProgressDialog(HbProgressDialog::WaitDialog);
 // Close wait dialog here
 if (mWaitDialog) {
 mWaitDialog->close();
 }
-if (result == NmNoError && mMessageCreationOperation) {
+if (result == NmNoError && mStartParam && mMessageCreationOperation) {
 NmUiEditorStartMode startMode = mStartParam->editorStartMode();
 // get message "again" from engine to update the message contents
 mMessage = mUiEngine.message(
 mStartParam->mailboxId(),
 */
 void NmEditorView::fillEditorWithMessageContents()
 {
 NM_FUNCTION;
-if (!mMessage || !mContentWidget) {
+if (!mStartParam || !mMessage || !mContentWidget) {
 return;
 }
 NmMessageEnvelope messageEnvelope(mMessage->envelope());
-NmUiEditorStartMode editorStartMode = NmUiEditorCreateNew;
 bool useStartParam(false);
-if (mStartParam) {
+NmUiEditorStartMode editorStartMode = mStartParam->editorStartMode();
-editorStartMode = mStartParam->editorStartMode();
+if (editorStartMode == NmUiEditorMailto) {
-if (editorStartMode == NmUiEditorMailto) {
+// Retrieve the message header data e.g. recipients from mStartParam.
-// Retrieve the message header data e.g. recipients from mStartParam.
+useStartParam = true;
-useStartParam = true;
-}
 }
 // Set recipients (to, cc and bcc).
 QString toAddressesString;
 QString ccAddressesString;
 mHeaderWidget->setPriority(messageEnvelope.priority());
 // Set the message body.
 if (editorStartMode==NmUiEditorReply||
 editorStartMode==NmUiEditorReplyAll||
-editorStartMode==NmUiEditorForward){
+editorStartMode==NmUiEditorForward||
+editorStartMode==NmUiEditorFromDrafts){
 // Use the body from the original message.
 NmMessage *originalMessage = mUiEngine.message(mStartParam->mailboxId(),
 mStartParam->folderId(),
 mStartParam->messageId());
 originalMessage->envelope().folderId(),
 originalMessage->envelope().messageId(),
 *htmlPart);
 }
-mContentWidget->setMessageData(*originalMessage);
+if (editorStartMode==NmUiEditorFromDrafts) {
+mContentWidget->setMessageData(*originalMessage, false);
+}
+else {
+mContentWidget->setMessageData(*originalMessage);
+}
 }
 delete originalMessage;
 originalMessage = NULL;
 }
 attachments[i]->attachmentName(),
 QString::number(attachments[i]->size()),
 attachments[i]->partId());
 }
-if (mStartParam) {
+// Attach passed files to the message.
-// Attach passed files to the message.
+QStringList *fileList = mStartParam->attachmentList();
-QStringList *fileList = mStartParam->attachmentList();
+if (fileList) {
-if (fileList) {
+addAttachments(*fileList);
-addAttachments(*fileList);
+}
-}
-}
-// TODO Switch the following arbitrary (magic number) timeout to a
-// meaningful constant, please!
-QTimer::singleShot(200, mHeaderWidget, SLOT(sendHeaderHeightChanged()));
 }
 /*!
 createToolBar. Function asks menu commands from extension
 }
 else {
 	mCcBccFieldVisible = true;
 }
 mHeaderWidget->setFieldVisibility( mCcBccFieldVisible );
-QTimer::singleShot(NmOrientationTimer, this, SLOT(sendHeaderHeightChanged()));
 }
 /*!
 handleActionCommand. From NmActionObserver, extension manager calls this
 call to handle menu command in the UI.
 case NmActionResponseCommandRemoveAttachment: {
 removeAttachmentTriggered();
 break;
 }
 case NmActionResponseCommandOpenAttachment: {
-openAttachmentTriggered();
+openAttachmentTriggered(mSelectedAttachment);
 break;
 }
 default:
 break;
 }
 /*!
 Slot. Cancelled sending progress dialog.
 */
 void NmEditorView::sendProgressDialogCancelled()
 {
-// 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);
 }
 for all editors of the view.
 */
 void NmEditorView::initializeVKB()
 {
 NM_FUNCTION;
+if (!mStartParam) {
+return;
+}
 NmActionRequest request(this, NmActionVKB, NmActionContextViewEditor,
 NmActionContextDataNone, mStartParam->mailboxId(), mStartParam->folderId() );
 NmUiExtensionManager &extMngr = mApplication.extManager();
 if (&extMngr) {
 Parameter 'errorMessage' is the error message returned by the service
 */
 void NmEditorView::onAttachmentsFetchError(int errorCode, const QString& errorMessage)
 {
 NM_FUNCTION;
+Q_UNUSED(errorCode);
+Q_UNUSED(errorMessage);
 NM_COMMENT(QString("Error code: %1").arg(errorCode));
 NM_COMMENT(QString("Error message: %1").arg(errorMessage));
 }
 /*!
 NM_FUNCTION;
 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);
 }
 }
 /*!
 This slot is called when 'open' is selected from attachment list context menu.
 */
-void NmEditorView::openAttachmentTriggered()
+void NmEditorView::openAttachmentTriggered(NmId attachmentId)
 {
 NM_FUNCTION;
+NmId mailboxId = mMessage->envelope().mailboxId();
-mHeaderWidget->launchAttachment(mSelectedAttachment);
+NmId folderId = mMessage->envelope().folderId();
+NmId msgId = mMessage->envelope().messageId();
+XQSharableFile file = mUiEngine.messagePartFile(mailboxId, folderId,
+		msgId, attachmentId);
+int error = NmUtilities::openFile(file);
+file.close();
+if ( error == NmNotFoundError ) {
+NmUtilities::displayErrorNote(hbTrId("txt_mail_dialog_unable_to_open_attachment_file_ty"));
+}
 }
 /*!
 Enables/disables toolbar extension for attach
 */

changeset 44	c2d07d913565
parent 43	99bcbff212ad
child 47	f83bd4ae1fe3
child 54	997a02608b3a