equal
deleted
inserted
replaced
64 // (other items were commented in a header). |
64 // (other items were commented in a header). |
65 // ----------------------------------------------------------- |
65 // ----------------------------------------------------------- |
66 // |
66 // |
67 CPhoneSingleAndWaiting::~CPhoneSingleAndWaiting() |
67 CPhoneSingleAndWaiting::~CPhoneSingleAndWaiting() |
68 { |
68 { |
69 if( iViewCommandHandle ) |
69 // <-- QT PHONE START --> |
|
70 if ( iViewCommandHandle ) |
70 { |
71 { |
71 TPhoneCmdParamBoolean dtmfSendFlag; |
72 TPhoneCmdParamBoolean dtmfSendFlag; |
72 dtmfSendFlag.SetBoolean( EFalse ); |
73 dtmfSendFlag.SetBoolean( EFalse ); |
73 TRAP_IGNORE( iViewCommandHandle->ExecuteCommandL( |
74 iViewCommandHandle->ExecuteCommand( EPhoneViewSetVideoCallDTMFVisibilityFlag, |
74 EPhoneViewSetVideoCallDTMFVisibilityFlag, |
75 &dtmfSendFlag ); |
75 &dtmfSendFlag ); ) |
76 } |
76 } |
77 // <-- QT PHONE END --> |
77 } |
78 } |
78 |
79 |
79 // ----------------------------------------------------------- |
80 // ----------------------------------------------------------- |
80 // CPhoneSingleAndWaiting::ConstructL() |
81 // CPhoneSingleAndWaiting::ConstructL() |
81 // Constructor |
82 // Constructor |
217 iStateMachine->SetCallId( iSingleCallId ); |
218 iStateMachine->SetCallId( iSingleCallId ); |
218 iStateMachine->SendPhoneEngineMessage( |
219 iStateMachine->SendPhoneEngineMessage( |
219 MPEPhoneModel::EPEMessageReject ); |
220 MPEPhoneModel::EPEMessageReject ); |
220 break; |
221 break; |
221 |
222 |
|
223 // <-- QT PHONE START --> |
|
224 case EPhoneCmdUpdateUiControls: |
|
225 UpdateUiControlsL(); |
|
226 break; |
|
227 // <-- QT PHONE END --> |
|
228 |
222 default: |
229 default: |
223 commandStatus = CPhoneGsmInCall::HandleCommandL( aCommand ); |
230 commandStatus = CPhoneGsmInCall::HandleCommandL( aCommand ); |
224 break; |
231 break; |
225 } |
232 } |
226 |
233 |
331 // CPhoneSingleAndWaiting::HandleKeyEventL |
338 // CPhoneSingleAndWaiting::HandleKeyEventL |
332 // ----------------------------------------------------------- |
339 // ----------------------------------------------------------- |
333 // |
340 // |
334 void CPhoneSingleAndWaiting::HandleKeyEventL( |
341 void CPhoneSingleAndWaiting::HandleKeyEventL( |
335 const TKeyEvent& aKeyEvent, |
342 const TKeyEvent& aKeyEvent, |
336 TEventCode aEventCode ) |
343 TEventCode /*aEventCode*/ ) |
337 { |
344 { |
338 if( EKeyDeviceF == aKeyEvent.iCode ) |
345 if( EKeyDeviceF == aKeyEvent.iCode ) |
339 { |
346 { |
340 __PHONELOG( EBasic, EPhoneUIStates, |
347 __PHONELOG( EBasic, EPhoneUIStates, |
341 "CPhoneSingleAndWaiting::HandleKeyMessageL-deviceF" ); |
348 "CPhoneSingleAndWaiting::HandleKeyMessageL-deviceF" ); |
530 |
537 |
531 TBuf<KPhoneCallHeaderLabelMaxLength> labelText( KNullDesC ); |
538 TBuf<KPhoneCallHeaderLabelMaxLength> labelText( KNullDesC ); |
532 TInt callLabelId = CPhoneMainResourceResolver::Instance()-> |
539 TInt callLabelId = CPhoneMainResourceResolver::Instance()-> |
533 ResolveResourceID( EPhoneCallOnHold ); |
540 ResolveResourceID( EPhoneCallOnHold ); |
534 |
541 |
535 StringLoader::Load( labelText, callLabelId, CCoeEnv::Static() ); |
542 // <-- QT PHONE START --> |
|
543 StringLoader::Load( labelText, callLabelId, CCoeEnv::Static() ); |
|
544 // <-- QT PHONE END --> |
536 callHeaderParam.SetLabelText( labelText ); |
545 callHeaderParam.SetLabelText( labelText ); |
537 |
546 |
538 iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId, |
547 iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId, |
539 &callHeaderParam ); |
548 &callHeaderParam ); |
540 |
549 |
547 { |
556 { |
548 HandleHoldNoteL( aCallId, ETrue ); |
557 HandleHoldNoteL( aCallId, ETrue ); |
549 } |
558 } |
550 |
559 |
551 UpdateInCallCbaL(); |
560 UpdateInCallCbaL(); |
|
561 |
|
562 // <-- QT PHONE START --> |
|
563 SetTouchPaneButtons( EPhoneWaitingCallButtons ); |
|
564 // <-- QT PHONE END --> |
552 } |
565 } |
553 |
566 |
554 // ----------------------------------------------------------- |
567 // ----------------------------------------------------------- |
555 // CPhoneSingleAndWaiting::HandleConnectedL |
568 // CPhoneSingleAndWaiting::HandleConnectedL |
556 // ----------------------------------------------------------- |
569 // ----------------------------------------------------------- |
605 if ( !FeatureManager::FeatureSupported( KFeatureIdTouchCallHandling ) ) |
618 if ( !FeatureManager::FeatureSupported( KFeatureIdTouchCallHandling ) ) |
606 { |
619 { |
607 HandleHoldNoteL( aCallId, EFalse ); |
620 HandleHoldNoteL( aCallId, EFalse ); |
608 } |
621 } |
609 |
622 |
|
623 // <-- QT PHONE START --> |
|
624 |
610 // Set CBAs |
625 // Set CBAs |
611 UpdateCbaL( EPhoneCallHandlingCallWaitingCBA ); |
626 UpdateInCallCbaL(); |
|
627 |
|
628 SetTouchPaneButtons( EPhoneWaitingCallButtons ); |
|
629 // <-- QT PHONE END --> |
612 } |
630 } |
613 |
631 |
614 // ----------------------------------------------------------- |
632 // ----------------------------------------------------------- |
615 // CPhoneSingleAndWaiting::MakeStateTransitionToTwoSinglesL |
633 // CPhoneSingleAndWaiting::MakeStateTransitionToTwoSinglesL |
616 // ----------------------------------------------------------- |
634 // ----------------------------------------------------------- |
667 // Set Two singles softkeys |
685 // Set Two singles softkeys |
668 UpdateCbaL( EPhoneCallHandlingNewCallSwapCBA ); |
686 UpdateCbaL( EPhoneCallHandlingNewCallSwapCBA ); |
669 |
687 |
670 // If numberentry is not open just check NeedToSendToBackgroundL and |
688 // If numberentry is not open just check NeedToSendToBackgroundL and |
671 // sendbackround if needed. |
689 // sendbackround if needed. |
672 if ( NeedToSendToBackgroundL() ) |
690 // <-- QT PHONE START --> |
|
691 /*if ( NeedToSendToBackgroundL() ) |
673 { |
692 { |
674 // Return phone to the background if send to background is needed. |
693 // Return phone to the background if send to background is needed. |
675 iViewCommandHandle->ExecuteCommandL( EPhoneViewSendToBackground ); |
694 iViewCommandHandle->ExecuteCommandL( EPhoneViewSendToBackground ); |
676 } |
695 }*/ |
|
696 // <-- QT PHONE END --> |
677 } |
697 } |
678 |
698 |
679 // Close dtmf dialer if exist. |
699 // Close dtmf dialer if exist. |
680 if ( iOnScreenDialer && IsDTMFEditorVisibleL() ) |
700 if ( iOnScreenDialer && IsDTMFEditorVisibleL() ) |
681 { |
701 { |
791 // |
811 // |
792 void CPhoneSingleAndWaiting::UpdateInCallCbaL() |
812 void CPhoneSingleAndWaiting::UpdateInCallCbaL() |
793 { |
813 { |
794 __LOGMETHODSTARTEND( EPhoneUIStates, |
814 __LOGMETHODSTARTEND( EPhoneUIStates, |
795 "CPhoneSingleAndWaiting::UpdateInCallCbaL() "); |
815 "CPhoneSingleAndWaiting::UpdateInCallCbaL() "); |
796 UpdateCbaL( EPhoneCallHandlingCallWaitingCBA ); |
816 // <-- QT PHONE START --> |
|
817 TPhoneCmdParamInteger callIdParam; |
|
818 iViewCommandHandle->ExecuteCommandL( |
|
819 EPhoneViewGetExpandedBubbleCallId, &callIdParam ); |
|
820 |
|
821 if ( callIdParam.Integer()==iSingleCallId ) |
|
822 { |
|
823 CPhoneGsmInCall::UpdateInCallCbaL(); |
|
824 } |
|
825 else |
|
826 { |
|
827 iCbaManager->SetCbaL( EPhoneCallHandlingCallWaitingCBA ); |
|
828 } |
|
829 // <-- QT PHONE END --> |
797 } |
830 } |
798 |
831 |
799 // ----------------------------------------------------------- |
832 // ----------------------------------------------------------- |
800 // CPhoneSingleAndWaiting::HandleErrorL |
833 // CPhoneSingleAndWaiting::HandleErrorL |
801 // ----------------------------------------------------------- |
834 // ----------------------------------------------------------- |
837 EPhoneViewSetNeedToSendToBackgroundStatus, |
870 EPhoneViewSetNeedToSendToBackgroundStatus, |
838 &booleanParam ); |
871 &booleanParam ); |
839 } |
872 } |
840 } |
873 } |
841 |
874 |
|
875 // <-- QT PHONE START --> |
|
876 // ----------------------------------------------------------- |
|
877 // CPhoneSingleAndWaiting::UpdateUiControlsL |
|
878 // ----------------------------------------------------------- |
|
879 // |
|
880 void CPhoneSingleAndWaiting::UpdateUiControlsL() |
|
881 { |
|
882 __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneSingleAndWaiting::UpdateUiControlsL( ) "); |
|
883 |
|
884 UpdateInCallCbaL(); |
|
885 } |
|
886 // <-- QT PHONE END --> |
|
887 |
842 // End of File |
888 // End of File |