--- a/camerauis/cameraxui/cxui/inc/cxuienums.h Fri Apr 16 14:51:30 2010 +0300
+++ b/camerauis/cameraxui/cxui/inc/cxuienums.h Thu May 13 21:30:19 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -35,24 +35,6 @@
//! Preview for captured image
VideoPostCaptureView = 3
};
-
- enum StillSceneModes
- {
- //! Automatic
- StillSceneAuto = 0,
- //! Portrait
- StillScenePortrait = 1,
- //! Landscape
- StillSceneLandscape = 2,
- //! Macro
- StillSceneMacro = 3,
- //! Sports
- StillSceneSports = 4,
- //! Night
- StillSceneNight = 5,
- //! Night portrait
- StillSceneNightPortrait = 6
- };
}
// Application layout strings
@@ -61,13 +43,10 @@
// Application layout xml files
static const char *VIDEO_1ST_XML = ":/xml/view_video_precapture.docml";
- static const char *VIDEO_2ND_XML = ":/xml/view_video_precapture_secondary.docml";
static const char *STILL_1ST_XML = ":/xml/view_still_precapture.docml";
- static const char *STILL_2ND_XML = ":/xml/view_still_precapture_secondary.docml";
static const char *POSTCAPTURE_XML = ":/xml/view_postcapture.docml";
- static const char *SCENEMODE_SETTING_XML = ":/xml/setting_still_scenemode.docml";
- static const char *SCENEMODE_VIDEO_SETTING_XML = ":/xml/setting_video_scenemode.docml";
+ static const char *SCENEMODE_SETTING_XML = ":/xml/setting_scenemode.docml";
static const char *STANDBY_POPUP_XML = ":/xml/standbymode_popup.docml";
static const char *ERROR_POPUP_XML = ":/xml/errornote_popup.docml";
@@ -85,18 +64,22 @@
static const char *VIDEO_PRE_CAPTURE_EMBEDDED_SECTION = "video_embedded_mode";
static const char *VIDEO_PRE_CAPTURE_STANDALONE_SECTION = "video_standalone_mode";
+ static const char *VIDEO_PRE_CAPTURE_IDLE = "video_idle";
+ static const char *VIDEO_PRE_CAPTURE_RECORDING = "video_recording";
+ static const char *VIDEO_PRE_CAPTURE_PAUSED = "video_paused";
+
// Widgets
// In order to be able to refer to a widget, we need to know its object name.
static const char *STILL_PRE_CAPTURE_VIEW = "still_capture_view";
- static const char *STILL_PRE_CAPTURE_VIEW2 = "still_capture_view_2";
+ static const char *STILL_SCENES_VIEW = "settings_scenes_view";
static const char *STILL_PRE_CAPTURE_TOOLBAR = "toolbar";
static const char *STILL_PRE_CAPTURE_FLASH_ACTION = "cxui_action_flash";
+ static const char *STILL_PRE_CAPTURE_SCENE_MODE_ACTION = "cxui_action_scenemodes";
static const char *STILL_PRE_CAPTURE_ROOT_WIDGET = "viewfinder_widget";
static const char *STILL_PRE_CAPTURE_VIEWFINDER = "transparent";
static const char *STILL_PRE_CAPTURE_ZOOM_SLIDER = "zoom";
static const char *STILL_PRE_CAPTURE_IMAGE_QUALITY_ACTION = "cxui_action_image_quality";
static const char *STILL_PRE_CAPTURE_GOTO_VIDEO_ACTION = "cxui_action_goto_video";
- static const char *STILL_PRE_CAPTURE_GOTO_2ND_CAMERA_ACTION = "cxui_action_goto_2_camera";
static const char *STILL_PRE_CAPTURE_IMAGES_LEFT_LABEL = "images_remaining";
static const char *STILL_PRE_CAPTURE_QUALITY_ICON = "quality_indicator";
static const char *STILL_PRE_CAPTURE_POST_CAPTURE_ACTION = "cxui_action_stillpostcapture";
@@ -104,14 +87,14 @@
static const char *STILL_PRE_CAPTURE_IMAGES_LEFT_CONTAINER = "images_left_container";
static const char *STILL_PRE_CAPTURE_SELFTIMER_CONTAINER = "still_precapture_selftimer_container";
- static const char *STILL_PRE_CAPTURE_SELFTIMER_BUTTON_CONTAINER = "selftimer_button_container";
static const char *STILL_PRE_CAPTURE_SELFTIMER_COUNTER = "still_selftimer_counter";
static const char *STILL_PRE_CAPTURE_SELFTIMER_START_BUTTON = "still_selftimer_start_button";
static const char *STILL_PRE_CAPTURE_SELFTIMER_CANCEL_BUTTON = "still_selftimer_cancel_button";
- static const char *VIDEO_PRE_CAPTURE_VIEW = "video_capture_view";
- static const char *VIDEO_PRE_CAPTURE_VIEW2 = "video_capture_view_2";
-
+ static const char *VIDEO_PRE_CAPTURE_VIEW = "video_capture_view";
+
+ static const char *SETTINGS_DIALOG_OK_ACTION = "action_ok";
+
// video
// In order to be able to refer to a widget, we need to know its object name.
static const char *VIDEO_PRE_CAPTURE_TOOLBAR = "video_toolbar";
@@ -123,11 +106,9 @@
static const char *VIDEO_PRE_CAPTURE_RECORDING_ICON = "video_recording_icon";
static const char *VIDEO_PRE_CAPTURE_ELAPSED_TIME_LABEL = "video_elapsed_time";
static const char *VIDEO_PRE_CAPTURE_REMAINING_TIME_LABEL = "video_remaining_time";
- static const char *VIDEO_PRE_CAPTURE_TOGGLE_LIGHT_ACTION = "cxui_video_action_toggle_light";
static const char *VIDEO_PRE_CAPTURE_DEFAULT_MENU = "video_view_menu";
static const char *VIDEO_PRE_CAPTURE_VIDEO_QUALITY_ACTION = "cxui_video_action_quality";
static const char *VIDEO_PRE_CAPTURE_GOTO_STILL_ACTION = "cxui_video_action_gotostill";
- static const char *VIDEO_PRE_CAPTURE_GOTO_2ND_CAMERA_ACTION = "cxui_video_action_goto_2_camera";
static const char *VIDEO_PRE_CAPTURE_POST_CAPTURE_ACTION = "cxui_video_action_showcapturedvideo";
static const char *VIDEO_PRE_CAPTURE_INDICATOR_CONTAINER_TOP = "video_indicator_container_top";
static const char *VIDEO_PRE_CAPTURE_INDICATOR_CONTAINER_BOTTOM = "video_indicator_container_bottom";
@@ -162,8 +143,12 @@
static const char *SETTINGS_SLIDER_DIALOG_CONTENT_WIDGET = "settings_dialog_slider";
// scene setting
- static const char *STILL_SCENE_DIALOG = "still_scenemode_popup";
- static const char *VIDEO_SCENE_DIALOG = "video_scenemode_popup";
+ static const char *SCENE_VIEW_CONTAINER = "scene_view_container";
+ static const char *SCENE_VIEW_BG_IMAGE = "scene_view_bg_icon";
+ static const char *SCENE_VIEW_BG_IMAGE2 = "scene_view_bg_icon2";
+ static const char *SCENE_VIEW_RADIOBUTTONS = "scene_view_radioButtonList";
+ static const char *SCENE_VIEW_OK_BUTTON = "scene_ok_button";
+ static const char *SCENE_VIEW_CANCEL_BUTTON = "scene_cancel_button";
}
namespace CxUiInternal