FCL/sf/app/files: comparison filemanager/App/src/CFileManagerViewBase.cpp

equal deleted inserted replaced

-:6a0ceb387ac7
+:40fb776cbfb3
 //
 void CFileManagerViewBase::HandleCommandL( TInt aCommand )
 {
 if ( !iContainer ) return;
-// Initialization, do not allow marking mode exit as default.
-iContainer->AllowMarkingModeExit( EFalse );
 TBool updateCba( !iContainer->SelectionModeEnabled() );
 switch( aCommand )
 {
 case EFileManagerOpen:
 break;
 }
 case EFileManagerNewFolder:
 {
 CmdNewFolderL();
+break;
+}
+case EFileManagerMarkOne:   // FALLTHROUGH
+case EFileManagerUnmarkOne: // FALLTHROUGH
+case EFileManagerToggleMark:
+{
+CmdToggleMarkL();
+break;
+}
+case EFileManagerMarkAll:
+{
+CmdMarkAllL();
+break;
+}
+case EFileManagerUnmarkAll:
+{
+CmdUnmarkAllL();
 break;
 }
 case EFileManagerRename:
 {
 CmdRenameL();
 //            break;
 //            }
 case EFileManagerReceiveViaIR:
 {
 CmdReceiveViaIRL();
+break;
+}
+case EFileManagerCheckMark: // Suppress
+{
 break;
 }
 case EAknSoftkeyContextOptions: // FALLTHROUGH
 case EFileManagerSelectionKey:
 {
 //
 // -----------------------------------------------------------------------------
 //
 void CFileManagerViewBase::SendUiQueryL()
 {
-// Do not allow marking mode exit during send.
+//iSendUiPopupOpened = ETrue;
-// No need to call iContainer->AllowMarkingModeExit( EFalse ).
-// Already done in CFileManagerViewBase::HandleCommandL().
 CSendUi& sendUi( static_cast< CFileManagerAppUi* >( AppUi() )->SendUiL() );
 CMessageData* msgData = CMessageData::NewL();
 CleanupStack::PushL( msgData );
 TInt msgSize( KMessageSize );
 CArrayFixFlat< TInt >* files = GetSendFilesLC( msgSize );
 //
 // -----------------------------------------------------------------------------
 //
 void CFileManagerViewBase::MarkMenuFilteringL( CEikMenuPane& aMenuPane )
 {
+TInt index( iContainer->ListBoxCurrentItemIndex() );
+if ( iEngine.IsFolder( index ) )
+{
+aMenuPane.SetItemDimmed( EFileManagerMarkOne, ETrue );
+aMenuPane.SetItemDimmed( EFileManagerUnmarkOne, ETrue );
+}
+else
+{
+if ( iContainer->ListBoxIsItemSelected( index ) )
+{
+aMenuPane.SetItemDimmed( EFileManagerMarkOne, ETrue );
+}
+else
+{
+aMenuPane.SetItemDimmed( EFileManagerUnmarkOne, ETrue );
+}
+}
 TInt files( 0 );
-// Get file count in current view, first check whether there is a
+if( iContainer->IsSearchFieldVisible() )
-// filter rule working.
-if ( iContainer->IsSearchFieldVisible() )
 {
 files = FilesCountInSearchField();
 }
 else
 {
 files = iEngine.FilesInFolderL();
 }
 TInt count( iContainer->ListBoxSelectionIndexesCount() );
-// if all the files are marked or no file eixists,
-// dim MarkAll.
 if ( count == files )
 {
-aMenuPane.SetItemDimmed( EAknCmdMarkingModeMarkAll, ETrue );
+aMenuPane.SetItemDimmed( EFileManagerMarkAll, ETrue );
 }
-// if no file marked, dim UnmarkAll.
-if ( count == 0 )
+if ( !count )
 {
-aMenuPane.SetItemDimmed( EAknCmdMarkingModeUnmarkAll, ETrue );
+aMenuPane.SetItemDimmed( EFileManagerUnmarkAll, ETrue );
-}
-// Dim MarkAll and UnMarkAll if the list is empty.
-if ( iContainer->ListBoxNumberOfItems() == 0 )
-{
-aMenuPane.SetItemDimmed( EAknCmdMarkingModeMarkAll, ETrue );
-aMenuPane.SetItemDimmed( EAknCmdMarkingModeUnmarkAll, ETrue );
 }
 }
 // -----------------------------------------------------------------------------
 // CFileManagerViewBase::CmdOpenL
 TBool ret( EFalse );
 DenyDirectoryRefresh( ETrue );
 TRAPD( err, ret = FileManagerDlgUtils::ShowConfirmQueryWithYesNoL( *prompt ) );
 DenyDirectoryRefresh( EFalse );
 User::LeaveIfError( err );
-// Set flag to indicate marking mode could exit or not.
-// Do not allow Marking mode exit when leave occurs.
-iContainer->AllowMarkingModeExit( ret );
 if ( ret )
 {
 if( IsDriveAvailable( DriveInfo().iDrive ) )
 {
 DeleteItemsL( index );
 R_FILEMANAGER_MOVE_MEMORY_SELECTIONDIALOG,
 filter ) );
 DenyDirectoryRefresh( EFalse );
 CleanupStack::PopAndDestroy( filter );
-// Set flag to indicate marking mode could exit or not
-iContainer->AllowMarkingModeExit( ret );
 if ( ret && ptrFileName.Length() )
 {
 if ( !DriveReadOnlyMmcL( ptrFileName ) )
 {
 RunOperationL(
 R_FILEMANAGER_COPY_MEMORY_SELECTIONDIALOG,
 filter ) );
 DenyDirectoryRefresh( EFalse );
 CleanupStack::PopAndDestroy( filter );
-// Set flag to indicate marking mode could exit or not
-iContainer->AllowMarkingModeExit( ret );
 if ( ret && ptrFileName.Length() )
 {
 if ( !DriveReadOnlyMmcL( ptrFileName ) )
 {
 RunOperationL(
 {
 iContainer->DrawDeferred();
 }
 }
 CleanupStack::PopAndDestroy( folderNameBuf );
+}
+// -----------------------------------------------------------------------------
+// CFileManagerViewBase::CmdToggleMarkL
+//
+// -----------------------------------------------------------------------------
+//
+void CFileManagerViewBase::CmdToggleMarkL()
+{
+const TInt index( iContainer->ListBoxCurrentItemIndex() );
+if ( iEngine.IsFolder( index ) )
+{
+iContainer->ListBoxDeselectItem( index );
+}
+else
+{
+iContainer->ListBoxToggleItemL( index );
+}
+}
+// -----------------------------------------------------------------------------
+// CFileManagerViewBase::CmdMarkAllL
+//
+// -----------------------------------------------------------------------------
+//
+void CFileManagerViewBase::CmdMarkAllL()
+{
+iContainer->ListBoxSelectAllL();
+}
+// -----------------------------------------------------------------------------
+// CFileManagerViewBase::CmdUnmarkAllL
+//
+// -----------------------------------------------------------------------------
+//
+void CFileManagerViewBase::CmdUnmarkAllL()
+{
+iContainer->ListBoxClearSelection();
 }
 // -----------------------------------------------------------------------------
 // CFileManagerViewBase::CmdRenameL
 //
 case R_FILEMANAGER_MEMORY_STORE_VIEW_MENU:
 {
 MemoryStoreMenuFilteringL( *aMenuPane );
 break;
 }
-// Marking mode menu
+case R_FILEMANAGER_MARK_UNMARK_MENU:
-case R_AVKON_MENUPANE_MARK_MULTIPLE:
+case R_FILEMANAGER_CONTEXT_SENSITIVE_MARK_UNMARK_MENU:
 {
 MarkMenuFilteringL( *aMenuPane );
 break;
 }
 case R_FILEMANAGER_ORGANISE_MENU:
 LOG_IF_ERROR2( aError, "CFileManagerViewBase::DoProcessFinishedL-iActiveProcess=%d,aError=%d",
 iActiveProcess, aError )
 if ( iPeriodic && iProgressInfo && iTotalTransferredBytes )
 {
-if ( iActiveProcess == ECopyProcess || iActiveProcess == EMoveProcess )
+iProgressInfo->SetAndDraw( iTotalTransferredBytes );
-{
-iProgressInfo->SetAndDraw( iTotalTransferredBytes / KMinificationFactor );
-}
-else
-{
-iProgressInfo->SetAndDraw( iTotalTransferredBytes );
-}
 }
 if ( IsSystemProcess( iActiveProcess ) )
 {
 // Remove system status to allow app close from task switcher
 iEikonEnv->SetSystem( EFalse );
 {
 ret = ETrue;
 }
 if ( ret )
 {
+#ifdef RD_MULTIPLE_DRIVE
+HBufC* text = iEngine.GetFormattedDriveNameLC(
+aDrive,
+R_QTN_MEMC_MULTIPLE_MEMC_READ_ONLY );
+FileManagerDlgUtils::ShowErrorNoteL( *text );
+CleanupStack::PopAndDestroy( text );
+#else // RD_MULTIPLE_DRIVE
 FileManagerDlgUtils::ShowErrorNoteL(
 R_QTN_MEMC_MEMORYCARD_READ_ONLY );
+#endif // RD_MULTIPLE_DRIVE
 }
 return ret;
 }
 msgSize = Int64ToInt( iEngine.GetFileSizesL( *indexArray ) );
 }
 CleanupStack::PopAndDestroy( indexArray );
 TSendingCapabilities caps(
 0, msgSize, TSendingCapabilities::ESupportsAttachments );
-TBool addMenuResult = EFalse;
+sendUi.AddSendMenuItemL( aMenuPane, pos, EFileManagerSend, caps );
-sendUi.AddSendMenuItemToMenuPaneL( addMenuResult, aMenuPane, pos, EFileManagerSend, caps );
+aMenuPane.SetItemSpecific(EFileManagerSend, ETrue);
-// EFileManagerSend is added by CSendUI, existence checking
-// should be taken before setting the properties of command.
-// Try to set properties of a none-existing command will cause panic.
-if ( addMenuResult )
-{
-aMenuPane.SetItemSpecific( EFileManagerSend, ETrue );
-}
 }
 // ------------------------------------------------------------------------------
 // CFileManagerViewBase::DeleteStatusNotOk
 //
 TInt driveNumber = drvInfo.iDrive;
 iEngine.GetDriveInfoL(driveNumber,drvInfo);
 // Common remote drive filtering
 RemoteDriveCommonFilteringL( aMenuPane );
+if( iContainer->IsSearchFieldVisible() &&
-// Used while checking EAknCmdMarkingModeEnter's existance
+!FilesCountInSearchField() )
-TInt pos ( 0 );
+{
-// No file exists after find pane filtering,
+aMenuPane.SetItemDimmed( EFileManagerMark, ETrue );
-// disable enter marking mode
-if ( iContainer->IsSearchFieldVisible() &&
-FilesCountInSearchField() == 0 )
-{
-if ( aMenuPane.MenuItemExists( EAknCmdMarkingModeEnter, pos ) )
-{
-aMenuPane.SetItemDimmed( EAknCmdMarkingModeEnter, ETrue );
-}
 }
 if ( iContainer->ListBoxNumberOfItems() )
 {
 if ( !iContainer->ListBoxSelectionIndexesCount() )
 {
 aMenuPane.SetItemDimmed( EFileManagerMoveToFolder, ETrue );
 aMenuPane.SetItemDimmed( EFileManagerCopyToFolder, ETrue );
 }
 TInt index(iContainer->ListBoxCurrentItemIndex());
 TUint32 fileType(iEngine.FileTypeL(index));
-// Do not dim move to folder command in option menu and stylus popup
+if (!(fileType & CFileManagerItemProperties::EFolder))
-// menu while marking mode is activated.
-// At least one item is marked.
-if ( !(fileType & CFileManagerItemProperties::EFolder )
-&& iContainer->ListBoxSelectionIndexesCount() == 0 )
 {
 aMenuPane.SetItemDimmed(EFileManagerMoveToFolder, ETrue);
 }
 CFileManagerFeatureManager& featureManager( FeatureManager() );
 {
 // Search view item dimming
 aMenuPane.SetItemDimmed( EFileManagerRename, ETrue );
 aMenuPane.SetItemDimmed( EFileManagerReceiveViaIR, ETrue );
 aMenuPane.SetItemDimmed( EFileManagerOrganise, ETrue );
+//        aMenuPane.SetItemDimmed( EFileManagerMemoryCard, ETrue );
+//        aMenuPane.SetItemDimmed( EFileManagerMemoryCardPassword, ETrue );
+//aMenuPane.SetItemDimmed( EFileManagerUnlockMemoryCard, ETrue );
 aMenuPane.SetItemDimmed( EFileManagerRefreshRemoteDrive, ETrue );
 #ifdef RD_MULTIPLE_DRIVE
 aMenuPane.SetItemDimmed( EFileManagerFormatMassStorage, ETrue );
 #endif // RD_MULTIPLE_DRIVE
 aMenuPane.SetItemDimmed( EFileManagerSort, ETrue );
 {
 // Write protected item dimming
 aMenuPane.SetItemDimmed( EFileManagerRename, ETrue );
 aMenuPane.SetItemDimmed( EFileManagerDelete, ETrue );
 aMenuPane.SetItemDimmed( EFileManagerReceiveViaIR, ETrue );
+//        aMenuPane.SetItemDimmed( EFileManagerMemoryCard, ETrue );
+//        aMenuPane.SetItemDimmed( EFileManagerMemoryCardPassword, ETrue );
 #ifdef RD_MULTIPLE_DRIVE
 aMenuPane.SetItemDimmed( EFileManagerFormatMassStorage, ETrue );
 #endif // RD_MULTIPLE_DRIVE
 }
 #ifdef RD_MULTIPLE_DRIVE
 if ( drvInfo.iState & TFileManagerDriveInfo::EDriveMassStorage )
 {
 // Mass storage item dimming
+//        aMenuPane.SetItemDimmed( EFileManagerMemoryCard, ETrue );
+//        aMenuPane.SetItemDimmed( EFileManagerMemoryCardPassword, ETrue );
 aMenuPane.SetItemDimmed( EFileManagerUnlockMemoryCard, ETrue );
 if ( !( drvInfo.iState & TFileManagerDriveInfo::EDrivePresent ) )
 {
 aMenuPane.SetItemDimmed( EFileManagerFormatMassStorage, ETrue );
 // Memory card item dimming
 if ( !( drvInfo.iState & TFileManagerDriveInfo::EDrivePresent ) ||
 ( drvInfo.iState & ( TFileManagerDriveInfo::EDriveCorrupted |
 TFileManagerDriveInfo::EDriveLocked ) ) )
 {
+//            aMenuPane.SetItemDimmed( EFileManagerMemoryCardPassword, ETrue );
 aMenuPane.SetItemDimmed( EFileManagerDetails, ETrue );
 }
 if ( ( drvInfo.iState & TFileManagerDriveInfo::EDriveCorrupted ) ||
 !( drvInfo.iState & TFileManagerDriveInfo::EDriveLocked ) )
 {
 aMenuPane.SetItemDimmed( EFileManagerUnlockMemoryCard, ETrue );
 }
+//        if ( !( drvInfo.iState & TFileManagerDriveInfo::EDriveLockable ) )
+//            {
+//            aMenuPane.SetItemDimmed( EFileManagerMemoryCardPassword, ETrue );
+//            }
 if ( !featureManager.IsMmcPassWdSupported() )
 {
+//aMenuPane.SetItemDimmed( EFileManagerMemoryCardPassword, ETrue );
 aMenuPane.SetItemDimmed( EFileManagerUnlockMemoryCard, ETrue );
 }
 #ifdef RD_MULTIPLE_DRIVE
 aMenuPane.SetItemDimmed( EFileManagerFormatMassStorage, ETrue );
 #endif // RD_MULTIPLE_DRIVE
 }
 else
 {
 // No mass storage or memory card item dimming
+//        aMenuPane.SetItemDimmed( EFileManagerMemoryCard, ETrue );
+//        aMenuPane.SetItemDimmed( EFileManagerMemoryCardPassword, ETrue );
 aMenuPane.SetItemDimmed( EFileManagerUnlockMemoryCard, ETrue );
 #ifdef RD_MULTIPLE_DRIVE
 aMenuPane.SetItemDimmed( EFileManagerFormatMassStorage, ETrue );
 #endif // RD_MULTIPLE_DRIVE
 }
+//    CEikListBox& listBox = iContainer->ListBox();
 TBool dimSend( EFalse );
 if ( iContainer->ListBoxSelectionIndexesCount() )
 {
 // Selections in list
 {
 aMenuPane.SetItemDimmed( EFileManagerDetails, ETrue );
 }
 if ( !( drvInfo.iState & TFileManagerDriveInfo::EDrivePresent ) ||
-( drvInfo.iState & TFileManagerDriveInfo::EDriveInUse ) ||
+	 ( ( drvInfo.iState & TFileManagerDriveInfo::EDriveRemote ) &&
-( ( drvInfo.iState & TFileManagerDriveInfo::EDriveRemote ) &&
 !( drvInfo.iState & TFileManagerDriveInfo::EDriveConnected ) ) )
 {
-// Handle unavailable drive or disconnected remote drive
+// Handle unavailable drive OR  disconnected remote drive
 dimSend = ETrue;
 aMenuPane.SetItemDimmed( EFileManagerSort, ETrue );
 aMenuPane.SetItemDimmed( EFileManagerOrganise, ETrue );
-aMenuPane.SetItemDimmed( EFileManagerDelete, ETrue );
+aMenuPane.SetItemDimmed( EFileManagerMark, ETrue );
-if ( aMenuPane.MenuItemExists( EAknCmdMarkingModeEnter, pos ) )
-{
-aMenuPane.SetItemDimmed( EAknCmdMarkingModeEnter, ETrue );
-}
 }
 }
 else if ( iContainer->ListBoxNumberOfItems() )
 {
-// Check whether there is file on the list
+// Check if there is files on the list
 TInt files( iEngine.FilesInFolderL() );
-if ( files == 0 )
+if ( !files )
 {
 dimSend = ETrue;
-if ( aMenuPane.MenuItemExists( EAknCmdMarkingModeEnter, pos ) )
+aMenuPane.SetItemDimmed( EFileManagerMark, ETrue );
-{
-aMenuPane.SetItemDimmed( EAknCmdMarkingModeEnter, ETrue );
-}
 }
 // There is items in list, check selection type
 TUint32 fileType( iEngine.FileTypeL(
 iContainer->ListBoxCurrentItemIndex() ) );
 else
 {
 // List is empty
 aMenuPane.SetItemDimmed( EFileManagerOpen, ETrue );
 aMenuPane.SetItemDimmed( EFileManagerDelete, ETrue );
-if ( aMenuPane.MenuItemExists( EAknCmdMarkingModeEnter, pos ) )
+aMenuPane.SetItemDimmed( EFileManagerMark, ETrue );
-{
-aMenuPane.SetItemDimmed( EAknCmdMarkingModeEnter, ETrue );
-}
 aMenuPane.SetItemDimmed( EFileManagerRename, ETrue );
 aMenuPane.SetItemDimmed( EFileManagerSort, ETrue );
 aMenuPane.SetItemDimmed( EFileManagerSearchSort, ETrue );
 aMenuPane.SetItemDimmed( EFileManagerDetails, ETrue );
 dimSend = ETrue;
 !( drvInfo.iState & TFileManagerDriveInfo::EDriveConnected ) )
 {
 // Handle disconnected remote drive
 aMenuPane.SetItemDimmed( EFileManagerReceiveViaIR, ETrue );
 aMenuPane.SetItemDimmed( EFileManagerOrganise, ETrue );
+//            aMenuPane.SetItemDimmed( EFileManagerDetails, ETrue );
 }
 else if ( !( drvInfo.iState & TFileManagerDriveInfo::EDrivePresent ) ||
 ( drvInfo.iState & (
 TFileManagerDriveInfo::EDriveCorrupted |
 TFileManagerDriveInfo::EDriveLocked ) ) )
 {
 // Handle unavailable drive
+//            aMenuPane.SetItemDimmed( EFileManagerDetails, ETrue );
 aMenuPane.SetItemDimmed( EFileManagerReceiveViaIR, ETrue );
 aMenuPane.SetItemDimmed( EFileManagerOrganise, ETrue );
+//            aMenuPane.SetItemDimmed( EFileManagerMemoryCardPassword, ETrue );
 if ( drvInfo.iState & TFileManagerDriveInfo::EDriveRemovable &&
 !( drvInfo.iState & TFileManagerDriveInfo::EDriveLocked ) )
 {
 aMenuPane.SetItemDimmed( EFileManagerUnlockMemoryCard, ETrue );
 // Handle empty search results and invalid path
 if ( isSearchOn || !iEngine.CurrentDirectory().Length() )
 {
 aMenuPane.SetItemDimmed( EFileManagerReceiveViaIR, ETrue );
 aMenuPane.SetItemDimmed( EFileManagerOrganise, ETrue );
+//                aMenuPane.SetItemDimmed( EFileManagerMemoryCardPassword, ETrue );
+//                aMenuPane.SetItemDimmed( EFileManagerMemoryCard, ETrue );
 aMenuPane.SetItemDimmed( EFileManagerUnlockMemoryCard, ETrue );
+//                aMenuPane.SetItemDimmed( EFileManagerDetails, ETrue );
 }
 else
 {
 // BaflUtils::PathExists does not work for remote drive root dirs.
 if( drvInfo.iState & TFileManagerDriveInfo::EDriveRemote )

branch	RCL_3
changeset 52	40fb776cbfb3
parent 45	6a0ceb387ac7