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

equal deleted inserted replaced

-:578830873419
+:ecc8def7944a
 static const char *NMUI_EDITOR_SCROLL_AREA_CONTENTS = "scrollAreaContents";
 static const int nmOrientationTimer=100;
 static const QString Delimiter("; ");
-#define IMAGE_FETCHER_INTERFACE "Image"
-#define FETCHER_OPERATION "fetch(QVariantMap,QVariant)"
 /*!
 	\class NmEditorView
 	\brief Mail editor view
 */
 NmEditorView::NmEditorView(
 NmApplication &application,
 NmUiStartParam* startParam,
 NmUiEngine &uiEngine,
 QGraphicsItem *parent)
 : NmBaseView(startParam, parent),
 mApplication(application),
 mUiEngine(uiEngine),
 mDocumentLoader(NULL),
 mScrollArea(NULL),
 mEditWidget(NULL),
 mHeaderWidget(NULL),
 mMessage(NULL),
 mContentWidget(NULL),
-mAttachContextMenu(NULL),
+mAttachmentListContextMenu(NULL),
 mMessageCreationOperation(NULL),
 mAddAttachmentOperation(NULL),
 mRemoveAttachmentOperation(NULL),
-mCheckOutboxOperation(NULL)
+mCheckOutboxOperation(NULL),
+mWaitDialog(NULL),
+mAttachmentPicker(NULL)
 {
 mDocumentLoader	= new HbDocumentLoader();
 // Set object name
 setObjectName("NmEditorView");
 // Load view layout
 /*!
 Destructor
 */
 NmEditorView::~NmEditorView()
 {
+// It is clearer that the operations are not owned by parent QObject as
+// they are not allocated in the constructor.
+delete mRemoveAttachmentOperation;
+delete mAddAttachmentOperation;
 delete mMessageCreationOperation;
 delete mCheckOutboxOperation;
 delete mMessage;
 mWidgetList.clear();
 delete mDocumentLoader;
 delete mContentWidget;
 delete mPrioritySubMenu;
-delete mAttachContextMenu;
+if (mAttachmentListContextMenu) {
+mAttachmentListContextMenu->clearActions();
+delete mAttachmentListContextMenu;
+}
+delete mWaitDialog;
+delete mAttachmentPicker;
 }
 /*!
 View layout loading from XML
 */
 mScrollArea = qobject_cast<NmBaseViewScrollArea *>
 (mDocumentLoader->findObject(NMUI_EDITOR_SCROLL_AREA));
 mScrollAreaContents = qobject_cast<HbWidget *>
 (mDocumentLoader->findObject(NMUI_EDITOR_SCROLL_AREA_CONTENTS));
-mContentWidget = new NmEditorContent(mScrollArea, this, mDocumentLoader);
+mContentWidget = new NmEditorContent(mScrollArea, this, mDocumentLoader,
+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();
 // 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(attachmentRemoved(const NmId)),
+connect(mHeaderWidget, SIGNAL(attachmentLongPressed(NmId, QPointF)),
-this, SLOT(removeAttachment(const NmId)));
+this, SLOT(attachmentLongPressed(NmId, QPointF)));
 }
 /*!
 Reload view contents with new start parameters
 Typically when view is already open and external view activation occurs
 void NmEditorView::orientationChanged(Qt::Orientation orientation)
 {
 Q_UNUSED(orientation);
 // Adjust content height
 QTimer::singleShot(nmOrientationTimer, this, SLOT(adjustViewDimensions()));
+QTimer::singleShot(nmOrientationTimer, mHeaderWidget, SLOT(sendHeaderHeightChanged()));
 }
 /*!
 Set new dimensions after orientation change.
 */
 return mScrollAreaContents;
 }
 /*
 Query user if we want to exit the editor
 */
 bool NmEditorView::okToExitView()
 {
 bool okToExit = true;
 // show the query if the message has not been sent
 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()) {
+// 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->exec();
+delete mWaitDialog;
+mWaitDialog = NULL;
+}
 // These operations need to be stopped before message can be deleted
 delete mAddAttachmentOperation;
+mAddAttachmentOperation = NULL;
 delete mRemoveAttachmentOperation;
+mRemoveAttachmentOperation = NULL;
 if (mMessage) { // this is NULL if sending is started
 // Delete message from drafts
 NmId mailboxId = mMessage->mailboxId();
 NmId folderId = mMessage->parentId();
 /*!
 Find message data based on start parameters.  Method is called
 when editor is started. If message data is found it means that
 operation is forward or reply message.
 */
 void NmEditorView::setMessageData()
 {
 // Check the outbox.
 delete mCheckOutboxOperation;
-	mCheckOutboxOperation = NULL;
+mCheckOutboxOperation = NULL;
-	mCheckOutboxOperation = mUiEngine.checkOutbox(mStartParam->mailboxId());
+mCheckOutboxOperation = mUiEngine.checkOutbox(mStartParam->mailboxId());
 if (mCheckOutboxOperation) {
 connect(mCheckOutboxOperation, SIGNAL(operationCompleted(int)),
 this, SLOT(outboxChecked(int)));
 }
 startMessageCreation( mStartParam->editorStartMode() );
 }
 }
 /*!
 */
 void NmEditorView::startMessageCreation(NmUiEditorStartMode startMode)
 {
 NmId mailboxId = mStartParam->mailboxId();
 NmId folderId = mStartParam->folderId();
 NmId msgId = mStartParam->messageId();
 delete mMessageCreationOperation;
-	mMessageCreationOperation = NULL;
+mMessageCreationOperation = NULL;
-	// original message is now fetched so start message creation
+// original message is now fetched so start message creation
 if (startMode == NmUiEditorForward) {
 mMessageCreationOperation = mUiEngine.createForwardMessage(mailboxId, msgId);
 }
 else if (startMode == NmUiEditorReply || startMode == NmUiEditorReplyAll) {
 mMessageCreationOperation = mUiEngine.createReplyMessage(mailboxId,
 }
 }
 /*!
 Starting the message sending is handled here.
 */
 void NmEditorView::startSending()
 {
 // The message contents should be verified
 updateMessageWithEditorContents();
 // verify addresses before sending
 QList<NmAddress> invalidAddresses;
-NmUtilities::getRecipientsFromMessage(*mMessage, invalidAddresses, NmUtilities::InvalidAddress);
+if (mMessage) {
+NmUtilities::getRecipientsFromMessage(*mMessage, invalidAddresses, NmUtilities::InvalidAddress);
+}
 bool okToSend = true;
 if (invalidAddresses.count() > 0) {
 // invalid addresses found, verify send from user
 HbAction *action = messageBox->exec();
 okToSend = (action == messageBox->primaryAction());
 }
 if (okToSend) {
-// ownership of mMessage changes
+QList<NmOperation *> preliminaryOperations;
-mUiEngine.sendMessage(mMessage);
+preliminaryOperations.append(mAddAttachmentOperation);
+preliminaryOperations.append(mRemoveAttachmentOperation);
+// ownership of mMessage is transferred
+// ownerships of NmOperations in preliminaryOperations are transferred
+mUiEngine.sendMessage(mMessage, preliminaryOperations);
 mMessage = NULL;
+mAddAttachmentOperation = NULL;
+mRemoveAttachmentOperation = NULL;
+preliminaryOperations.clear();
 // sending animation should be shown here, then exit
 QTimer::singleShot(1000, &mApplication, SLOT(popView()));
 }
 }
 /*!
 This is signalled by mMessageCreationOperation when message is created.
 */
 void NmEditorView::messageCreated(int result)
 {
 delete mMessage;
 mMessage = NULL;
 }
 }
 /*!
 Updates the message with the editor contents.
 */
 void NmEditorView::updateMessageWithEditorContents()
 {
 if (mMessage) {
 if (mContentWidget && mContentWidget->editor()) {
 NmMessagePart* bodyPart = mMessage->htmlBodyPart();
 /*!
 Updates the message with the editor contents. Called only once when the
 editor is launched.
 */
 void NmEditorView::fillEditorWithMessageContents()
 {
 if (!mMessage || !mContentWidget) {
 return;
 }
 mMessage->parentId(),
 mMessage->envelope().id(),
 *attachmentHtml);
 }
-mContentWidget->setMessageData(mMessage);
+// Set content data
+if (editorStartMode==NmUiEditorReply||
+editorStartMode==NmUiEditorReplyAll||
+editorStartMode==NmUiEditorForward){
+// Pass envelope ptr only when needed for reaply header creation
+NmMessage *originalMessage = mUiEngine.message(mStartParam->mailboxId(),
+mStartParam->folderId(),
+mStartParam->messageId());
+mContentWidget->setMessageData(*mMessage, &originalMessage->envelope());
+delete originalMessage;
+}
+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);
 // If action has NmSendable condition, it is shown only when send action
 // is available, i.e. when at least one recipient field has data.
 if( list[i]->availabilityCondition() == NmAction::NmSendable ) {
 list[i]->setEnabled(false);
 }
-}
+//object name set in NmBaseClientPlugin::createEditorViewCommands
+//temporary solution
+else if (list[i]->objectName() == "baseclientplugin_attachaction") {
+HbToolBarExtension* extension = new HbToolBarExtension();
+mAttachmentPicker = new NmAttachmentPicker(this);
+if (extension && mAttachmentPicker) {
+connect(mAttachmentPicker, SIGNAL(attachmentsFetchOk(const QVariant &)),
+this, SLOT(onAttachmentReqCompleted(const QVariant &)));
+HbAction* actionPhoto =
+extension->addAction(hbTrId("txt_mail_list_photo"), extension, SLOT(close()));
+connect(actionPhoto, SIGNAL(triggered()), mAttachmentPicker, SLOT(fetchImage()));
+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()));
+HbAction* actionOther =
+extension->addAction(hbTrId("txt_mail_list_other"), extension, SLOT(close()));
+list[i]->setToolBarExtension(extension);
+}
+}
+}
 }
 }
 /*!
 createOptionsMenu. Functions asks menu commands from extension
 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->isRunning()
+&& (!mMessageCreationOperation || !mMessageCreationOperation->isRunning())) {
 startSending();
-break;
+}
-}
+break;
-case NmActionResponseCommandAttach : {
+}
-// Do nothing if previous addAttachment operation is still ongoing.
+default:
-if(!mAddAttachmentOperation || !mAddAttachmentOperation->isRunning()) {
+break;
-//will be replaced by toolbar extension
+}
-if (!mAttachContextMenu) {
+}
-QList<NmAction *> actionList;
+else if (actionResponse.menuType() == NmActionContextMenu) {
-NmAction* actionPhoto = new NmAction(0);
+switch (responseCommand) {
-actionPhoto->setText(QObject::tr("Photo", "txt_nmailui_photo_attach"));
+case NmActionResponseCommandRemoveAttachment: {
-actionList.append(actionPhoto);
+removeAttachmentTriggered();
-connect(actionPhoto, SIGNAL(triggered()), this, SLOT(attachImage()));
+break;
+}
-mAttachContextMenu = new HbMenu();
+case NmActionResponseCommandOpenAttachment: {
-mAttachContextMenu->clearActions();
+openAttachmentTriggered();
+break;
-for (int i=0;i<actionList.count();i++) {
+}
-mAttachContextMenu->addAction(actionList[i]);
+default:
-}
+	break;
-}
-QPointF menuPos(qreal(20),qreal(520));
-mAttachContextMenu->exec(menuPos);
-}
-break;
-}
-default:
-break;
 }
 }
 }
 /*!
 This function converts background scroll area coordinate point into
 body text editor coordinate point.
 */
 QPointF NmEditorView::viewCoordinateToEditCoordinate(QPointF orgPoint)
 {
 QPointF contentWidgetPos = mScrollAreaContents->pos();
 qreal y = orgPoint.y() - mHeaderWidget->headerHeight();
 y -= contentWidgetPos.y();
 }
 /*!
 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 )
 {
 QString newSubject(subject.trimmed());
 if (startMode == NmUiEditorReply || startMode == NmUiEditorReplyAll ||
 }
 return newSubject;
 }
-#ifdef Q_OS_SYMBIAN
-void NmEditorView::attachImage()
-{
-XQAiwRequest *request;
-XQApplicationManager mAppmgr;
-request = mAppmgr.create(IMAGE_FETCHER_INTERFACE, FETCHER_OPERATION, true);
-if (request) {
-connect(request, SIGNAL(requestOk(const QVariant&)), this, SLOT(onAttachmentReqCompleted(const QVariant&)));
-}
-else {
-//create request failed
-NMLOG("appmgr: create request failed");
-return;
-}
-if (!(request)->send()) {
-//sending request failed
-NMLOG("appmgr: send request failed");
-}
-delete request;
-}
 /*!
 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.
 */
 if (!value.isNull()) {
 addAttachments(value.toStringList());
 }
 }
-#endif
+/*!
+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) {
+mWaitDialog->close();
+}
+}
 /*!
 Add list of attachments
 */
 void NmEditorView::addAttachments(const QStringList& fileNames)
 // At this phase attachment size and nmid are not known
 mHeaderWidget->addAttachment(fileName, QString("0"), NmId(0));
 NMLOG(fileName);
 }
-// Start operation to attach file or list of files into mail message
+// Delete previous operation if it's not running.
-// This will also copy files into message store
-// Delete previous operation
 if (mAddAttachmentOperation) {
 if (!mAddAttachmentOperation->isRunning()) {
 delete mAddAttachmentOperation;
 mAddAttachmentOperation = NULL;
 }
 }
 if (!mAddAttachmentOperation) {
+// Start operation to attach file or list of files into mail message.
+// This will also copy files into message store.
 mAddAttachmentOperation = mUiEngine.addAttachments(*mMessage, fileNames);
 if (mAddAttachmentOperation) {
+enableToolBarAttach(false);
 // Signal to inform completion of one attachment
 connect(mAddAttachmentOperation,
 SIGNAL(operationPartCompleted(const QString &, const NmId &, int)),
 this,
 SLOT(oneAttachmentAdded(const QString &, const NmId &, int)));
 }
 }
 }
 /*!
-This slot is called when attachment has been deleted from UI
+This slot is called to create context menu when attachment has been selected
-*/
+from UI by longpress.
-void NmEditorView::removeAttachment(const NmId attachmentPartId)
+*/
-{
+void NmEditorView::attachmentLongPressed(NmId attachmentPartId, QPointF point)
-// Delete previous operation
+{
-if (mRemoveAttachmentOperation) {
+// Store id of the attachment to be removed into member.
-if (!mRemoveAttachmentOperation->isRunning()) {
+// It is used by removeAttachmentTriggered later if 'remove' selected.
-delete mRemoveAttachmentOperation;
+mSelectedAttachment = attachmentPartId;
-mRemoveAttachmentOperation = NULL;
-}
+if (!mAttachmentListContextMenu) {
-}
+mAttachmentListContextMenu = new HbMenu();
-if (!mRemoveAttachmentOperation) {
+}
-mRemoveAttachmentOperation = mUiEngine.removeAttachment(*mMessage, attachmentPartId);
+mAttachmentListContextMenu->clearActions();
-}
+NmActionRequest request(this, NmActionContextMenu, NmActionContextViewEditor,
+NmActionContextDataMessage, mStartParam->mailboxId(), mStartParam->folderId(),
+mStartParam->messageId());
+NmUiExtensionManager &extensionManager = mApplication.extManager();
+if (&extensionManager) {
+QList<NmAction*> actionList;
+extensionManager.getActions(request, actionList);
+for (int i = 0; i < actionList.count(); ++i) {
+mAttachmentListContextMenu->addAction(actionList[i]);
+}
+}
+// Add menu position check here, so that it does not go outside of the screen
+QPointF menuPos(point.x(),point.y());
+mAttachmentListContextMenu->exec(menuPos);
 }
 /*!
 This is signalled by mAddAttachmentOperation when the operation is
 completed for one attachment.
 */
 void NmEditorView::oneAttachmentAdded(const QString &fileName, const NmId &msgPartId, int result)
 {
-if (result == NmNoError) {
+if (result == NmNoError && mMessage) {
-// Get file size from the message when it works
+// Need to get the message again because new attachment part has been added.
-mHeaderWidget->setAttachmentParameters(fileName, msgPartId, QString("0"), result);
+NmId mailboxId = mMessage->mailboxId();
+NmId folderId = mMessage->parentId();
+NmId msgId = mMessage->envelope().id();
+delete mMessage;
+mMessage = NULL;
+mMessage = mUiEngine.message(mailboxId, folderId, msgId);
+if (mMessage) {
+// Get attachment list from the message
+QList<NmMessagePart*> attachmentList;
+mMessage->attachmentList(attachmentList);
+// Search newly added attachment from the list
+for (int i=0; i<attachmentList.count(); i++) {
+if (attachmentList[i]->id() == msgPartId) {
+// Get attachment file size and set it into UI
+mHeaderWidget->setAttachmentParameters(fileName,
+msgPartId,
+QString().setNum(attachmentList[i]->size()),
+result);
+}
+}
+}
 }
 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));
 mHeaderWidget->removeAttachment(fileName);
 }
 /*!
 This is signalled by mAddAttachmentOperation when the operation is
 completed totally.
 */
 void NmEditorView::allAttachmentsAdded(int result)
 {
+enableToolBarAttach(true);
 if (result != NmNoError) {
 HbMessageBox::warning(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) {
 }
 return addressesString;
 }
+/*!
+This slot is called when 'remove' is selected from attachment list context menu.
+*/
+void NmEditorView::removeAttachmentTriggered()
+{
+// Delete previous operation
+if (mRemoveAttachmentOperation) {
+if (!mRemoveAttachmentOperation->isRunning()) {
+delete mRemoveAttachmentOperation;
+mRemoveAttachmentOperation = NULL;
+}
+}
+if (!mRemoveAttachmentOperation) {
+// Remove from UI
+mHeaderWidget->removeAttachment(mSelectedAttachment);
+// Remove from message store
+mRemoveAttachmentOperation = mUiEngine.removeAttachment(*mMessage, mSelectedAttachment);
+if (mRemoveAttachmentOperation) {
+// Signal to inform the remove operation completion
+connect(mRemoveAttachmentOperation,
+SIGNAL(operationCompleted(int)),
+this,
+SLOT(attachmentRemoved(int)));
+}
+}
+}
+/*!
+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)
+{
+// It is not desided yet what to do if operation fails
+Q_UNUSED(result);
+if (mMessage) {
+// Reload message because one attachment has been removed
+NmId mailboxId = mMessage->mailboxId();
+NmId folderId = mMessage->parentId();
+NmId msgId = mMessage->envelope().id();
+delete mMessage;
+mMessage = NULL;
+mMessage = mUiEngine.message(mailboxId, folderId, msgId);
+}
+}
+/*!
+This slot is called when 'open' is selected from attachment list context menu.
+*/
+void NmEditorView::openAttachmentTriggered()
+{
+mHeaderWidget->launchAttachment(mSelectedAttachment);
+}
+/*!
+Enables/disables toolbar extension for attach
+*/
+void NmEditorView::enableToolBarAttach(bool enable)
+{
+HbToolBar *tb = toolBar();
+if (tb) {
+QList<QAction *> toolbarList = tb->actions();
+int count = toolbarList.count();
+for (int i = 0; i < count; i++) {
+NmAction *action = static_cast<NmAction *>(toolbarList[i]);
+//object name set in NmBaseClientPlugin::createEditorViewCommands
+//temporary solution
+if (action->objectName() == "baseclientplugin_attachaction") {
+action->setEnabled(enable);
+}
+}
+}
+}
 // End of file.

changeset 20	ecc8def7944a
parent 18	578830873419
child 23	2dc6caa42ec3