diff -r 8812206c49a0 -r 1772663c5b4e filemanager/App/src/CFileManagerViewBase.cpp --- a/filemanager/App/src/CFileManagerViewBase.cpp Fri Mar 12 15:41:37 2010 +0200 +++ b/filemanager/App/src/CFileManagerViewBase.cpp Mon Mar 15 12:39:38 2010 +0200 @@ -86,7 +86,7 @@ const TInt64 KMinToMicroSecMultiplier = KMSecToMicroSecMultiplier * 60; const TInt64 KHourToMicroSecMultiplier = KMinToMicroSecMultiplier * 60; const TUint KProgressBarAsyncStartDelay = 1500000; // microseconds - +const TInt KMinificationFactor = 1024; // Used to zoom processbar's proportion // ============================ LOCAL FUNCTIONS ================================ @@ -2352,7 +2352,7 @@ // Update progress indicator if ( iProgressDialog && iProgressInfo ) { - iProgressInfo->SetAndDraw( iTotalTransferredBytes/1024 ); + iProgressInfo->SetAndDraw( iTotalTransferredBytes / KMinificationFactor ); } } @@ -3187,6 +3187,29 @@ // Common remote drive filtering RemoteDriveCommonFilteringL( aMenuPane ); + if ( iContainer->ListBoxNumberOfItems() ) + { + if ( !iContainer->ListBoxSelectionIndexesCount() ) + { + TUint32 fileType( iEngine.FileTypeL( + iContainer->ListBoxCurrentItemIndex() ) ); + if ( ( fileType & KDefaultFolderMask ) == KDefaultFolderMask ) + { + aMenuPane.SetItemDimmed( EFileManagerMoveToFolder, ETrue ); + } + } + } + else + { + aMenuPane.SetItemDimmed( EFileManagerMoveToFolder, ETrue ); + aMenuPane.SetItemDimmed( EFileManagerCopyToFolder, ETrue ); + } + TInt index(iContainer->ListBoxCurrentItemIndex()); + TUint32 fileType(iEngine.FileTypeL(index)); + if (!(fileType & CFileManagerItemProperties::EFolder)) + { + aMenuPane.SetItemDimmed(EFileManagerMoveToFolder, ETrue); + } CFileManagerFeatureManager& featureManager( FeatureManager() ); #ifdef RD_MULTIPLE_DRIVE @@ -3478,23 +3501,6 @@ { // CEikListBox& listBox( iContainer->ListBox() ); - if ( iContainer->ListBoxNumberOfItems() ) - { - if ( !iContainer->ListBoxSelectionIndexesCount() ) - { - TUint32 fileType( iEngine.FileTypeL( - iContainer->ListBoxCurrentItemIndex() ) ); - if ( ( fileType & KDefaultFolderMask ) == KDefaultFolderMask ) - { - aMenuPane.SetItemDimmed( EFileManagerMoveToFolder, ETrue ); - } - } - } - else - { - aMenuPane.SetItemDimmed( EFileManagerMoveToFolder, ETrue ); - aMenuPane.SetItemDimmed( EFileManagerCopyToFolder, ETrue ); - } // Search view item dimming if( iEngine.State() == CFileManagerEngine::ESearch ) @@ -3507,13 +3513,7 @@ { // Write protected item dimming aMenuPane.SetItemDimmed( EFileManagerNewFolder, ETrue ); - } - - TInt index(iContainer->ListBoxCurrentItemIndex()); - TUint32 fileType(iEngine.FileTypeL(index)); - if (!(fileType & CFileManagerItemProperties::EFolder)) - { - aMenuPane.SetItemDimmed(EFileManagerMoveToFolder, ETrue); + } } @@ -4216,8 +4216,8 @@ iProgressInfo = iProgressDialog->GetProgressInfoL(); if ( iProgressInfo ) { - iProgressInfo->SetFinalValue( static_cast( aFinalValue/1024 ) ); - iProgressInfo->SetAndDraw( static_cast( aInitialValue/1024 ) ); + iProgressInfo->SetFinalValue( static_cast( aFinalValue / KMinificationFactor ) ); + iProgressInfo->SetAndDraw( static_cast( aInitialValue / KMinificationFactor ) ); } iProgressDialog->RunLD(); } @@ -4770,8 +4770,8 @@ if ( iProgressDialog && iProgressInfo ) { CEikProgressInfo::SInfo info( iProgressInfo->Info() ); - iProgressFinalValue = info.iFinalValue; - iProgressCurrentValue = iProgressInfo->CurrentValue(); + iProgressFinalValue = ( info.iFinalValue ) * KMinificationFactor; + iProgressCurrentValue = ( iProgressInfo->CurrentValue() ) * KMinificationFactor; if ( !iProgressCurrentValue && iTotalTransferredBytes <= iProgressFinalValue ) { iProgressCurrentValue = iTotalTransferredBytes;