# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1266612113 -7200 # Node ID 1e73d2d04cbc567c9b79b2fcf4231aa87702fd84 # Parent d1daf54a55b566a52de01b8f9cb5125d2b06e631 Revision: 201003 Kit: 201007 diff -r d1daf54a55b5 -r 1e73d2d04cbc deviceencryption/DevEncGsPlugin/src/devencgsplugin.cpp --- a/deviceencryption/DevEncGsPlugin/src/devencgsplugin.cpp Tue Feb 02 00:03:31 2010 +0200 +++ b/deviceencryption/DevEncGsPlugin/src/devencgsplugin.cpp Fri Feb 19 22:41:53 2010 +0200 @@ -18,12 +18,12 @@ // User includes #include "devencgsplugin.h" -#include -#include +#include +#include #include // GUI Resource //#include #include -#include +#include #include #include #include diff -r d1daf54a55b5 -r 1e73d2d04cbc deviceencryption/DevEncUi/src/DevEncUiEncryptionOperator.cpp --- a/deviceencryption/DevEncUi/src/DevEncUiEncryptionOperator.cpp Tue Feb 02 00:03:31 2010 +0200 +++ b/deviceencryption/DevEncUi/src/DevEncUiEncryptionOperator.cpp Fri Feb 19 22:41:53 2010 +0200 @@ -40,8 +40,8 @@ #include #include // For general settings view UIDs (autolock) #include // For power state -#include // for autolock -#include +#include // for autolock +#include #include #include // For character conversion #include diff -r d1daf54a55b5 -r 1e73d2d04cbc filemanager/App/data/FileManager.rss --- a/filemanager/App/data/FileManager.rss Tue Feb 02 00:03:31 2010 +0200 +++ b/filemanager/App/data/FileManager.rss Fri Feb 19 22:41:53 2010 +0200 @@ -179,16 +179,19 @@ { command = EFileManagerConnectRemoveDrive; txt = qtn_rd_opt_connect; + flags = EEikMenuItemDimmed; }, MENU_ITEM { command = EFileManagerDisconnectRemoveDrive; txt = qtn_rd_opt_disconnect; + flags = EEikMenuItemDimmed; }, MENU_ITEM { command = EFileManagerEject; txt = qtn_fmgr_options_eject; + flags = EEikMenuItemSpecific; }, #ifndef RD_FILE_MANAGER_BACKUP MENU_ITEM @@ -202,27 +205,32 @@ txt = qtn_memc_options_restore; }, #endif // !RD_FILE_MANAGER_BACKUP - MENU_ITEM - { - command = EFileManagerFindFile; - txt = qtn_fmgr_options_find_file; - }, - MENU_ITEM - { - command = EFileManagerMemoryStorage; - cascade = r_filemanager_memory_storage_menu; - txt = qtn_fmgr_options_memory_sub; - flags = EEikMenuItemSpecific; - }, - MENU_ITEM - { - command = EFileManagerRemoveDrives; - cascade = r_filemanager_remote_drives_menu; - txt = qtn_fmgr_opt_remote_drives; - flags = EEikMenuItemSpecific; - }, - MENU_ITEM - { + MENU_ITEM + { + command = EFileManagerFindFile; + txt = qtn_fmgr_options_find_file; + }, + MENU_ITEM + { + command = EFileManagerMemoryStorage; + cascade = r_filemanager_memory_storage_menu; + txt = qtn_fmgr_options_memory_sub; + flags = EEikMenuItemSpecific; + }, + MENU_ITEM + { + command = EFileManagerRemoveDrives; + cascade = r_filemanager_remote_drives_menu; + txt = qtn_fmgr_opt_remote_drives; + flags = EEikMenuItemSpecific; + }, + MENU_ITEM + { + command = EFileManagerRemoveDrivesMapDrive; + txt = qtn_fmgr_opt_rd_new_drive; + }, + MENU_ITEM + { command = EAknCmdHelp; txt = qtn_options_help; }, @@ -248,19 +256,16 @@ { command = EFileManagerConnectRemoveDrive; txt = qtn_rd_opt_connect; - flags = EEikMenuItemSpecific; }, MENU_ITEM { command = EFileManagerDisconnectRemoveDrive; txt = qtn_rd_opt_disconnect; - flags = EEikMenuItemSpecific; }, MENU_ITEM { command = EFileManagerRefreshRemoteDrive; txt = qtn_fmgr_rd_opt_refresh; - flags = EEikMenuItemSpecific; }, MENU_ITEM { @@ -511,12 +516,6 @@ }, MENU_ITEM { - command = EFileManagerRemoveDrivesMapDrive; - txt = qtn_fmgr_opt_rd_new_drive; - flags = EEikMenuItemSpecific; - }, - MENU_ITEM - { command = EFileManagerRemoveDrivesDelete; txt = qtn_fmgr_opt_rd_delete_drive; flags = EEikMenuItemSpecific; diff -r d1daf54a55b5 -r 1e73d2d04cbc filemanager/App/src/CFileManagerAppUi.cpp --- a/filemanager/App/src/CFileManagerAppUi.cpp Tue Feb 02 00:03:31 2010 +0200 +++ b/filemanager/App/src/CFileManagerAppUi.cpp Fri Feb 19 22:41:53 2010 +0200 @@ -22,7 +22,7 @@ #include // CAknNavigationControlContainer #include // CAknNavigationDecorator #include // CSendAppUi -#include +#include #include #include #include // HlpLauncher diff -r d1daf54a55b5 -r 1e73d2d04cbc filemanager/App/src/CFileManagerFileListContainer.cpp --- a/filemanager/App/src/CFileManagerFileListContainer.cpp Tue Feb 02 00:03:31 2010 +0200 +++ b/filemanager/App/src/CFileManagerFileListContainer.cpp Fri Feb 19 22:41:53 2010 +0200 @@ -32,8 +32,9 @@ #include "CFileManagerAppUi.h" #include "FileManager.hrh" #include "CFileManagerIconArray.h" - - +#include +#include +#include // CEikMenuPane // CONSTANTS const TInt KTouchGestureThreshold = 30; // Threshold could be stored in CenRep @@ -199,27 +200,38 @@ const TKeyEvent& aKeyEvent, TEventCode aType ) { TKeyResponse response = OfferSearchKeyEventL( aKeyEvent, aType ); + if ( response == EKeyWasConsumed ) + { + return response; + } - response = ListBox().OfferKeyEventL( aKeyEvent, aType ); - /* if ( response == EKeyWasConsumed ) - { - return response; - }*/ + TVwsViewId enabledViewId = TVwsViewId( KNullUid, KNullUid ); + iAppUi->GetActiveViewId( enabledViewId ); + + TUid enabledViewUid = enabledViewId.iViewUid; + CAknView* enabledView = iAppUi->View( enabledViewUid ); + CEikMenuBar* menuBar = enabledView->MenuBar(); + switch( aKeyEvent.iCode ) { case EKeyEnter: // FALLTHROUH case EKeyOK: { - /* indexOfMSK++; - iAppUi->ProcessCommandL( EFileManagerSelectionKey ); - response = EKeyWasConsumed;*/ + if ( menuBar->ItemSpecificCommandsEnabled() ) + { + iAppUi->ProcessCommandL( EFileManagerSelectionKey ); + response = EKeyWasConsumed; + } break; } case EKeyDelete: // FALLTHROUGH case EKeyBackspace: { - iAppUi->ProcessCommandL( EFileManagerDelete ); - response = EKeyWasConsumed; + if ( menuBar->ItemSpecificCommandsEnabled() ) + { + iAppUi->ProcessCommandL( EFileManagerDelete ); + response = EKeyWasConsumed; + } break; } case EKeyLeftArrow: // FALLTHROUGH @@ -254,7 +266,7 @@ } default: { - // response = ListBox().OfferKeyEventL( aKeyEvent, aType ); + response = ListBox().OfferKeyEventL( aKeyEvent, aType ); break; } } diff -r d1daf54a55b5 -r 1e73d2d04cbc filemanager/App/src/CFileManagerViewBase.cpp --- a/filemanager/App/src/CFileManagerViewBase.cpp Tue Feb 02 00:03:31 2010 +0200 +++ b/filemanager/App/src/CFileManagerViewBase.cpp Fri Feb 19 22:41:53 2010 +0200 @@ -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 ) diff -r d1daf54a55b5 -r 1e73d2d04cbc filemanager/Engine/src/CFileManagerActiveExecute.cpp --- a/filemanager/Engine/src/CFileManagerActiveExecute.cpp Tue Feb 02 00:03:31 2010 +0200 +++ b/filemanager/Engine/src/CFileManagerActiveExecute.cpp Fri Feb 19 22:41:53 2010 +0200 @@ -114,7 +114,7 @@ iItemIterator->CurrentL( &iSrc, &iDst, iItemType ); } - if ( ( iDst && iDst->Length() > KMaxFileName ) || !iDst ) + if ( iDst && iDst->Length() > KMaxFileName ) { error = KErrBadName; TRequestStatus* status = &iStatus; diff -r d1daf54a55b5 -r 1e73d2d04cbc filemanager/Engine/src/CFileManagerRemovableDriveHandler.cpp --- a/filemanager/Engine/src/CFileManagerRemovableDriveHandler.cpp Tue Feb 02 00:03:31 2010 +0200 +++ b/filemanager/Engine/src/CFileManagerRemovableDriveHandler.cpp Fri Feb 19 22:41:53 2010 +0200 @@ -920,74 +920,40 @@ // void CFileManagerRemovableDriveHandler::StartFormatProcessL() { - RDebug::Printf(">> CFileManagerRemovableDriveHandler::StartFormatProcessL() 1 "); // Store the current volume name over format operation. TRAPD( err, StoreVolumeNameL( iDrive ) ); LOG_IF_ERROR1( err, "FileManagerRemovableDriveHandler::StartFormatProcessL-StoreVolumeName %d", err ); - TDriveName driveName( TDriveUnit( iDrive ).Name() ); - RDebug::Printf(">> CFileManagerRemovableDriveHandler::StartFormatProcessL() 2"); // Resolve drive character and open formatter iFormatter.Close(); - RDebug::Printf(">> CFileManagerRemovableDriveHandler::StartFormatProcessL() 2.1"); err = iFormatter.Open( iFs, driveName, EFullFormat, iFinalValue ); - RDebug::Printf(">> CFileManagerRemovableDriveHandler::StartFormatProcessL() 2.2 RFormat::Open full err=%d", err); - // Forced format for locked card if ( err == KErrLocked ) { // Erase password and try again err = iFs.ErasePassword( iDrive ); - INFO_LOG1( "FileManagerRemovableDriveHandler::StartFormatProcessL-ErasePassword result=%d", err); - if (err == KErrNone) { - err = iFormatter.Open(iFs, driveName, EFullFormat , iFinalValue ); - RDebug::Printf(">> CFileManagerRemovableDriveHandler::StartFormatProcessL() RFormat::Open again err=%d", err); + err = iFormatter.Open(iFs, driveName, EFullFormat , iFinalValue ); } } - if (err == KErrInUse) - { - RDebug::Printf(">> CFileManagerRemovableDriveHandler::StartFormatProcessL KErrInUse try force format err=%d", err); - - // There are still files open on the drive being formatted, prompt the user to - // ask if they want to format anyway. - // - // formatting. - //TBool reallyFormat = FileManagerDlgUtils::ShowConfirmQueryWithYesNoL(_L("There are files open on this drive, continue with format?")); - TBool reallyFormat = ETrue; // TEMP! - should ask the user to confirm Yes / No - + { + TBool reallyFormat = ETrue; if (reallyFormat) - { - // Open the RFormat sub-session with force format flags - RDebug::Printf( "FileManagerRemovableDriveHandler::StartFormatProcessL-******force format*****"); + { err = iFormatter.Open( - iFs, driveName, EFullFormat | EForceFormat, iFinalValue ); - RDebug::Printf( "FileManagerRemovableDriveHandler::StartFormatProcessL-******force format***** err = %d", err); + iFs, driveName, EFullFormat | EForceFormat, iFinalValue ); } } - - // By the time we get here, one of three things could have happened: - // 1. RFormat has been opened with standard full format flag with no error - // 2. Some other app still has files opened so full format cannot be used. - // A second attempt has been made to open the format sub-session with - // full format flags and this has succeeded. - // 3. As 2 but for some other reason (corrupt card perhaps?), force format - // does not work in which case abort format. - - TFullName fsName; if (err == KErrNone) { - err = iFs.FileSystemName( fsName, iDrive ); - - RDebug::Printf( "FileManagerRemovableDriveHandler::StartFormatProcessL-fsName=%S, result=%d", - &fsName, err ); + err = iFs.FileSystemName( fsName, iDrive ); if ( err == KErrNone && fsName.Length() > 0 ) { @@ -1012,20 +978,16 @@ { TRAP( err, InformStartL( iFinalValue ) ); if ( err == KErrNone ) - { - RDebug::Printf(">> CFileManagerRemovableDriveHandler::StartFormatProcessL() RFormat::Next err = %d, tracks left=%d", err, iFinalValue); + { iFormatCountBuf = iFinalValue; iFormatter.Next( iFormatCountBuf, iStatus ); SetActive(); } } if ( !iFinalValue || err != KErrNone ) - { - RDebug::Printf(">> CFileManagerRemovableDriveHandler::StartFormatProcessL() 6 err = %d", err); - EndFormatProcessL( err ); - RDebug::Printf(">> CFileManagerRemovableDriveHandler::StartFormatProcessL() 7 err = %d", err); + { + EndFormatProcessL( err ); } - RDebug::Printf("<< CFileManagerRemovableDriveHandler::StartFormatProcessL() 8 err=%d", err); } // --------------------------------------------------------------------------- // CFileManagerRemovableDriveHandler::CloseAppsL diff -r d1daf54a55b5 -r 1e73d2d04cbc filemanager/Engine/src/CFileManagerUtils.cpp --- a/filemanager/Engine/src/CFileManagerUtils.cpp Tue Feb 02 00:03:31 2010 +0200 +++ b/filemanager/Engine/src/CFileManagerUtils.cpp Fri Feb 19 22:41:53 2010 +0200 @@ -226,18 +226,17 @@ RFile64 drmFile; - User::LeaveIfError( drmFile.Open( - iFs, aFullPath, EFileRead | EFileShareReadersOrWriters ) ); - CleanupClosePushL( drmFile ); - DRM::CDrmUtility *drmCheck = DRM::CDrmUtility::NewLC(); + User::LeaveIfError( drmFile.Open( + iFs, aFullPath, EFileRead | EFileShareReadersOrWriters ) ); + CleanupClosePushL( drmFile ); + DRM::CDrmUtility *drmCheck = DRM::CDrmUtility::NewLC(); - TBool isProtected( EFalse ); - if ( drmCheck->IsProtectedL(drmFile) ) - { - isProtected = ETrue; - } - CleanupStack::PopAndDestroy(drmCheck); - CleanupStack::PopAndDestroy( &drmFile ); + TBool isProtected( EFalse ); + TRAP_IGNORE( isProtected = drmCheck->IsProtectedL( drmFile ) ); + + CleanupStack::PopAndDestroy( drmCheck ); + CleanupStack::PopAndDestroy( &drmFile ); + return isProtected; #endif }