FCL/sf/app/camera: comparison camerauis/cameraapp/generic/data/nhdcamsettings.rss

equal deleted inserted replaced

-:8c55c525d5d7
+:d486e5e3cc9a
 {
 lines = 3;
 flags = KAknToolbarFixed | KAknToolbarDsaMode | KAknToolbarNoBackground | KAknToolbarTransparent;
 items =
 {
-TBAR_CTRL
+/*TBAR_CTRL
 {
 type = EAknCtButton;
 id = ECamCmdCaptureImage;
 control = AVKON_BUTTON
 {
 helptxt = qtn_lcam_tt_capture;
 extension = r_cam_ext_qgn_indi_cam4_tb_capture;
 }
 };
 };
-},
+},*/
-TBAR_CTRL
+TBAR_CTRL
 {
 type = EAknCtButton;
 id = ECamCmdNewVideo;
 control = AVKON_BUTTON
 {
 }
 };
 };
 },
 TBAR_CTRL
+{
+type = EAknCtButton;
+id = ECamCmdPhotos;
+control = AVKON_BUTTON
+{
+flags = KAknButtonNoFrame;
+states =
+{
+AVKON_BUTTON_STATE
+{
+bmpfile = CAMERAAPP_BITMAP_FILE;
+bmpid = EMbmCameraappQgn_indi_cam4_goto_gallery;
+bmpmask = EMbmCameraappQgn_indi_cam4_goto_gallery_mask;
+helptxt = qtn_lcam_tt_go_to_photos;
+extension = r_cam_ext_qgn_indi_cam4_goto_photos;
+}
+};
+};
+},
+TBAR_CTRL
+{
+type = EAknCtButton;
+id = ECamCmdSwitchCamera;
+control = AVKON_BUTTON
+{
+flags = KAknButtonNoFrame;
+states =
+{
+AVKON_BUTTON_STATE
+{
+bmpfile = CAMERAAPP_BITMAP_FILE;
+bmpid = EMbmCameraappQgn_indi_tb_cam4_goto_main;
+bmpmask = EMbmCameraappQgn_indi_tb_cam4_goto_main_mask;
+helptxt = qtn_lcam_tt_camera_main;
+extension = r_cam_ext_qgn_indi_cam4_mode_camera;
+}
+};
+};
+}
+};
+}
+//----------------------------------------------------
+//
+//    r_cam_video_precapture_toolbar_portrait
+//    Toolbar and toolbar extension for video pre-capture view for secondary
+//    camera
+//
+//----------------------------------------------------
+//
+RESOURCE AVKON_TOOLBAR r_cam_video_precapture_toolbar_portrait
+{
+lines = 3;
+flags = KAknToolbarFixed | KAknToolbarDsaMode;
+items =
+{
+TBAR_CTRL
+{
+type = EAknCtButton;
+id = ECamCmdRecord;
+control = AVKON_BUTTON
+{
+states =
+{
+AVKON_BUTTON_STATE
+{
+bmpfile = CAMERAAPP_BITMAP_FILE;
+bmpid = EMbmCameraappQgn_indi_cam4_tb_record;
+bmpmask = EMbmCameraappQgn_indi_cam4_tb_record_mask;
+helptxt = qtn_lcam_tt_record;
+extension = r_cam_ext_qgn_indi_cam4_tb_record;
+}
+};
+};
+},
+TBAR_CTRL
+{
+type = EAknCtButton;
+id = ECamCmdNewPhoto;
+control = AVKON_BUTTON
+{
+states =
+{
+AVKON_BUTTON_STATE
+{
+bmpfile = CAMERAAPP_BITMAP_FILE;
+bmpid = EMbmCameraappQgn_indi_cam4_camera;
+bmpmask = EMbmCameraappQgn_indi_cam4_camera_mask;
+helptxt = qtn_lcam_tt_still_mode;
+extension = r_cam_ext_qgn_indi_cam4_camera;
+}
+};
+};
+},
+TBAR_CTRL
 {
 type = EAknCtButton;
 id = ECamCmdSwitchCamera;
 control = AVKON_BUTTON
 {
-flags = KAknButtonNoFrame;
 states =
 {
 AVKON_BUTTON_STATE
 {
 bmpfile = CAMERAAPP_BITMAP_FILE;
 };
 };
 }
 };
 }
 //----------------------------------------------------
 //
-//    r_cam_video_precapture_toolbar_portrait
+//    r_cam_video_precapture_toolbar_landscape
 //    Toolbar and toolbar extension for video pre-capture view for secondary
 //    camera
 //
 //----------------------------------------------------
 //
-RESOURCE AVKON_TOOLBAR r_cam_video_precapture_toolbar_portrait
+RESOURCE AVKON_TOOLBAR r_cam_video_precapture_toolbar_landscape
 {
 lines = 3;
-flags = KAknToolbarFixed | KAknToolbarDsaMode;
+flags = KAknToolbarFixed | KAknToolbarDsaMode | KAknToolbarNoBackground | KAknToolbarTransparent;
 items =
 {
-TBAR_CTRL
+/*TBAR_CTRL
 {
 type = EAknCtButton;
 id = ECamCmdRecord;
 control = AVKON_BUTTON
 {
+flags = KAknButtonNoFrame;
 states =
 {
 AVKON_BUTTON_STATE
 {
 bmpfile = CAMERAAPP_BITMAP_FILE;
 helptxt = qtn_lcam_tt_record;
 extension = r_cam_ext_qgn_indi_cam4_tb_record;
 }
 };
 };
-},
+},*/
 TBAR_CTRL
 {
 type = EAknCtButton;
 id = ECamCmdNewPhoto;
 control = AVKON_BUTTON
 {
+flags = KAknButtonNoFrame;
 states =
 {
 AVKON_BUTTON_STATE
 {
 bmpfile = CAMERAAPP_BITMAP_FILE;
 extension = r_cam_ext_qgn_indi_cam4_camera;
 }
 };
 };
 },
 TBAR_CTRL
+{
+type = EAknCtButton;
+id = ECamCmdPhotos;
+control = AVKON_BUTTON
+{
+flags = KAknButtonNoFrame;
+states =
+{
+AVKON_BUTTON_STATE
+{
+bmpfile = CAMERAAPP_BITMAP_FILE;
+bmpid = EMbmCameraappQgn_indi_cam4_goto_gallery;
+bmpmask = EMbmCameraappQgn_indi_cam4_goto_gallery_mask;
+helptxt = qtn_lcam_tt_go_to_photos;
+extension = r_cam_ext_qgn_indi_cam4_goto_photos;
+}
+};
+};
+},
+TBAR_CTRL
 {
 type = EAknCtButton;
 id = ECamCmdSwitchCamera;
 control = AVKON_BUTTON
 {
+flags = KAknButtonNoFrame;
 states =
 {
 AVKON_BUTTON_STATE
 {
 bmpfile = CAMERAAPP_BITMAP_FILE;
 helptxt = qtn_lcam_tt_camera_main;
 extension = r_cam_ext_qgn_indi_cam4_mode_camera;
 }
 };
 };
 }
 };
 }
 //----------------------------------------------------
 //
-//    r_cam_video_precapture_toolbar_landscape
+//    r_cam_still_precapture_toolbar
-//    Toolbar and toolbar extension for video pre-capture view for secondary
+//    Toolbar and toolbar extension for still pre-capture view for primary
 //    camera
 //
 //----------------------------------------------------
 //
-RESOURCE AVKON_TOOLBAR r_cam_video_precapture_toolbar_landscape
+RESOURCE AVKON_TOOLBAR r_cam_still_precapture_toolbar
 {
 lines = 3;
 flags = KAknToolbarFixed | KAknToolbarDsaMode | KAknToolbarNoBackground | KAknToolbarTransparent;
 items =
 {
 TBAR_CTRL
 {
 type = EAknCtButton;
-id = ECamCmdRecord;
+id = ECamCmdNewVideo;
 control = AVKON_BUTTON
 {
 flags = KAknButtonNoFrame;
 states =
 {
 AVKON_BUTTON_STATE
 {
 bmpfile = CAMERAAPP_BITMAP_FILE;
-bmpid = EMbmCameraappQgn_indi_cam4_tb_record;
+bmpid = EMbmCameraappQgn_indi_cam4_video;
-bmpmask = EMbmCameraappQgn_indi_cam4_tb_record_mask;
+bmpmask = EMbmCameraappQgn_indi_cam4_video_mask;
-helptxt = qtn_lcam_tt_record;
+helptxt = qtn_lcam_tt_video_mode;
-extension = r_cam_ext_qgn_indi_cam4_tb_record;
+extension = r_cam_ext_qgn_indi_cam4_video;
 }
 };
 };
 },
-TBAR_CTRL
+/*TBAR_CTRL
-{
-type = EAknCtButton;
-id = ECamCmdNewPhoto;
-control = AVKON_BUTTON
-{
-flags = KAknButtonNoFrame;
-states =
-{
-AVKON_BUTTON_STATE
-{
-bmpfile = CAMERAAPP_BITMAP_FILE;
-bmpid = EMbmCameraappQgn_indi_cam4_camera;
-bmpmask = EMbmCameraappQgn_indi_cam4_camera_mask;
-helptxt = qtn_lcam_tt_still_mode;
-extension = r_cam_ext_qgn_indi_cam4_camera;
-}
-};
-};
-},
-TBAR_CTRL
-{
-type = EAknCtButton;
-id = ECamCmdSwitchCamera;
-control = AVKON_BUTTON
-{
-flags = KAknButtonNoFrame;
-states =
-{
-AVKON_BUTTON_STATE
-{
-bmpfile = CAMERAAPP_BITMAP_FILE;
-bmpid = EMbmCameraappQgn_indi_tb_cam4_goto_main;
-bmpmask = EMbmCameraappQgn_indi_tb_cam4_goto_main_mask;
-helptxt = qtn_lcam_tt_camera_main;
-extension = r_cam_ext_qgn_indi_cam4_mode_camera;
-}
-};
-};
-}
-};
-}
-//----------------------------------------------------
-//
-//    r_cam_still_precapture_toolbar
-//    Toolbar and toolbar extension for still pre-capture view for primary
-//    camera
-//
-//----------------------------------------------------
-//
-RESOURCE AVKON_TOOLBAR r_cam_still_precapture_toolbar
-{
-lines = 3;
-flags = KAknToolbarFixed | KAknToolbarDsaMode | KAknToolbarNoBackground | KAknToolbarTransparent;
-items =
-{
-TBAR_CTRL
 {
 type = EAknCtButton;
 id = ECamCmdCaptureImage;
 control = AVKON_BUTTON
 {
 helptxt = qtn_lcam_tt_capture;
 extension = r_cam_ext_qgn_indi_cam4_tb_capture;
 }
 };
 };
-},
+},*/
 TBAR_CTRL
 {
 type = EAknCtButton;
 id = ECamCmdCaptureSetupFlashStill;
 control = AVKON_BUTTON
 txt = qtn_lcam_tb_go_to_photos;
 extension = r_cam_ext_qgn_indi_cam4_goto_photos;
 }
 };
 };
-},
+}/*,
 TBAR_CTRL
 {
 type = EAknCtButton;
 id = ECamCmdNewVideo;
 control = AVKON_BUTTON
 txt = qtn_lcam_tb_switch_video_mode;
 extension = r_cam_ext_qgn_indi_cam4_video;
 }
 };
 };
-}
+}*/
 };
 };
 }
 };
 }
 items =
 {
 TBAR_CTRL
 {
 type = EAknCtButton;
+id = ECamCmdNewPhoto;
+control = AVKON_BUTTON
+{
+flags = KAknButtonNoFrame;
+states =
+{
+AVKON_BUTTON_STATE
+{
+bmpfile = CAMERAAPP_BITMAP_FILE;
+bmpid = EMbmCameraappQgn_indi_cam4_camera;
+bmpmask = EMbmCameraappQgn_indi_cam4_camera_mask;
+helptxt = qtn_lcam_tt_still_mode;
+extension = r_cam_ext_qgn_indi_cam4_camera;
+}
+};
+};
+},
+/*TBAR_CTRL
+{
+type = EAknCtButton;
 id = ECamCmdRecord;
 control = AVKON_BUTTON
 {
 flags = KAknButtonNoFrame;
 states =
 helptxt = qtn_lcam_tt_start_video_rec;
 extension = r_cam_ext_qgn_indi_cam4_tb_record;
 }
 };
 };
-},
+},*/
 TBAR_CTRL
 {
 type = EAknCtButton;
 id = ECamCmdToggleVideoFlash;
 control = AVKON_BUTTON
 txt = qtn_lcam_tb_go_to_photos;
 extension = r_cam_ext_qgn_indi_cam4_goto_photos;
 }
 };
 };
-},
+}/*,
 TBAR_CTRL
 {
 type = EAknCtButton;
 id = ECamCmdNewPhoto;
 control = AVKON_BUTTON
 txt = qtn_lcam_tb_switch_mode;
 extension = r_cam_ext_qgn_indi_cam4_camera;
 }
 };
 };
-}
+}*/
 };
 };
 }
 };
 }
 items =
 {
 TBAR_CTRL
 {
 type = EAknCtButton;
+id = ECamCmdNewPhoto;
+control = AVKON_BUTTON
+{
+flags = KAknButtonNoFrame;
+states =
+{
+AVKON_BUTTON_STATE
+{
+bmpfile = CAMERAAPP_BITMAP_FILE;
+bmpid = EMbmCameraappQgn_indi_cam4_camera;
+bmpmask = EMbmCameraappQgn_indi_cam4_camera_mask;
+helptxt = qtn_lcam_tt_still_mode;
+extension = r_cam_ext_qgn_indi_cam4_camera;
+}
+};
+};
+},
+/*TBAR_CTRL
+{
+type = EAknCtButton;
 id = ECamCmdRecord;
 control = AVKON_BUTTON
 {
 flags = KAknButtonNoFrame;
 states =
 helptxt = qtn_lcam_tt_start_video_rec;
 extension = r_cam_ext_qgn_indi_cam4_tb_record;
 }
 };
 };
-},
+},*/
 TBAR_CTRL
 {
 type = EAknCtButton;
 id = ECamCmdCaptureSetupSceneVideo;
 control = AVKON_BUTTON
 states =
 {
 AVKON_BUTTON_STATE
 {
 //txt = qtn_lcam_tb_scenes;
-			helptxt = qtn_lcam_tt_goto_scenemode_settings;
+helptxt = qtn_lcam_tt_goto_scenemode_settings;
 }
 };
 };
 },
 TBAR_CTRL
 txt = qtn_lcam_tb_go_to_photos;
 extension = r_cam_ext_qgn_indi_cam4_goto_photos;
 }
 };
 };
-},
+}/*,
 TBAR_CTRL
 {
 type = EAknCtButton;
 id = ECamCmdNewPhoto;
 control = AVKON_BUTTON
 txt = qtn_lcam_tb_switch_mode;
 extension = r_cam_ext_qgn_indi_cam4_camera;
 }
 };
 };
-}
+}*/
 };
 };
 }
 };
 }

branch	RCL_3
changeset 16	d486e5e3cc9a
parent 12	8c55c525d5d7
child 18	51dda465e618