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

equal deleted inserted replaced

-:b13141f05c3d
+:b5fbb9b25d57
 #include "FreestyleEmailUiMailViewerConstants.h"
 #include "FSDelayedLoader.h"
 #include "FreestyleMessageHeaderURL.h"
 #include "FreestyleEmailUiAknStatusIndicator.h"
 #include <akntoolbar.h>
-// CONSTANTS
-// Zoom levels available on the UI
-const TInt KZoomLevels[] = { 75, 100, 125, 150 };
-const TInt KZoomLevelCount = sizeof( KZoomLevels ) / sizeof( TInt );
 CFsEmailUiHtmlViewerView* CFsEmailUiHtmlViewerView::NewL(
 CAlfEnv& aEnv,
 CFreestyleEmailUiAppUi& aAppUi,
 CAlfControlGroup& aControlGroup )
 DeleteMailL();
 }
 break;
 case EFsEmailUiCmdZoomIn:
 {
-TUint zoomLevelIdx = ZoomLevelIndexL();
+iContainer->ZoomInL();
-SetZoomLevelIndexL( zoomLevelIdx + 1 );
 }
 break;
 case EFsEmailUiCmdZoomOut:
 {
-TUint zoomLevelIdx = ZoomLevelIndexL();
+iContainer->ZoomOutL();
-SetZoomLevelIndexL( zoomLevelIdx - 1 );
 }
 break;
 case EFsEmailUiCmdHelp:
 {
 TFsEmailUiUtility::LaunchHelpL( KFSE_HLP_LAUNCHER_GRID );
 }
 }
 break;
 default:
 {
+/* -- pinch zoom only --
 if ( aCommand >= EFsEmailUiCmdZoomSmall )
 {
-TUint zoomLevelIndex = aCommand - EFsEmailUiCmdZoomSmall;
+iContainer->SetZoomLevelL( aCommand - EFsEmailUiCmdZoomSmall );
-SetZoomLevelIndexL( zoomLevelIndex );
 }
+*/
 }
 break;
 }
 }
 TIMESTAMP( "Html viewer selected operation done" );
 {
 FUNC_LOG;
 if ( aResourceId == R_FSEMAILUI_HTMLVIEWER_MENUPANE )
 {
+// Pinch zoom only
+aMenuPane->SetItemDimmed( EFsEmailUiCmdZoomLevel, ETrue );
 if ( FeatureManager::FeatureSupported( KFeatureIdFfCmailIntegration ) )
 {
 // remove help support in pf5250
 aMenuPane->SetItemDimmed( EFsEmailUiCmdHelp, ETrue);
 }
 if ( !iMessage || iActivationData.iEmbeddedMessageMode )
 {
 return;
 }
+TFSMailMsgId currentMsgId = iMessage->GetMessageId();
+if ( iLastDeletedMessageID == currentMsgId )
+{
+return;
+}
 TInt reallyDelete( ETrue );
 if ( iAppUi.GetCRHandler()->WarnBeforeDelete() &&
 !aSilentDelete )
 {
 iContainer->ResetContent();
 }
 RArray<TFSMailMsgId> msgIds;
 CleanupClosePushL( msgIds );
-TFSMailMsgId currentMsgId = iMessage->GetMessageId();
 msgIds.Append( currentMsgId );
 TFSMailMsgId mailBox = iMessage->GetMailBoxId();
 TFSMailMsgId folderId = iMessage->GetFolderId();
 //Get the id and check if there is a previous message available
 TBool available = iAppUi.IsPreviousMsgAvailable( currentMsgId,
 prevMsgId,
 prevMsgFolderId );
 //Delete the message
+iLastDeletedMessageID = iMessage->GetMessageId();
 iAppUi.GetMailClient()->DeleteMessagesByUidL( mailBox, folderId, msgIds );
 CleanupStack::PopAndDestroy( &msgIds );
 // Notify appui of deleted mail item
 SendEventToAppUiL( TFSEventMailDeletedFromViewer );
 if ( iAppUi.CurrentActiveView()->Id() == HtmlViewerId )
 {
 //Open the previous message or navigate back to list viewer
 if ( available )
 {
 }
 }
 void CFsEmailUiHtmlViewerView::DynInitZoomMenuL( CEikMenuPane* aMenuPane )
 {
 FUNC_LOG;
-TInt zoomLevelIdx = ZoomLevelIndexL();
+/* -- Pinch zoom only --
+TInt zoomLevelIdx = iContainer->ZoomLevelL();
 // Set the radio button state to match current zoom level
-if ( zoomLevelIdx >= 0 && zoomLevelIdx < KZoomLevelCount )
+if ( zoomLevelIdx >= 0 && zoomLevelIdx < iContainer->MaxZoomLevel() )
 {
 TInt curZoomLevel = zoomLevelIdx + EFsEmailUiCmdZoomSmall;
 aMenuPane->SetItemButtonState( curZoomLevel, EEikMenuItemSymbolOn );
 }
-}
+*/
+aMenuPane->SetItemDimmed( EFsEmailUiCmdZoomSmall, ETrue );
-TInt CFsEmailUiHtmlViewerView::ZoomLevelIndexL()
+aMenuPane->SetItemDimmed( EFsEmailUiCmdZoomNormal, ETrue );
-{
+aMenuPane->SetItemDimmed( EFsEmailUiCmdZoomLarge, ETrue );
-FUNC_LOG;
+aMenuPane->SetItemDimmed( EFsEmailUiCmdZoom150Percent, ETrue );
-TInt zoomLevelIdx = iContainer->BrowserControlIf()->BrowserSettingL(
-TBrCtlDefs::ESettingsCurrentZoomLevelIndex );
-// Behaviour of zooming in Browser Control Interface is different in version 7.1
-// than in previous versions and we need to support both. In older versions there
-// are 4 preset zoom levels while version 7.1 can zoom to any percent.
-RArray<TUint>* zoomLevels = iContainer->BrowserControlIf()->ZoomLevels();
-if ( !zoomLevels || !zoomLevels->Count() || ( *zoomLevels )[0] != KZoomLevels[0] )
-{
-// new browser:
-// BrowserControlIf gives zoom level percentage insted of index to array
-TBool found = EFalse;
-for ( TInt i = 0 ; i < KZoomLevelCount && !found ; ++i )
-{
-if ( zoomLevelIdx == KZoomLevels[i] )
-{
-zoomLevelIdx = i;
-found = ETrue;
-}
-}
-if ( !found )
-{
-zoomLevelIdx = KErrNotFound;
-}
-}
-return zoomLevelIdx;
-}
-void CFsEmailUiHtmlViewerView::SetZoomLevelIndexL( TInt aIndex )
-{
-FUNC_LOG;
-TInt newValue = KMinTInt;
-// Behaviour of zooming in Browser Control Interface is different in version 7.1
-// than in previous versions and we need to support both. In older versions there
-// are 4 preset zoom levels while version 7.1 can zoom to any percent.
-RArray<TUint>* zoomLevels = iContainer->BrowserControlIf()->ZoomLevels();
-if ( !zoomLevels || !zoomLevels->Count() || ( *zoomLevels )[0] != KZoomLevels[0] )
-{
-// new browser:
-// BrowserControlIf takes zoom level percentage insted of index to array
-if ( aIndex >= 0 && aIndex < KZoomLevelCount )
-{
-newValue = KZoomLevels[aIndex];
-}
-}
-else
-{
-// old browser
-newValue = aIndex;
-}
-if ( newValue > KMinTInt )
-{
-iContainer->BrowserControlIf()->SetBrowserSettingL(
-TBrCtlDefs::ESettingsCurrentZoomLevelIndex, newValue );
-}
-}
-// -----------------------------------------------------------------------------
-// CFsEmailUiHtmlViewerView::RestoreZoomLevelL()
-// -----------------------------------------------------------------------------
-//
-void CFsEmailUiHtmlViewerView::RestoreZoomLevelL()
-{
-FUNC_LOG;
-SetZoomLevelIndexL( ZoomLevelIndexL() );
 }
 // -----------------------------------------------------------------------------
 // CFsEmailUiHtmlViewerView::HandleEmailAddressCommandL()
 // -----------------------------------------------------------------------------
 {
 }
 void CFsEmailUiHtmlViewerView::DownloadAttachmentL( const TAttachmentData& aAttachment )
 {
-iAppUi.DownloadInfoMediator()->AddObserver( this, aAttachment.partData.iMessageId );
 iAttachmentsListModel->StartDownloadL(aAttachment);
 }
 void CFsEmailUiHtmlViewerView::DownloadAllAttachmentsL()
 {
 break;
 }
 iContainer->ShowAttachmentDownloadStatusL( aEvent.iProgressStatus, *attachment );
 }
-if (aEvent.iProgressStatus == TFSProgress::EFSStatus_RequestComplete ||
-aEvent.iProgressStatus == TFSProgress::EFSStatus_RequestCancelled)
-{
-iAppUi.DownloadInfoMediator()->StopObserving( this, aPart.iMessageId );
-}
 }
 void CFsEmailUiHtmlViewerView::RequestResponseL( const TFSProgress& aEvent, const TPartData& aPart )
 {
 FUNC_LOG;
 // Change empty msk when moving to next
 ChangeMskCommandL( R_FSE_QTN_MSK_EMPTY );
 iAppUi.MoveToNextMsgL( currentMsgId, nextMsgId );
 // Next message is displayed in this view through doactivate, because view is re-activate by mail list
-if ( iContainer )
-{
-			    RestoreZoomLevelL();
-}
 }
 }
 }
 // -----------------------------------------------------------------------------
 // CFsEmailUiHtmlViewerView::ShowPreviousMessageMenuInOptions
 // Change empty msk when moving to previous
 ChangeMskCommandL( R_FSE_QTN_MSK_EMPTY );
 iAppUi.MoveToPreviousMsgL( currentMsgId, prevMsgId );
 // Previous message is displayed in this view through doactivate, because view is re-activate by mail list
-if ( iContainer )
-{
-RestoreZoomLevelL();
-}
 }
 }
 }

branch	RCL_3
changeset 16	b5fbb9b25d57
parent 14	b13141f05c3d
child 17	67369d1b217f