--- a/camerauis/cameraxui/cxui/layouts/view_video_precapture.docml Thu May 13 21:30:19 2010 +0300
+++ b/camerauis/cameraxui/cxui/layouts/view_video_precapture.docml Thu Jul 15 01:55:05 2010 +0300
@@ -1,11 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<hbdocument version="1.0">
+<hbdocument version="1.1">
<object name="cxui_video_action_record" type="HbAction">
<icon iconName="qtg_small_record" name="icon"/>
</object>
- <object name="cxui_video_action_light" type="HbAction">
- <icon iconName="qtg_mono_light" name="icon"/>
- </object>
<object name="cxui_video_action_zoom" type="HbAction">
<icon iconName="qtg_mono_zoom" name="icon"/>
</object>
@@ -22,9 +19,6 @@
<string name="settingskey" value="videoQuality"/>
<string locid="txt_cam_opt_video_quality" name="text" value="Video quality"/>
</object>
- <object name="cxui_video_action_restore" type="HbAction">
- <string locid="txt_cam_opt_restore_settings" name="text" value="Restore settings"/>
- </object>
<object name="cxui_video_action_help" type="HbAction">
<string name="text" value="Help"/>
</object>
@@ -41,15 +35,6 @@
<string name="settingskey" value="video_showcaptured"/>
<string locid="txt_cam_opt_show_captured_video" name="text" value="Show captured video"/>
</object>
- <object name="cxui_video_action_videosound" type="HbAction">
- <string locid="txt_cam_opt_video_sound" name="text" value="Video sound"/>
- </object>
- <object name="cxui_video_action_defaultvideoname" type="HbAction">
- <string locid="txt_cam_opt_default_video_name" name="text" value="Default video name"/>
- </object>
- <object name="cxui_video_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_video_action_settings" type="HbAction">
<string locid="txt_cam_opt_camera_settings" name="text" value="Camera settings"/>
</object>
@@ -57,35 +42,47 @@
<string locid="txt_cam_opt_go_to_videos" name="text" value="Go to Videos"/>
</object>
<widget name="video_capture_view" type="HbView">
- <widget name="video_view_menu" role="HbView:menu" type="HbMenu"/>
+ <widget name="video_view_menu" role="HbView:menu" type="HbMenu"/>
<widget name="video_container" role="HbView:widget" type="HbWidget">
<widget name="video_viewfinder_widget" type="HbTransparentWindow">
<real name="z" value="0"/>
</widget>
+ <layout type="anchor">
+ <anchoritem dst="video_viewfinder_widget" dstEdge="RIGHT" spacing="0un" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="video_viewfinder_widget" dstEdge="LEFT" spacing="0un" src="" srcEdge="LEFT"/>
+ <anchoritem dst="video_viewfinder_widget" dstEdge="TOP" spacing="0un" src="" srcEdge="TOP"/>
+ <anchoritem dst="video_viewfinder_widget" dstEdge="BOTTOM" spacing="0un" src="" srcEdge="BOTTOM"/>
+ </layout>
+ </widget>
+ <string locid="txt_cam_title_camera" name="title" value="Camera"/>
+ <bool name="contentFullScreen" value="TRUE"/>
+ </widget>
+ <section name="video_capture_indicators">
+ <widget name="video_container" role="HbView:widget" type="HbWidget">
<widget name="video_indicator_container_top" type="HbWidget">
<widget name="video_mode_indicator" type="HbLabel">
<enums name="alignment" value="AlignVCenter|AlignHCenter"/>
<icon iconName="qtg_mono_camcorder" 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="video_quality_indicator" type="HbLabel">
<enums name="alignment" value="AlignVCenter|AlignHCenter"/>
<icon iconName="qtg_mono_vga" 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="video_audio_mute_indicator" type="HbLabel">
<enums name="alignment" value="AlignVCenter|AlignHCenter"/>
<icon iconName="qtg_mono_call_mute" 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="video_stability_indicator" type="HbLabel">
<enums name="alignment" value="AlignVCenter|AlignHCenter"/>
<icon iconName="qtg_mono_call_mute" 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)"/>
<bool name="visible" value="FALSE"/>
</widget>
<real name="z" value="5"/>
@@ -99,18 +96,11 @@
</layout>
</widget>
<layout type="anchor">
- <anchoritem dst="video_indicator_container_top" dstEdge="LEFT" spacing="var(hb-param-margin-gene-left)" src="" srcEdge="LEFT"/>
+ <anchoritem dst="video_indicator_container_top" dstEdge="LEFT" spacing="11un" src="" srcEdge="LEFT"/>
<anchoritem dst="video_indicator_container_top" dstEdge="TOP" spacing="var(hb-param-margin-gene-top)" src="" srcEdge="TOP"/>
- <anchoritem dst="video_viewfinder_widget" dstEdge="RIGHT" spacing="0un" src="" srcEdge="RIGHT"/>
- <anchoritem dst="video_viewfinder_widget" dstEdge="LEFT" spacing="0un" src="" srcEdge="LEFT"/>
- <anchoritem dst="video_viewfinder_widget" dstEdge="TOP" spacing="0un" src="" srcEdge="TOP"/>
- <anchoritem dst="video_viewfinder_widget" dstEdge="BOTTOM" spacing="0un" src="" srcEdge="BOTTOM"/>
</layout>
</widget>
- <string locid="txt_cam_title_camera" name="title" value="Camera"/>
- <bool name="contentFullScreen" value="TRUE"/>
- <enums name="titleBarFlags" value="TitleBarHidden"/>
- </widget>
+ </section>
<section name="video_capture_with_widgets">
<widget name="video_capture_view" type="HbView">
<widget name="video_view_menu" role="HbView:menu" type="HbMenu"/>
@@ -121,23 +111,21 @@
<sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
<sizehint type="PREFERRED" width="var(hb-param-widget-toolbar-height)"/>
<enums name="orientation" value="Vertical"/>
- <ref object="cxui_video_action_record" role="HbToolBar:addAction"/>
- <ref object="cxui_video_action_light" role="HbToolBar:addAction"/>
- <ref object="cxui_video_action_scene" role="HbToolBar:addAction"/>
- <ref object="cxui_video_action_gotostill" role="HbToolBar:addAction"/>
+ <ref object="cxui_video_action_record" role="HbWidget:addAction"/>
+ <ref object="cxui_video_action_scene" role="HbWidget:addAction"/>
+ <ref object="cxui_video_action_gotostill" role="HbWidget:addAction"/>
</widget>
<widget name="video_toolbar_recording" type="HbToolBar">
<enums name="layoutDirection" value="RightToLeft"/>
<sizehint type="PREFERRED" width="var(hb-param-widget-toolbar-height)"/>
<enums name="orientation" value="Vertical"/>
<bool name="visible" value="FALSE"/>
- <ref object="cxui_video_action_pause" role="HbToolBar:addAction"/>
- <ref object="cxui_video_action_light" role="HbToolBar:addAction"/>
- <ref object="cxui_video_action_stop" role="HbToolBar:addAction"/>
+ <ref object="cxui_video_action_pause" role="HbWidget:addAction"/>
+ <ref object="cxui_video_action_stop" role="HbWidget:addAction"/>
</widget>
<widget name="video_zoom" type="HbSlider">
<real name="z" value="8"/>
- <sizehint height="40un" type="PREFERRED"/>
+ <sizehint height="40un" type="PREFERRED" width="9un"/>
<enums name="orientation" value="Vertical"/>
</widget>
<widget name="video_toolbar_paused" type="HbToolBar">
@@ -145,9 +133,8 @@
<sizehint type="PREFERRED" width="var(hb-param-widget-toolbar-height)"/>
<enums name="orientation" value="Vertical"/>
<bool name="visible" value="FALSE"/>
- <ref object="cxui_video_action_resume" role="HbToolBar:addAction"/>
- <ref object="cxui_video_action_light" role="HbToolBar:addAction"/>
- <ref object="cxui_video_action_stop" role="HbToolBar:addAction"/>
+ <ref object="cxui_video_action_resume" role="HbWidget:addAction"/>
+ <ref object="cxui_video_action_stop" role="HbWidget:addAction"/>
</widget>
<widget name="video_indicator_container_bottom" type="HbWidget">
<widget name="video_recording_icon" type="HbLabel">
@@ -159,7 +146,7 @@
<widget name="video_remaining_time" type="HbLabel">
<enums name="alignment" value="AlignVCenter|AlignHCenter"/>
<sizehint height="var(hb-param-graphic-size-function)" type="PREFERRED"/>
- <string name="textColor" value="#ff0000"/>
+ <string name="textColor" value="#ffffff"/>
<string name="plainText" value="00:00"/>
<fontspec name="fontSpec" role="Undefined" textheight="var(hb-param-text-height-tiny)"/>
</widget>
@@ -180,8 +167,6 @@
</layout>
</widget>
<layout type="anchor">
- <anchoritem dst="video_indicator_container_top" dstEdge="LEFT" spacing="var(hb-param-margin-gene-left)" src="" srcEdge="LEFT"/>
- <anchoritem dst="video_indicator_container_top" dstEdge="TOP" spacing="var(hb-param-margin-gene-top)" src="" srcEdge="TOP"/>
<anchoritem dst="video_viewfinder_widget" dstEdge="RIGHT" spacing="0un" src="" srcEdge="RIGHT"/>
<anchoritem dst="video_viewfinder_widget" dstEdge="LEFT" spacing="0un" src="" srcEdge="LEFT"/>
<anchoritem dst="video_viewfinder_widget" dstEdge="TOP" spacing="0un" src="" srcEdge="TOP"/>
@@ -203,18 +188,16 @@
<anchoritem dst="video_viewfinder_widget" dstEdge="LEFT" spacing="0un" src="" srcEdge="LEFT"/>
<anchoritem dst="video_viewfinder_widget" dstEdge="TOP" spacing="0un" src="" srcEdge="TOP"/>
<anchoritem dst="video_viewfinder_widget" dstEdge="BOTTOM" spacing="0un" src="" srcEdge="BOTTOM"/>
+ <anchoritem dst="video_indicator_container_top" dstEdge="LEFT" spacing="11un" src="" srcEdge="LEFT"/>
+ <anchoritem dst="video_indicator_container_top" dstEdge="TOP" spacing="var(hb-param-margin-gene-top)" src="" srcEdge="TOP"/>
</layout>
</widget>
- <enums name="titleBarFlags" value="TitleBarTransparent"/>
</widget>
<connect receiver="video_capture_view" sender="video_view_menu" signal="aboutToShow()" slot="disableControlsTimeout()"/>
<connect receiver="video_capture_view" sender="video_view_menu" signal="aboutToHide()" slot="hideControls()"/>
<connect receiver="video_capture_view" sender="cxui_video_action_settings" signal="triggered(bool)" slot="showSettingsGrid()"/>
<connect receiver="video_capture_view" sender="cxui_video_action_quality" signal="triggered(bool)" slot="launchSetting()"/>
- <connect receiver="video_capture_view" sender="cxui_video_action_restore" signal="triggered(bool)" slot="launchNotSupportedNotification()"/>
<connect receiver="video_capture_view" sender="cxui_video_action_showcapturedvideo" signal="triggered(bool)" slot="launchSetting()"/>
- <connect receiver="video_capture_view" sender="cxui_video_action_videosound" signal="triggered(bool)" slot="launchNotSupportedNotification()"/>
- <connect receiver="video_capture_view" sender="cxui_video_action_defaultvideoname" signal="triggered(bool)" slot="launchNotSupportedNotification()"/>
<connect receiver="video_capture_view" sender="video_zoom" signal="valueChanged(int)" slot="zoomTo(int)"/>
<connect receiver="video_capture_view" sender="cxui_video_action_record" signal="triggered(bool)" slot="record()"/>
<connect receiver="video_capture_view" sender="cxui_video_action_resume" signal="triggered(bool)" slot="record()"/>
@@ -222,37 +205,33 @@
<connect receiver="video_capture_view" sender="cxui_video_action_pause" signal="triggered(bool)" slot="pause()"/>
<connect receiver="video_capture_view" sender="cxui_video_action_gotostill" signal="triggered(bool)" slot="goToStill()"/>
<connect receiver="video_capture_view" sender="cxui_video_action_gotostill" signal="triggered(bool)" slot="hideControls()"/>
- <connect receiver="video_capture_view" sender="cxui_video_action_light" signal="triggered(bool)" slot="launchNotSupportedNotification()"/>
- <connect receiver="video_capture_view" sender="cxui_video_action_scene" signal="triggered(bool)" slot="launchNotSupportedNotification()"/>
+ <connect receiver="video_capture_view" sender="cxui_video_action_scene" signal="triggered(bool)" slot="launchVideoScenePopup()"/>
<connect receiver="video_capture_view" sender="cxui_video_action_gotovideos" signal="triggered(bool)" slot="launchVideosApp()"/>
</section>
<section name="video_standalone_mode">
<widget name="video_view_menu" role="HbView:menu" type="HbMenu">
- <ref object="cxui_video_action_gotovideos" role="HbMenu:addAction"/>
- <ref object="cxui_video_action_settings" role="HbMenu:addAction"/>
+ <ref object="cxui_video_action_gotovideos" role="HbWidget:addAction"/>
+ <ref object="cxui_video_action_settings" role="HbWidget:addAction"/>
<widget name="video_submenu_general" role="HbMenu:menu" type="HbMenu">
<string locid="txt_cam_opt_general_settings" name="title" value="General settings"/>
- <ref object="cxui_video_action_showcapturedvideo" role="HbMenu:addAction"/>
- <ref object="cxui_video_action_quality" role="HbMenu:addAction"/>
- <ref object="cxui_video_action_videosound" role="HbMenu:addAction"/>
- <ref object="cxui_video_action_defaultvideoname" role="HbMenu:addAction"/>
+ <ref object="cxui_video_action_showcapturedvideo" role="HbWidget:addAction"/>
+ <ref object="cxui_video_action_quality" role="HbWidget:addAction"/>
</widget>
- <ref object="cxui_video_action_restore" role="HbMenu:addAction"/>
</widget>
</section>
<section name="video_embedded_mode">
<widget name="video_view_menu" role="HbView:menu" type="HbMenu">
- <ref object="cxui_video_action_settings" role="HbMenu:addAction"/>
+ <ref object="cxui_video_action_settings" role="HbWidget:addAction"/>
<widget name="video_submenu_general" role="HbMenu:menu" type="HbMenu">
<string locid="txt_cam_opt_general_settings" name="title" value="General settings"/>
- <ref object="cxui_video_action_quality" role="HbMenu:addAction"/>
- <ref object="cxui_video_action_videosound" role="HbMenu:addAction"/>
- <ref object="cxui_video_action_defaultvideoname" role="HbMenu:addAction"/>
+ <ref object="cxui_video_action_quality" role="HbWidget:addAction"/>
</widget>
- <ref object="cxui_video_action_restore" role="HbMenu:addAction"/>
</widget>
</section>
<section name="video_idle">
+ <widget name="video_elapsed_time" type="HbLabel">
+ <bool name="visible" value="FALSE"/>
+ </widget>
<widget name="video_recording_icon" type="HbLabel">
<bool name="visible" value="FALSE"/>
</widget>
@@ -263,12 +242,37 @@
<linearitem itemname="video_remaining_time"/>
</layout>
</widget>
+ </section>
+ <section name="video_recording">
<widget name="video_elapsed_time" type="HbLabel">
- <bool name="visible" value="FALSE"/>
+ <bool name="visible" value="TRUE"/>
+ </widget>
+ <widget name="video_remaining_time" type="HbLabel">
+ <bool name="visible" value="TRUE"/>
+ </widget>
+ <widget name="video_recording_icon" type="HbLabel">
+ <bool name="visible" value="TRUE"/>
+ <icon iconName="qtg_small_record" name="icon"/>
+ </widget>
+ <widget name="video_indicator_container_bottom" type="HbWidget">
+ <bool name="visible" value="TRUE"/>
+ <layout orientation="Horizontal" spacing="var(hb-param-margin-gene-middle-horizontal)" type="linear">
+ <contentsmargins bottom="var(hb-param-margin-gene-middle-vertical)" left="var(hb-param-margin-gene-middle-horizontal)" right="var(hb-param-margin-gene-middle-horizontal)" top="var(hb-param-margin-gene-middle-vertical)"/>
+ <linearitem itemname="video_recording_icon"/>
+ <linearitem itemname="video_elapsed_time"/>
+ <linearitem itemname="video_remaining_time"/>
+ </layout>
</widget>
</section>
- <section name="video_recording">
+ <section name="video_paused">
+ <widget name="video_elapsed_time" type="HbLabel">
+ <bool name="visible" value="TRUE"/>
+ </widget>
+ <widget name="video_remaining_time" type="HbLabel">
+ <string name="textColor" value="#ffffff"/>
+ </widget>
<widget name="video_recording_icon" type="HbLabel">
+ <icon iconName="qtg_mono_pause" name="icon"/>
<bool name="visible" value="TRUE"/>
</widget>
<widget name="video_indicator_container_bottom" type="HbWidget">
@@ -280,31 +284,8 @@
<linearitem itemname="video_remaining_time"/>
</layout>
</widget>
- <widget name="video_elapsed_time" type="HbLabel">
- <bool name="visible" value="TRUE"/>
- </widget>
- <widget name="video_remaining_time" type="HbLabel">
- <bool name="visible" value="TRUE"/>
- </widget>
</section>
- <section name="video_paused">
- <widget name="video_recording_icon" type="HbLabel">
- <bool name="visible" value="FALSE"/>
- </widget>
- <widget name="video_indicator_container_bottom" type="HbWidget">
- <bool name="visible" value="TRUE"/>
- <layout orientation="Horizontal" spacing="var(hb-param-margin-gene-middle-horizontal)" type="linear">
- <contentsmargins bottom="var(hb-param-margin-gene-middle-vertical)" left="var(hb-param-margin-gene-middle-horizontal)" right="var(hb-param-margin-gene-middle-horizontal)" top="var(hb-param-margin-gene-middle-vertical)"/>
- <linearitem itemname="video_recording_icon"/>
- <linearitem itemname="video_elapsed_time"/>
- <linearitem itemname="video_remaining_time"/>
- </layout>
- </widget>
- <widget name="video_elapsed_time" type="HbLabel">
- <bool name="visible" value="TRUE"/>
- </widget>
- </section>
- <metadata activeUIState="Recording" display="NHD landscape" unit="un">
+ <metadata activeUIState="Paused" display="NHD-3.2-inch_landscape" unit="un">
<uistate name="Common ui state" sections="#common"/>
<uistate name="All widgets" sections="#common video_capture_with_widgets"/>
<uistate name="video_standalone_mode" sections="#common video_capture_with_widgets video_standalone_mode"/>