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

equal deleted inserted replaced

-:139d4b7b2938
+:99bcbff212ad
 mAttaIndexUnderFetch(NmNotFoundError),
 mAttaWidget(NULL),
 mViewReady(false),
 mWaitNoteCancelled(false)
 {
+NM_FUNCTION;
 // Create documentloader
 mDocumentLoader = new NmUiDocumentLoader(mMainWindow);
 // Get screensize
 mScreenSize = mApplication.screenSize();
 // Connect external delete handling to uiengine signal
 /*!
 Destructor
 */
 NmViewerView::~NmViewerView()
 {
+NM_FUNCTION;
 delete mWebView;
 mWebView = NULL;
 delete mMessage;
 mMessage = NULL;
 delete mDocumentLoader;
 /*!
 View is about to exit
 */
 void NmViewerView::aboutToExitView()
 {
+NM_FUNCTION;
 // View is about to exit, for safety, stop
 // loading of content before closing the view
 if (mWebView){
 mWebView->stop();
 if (mWebView->page()){
 /*!
 View layout loading from XML
 */
 void NmViewerView::loadViewLayout()
 {
+NM_FUNCTION;
 // Use document loader to load the view
 bool ok = false;
 setObjectName(QString(NMUI_MESSAGE_VIEWER_VIEW));
 QObjectList objectList;
 objectList.append(this);
 // Pass the view to documentloader. Document loader uses this view
 // when docml is parsed, instead of creating new view.
-if (mDocumentLoader) {
+// documentloader is created in constructor
 mDocumentLoader->setObjectTree(objectList);
 mWidgetList = mDocumentLoader->load(NMUI_MESSAGE_VIEWER_XML, &ok);
-}
 int widgetCount = mWidgetList.count();
 if (ok == true && widgetCount)
 {
 // Create content and content layout
 // qobject_cast not work in this case, using reinterpret_cast
 this, SLOT(handleMouseReleaseEvent(QGraphicsSceneMouseEvent*)));
 // Get scroll area contents and set layout margins
 mScrollAreaContents = qobject_cast<HbWidget *>(
 mDocumentLoader->findObject(NMUI_MESSAGE_VIEWER_SCROLL_AREA_CONTENTS));
-if (mScrollAreaContents->layout()){
+if (mScrollAreaContents) {
-mScrollAreaContents->layout()->setContentsMargins(0,0,0,0);
+QGraphicsLayout *layout = mScrollAreaContents->layout();
-}
+if (layout){
+layout->setContentsMargins(0,0,0,0);
-// Set white pixmap to backgrounditem
+}
-QPixmap whitePixmap(10,10);
+// Set white pixmap to backgrounditem
-whitePixmap.fill(Qt::white);
+QPixmap whitePixmap(10,10);
-QGraphicsPixmapItem *pixmapItem = new QGraphicsPixmapItem(whitePixmap);
+whitePixmap.fill(Qt::white);
-mScrollAreaContents->setBackgroundItem(pixmapItem);
+QGraphicsPixmapItem *pixmapItem = new QGraphicsPixmapItem(whitePixmap);
+mScrollAreaContents->setBackgroundItem(pixmapItem);
+}
 // Load headerwidget
 mHeaderWidget = qobject_cast<NmViewerHeader *>(
 mDocumentLoader->findObject(NMUI_MESSAGE_VIEWER_HEADER));
 if (mHeaderWidget) {
 mWebView = reinterpret_cast<NmMailViewerWK *>(
 mDocumentLoader->findObject(QString(NMUI_MESSAGE_VIEWER_SCROLL_WEB_VIEW)));
 if (mWebView) {
 mWebView->setParentView(this);
 // Set auto load images and private browsing(no history) attributes
-mWebView->settings()->setAttribute(QWebSettings::AutoLoadImages, true);
+QWebSettings *settings = mWebView->settings();
-mWebView->settings()->setAttribute(QWebSettings::PrivateBrowsingEnabled, true);
+if (settings) {
+settings->setAttribute(QWebSettings::AutoLoadImages, true);
+settings->setAttribute(QWebSettings::PrivateBrowsingEnabled, true);
+}
 HbEditorInterface editorInterface(mWebView);
 editorInterface.setInputConstraints(HbEditorConstraintIgnoreFocus);
 mWebView->setAcceptedMouseButtons(Qt::NoButton);
-if (mWebView->page()){
+QWebPage *page = mWebView->page();
-mWebView->page()->mainFrame()->setScrollBarPolicy(Qt::Vertical,
+if (page) {
-Qt::ScrollBarAlwaysOff);
+QWebFrame *frame = page->mainFrame();
-mWebView->page()->mainFrame()->setScrollBarPolicy(Qt::Horizontal,
+if (frame) {
-Qt::ScrollBarAlwaysOff);
+frame->setScrollBarPolicy(Qt::Vertical,Qt::ScrollBarAlwaysOff);
-connect(mWebView->page()->mainFrame(),
+frame->setScrollBarPolicy(Qt::Horizontal, Qt::ScrollBarAlwaysOff);
-SIGNAL(contentsSizeChanged(const QSize&)),
+connect(mWebView->page()->mainFrame(),
-this, SLOT(scaleWebViewWhenLoading(const QSize&)));
+SIGNAL(contentsSizeChanged(const QSize&)),
+this, SLOT(scaleWebViewWhenLoading(const QSize&)));
+}
 }
 }
 }
 }
 }
 /*!
 Lazy loading when view layout has been loaded
 */
 void NmViewerView::viewReady()
 {
+NM_FUNCTION;
 if (!mViewReady){
 // Set mailbox name to title
 setMailboxName();
 // Create toolbar if needed
 if (mToolbarEnabled) {
 createToolBar();
-}
+} else {
-else {
 // Connect options menu about to show to create options menu function
 QObject::connect(menu(), SIGNAL(aboutToShow()),
 this, SLOT(createOptionsMenu()));
 // Menu needs one dummy item so that aboutToShow signal is emitted.
 NmAction *dummy = new NmAction(0);
 menu()->addAction(dummy);
 }
+if (mHeaderWidget) {
-if (mHeaderWidget){
 QPointF contentWidgetPos = mScrollArea->pos();
 qreal headerHeight = mHeaderWidget->geometry().height();
-if(mMainWindow->orientation()==Qt::Horizontal) {
+if (mMainWindow->orientation() == Qt::Horizontal) {
 const QPointF pointToWebView(contentWidgetPos.x(), headerHeight+NmHeaderMargin);
 mScrollArea->scrollContentsTo(pointToWebView,0);
 }
 }
 // Run fetchmessage in queue
 QMetaObject::invokeMethod(this, "fetchMessage", Qt::QueuedConnection);
 // Set view ready
-mViewReady=true;
+mViewReady = true;
 }
 }
 /*!
 Function fecthes message data based on parameters
 */
 void NmViewerView::loadMessage()
 {
+NM_FUNCTION;
 if (mMessage) {
 delete mMessage;
 mMessage = NULL;
 }
-NmId mailboxId;
-NmId folderId;
-NmId msgId;
 // Read start params and message object
 if (mStartParam){
-mailboxId = mStartParam->mailboxId();
+NmId mailboxId = mStartParam->mailboxId();
-folderId = mStartParam->folderId();
+NmId folderId = mStartParam->folderId();
-msgId = mStartParam->messageId();
+NmId msgId = mStartParam->messageId();
 mMessage = mUiEngine.message(mailboxId, folderId, msgId);
 }
 }
 /*!
 Function fecthes message data based on parameters. Returns false if message is available,
 true if message have to be fetched
 */
 void NmViewerView::fetchMessage()
 {
-#ifdef Q_OS_SYMBIAN
+NM_FUNCTION;
 if (mMessage) {
 NmId mailboxId = mStartParam->mailboxId();
 NmId folderId = mStartParam->folderId();
 NmId msgId = mStartParam->messageId();
 const NmMessagePart *body = mMessage->htmlBodyPart();
 if (mMessageFetchingOperation) {
 connect(mMessageFetchingOperation,
 SIGNAL(operationCompleted(int)),
 this,
 SLOT(messageFetched(int)));
+createAndShowWaitDialog();
-delete mWaitDialog;
+}
-mWaitDialog = NULL;
+} else {
-// Create new wait dialog and set it to me modal with dimmed background
-mWaitDialog = new HbProgressDialog(HbProgressDialog::WaitDialog);
-mWaitDialog->setModal(true);
-mWaitDialog->setBackgroundFaded(true);
-connect(mWaitDialog, SIGNAL(cancelled()), this, SLOT(waitNoteCancelled()));
-mWaitDialog->setText(hbTrId("txt_mail_dialog_loading_mail_content"));
-// Display wait dialog
-mWaitDialog->show();
-}
-}
-else {
 // message is fetched
 setMessageData();
 }
+}
-}
-#else
-setMessageData();
-#endif
 }
 /*!
 This is signalled by mMessageFetchingOperation when the original message is fetched.
 */
 void NmViewerView::messageFetched(int result)
 {
+NM_FUNCTION;
 mWaitDialog->close();
 if (result == NmNoError && mMessageFetchingOperation) {
 if (mMessage) {
 delete mMessage;
 mMessage = NULL;
 }
-NmId mailboxId;
-NmId folderId;
-NmId msgId;
 // Read start params and message object
 if (mStartParam) {
-mailboxId = mStartParam->mailboxId();
+NmId mailboxId = mStartParam->mailboxId();
-folderId = mStartParam->folderId();
+NmId folderId = mStartParam->folderId();
-msgId = mStartParam->messageId();
+NmId msgId = mStartParam->messageId();
 mMessage = mUiEngine.message(mailboxId, folderId, msgId);
 }
 setMessageData();
 // Update header message data
 		if (mHeaderWidget){
 /*!
 This is signalled by mWaitDialog when the note is cancelled
 */
 void NmViewerView::waitNoteCancelled()
 {
+NM_FUNCTION;
 if (!mWaitNoteCancelled) {
 if (mMessageFetchingOperation && mMessageFetchingOperation->isRunning()) {
 	        mMessageFetchingOperation->cancelOperation();
 }
 mWaitNoteCancelled = true;
 /*!
 Function sets message data to web view and header
 */
 void NmViewerView::setMessageData()
 {
+NM_FUNCTION;
 // Connect to observe orientation change events
 connect(mApplication.mainWindow(), SIGNAL(orientationChanged(Qt::Orientation)),
 this, SLOT(orientationChanged(Qt::Orientation)));
 // Set page parameters
 /*!
 */
 void NmViewerView::setAttachmentList()
 {
+NM_FUNCTION;
 // Load headerwidget
 mAttaWidget = qobject_cast<NmAttachmentListWidget *>(
 mDocumentLoader->findObject(NMUI_MESSAGE_VIEWER_ATTALIST));
 if (mMessage && mAttaWidget) {
 // connect atta widget to listen progress value events
 /*!
 */
 void NmViewerView::openAttachment(int index)
 {
+NM_FUNCTION;
 NmId attaId = mAttaIdList.at(index);
 // reload message to get updates part sizes
 loadMessage();
 QList<NmMessagePart*> messageParts;
 mMessage->attachmentList(messageParts);
+NmId mailboxId = mMessage->envelope().mailboxId();
+NmId folderId = mMessage->envelope().folderId();
+NmId messageId = mMessage->envelope().messageId();
 for (int i = 0; i < messageParts.count(); i++) {
 // message part found have to found
 // and its fetched size is smaller than size, then start part fetch
 if (messageParts[i]->partId() == attaId &&
 messageParts[i]->size() > messageParts[i]->fetchedSize()) {
 // do not start if there's already ongoing fetch
 if (mAttaIndexUnderFetch == NmNotFoundError) {
 mAttaIndexUnderFetch = index;
-mAttaManager.fetchAttachment(
+mAttaManager.fetchAttachment(mailboxId, folderId,
-mMessage->envelope().mailboxId(),
+messageId, attaId);
-mMessage->envelope().folderId(),
-mMessage->envelope().messageId(),
-attaId);
 }
 }
 // attachment is fetched, open file
 else if (messageParts[i]->partId() == attaId) {
-XQSharableFile file = mUiEngine.messagePartFile(
+XQSharableFile file = mUiEngine.messagePartFile(mailboxId, folderId,
-mMessage->envelope().mailboxId(),
+messageId, attaId);
-mMessage->envelope().folderId(),
-mMessage->envelope().messageId(),
-attaId);
 NmUtilities::openFile(file);
 file.close();
 }
 }
 }
 /*!
 Function formats message based on actual data
 */
 QString NmViewerView::formatMessage()
 {
+NM_FUNCTION;
 QString msg = "";
 // null pointer check for mMessage is done before calling this function
+NmId mailboxId = mMessage->envelope().mailboxId();
+NmId folderId = mMessage->envelope().folderId();
+NmId messageId = mMessage->envelope().messageId();
 NmMessagePart *html = mMessage->htmlBodyPart();
 if (html) {
 QList<NmMessagePart*> parts;
 mMessage->attachmentList(parts);
 for (int i=0; i < parts.count(); i++) {
 NmMessagePart *child = parts[i];
 // Browse through embedded image parts and add those
 // the web view.
-quint32 fetchedSize = child->fetchedSize();
+bool isFetched = child->fetchedSize() >= child->size();
-quint32 size = child->size();
+if (child->contentType().startsWith("image", Qt::CaseInsensitive)) {
-if (fetchedSize >= size &&
-child->contentType().startsWith("image", Qt::CaseInsensitive)) {
 QString contentId = child->contentId();
-int ret = mUiEngine.contentToMessagePart(
+if (isFetched) {
-mMessage->envelope().mailboxId(),
+int ret = mUiEngine.contentToMessagePart(
-mMessage->envelope().folderId(),
+mailboxId, folderId, messageId, *child);
-mMessage->envelope().messageId(),
+if (ret == NmNoError) {
-*child);
+mWebView->addContent(contentId, QVariant::fromValue(child->binaryContent()),
-if (ret == NmNoError) {
+child->partId(), isFetched);
-mWebView->addContent(contentId, QVariant::fromValue(child->binaryContent()));
+}
 }
-}
+else {
-}
+mWebView->addContent(contentId, QVariant::fromValue(QByteArray()),
-int ret = mUiEngine.contentToMessagePart(
+child->partId(), isFetched);
-mMessage->envelope().mailboxId(),
+}
-mMessage->envelope().folderId(),
+}
-mMessage->envelope().messageId(),
+}
-*html);
+int ret = mUiEngine.contentToMessagePart(mailboxId, folderId, messageId, *html);
 if (ret == NmNoError) {
 msg = html->textContent();
 }
 }
 else {
 NmMessagePart *plain = mMessage->plainTextBodyPart();
 if (plain) {
-int ret = mUiEngine.contentToMessagePart(
+int ret = mUiEngine.contentToMessagePart(mailboxId, folderId,
-mMessage->envelope().mailboxId(),
+messageId, *plain);
-mMessage->envelope().folderId(),
-mMessage->envelope().messageId(),
-*plain);
 if (ret == NmNoError) {
-QTextDocument doku;
+QTextDocument document;
 // set font
-QFont currentFont = doku.defaultFont();
+QFont currentFont = document.defaultFont();
 currentFont.setWeight(QFont::Normal);
 qreal secondarySize;
 HbStyle myStyle;
 bool found = myStyle.parameter(NmParamTextHeightSecondary, secondarySize);
 if (found) {
 HbFontSpec fontSpec(HbFontSpec::Secondary);
 fontSpec.setTextHeight(secondarySize);
 currentFont.setPixelSize(fontSpec.font().pixelSize());
 }
-doku.setDefaultFont(currentFont);
+document.setDefaultFont(currentFont);
 // convert to html
-doku.setPlainText(plain->textContent());
+document.setPlainText(plain->textContent());
-msg = doku.toHtml();
+msg = document.toHtml();
 if (qApp->layoutDirection()==Qt::RightToLeft){
 // add right alignment to document css section
 QRegExp rx("(<style type=\"text/css\">)(.+)(</style>)", Qt::CaseInsensitive);
 rx.setMinimal(true);
 Typically when view is already open and external view activation occurs
 for this same view
 */
 void NmViewerView::reloadViewContents(NmUiStartParam* startParam)
 {
+NM_FUNCTION;
 // Check start parameter validity, message view cannot
 // be updated if given parameter is zero.
 if (startParam && startParam->viewId() == NmUiViewMessageViewer &&
 startParam->messageId()!= 0) {
 // Delete existing start parameter data
 /*!
 nmailViewId
 */
 NmUiViewId NmViewerView::nmailViewId() const
 {
+NM_FUNCTION;
 return NmUiViewMessageViewer;
 }
 /*!
 Scale web view width
 */
 void NmViewerView::webFrameLoaded(bool loaded)
 {
+NM_FUNCTION;
 if (loaded){
 webFrameloadingCompleted = true;
 // Scale web view after loading the
 // complete contents, including images
 QMetaObject::invokeMethod(this, "scaleWebViewWhenLoaded", Qt::QueuedConnection);
 /*!
 Scale web view width when loading is ongoing
 */
 void NmViewerView::scaleWebViewWhenLoading(const QSize &size)
 {
+NM_FUNCTION;
 // Try to scale web view while mainframe is being loaded.
 // So that screen is scrollable even before images are fully loaded
 // First check that new size is different than previous, no need to react if
 // same size value is received more than once.
-if (size!=mLatestLoadingSize){
+if (size != mLatestLoadingSize) {
-if (!webFrameloadingCompleted&&mWebView&&mWebView->page()&&
+if (!webFrameloadingCompleted && mWebView && mWebView->page() &&
-(size.width()>mScreenSize.width()||size.height()>mScreenSize.height())) {
+(size.width() > mScreenSize.width() || size.height() > mScreenSize.height())) {
 int width = (int)size.width();
 int height = (int)size.height();
 // Set content (webview) width
 if (mDisplayingPlainText){
-mWebView->setMaximumWidth(mScreenSize.width());
+setWebViewWidth(mScreenSize.width());
-mWebView->setMinimumWidth(mScreenSize.width());
-mWebView->setPreferredWidth(mScreenSize.width());
 }
 else {
-mWebView->setMaximumWidth(width);
+setWebViewWidth(width);
-mWebView->setMinimumWidth(width);
-mWebView->setPreferredWidth(width);
 }
 mWebView->setMinimumHeight(height);
 mWebView->setPreferredHeight(height);
 }
 }
-mLatestLoadingSize=size;
+mLatestLoadingSize = size;
 }
 /*!
 Scale web view width when loading is completed
 */
 void NmViewerView::scaleWebViewWhenLoaded()
 {
+NM_FUNCTION;
 if (mWebView&&mWebView->page()) {
 QSizeF contentSize = mWebView->page()->mainFrame()->contentsSize();
 int width = (int)contentSize.width();
 int height = (int)contentSize.height();
 // Set content (webview) width
-if (mDisplayingPlainText){
+if (mDisplayingPlainText) {
 mWebView->page()->setPreferredContentsSize(mScreenSize);
-mWebView->setMinimumWidth(mScreenSize.width());
+setWebViewWidth(mScreenSize.width());
-mWebView->setMaximumWidth(mScreenSize.width());
+} else {
-mWebView->setPreferredWidth(mScreenSize.width());
+setWebViewWidth(width);
-}
-else {
-mWebView->setMinimumWidth(width);
-mWebView->setMaximumWidth(width);
-mWebView->setPreferredWidth(width);
 }
 // Set content (webview) height
 if (mScrollAreaContents){
 QRectF contentRect = mScrollAreaContents->geometry();
 if (contentRect.height()<geometry().height()){
 contentRect.setHeight(geometry().height());
 mViewerContent->setPreferredHeight(contentRect.height());
 qreal webViewHeight = geometry().height()-mHeaderWidget->geometry().height();
-mWebView->setMinimumHeight(webViewHeight);
+setWebViewHeighth(webViewHeight);
-mWebView->setMaximumHeight(webViewHeight);
+} else {
-mWebView->setPreferredHeight(webViewHeight);
+setWebViewHeighth(height);
-}
-else{
-mWebView->setMinimumHeight(height);
-mWebView->setMaximumHeight(height);
-mWebView->setPreferredHeight(height);
 }
 }
 }
 }
 /*!
 Set new dimensions after orientation change.
 */
 void NmViewerView::adjustViewDimensions()
 {
+NM_FUNCTION;
 // Update current screensize
 mScreenSize = mApplication.screenSize();
 // Scale header to screen width
 if (mHeaderWidget){
 mHeaderWidget->rescaleHeader(mScreenSize);
 landscape <-> portrait switch occurs because text needs to
 be wrapped again.
 */
 void NmViewerView::orientationChanged(Qt::Orientation orientation)
 {
+NM_FUNCTION;
 Q_UNUSED(orientation);
 QTimer::singleShot(NmOrientationTimer, this, SLOT(adjustViewDimensions()));
 }
 /*!
 Link clicked callback
 */
 void NmViewerView::linkClicked(const QUrl& link)
 {
-NMLOG("link clicked");
+NM_FUNCTION;
 if (link.scheme() == "http" ||
 link.scheme() == "https" ) {
 QDesktopServices::openUrl(link);
 }
 else if (link.scheme() == "mailto"){
 /*!
 Send mouse release event to web view
 */
 void NmViewerView::handleMouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 {
-NmMailViewerWK* view = webView();
+NM_FUNCTION;
-if (event&& view && mHeaderWidget && mScrollAreaContents) {
+handleMouseEvent(event, false);
-QPointF lastReleasePoint = event->pos();
-QPointF contentWidgetPos = mScrollAreaContents->pos();
-qreal headerHeight = mHeaderWidget->geometry().height();
-qreal y = lastReleasePoint.y()-headerHeight;
-y -= contentWidgetPos.y();
-qreal x = lastReleasePoint.x()-contentWidgetPos.x();
-const QPointF pointToWebView(x, y);
-event->setPos(pointToWebView);
-event->setAccepted(true);
-view->sendMouseReleaseEvent(event);
-}
 }
 /*!
 Send mouse press event
 */
 void NmViewerView::handleMousePressEvent(QGraphicsSceneMouseEvent *event)
 {
-NmMailViewerWK* view = webView();
+NM_FUNCTION;
-if (event&& view && mHeaderWidget && mScrollAreaContents) {
+handleMouseEvent(event, true);
-QPointF lastPressPoint = event->pos();
-QPointF contentWidgetPos = mScrollAreaContents->pos();
-qreal headerHeight = mHeaderWidget->geometry().height();
-qreal y = lastPressPoint.y()-headerHeight;
-y -= contentWidgetPos.y();
-qreal x = lastPressPoint.x()-contentWidgetPos.x();
-const QPointF pointToWebView(x, y);
-event->setPos(pointToWebView);
-event->setAccepted(true);
-view->sendMousePressEvent(event);
-}
 }
 /*!
 Function can be used to check whether mouse event has
 occured on top of header area.
 */
 bool NmViewerView::eventOnTopOfHeaderArea(QGraphicsSceneMouseEvent *event)
 {
+NM_FUNCTION;
 bool ret(false);
-if (event && mHeaderWidget){
+if (event && mHeaderWidget) {
 QPointF lastReleasePoint = event->lastPos();
 QPointF contentWidgetPos = mScrollAreaContents->pos();
 int headerHeight = (int)mHeaderWidget->geometry().height();
-if (lastReleasePoint.y()<headerHeight+contentWidgetPos.y()){
+if (lastReleasePoint.y()<headerHeight+contentWidgetPos.y()) {
 ret=true;
 }
 }
 return ret;
 }
 /*!
 get function for content widget web view.
 */
 NmMailViewerWK* NmViewerView::webView()
 {
+NM_FUNCTION;
 return mWebView;
 }
 /*!
+*/
+NmMessage* NmViewerView::message()
+{
+return mMessage;
+}
+/*!
 Function to set message read status
 */
 void NmViewerView::changeMessageReadStatus(bool read)
 {
+NM_FUNCTION;
 QList<const NmMessageEnvelope*> envelopeList;
 NmMessageEnvelope *envelope = &mMessage->envelope();
 QPointer<NmStoreEnvelopesOperation> op(NULL);
-if (envelope){
+if (envelope) {
 if ( read != envelope->isRead() ){
 if (read){
 envelope->setRead(true);
 envelopeList.append(envelope);
 op = mUiEngine.setEnvelopes(
 /*!
 Set mailbox name to title
 */
 void NmViewerView::setMailboxName()
 {
+NM_FUNCTION;
 if (mStartParam){
 NmMailboxMetaData *meta = mUiEngine.mailboxById(mStartParam->mailboxId());
-if (meta){
+if (meta) {
 setTitle(meta->name());
 }
 }
 }
 Function reacts to scroll position change events and sets
 header to correct position
 */
 void NmViewerView::contentScrollPositionChanged(const QPointF &newPosition)
 {
+NM_FUNCTION;
 if (mWebView&&mHeaderWidget){
 QRectF webViewRect = mWebView->geometry();
 QTransform tr;
 qreal leftMovementThreshold(webViewRect.width()-mHeaderWidget->geometry().width());
-if (newPosition.x()<0){
+if (newPosition.x()<0) {
 tr.translate(webViewRect.topLeft().x() ,0);
 }
-else if (newPosition.x()>=0 && newPosition.x()<leftMovementThreshold){
+else if (newPosition.x()>=0 && newPosition.x()<leftMovementThreshold) {
 tr.translate(mHeaderStartScenePos.x()+newPosition.x() ,0);
 }
 else {
 tr.translate(webViewRect.topLeft().x()+leftMovementThreshold ,0);
 }
 mHeaderWidget->setTransform(tr);
-if (mAttaWidget){
+if (mAttaWidget) {
 mAttaWidget->setTransform(tr);
 }
 }
 mLatestScrollPos = newPosition;
 }
 createToolBar. Function asks menu commands from extension
 to be added to toolbar owned by the HbView.
 */
 void NmViewerView::createToolBar()
 {
+NM_FUNCTION;
 HbToolBar *tb = toolBar();
 NmUiExtensionManager &extMngr = mApplication.extManager();
 if (tb && &extMngr && mStartParam) {
 tb->clearActions();
 NmActionRequest request(this, NmActionToolbar, NmActionContextViewViewer,
 createOptionsMenu. Functions asks menu commands from extension
 to be added to options menu.
 */
 void NmViewerView::createOptionsMenu()
 {
+NM_FUNCTION;
 	HbMenu *optionsMenu = menu();
 	NmUiExtensionManager &extMngr = mApplication.extManager();
 	if (optionsMenu && &extMngr && mStartParam) {
 		optionsMenu->clearActions();
 		NmActionRequest request(this, NmActionOptionsMenu, NmActionContextViewViewer,
 handleActionCommand. From NmActionObserver, extension manager calls this
 call to handle menu command in the UI.
 */
 void NmViewerView::handleActionCommand(NmActionResponse &actionResponse)
 {
+NM_FUNCTION;
 bool showSendInProgressNote = false;
 // Handle options menu or toolbar
 if (actionResponse.menuType() == NmActionOptionsMenu ||
 	actionResponse.menuType() == NmActionToolbar) {
 mStartParam->messageId(), NmUiEditorForward);
 mApplication.enterNmUiView(startParam);
 }
 break;
 case NmActionResponseCommandDeleteMail: {
-HbMessageBox *messageBox = new HbMessageBox(HbMessageBox::MessageTypeQuestion);
+deleteMessage();
-messageBox->setText(hbTrId("txt_mail_dialog_delete_mail"));
-messageBox->setAttribute(Qt::WA_DeleteOnClose);
-messageBox->open(this, SLOT(deleteButton(HbAction*)));
 }
 break;
 default:
 break;
 }
 HbMessageBox::warning(noteText);
 }
 }
 /*!
-Slot. Signaled when delete button is pressed
+Deletes the currently open message
 */
-void NmViewerView::deleteButton(HbAction* result)
+void NmViewerView::deleteMessage()
 {
-HbMessageBox *dlg = static_cast<HbMessageBox*>(sender());
+NM_FUNCTION;
-if(result == dlg->actions().at(0))
-{
+QList<NmId> messageList;
-QList<NmId> messageList;
+messageList.append(mStartParam->messageId());
-messageList.append(mStartParam->messageId());
+int err = mUiEngine.deleteMessages(mStartParam->mailboxId(),
-int err = mUiEngine.deleteMessages(mStartParam->mailboxId(),
+mStartParam->folderId(),
-mStartParam->folderId(),
+messageList);
-messageList);
+messageList.clear();
-messageList.clear();
+if (NmNoError != err) {
-if (NmNoError != err) {
+// Failed to delete the messages!
-// Failed to delete the messages!
+NMLOG(QString("NmViewerView::handleActionCommand(): failed err=%1").arg(err));
-NMLOG(QString("NmViewerView::handleActionCommand(): failed err=%1").arg(err));
-}
 }
 }
 /*!
 This is called when attachment fetch progress changes
 */
 void NmViewerView::progressChanged(int value)
 {
+NM_FUNCTION;
 if (mAttaIndexUnderFetch != NmNotFoundError) {
 // emit signal
 if (mAttaWidget && mAttaWidget->progressValue(mAttaIndexUnderFetch) < value) {
 progressValueChanged(mAttaIndexUnderFetch, value);
 }
 /*!
 This is called when attachment fetch is completed
 */
 void NmViewerView::fetchCompleted(int result)
 {
+NM_FUNCTION;
 if (mAttaWidget && mAttaIndexUnderFetch != NmNotFoundError) {
 if (result == NmNoError) {
 progressValueChanged(mAttaIndexUnderFetch, 100);
 openAttachment(mAttaIndexUnderFetch);
-}
+} else {
-else {
 mAttaWidget->hideProgressBar(mAttaIndexUnderFetch);
 }
 }
 mAttaIndexUnderFetch = NmNotFoundError;
 }
 /*!
 externalDelete. From NmMessageListModel, handles viewer shutdown when current message is deleted.
 */
 void NmViewerView::messageDeleted(const NmId &mailboxId, const NmId &folderId, const NmId &messageId)
 {
-NMLOG("NmViewerView::messageDeleted");
+NM_FUNCTION;
 if ((mStartParam->viewId() == NmUiViewMessageViewer)
 && (mStartParam->mailboxId()== mailboxId)
 && (mStartParam->folderId()== folderId)
-&& (mStartParam->messageId()== messageId)){
+&& (mStartParam->messageId()== messageId)) {
 mApplication.prepareForPopView();
 }
 }
+/*!
+Helper function for wait dialog creation.
+*/
+void NmViewerView::createAndShowWaitDialog()
+{
+NM_FUNCTION;
+delete mWaitDialog;
+mWaitDialog = NULL;
+// Create new wait dialog and set it to me modal with dimmed background
+mWaitDialog = new HbProgressDialog(HbProgressDialog::WaitDialog);
+mWaitDialog->setModal(true);
+mWaitDialog->setBackgroundFaded(true);
+connect(mWaitDialog, SIGNAL(cancelled()), this, SLOT(waitNoteCancelled()));
+mWaitDialog->setText(hbTrId("txt_mail_dialog_loading_mail_content"));
+// Display wait dialog
+mWaitDialog->show();
+}
+/*!
+Helper function for width.
+*/
+void NmViewerView::setWebViewWidth(int width)
+{
+NM_FUNCTION;
+// null pointer check for mWebView in calling function
+mWebView->setMinimumWidth(width);
+mWebView->setMaximumWidth(width);
+mWebView->setPreferredWidth(width);
+}
+/*!
+Helper function for heigth.
+*/
+void NmViewerView::setWebViewHeighth(int height)
+{
+NM_FUNCTION;
+// null pointer check for mWebView in calling function
+mWebView->setMinimumHeight(height);
+mWebView->setMaximumHeight(height);
+mWebView->setPreferredHeight(height);
+}
+/*!
+Helper function for mouse events.
+*/
+void NmViewerView::handleMouseEvent(QGraphicsSceneMouseEvent *event, bool pressed)
+{
+NM_FUNCTION;
+NmMailViewerWK* view = webView();
+if (event && view && mHeaderWidget && mScrollAreaContents) {
+QPointF lastReleasePoint = event->pos();
+QPointF contentWidgetPos = mScrollAreaContents->pos();
+qreal headerHeight = mHeaderWidget->geometry().height();
+qreal y = lastReleasePoint.y()-headerHeight;
+y -= contentWidgetPos.y();
+qreal x = lastReleasePoint.x()-contentWidgetPos.x();
+const QPointF pointToWebView(x, y);
+event->setPos(pointToWebView);
+event->setAccepted(true);
+if (pressed) {
+view->sendMousePressEvent(event);
+} else {
+view->sendMouseReleaseEvent(event);
+}
+}
+}

changeset 43	99bcbff212ad
parent 40	2c62ef3caffd
child 44	c2d07d913565