MCL/sf/app/commonemail: comparison emailuis/emailui/src/FreestyleEmailUiHtmlViewerContainer.cpp

equal deleted inserted replaced

-:5253a20d2a1e
+:a4d6f1ea0416
 #include <AknsDrawUtils.h>
 #include <coemain.h>
 #include <commdbconnpref.h>
 #include <bautils.h>
 #include <biditext.h>
+#include <stringloader.h>
+#include <e32base.h>
+#include <badesca.h>
 //<cmail>
 #include "CFSMailMessage.h"
 //</cmail>
 #include <brctlinterface.h>
 #include <sysutil.h>
 #include <SchemeHandler.h>
+#include <FreestyleEmailUi.rsg>
 #include "FreestyleEmailUiAppui.h"
 #include "FreestyleEmailUiUtilities.h"
 #include "FreestyleEmailUiHtmlViewerContainer.h"
 #include "FreestyleEmailUiHtmlViewerView.h"
 #include "FreestyleEmailUiShortcutBinding.h"
 #include "FreestyleMessageHeaderHTML.h"
 #include "FreestyleMessageHeaderURLEventHandler.h"
+#include "FreestyleEmailUiAknStatusIndicator.h"
+#include "FreestyleEmailUiAttachmentsListModel.h"
 _LIT( KContentIdPrefix, "cid:" );
 _LIT( KCDrive, "c:" );
 _LIT( KHtmlPath, "HtmlFile\\" );
 _LIT( KTempHtmlPath, "temp\\" );
 _LIT8( KHtmlLessThan, "&lt;" );
 _LIT8( KHtmlGreaterThan, "&gt;" );
 _LIT8( KHtmlAmpersand, "&amp;" );
 _LIT8( KHtmlQuotation, "&quot;" );
 _LIT8( KHtmlLinkTag, "<a href=\"%S\">" );
+_LIT8( KHtmlLinkTagWWW, "<a href=\"%S%S\">" );
 _LIT8( KHtmlLinkEndTag, "</a>" );
 _LIT( KURLTypeBody, "body");
 const TText8 KGreaterThan = 0x3e;
 const TText8 KLessThan = 0x3c;
 const TText8 KHT = 0x09; // Horizontal Tab
 const TReal KOverlayButtonMarginX = 0.01; // 1%
 const TReal KOverlayButtonMarginY = 0.01; // 1%
 const TReal KOverlayButtonSizeP = 0.15; // 15%
 const TReal KOverlayButtonSizeLs = 0.20; // 25%
-const TReal KOverlayButtonPosP = 0.88;
-const TReal KOverlayButtonPosLs = 0.85;
+const TInt KStatusIndicatorHeight = 50;
+const TInt KStatusIndicatorXMargin = 50;
 // ---------------------------------------------------------------------------
 // Two-phased constructor.
 // ---------------------------------------------------------------------------
 //
 CleanupStack::PopAndDestroy( &htmlFile );
 CleanupStack::PopAndDestroy( htmlBodyPart );
 }
 else
 {
-CFSMailMessagePart* textBodyPart = iMessage->PlainTextBodyPartL();;
+CFSMailMessagePart* textBodyPart = iMessage->PlainTextBodyPartL();
 if ( textBodyPart )
 {
 CleanupStack::PushL( textBodyPart );
 //For now do not do any conversion just add start and end..Let browser display plain text as is
 {
 case 0:
 {
 return iBrCtlInterface;
 }
+case 1:
+if ( iAttachmentStatus )
+return iAttachmentStatus;
+else
+return NULL;
 default:
 {
 return NULL;
 }
 }
 // ---------------------------------------------------------------------------
 //
 TInt CFsEmailUiHtmlViewerContainer::CountComponentControls() const
 {
 FUNC_LOG;
-return 1;
+if ( iAttachmentStatus )
+{
+return 2;
+}
+else
+{
+return 1;
+}
 }
 // ---------------------------------------------------------------------------
 // From CCoeControl.
 // Draw this application's view to the screen
 emailHtmlFile.Append( KMessageHtmlFile );
 TRAP_IGNORE( LoadContentFromFileL( emailHtmlFile ) )
 }
 UpdateOverlayButtons( IsVisible() );
+if ( iAttachmentStatus )
+{
+TRect rect = CalcAttachmentStatusRect();
+iAttachmentStatus->SetRect( rect );
+}
 }
 // ---------------------------------------------------------------------------
 // From CCoeControl.
 // ---------------------------------------------------------------------------
 }
 if ( url.CompareC( KWww ) != KErrNone ) // if token=www., validate format
 {                                   // www.x
 RBuf8 urlBuf;
-urlBuf.CreateL( KHtmlLinkTag().Length() + url.Length() * 2
+TBool wwwLink( EFalse );
-+ KHtmlLinkEndTag().Length() + KHtmlLineBreak().Length() );
+if ( url.Left( KWww().Length() ).CompareF( KWww ) == 0 )
+{
+wwwLink = ETrue;
+//Hyperlinks beginning with www. needs http:// prefix
+urlBuf.CreateL( KHtmlLinkTagWWW().Length() + url.Length() * 2
++ KHtmlLinkEndTag().Length() + KHtmlLineBreak().Length() + KHttp().Length() );
+}
+else
+{
+urlBuf.CreateL( KHtmlLinkTag().Length() + url.Length() * 2
++ KHtmlLinkEndTag().Length() + KHtmlLineBreak().Length() );
+}
 urlBuf.CleanupClosePushL();
 // Format html link
-urlBuf.AppendFormat( KHtmlLinkTag, &url );
+if ( wwwLink )
+{
+urlBuf.AppendFormat( KHtmlLinkTagWWW, &KHttp, &url );
+}
+else
+{
+urlBuf.AppendFormat( KHtmlLinkTag, &url );
+}
 urlBuf.Append( url );
 urlBuf.Append( KHtmlLinkEndTag );
 if ( lineBreakPos != KErrNotFound )
 { // Add line break if removed earlier
 urlBuf.Append( KHtmlLineBreak );
 { // Token takes up the whole segment, or first pass( first segment
 // with last token where hyperlink does not end within segment's
 // boundaries, move to next segment
 nextPos += nextSegment.Length();
 nextSegment.Set( aSource.Ptr( nextPos ) );
+if( nextSegment.Length() == 0 )
+{
+break;
+}
 lexNextSegment.Assign( nextSegment );
 nextNextToken.Set( lexNextSegment.NextToken() );
 if ( firstPass )
 {
 firstPass =  EFalse;
 }
 if ( endOfUrlPos != KErrNotFound )
 { // Handle hyperlink that is within 2K limit
 RBuf8 urlBuf;
-urlBuf.CreateL( KHtmlLinkTag().Length() + url.Length() * 2
+TBool wwwLink( EFalse );
-+ KHtmlLinkEndTag().Length() + KHtmlLineBreak().Length() );
+if ( url.Left( KWww().Length() ).CompareF( KWww ) == 0 )
+{
+wwwLink = ETrue;
+urlBuf.CreateL( KHtmlLinkTagWWW().Length() + url.Length() * 2
++ KHtmlLinkEndTag().Length() + KHtmlLineBreak().Length() + KHttp().Length() );
+}
+else
+{
+urlBuf.CreateL( KHtmlLinkTag().Length() + url.Length() * 2
++ KHtmlLinkEndTag().Length() + KHtmlLineBreak().Length() );
+}
 urlBuf.CleanupClosePushL();
 // Format html link
-urlBuf.AppendFormat( KHtmlLinkTag, &url );
+if ( wwwLink )
+{
+urlBuf.AppendFormat( KHtmlLinkTagWWW, &KHttp, &url );
+}
+else
+{
+urlBuf.AppendFormat( KHtmlLinkTag, &url );
+}
 urlBuf.Append( url );
 urlBuf.Append( KHtmlLinkEndTag );
 urlBuf.Append( KHtmlLineBreak );
 TInt offset = lexSegment.Offset() - nextToken.Length();
 {
 emailHtmlFile.Append( KMessageHtmlRTLFile );
 }
 TRAP_IGNORE( LoadContentFromFileL( emailHtmlFile ) );
 SetRect( iAppUi.ClientRect() );
+}
+void CFsEmailUiHtmlViewerContainer::ShowAttacthmentDownloadStatusL(
+TFSProgress::TFSProgressStatus aProgressStatus,
+const TAttachmentData& aAttachmentData )
+{
+TBool freshDraw = EFalse;
+if ( !iAttachmentStatus )
+{
+TRect rect = CalcAttachmentStatusRect();
+iAttachmentStatus = CFreestyleEmailUiAknStatusIndicator::NewL( rect, this );
+freshDraw = ETrue;
+}
+if ( !iAttachmentStatus->IsVisible()
+|| ( aAttachmentData.downloadProgress == KNone )
+|| ( aProgressStatus == TFSProgress::EFSStatus_RequestCancelled ) )
+{
+freshDraw = ETrue;
+}
+TInt duration = KStatusIndicatorDefaultDuration;
+if ( ( aAttachmentData.downloadProgress == TFSProgress::EFSStatus_RequestComplete )
+|| ( aProgressStatus == TFSProgress::EFSStatus_RequestCancelled )
+|| ( aAttachmentData.downloadProgress == KComplete ) )
+{
+duration = KStatusIndicatorAutomaticHidingDuration;
+}
+HBufC* statusText = NULL;
+switch ( aProgressStatus )
+{
+case TFSProgress::EFSStatus_Status:
+case TFSProgress::EFSStatus_RequestComplete:
+{
+CDesCArray* descArray = new (ELeave) CDesCArrayFlat( 1 );
+CleanupStack::PushL( descArray );
+descArray->AppendL( aAttachmentData.fileName );
+CArrayFix<TInt>* intArray = new (ELeave) CArrayFixFlat<TInt>( 1 );
+CleanupStack::PushL( intArray );
+intArray->AppendL( aAttachmentData.downloadProgress );
+statusText = StringLoader::LoadL( R_FSE_VIEWER_ATTACHMENTS_LIST_DOWNLOAD,
+*descArray,
+*intArray );
+CleanupStack::PopAndDestroy( intArray );
+CleanupStack::PopAndDestroy( descArray );
+CleanupStack::PushL( statusText );
+}
+break;
+case TFSProgress::EFSStatus_RequestCancelled:
+{
+statusText = aAttachmentData.fileName.AllocLC();
+}
+break;
+default:
+statusText = KNullDesC().AllocLC();
+break;
+}
+if ( statusText->Length() > 0 )
+{
+if ( freshDraw )
+{
+CFbsBitmap* image = NULL;
+CFbsBitmap* imageMask = NULL;
+if ( aProgressStatus == TFSProgress::EFSStatus_RequestCancelled )
+{
+iAppUi.FsTextureManager()->ProvideBitmapL(EAttachmentsCancelDownload, image, imageMask );
+}
+else
+{
+iAppUi.FsTextureManager()->ProvideBitmapL(EAttachmentsDownload, image, imageMask );
+}
+iAttachmentStatus->ShowIndicatorL( image, imageMask, statusText, duration );
+}
+else
+{
+iAttachmentStatus->SetTextL( statusText );
+if ( duration > -1 )
+{
+iAttachmentStatus->HideIndicator( duration );
+}
+}
+}
+CleanupStack::Pop( statusText );
+}
+TBool CFsEmailUiHtmlViewerContainer::AttacthmentDownloadStatusVisible()
+{
+if ( iAttachmentStatus )
+{
+return iAttachmentStatus->IsVisible();
+}
+else
+{
+return EFalse;
+}
+}
+void CFsEmailUiHtmlViewerContainer::HideAttacthmentDownloadStatus()
+{
+if ( iAttachmentStatus )
+{
+iAttachmentStatus->MakeVisible( EFalse );
+}
+}
+TRect CFsEmailUiHtmlViewerContainer::CalcAttachmentStatusRect()
+{
+TRect rect = Rect();
+TPoint topLeft = rect.iTl;
+TPoint bottomRight = rect.iBr;
+TPoint statusTopLeft( topLeft.iX + KStatusIndicatorXMargin, bottomRight.iY - KStatusIndicatorHeight + 1 );
+TPoint statusBottomRight( bottomRight.iX - KStatusIndicatorXMargin, bottomRight.iY );
+return TRect( statusTopLeft, statusBottomRight );
 }
 /**
 * The body fetch link is cmail://body/fetch. Look for the URL separator
 * and the presence of cmail and body on the url.

changeset 3	a4d6f1ea0416
parent 2	5253a20d2a1e
child 4	e7aa27f58ae1