equal
deleted
inserted
replaced
655 SetSoftKeysL( R_AVKON_SOFTKEYS_SELECT_BACK ); |
655 SetSoftKeysL( R_AVKON_SOFTKEYS_SELECT_BACK ); |
656 } |
656 } |
657 // if the view is in capture setup mode |
657 // if the view is in capture setup mode |
658 else if ( iCaptureSetupModeActive ) |
658 else if ( iCaptureSetupModeActive ) |
659 { |
659 { |
660 SetSoftKeysL( R_AVKON_SOFTKEYS_OK_CANCEL__OK ); |
660 SetSoftKeysL( R_CAM_SOFTKEYS_SELECT_CANCEL ); |
661 } |
661 } |
662 // if the view is in scene settings mode |
662 // if the view is in scene settings mode |
663 else if ( iSceneSettingModeActive ) |
663 else if ( iSceneSettingModeActive ) |
664 { |
664 { |
665 // R_AVKON_SOFTKEYS_OPTIONS_BACK |
665 // R_AVKON_SOFTKEYS_OPTIONS_BACK |
|
666 if( !iForceAvkonCBA ) |
|
667 { |
|
668 SetSoftKeysL( R_CAM_SOFTKEYS_SETTINGS_SELECT_BACK__CHANGE_TRANSPARENT ); |
|
669 } |
|
670 else |
|
671 { |
666 SetSoftKeysL( R_CAM_SOFTKEYS_SETTINGS_SELECT_BACK__CHANGE ); //R_CAM_SOFTKEYS_OPTIONS_BACK__CHANGE ); |
672 SetSoftKeysL( R_CAM_SOFTKEYS_SETTINGS_SELECT_BACK__CHANGE ); //R_CAM_SOFTKEYS_OPTIONS_BACK__CHANGE ); |
|
673 } |
667 } |
674 } |
668 else if ( iStandbyModeActive ) |
675 else if ( iStandbyModeActive ) |
669 { |
676 { |
670 if( KErrNone == appui->StandbyStatus() ) |
677 if( KErrNone == appui->StandbyStatus() ) |
671 SetSoftKeysL( R_CAM_SOFTKEYS_OPTIONS_EXIT__CONTINUE ); |
678 SetSoftKeysL( R_CAM_SOFTKEYS_OPTIONS_EXIT__CONTINUE ); |
993 { |
1000 { |
994 if ( !iSceneSettingContainer ) |
1001 if ( !iSceneSettingContainer ) |
995 { |
1002 { |
996 // Create the scene setting container for video mode. |
1003 // Create the scene setting container for video mode. |
997 iSceneSettingContainer = CCamShootingModeContainer::NewL( AppUi()->ApplicationRect(), |
1004 iSceneSettingContainer = CCamShootingModeContainer::NewL( AppUi()->ApplicationRect(), |
|
1005 EFalse, //Notskinned background |
998 *this, |
1006 *this, |
999 ECamControllerVideo, |
1007 ECamControllerVideo, |
1000 iController ); |
1008 iController, |
|
1009 EFalse ); |
|
1010 |
1001 iSceneSettingContainer->DrawableWindow()->SetOrdinalPosition(-1); |
1011 iSceneSettingContainer->DrawableWindow()->SetOrdinalPosition(-1); |
1002 } |
1012 } |
1003 |
1013 |
1004 iSettingModeTitleResourceId = R_CAM_VIDEO_SCENE_SETTING_TITLE; |
1014 iSettingModeTitleResourceId = R_CAM_VIDEO_SCENE_SETTING_TITLE; |
1005 |
1015 |
1018 // only remove the capture setup menu container after |
1028 // only remove the capture setup menu container after |
1019 // the switch completes successfully |
1029 // the switch completes successfully |
1020 RemoveCaptureSetupMenuContainers(); |
1030 RemoveCaptureSetupMenuContainers(); |
1021 |
1031 |
1022 // Stop the viewfinder as it isn't required for scene settings |
1032 // Stop the viewfinder as it isn't required for scene settings |
1023 StopViewFinder(); |
1033 //StopViewFinder(); |
1024 |
1034 |
1025 } |
1035 } |
1026 |
1036 |
1027 |
1037 |
1028 // --------------------------------------------------------------------------- |
1038 // --------------------------------------------------------------------------- |