equal
deleted
inserted
replaced
339 // CCamCaptureSetupViewBase::CCamCaptureSetupViewBase |
339 // CCamCaptureSetupViewBase::CCamCaptureSetupViewBase |
340 // C++ constructor |
340 // C++ constructor |
341 // --------------------------------------------------------------------------- |
341 // --------------------------------------------------------------------------- |
342 // |
342 // |
343 CCamCaptureSetupViewBase::CCamCaptureSetupViewBase( CCamAppController& aController ) |
343 CCamCaptureSetupViewBase::CCamCaptureSetupViewBase( CCamAppController& aController ) |
344 : CCamViewBase( aController ),iForceAvkonCBA(EFalse) |
344 : CCamViewBase( aController ),iForceAvkonCBA(EFalse), |
|
345 iCaptureSetupModeActive( EFalse ) |
345 { |
346 { |
346 } |
347 } |
347 |
348 |
348 // --------------------------------------------------------------------------- |
349 // --------------------------------------------------------------------------- |
349 // CCamCaptureSetupViewBase::CreateCaptureSetupControlHandlerL |
350 // CCamCaptureSetupViewBase::CreateCaptureSetupControlHandlerL |
1055 // Sets the iSceneSettingModeActive flag |
1056 // Sets the iSceneSettingModeActive flag |
1056 // --------------------------------------------------------------------------- |
1057 // --------------------------------------------------------------------------- |
1057 // |
1058 // |
1058 void CCamCaptureSetupViewBase::SetSceneSettingMode(TBool aActive) |
1059 void CCamCaptureSetupViewBase::SetSceneSettingMode(TBool aActive) |
1059 { |
1060 { |
|
1061 TUid view = Id(); |
|
1062 TBool userSceneActive = ( view.iUid == ECamViewIdPhotoUserSceneSetup ); |
1060 // This should be the only place iSceneSettingModeActive is set! |
1063 // This should be the only place iSceneSettingModeActive is set! |
1061 // We need to inform the AppUi |
1064 // We need to inform the AppUi |
1062 iSceneSettingModeActive = aActive; |
1065 iSceneSettingModeActive = aActive; |
1063 |
1066 |
1064 CCamAppUi* appUi = static_cast<CCamAppUi*>(AppUi()); //static_cast<CCamAppUiBase*>( AppUi() ); |
1067 CCamAppUi* appUi = static_cast<CCamAppUi*>(AppUi()); //static_cast<CCamAppUiBase*>( AppUi() ); |
1067 { |
1070 { |
1068 if ( aActive ) |
1071 if ( aActive ) |
1069 { |
1072 { |
1070 appUi->SetPreCaptureMode(ECamPreCapSceneSetting); |
1073 appUi->SetPreCaptureMode(ECamPreCapSceneSetting); |
1071 iChangeButtonPressed = EFalse; |
1074 iChangeButtonPressed = EFalse; |
1072 } |
1075 } // userSceneActive to avoit toolbar flicker after back from scene setting |
1073 else if ( iChangeButtonPressed ) |
1076 else if ( iChangeButtonPressed || userSceneActive ) |
1074 { |
1077 { |
1075 // transfering to user scene setup view |
1078 // transfering to user scene setup view |
1076 appUi->SetPreCaptureMode(ECamPreCapSceneSetting); |
1079 appUi->SetPreCaptureMode(ECamPreCapSceneSetting); |
1077 } |
1080 } |
1078 else |
1081 else |
1116 void CCamCaptureSetupViewBase::SetCaptureSetupModeActive(TBool aActive) |
1119 void CCamCaptureSetupViewBase::SetCaptureSetupModeActive(TBool aActive) |
1117 { |
1120 { |
1118 // This should be the only place iCaptureSetupModeActive is set! |
1121 // This should be the only place iCaptureSetupModeActive is set! |
1119 // We need to inform the AppUi |
1122 // We need to inform the AppUi |
1120 iCaptureSetupModeActive = aActive; |
1123 iCaptureSetupModeActive = aActive; |
1121 |
1124 PRINT1( _L("Camera <> CCamCaptureSetupViewBase::SetCaptureSetupModeActive iCaptureSetupModeActive=%d"),iCaptureSetupModeActive); |
1122 CCamAppUiBase* appUi = static_cast<CCamAppUiBase*>( AppUi() ); |
1125 CCamAppUiBase* appUi = static_cast<CCamAppUiBase*>( AppUi() ); |
1123 |
1126 |
1124 if ( appUi) |
1127 if ( appUi) |
1125 { |
1128 { |
1126 if ( aActive ) |
1129 if ( aActive ) |