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

equal deleted inserted replaced

-:ae34e1715e21
+:a8c646b56683
 mWaitDialog(NULL),
 mQueryDialog(NULL),
 mAttachmentPicker(NULL),
 mCcBccFieldVisible(false),
 mServiceSendingDialog(NULL),
-mIsNotFetchedBefore(true),
 mHiddenPriorityName(NmPriorityNormal)
 {
 NM_FUNCTION;
 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();
 }
 NM_FUNCTION;
 HbMessageBox *dlg = static_cast<HbMessageBox*>(sender());
 // The first action in dialogs action list is for the "Yes"-button.
 if (action == dlg->actions().at(0)) {
+safeToDraft();
-// Update draft message with content.
-updateMessageWithEditorContents();
-// 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);
 }
 /*!
+Public slot to handle draft saving.
+*/
+void NmEditorView::safeToDraft()
+{
+// Update draft message with content.
+updateMessageWithEditorContents();
+// 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();
+}
+/*!
 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()
 Lazy loading when view layout has been loaded
 */
 void NmEditorView::viewReady()
 {
 NM_FUNCTION;
+// Set mailbox name to title pane
+setMailboxName();
 // 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);
 fetchMessageIfNeeded(*mStartParam);
 }
 else { // execution cannot proceed without start param
 QMetaObject::invokeMethod(&mApplication, "popView", Qt::QueuedConnection);
 }
+// Adjust the header width according to the current screen width.
+mHeaderWidget->adjustHeaderWidth();
 }
 /*!
 If entering editor for forwarding or replying, use attachment manager
 to check that we have all message parts fetched. Also show dialog for
 */
 void NmEditorView::fetchMessageIfNeeded(NmUiStartParam &startParam)
 {
 NM_FUNCTION;
-if (mIsNotFetchedBefore == true) {
+if (startParam.editorStartMode() == NmUiEditorForward
-if (startParam.editorStartMode() == NmUiEditorForward
+|| startParam.editorStartMode()== NmUiEditorReply
-|| startParam.editorStartMode()== NmUiEditorReply
+|| startParam.editorStartMode() == NmUiEditorReplyAll) {
-|| startParam.editorStartMode() == NmUiEditorReplyAll) {
+fetchProgressDialogShow();
-fetchProgressDialogShow();
+mAttaManager.clearObserver();
-mAttaManager.clearObserver();
+mAttaManager.setObserver(this);
-mAttaManager.setObserver(this);
+mAttaManager.fetchAllMessageParts(
-mAttaManager.fetchAllMessageParts(
+startParam.mailboxId(),
-startParam.mailboxId(),
+startParam.folderId(),
-startParam.folderId(),
+startParam.messageId());
-startParam.messageId());
+}
-}
+else {
-else {
+startMessageCreation(startParam);
-startMessageCreation(startParam);
-}
-mIsNotFetchedBefore = false;
 }
 }
 /*!
 Slot. Called when attachments fetch progress changes.
 if (result == NmNoError && mStartParam) {
 startMessageCreation(*mStartParam);
 }
 else {
-// Show the fetching failed note only when
+// Close "Loading mail content" dialog
-// the error is not Device/System errors,
+mWaitDialog->close();
+// Show a fetching failed note when the failure is not caused by a Device/System failure.
 if (result != NmNoError &&
 result != NmNotFoundError &&
 result != NmGeneralError &&
 result != NmCancelError &&
 result != NmAuthenticationError &&
 result != NmServerConnectionError &&
 result != NmConnectionError) {
+HbNotificationDialog *note = new HbNotificationDialog();
-HbNotificationDialog *note = new HbNotificationDialog();
 bool enalbeAttribute(true);
 note->setAttribute(Qt::WA_DeleteOnClose, enalbeAttribute);
+note->setIcon(HbIcon(QLatin1String("note_warning")));
-note->setIcon(HbIcon(QLatin1String("note_warning")));
 note->setTitle(hbTrId("txt_mail_dpopinfo_loading_failed"));
 note->setTitleTextWrapping(Hb::TextWordWrap);
 note->setDismissPolicy(HbNotificationDialog::TapAnywhere);
 note->setTimeout(HbNotificationDialog::StandardTimeout);
 note->setSequentialShow(true);
 note->show();
 }
-mWaitDialog->close();
+// Go back to Viewer view
 QMetaObject::invokeMethod(&mApplication, "popView", Qt::QueuedConnection);
 }
 }
 void NmEditorView::fetchProgressDialogShow()
 */
 void NmEditorView::fetchProgressDialogCancelled()
 {
 NM_FUNCTION;
 if (mAttaManager.isFetching()) {
 mAttaManager.cancelFetch();
 mAttaManager.clearObserver();
 }
-QMetaObject::invokeMethod(&mApplication, "popView", Qt::QueuedConnection);
+else {
+// For those email has no attachment or attachment has fetched.
+// Go back to Viewer view.
+QMetaObject::invokeMethod(&mApplication, "popView", Qt::QueuedConnection);
+}
 }
 void NmEditorView::startMessageCreation(NmUiStartParam &startParam)
 {
 NM_FUNCTION;
 NmUtilities::getRecipientsFromMessage(*mMessage, invalidAddresses, NmUtilities::NmInvalidAddress);
 }
 if (invalidAddresses.count() > 0) {
-// invalid addresses found, verify send from user
+// Invalid addresses found, verify send from user.
-QString noteText = hbTrId("txt_mail_dialog_invalid_mail_address_send");
+// Set the first failing address to the note.
-// set the first failing address to the note
+QString noteText =
-noteText = noteText.arg(invalidAddresses.at(0).address());
+HbParameterLengthLimiter(
+"txt_mail_dialog_invalid_mail_address_send"
+).arg(invalidAddresses.at(0).address());
 if (mQueryDialog) {
 delete mQueryDialog;
 mQueryDialog = 0;
 }
 mContent->header()->bccEdit()->setPlainText(bccAddressesString);
 if (ccAddressesString.length() || bccAddressesString.length()) {
 // Since cc or/and bcc recipients exist, expand the group box to display
 // the addresses by expanding the group box.
-mContent->header()->setFieldVisibility(true);
+mCcBccFieldVisible = true;
+mHeaderWidget->setFieldVisibility(mCcBccFieldVisible);
 }
 // Set subject.
 if (useStartParam) {
 QString *subject = mStartParam->subject();
 if (editorStartMode==NmUiEditorReply || editorStartMode==NmUiEditorReplyAll) {
 //Clear the importance flag. Replied messages dont keep the importance
 setPriority(NmActionResponseCommandNone);
 }
 mHeaderWidget->setPriority(messageEnvelope.priority());
+NmMessage *originalMessage = NULL;
 // Set the message body.
 if (editorStartMode==NmUiEditorReply||
 editorStartMode==NmUiEditorReplyAll||
 editorStartMode==NmUiEditorForward||
 editorStartMode==NmUiEditorFromDrafts){
 // Use the body from the original message.
-NmMessage *originalMessage = mUiEngine.message(mStartParam->mailboxId(),
+originalMessage = mUiEngine.message(mStartParam->mailboxId(),
 mStartParam->folderId(),
 mStartParam->messageId());
 if (originalMessage) {
 NmMessagePart *plainPart = originalMessage->plainTextBodyPart();
 if (plainPart) {
 originalMessage->envelope().folderId(),
 originalMessage->envelope().messageId(),
 *htmlPart);
 }
-		mContent->setMessageData(*originalMessage, editorStartMode);
+}
-}
+}
-delete originalMessage;
-originalMessage = NULL;
+QString *signature = NULL;
-}
+// return value is not relevant here
+mUiEngine.getSignature(mStartParam->mailboxId(), signature);
+mContent->setBodyContent(editorStartMode, originalMessage, signature);
+delete signature;
+signature = NULL;
+delete originalMessage;
+originalMessage = NULL;
 // Get list of attachments from the message and set those into UI attachment list
 QList<NmMessagePart*> attachments;
 mMessage->attachmentList(attachments);
 for (int i=0; i<attachments.count(); i++) {
 HbToolBarExtension* extension = new HbToolBarExtension();
 mAttachmentPicker = new NmAttachmentPicker(this);
 if (extension && mAttachmentPicker) {
 connect(mAttachmentPicker, SIGNAL(attachmentsFetchOk(const QVariant &)),
 this, SLOT(onAttachmentReqCompleted(const QVariant &)));
+connect(this, SIGNAL(titleChanged(QString)), mAttachmentPicker,
+SLOT(setTitle(QString)));
 list[i]->setToolBarExtension(extension);
 //content widget to get the items to a list
 mTBExtnContentWidget = new HbListWidget();
 mTBExtnContentWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
 int count = toolbarList.count();
 for (int i = 0; i < count; i++) {
 NmAction *action = static_cast<NmAction *>(toolbarList[i]);
 if (action->availabilityCondition() == NmAction::NmAttachable) {
 action->setEnabled(enable);
-}
+if (enable) {
-}
+// For some reason 'Add attachment' toolbar button stays dimmed sometimes,
-}
+// showItems will fix the situation.
-}
+showItems(Hb::ToolBarItem);
+}
+}
+}
+}
+}

changeset 62	a8c646b56683
parent 57	ae34e1715e21
child 66	084b5b1f02a7