--- a/camerauis/cameraxui/cxui/inc/cxuienums.h Thu May 13 21:30:19 2010 +0300
+++ b/camerauis/cameraxui/cxui/inc/cxuienums.h Thu Jul 15 01:55:05 2010 +0300
@@ -48,15 +48,19 @@
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";
static const char *SETTINGS_SLIDER_DIALOG_XML = ":/xml/setting_slider.docml";
+ static const char *FULL_SCREEN_POPUP_XML = ":/xml/full_screen_popup.docml";
+
+
// Graphics
static const char *TRANSPARENT_BACKGROUND_GRAPHIC = "qtg_fr_popup_trans";
// Sections
+ static const char *STILL_PRE_CAPTURE_INDICATORS_SECTION = "still_capture_indicators";
static const char *STILL_PRE_CAPTURE_WIDGETS_SECTION = "still_capture_with_widgets";
+ static const char *VIDEO_PRE_CAPTURE_INDICATORS_SECTION = "video_capture_indicators";
static const char *VIDEO_PRE_CAPTURE_WIDGETS_SECTION = "video_capture_with_widgets";
static const char *POST_CAPTURE_WIDGETS_SECTION = "post_capture_with_widgets";
static const char *STILL_PRE_CAPTURE_EMBEDDED_SECTION = "still_embedded_mode";
@@ -71,7 +75,6 @@
// 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_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";
@@ -82,9 +85,12 @@
static const char *STILL_PRE_CAPTURE_GOTO_VIDEO_ACTION = "cxui_action_goto_video";
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_FACE_TRACKING_ICON = "face_tracking_indicator";
static const char *STILL_PRE_CAPTURE_POST_CAPTURE_ACTION = "cxui_action_stillpostcapture";
static const char *STILL_PRE_CAPTURE_INDICATOR_CONTAINER = "indicatorContainer";
static const char *STILL_PRE_CAPTURE_IMAGES_LEFT_CONTAINER = "images_left_container";
+ static const char *STILL_PRE_CAPTURE_GEOTAGGING_INDICATOR_ICON = "still_geotagging_indicator";
+ static const char *STILL_PRE_CAPTURE_FLASHBLINK_INDICATOR_ICON = "flash_indicator";
static const char *STILL_PRE_CAPTURE_SELFTIMER_CONTAINER = "still_precapture_selftimer_container";
static const char *STILL_PRE_CAPTURE_SELFTIMER_COUNTER = "still_selftimer_counter";
@@ -92,15 +98,14 @@
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 *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";
static const char *VIDEO_PRE_CAPTURE_TOOLBAR_REC = "video_toolbar_recording";
static const char *VIDEO_PRE_CAPTURE_TOOLBAR_PAUSED = "video_toolbar_paused";
- static const char *VIDEO_PRE_CAPTURE_FLASH_ACTION = "cxui_video_action_light";
static const char *VIDEO_PRE_CAPTURE_VIEWFINDER = "video_viewfinder_widget";
static const char *VIDEO_PRE_CAPTURE_ZOOM_SLIDER = "video_zoom";
static const char *VIDEO_PRE_CAPTURE_RECORDING_ICON = "video_recording_icon";
@@ -112,13 +117,22 @@
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";
+ static const char *VIDEO_PRE_CAPTURE_SCENE_MODE_ACTION = "cxui_video_action_scene";
static const char *VIDEO_PRE_CAPTURE_QUALITY_ICON = "video_quality_indicator";
+ static const char *VIDEO_PRE_CAPTURE_GEOTAGGING_INDICATOR_ICON = "video_geotagging_indicator";
+ static const char *VIDEO_PRE_CAPTURE_VIDEOAUDIOMUTE_INDICATOR_ICON = "video_audio_mute_indicator";
+ static const char *VIDEO_PRE_CAPTURE_STABILITY_INDICATOR_ICON = "video_stability_indicator";
// standby
static const char *STANDBY_POPUP = "standbymode_popup";
static const char *STANDBY_TEXT_WIDGET = "standby_text";
+ // Full screen popup
+ static const char *FULL_SCREEN_POPUP = "full_screen_popup";
+ static const char *FULL_SCREEN_POPUP_TEXT = "full_screen_popup_text";
+ static const char *FULL_SCREEN_POPUP_BUTTON = "full_screen_popup_button";
+
// error manager
static const char *ERROR_POPUP = "errornote_popup";
static const char *ERROR_TEXT_WIDGET = "errornote_text";
@@ -142,13 +156,15 @@
static const char *SETTINGS_SLIDER_DIALOG_HEADING_WIDGET = "slider_settings_dialog_heading";
static const char *SETTINGS_SLIDER_DIALOG_CONTENT_WIDGET = "settings_dialog_slider";
- // scene setting
- 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";
+ // scene mode view
+ static const char *SCENE_MODE_VIEW = "settings_scenes_view";
+ static const char *SCENE_MODE_VIEW_CONTAINER = "scene_view_container";
+ static const char *SCENE_MODE_VIEW_BG_IMAGE = "scene_view_bg_icon";
+ static const char *SCENE_MODE_VIEW_BG_IMAGE2 = "scene_view_bg_icon2";
+ static const char *SCENE_MODE_VIEW_RADIOBUTTONS = "scene_view_radioButtonList";
+ static const char *SCENE_MODE_VIEW_OK_BUTTON = "scene_ok_button";
+ static const char *SCENE_MODE_VIEW_CANCEL_BUTTON = "scene_cancel_button";
+ static const char *SCENE_MODE_VIEW_HEADING_WIDGET = "scene_title";
}
namespace CxUiInternal
@@ -160,6 +176,15 @@
static const char *PROPERTY_KEY_TRUE = "1";
}
+namespace CxuiActivityIds
+{
+ static const QString STILL_PRECAPTURE_ACTIVITY = "CameraViewfinderShow";
+ static const QString STILL_POSTCAPTURE_ACTIVITY = "CameraPostCaptureShow";
+
+ static const QString VIDEO_PRECAPTURE_ACTIVITY = "CamcorderViewfinderShow";
+ static const QString VIDEO_POSTCAPTURE_ACTIVITY = "CamcorderPostCaptureShow";
+}
+
Q_DECLARE_METATYPE(CxUi::CameraView)
#endif // CXUIENUMS_H