--- a/camerauis/cameraxui/cxui/layouts/view_still_precapture.docml Thu May 13 21:30:19 2010 +0300
+++ b/camerauis/cameraxui/cxui/layouts/view_still_precapture.docml Thu Jul 15 01:55: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>
@@ -14,18 +14,6 @@
<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 +21,10 @@
<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_still_geotagging" type="HbAction">
+ <string name="settingskey" value="geotagging"/>
+ <string locid="txt_cam_opt_geotagging" name="text" value="Geotagging"/>
+ </object>
<object name="cxui_action_capture" type="HbAction">
<icon iconName="qtg_mono_capture" name="icon"/>
</object>
@@ -54,23 +43,47 @@
<widget name="transparent" type="HbTransparentWindow">
<real name="z" value="0"/>
</widget>
+ <layout type="anchor">
+ <anchoritem dst="transparent" dstEdge="LEFT" spacing="0un" src="" srcEdge="LEFT"/>
+ <anchoritem dst="transparent" dstEdge="TOP" spacing="0un" src="" srcEdge="TOP"/>
+ <anchoritem dst="transparent" dstEdge="RIGHT" spacing="0un" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="transparent" dstEdge="BOTTOM" spacing="0un" src="" srcEdge="BOTTOM"/>
+ </layout>
+ </widget>
+ <string name="title" value="Camera"/>
+ <bool name="contentFullScreen" value="TRUE"/>
+ </widget>
+ <section name="still_capture_indicators">
+ <widget name="still_container" role="HbView:widget" type="HbWidget">
<widget name="indicatorContainer" type="HbWidget">
<widget name="mode_indicator" type="HbLabel">
<enums name="alignment" value="AlignVCenter|AlignHCenter"/>
<icon iconName="qtg_mono_camera" name="icon"/>
<sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
- <sizehint height="var(hb-param-graphic-size-secondary)" type="FIXED" width="var(hb-param-graphic-size-secondary)"/>
+ <sizehint height="var(hb-param-graphic-size-primary-small)" type="FIXED" width="var(hb-param-graphic-size-primary-small)"/>
</widget>
<widget name="quality_indicator" type="HbLabel">
<enums name="alignment" value="AlignVCenter|AlignHCenter"/>
<sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
- <sizehint height="var(hb-param-graphic-size-secondary)" type="FIXED" width="var(hb-param-graphic-size-secondary)"/>
+ <sizehint height="var(hb-param-graphic-size-primary-small)" type="FIXED" width="var(hb-param-graphic-size-primary-small)"/>
<bool name="visible" value="TRUE"/>
</widget>
<widget name="flash_indicator" type="HbLabel">
<enums name="alignment" value="AlignVCenter|AlignHCenter"/>
<sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
- <sizehint height="var(hb-param-graphic-size-secondary)" type="FIXED" width="var(hb-param-graphic-size-secondary)"/>
+ <sizehint height="var(hb-param-graphic-size-primary-small)" type="FIXED" width="var(hb-param-graphic-size-primary-small)"/>
+ <bool name="visible" value="TRUE"/>
+ </widget>
+ <widget name="still_geotagging_indicator" type="HbLabel">
+ <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
+ <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
+ <sizehint height="var(hb-param-graphic-size-primary-small)" type="FIXED" width="var(hb-param-graphic-size-primary-small)"/>
+ <bool name="visible" value="TRUE"/>
+ </widget>
+ <widget name="face_tracking_indicator" type="HbLabel">
+ <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
+ <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
+ <sizehint height="var(hb-param-graphic-size-primary-small)" type="FIXED" width="var(hb-param-graphic-size-primary-small)"/>
<bool name="visible" value="TRUE"/>
</widget>
<real name="z" value="5"/>
@@ -80,21 +93,16 @@
<linearitem itemname="mode_indicator"/>
<linearitem itemname="quality_indicator"/>
<linearitem itemname="flash_indicator"/>
+ <linearitem itemname="still_geotagging_indicator"/>
+ <linearitem itemname="face_tracking_indicator"/>
</layout>
</widget>
<layout type="anchor">
- <anchoritem dst="indicatorContainer" dstEdge="LEFT" spacing="var(hb-param-margin-gene-left)" src="" srcEdge="LEFT"/>
+ <anchoritem dst="indicatorContainer" dstEdge="LEFT" spacing="11un" src="" srcEdge="LEFT"/>
<anchoritem dst="indicatorContainer" dstEdge="TOP" spacing="var(hb-param-margin-gene-top)" src="" srcEdge="TOP"/>
- <anchoritem dst="transparent" dstEdge="LEFT" spacing="0un" src="" srcEdge="LEFT"/>
- <anchoritem dst="transparent" dstEdge="TOP" spacing="0un" src="" srcEdge="TOP"/>
- <anchoritem dst="transparent" dstEdge="RIGHT" spacing="0un" src="" srcEdge="RIGHT"/>
- <anchoritem dst="transparent" dstEdge="BOTTOM" spacing="0un" src="" srcEdge="BOTTOM"/>
</layout>
</widget>
- <string name="title" value="Camera"/>
- <bool name="contentFullScreen" value="TRUE"/>
- <enums name="titleBarFlags" value="TitleBarHidden|TitleBarTransparent"/>
- </widget>
+ </section>
<section name="still_capture_with_widgets">
<widget name="still_capture_view" type="HbView">
<widget name="still_view_menu" role="HbView:menu" type="HbMenu"/>
@@ -105,14 +113,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>
@@ -133,6 +141,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" verticalPolicy="Fixed" verticalStretch="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"/>
@@ -140,6 +150,9 @@
</widget>
<widget name="still_selftimer_cancel_button" type="HbPushButton">
<real name="z" value="4"/>
+ <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
+ <sizehint type="FIXED" width="20un"/>
+ <sizehint height="7un" type="PREFERRED" width="20un"/>
<string locid="txt_cam_button_cancel" name="text" value="Cancel"/>
<bool name="visible" value="TRUE"/>
<string name="state" value="normal"/>
@@ -187,8 +200,6 @@
</widget>
<real name="z" value="1"/>
<layout type="anchor">
- <anchoritem dst="indicatorContainer" dstEdge="LEFT" spacing="var(hb-param-margin-gene-left)" src="" srcEdge="LEFT"/>
- <anchoritem dst="indicatorContainer" dstEdge="TOP" spacing="var(hb-param-margin-gene-top)" src="" srcEdge="TOP"/>
<anchoritem dst="toolbar" dstEdge="LEFT" spacing="0un" src="" srcEdge="LEFT"/>
<anchoritem dst="toolbar" dstEdge="BOTTOM" spacing="0un" src="" srcEdge="BOTTOM"/>
<anchoritem dst="toolbar" dstEdge="TOP" spacing="var(hb-param-widget-chrome-height)" src="" srcEdge="TOP"/>
@@ -202,16 +213,13 @@
<anchoritem dst="images_left_container" dstEdge="LEFT" spacing="11un" src="" srcEdge="LEFT"/>
<anchoritem dst="still_precapture_selftimer_container" dstEdge="CENTERH" spacing="0" src="" srcEdge="CENTERH"/>
<anchoritem dst="still_precapture_selftimer_container" dstEdge="CENTERV" spacing="0" src="" srcEdge="CENTERV"/>
+ <anchoritem dst="indicatorContainer" dstEdge="LEFT" spacing="11un" src="" srcEdge="LEFT"/>
+ <anchoritem dst="indicatorContainer" dstEdge="TOP" spacing="var(hb-param-margin-gene-top)" src="" srcEdge="TOP"/>
</layout>
</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="cxui_action_still_geotagging" signal="triggered(bool)" slot="launchSetting()"/>
<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,46 +228,40 @@
<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="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_default_image_name" role="HbMenu:addAction"/>
- <ref object="cxui_action_capturetone" role="HbMenu:addAction"/>
- <ref object="cxui_action_imagerotation" role="HbMenu:addAction"/>
+ <ref object="cxui_action_stillpostcapture" role="HbWidget:addAction"/>
+ <ref object="cxui_action_image_quality" role="HbWidget:addAction"/>
+ <ref object="cxui_action_still_geotagging" role="HbWidget: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">
<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"/>
- <ref object="cxui_action_default_image_name" role="HbMenu:addAction"/>
- <ref object="cxui_action_imagerotation" role="HbMenu:addAction"/>
+ <ref object="cxui_action_still_geotagging" role="HbMenu:addAction"/>
</widget>
- <ref object="cxui_action_restore" role="HbMenu:addAction"/>
</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"/>
<uistate name="still_embedded_mode" sections="#common still_capture_with_widgets still_embedded_mode"/>
</metadata>
-</hbdocument>
+</hbdocument>
\ No newline at end of file