diff -r bf64cebf4673 -r 53c8aa5d97a3 camerauis/cameraapp/generic/src/CamStillPreCaptureContainer.cpp --- a/camerauis/cameraapp/generic/src/CamStillPreCaptureContainer.cpp Tue May 11 15:56:11 2010 +0300 +++ b/camerauis/cameraapp/generic/src/CamStillPreCaptureContainer.cpp Tue May 25 12:22:04 2010 +0300 @@ -51,6 +51,8 @@ const TRgb KGridColor = KRgbGray; const CGraphicsContext::TPenStyle KGridStyle = CGraphicsContext::ESolidPen; +_LIT(KCamBitmapFile, "z:\\resource\\apps\\cameraapp.mif"); +const TSize KIconSize(35, 35); // ================= MEMBER FUNCTIONS ======================= @@ -99,6 +101,13 @@ delete iFlashBitmap; delete iFlashBitmapMask; } + + if ( iCaptureIcon ) + { + delete iCaptureIcon; + delete iCaptureMask; + } + PRINT( _L("Camera <= ~CCamStillPreCaptureContainer" )) } @@ -151,6 +160,17 @@ ->SetupActivePaletteL( static_cast(&iView) ); OstTrace0( CAMERAAPP_PERFORMANCE, DUP1_CCAMSTILLPRECAPTURECONTAINER_CONSTRUCTL, "e_CAM_APP_AP_SETUP 0" ); } + + // Load capture icon + AknIconUtils::CreateIconL( + iCaptureIcon, + iCaptureMask, + KCamBitmapFile(), + EMbmCameraappQgn_indi_cam4_capture, + EMbmCameraappQgn_indi_cam4_capture_mask ); + AknIconUtils::SetSize( iCaptureIcon, KIconSize, EAspectRatioPreserved ); + AknIconUtils::SetSize( iCaptureMask, KIconSize, EAspectRatioPreserved ); + PRINT( _L("Camera <= CCamStillPreCaptureContainer::ConstructL" )) } @@ -511,7 +531,8 @@ // First handle middle softkey and enter key capture event if ( !appui->IsToolBarVisible() && ( aKeyEvent.iScanCode == EStdKeyDevice3 - || aKeyEvent.iScanCode == EStdKeyEnter ) ) + || aKeyEvent.iScanCode == EStdKeyEnter + || aKeyEvent.iScanCode == EStdKeyNkpEnter ) ) { if ( iController.UiConfigManagerPtr() ) {