59 } |
59 } |
60 |
60 |
61 return retValue; |
61 return retValue; |
62 } |
62 } |
63 |
63 |
64 QMap<PhoneAction::ActionType, PhoneAction *> PhoneResourceAdapter::convert (int symbianResourceId, ...) |
64 QString PhoneResourceAdapter::convert (int symbianResourceId, ...) |
65 { |
65 { |
66 QMap<PhoneAction::ActionType, PhoneAction *> translatedActions; |
66 QString ret = ""; |
67 |
|
68 switch (symbianResourceId) { |
67 switch (symbianResourceId) { |
69 |
|
70 case R_PHONEUI_MTCAL_INCOMING_CALL: |
68 case R_PHONEUI_MTCAL_INCOMING_CALL: |
71 { |
69 { |
72 PhoneAction *text = new PhoneAction; |
70 ret = hbTrId("txt_phone_other_incoming_call"); |
73 text->setText(hbTrId("txt_phone_other_incoming_call")); |
|
74 translatedActions[PhoneAction::Text] = text; |
|
75 } |
71 } |
76 break; |
72 break; |
77 case R_PHONEUI_VIDEO_CALL_INCOMING: |
73 case R_PHONEUI_VIDEO_CALL_INCOMING: |
78 { |
74 { |
79 PhoneAction *text = new PhoneAction; |
75 ret = hbTrId("txt_phone_other_incoming_video_call"); |
80 text->setText (hbTrId("txt_phone_other_incoming_video_call")); |
|
81 translatedActions [PhoneAction::Text] = text; |
|
82 } |
76 } |
83 break; |
77 break; |
84 |
78 |
85 case R_PHONEUI_INCALL_CALL_DISCONNECTED: |
79 case R_PHONEUI_INCALL_CALL_DISCONNECTED: |
86 { |
80 { |
87 PhoneAction *text = new PhoneAction; |
81 ret = hbTrId("txt_phone_other_disconnected"); |
88 text->setText (hbTrId("txt_phone_other_disconnected")); |
|
89 translatedActions [PhoneAction::Text] = text; |
|
90 } |
82 } |
91 break; |
83 break; |
92 |
84 |
93 case R_PHONEUI_INCALL_CALL_HELD: |
85 case R_PHONEUI_INCALL_CALL_HELD: |
94 { |
86 { |
95 PhoneAction *text = new PhoneAction; |
87 ret = hbTrId("txt_phone_other_on_hold"); |
96 text->setText (hbTrId("txt_phone_other_on_hold")); |
|
97 translatedActions [PhoneAction::Text] = text; |
|
98 break; |
88 break; |
99 } |
89 } |
100 |
90 |
101 case R_PHONEUI_MULTC_WAITING: |
91 case R_PHONEUI_MULTC_WAITING: |
102 { |
92 { |
103 PhoneAction *text = new PhoneAction; |
93 ret = hbTrId("txt_phone_other_waiting"); |
104 text->setText (hbTrId("txt_phone_other_waiting")); |
|
105 translatedActions [PhoneAction::Text] = text; |
|
106 } |
94 } |
107 break; |
95 break; |
108 |
96 |
109 case R_PHONEUI_TIME_DURAT_LONG_WITH_ZERO: |
97 case R_PHONEUI_TIME_DURAT_LONG_WITH_ZERO: |
110 { |
98 { |
111 PhoneAction *text = new PhoneAction; |
|
112 // Symbian modifier used here: %:0%H%:1%T%:2%S%:3 |
99 // Symbian modifier used here: %:0%H%:1%T%:2%S%:3 |
113 // This is because this text is used by Symbian localization |
100 // This is because this text is used by Symbian localization |
114 // for formatting later on. |
101 // for formatting later on. |
115 text->setText ("%:0%H%:1%T%:2%S%:3"); |
102 ret = ("%:0%H%:1%T%:2%S%:3"); |
116 translatedActions [PhoneAction::Text] = text; |
|
117 } |
103 } |
118 break; |
104 break; |
119 |
105 |
120 case R_PHONEUI_OUT_GOING_CALL: |
106 case R_PHONEUI_OUT_GOING_CALL: |
121 { |
107 { |
122 PhoneAction *text = new PhoneAction; |
108 ret = hbTrId("txt_phone_other_calling"); |
123 text->setText (hbTrId("txt_phone_other_calling")); |
|
124 translatedActions [PhoneAction::Text] = text; |
|
125 } |
109 } |
126 break; |
110 break; |
127 case R_PHONEUI_OUT_GOING_VIDEO_CALL: |
111 case R_PHONEUI_OUT_GOING_VIDEO_CALL: |
128 { |
112 { |
129 PhoneAction *text = new PhoneAction; |
113 ret = hbTrId("txt_phone_other_calling_video_call"); |
130 text->setText (hbTrId("txt_phone_other_calling_video_call")); |
|
131 translatedActions [PhoneAction::Text] = text; |
|
132 } |
114 } |
133 break; |
115 break; |
134 |
116 |
135 case R_PHONEUI_MTCAL_CLI_WITHHELD: |
117 case R_PHONEUI_MTCAL_CLI_WITHHELD: |
136 { |
118 { |
137 PhoneAction *text = new PhoneAction; |
119 ret = hbTrId("txt_phone_other_private_number"); |
138 text->setText (hbTrId("txt_phone_other_private_number")); |
|
139 translatedActions [PhoneAction::Text] = text; |
|
140 } |
120 } |
141 break; |
121 break; |
142 case R_PHONEUI_MTCAL_CLI_UNKNOWN: |
122 case R_PHONEUI_MTCAL_CLI_UNKNOWN: |
143 { |
123 { |
144 PhoneAction *text = new PhoneAction; |
124 ret = hbTrId("txt_phone_other_unknown_number"); |
145 text->setText (hbTrId("txt_phone_other_unknown_number")); |
|
146 translatedActions [PhoneAction::Text] = text; |
|
147 } |
125 } |
148 break; |
126 break; |
149 case R_PHONE_MTCAL_CLI_PAYPHONE: |
127 case R_PHONE_MTCAL_CLI_PAYPHONE: |
150 { |
128 { |
151 PhoneAction *text = new PhoneAction; |
129 ret = hbTrId("Payphone number"); |
152 text->setText (hbTrId("Payphone number")); |
|
153 translatedActions [PhoneAction::Text] = text; |
|
154 } |
130 } |
155 break; |
131 break; |
156 |
132 |
157 case R_PHONEUI_EMERGENCY_CALL_HEADER: |
133 case R_PHONEUI_EMERGENCY_CALL_HEADER: |
158 { |
134 { |
159 PhoneAction *text = new PhoneAction; |
135 ret = hbTrId("txt_phone_other_emergency_call"); |
160 text->setText (hbTrId("txt_phone_other_emergency_call")); |
|
161 translatedActions [PhoneAction::Text] = text; |
|
162 } |
136 } |
163 break; |
137 break; |
164 |
138 |
165 case R_PHONEUI_ATTEMPTING_EMERGENCY_CALL_TEXT: |
139 case R_PHONEUI_ATTEMPTING_EMERGENCY_CALL_TEXT: |
166 { |
140 { |
167 PhoneAction *text = new PhoneAction; |
141 ret = hbTrId("txt_phone_other_attempting"); |
168 text->setText (hbTrId("txt_phone_other_attempting")); |
|
169 translatedActions [PhoneAction::Text] = text; |
|
170 } |
142 } |
171 break; |
143 break; |
172 |
144 |
173 case R_PHONEUI_CONFERENCE_CALL: |
145 case R_PHONEUI_CONFERENCE_CALL: |
174 { |
146 { |
175 PhoneAction *text = new PhoneAction; |
147 ret = hbTrId("txt_phone_other_conference_call"); |
176 text->setText (hbTrId("txt_phone_other_conference_call")); |
|
177 translatedActions [PhoneAction::Text] = text; |
|
178 } |
148 } |
179 break; |
149 break; |
180 case R_PHONEUI_SENDING_DTMF_WAIT_NOTE_TEXT: |
150 case R_PHONEUI_SENDING_DTMF_WAIT_NOTE_TEXT: |
181 { |
151 { |
182 PhoneAction *text = new PhoneAction; |
|
183 VA_LIST list; |
152 VA_LIST list; |
184 VA_START (list, symbianResourceId); |
153 VA_START (list, symbianResourceId); |
185 const TDesC *string = (TDesC*)VA_ARG(list, TDesC*); |
154 const TDesC *string = (TDesC*)VA_ARG(list, TDesC*); |
186 text->setText (hbTrId("txt_phone_info_sending").arg(QString::fromUtf16(string->Ptr(), |
155 ret = hbTrId("txt_phone_info_sending").arg(QString::fromUtf16(string->Ptr(), |
187 string->Length()))); |
156 string->Length())); |
188 translatedActions [PhoneAction::Text] = text; |
|
189 VA_END (list); |
157 VA_END (list); |
190 } |
158 } |
191 break; |
159 break; |
192 case R_PHONEUI_DTMF_WAIT_CHARACTER_CONFIRMATION_QUERY_TEXT: |
160 case R_PHONEUI_DTMF_WAIT_CHARACTER_CONFIRMATION_QUERY_TEXT: |
193 { |
161 { |
194 PhoneAction *text = new PhoneAction; |
|
195 VA_LIST list; |
162 VA_LIST list; |
196 VA_START (list, symbianResourceId); |
163 VA_START (list, symbianResourceId); |
197 const TDesC *string = (TDesC*)VA_ARG(list, TDesC*); |
164 const TDesC *string = (TDesC*)VA_ARG(list, TDesC*); |
198 text->setText (hbTrId("txt_phone_info_send_string").arg(QString::fromUtf16(string->Ptr(), |
165 ret = hbTrId("txt_phone_info_send_string").arg(QString::fromUtf16(string->Ptr(), |
199 string->Length()))); |
166 string->Length())); |
200 translatedActions [PhoneAction::Text] = text; |
|
201 VA_END (list); |
167 VA_END (list); |
202 } |
168 } |
203 break; |
169 break; |
204 default: |
170 default: |
205 break; |
171 break; |
206 } |
172 } |
207 |
173 |
208 return translatedActions; |
174 return ret; |
209 } |
175 } |
210 |
176 |
211 QString PhoneResourceAdapter::convertToString( |
177 QString PhoneResourceAdapter::convertToString( |
212 int symbianResourceId, const QString &causeCode) const |
178 int symbianResourceId, const QString &causeCode) const |
213 { |
179 { |
512 } |
478 } |
513 |
479 |
514 return ret; |
480 return ret; |
515 } |
481 } |
516 |
482 |
517 QList<PhoneAction::ToolBarItem> PhoneResourceAdapter::convertToToolBarCommandList( |
483 |
|
484 QList<XQTelUiCommandExtension::ToolBarCommand> |
|
485 PhoneResourceAdapter::convertToToolBarCommandList( |
518 int symbianResourceId ) const |
486 int symbianResourceId ) const |
519 { |
487 { |
520 QList<PhoneAction::ToolBarItem> ret; |
488 QList<XQTelUiCommandExtension::ToolBarCommand> ret; |
521 |
489 |
522 switch(symbianResourceId) { |
490 switch(symbianResourceId) { |
523 case R_PHONEUI_CALLHANDLING_INCOMINGCALL_CBA: |
491 case R_PHONEUI_CALLHANDLING_INCOMINGCALL_CBA: |
524 { |
492 { |
525 bool showSoftReject = (false == m_buttonsCtrl->getButtonFlags( |
493 bool showSoftReject = (false == m_buttonsCtrl->getButtonFlags( |
526 PhoneUIQtButtonsController::DisableSoftReject)); |
494 PhoneUIQtButtonsController::DisableSoftReject)); |
527 |
495 |
528 ret.append(PhoneAction::ToolBarItem( |
496 ret.append(XQTelUiCommandExtension::ToolBarCommand( |
529 PhoneCallComingCmdSoftReject,showSoftReject)); |
497 PhoneCallComingCmdSoftReject,showSoftReject)); |
530 ret.append(PhoneAction::ToolBarItem(PhoneCallComingCmdSilent,true)); |
498 ret.append(XQTelUiCommandExtension::ToolBarCommand( |
|
499 PhoneCallComingCmdSilent,true)); |
531 } |
500 } |
532 break; |
501 break; |
533 |
502 |
534 case R_PHONEUI_CALLHANDLING_INCOMINGCALL_REJECT_CBA: |
503 case R_PHONEUI_CALLHANDLING_INCOMINGCALL_REJECT_CBA: |
535 { |
504 { |
536 bool showSoftReject = (false == m_buttonsCtrl->getButtonFlags( |
505 bool showSoftReject = (false == m_buttonsCtrl->getButtonFlags( |
537 PhoneUIQtButtonsController::DisableSoftReject)); |
506 PhoneUIQtButtonsController::DisableSoftReject)); |
538 |
507 |
539 ret.append(PhoneAction::ToolBarItem( |
508 ret.append(XQTelUiCommandExtension::ToolBarCommand( |
540 PhoneCallComingCmdSoftReject,showSoftReject)); |
509 PhoneCallComingCmdSoftReject,showSoftReject)); |
541 ret.append(PhoneAction::ToolBarItem(PhoneInCallCmdReject,true)); |
510 ret.append(XQTelUiCommandExtension::ToolBarCommand( |
|
511 PhoneInCallCmdReject,true)); |
542 } |
512 } |
543 break; |
513 break; |
544 |
514 |
545 case R_PHONEUI_CALLHANDLING_INCOMINGCALL_SOFT_REJECT_CBA: |
515 case R_PHONEUI_CALLHANDLING_INCOMINGCALL_SOFT_REJECT_CBA: |
546 { |
516 { |
547 bool showSoftReject = (false == m_buttonsCtrl->getButtonFlags( |
517 bool showSoftReject = (false == m_buttonsCtrl->getButtonFlags( |
548 PhoneUIQtButtonsController::DisableSoftReject)); |
518 PhoneUIQtButtonsController::DisableSoftReject)); |
549 |
519 |
550 ret.append(PhoneAction::ToolBarItem( |
520 ret.append(XQTelUiCommandExtension::ToolBarCommand( |
551 PhoneCallComingCmdSoftReject,showSoftReject)); |
521 PhoneCallComingCmdSoftReject,showSoftReject)); |
552 ret.append(PhoneAction::ToolBarItem( |
522 ret.append(XQTelUiCommandExtension::ToolBarCommand( |
553 PhoneCallComingCmdSilent,false)); |
523 PhoneCallComingCmdSilent,false)); |
554 } |
524 } |
555 break; |
525 break; |
556 |
526 |
557 case R_PHONEUI_CALLHANDLING_CALLWAITING_CBA: |
527 case R_PHONEUI_CALLHANDLING_CALLWAITING_CBA: |
558 { |
528 { |
559 bool showSoftReject = (false == m_buttonsCtrl->getButtonFlags( |
529 bool showSoftReject = (false == m_buttonsCtrl->getButtonFlags( |
560 PhoneUIQtButtonsController::DisableSoftReject)); |
530 PhoneUIQtButtonsController::DisableSoftReject)); |
561 |
531 |
562 ret.append(PhoneAction::ToolBarItem( |
532 ret.append(XQTelUiCommandExtension::ToolBarCommand( |
563 PhoneCallComingCmdSoftReject,showSoftReject)); |
533 PhoneCallComingCmdSoftReject,showSoftReject)); |
564 ret.append(PhoneAction::ToolBarItem( |
534 ret.append(XQTelUiCommandExtension::ToolBarCommand( |
565 PhoneInCallCmdJoinToConference,false)); |
535 PhoneInCallCmdJoinToConference,false)); |
566 } |
536 } |
567 break; |
537 break; |
568 |
538 |
569 case R_PHONEUI_DIALER_CBA: |
539 case R_PHONEUI_DIALER_CBA: |
575 { |
545 { |
576 if (m_buttonsCtrl->getButtonFlags( |
546 if (m_buttonsCtrl->getButtonFlags( |
577 PhoneUIQtButtonsController::IhfAsPushButton)) { |
547 PhoneUIQtButtonsController::IhfAsPushButton)) { |
578 if (m_buttonsCtrl->getButtonFlags( |
548 if (m_buttonsCtrl->getButtonFlags( |
579 PhoneUIQtButtonsController::Mute)) { |
549 PhoneUIQtButtonsController::Mute)) { |
580 ret.append(PhoneAction::ToolBarItem( |
550 ret.append(XQTelUiCommandExtension::ToolBarCommand( |
581 PhoneInCallCmdUnmute,true)); |
551 PhoneInCallCmdUnmute,true)); |
582 } else { |
552 } else { |
583 ret.append(PhoneAction::ToolBarItem( |
553 ret.append(XQTelUiCommandExtension::ToolBarCommand( |
584 PhoneInCallCmdMute,true)); |
554 PhoneInCallCmdMute,true)); |
585 } |
555 } |
586 } else { |
556 } else { |
587 if (m_buttonsCtrl->getButtonFlags( |
557 if (m_buttonsCtrl->getButtonFlags( |
588 PhoneUIQtButtonsController::BluetoothAvailable)) { |
558 PhoneUIQtButtonsController::BluetoothAvailable)) { |
589 if (m_buttonsCtrl->getButtonFlags( |
559 if (m_buttonsCtrl->getButtonFlags( |
590 PhoneUIQtButtonsController::Btaa)) { |
560 PhoneUIQtButtonsController::Btaa)) { |
591 ret.append(PhoneAction::ToolBarItem( |
561 ret.append(XQTelUiCommandExtension::ToolBarCommand( |
592 PhoneInCallCmdHandset,true)); |
562 PhoneInCallCmdHandset,true)); |
593 } else { |
563 } else { |
594 ret.append(PhoneAction::ToolBarItem( |
564 ret.append(XQTelUiCommandExtension::ToolBarCommand( |
595 PhoneInCallCmdBtHandsfree,true)); |
565 PhoneInCallCmdBtHandsfree,true)); |
596 } |
566 } |
597 } else { |
567 } else { |
598 if (!m_buttonsCtrl->getButtonFlags( |
568 if (!m_buttonsCtrl->getButtonFlags( |
599 PhoneUIQtButtonsController::Ihf)) { |
569 PhoneUIQtButtonsController::Ihf)) { |
600 ret.append(PhoneAction::ToolBarItem( |
570 ret.append(XQTelUiCommandExtension::ToolBarCommand( |
601 PhoneInCallCmdActivateIhf,true)); |
571 PhoneInCallCmdActivateIhf,true)); |
602 } else { |
572 } else { |
603 ret.append(PhoneAction::ToolBarItem( |
573 ret.append(XQTelUiCommandExtension::ToolBarCommand( |
604 PhoneInCallCmdDeactivateIhf,true)); |
574 PhoneInCallCmdDeactivateIhf,true)); |
605 } |
575 } |
606 } |
576 } |
607 } |
577 } |
608 |
578 |
610 PhoneUIQtButtonsController::MultiCall)) { |
580 PhoneUIQtButtonsController::MultiCall)) { |
611 bool outgoing(m_buttonsCtrl->getButtonFlags( |
581 bool outgoing(m_buttonsCtrl->getButtonFlags( |
612 PhoneUIQtButtonsController::Outgoing)); |
582 PhoneUIQtButtonsController::Outgoing)); |
613 if (m_buttonsCtrl->getButtonFlags( |
583 if (m_buttonsCtrl->getButtonFlags( |
614 PhoneUIQtButtonsController::Hold)) { |
584 PhoneUIQtButtonsController::Hold)) { |
615 ret.append(PhoneAction::ToolBarItem( |
585 ret.append(XQTelUiCommandExtension::ToolBarCommand( |
616 PhoneInCallCmdUnhold,!outgoing)); |
586 PhoneInCallCmdUnhold,!outgoing)); |
617 } else { |
587 } else { |
618 ret.append(PhoneAction::ToolBarItem( |
588 ret.append(XQTelUiCommandExtension::ToolBarCommand( |
619 PhoneInCallCmdHold,!outgoing)); |
589 PhoneInCallCmdHold,!outgoing)); |
620 } |
590 } |
621 |
591 |
622 ret.append(PhoneAction::ToolBarItem( |
592 ret.append(XQTelUiCommandExtension::ToolBarCommand( |
623 PhoneInCallCmdOpenContacts,true)); |
593 PhoneInCallCmdOpenContacts,true)); |
624 } else { |
594 } else { |
625 bool outgoing(m_buttonsCtrl->getButtonFlags( |
595 bool outgoing(m_buttonsCtrl->getButtonFlags( |
626 PhoneUIQtButtonsController::Outgoing)); |
596 PhoneUIQtButtonsController::Outgoing)); |
627 bool disableJoin(outgoing ? true : |
597 bool disableJoin(outgoing ? true : |
628 m_buttonsCtrl->getButtonFlags( |
598 m_buttonsCtrl->getButtonFlags( |
629 PhoneUIQtButtonsController::DisableJoin)); |
599 PhoneUIQtButtonsController::DisableJoin)); |
630 |
600 |
631 ret.append(PhoneAction::ToolBarItem( |
601 ret.append(XQTelUiCommandExtension::ToolBarCommand( |
632 PhoneInCallCmdSwap,!outgoing)); |
602 PhoneInCallCmdSwap,!outgoing)); |
633 |
603 |
634 if (m_buttonsCtrl->getButtonFlags( |
604 if (m_buttonsCtrl->getButtonFlags( |
635 PhoneUIQtButtonsController::Conference)) { |
605 PhoneUIQtButtonsController::Conference)) { |
636 ret.append(PhoneAction::ToolBarItem( |
606 ret.append(XQTelUiCommandExtension::ToolBarCommand( |
637 PhoneInCallCmdJoinToConference,!disableJoin)); |
607 PhoneInCallCmdJoinToConference,!disableJoin)); |
638 } else { |
608 } else { |
639 ret.append(PhoneAction::ToolBarItem( |
609 ret.append(XQTelUiCommandExtension::ToolBarCommand( |
640 PhoneInCallCmdCreateConference,!disableJoin)); |
610 PhoneInCallCmdCreateConference,!disableJoin)); |
641 } |
611 } |
642 } |
612 } |
643 |
613 |
644 ret.append(PhoneAction::ToolBarItem(PhoneInCallCmdOpenDialer,true)); |
614 ret.append(XQTelUiCommandExtension::ToolBarCommand( |
|
615 PhoneInCallCmdOpenDialer,true)); |
645 } |
616 } |
646 break; |
617 break; |
647 |
618 |
648 case R_PHONEUI_CALLHANDLING_EMERGENCY_CBA: |
619 case R_PHONEUI_CALLHANDLING_EMERGENCY_CBA: |
649 { |
620 { |
650 |
621 |
651 if (!m_buttonsCtrl->getButtonFlags(PhoneUIQtButtonsController::Ihf)) |
622 if (!m_buttonsCtrl->getButtonFlags(PhoneUIQtButtonsController::Ihf)) |
652 { |
623 { |
653 ret.append(PhoneAction::ToolBarItem( |
624 ret.append(XQTelUiCommandExtension::ToolBarCommand( |
654 PhoneInCallCmdActivateIhf,true)); |
625 PhoneInCallCmdActivateIhf,true)); |
655 } |
626 } |
656 else |
627 else |
657 { |
628 { |
658 ret.append(PhoneAction::ToolBarItem( |
629 ret.append(XQTelUiCommandExtension::ToolBarCommand( |
659 PhoneInCallCmdDeactivateIhf,true)); |
630 PhoneInCallCmdDeactivateIhf,true)); |
660 } |
631 } |
661 } |
632 } |
662 |
633 |
663 ret.append(PhoneAction::ToolBarItem(PhoneInCallCmdOpenDialer,true)); |
634 ret.append(XQTelUiCommandExtension::ToolBarCommand( |
|
635 PhoneInCallCmdOpenDialer,true)); |
664 break; |
636 break; |
665 |
637 |
666 /*case R_PHONEUI_CALLHANDLING_INCALL_HANDSET_CBA: |
638 /*case R_PHONEUI_CALLHANDLING_INCALL_HANDSET_CBA: |
667 { |
639 { |
668 ret.append(PhoneAction::ToolBarItem(PhoneInCallCmdOpenDialer,true)); |
640 ret.append(XQTelUiCommandExtension::ToolBarCommand( |
|
641 PhoneInCallCmdOpenDialer,true)); |
669 |
642 |
670 if (m_buttonsCtrl->getButtonFlags(PhoneUIQtButtonsController::Hold)) |
643 if (m_buttonsCtrl->getButtonFlags(PhoneUIQtButtonsController::Hold)) |
671 { |
644 { |
672 ret.append(PhoneAction::ToolBarItem(PhoneInCallCmdUnhold,true)); |
645 ret.append(XQTelUiCommandExtension::ToolBarCommand( |
|
646 PhoneInCallCmdUnhold,true)); |
673 } |
647 } |
674 else |
648 else |
675 { |
649 { |
676 ret.append(PhoneAction::ToolBarItem(PhoneInCallCmdHold,true)); |
650 ret.append(XQTelUiCommandExtension::ToolBarCommand( |
|
651 PhoneInCallCmdHold,true)); |
677 } |
652 } |
678 if (!m_buttonsCtrl->getButtonFlags(PhoneUIQtButtonsController::Hold)) |
653 if (!m_buttonsCtrl->getButtonFlags(PhoneUIQtButtonsController::Hold)) |
679 { |
654 { |
680 ret.append(PhoneAction::ToolBarItem(PhoneInCallCmdMute,true)); |
655 ret.append(XQTelUiCommandExtension::ToolBarCommand( |
|
656 PhoneInCallCmdMute,true)); |
681 } |
657 } |
682 else |
658 else |
683 { |
659 { |
684 ret.append(PhoneAction::ToolBarItem(PhoneInCallCmdUnmute,true)); |
660 ret.append(XQTelUiCommandExtension::ToolBarCommand( |
685 } |
661 PhoneInCallCmdUnmute,true)); |
686 |
662 } |
687 ret.append(PhoneAction::ToolBarItem(PhoneInCallCmdDeactivateIhf,true)); |
663 |
688 ret.append(PhoneAction::ToolBarItem(PhoneInCallCmdOpenContacts,true)); |
664 ret.append(XQTelUiCommandExtension::ToolBarCommand( |
|
665 PhoneInCallCmdDeactivateIhf,true)); |
|
666 ret.append(XQTelUiCommandExtension::ToolBarCommand( |
|
667 PhoneInCallCmdOpenContacts,true)); |
689 } |
668 } |
690 break;*/ |
669 break;*/ |
691 default: |
670 default: |
692 break; |
671 break; |
693 } |
672 } |
694 |
673 |
695 return ret; |
674 return ret; |
696 } |
675 } |
697 |
676 |
698 |
|