equal
deleted
inserted
replaced
1 /* |
1 /* |
2 * Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies). |
2 * Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). |
3 * All rights reserved. |
3 * All rights reserved. |
4 * This component and the accompanying materials are made available |
4 * This component and the accompanying materials are made available |
5 * under the terms of "Eclipse Public License v1.0" |
5 * under the terms of "Eclipse Public License v1.0" |
6 * which accompanies this distribution, and is available |
6 * which accompanies this distribution, and is available |
7 * at the URL "http://www.eclipse.org/legal/epl-v10.html". |
7 * at the URL "http://www.eclipse.org/legal/epl-v10.html". |
158 iController.CancelPreviewChangesL(); |
158 iController.CancelPreviewChangesL(); |
159 // fallthrough to exit CaptureSetup mode |
159 // fallthrough to exit CaptureSetup mode |
160 } |
160 } |
161 else if ( iInfoListBoxActive ) |
161 else if ( iInfoListBoxActive ) |
162 { |
162 { |
|
163 iController.CancelPreviewChangesL(); |
163 ExitAllModesL(); |
164 ExitAllModesL(); |
164 break; |
165 break; |
165 } |
166 } |
166 else if ( iSceneSettingModeActive ) |
167 else if ( iSceneSettingModeActive ) |
167 { |
168 { |
682 // order to return the correct CBA |
683 // order to return the correct CBA |
683 SetSceneSettingMode(ETrue); |
684 SetSceneSettingMode(ETrue); |
684 |
685 |
685 appUi->SetToolbarVisibility(); |
686 appUi->SetToolbarVisibility(); |
686 |
687 |
|
688 iForceAvkonCBA = ETrue; |
687 UpdateCbaL(); |
689 UpdateCbaL(); |
688 SetTitlePaneTextL(); |
690 SetTitlePaneTextL(); |
689 appUi->PushDefaultNaviPaneL(); |
691 appUi->PushDefaultNaviPaneL(); |
690 CleanupStack::Pop(); // CleanupSceneSettingContainer |
692 CleanupStack::Pop(); // CleanupSceneSettingContainer |
691 // after all leaving functions have completed |
693 // after all leaving functions have completed |
841 // Exit scene setup mode |
843 // Exit scene setup mode |
842 // --------------------------------------------------------------------------- |
844 // --------------------------------------------------------------------------- |
843 // |
845 // |
844 void CCamCaptureSetupViewBase::ExitSceneSettingModeL() |
846 void CCamCaptureSetupViewBase::ExitSceneSettingModeL() |
845 { |
847 { |
846 PRINT( _L( "Camera => CCamCaptureSetupViewBase::ExitSceneSettingModeL" ) ); |
848 PRINT( _L( "Camera => CCamCaptureSetupViewBase::ExitSceneSettingModeL" ) ); |
847 |
849 iForceAvkonCBA = EFalse; |
848 if ( !iSceneSettingModeActive ) |
850 if ( !iSceneSettingModeActive ) |
849 { |
851 { |
850 AppUi()->RemoveFromStack( iSceneSettingContainer ); |
852 AppUi()->RemoveFromStack( iSceneSettingContainer ); |
851 |
853 |
852 if ( iSceneSettingContainer ) |
854 if ( iSceneSettingContainer ) |
853 { |
855 { |
854 delete iSceneSettingContainer; |
856 delete iSceneSettingContainer; |
855 iSceneSettingContainer = NULL; |
857 iSceneSettingContainer = NULL; |
917 } |
919 } |
918 |
920 |
919 // Cleanup the view correctly if a leave occurs |
921 // Cleanup the view correctly if a leave occurs |
920 CleanupStack::PushL( TCleanupItem( CleanupExit, this ) ); |
922 CleanupStack::PushL( TCleanupItem( CleanupExit, this ) ); |
921 AppUi()->AddToStackL( *this, iContainer ); |
923 AppUi()->AddToStackL( *this, iContainer ); |
|
924 iController.SetViewfinderWindowHandle( &iContainer->Window() ); |
922 PRINT( _L( "Camera => CCamCaptureSetupViewBase::ExitInfoListBoxL removing iInfoListBoxContainer" ) ); |
925 PRINT( _L( "Camera => CCamCaptureSetupViewBase::ExitInfoListBoxL removing iInfoListBoxContainer" ) ); |
923 AppUi()->RemoveFromStack( iInfoListBoxContainer ); |
926 AppUi()->RemoveFromStack( iInfoListBoxContainer ); |
924 delete iInfoListBoxContainer; |
927 delete iInfoListBoxContainer; |
925 iInfoListBoxContainer = NULL; |
928 iInfoListBoxContainer = NULL; |
926 PRINT( _L( "Camera => CCamCaptureSetupViewBase::ExitInfoListBoxL removed iInfoListBoxContainer" ) ); |
929 PRINT( _L( "Camera => CCamCaptureSetupViewBase::ExitInfoListBoxL removed iInfoListBoxContainer" ) ); |