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

equal deleted inserted replaced

-:6c59112cfd31
+:38bf5461e270
 {
 NM_FUNCTION;
 // Delete opened temporary files.
 NmUtilities::deleteTempFiles(mTempFiles);
 if (mRemoveAttachmentOperation && mRemoveAttachmentOperation->isRunning()) {
 mRemoveAttachmentOperation->cancelOperation();
 }
 if (mAddAttachmentOperation && mAddAttachmentOperation->isRunning()) {
 Loads the view layout from XML.
 */
 void NmEditorView::loadViewLayout()
 {
 NM_FUNCTION;
 // Use the document loader to load the view.
 QObjectList objectList;
 objectList.append(this);
 // Pass the view to documentloader. Document loader uses this view when
 bool ok(false);
 mWidgetList = mDocumentLoader->load(NMUI_EDITOR_VIEW_XML, &ok);
 if (ok) {
 mContent = new NmEditorContent(this, mDocumentLoader,
 mApplication.networkAccessManager(),
 mApplication);
 mHeaderWidget = mContent->header();
 // mode.
 if (mStartParam) {
 NmUiEditorStartMode mode = mStartParam->editorStartMode();
 if (mode == NmUiEditorReply ||
 mode == NmUiEditorReplyAll ||
 mode == NmUiEditorForward) {
 mContent->editor()->setCustomTextColor(true, Qt::blue);
 }
 }
 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)) {
+connect(&mUiEngine, SIGNAL(draftSaved()),this, SLOT(closeView()));
 safeToDraft();
-}
+} else {
+// delete draft now because it is always created in the beginning
-// Close the view
+// of new email creation process
-QMetaObject::invokeMethod(&mApplication,
+connect(&mUiEngine, SIGNAL(draftDeleted()),this, SLOT(closeView()));
-"popView",
+deleteDraft();
-Qt::QueuedConnection);
+}
 }
 /*!
 Public slot to handle draft saving.
 */
 void NmEditorView::safeToDraft()
 {
 // Update draft message with content.
 updateMessageWithEditorContents();
+// Draft messages are always read.
+mMessage->envelope().setRead(true);
 // Save message to drafts
 QList<NmOperation *> preliminaryOperations;
 if (mAddAttachmentOperation && mAddAttachmentOperation->isRunning()) {
 preliminaryOperations.append(mAddAttachmentOperation);
 // ownership of mMessage is transferred
 // NmOperations are automatically deleted after completion
 mUiEngine.saveDraftMessage(mMessage, preliminaryOperations);
 mMessage = NULL;
 preliminaryOperations.clear();
+}
+/*!
+Public slot to handle draft deletion.
+*/
+void NmEditorView::deleteDraft()
+{
+// ownership of mMessage is transferred
+// NmOperations are automatically deleted after completion
+mUiEngine.removeDraftMessage(mMessage);
+mMessage = NULL;
+}
+void NmEditorView::closeView()
+{
+// 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
 void NmEditorView::startMessageCreation(NmUiStartParam &startParam)
 {
 NM_FUNCTION;
 NM_TIMESTAMP("Start editor.");
 NmUiEditorStartMode startMode = startParam.editorStartMode();
 NmId mailboxId = startParam.mailboxId();
 NmId folderId = startParam.folderId();
 NmId msgId = startParam.messageId();
 connect(mMessageCreationOperation,
 SIGNAL(operationCompleted(int)),
 this,
 SLOT(messageCreated(int)));
 }
 // Set focus
 if (mContent && mContent->header() ) {
 if (startMode == NmUiEditorCreateNew || XQServiceUtil::isEmbedded()) {
 if (mContent->header()->toEdit()) {
 mContent->header()->toEdit()->setFocus(Qt::OtherFocusReason);
 */
 void NmEditorView::messageCreated(int result)
 {
 NM_FUNCTION;
 NM_TIMESTAMP("Editor opened.");
 delete mMessage;
 mMessage = NULL;
 // Close wait dialog here
 if (mWaitDialog) {
 QList<NmAddress *> ccAddressList = mStartParam->ccAddressList();
 QList<NmAddress *> bccAddressList = mStartParam->bccAddressList();
 toAddressesString = addressListToString(toAddressList);
 ccAddressesString = addressListToString(ccAddressList);
 bccAddressesString = addressListToString(bccAddressList);
 // Also add recipients added for example from send service
 // interface to recipient line edits.
 mContent->header()->toEdit()->addContacts(toAddressList);
 mContent->header()->ccEdit()->addContacts(ccAddressList);
 mContent->header()->bccEdit()->addContacts(bccAddressList);
 }
 else {
 manager.
 */
 void NmEditorView::createToolBar()
 {
 NM_FUNCTION;
 HbToolBar *tb = toolBar();
 NmUiExtensionManager &extMngr = mApplication.extManager();
 if (!tb || !mStartParam) {
 return;
 NmActionRequest request(this,
 NmActionToolbar,
 NmActionContextViewEditor,
 NmActionContextDataNone,
 mStartParam->mailboxId(),
 mStartParam->folderId());
 QList<NmAction *> list;
 extMngr.getActions(request, list);
 for (int i = 0; i < list.count(); i++) {
 tb->addAction(list[i]);
 mTBExtnContentWidget->addItem(hbTrId("txt_mail_list_new_video"));
 HbListViewItem *listView = mTBExtnContentWidget->listItemPrototype();
 HbFrameBackground frame(NmPopupListFrame, HbFrameDrawer::NinePieces);
 listView->setDefaultFrame(frame);
 extension->setContentWidget(mTBExtnContentWidget);
 connect(mTBExtnContentWidget, SIGNAL(activated(HbListWidgetItem*)),
 extension, SLOT(close()));
 mAttachmentPicker = new NmAttachmentPicker(this);
 connect(mAttachmentPicker, SIGNAL(attachmentsFetchOk(const QVariant &)),
 this, SLOT(onAttachmentReqCompleted(const QVariant &)));
 connect(this, SIGNAL(titleChanged(QString)),
 mAttachmentPicker, SLOT(setTitle(QString)));
 connect(mTBExtnContentWidget, SIGNAL(activated(HbListWidgetItem*)),
 mAttachmentPicker, SLOT (selectFetcher(HbListWidgetItem*)));
 }
 } // for ()
 }
 /*!
 createOptionsMenu. Functions asks menu commands from extension
 */
 void NmEditorView::addAttachments(const QStringList& fileNames)
 {
 NM_FUNCTION;
 NM_TIMESTAMP("Add attachments.");
 // 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));
 NM_COMMENT(fileName);
 */
 void NmEditorView::allAttachmentsAdded(int result)
 {
 NM_FUNCTION;
 NM_TIMESTAMP("All attachments added.");
 enableToolBarAttach(true);
 if (result != NmNoError) {
 NmUtilities::displayWarningNote(hbTrId("txt_mail_dialog_unable_to_add_attachment"));
 }
 }
 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 76	38bf5461e270
parent 74	6c59112cfd31