camerauis/cameraapp/generic/src/CamStillPreCaptureView.cpp
branchRCL_3
changeset 25 bf64cebf4673
parent 20 38fb6f7eacd5
child 27 53c8aa5d97a3
--- a/camerauis/cameraapp/generic/src/CamStillPreCaptureView.cpp	Tue Apr 27 16:19:06 2010 +0300
+++ b/camerauis/cameraapp/generic/src/CamStillPreCaptureView.cpp	Tue May 11 15:56:11 2010 +0300
@@ -698,7 +698,7 @@
   // if the view is in capture setup mode
   else if ( iCaptureSetupModeActive )
       {
-      SetSoftKeysL( R_CAM_SOFTKEYS_SELECT_CANCEL );
+      SetSoftKeysL( R_CAM_SOFTKEYS_SETTINGS_SELECT_BACK__CHANGE_TRANSPARENT );
       }
   // if the view is in scene settings mode
   else if ( iSceneSettingModeActive )
@@ -2104,7 +2104,7 @@
             TFileName iconFileName;
             CamUtility::ResourceFileName( iconFileName );     
 
-            if ( grid == ECamViewfinderGridOn )
+            if ( grid == ECamViewfinderGridOff )
                 {
                 SetIconL(
                     button,
@@ -2211,7 +2211,7 @@
                 MAknsSkinInstance* skinInstance = AknsUtils::SkinInstance();
                 TFileName iconFileName;
                 CamUtility::ResourceFileName( iconFileName );  
-                  if ( face == ECamSettOn )
+                  if ( face == ECamSettOff )
                       {
                       PRINT( _L( "Camera => UpdateFaceTrackingIconL on" ) ); 
                       SetIconL (