--- a/camerauis/cameraxui/cxui/layouts/view_still_precapture.docml	Thu Jul 15 01:44:30 2010 +0300
+++ b/camerauis/cameraxui/cxui/layouts/view_still_precapture.docml	Thu Jul 15 01:46:05 2010 +0300
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hbdocument context="CxuiStillPrecaptureView" version="1.0">
+<hbdocument context="CxuiStillPrecaptureView" version="1.1">
     <object name="cxui_action_goto_2_camera" type="HbAction">
         <string name="text" value="Go to 2nd camera"/>
     </object>
@@ -81,7 +81,6 @@
         </widget>
         <string name="title" value="Camera"/>
         <bool name="contentFullScreen" value="TRUE"/>
-        <enums name="titleBarFlags" value="TitleBarHidden|TitleBarTransparent"/>
     </widget>
     <section name="still_capture_with_widgets">
         <widget name="still_capture_view" type="HbView">
@@ -93,14 +92,14 @@
                     <sizehint type="PREFERRED" width="var(hb-param-widget-toolbar-height)"/>
                     <enums name="orientation" value="Vertical"/>
                     <bool name="visible" value="TRUE"/>
-                    <ref object="cxui_action_capture" role="HbToolBar:addAction"/>
-                    <ref object="cxui_action_flash" role="HbToolBar:addAction"/>
-                    <ref object="cxui_action_scenemodes" role="HbToolBar:addAction"/>
-                    <ref object="cxui_action_goto_video" role="HbToolBar:addAction"/>
+                    <ref object="cxui_action_capture" role="HbWidget:addAction"/>
+                    <ref object="cxui_action_flash" role="HbWidget:addAction"/>
+                    <ref object="cxui_action_scenemodes" role="HbWidget:addAction"/>
+                    <ref object="cxui_action_goto_video" role="HbWidget:addAction"/>
                 </widget>
                 <widget name="zoom" type="HbSlider">
                     <real name="z" value="2"/>
-                    <sizehint height="40un" type="PREFERRED"/>
+                    <sizehint height="40un" type="PREFERRED" width="9un"/>
                     <enums name="orientation" value="Vertical"/>
                     <bool name="visible" value="FALSE"/>
                 </widget>
@@ -121,6 +120,8 @@
                     <widget name="selftimer_button_container" type="HbWidget">
                         <widget name="still_selftimer_start_button" type="HbPushButton">
                             <real name="z" value="5"/>
+                            <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0"/>
+                            <sizehint type="FIXED" width="20un"/>
                             <string locid="txt_cam_button_start" name="text" value="Start"/>
                             <bool name="visible" value="TRUE"/>
                             <string name="state" value="normal"/>
@@ -128,6 +129,8 @@
                         </widget>
                         <widget name="still_selftimer_cancel_button" type="HbPushButton">
                             <real name="z" value="4"/>
+                            <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0"/>
+                            <sizehint type="FIXED" width="20un"/>
                             <string locid="txt_cam_button_cancel" name="text" value="Cancel"/>
                             <bool name="visible" value="TRUE"/>
                             <string name="state" value="normal"/>
@@ -192,7 +195,6 @@
                     <anchoritem dst="still_precapture_selftimer_container" dstEdge="CENTERV" spacing="0" src="" srcEdge="CENTERV"/>
                 </layout>
             </widget>
-            <enums name="titleBarFlags" value="TitleBarFloating|TitleBarTransparent"/>
         </widget>
         <connect receiver="still_capture_view" sender="cxui_action_setdefaultscenemode" signal="triggered(bool)" slot="launchNotSupportedNotification()"/>
         <connect receiver="still_capture_view" sender="cxui_action_image_quality" signal="triggered(bool)" slot="launchSetting()"/>
@@ -208,32 +210,32 @@
         <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="launchSceneModesPopup()"/>
+        <connect receiver="still_capture_view" sender="cxui_action_scenemodes" signal="triggered(bool)" slot="launchScenesView()"/>
     </section>
     <section name="still_standalone_mode">
         <widget name="still_view_menu" role="HbView:menu" type="HbMenu">
-            <ref object="cxui_action_goto_photos" role="HbMenu:addAction"/>
-            <ref object="cxui_action_self_timer" role="HbMenu:addAction"/>
-            <ref object="cxui_action_settings" role="HbMenu:addAction"/>
+            <ref object="cxui_action_goto_photos" role="HbWidget:addAction"/>
+            <ref object="cxui_action_self_timer" role="HbWidget:addAction"/>
+            <ref object="cxui_action_settings" role="HbWidget:addAction"/>
             <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_stillpostcapture" role="HbMenu:addAction"/>
-                <ref object="cxui_action_image_quality" role="HbMenu:addAction"/>
+                <ref object="cxui_action_stillpostcapture" role="HbWidget:addAction"/>
+                <ref object="cxui_action_image_quality" role="HbWidget:addAction"/>
             </widget>
-            <ref object="cxui_action_setdefaultscenemode" role="HbMenu:addAction"/>
+            <ref object="cxui_action_setdefaultscenemode" role="HbWidget:addAction"/>
         </widget>
     </section>
     <section name="still_embedded_mode">
         <widget name="still_view_menu" role="HbView:menu" type="HbMenu">
-            <ref object="cxui_action_self_timer" role="HbMenu:addAction"/>
-            <ref object="cxui_action_settings" role="HbMenu:addAction"/>
+            <ref object="cxui_action_self_timer" role="HbWidget:addAction"/>
+            <ref object="cxui_action_settings" role="HbWidget:addAction"/>
             <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"/>
             </widget>
         </widget>
     </section>
-    <metadata activeUIState="still_standalone_mode" display="NHD landscape" unit="un">
+    <metadata activeUIState="still_standalone_mode" display="NHD-3.2-inch_landscape" unit="un">
         <uistate name="Common ui state" sections="#common"/>
         <uistate name="still_capture_with_widgets" sections="#common still_capture_with_widgets"/>
         <uistate name="still_standalone_mode" sections="#common still_capture_with_widgets still_standalone_mode"/>