--- a/camerauis/cameraxui/cxui/layouts/view_still_precapture.docml Wed Jun 23 17:59:54 2010 +0300
+++ b/camerauis/cameraxui/cxui/layouts/view_still_precapture.docml Tue Jul 06 14:04:02 2010 +0300
@@ -14,9 +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_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_settings" type="HbAction">
<string locid="txt_cam_opt_camera_settings" name="text" value="Camera settings"/>
</object>
@@ -24,6 +21,10 @@
<string name="settingskey" value="imageQuality"/>
<string locid="txt_cam_opt_image_quality" name="text" value="Image quality"/>
</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>
@@ -61,6 +62,12 @@
<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"/>
@@ -74,6 +81,7 @@
<linearitem itemname="mode_indicator"/>
<linearitem itemname="quality_indicator"/>
<linearitem itemname="flash_indicator"/>
+ <linearitem itemname="still_geotagging_indicator"/>
<linearitem itemname="face_tracking_indicator"/>
</layout>
</widget>
@@ -203,8 +211,8 @@
</layout>
</widget>
</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()"/>
+ <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()"/>
@@ -228,8 +236,8 @@
<string locid="txt_cam_opt_general_settings" name="title" value="General settings"/>
<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="HbWidget:addAction"/>
</widget>
</section>
<section name="still_embedded_mode">
@@ -239,6 +247,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_still_geotagging" role="HbMenu:addAction"/>
</widget>
</widget>
</section>