phoneapp/phoneuiview/src/cphonemenucontroller.cpp
branchRCL_3
changeset 20 3c221667e687
parent 10 ba54057fe027
child 22 94dc1107e8b2
equal deleted inserted replaced
14:b8d67d6176f5 20:3c221667e687
   226     // Menu items to be deleted 
   226     // Menu items to be deleted 
   227     for ( TInt i( 0 ); i < menuItemArray.Count(); i++ )
   227     for ( TInt i( 0 ); i < menuItemArray.Count(); i++ )
   228         {
   228         {
   229         switch( menuItemArray[ i ] )
   229         switch( menuItemArray[ i ] )
   230             {
   230             {
   231             case EPhoneDialerCallSettings:
       
   232                 if ( iSecurityMode )
       
   233                     {
       
   234                     menuPane->DeleteMenuItem( menuItemArray[ i ] );
       
   235                     }
       
   236                 break;
       
   237 
       
   238             case EPhoneInCallCmdAnswer:
   231             case EPhoneInCallCmdAnswer:
   239                 if ( iConferenceAndWaitingVideoFlag )
   232                 if ( iConferenceAndWaitingVideoFlag )
   240                     {
   233                     {
   241                     menuPane->DeleteMenuItem( menuItemArray[ i ] );
   234                     menuPane->DeleteMenuItem( menuItemArray[ i ] );
   242                     }
   235                     }
   297                     {
   290                     {
   298                     menuPane->DeleteMenuItem( menuItemArray[ i ] ); 
   291                     menuPane->DeleteMenuItem( menuItemArray[ i ] ); 
   299                     }
   292                     }
   300                 break;    
   293                 break;    
   301                 
   294                 
   302             case EPhoneInCallCmdSendToCallerMenu:
       
   303             	{
       
   304             	if ( iSecurityMode )
       
   305             		{
       
   306             		menuPane->DeleteMenuItem( menuItemArray[ i ] ); 
       
   307             		}
       
   308             	}
       
   309             break;
       
   310                                 
       
   311             case EPhoneNumberAcqCmdSendCommand:
   295             case EPhoneNumberAcqCmdSendCommand:
   312                 if ( !iServiceCodeFlag || iNumberEntryEmpty || iInvalidCsPhoneNumber )
   296                 if ( !iServiceCodeFlag || iNumberEntryEmpty || iInvalidCsPhoneNumber )
   313                     {
   297                     {
   314                     menuPane->DeleteMenuItem( menuItemArray[ i ] );
   298                     menuPane->DeleteMenuItem( menuItemArray[ i ] );
   315                     }
   299                     }
   518                     }
   502                     }
   519                 }
   503                 }
   520                 break;
   504                 break;
   521             case EPhoneCmdDtmfOk:
   505             case EPhoneCmdDtmfOk:
   522                 {
   506                 {
   523                 if ( onScreenDialer && iNumberEntryEmpty )
   507                 if ( ( onScreenDialer && iNumberEntryEmpty ) || iSecurityMode )
   524                     {
   508                     {
   525                     menuPane->DeleteMenuItem( menuItemArray[i] );                     
   509                     menuPane->DeleteMenuItem( menuItemArray[i] );                     
   526                     }
   510                     }
   527                 }
   511                 }
   528                 break;
   512                 break;
   559                     {
   543                     {
   560                     menuPane->DeleteMenuItem( menuItemArray[i] );
   544                     menuPane->DeleteMenuItem( menuItemArray[i] );
   561                     }
   545                     }
   562                 }
   546                 }
   563                 break;
   547                 break;
   564 			
   548 
       
   549             case EPhoneDialerCallSettings: // Fall through
       
   550             case EPhoneInCallCmdSendToCallerMenu: // Fall through
       
   551             case EAknCmdEditItemPlaceHolder: // Fall through
   565             case EPhoneDialerCmdHelp: // Fall through 
   552             case EPhoneDialerCmdHelp: // Fall through 
   566             case EPhoneDialerCmdHelpDtmf: // Fall through
   553             case EPhoneDialerCmdHelpDtmf: // Fall through
   567             case EPhoneInCallCmdHelp:
   554             case EPhoneInCallCmdHelp:
   568                 {
       
   569                 if ( iSecurityMode )
   555                 if ( iSecurityMode )
   570                     {
   556                     {
   571                     menuPane->DeleteMenuItem( menuItemArray[i] );
   557                     menuPane->DeleteMenuItem( menuItemArray[i] );
   572                     }
   558                     }
   573                 }
   559                 break;
   574 			break;
   560 
   575 			
       
   576             default:
   561             default:
   577                 break;                                                                                                
   562                 break;                                                                                                
   578              
   563              
   579             }
   564             }
   580         }
   565         }