equal
deleted
inserted
replaced
2506 } |
2506 } |
2507 // ----------------------------------------------------- |
2507 // ----------------------------------------------------- |
2508 case ECamEventSaveLocationChanged: |
2508 case ECamEventSaveLocationChanged: |
2509 { |
2509 { |
2510 PRINT( _L( "Camera <> case ECamEventSaveLocationChanged" ) ) |
2510 PRINT( _L( "Camera <> case ECamEventSaveLocationChanged" ) ) |
|
2511 DismissMemoryNoteL(); |
2511 if ( IsMMCRemovedNotePending() && |
2512 if ( IsMMCRemovedNotePending() && |
2512 ( CamUtility::MemoryCardStatus() != ECamMemoryCardNotInserted ) ) |
2513 ( CamUtility::MemoryCardStatus() != ECamMemoryCardNotInserted ) ) |
2513 { |
2514 { |
2514 iMMCRemoveNoteRequired = EFalse; |
2515 iMMCRemoveNoteRequired = EFalse; |
2515 iMMCRemoveNoteRequiredOnCapture = EFalse; |
2516 iMMCRemoveNoteRequiredOnCapture = EFalse; |
2516 } |
2517 } |
2517 if ( IsDirectViewfinderActive() ) |
2518 if ( IsDirectViewfinderActive() ) |
2518 { |
2519 { |
2519 TRAP_IGNORE( HandleCommandL( ECamCmdRedrawScreen ) ); |
2520 TRAP_IGNORE( HandleCommandL( ECamCmdRedrawScreen ) ); |
|
2521 } |
|
2522 if ( ECamViewStatePostCapture == iViewState ) |
|
2523 { |
|
2524 iTargetViewState = ECamViewStatePreCapture; |
2520 } |
2525 } |
2521 break; |
2526 break; |
2522 } |
2527 } |
2523 |
2528 |
2524 // ----------------------------------------------------- |
2529 // ----------------------------------------------------- |
4354 CleanupStack::PopAndDestroy(text); |
4359 CleanupStack::PopAndDestroy(text); |
4355 } |
4360 } |
4356 else if(IsMemoryFullOrUnavailable( storeToCheck )) |
4361 else if(IsMemoryFullOrUnavailable( storeToCheck )) |
4357 { |
4362 { |
4358 HBufC* text = StringLoader::LoadLC(R_NOTE_TEXT_MEMORY_FULL); |
4363 HBufC* text = StringLoader::LoadLC(R_NOTE_TEXT_MEMORY_FULL); |
4359 CAknStaticNoteDialog* note = new( ELeave ) CAknStaticNoteDialog; |
4364 iMemoryNote = new( ELeave ) CAknStaticNoteDialog; |
4360 note->PrepareLC( R_CAM_OOM_NOTE_OK_CANCEL); |
4365 iMemoryNote->PrepareLC( R_CAM_OOM_NOTE_OK_CANCEL); |
4361 note->SetTextL( *text ); |
4366 iMemoryNote->SetTextL( *text ); |
4362 iController.StopIdleTimer(); |
4367 iController.StopIdleTimer(); |
4363 TInt ret = note->RunDlgLD(); |
4368 TInt ret = iMemoryNote->RunDlgLD(); |
|
4369 iMemoryNote = NULL; |
4364 CleanupStack::PopAndDestroy( text ); |
4370 CleanupStack::PopAndDestroy( text ); |
4365 if(EAknSoftkeyOk == ret) |
4371 if(EAknSoftkeyOk == ret) |
4366 { |
4372 { |
4367 //when memoryDialog showed, redraw background |
4373 //when memoryDialog showed, redraw background |
4368 if ( IsDirectViewfinderActive() ) |
4374 if ( IsDirectViewfinderActive() ) |
4410 CAknMemorySelectionDialogMultiDrive::NewL( |
4416 CAknMemorySelectionDialogMultiDrive::NewL( |
4411 ECFDDialogTypeSelect, |
4417 ECFDDialogTypeSelect, |
4412 R_CAM_MEMORY_SELECT_DIALOG, |
4418 R_CAM_MEMORY_SELECT_DIALOG, |
4413 EFalse, |
4419 EFalse, |
4414 supportedMemTypes ); |
4420 supportedMemTypes ); |
|
4421 CleanupStack::PushL(memoryDialog); |
4415 TDriveNumber driveNumber = static_cast<TDriveNumber>(KErrNotFound); |
4422 TDriveNumber driveNumber = static_cast<TDriveNumber>(KErrNotFound); |
4416 CAknCommonDialogsBase::TReturnKey result = |
4423 CAknCommonDialogsBase::TReturnKey result = |
4417 memoryDialog->ExecuteL( driveNumber ); |
4424 memoryDialog->ExecuteL( driveNumber ); |
4418 |
4425 CleanupStack::PopAndDestroy(memoryDialog); |
4419 if ( result != CAknCommonDialogsBase::TReturnKey( |
4426 if ( result != CAknCommonDialogsBase::TReturnKey( |
4420 CAknCommonDialogsBase::ERightSoftkey) ) |
4427 CAknCommonDialogsBase::ERightSoftkey) ) |
4421 { |
4428 { |
4422 DriveInfo::TDefaultDrives memVal = |
4429 DriveInfo::TDefaultDrives memVal = |
4423 static_cast<DriveInfo::TDefaultDrives>( |
4430 static_cast<DriveInfo::TDefaultDrives>( |