equal
deleted
inserted
replaced
1000 { |
1000 { |
1001 if ( !iSceneSettingContainer ) |
1001 if ( !iSceneSettingContainer ) |
1002 { |
1002 { |
1003 // Create the scene setting container for video mode. |
1003 // Create the scene setting container for video mode. |
1004 iSceneSettingContainer = CCamShootingModeContainer::NewL( AppUi()->ApplicationRect(), |
1004 iSceneSettingContainer = CCamShootingModeContainer::NewL( AppUi()->ApplicationRect(), |
1005 EFalse, //Notskinned background |
1005 ETrue, //Skinned background |
1006 *this, |
1006 *this, |
1007 ECamControllerVideo, |
1007 ECamControllerVideo, |
1008 iController, |
1008 iController, |
1009 EFalse ); |
1009 EFalse ); |
1010 |
1010 |
1028 // only remove the capture setup menu container after |
1028 // only remove the capture setup menu container after |
1029 // the switch completes successfully |
1029 // the switch completes successfully |
1030 RemoveCaptureSetupMenuContainers(); |
1030 RemoveCaptureSetupMenuContainers(); |
1031 |
1031 |
1032 // Stop the viewfinder as it isn't required for scene settings |
1032 // Stop the viewfinder as it isn't required for scene settings |
1033 //StopViewFinder(); |
1033 StopViewFinder(); |
1034 |
1034 |
1035 } |
1035 } |
1036 |
1036 |
1037 |
1037 |
1038 // --------------------------------------------------------------------------- |
1038 // --------------------------------------------------------------------------- |
1187 if ( iController.IsTouchScreenSupported() ) |
1187 if ( iController.IsTouchScreenSupported() ) |
1188 { |
1188 { |
1189 UpdateToolbarIconsL(); |
1189 UpdateToolbarIconsL(); |
1190 if( aToolbar ) |
1190 if( aToolbar ) |
1191 { |
1191 { |
1192 if ( iEmbedded && appUi->IsSecondCameraEnabled() ) |
1192 if ( iEmbedded /* && appUi->IsSecondCameraEnabled()*/ ) |
1193 { |
1193 { |
1194 aToolbar->SetItemDimmed(ECamCmdNewPhoto, ETrue, ETrue); |
1194 aToolbar->SetItemDimmed(ECamCmdNewPhoto, ETrue, ETrue); |
1195 } |
1195 } |
1196 CAknToolbarExtension* extension = aToolbar->ToolbarExtension(); |
1196 CAknToolbarExtension* extension = aToolbar->ToolbarExtension(); |
1197 if( extension ) |
1197 if( extension ) |