diff -r 61bc0f252b2b -r bac7acad7cb3 camerauis/cameraapp/generic/data/resource_inc/CamVideoCaptureV2.ra
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/camerauis/cameraapp/generic/data/resource_inc/CamVideoCaptureV2.ra	Wed Sep 01 12:30:54 2010 +0100
@@ -0,0 +1,369 @@
+/*
+* Copyright (c) 2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  Resource definitions for the Camera Application*
+*/
+
+
+
+
+//----------------------------------------------------
+//   
+//    r_cam_saving_video_wait_note
+//    Wait note shown whilst saving video after capturing
+//
+//----------------------------------------------------
+//
+RESOURCE DIALOG r_cam_saving_video_wait_note
+    {
+    flags = EAknWaitNoteFlags | EEikDialogFlagNoBackgroundFade;
+    buttons = R_AVKON_SOFTKEYS_EMPTY;
+    items=
+        {
+        DLG_LINE
+            {
+            type = EAknCtNote;
+            id = ESavingVideoWaitNote;
+            control = AVKON_NOTE 
+                {
+                layout = EWaitLayout;
+                animation = R_QGN_GRAF_WAIT_BAR_ANIM;
+                singular_label = qtn_lcam_note_processing_video_v2;
+                };
+            }
+        };
+    }
+
+//----------------------------------------------------
+//   
+//    r_cam_video_dynamic_settings_data
+//    Default values for the video dynamic setting items
+//
+//----------------------------------------------------
+//
+RESOURCE CAM_SETTING_ITEMS_DATA r_cam_video_dynamic_settings_data
+    {
+    settings_items =
+        {
+        CAM_NON_STATIC_SETTING_ITEM_DATA
+            {          
+            id = ECamSettingItemDynamicVideoWhiteBalance;
+            default = ECamWhiteBalanceAWB;
+            },
+   		CAM_NON_STATIC_SETTING_ITEM_DATA
+            {          
+            id = ECamSettingItemDynamicVideoExposure;
+            default = ECamExposureZero;
+            },
+        CAM_NON_STATIC_SETTING_ITEM_DATA
+            {
+            id = ECamSettingItemDynamicVideoColourFilter;
+            default = ECamColourFilterColour;
+            },
+        CAM_NON_STATIC_SETTING_ITEM_DATA
+            {
+            id = ECamSettingItemDynamicVideoScene;
+            default = ECamSceneNormal;
+            },
+        CAM_NON_STATIC_SETTING_ITEM_DATA
+            {
+            id = ECamSettingItemDynamicVideoFlash;
+            default = ECamFlashOff;
+            },
+        CAM_NON_STATIC_SETTING_ITEM_DATA
+            {
+            id = ECamSettingItemDynamicVideoBrightness;
+            default = ECamBrightnessNorm;
+            },
+        CAM_NON_STATIC_SETTING_ITEM_DATA
+            {
+            id = ECamSettingItemDynamicVideoContrast;
+            default = ECamContrastNorm;
+            },
+        CAM_NON_STATIC_SETTING_ITEM_DATA
+            {
+            id = ECamSettingItemDynamicVideoColourSaturation;
+            default = ECamColourSaturationNorm;
+            },
+        CAM_NON_STATIC_SETTING_ITEM_DATA
+            {
+            id = ECamSettingItemDynamicVideoLightSensitivity;
+            default = ECamLightSensitivityAuto;    
+            }                  
+        };
+    }
+
+
+
+// ---------------------------------------------------
+//
+//    r_cam_video_post_capture_delete_note
+//    Dialog to display delete video confirmation note
+//
+// ---------------------------------------------------
+//
+RESOURCE DIALOG r_cam_video_post_capture_delete_note
+    {
+    flags = EGeneralQueryFlags;
+    buttons = R_AVKON_SOFTKEYS_YES_NO__YES;
+
+    items =
+        {
+        DLG_LINE
+            {
+            type = EAknCtQuery;
+            id = EGeneralQuery;
+            control = AVKON_CONFIRMATION_QUERY
+                {
+                layout = EConfirmationQueryLayout;
+                label = "";
+                };
+            }
+        };
+    }
+
+//-----------------------------------------------------------------------------
+//
+//    r_cam_video_post_capture_delete_note_text
+//    Delete confirmation query text.
+//
+//-----------------------------------------------------------------------------
+//
+RESOURCE TBUF r_cam_video_post_capture_delete_note_text
+    {
+    buf = qtn_lcam_note_delete_video;
+    }
+
+// ---------------------------------------------------------
+//   
+//   r_cam_video_post_capture_ok_menubar
+//   Ok menubar for video post capture view
+//
+// ---------------------------------------------------------
+//
+RESOURCE MENU_BAR r_cam_video_post_capture_ok_menubar
+    {
+    titles =
+        {
+        MENU_TITLE
+            {
+            menu_pane = r_cam_video_post_capture_ok_menu;
+            }
+        };
+    }
+
+// ---------------------------------------------------------
+//   
+//   r_cam_video_post_capture_ok_menu
+//   Context specific ok options menu for 
+//   video post capture view
+//
+// ---------------------------------------------------------
+//
+RESOURCE MENU_PANE r_cam_video_post_capture_ok_menu
+    {
+    items = 
+        {
+        MENU_ITEM
+            {
+            command = ECamCmdNewVideo;
+            txt = qtn_lcam_options_new_video;
+            },        
+        MENU_ITEM
+            {
+            command = ECamCmdPlay;
+            txt = qtn_lcam_options_play;
+            },
+        MENU_ITEM
+            {
+            command = ECamCmdDelete;
+            txt = qtn_lcam_options_delete;
+            }
+        };
+    }
+
+//----------------------------------------------------
+//   
+//    r_cam_video_pre_capture_title_name
+//    Title name used in video pre-capture view
+//
+//----------------------------------------------------
+//
+RESOURCE TITLE_PANE r_cam_video_pre_capture_title_name
+    {
+    txt = qtn_lcam_title_text_video_camera;
+    }
+
+// ---------------------------------------------------------
+//   
+//   r_cam_video_pre_capture_ok_menubar
+//   Ok menubar for video pre-capture view
+//
+// ---------------------------------------------------------
+//
+RESOURCE MENU_BAR r_cam_video_pre_capture_ok_menubar
+    {
+    titles =
+        {
+        MENU_TITLE
+            {
+            menu_pane = r_cam_video_pre_capture_ok_menu;
+            }
+        };
+    }
+
+// ---------------------------------------------------------
+//   
+//   r_cam_video_pre_capture_ok_menu
+//   Context specific ok options menu for 
+//   video pre capture view
+//
+// ---------------------------------------------------------
+//
+RESOURCE MENU_PANE r_cam_video_pre_capture_ok_menu
+    {
+    items = 
+        {
+        MENU_ITEM
+            {
+            command = ECamCmdNewPhoto;
+            txt = qtn_lcam_options_photo_mode;
+            },
+        MENU_ITEM
+            {
+            command = ECamCmdShootSetup;
+            txt = qtn_lcam_options_videoset;
+            },
+        MENU_ITEM
+            {
+            command = ECamCmdSettings;
+            txt = qtn_lcam_cmd_settings;
+            }
+        };
+    }
+
+//----------------------------------------------------
+//   
+//    r_cam_video_resolution_array
+//    Mapping of video resolution settings
+//    to actual numeric parameters.
+//
+//----------------------------------------------------
+//
+RESOURCE CAM_RESOLUTION_ARRAY r_cam_video_resolution_array
+    {
+    resolutions =
+        {
+        // SubQCIF video (SubQCIF viewfinder)
+        CAM_RESOLUTION
+            {
+            width = 128;
+            height = 96;
+            },
+        // QCIF video (QCIF viewfinder)
+        CAM_RESOLUTION
+            {
+            width = 176;
+            height = 144;
+            },
+        // CIF video 
+        CAM_RESOLUTION
+            {
+            width = 352;
+            height = 288;
+            },
+        // VGA video 
+        CAM_RESOLUTION
+            {
+            width = 640;
+            height = 480;
+            },
+        // QVGA video 
+        CAM_RESOLUTION
+            {
+            width = 320;
+            height = 240;
+            },
+        // nHD video 
+        CAM_RESOLUTION
+            {
+            width = 640;
+            height = 352;
+            },
+        // WVGA video 
+        CAM_RESOLUTION
+            {
+            width = 864;
+            height = 480;
+            },
+        // HD 720 video 
+        CAM_RESOLUTION
+            {
+            width = 1280;
+            height = 720;
+            }
+        };
+    }
+
+
+//----------------------------------------------------
+//   
+//    r_cam_set_as_ring_tone_interest
+//    This resource is used to register an interest in 
+//    assinging video to Application InterWork (AIW)
+//	  services
+//
+//----------------------------------------------------
+//
+RESOURCE AIW_INTEREST r_cam_set_as_ring_tone_interest
+    {
+    items = 
+        {
+        AIW_CRITERIA_ITEM   // 
+            {
+            id = KAiwCmdAssign;
+            serviceCmd = KAiwCmdAssign;        
+            contentType = "*";
+            serviceClass = KAiwClassMenu; 
+            //maxProviders = 1;         
+            loadOptions = AIW_OPTIONS_ROM_ONLY;         
+            //defaultProvider = 0x10281F18;       
+            }
+        };
+    }
+
+//----------------------------------------------------
+//   
+//    r_cam_set_as_ring_tone_interest_editor
+//    This resource is used to register an interest in 
+//    assinging video to Application InterWork (AIW)
+//    services with Photos editor
+//
+//----------------------------------------------------
+//
+RESOURCE AIW_INTEREST r_cam_set_as_ring_tone_interest_editor
+    {
+    items = 
+        {
+        AIW_CRITERIA_ITEM   // 
+            {
+            id = KAiwCmdAssign;
+            serviceCmd = KAiwCmdAssign;        
+            contentType = "MediaEditor/*";
+            serviceClass = KAiwClassMenu; 
+            //maxProviders = 1;         
+            loadOptions = AIW_OPTIONS_ROM_ONLY;         
+            //defaultProvider = 0x10281F18;       
+            }
+        };
+    }