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

equal deleted inserted replaced

-:4e54af54a4a1
+:6c59112cfd31
 mLatestLoadingSize(QSize(0,0)),
 mAttaIndexUnderFetch(NmNotFoundError),
 mAttaWidget(NULL),
 mViewReady(false),
 mWaitNoteCancelled(false),
-mErrorNote(NULL)
+mErrorNote(NULL),
+mAttachmentOpen(false)
 {
 // Create documentloader
 mDocumentLoader = new NmUiDocumentLoader(mMainWindow);
 // Get screensize
 mScreenSize = mApplication.screenSize();
 /*!
 Destructor
 */
 NmViewerView::~NmViewerView()
 {
+// Delete opened temporary files.
+NmUtilities::deleteTempFiles(mTempFiles);
 delete mErrorNote;
 mErrorNote=NULL;
 delete mWebView;
 mWebView = NULL;
 delete mMessage;
 */
 void NmViewerView::openAttachment(int index)
 {
 NM_FUNCTION;
-if (index >= 0) {
+if (index >= 0 && !mAttachmentOpen) {
 NmId attaId = mAttaIdList.at(index);
 // reload message to get updates part sizes
 loadMessage();
 QList<NmMessagePart*> messageParts;
 if (mMessage) {
 }
 }
 // attachment is fetched, open file
 else if (messageParts[i]->partId() == attaId) {
 mAttaManager.cancelFetch();
-XQSharableFile file = mUiEngine.messagePartFile(mailboxId, folderId,
+mAttachmentOpen = true;
-messageId, attaId);
+QObject::disconnect(mAttaWidget, SIGNAL(itemActivated(int)),
-int error = NmUtilities::openFile(file);
+this, SLOT(openAttachment(int)));
-file.close();
+					 // We need to fill the part before opening the attachment.
-if (error==NmNotFoundError){
+					 mUiEngine.contentToMessagePart(mailboxId, folderId, messageId, *(messageParts[i]));
+					 int error = NmUtilities::openAttachment(messageParts[i],mTempFiles,this);
+if (error==NmGeneralError){
+mAttachmentOpen = false;
+QObject::connect(mAttaWidget, SIGNAL(itemActivated(int)),
+this, SLOT(openAttachment(int)));
 delete mErrorNote;
 mErrorNote=NULL;
 mErrorNote = NmUtilities::displayWarningNote(
 hbTrId("txt_mail_dialog_unable_to_open_attachment_file_ty"));
 }
 QString msg = "";
 if (mMessage) {
 NmMessagePart *html = mMessage->htmlBodyPart();
 if (html) {
 msg += formatHtmlMessage(html);
+// Remove DOCTYPE definition as it will break viewer layout
+if (msg.startsWith("<!DOCTYPE", Qt::CaseInsensitive)) {
+int doctypeTagEnd = msg.indexOf(">",0,Qt::CaseInsensitive);
+msg.remove(0,doctypeTagEnd+1);
+}
 }
 else {
 NmMessagePart *plain = mMessage->plainTextBodyPart();
 if (plain) {
 msg += formatPlainTextMessage(plain);
 HbFontSpec fontSpec(HbFontSpec::Secondary);
 fontSpec.setTextHeight(secondarySize);
 currentFont.setPixelSize(fontSpec.font().pixelSize());
 }
 document.setDefaultFont(currentFont);
-// convert to html
+// convert to html with html and body tags
+// for background and text color
 document.setPlainText(plain->textContent());
-msg = document.toHtml();
+msg += "<html><body bgcolor=white text=black>";
+msg += document.toHtml();
+msg += "</body></html>";
 if (qApp->layoutDirection()==Qt::RightToLeft){
 // add right alignment to document css section
 QRegExp rx("(<style type=\"text/css\">)(.+)(</style>)", Qt::CaseInsensitive);
 rx.setMinimal(true);
 int pos = rx.indexIn(msg);
 link.scheme() == NmHttpsLinkScheme) {
 mAttaManager.cancelFetch();
 QDesktopServices::openUrl(link);
 } else if (link.scheme() == NmMailtoLinkScheme){
 mAttaManager.cancelFetch();
-QList<NmAddress*> *addrList = new QList<NmAddress*>();
-NmAddress *mailtoAddr = new NmAddress();
+NmUriParser uriParser;
-QString address = link.toString(QUrl::RemoveScheme);
+if (uriParser.extractData(link.toString())) {
-mailtoAddr->setAddress(address);
+// Create start parameters. Address list ownership
-mailtoAddr->setDisplayName(address);
+// is transferred to startparam object
-addrList->append(mailtoAddr);
+// The ownership of these is passed to NmApplication in launchEditorView()
-// Create start parameters. Address list ownership
+QList<NmAddress*> *toAddresses = NmUtilities::qstringListToNmAddressList(uriParser.toAddresses());
-// is transferred to startparam object
+QList<NmAddress*> *ccAddresses = NmUtilities::qstringListToNmAddressList(uriParser.ccAddresses());
-NmUiStartParam* param = new NmUiStartParam(NmUiViewMessageEditor,
+QList<NmAddress*> *bccAddresses = NmUtilities::qstringListToNmAddressList(uriParser.bccAddresses());
-mStartParam->mailboxId(),
-mStartParam->folderId(),
+QString* subject = new QString(uriParser.subject());
-0,
+QString* bodyText = new QString(uriParser.bodyText());
-NmUiEditorMailto,
-addrList);
+NmUiStartParam* param = new NmUiStartParam(NmUiViewMessageEditor,
-mApplication.enterNmUiView(param);
+mStartParam->mailboxId(),
+mStartParam->folderId(),
+0, // message id
+NmUiEditorMailto, // editor start mode
+toAddresses,
+NULL, // attachment list
+false, // start as service
+subject, // message subject
+ccAddresses, // cc recipients
+bccAddresses, //bcc recipients
+bodyText // body text
+);
+mApplication.enterNmUiView(param);
+}
 }
 }
 /*!
 Function can be used to check whether mouse event has
 progressValueChanged(mAttaIndexUnderFetch, value);
 }
 }
 }
-/*!
-This is called when attachment fetch is completed
+/*!
+This method is called when fetching an attachment is either completed or
+cancelled.
+\param result The result code (NmNoError if success).
 */
 void NmViewerView::fetchCompleted(int result)
 {
 if (mAttaWidget && mAttaIndexUnderFetch != NmNotFoundError) {
 if (result == NmNoError) {
 progressValueChanged(mAttaIndexUnderFetch, NmProgressValueComplete);
 openAttachment(mAttaIndexUnderFetch);
 } else {
 mAttaWidget->hideProgressBar(mAttaIndexUnderFetch);
-}
-}
+if (result == NmDiskFullError) {
+// Display an error message.
+delete mErrorNote;
+mErrorNote = NmUtilities::displayWarningNote(
+hbTrId("txt_mail_dialog_downloading_canceled"));
+}
+}
+}
 mAttaIndexUnderFetch = NmNotFoundError;
 }
 /*!
 externalDelete. From NmUiEngine, handles viewer shutdown when current message is deleted.
 */
 void NmViewerView::messageDeleted(const NmId &mailboxId, const NmId &folderId, const NmId &messageId)
 }
 }
 return ret;
 }
+void NmViewerView::fileOpenCompleted(const QVariant&)
+{
+mAttachmentOpen = false;
+QObject::connect(mAttaWidget, SIGNAL(itemActivated(int)),
+this, SLOT(openAttachment(int)));
+}
+void NmViewerView::fileOpenError(int, const QString&)
+{
+mAttachmentOpen = false;
+QObject::connect(mAttaWidget, SIGNAL(itemActivated(int)),
+this, SLOT(openAttachment(int)));
+}

changeset 74	6c59112cfd31
parent 68	83cc6bae1de8