diff -r 8696bb5a6e6e -r 56a6a91a2a3e filemanager/App/src/CFileManagerViewBase.cpp --- a/filemanager/App/src/CFileManagerViewBase.cpp Mon Mar 08 21:43:10 2010 +0000 +++ b/filemanager/App/src/CFileManagerViewBase.cpp Sun Mar 14 13:08:45 2010 +0000 @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include @@ -586,20 +586,22 @@ void CFileManagerViewBase::MarkMenuFilteringL( CEikMenuPane& aMenuPane ) { TInt index( iContainer->ListBoxCurrentItemIndex() ); - if ( iContainer->ListBoxIsItemSelected( index ) ) - { - aMenuPane.SetItemDimmed( EFileManagerMarkOne, ETrue ); - } - else - { - aMenuPane.SetItemDimmed( EFileManagerUnmarkOne, ETrue ); - } if ( iEngine.IsFolder( index ) ) { aMenuPane.SetItemDimmed( EFileManagerMarkOne, ETrue ); aMenuPane.SetItemDimmed( EFileManagerUnmarkOne, ETrue ); - aMenuPane.SetItemDimmed( EFileManagerMarkAll, ETrue ); + } + else + { + if ( iContainer->ListBoxIsItemSelected( index ) ) + { + aMenuPane.SetItemDimmed( EFileManagerMarkOne, ETrue ); + } + else + { + aMenuPane.SetItemDimmed( EFileManagerUnmarkOne, ETrue ); + } } TInt files( iEngine.FilesInFolderL() ); @@ -613,7 +615,6 @@ { aMenuPane.SetItemDimmed( EFileManagerUnmarkAll, ETrue ); } - } // ----------------------------------------------------------------------------- @@ -3341,6 +3342,14 @@ } else if ( iContainer->ListBoxNumberOfItems() ) { + // Check if there is files on the list + TInt files( iEngine.FilesInFolderL() ); + if ( !files ) + { + dimSend = ETrue; + aMenuPane.SetItemDimmed( EFileManagerMark, ETrue ); + } + // There is items in list, check selection type TUint32 fileType( iEngine.FileTypeL( iContainer->ListBoxCurrentItemIndex() ) ); @@ -3348,13 +3357,11 @@ { dimSend = ETrue; aMenuPane.SetItemDimmed( EFileManagerDelete, ETrue ); - aMenuPane.SetItemDimmed( EFileManagerMark, ETrue ); aMenuPane.SetItemDimmed( EFileManagerRename, ETrue ); } else if ( fileType & CFileManagerItemProperties::EFolder ) { dimSend = ETrue; - aMenuPane.SetItemDimmed( EFileManagerMark, ETrue ); } if ( fileType & CFileManagerItemProperties::EPlaylist )