--- a/camerauis/cameraxui/cxengine/conf/camerax.confml	Thu May 13 21:30:19 2010 +0300
+++ b/camerauis/cameraxui/cxengine/conf/camerax.confml	Thu Jul 15 01:55:05 2010 +0300
@@ -27,26 +27,6 @@
       </desc>
     </setting>
 
-    <setting ref="StillShowCapturedCr" name="Show Captured Image" type="selection">
-      <desc>StillShowCapturedCr defines setting in Image settings.
-            If disabled, post-capture view is not shown after capturing an image.
-      </desc>
-      <option name="On" value="-1"/>
-      <option name="2 seconds" value="2000"/>
-      <option name="10 seconds" value="10000"/>
-      <option name="Off" value="0"/>
-    </setting>
-    
-    <setting ref="VideoShowCapturedCr" name="Show Captured Video" type="selection">
-      <desc>VideoShowCapturedCr defines setting in Image settings.
-            If disabled, post-capture view is not shown after capturing an video.
-      </desc>
-      <option name="On" value="-1"/>
-      <option name="2 seconds" value="2000"/>
-      <option name="10 seconds" value="10000"/>
-      <option name="Off" value="0"/>
-    </setting>
-
     <setting ref="ImageQualityCr" name="Image quality" type="int">
       <desc>ImageQualityCr defines the quality currently in use in still mode.
       </desc>
@@ -63,6 +43,29 @@
             0 indicates "video recording with sound."
       </desc>
     </setting>
+
+    <setting ref="GeoTaggingDisclaimerCr" name="Geotagging first time use notification" type="int">
+      <desc>GeoTaggingDisclaimerCr defines whether we have to show first time use note for geotagging
+            when we first start the camera.
+      </desc>
+    </setting>
+
+    <setting ref="CameraModeCr" name="Camera mode" type="int">
+      <desc> Current mode of the camera - still or video.</desc>
+    </setting>
+    <setting ref="FlashModeStillCr" name="Video quality" type="int">
+      <desc>VideoQualityCr defines the quality currently in use in video mode.
+      </desc>
+    </setting>
+    <setting ref="SceneModeStillCr" name="Scene mode still" type="string">
+      <desc>Scene mode setting in still mode.
+      </desc>
+    </setting>    
+    <setting ref="SceneModeVideoCr" name="Scene mode video" type="string">
+      <desc> Scene mode setting in video mode.
+      </desc>
+    </setting>
+    
   </feature>
 
   <data>
@@ -76,7 +79,15 @@
       <ImageQualityCr>1</ImageQualityCr>
       <VideoQualityCr>0</VideoQualityCr>
       <AudioMuteCr>0</AudioMuteCr>
-    </CxSettingsCrUid>
+      <GeoTaggingCr>1</GeoTaggingCr>
+      <FacetrackingCr>1</FacetrackingCr>
+      <CaptureSoundAlwaysOnCr>0</CaptureSoundAlwaysOnCr>
+      <GeoTaggingDisclaimerCr>1</GeoTaggingDisclaimerCr>
+      <CameraModeCr>0</CameraModeCr>
+      <FlashModeStillCr>0</FlashModeStillCr>
+      <SceneModeStillCr>image_scene_auto</SceneModeStillCr>
+      <SceneModeVideoCr>video_scene_auto</SceneModeVideoCr>
+   </CxSettingsCrUid>
   </data>
 
   <rfs>
@@ -88,7 +99,15 @@
       <StillShowCapturedCr>true</StillShowCapturedCr>
       <VideoShowCapturedCr>true</VideoShowCapturedCr>
       <AudioMuteCr>true</AudioMuteCr>
-    </CxSettingsCrUid>
+      <GeoTaggingCr>true</GeoTaggingCr>
+      <FacetrackingCr>true</FacetrackingCr>
+      <CaptureSoundAlwaysOnCr>true</CaptureSoundAlwaysOnCr>
+      <GeoTaggingDisclaimerCr>true</GeoTaggingDisclaimerCr>
+      <CameraModeCr>true</CameraModeCr>
+      <FlashModeStillCr>true</FlashModeStillCr>
+      <SceneModeStillCr>true</SceneModeStillCr>
+      <SceneModeVideoCr>true</SceneModeVideoCr>
+   </CxSettingsCrUid>
   </rfs>
 
 </configuration>