equal
deleted
inserted
replaced
43 #include <akntoolbarextension.h> |
43 #include <akntoolbarextension.h> |
44 #include <aknbutton.h> |
44 #include <aknbutton.h> |
45 #include <AknsUtils.h> |
45 #include <AknsUtils.h> |
46 #include <cameraapp.mbg> |
46 #include <cameraapp.mbg> |
47 #include <AknIconUtils.h> |
47 #include <AknIconUtils.h> |
|
48 #include <gulicon.h> |
48 |
49 |
49 |
50 |
50 #include "StringLoader.h" |
51 #include "StringLoader.h" |
51 #include "camactivepalettehandler.h" |
52 #include "camactivepalettehandler.h" |
52 #include "CameraUiConfigManager.h" |
53 #include "CameraUiConfigManager.h" |
|
54 #include "CamSidePane.h" |
53 |
55 |
54 #include "CamLocalViewIds.h" |
56 #include "CamLocalViewIds.h" |
55 #include "OstTraceDefinitions.h" |
57 #include "OstTraceDefinitions.h" |
56 #ifdef OST_TRACE_COMPILER_IN_USE |
58 #ifdef OST_TRACE_COMPILER_IN_USE |
57 #include "CamStillPreCaptureViewTraces.h" |
59 #include "CamStillPreCaptureViewTraces.h" |
117 // Handle commands |
119 // Handle commands |
118 // ----------------------------------------------------------------------------- |
120 // ----------------------------------------------------------------------------- |
119 // |
121 // |
120 void CCamStillPreCaptureView::HandleCommandL( TInt aCommand ) |
122 void CCamStillPreCaptureView::HandleCommandL( TInt aCommand ) |
121 { |
123 { |
|
124 PRINT( _L("Camera => CCamStillPreCaptureView::HandleCommandL") ); |
122 CCamAppUi* appUi = static_cast<CCamAppUi*>( iEikonEnv->AppUi() ); |
125 CCamAppUi* appUi = static_cast<CCamAppUi*>( iEikonEnv->AppUi() ); |
123 TCamOrientation orientation = appUi->CamOrientation(); |
126 TCamOrientation orientation = appUi->CamOrientation(); |
124 switch ( aCommand ) |
127 switch ( aCommand ) |
125 { |
128 { |
126 case ECamMSKCmdSelect: |
129 case ECamMSKCmdSelect: |
284 default: |
287 default: |
285 { |
288 { |
286 CCamPreCaptureViewBase::HandleCommandL( aCommand ); |
289 CCamPreCaptureViewBase::HandleCommandL( aCommand ); |
287 } |
290 } |
288 } |
291 } |
|
292 PRINT( _L("Camera <= CCamStillPreCaptureView::HandleCommandL") ); |
289 } |
293 } |
290 |
294 |
291 // ----------------------------------------------------------------------------- |
295 // ----------------------------------------------------------------------------- |
292 // CCamStillPreCaptureView::HandleForegroundEventL |
296 // CCamStillPreCaptureView::HandleForegroundEventL |
293 // Handle foreground event |
297 // Handle foreground event |
427 { |
431 { |
428 iController.StopSequenceCaptureL(); |
432 iController.StopSequenceCaptureL(); |
429 } |
433 } |
430 } |
434 } |
431 CCamPreCaptureViewBase::HandleFocusLossL(); |
435 CCamPreCaptureViewBase::HandleFocusLossL(); |
432 PRINT( _L( "Camera <= CCamVideoPreCaptureView::HandleFocusLossL" ) ); |
436 PRINT( _L( "Camera <= CCamStillPreCaptureView::HandleFocusLossL" ) ); |
433 } |
437 } |
434 |
438 |
435 // ----------------------------------------------------------------------------- |
439 // ----------------------------------------------------------------------------- |
436 // CCamStillPreCaptureView::HandleControllerEventL |
440 // CCamStillPreCaptureView::HandleControllerEventL |
437 // Handle controller events |
441 // Handle controller events |
745 // If "Burst" capture is starting |
749 // If "Burst" capture is starting |
746 else if ( burstEnabled && operation == ECamCapturing ) |
750 else if ( burstEnabled && operation == ECamCapturing ) |
747 { |
751 { |
748 |
752 |
749 SetSoftKeysL( R_CAM_SOFTKEYS_BLANK_STOP ); |
753 SetSoftKeysL( R_CAM_SOFTKEYS_BLANK_STOP ); |
750 |
|
751 } |
754 } |
752 // If "Burst" capture is completing |
755 // If "Burst" capture is completing |
753 else if ( burstEnabled && operation == ECamCompleting ) |
756 else if ( burstEnabled && operation == ECamCompleting ) |
754 { |
757 { |
755 SetSoftKeysL( R_CAM_SOFTKEYS_BLANK ); |
758 SetSoftKeysL( R_CAM_SOFTKEYS_BLANK ); |
1985 TCamSceneId scene = static_cast< TCamSceneId > ( |
1988 TCamSceneId scene = static_cast< TCamSceneId > ( |
1986 iController.IntegerSettingValue( ECamSettingItemDynamicPhotoScene ) ); |
1989 iController.IntegerSettingValue( ECamSettingItemDynamicPhotoScene ) ); |
1987 MAknsSkinInstance* skinInstance = AknsUtils::SkinInstance(); |
1990 MAknsSkinInstance* skinInstance = AknsUtils::SkinInstance(); |
1988 TFileName iconFileName; |
1991 TFileName iconFileName; |
1989 CamUtility::ResourceFileName( iconFileName ); |
1992 CamUtility::ResourceFileName( iconFileName ); |
1990 |
1993 |
|
1994 // For use with scene indicator |
|
1995 TInt32 iconId = EMbmCameraappQgn_indi_cam4_mode_auto; |
|
1996 TInt32 maskId = EMbmCameraappQgn_indi_cam4_mode_auto_mask; |
|
1997 |
1991 switch ( scene ) |
1998 switch ( scene ) |
1992 { |
1999 { |
1993 case ECamSceneAuto: |
2000 case ECamSceneAuto: |
1994 { |
2001 { |
1995 SetIconL( |
2002 SetIconL( |
1997 iconFileName, |
2004 iconFileName, |
1998 EMbmCameraappQgn_indi_cam4_mode_auto, |
2005 EMbmCameraappQgn_indi_cam4_mode_auto, |
1999 EMbmCameraappQgn_indi_cam4_mode_auto_mask, |
2006 EMbmCameraappQgn_indi_cam4_mode_auto_mask, |
2000 skinInstance, |
2007 skinInstance, |
2001 KAknsIIDQgnIndiCam4ModeAuto ); |
2008 KAknsIIDQgnIndiCam4ModeAuto ); |
|
2009 iconId = EMbmCameraappQgn_indi_cam4_mode_auto; |
|
2010 maskId = EMbmCameraappQgn_indi_cam4_mode_auto_mask; |
2002 break; |
2011 break; |
2003 } |
2012 } |
2004 case ECamSceneUser: |
2013 case ECamSceneUser: |
2005 { |
2014 { |
2006 SetIconL( |
2015 SetIconL( |
2008 iconFileName, |
2017 iconFileName, |
2009 EMbmCameraappQgn_indi_cam4_mode_userscene, |
2018 EMbmCameraappQgn_indi_cam4_mode_userscene, |
2010 EMbmCameraappQgn_indi_cam4_mode_userscene_mask, |
2019 EMbmCameraappQgn_indi_cam4_mode_userscene_mask, |
2011 skinInstance, |
2020 skinInstance, |
2012 KAknsIIDQgnIndiCam4ModeUserscene ); |
2021 KAknsIIDQgnIndiCam4ModeUserscene ); |
|
2022 iconId = EMbmCameraappQgn_indi_cam4_mode_userscene; |
|
2023 maskId = EMbmCameraappQgn_indi_cam4_mode_userscene_mask; |
2013 break; |
2024 break; |
2014 } |
2025 } |
2015 case ECamSceneMacro: |
2026 case ECamSceneMacro: |
2016 { |
2027 { |
2017 SetIconL( |
2028 SetIconL( |
2019 iconFileName, |
2030 iconFileName, |
2020 EMbmCameraappQgn_indi_cam4_mode_closeup, |
2031 EMbmCameraappQgn_indi_cam4_mode_closeup, |
2021 EMbmCameraappQgn_indi_cam4_mode_closeup_mask, |
2032 EMbmCameraappQgn_indi_cam4_mode_closeup_mask, |
2022 skinInstance, |
2033 skinInstance, |
2023 KAknsIIDQgnIndiCam4ModeCloseup ); |
2034 KAknsIIDQgnIndiCam4ModeCloseup ); |
|
2035 iconId = EMbmCameraappQgn_indi_cam4_mode_closeup; |
|
2036 maskId = EMbmCameraappQgn_indi_cam4_mode_closeup_mask; |
2024 break; |
2037 break; |
2025 } |
2038 } |
2026 case ECamScenePortrait: |
2039 case ECamScenePortrait: |
2027 { |
2040 { |
2028 SetIconL( |
2041 SetIconL( |
2030 iconFileName, |
2043 iconFileName, |
2031 EMbmCameraappQgn_indi_cam4_mode_portrait, |
2044 EMbmCameraappQgn_indi_cam4_mode_portrait, |
2032 EMbmCameraappQgn_indi_cam4_mode_portrait_mask, |
2045 EMbmCameraappQgn_indi_cam4_mode_portrait_mask, |
2033 skinInstance, |
2046 skinInstance, |
2034 KAknsIIDQgnIndiCam4ModePortrait ); |
2047 KAknsIIDQgnIndiCam4ModePortrait ); |
|
2048 iconId = EMbmCameraappQgn_indi_cam4_mode_portrait; |
|
2049 maskId = EMbmCameraappQgn_indi_cam4_mode_portrait_mask; |
2035 break; |
2050 break; |
2036 } |
2051 } |
2037 case ECamSceneScenery: |
2052 case ECamSceneScenery: |
2038 { |
2053 { |
2039 SetIconL( |
2054 SetIconL( |
2041 iconFileName, |
2056 iconFileName, |
2042 EMbmCameraappQgn_indi_cam4_mode_landscape, |
2057 EMbmCameraappQgn_indi_cam4_mode_landscape, |
2043 EMbmCameraappQgn_indi_cam4_mode_landscape_mask, |
2058 EMbmCameraappQgn_indi_cam4_mode_landscape_mask, |
2044 skinInstance, |
2059 skinInstance, |
2045 KAknsIIDQgnIndiCam4ModeLandscape ); |
2060 KAknsIIDQgnIndiCam4ModeLandscape ); |
|
2061 iconId = EMbmCameraappQgn_indi_cam4_mode_landscape; |
|
2062 maskId = EMbmCameraappQgn_indi_cam4_mode_landscape_mask; |
2046 break; |
2063 break; |
2047 } |
2064 } |
2048 case ECamSceneNight: |
2065 case ECamSceneNight: |
2049 { |
2066 { |
2050 SetIconL( |
2067 SetIconL( |
2052 iconFileName, |
2069 iconFileName, |
2053 EMbmCameraappQgn_indi_cam4_mode_night, |
2070 EMbmCameraappQgn_indi_cam4_mode_night, |
2054 EMbmCameraappQgn_indi_cam4_mode_night_mask, |
2071 EMbmCameraappQgn_indi_cam4_mode_night_mask, |
2055 skinInstance, |
2072 skinInstance, |
2056 KAknsIIDQgnIndiCam4ModeNight ); |
2073 KAknsIIDQgnIndiCam4ModeNight ); |
|
2074 iconId = EMbmCameraappQgn_indi_cam4_mode_night; |
|
2075 maskId = EMbmCameraappQgn_indi_cam4_mode_night_mask; |
2057 break; |
2076 break; |
2058 } |
2077 } |
2059 case ECamSceneSports: |
2078 case ECamSceneSports: |
2060 { |
2079 { |
2061 SetIconL( |
2080 SetIconL( |
2063 iconFileName, |
2082 iconFileName, |
2064 EMbmCameraappQgn_indi_cam4_mode_sport, |
2083 EMbmCameraappQgn_indi_cam4_mode_sport, |
2065 EMbmCameraappQgn_indi_cam4_mode_sport_mask, |
2084 EMbmCameraappQgn_indi_cam4_mode_sport_mask, |
2066 skinInstance, |
2085 skinInstance, |
2067 KAknsIIDQgnIndiCam4ModeSport ); |
2086 KAknsIIDQgnIndiCam4ModeSport ); |
|
2087 iconId = EMbmCameraappQgn_indi_cam4_mode_sport; |
|
2088 maskId = EMbmCameraappQgn_indi_cam4_mode_sport_mask; |
2068 break; |
2089 break; |
2069 } |
2090 } |
2070 case ECamSceneNightScenery: |
2091 case ECamSceneNightScenery: |
2071 case ECamSceneNightPortrait: |
2092 case ECamSceneNightPortrait: |
2072 { |
2093 { |
2075 iconFileName, |
2096 iconFileName, |
2076 EMbmCameraappQgn_indi_cam4_mode_portrait_night, |
2097 EMbmCameraappQgn_indi_cam4_mode_portrait_night, |
2077 EMbmCameraappQgn_indi_cam4_mode_portrait_night_mask, |
2098 EMbmCameraappQgn_indi_cam4_mode_portrait_night_mask, |
2078 skinInstance, |
2099 skinInstance, |
2079 KAknsIIDQgnIndiCam4ModePortraitNight ); |
2100 KAknsIIDQgnIndiCam4ModePortraitNight ); |
|
2101 iconId = EMbmCameraappQgn_indi_cam4_mode_portrait_night; |
|
2102 maskId = EMbmCameraappQgn_indi_cam4_mode_portrait_night_mask; |
2080 break; |
2103 break; |
2081 } |
2104 } |
2082 case ECamSceneCandlelight: |
2105 case ECamSceneCandlelight: |
2083 default: |
2106 default: |
2084 break; |
2107 break; |
2085 } |
2108 } |
2086 } |
2109 |
|
2110 // Update the icon in the side pane |
|
2111 if ( iController.UiConfigManagerPtr()->IsCustomCaptureButtonSupported() ) |
|
2112 { |
|
2113 CCamAppUi* appUi = static_cast<CCamAppUi*>( iEikonEnv->AppUi() ); |
|
2114 CCamSidePane* sidePane = appUi->SidePane(); |
2087 |
2115 |
|
2116 if ( sidePane ) |
|
2117 { |
|
2118 PRINT( _L("Camera <> CCamStillPreCaptureView::UpdateSceneModeIconsL - Updating side pane indicator") ); |
|
2119 sidePane->UpdateSceneIndicatorL( iconId, maskId ); |
|
2120 } |
|
2121 } |
|
2122 } |
2088 } |
2123 } |
2089 |
2124 |
2090 // --------------------------------------------------------------------------- |
2125 // --------------------------------------------------------------------------- |
2091 // CCamStillPreCaptureView::UpdateVFGridIconsL |
2126 // CCamStillPreCaptureView::UpdateVFGridIconsL |
2092 // --------------------------------------------------------------------------- |
2127 // --------------------------------------------------------------------------- |