equal
deleted
inserted
replaced
55 // Reset flag |
55 // Reset flag |
56 if ( iViewCommandHandle ) |
56 if ( iViewCommandHandle ) |
57 { |
57 { |
58 TPhoneCmdParamBoolean dtmfSendFlag; |
58 TPhoneCmdParamBoolean dtmfSendFlag; |
59 dtmfSendFlag.SetBoolean( EFalse ); |
59 dtmfSendFlag.SetBoolean( EFalse ); |
60 iViewCommandHandle->ExecuteCommandL( EPhoneViewSetDtmfOptionsFlag, |
60 // <-- QT PHONE START --> |
61 &dtmfSendFlag ); |
61 iViewCommandHandle->ExecuteCommand( EPhoneViewSetDtmfOptionsFlag, |
|
62 &dtmfSendFlag ); |
|
63 // <-- QT PHONE END --> |
62 } |
64 } |
63 } |
65 } |
64 |
66 |
65 // ----------------------------------------------------------- |
67 // ----------------------------------------------------------- |
66 // CPhoneConferenceAndCallSetup::ConstructL() |
68 // CPhoneConferenceAndCallSetup::ConstructL() |
105 { |
107 { |
106 __LOGMETHODSTARTEND(EPhoneControl, "CPhoneConferenceAndCallSetup::HandlePhoneEngineMessageL()"); |
108 __LOGMETHODSTARTEND(EPhoneControl, "CPhoneConferenceAndCallSetup::HandlePhoneEngineMessageL()"); |
107 switch ( aMessage ) |
109 switch ( aMessage ) |
108 { |
110 { |
109 case MEngineMonitor::EPEMessageConnecting: |
111 case MEngineMonitor::EPEMessageConnecting: |
110 { |
|
111 iAlerting = ETrue; |
112 iAlerting = ETrue; |
112 HandleConnectingL( aCallId ); |
113 HandleConnectingL( aCallId ); |
113 } |
|
114 break; |
114 break; |
115 |
115 |
116 case MEngineMonitor::EPEMessageConnected: |
116 case MEngineMonitor::EPEMessageConnected: |
117 { |
|
118 HandleConnectedL( aCallId ); |
117 HandleConnectedL( aCallId ); |
119 } |
|
120 break; |
118 break; |
121 |
119 |
122 case MEngineMonitor::EPEMessageIdle: |
120 case MEngineMonitor::EPEMessageIdle: |
123 { |
|
124 HandleIdleL( aCallId ); |
121 HandleIdleL( aCallId ); |
125 } |
|
126 break; |
122 break; |
127 |
123 |
128 case MEngineMonitor::EPEMessageConferenceIdle: |
124 case MEngineMonitor::EPEMessageConferenceIdle: |
129 { |
|
130 HandleConferenceIdleL(); |
125 HandleConferenceIdleL(); |
131 } |
126 break; |
132 break; |
|
133 |
|
134 case MEngineMonitor::EPEMessageColpNumberAvailable: |
|
135 { |
|
136 HandleColpNoteL( aCallId ); |
|
137 } |
|
138 break; |
|
139 |
127 |
140 default: |
128 default: |
141 { |
|
142 CPhoneConference::HandlePhoneEngineMessageL( aMessage, |
129 CPhoneConference::HandlePhoneEngineMessageL( aMessage, |
143 aCallId ); |
130 aCallId ); |
144 } |
|
145 break; |
131 break; |
146 } |
132 } |
147 } |
133 } |
148 |
134 |
149 // ----------------------------------------------------------- |
135 // ----------------------------------------------------------- |
214 |
200 |
215 // Set specific flag to view so that DTMF menu item available |
201 // Set specific flag to view so that DTMF menu item available |
216 TPhoneCmdParamBoolean dtmfSendFlag; |
202 TPhoneCmdParamBoolean dtmfSendFlag; |
217 dtmfSendFlag.SetBoolean( ETrue ); |
203 dtmfSendFlag.SetBoolean( ETrue ); |
218 iViewCommandHandle->ExecuteCommandL( EPhoneViewSetDtmfOptionsFlag, |
204 iViewCommandHandle->ExecuteCommandL( EPhoneViewSetDtmfOptionsFlag, |
219 &dtmfSendFlag ); |
205 &dtmfSendFlag ); |
220 |
206 |
221 if ( iOnScreenDialer && IsDTMFEditorVisibleL() ) |
207 if ( iOnScreenDialer && IsDTMFEditorVisibleL() ) |
222 { |
208 { |
223 resourceId = EPhoneDtmfDialerMenubar; |
209 resourceId = EPhoneDtmfDialerMenubar; |
224 } |
210 } |
229 else if ( IsConferenceBubbleInSelectionMode() ) |
215 else if ( IsConferenceBubbleInSelectionMode() ) |
230 { |
216 { |
231 resourceId = EPhoneConfCallParticipantsDropMenubar; |
217 resourceId = EPhoneConfCallParticipantsDropMenubar; |
232 } |
218 } |
233 else |
219 else |
234 { |
220 { |
235 resourceId = EPhoneAlertingAndConfHeldCallMenuBar; |
221 resourceId = EPhoneAlertingAndConfHeldCallMenuBar; |
236 } |
222 } |
237 |
223 |
238 TPhoneCmdParamInteger integerParam; |
224 TPhoneCmdParamInteger integerParam; |
239 integerParam.SetInteger( |
225 integerParam.SetInteger( |
240 CPhoneMainResourceResolver::Instance()-> |
226 CPhoneMainResourceResolver::Instance()-> |
241 ResolveResourceID( resourceId ) ); |
227 ResolveResourceID( resourceId ) ); |
242 |
228 |
243 iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarOpen, |
229 iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarOpen, |
244 &integerParam ); |
230 &integerParam ); |
245 } |
231 } |
246 |
232 |
247 // ----------------------------------------------------------- |
233 // ----------------------------------------------------------- |
325 } |
311 } |
326 |
312 |
327 SetTouchPaneButtons( EPhoneConferenceAndSingleButtons ); |
313 SetTouchPaneButtons( EPhoneConferenceAndSingleButtons ); |
328 SetTouchPaneButtonDisabled( EPhoneInCallCmdPrivate ); |
314 SetTouchPaneButtonDisabled( EPhoneInCallCmdPrivate ); |
329 EndUiUpdate(); |
315 EndUiUpdate(); |
330 |
316 |
|
317 HandleColpNoteL( aCallId ); |
331 UpdateCbaL ( EPhoneCallHandlingNewCallSwapCBA ); |
318 UpdateCbaL ( EPhoneCallHandlingNewCallSwapCBA ); |
332 |
319 |
333 iStateMachine->ChangeState( EPhoneStateConferenceAndSingle ); |
320 iStateMachine->ChangeState( EPhoneStateConferenceAndSingle ); |
334 } |
321 } |
335 |
322 |
357 iViewCommandHandle->ExecuteCommandL( EPhoneViewGetCallExistsInConference, |
344 iViewCommandHandle->ExecuteCommandL( EPhoneViewGetCallExistsInConference, |
358 aCallId, &conferenceExistsForCallId ); |
345 aCallId, &conferenceExistsForCallId ); |
359 |
346 |
360 if( conferenceExistsForCallId.Boolean() ) |
347 if( conferenceExistsForCallId.Boolean() ) |
361 { |
348 { |
362 // Remove 'Conference on hold' global note |
349 // Remove 'Conference on hold' global note |
363 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveGlobalNote ); |
350 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveGlobalNote ); |
364 |
351 |
365 // Remove conference member from conference bubble |
352 // Remove conference member from conference bubble |
366 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveFromConference, |
353 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveFromConference, |
367 aCallId ); |
354 aCallId ); |
368 |
355 |
400 |
387 |
401 if ( IsNumberEntryUsedL() ) |
388 if ( IsNumberEntryUsedL() ) |
402 { |
389 { |
403 // Show the number entry if it exists |
390 // Show the number entry if it exists |
404 SetNumberEntryVisibilityL(ETrue); |
391 SetNumberEntryVisibilityL(ETrue); |
405 } |
392 } |
406 |
393 |
407 SetTouchPaneButtons( EPhoneConferenceButtons ); |
394 SetTouchPaneButtons( EPhoneConferenceButtons ); |
408 EndUiUpdate(); |
395 EndUiUpdate(); |
409 EndTransEffect(); |
396 EndTransEffect(); |
410 |
397 |
411 // Go to conference state |
398 // Go to conference state |