--- a/camerauis/cameraxui/cxui/layouts/view_still_precapture.docml	Fri May 14 15:40:46 2010 +0300
+++ b/camerauis/cameraxui/cxui/layouts/view_still_precapture.docml	Thu May 27 12:43:29 2010 +0300
@@ -14,18 +14,9 @@
         <string name="settingskey" value="still_showcaptured"/>
         <string locid="txt_cam_opt_show_captured_image" name="text" value="Show captured image"/>
     </object>
-    <object name="cxui_action_capturetone" type="HbAction">
-        <string locid="txt_cam_opt_capture_tone" name="text" value="Capture tone"/>
-    </object>
-    <object name="cxui_action_imagerotation" type="HbAction">
-        <string locid="txt_cam_opt_image_rotation" name="text" value="Image rotation"/>
-    </object>
     <object name="cxui_action_setdefaultscenemode" type="HbAction">
         <string locid="txt_cam_opt_set_as_default_scene_mode" name="text" value="Set as default scene mode"/>
     </object>
-    <object name="cxui_action_restore" type="HbAction">
-        <string locid="txt_cam_opt_restore_settings" name="text" value="Restore settings"/>
-    </object>
     <object name="cxui_action_settings" type="HbAction">
         <string locid="txt_cam_opt_camera_settings" name="text" value="Camera settings"/>
     </object>
@@ -33,9 +24,6 @@
         <string name="settingskey" value="imageQuality"/>
         <string locid="txt_cam_opt_image_quality" name="text" value="Image quality"/>
     </object>
-    <object name="cxui_action_default_image_name" type="HbAction">
-        <string locid="txt_cam_opt_default_image_name" name="text" value="Default image name"/>
-    </object>
     <object name="cxui_action_capture" type="HbAction">
         <icon iconName="qtg_mono_capture" name="icon"/>
     </object>
@@ -206,12 +194,8 @@
             </widget>
             <enums name="titleBarFlags" value="TitleBarFloating|TitleBarTransparent"/>
         </widget>
-        <connect receiver="still_capture_view" sender="cxui_action_capturetone" signal="triggered(bool)" slot="launchNotSupportedNotification()"/>
-        <connect receiver="still_capture_view" sender="cxui_action_imagerotation" signal="triggered(bool)" slot="launchNotSupportedNotification()"/>
         <connect receiver="still_capture_view" sender="cxui_action_setdefaultscenemode" signal="triggered(bool)" slot="launchNotSupportedNotification()"/>
-        <connect receiver="still_capture_view" sender="cxui_action_restore" signal="triggered(bool)" slot="launchNotSupportedNotification()"/>
         <connect receiver="still_capture_view" sender="cxui_action_image_quality" signal="triggered(bool)" slot="launchSetting()"/>
-        <connect receiver="still_capture_view" sender="cxui_action_default_image_name" signal="triggered(bool)" slot="launchNotSupportedNotification()"/>
         <connect receiver="still_capture_view" sender="still_view_menu" signal="aboutToShow()" slot="disableControlsTimeout()"/>
         <connect receiver="still_capture_view" sender="still_view_menu" signal="aboutToHide()" slot="hideControls()"/>
         <connect receiver="still_capture_view" sender="cxui_action_goto_photos" signal="triggered(bool)" slot="launchPhotosApp()"/>
@@ -220,11 +204,11 @@
         <connect receiver="still_capture_view" sender="cxui_action_stillpostcapture" signal="triggered(bool)" slot="launchSetting()"/>
         <connect receiver="still_capture_view" sender="cxui_action_goto_2_camera" signal="triggered(bool)" slot="requestCameraSwitch()"/>
         <connect receiver="still_capture_view" sender="zoom" signal="valueChanged(int)" slot="zoomTo(int)"/>
-        <connect receiver="still_capture_view" sender="cxui_action_capture" signal="triggered(bool)" slot="capture()"/>
+        <connect receiver="still_capture_view" sender="cxui_action_capture" signal="triggered(bool)" slot="focusAndCapture()"/>
         <connect receiver="still_capture_view" sender="cxui_action_goto_video" signal="triggered(bool)" slot="goToVideo()"/>
         <connect receiver="still_capture_view" sender="cxui_action_goto_video" signal="triggered(bool)" slot="hideControls()"/>
         <connect receiver="still_capture_view" sender="cxui_action_flash" signal="triggered(bool)" slot="launchSetting()"/>
-        <connect receiver="still_capture_view" sender="cxui_action_scenemodes" signal="triggered(bool)" slot="launchNotSupportedNotification()"/>
+        <connect receiver="still_capture_view" sender="cxui_action_scenemodes" signal="triggered(bool)" slot="launchSceneModesPopup()"/>
     </section>
     <section name="still_standalone_mode">
         <widget name="still_view_menu" role="HbView:menu" type="HbMenu">
@@ -235,12 +219,8 @@
                 <string locid="txt_cam_opt_general_settings" name="title" value="General settings"/>
                 <ref object="cxui_action_stillpostcapture" role="HbMenu:addAction"/>
                 <ref object="cxui_action_image_quality" role="HbMenu:addAction"/>
-                <ref object="cxui_action_default_image_name" role="HbMenu:addAction"/>
-                <ref object="cxui_action_capturetone" role="HbMenu:addAction"/>
-                <ref object="cxui_action_imagerotation" role="HbMenu:addAction"/>
             </widget>
             <ref object="cxui_action_setdefaultscenemode" role="HbMenu:addAction"/>
-            <ref object="cxui_action_restore" role="HbMenu:addAction"/>
         </widget>
     </section>
     <section name="still_embedded_mode">
@@ -250,10 +230,7 @@
             <widget name="still_submenu_general" role="HbMenu:menu" type="HbMenu">
                 <string locid="txt_cam_opt_general_settings" name="title" value="General settings"/>
                 <ref object="cxui_action_image_quality" role="HbMenu:addAction"/>
-                <ref object="cxui_action_default_image_name" role="HbMenu:addAction"/>
-                <ref object="cxui_action_imagerotation" role="HbMenu:addAction"/>
             </widget>
-            <ref object="cxui_action_restore" role="HbMenu:addAction"/>
         </widget>
     </section>
     <metadata activeUIState="still_standalone_mode" display="NHD landscape" unit="un">