camerauis/cameraapp/generic/src/CamStillPostCaptureView.cpp
branchRCL_3
changeset 22 f54ad444594d
parent 13 38fb6f7eacd5
equal deleted inserted replaced
21:289bbfdb6627 22:f54ad444594d
   340 
   340 
   341     // SHARE_AIW
   341     // SHARE_AIW
   342     iAiwServiceHandler->AttachMenuL( ROID( R_CAM_STILL_POST_CAPTURE_MENU_ID),
   342     iAiwServiceHandler->AttachMenuL( ROID( R_CAM_STILL_POST_CAPTURE_MENU_ID),
   343             R_CAM_AIW_VIEW_INTEREST );
   343             R_CAM_AIW_VIEW_INTEREST );
   344 
   344 
   345     if ( iController.IntegerSettingValue(ECamSettingItemPhotoEditorSupport) )
   345     if ( iController.IntegerSettingValue(ECamSettingItemPhotoEditorSupport) != ECamNoEditorSupport )
   346         {    
   346         {    
   347         iAiwServiceHandler->AttachMenuL( ROID( R_CAM_STILL_POST_CAPTURE_MENU_ID), 
   347         iAiwServiceHandler->AttachMenuL( ROID( R_CAM_STILL_POST_CAPTURE_MENU_ID), 
   348                 R_CAM_SET_AS_CALL_IMAGE_INTEREST_EDITOR );
   348                 R_CAM_SET_AS_CALL_IMAGE_INTEREST_EDITOR );
   349         }
   349         }
   350     else
   350     else
   556         }
   556         }
   557 
   557 
   558     if ( aResourceId == ROID( R_CAM_STILL_POST_CAPTURE_MENU_ID ) ||
   558     if ( aResourceId == ROID( R_CAM_STILL_POST_CAPTURE_MENU_ID ) ||
   559          aResourceId == ROID( R_CAM_STILL_POST_CAPTURE_OK_MENU_ID ) )
   559          aResourceId == ROID( R_CAM_STILL_POST_CAPTURE_OK_MENU_ID ) )
   560         {
   560         {
   561         TBool showSend = ETrue;
       
   562         TBool showSendToCaller = EFalse;
       
   563 
       
   564 /*#ifndef __WINS__
       
   565         if ( iSFIUtils->IsCLIValidL() )
       
   566             {
       
   567             showSend = EFalse;
       
   568             showSendToCaller = ETrue;
       
   569             }
       
   570 #endif*/
       
   571 
       
   572         TCamOrientation orientation =
       
   573             static_cast<CCamAppUiBase*>( AppUi() )->CamOrientation();
       
   574 
       
   575         if ( orientation == ECamOrientationCamcorder || 
       
   576             orientation == ECamOrientationCamcorderLeft ||
       
   577 			orientation == ECamOrientationPortrait )
       
   578             {
       
   579             showSend = EFalse;
       
   580             showSendToCaller = EFalse;
       
   581             }
       
   582 
       
   583         TInt itemPos = 0;
   561         TInt itemPos = 0;
   584         if ( aMenuPane->MenuItemExists( ECamCmdSendToCallerMultimedia, itemPos ) )
   562         if ( aMenuPane->MenuItemExists( ECamCmdSendToCallerMultimedia, itemPos ) )
   585             {
   563             {
   586             aMenuPane->SetItemDimmed(
   564             aMenuPane->SetItemDimmed(
   587                 ECamCmdSendToCallerMultimedia, !showSendToCaller );
   565                 ECamCmdSendToCallerMultimedia, ETrue );
   588             }
   566             }
   589         
   567         
   590         if(iController.IntegerSettingValue(ECamSettingItemPhotoEditorSupport))
   568 		TInt editorSupport = iController.IntegerSettingValue(ECamSettingItemPhotoEditorSupport);
   591             {
       
   592             showSend = ETrue;
       
   593             }
       
   594         
   569         
   595         if ( aMenuPane->MenuItemExists( ECamCmdSend, itemPos ) )
   570 		if( editorSupport == ECamNoEditorSupport || 
   596             {
   571 			editorSupport == ECamEditorSupportInOptions )
   597             aMenuPane->SetItemDimmed(
   572             {
   598                 ECamCmdSend, !showSend );
   573 			if ( aMenuPane->MenuItemExists( ECamCmdSend, itemPos ) )
   599             }
   574 				{
   600 
   575 				aMenuPane->SetItemDimmed(
       
   576 					ECamCmdSend, ETrue );
       
   577 				}
       
   578 			}
       
   579 		if( editorSupport == ECamNoEditorSupport || 
       
   580 			editorSupport == ECamEditorSupportInToolbar )
       
   581 			{
       
   582 			if ( aMenuPane->MenuItemExists( ECamCmdEditPhoto, itemPos ) )
       
   583 				{
       
   584 				aMenuPane->SetItemDimmed(
       
   585 					ECamCmdEditPhoto, ETrue );
       
   586 				}			
       
   587 			}
       
   588 			
   601         /*
   589         /*
   602          * MSK : ContextOptions --> We just hide Help and Exit from the Options Menu when
   590          * MSK : ContextOptions --> We just hide Help and Exit from the Options Menu when
   603          *       the MSK is pressed in the postcapture still view
   591          *       the MSK is pressed in the postcapture still view
   604          *       iRockerKeyPress represents MSK key event in still postcapture view
   592          *       iRockerKeyPress represents MSK key event in still postcapture view
   605          */
   593          */
   666 			aToolbar->HideItem( ECamCmdOneClickUpload, ETrue, EFalse );
   654 			aToolbar->HideItem( ECamCmdOneClickUpload, ETrue, EFalse );
   667 			aToolbar->HideItem( ECamCmdDelete, ETrue, EFalse );
   655 			aToolbar->HideItem( ECamCmdDelete, ETrue, EFalse );
   668 			}
   656 			}
   669 		else
   657 		else
   670 			{
   658 			{
   671             if(iController.IntegerSettingValue(ECamSettingItemPhotoEditorSupport))
   659 			TInt editorSupport = iController.IntegerSettingValue(ECamSettingItemPhotoEditorSupport);
       
   660             if( editorSupport == ECamEditorSupportInToolbar )
   672                 {
   661                 {
   673                 aToolbar->RemoveItem( ECamCmdSend );
   662                 aToolbar->RemoveItem( ECamCmdSend );
   674                 CAknButton* editButton = dynamic_cast<CAknButton*>(aToolbar->ControlOrNull( ECamCmdEdit ));
   663                 CAknButton* editButton = dynamic_cast<CAknButton*>(aToolbar->ControlOrNull( ECamCmdEdit ));
   675                 if( editButton )
   664                 if( editButton )
   676                     {
   665                     {