38 #include <AknsUtils.h> |
38 #include <AknsUtils.h> |
39 #include <AknsConstants.h> |
39 #include <AknsConstants.h> |
40 #include <cameraapp.mbg> |
40 #include <cameraapp.mbg> |
41 #include "CamCaptureSetupMenu.h" |
41 #include "CamCaptureSetupMenu.h" |
42 #include "CamPanic.h" |
42 #include "CamPanic.h" |
|
43 #include "CamSidePane.h" |
43 |
44 |
44 #include "CamShootingModeContainer.h" |
45 #include "CamShootingModeContainer.h" |
45 #include "CamVideoPreCaptureContainer.h" |
46 #include "CamVideoPreCaptureContainer.h" |
46 #include "Cam.hrh" |
47 #include "Cam.hrh" |
47 #include "CamAppUid.h" |
48 #include "CamAppUid.h" |
1241 // Update fixed toolbar icons according to current settings |
1242 // Update fixed toolbar icons according to current settings |
1242 // --------------------------------------------------------------------------- |
1243 // --------------------------------------------------------------------------- |
1243 // |
1244 // |
1244 void CCamVideoPreCaptureView::UpdateToolbarIconsL() |
1245 void CCamVideoPreCaptureView::UpdateToolbarIconsL() |
1245 { |
1246 { |
|
1247 PRINT( _L("Camera => CCamVideoPreCaptureView::UpdateToolbarIconsL") ); |
1246 // fixed toolbar is used only with touch devices |
1248 // fixed toolbar is used only with touch devices |
1247 if (!iController.IsTouchScreenSupported() ) |
1249 if (!iController.IsTouchScreenSupported() ) |
1248 return; |
1250 return; |
1249 UpdateVideoFlashIconsL(); |
1251 UpdateVideoFlashIconsL(); |
1250 UpdateVideoSceneModeIconsL(); |
1252 UpdateVideoSceneModeIconsL(); |
1251 UpdateVideoColorToneIconsL(); |
1253 UpdateVideoColorToneIconsL(); |
1252 UpdateVideoWhitebalanceIconsL(); |
1254 UpdateVideoWhitebalanceIconsL(); |
1253 RedrawToolBar(); |
1255 RedrawToolBar(); |
|
1256 PRINT( _L("Camera <= CCamVideoPreCaptureView::UpdateToolbarIconsL") ); |
1254 } |
1257 } |
1255 |
1258 |
1256 // --------------------------------------------------------------------------- |
1259 // --------------------------------------------------------------------------- |
1257 // CCamVideoPreCaptureView::OfferToolbarEventL |
1260 // CCamVideoPreCaptureView::OfferToolbarEventL |
1258 // Handle commands from toolbar |
1261 // Handle commands from toolbar |
1405 MAknsSkinInstance* skinInstance = AknsUtils::SkinInstance(); |
1408 MAknsSkinInstance* skinInstance = AknsUtils::SkinInstance(); |
1406 TFileName iconFileName; |
1409 TFileName iconFileName; |
1407 CamUtility::ResourceFileName( iconFileName ); |
1410 CamUtility::ResourceFileName( iconFileName ); |
1408 TCamSceneId scene = static_cast< TCamSceneId > ( |
1411 TCamSceneId scene = static_cast< TCamSceneId > ( |
1409 iController.IntegerSettingValue( ECamSettingItemDynamicVideoScene ) ); |
1412 iController.IntegerSettingValue( ECamSettingItemDynamicVideoScene ) ); |
|
1413 |
|
1414 // For use with scene indicator |
|
1415 TInt32 iconId = EMbmCameraappQgn_indi_cam4_mode_auto; |
|
1416 TInt32 maskId = EMbmCameraappQgn_indi_cam4_mode_auto_mask; |
|
1417 |
1410 switch ( scene ) |
1418 switch ( scene ) |
1411 { |
1419 { |
1412 case ECamSceneAuto: |
1420 case ECamSceneAuto: |
1413 case ECamSceneNormal: |
1421 case ECamSceneNormal: |
1414 { |
1422 { |
1417 iconFileName, |
1425 iconFileName, |
1418 EMbmCameraappQgn_indi_cam4_mode_auto, |
1426 EMbmCameraappQgn_indi_cam4_mode_auto, |
1419 EMbmCameraappQgn_indi_cam4_mode_auto_mask, |
1427 EMbmCameraappQgn_indi_cam4_mode_auto_mask, |
1420 skinInstance, |
1428 skinInstance, |
1421 KAknsIIDQgnIndiCam4ModeAuto ); |
1429 KAknsIIDQgnIndiCam4ModeAuto ); |
|
1430 iconId = EMbmCameraappQgn_indi_cam4_mode_auto; |
|
1431 maskId = EMbmCameraappQgn_indi_cam4_mode_auto_mask; |
1422 break; |
1432 break; |
1423 } |
1433 } |
1424 case ECamSceneNight: |
1434 case ECamSceneNight: |
1425 { |
1435 { |
1426 SetIconL( |
1436 SetIconL( |
1428 iconFileName, |
1438 iconFileName, |
1429 EMbmCameraappQgn_indi_cam4_mode_night, |
1439 EMbmCameraappQgn_indi_cam4_mode_night, |
1430 EMbmCameraappQgn_indi_cam4_mode_night_mask, |
1440 EMbmCameraappQgn_indi_cam4_mode_night_mask, |
1431 skinInstance, |
1441 skinInstance, |
1432 KAknsIIDQgnIndiCam4ModeNight ); |
1442 KAknsIIDQgnIndiCam4ModeNight ); |
|
1443 iconId = EMbmCameraappQgn_indi_cam4_mode_night; |
|
1444 maskId = EMbmCameraappQgn_indi_cam4_mode_night_mask; |
1433 break; |
1445 break; |
1434 } |
1446 } |
1435 case ECamSceneLowLight: |
1447 case ECamSceneLowLight: |
1436 { |
1448 { |
1437 SetIconL( |
1449 SetIconL( |
1439 iconFileName, |
1451 iconFileName, |
1440 EMbmCameraappQgn_indi_cam4_wb_tungsten, |
1452 EMbmCameraappQgn_indi_cam4_wb_tungsten, |
1441 EMbmCameraappQgn_indi_cam4_wb_tungsten_mask, |
1453 EMbmCameraappQgn_indi_cam4_wb_tungsten_mask, |
1442 skinInstance, |
1454 skinInstance, |
1443 KAknsIIDQgnIndiCam4WbTungsten ); |
1455 KAknsIIDQgnIndiCam4WbTungsten ); |
|
1456 iconId = EMbmCameraappQgn_indi_cam4_wb_tungsten; |
|
1457 maskId = EMbmCameraappQgn_indi_cam4_wb_tungsten_mask; |
1444 break; |
1458 break; |
1445 } |
1459 } |
1446 default: |
1460 default: |
1447 { |
1461 { |
1448 //Do Nothing |
1462 //Do Nothing |
1449 } |
1463 } |
1450 break; |
1464 break; |
|
1465 } |
|
1466 |
|
1467 // Update the icon in the side pane |
|
1468 if ( iController.UiConfigManagerPtr()->IsCustomCaptureButtonSupported() ) |
|
1469 { |
|
1470 CCamAppUi* appUi = static_cast<CCamAppUi*>( iEikonEnv->AppUi() ); |
|
1471 CCamSidePane* sidePane = appUi->SidePane(); |
|
1472 |
|
1473 if ( sidePane ) |
|
1474 { |
|
1475 PRINT( _L("Camera <> CCamVideoPreCaptureView::UpdateVideoSceneModeIconsL - Updating side pane indicator") ); |
|
1476 sidePane->UpdateSceneIndicatorL( iconId, maskId ); |
|
1477 } |
1451 } |
1478 } |
1452 } |
1479 } |
1453 |
1480 |
1454 // --------------------------------------------------------------------------- |
1481 // --------------------------------------------------------------------------- |
1455 // CCamVideoPreCaptureView::UpdateVideoColorToneIconsL() |
1482 // CCamVideoPreCaptureView::UpdateVideoColorToneIconsL() |