--- a/camerauis/cameraxui/cxengine/conf/camerax.confml	Wed Jun 23 17:59:54 2010 +0300
+++ b/camerauis/cameraxui/cxengine/conf/camerax.confml	Tue Jul 06 14:04:02 2010 +0300
@@ -43,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>
@@ -56,10 +79,15 @@
       <ImageQualityCr>1</ImageQualityCr>
       <VideoQualityCr>0</VideoQualityCr>
       <AudioMuteCr>0</AudioMuteCr>
-      <GeoTaggingCr>0</GeoTaggingCr>
+      <GeoTaggingCr>1</GeoTaggingCr>
       <FacetrackingCr>1</FacetrackingCr>
       <CaptureSoundAlwaysOnCr>0</CaptureSoundAlwaysOnCr>
-    </CxSettingsCrUid>
+      <GeoTaggingDisclaimerCr>1</GeoTaggingDisclaimerCr>
+      <CameraModeCr>0</CameraModeCr>
+      <FlashModeStillCr>0</FlashModeStillCr>
+      <SceneModeStillCr>image_scene_auto</SceneModeStillCr>
+      <SceneModeVideoCr>video_scene_auto</SceneModeVideoCr>
+   </CxSettingsCrUid>
   </data>
 
   <rfs>
@@ -74,7 +102,12 @@
       <GeoTaggingCr>true</GeoTaggingCr>
       <FacetrackingCr>true</FacetrackingCr>
       <CaptureSoundAlwaysOnCr>true</CaptureSoundAlwaysOnCr>
-    </CxSettingsCrUid>
+      <GeoTaggingDisclaimerCr>true</GeoTaggingDisclaimerCr>
+      <CameraModeCr>true</CameraModeCr>
+      <FlashModeStillCr>true</FlashModeStillCr>
+      <SceneModeStillCr>true</SceneModeStillCr>
+      <SceneModeVideoCr>true</SceneModeVideoCr>
+   </CxSettingsCrUid>
   </rfs>
 
 </configuration>