camerauis/cameraapp/generic/common/src/CamUtility.cpp
branchRCL_3
changeset 16 d486e5e3cc9a
parent 12 8c55c525d5d7
child 20 38fb6f7eacd5
equal deleted inserted replaced
12:8c55c525d5d7 16:d486e5e3cc9a
     1 /*
     1 /*
     2 * Copyright (c) 2007-2009 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".
  1027   switch ( aKey )
  1027   switch ( aKey )
  1028     {     
  1028     {     
  1029     // Resource ids for User Scene setup items  
  1029     // Resource ids for User Scene setup items  
  1030     case ECamPsiUserSceneResourceIds:
  1030     case ECamPsiUserSceneResourceIds:
  1031       {
  1031       {
       
  1032       User::LeaveIfError( aArray.Append( R_CAM_PHOTO_USER_SCENE_SETUP_LIST_SET_USER_DEFAULT ) );
  1032       User::LeaveIfError( aArray.Append( R_CAM_PHOTO_USER_SCENE_SETUP_LIST_SCENEBASE_DATA    ) );
  1033       User::LeaveIfError( aArray.Append( R_CAM_PHOTO_USER_SCENE_SETUP_LIST_SCENEBASE_DATA    ) );
  1033       if ( configManager->IsFlashModeSupported() )
  1034       if ( configManager->IsFlashModeSupported() )
  1034           User::LeaveIfError( aArray.Append( R_CAM_PHOTO_USER_SCENE_SETUP_LIST_FLASH_DATA ) );
  1035           User::LeaveIfError( aArray.Append( R_CAM_PHOTO_USER_SCENE_SETUP_LIST_FLASH_DATA ) );
  1035       if ( configManager->IsWhiteBalanceFeatureSupported() )
  1036       if ( configManager->IsWhiteBalanceFeatureSupported() )
  1036           User::LeaveIfError( aArray.Append( 
  1037           User::LeaveIfError( aArray.Append( 
  1056           User::LeaveIfError( aArray.Append( 
  1057           User::LeaveIfError( aArray.Append( 
  1057                                     R_CAM_PHOTO_USER_SCENE_SETUP_LIST_IMAGESHARPNESS_DATA ) );
  1058                                     R_CAM_PHOTO_USER_SCENE_SETUP_LIST_IMAGESHARPNESS_DATA ) );
  1058       
  1059       
  1059       if ( configManager->IsContrastSupported() )
  1060       if ( configManager->IsContrastSupported() )
  1060           User::LeaveIfError( aArray.Append( R_CAM_PHOTO_USER_SCENE_SETUP_LIST_CONTRAST_DATA ) );
  1061           User::LeaveIfError( aArray.Append( R_CAM_PHOTO_USER_SCENE_SETUP_LIST_CONTRAST_DATA ) );
  1061       
  1062          
  1062       User::LeaveIfError( aArray.Append( R_CAM_PHOTO_USER_SCENE_SETUP_LIST_SET_USER_DEFAULT ) ); 
       
  1063             
       
  1064       User::LeaveIfError( aArray.Append( R_CAM_PHOTO_USER_SCENE_SETUP_LIST_RESET_DATA ) );
  1063       User::LeaveIfError( aArray.Append( R_CAM_PHOTO_USER_SCENE_SETUP_LIST_RESET_DATA ) );
  1065       break;
  1064       break;
  1066       }
  1065       }
  1067     // -----------------------------------------------------
  1066     // -----------------------------------------------------
  1068     default:
  1067     default: