| branch | RCL_3 |
| changeset 12 | 60626d494346 |
| parent 10 | 1772663c5b4e |
| child 13 | 875fd7f60fdf |
| 10:1772663c5b4e | 12:60626d494346 |
|---|---|
1554 } |
1554 } |
1555 break; |
1555 break; |
1556 } |
1556 } |
1557 case EFormatProcess: |
1557 case EFormatProcess: |
1558 { |
1558 { |
1559 RefreshDriveInfoL(); |
1559 TFileManagerDriveInfo drvInfo; |
1560 DriveInfoAtCurrentPosL( drvInfo ); |
|
1560 if ( aError == KErrNone ) |
1561 if ( aError == KErrNone ) |
1561 { |
1562 { |
1562 #ifdef RD_MULTIPLE_DRIVE |
1563 #ifdef RD_MULTIPLE_DRIVE |
1563 if ( DriveInfo().iState & TFileManagerDriveInfo::EDriveMassStorage ) |
1564 if ( drvInfo.iState & TFileManagerDriveInfo::EDriveMassStorage ) |
1564 { |
1565 { |
1565 FileManagerDlgUtils::ShowInfoNoteL( |
1566 FileManagerDlgUtils::ShowInfoNoteL( |
1566 R_QTN_FMGR_MASS_FORMAT_COMPLETED ); |
1567 R_QTN_FMGR_MASS_FORMAT_COMPLETED ); |
1567 } |
1568 } |
1568 else |
1569 else |
2194 |
2195 |
2195 if ( !done ) |
2196 if ( !done ) |
2196 { |
2197 { |
2197 // User cancelled rename |
2198 // User cancelled rename |
2198 aNewName.Zero(); |
2199 aNewName.Zero(); |
2200 } |
|
2201 else |
|
2202 { |
|
2203 //file server doesn't support the space in the end of the folder/file name |
|
2204 aNewName.TrimRight(); |
|
2199 } |
2205 } |
2200 } |
2206 } |
2201 |
2207 |
2202 if ( iActiveProcess == aOperation && |
2208 if ( iActiveProcess == aOperation && |
2203 ( aOperation == MFileManagerProcessObserver::ECopyProcess || |
2209 ( aOperation == MFileManagerProcessObserver::ECopyProcess || |
4005 } |
4011 } |
4006 else |
4012 else |
4007 { |
4013 { |
4008 pwdGiven = FileManagerDlgUtils::ShowSimplePasswordQueryL( res, oldPwd ); |
4014 pwdGiven = FileManagerDlgUtils::ShowSimplePasswordQueryL( res, oldPwd ); |
4009 } |
4015 } |
4016 |
|
4010 if( pwdGiven ) |
4017 if( pwdGiven ) |
4011 { |
4018 { |
4012 ConvertCharsToPwd( oldPwd, pwd ); |
4019 ConvertCharsToPwd( oldPwd, pwd ); |
4013 if( aRemove ) |
4020 if( aRemove ) |
4014 { |
4021 { |
4021 |
4028 |
4022 if ( err == KErrNone ) |
4029 if ( err == KErrNone ) |
4023 { |
4030 { |
4024 isDone = ETrue; |
4031 isDone = ETrue; |
4025 } |
4032 } |
4033 else if ( err == KErrAccessDenied ) |
|
4034 { |
|
4035 FileManagerDlgUtils::ShowErrorNoteL( resWrong ); |
|
4036 } |
|
4037 else if ( err = KErrNotReady ) |
|
4038 { |
|
4039 isDone = ETrue; |
|
4040 FileManagerDlgUtils::ShowErrorNoteL( R_QTN_MEMC_NOT_AVAILABLE ); |
|
4041 } |
|
4026 else |
4042 else |
4027 { |
4043 { |
4028 FileManagerDlgUtils::ShowErrorNoteL( resWrong ); |
4044 isDone = ETrue; |
4045 FileManagerDlgUtils::ShowErrorNoteL( R_QTN_CRITICAL_ERROR ); |
|
4029 } |
4046 } |
4030 } |
4047 } |
4031 else |
4048 else |
4032 { |
4049 { |
4033 err = KErrCancel; |
4050 err = KErrCancel; |
4034 isDone = ETrue; |
4051 isDone = ETrue; |
4035 } |
4052 } |
4036 } |
4053 } |
4054 |
|
4037 if ( text ) |
4055 if ( text ) |
4038 { |
4056 { |
4039 CleanupStack::PopAndDestroy( text ); |
4057 CleanupStack::PopAndDestroy( text ); |
4040 } |
4058 } |
4041 return err; |
4059 return err; |