FCL/sf/app/phone: comparison phoneapp/phoneuiqtviewadapter/src/phoneuiqtviewadapter.cpp

equal deleted inserted replaced

-:cfea66083b62
+:baacf668fe89
 *
 * Description:  Phone UI's symbian adapter for Qt view.
 *
 */
+#include "cphonemediatorsender.h"
 #include "phoneuiqtviewadapter.h"
 #include "phoneuiqtviewif.h"
 #include "phonebubblewrapper.h"
 #include "tphonecmdparaminteger.h"
 #include "tphonecmdparamboolean.h"
 #include "tphonecmdparamemergencycallheaderdata.h"
 #include "tphonecmdparamstring.h"
 #include "tphonecmdparamkeycapture.h"
 #include "cphonepubsubproxy.h"
 #include "pevirtualengine.h"
-#include "cphoneringingtonecontroller.h"
+#include "rphonetoneclient.h"
 #include "phoneresourceadapter.h"
 #include "phoneui.hrh"
 #include "cphonemediatorfactory.h"
 #include "phoneuiqtbuttonscontroller.h"
 #include "phoneconstants.h"
 #include <eikenv.h>
 #include <w32std.h>
 #include <hbstringutil.h>
 #include <xqaiwdecl.h>
 #include <mpeengineinfo.h>
+#include <xqsystemtoneservice.h>
 //CONSTANTS
 static const int PHONE_CALL_NOT_FOUND = -1;
 PhoneUIQtViewAdapter::PhoneUIQtViewAdapter (PhoneUIQtViewIF &view, QObject *parent) :
 QObject (parent),
 m_view (view),
 m_bubbleWrapper(0),
-m_ringingtonecontroller(0),
 m_resourceAdapter(0),
 m_noteController(0),
 m_telephonyService(0),
 m_uiCommandController(0),
 m_messageController(0),
 m_indicatorController(0),
 m_phoneCallHeaderManager(0),
 m_dialpadAboutToClose(false),
-m_homeScreenToForeground(false),
 m_visibilityHandler(0),
 m_appLauncher(0),
 m_clearDialpadOnClose(true),
 m_speakerAsDefaultButton(false),
 m_ringingTonePlaying(false)
 {
+m_toneService = new XQSystemToneService(this);
 m_bubbleWrapper = new PhoneBubbleWrapper(m_view.bubbleManager(), this);
-m_noteController = new PhoneNoteController(this);
+m_noteController = new PhoneNoteController(*m_toneService, this);
 m_uiCommandController = new PhoneUiCommandController(view, this);
-m_phoneCallHeaderManager = new PhoneCallHeaderManager(*m_bubbleWrapper, m_view, this);
+m_phoneCallHeaderManager = new PhoneCallHeaderManager(*m_bubbleWrapper,
+m_view, this);
-TRAPD( error, m_ringingtonecontroller = CPhoneRingingToneController::NewL () );
+int error = m_toneClient.Connect();
 qt_symbian_throwIfError(error);
 m_resourceAdapter = PhoneResourceAdapter::Instance(this);
 // display initial toolbar to make client area size correct
 TPhoneCmdParamInteger intParam;
 }
 PhoneUIQtViewAdapter::~PhoneUIQtViewAdapter ()
 {
-delete m_ringingtonecontroller;
+m_toneClient.Close();
 }
 void PhoneUIQtViewAdapter::ExecuteCommandL (TPhoneViewCommandId aCmdId)
 {
+PHONE_TRACE1(aCmdId)
 switch (aCmdId) {
 case EPhoneAppShutDown:
 {
 m_view.shutdownPhoneApp();
 }
 case EPhoneViewBringPhoneAppToForeground:
 bringToForeground();
 break;
 case EPhoneViewMuteRingToneOnAnswer:
-m_ringingtonecontroller->MuteRingingToneOnAnswer();
+m_toneClient.StopPlayingL();
 break;
 case EPhoneViewStopRingTone:
 m_ringingTonePlaying = false;
-m_ringingtonecontroller->StopPlaying();
+m_toneClient.StopPlayingL();
 break;
 case EPhoneViewMuteRingTone:
 m_ringingTonePlaying = false;
-m_ringingtonecontroller->MuteRingingTone();
+m_toneClient.StopPlayingL();
 break;
 case EPhoneViewHideNaviPaneAudioVolume:
 m_view.removeVolumeSlider ();
 break;
 removeConferenceBubble();
 break;
 case EPhoneViewSendToBackground:
 case EPhoneViewBringIdleToForeground:
-m_visibilityHandler->sendToBackground(m_homeScreenToForeground);
+m_visibilityHandler->sendToBackground();
-m_homeScreenToForeground = false;
 break;
 case EPhoneViewRemoveAllCallHeaders:
 removeAllCallHeaders();
 break;
 case EPhoneViewRemoveNumberEntry:
 m_noteController->removeGlobalWaitNote();
 break;
 case EPhoneViewUpdateFSW:
 setHidden(true);
 break;
+case EPhoneViewPlayHandsFreeActivatedTone:
+playHandsFreeActivatedTone();
+break;
 default:
 break;
 }
 CPhoneMediatorFactory::Instance()->Sender()->SendEvent( aCmdId );
 }
 void PhoneUIQtViewAdapter::ExecuteCommandL (TPhoneViewCommandId aCmdId, TInt aCallId)
 {
+PHONE_TRACE1(aCmdId)
 switch (aCmdId) {
 case EPhoneViewRemoveCallHeader:
 {
 	        m_phoneCallHeaderManager->removeCallHeader(aCallId);
 CPhoneMediatorFactory::Instance()->Sender()->SendEvent( aCmdId, aCallId );
 }
 void PhoneUIQtViewAdapter::ExecuteCommandL (TPhoneViewCommandId aCmdId, TPhoneCommandParam* aCommandParam)
 {
+PHONE_TRACE1(aCmdId)
 switch (aCmdId) {
 case EPhoneViewPlayRingTone:
 m_ringingTonePlaying = true;
-m_ringingtonecontroller->PlayRingToneL( aCommandParam );
+m_toneClient.PlayRingingToneL( aCommandParam );
 break;
 case EPhoneViewSetNaviPaneAudioVolume:
 setAudioVolumeSliderValue (aCommandParam);
 break;
 case EPhoneViewActivateMuteUIChanges:
 }
 void PhoneUIQtViewAdapter::ExecuteCommandL (TPhoneViewCommandId aCmdId, TInt aCallId,
 TPhoneCommandParam *aCommandParam)
 {
+PHONE_TRACE1(aCmdId)
 switch (aCmdId) {
 case EPhoneViewGetCallExistsInConference:
 conferenceCallId(aCallId, aCommandParam);
 break;
 case EPhoneViewUpdateCallHeaderCallDuration:
 }
 void PhoneUIQtViewAdapter::ExecuteCommandL (TPhoneViewCommandId aCmdId, TInt aCallId,
 TDesC &aMessage)
 {
+PHONE_TRACE1(aCmdId)
 switch (aCmdId) {
 default:
 break;
 }
 CPhoneMediatorFactory::Instance()->Sender()->SendEvent( aCmdId, aCallId, &aMessage );
 }
 TPhoneViewResponseId PhoneUIQtViewAdapter::HandleCommandL (TPhoneViewCommandId aCmdId)
 {
+PHONE_TRACE1(aCmdId)
 TPhoneViewResponseId response = EPhoneViewResponseSuccess;
 switch (aCmdId) {
 case EPhoneIsDTMFDialerVisible:
 case EPhoneIsCustomizedDialerVisible:
 }
 TPhoneViewResponseId PhoneUIQtViewAdapter::HandleCommandL (TPhoneViewCommandId aCmdId,
 TPhoneCommandParam *aCommandParam)
 {
+PHONE_TRACE1(aCmdId)
 TPhoneViewResponseId viewResponse = EPhoneViewResponseSuccess;
 switch (aCmdId) {
-case EPhoneViewGetCallIdByState:
-viewResponse = callIdByState (aCommandParam);
-break;
 case EPhoneViewSelectedConfMember:
 viewResponse = getSelectedConferenceMember (aCommandParam);
 break;
 default:
 break;
 return viewResponse;
 }
 void PhoneUIQtViewAdapter::ExecuteCommand (TPhoneViewCommandId aCmdId)
 {
+PHONE_TRACE1(aCmdId)
 switch (aCmdId) {
 case EPhoneSetConferenceExpanded:
 m_bubbleWrapper->bubbleManager ().startChanges ();
 m_bubbleWrapper->bubbleManager().setExpandedConferenceCallHeader(
 m_bubbleWrapper->conferenceCallList().size());
 m_bubbleWrapper->bubbleManager ().endChanges ();
 break;
 case EPhoneViewOpenContacts:
 openContacts();
 break;
+case EPhoneViewSetVideoCallOnTop:
+m_visibilityHandler->bringVideoCallToForeground();
+break;
 default:
 break;
 }
 }
 void PhoneUIQtViewAdapter::ExecuteCommand (TPhoneViewCommandId aCmdId, TPhoneCommandParam *aCommandParam)
 {
+PHONE_TRACE1(aCmdId)
 switch (aCmdId) {
 case EPhoneViewGetAudioVolumeLevel:
 writeAudioVolumeLevel (aCommandParam);
 break;
 case EPhoneViewGetNumberFromEntry:
 TPhoneCmdParamBoolean *param = static_cast<TPhoneCmdParamBoolean *>(aCommandParam);
 m_view.setBackButtonVisible(param->Boolean());
 		}
 break;
 case EPhoneViewHsToForegroundAfterCall: {
-TPhoneCmdParamBoolean *param = static_cast<TPhoneCmdParamBoolean *>(aCommandParam);
+//TODO: remove EPhoneViewHsToForegroundAfterCall
-m_homeScreenToForeground = param->Boolean();
 }
 break;
 case EPhoneViewSetIhfFlag: {
 TPhoneCmdParamBoolean *param = static_cast<TPhoneCmdParamBoolean *>(aCommandParam);
 TPhoneCmdParamBoolean *param = static_cast<TPhoneCmdParamBoolean *>(aCommandParam);
 PhoneResourceAdapter::Instance()->buttonsController()->
 setButtonFlags(PhoneUIQtButtonsController::BluetoothAvailable,
 param->Boolean());
+}
+break;
+case EPhoneViewSetRingingFlag: {
+TPhoneCmdParamBoolean *param = static_cast<TPhoneCmdParamBoolean *>(aCommandParam);
+m_ringingTonePlaying = param->Boolean();
 }
 break;
 case EPhoneViewStartCapturingKey: {
 TPhoneCmdParamKeyCapture *captureParam =
 static_cast<TPhoneCmdParamKeyCapture *>(aCommandParam);
 break;
 case EPhoneViewSetTouchPaneButtons:
 setTouchButtons (aCommandParam);
 setExpandActions();
 break;
+case EPhoneViewGetCallIdByState:
+callIdByState(aCommandParam);
+break;
 default:
 break;
 }
 }
 m_view.captureKey(Qt::Key_Yes, false);
 }
 void PhoneUIQtViewAdapter::onFocusLost()
 {
+m_visibilityHandler->windowVisibilityChange(false);
 m_indicatorController->enableActiveCallIndicator();
 }
 void PhoneUIQtViewAdapter::onFocusGained()
 {
+m_visibilityHandler->windowVisibilityChange(true);
 m_indicatorController->disableActiveCallIndicator();
 }
 void PhoneUIQtViewAdapter::createCallHeader(
 int callId )
 }
 if( m_phoneCallHeaderManager->isVoiceCall(callId) ){
 m_indicatorController->setActiveCallData();
 }
 }
 void PhoneUIQtViewAdapter::createEmergencyCallHeader(int callId)
 {
 m_phoneCallHeaderManager->createEmergencyCallHeader(callId);
 int callId = bubbles.at(j);
 // Clear bubble
 m_view.clearBubbleCommands(m_bubbleWrapper->bubbles().value(callId));
 		// Get bubble actions by call type
-QMap<PhoneAction::ActionType, PhoneAction *> actions =
+QList<HbAction *> actions =
 m_uiCommandController->pushButtonActionsForCall(
 m_bubbleWrapper->callStates().value(callId),
 emergencyCall,
 m_bubbleWrapper->callStates(),
 m_bubbleWrapper->serviceIds(),
 m_bubbleWrapper->serviceIdByCallId(callId),
 callId);
-QList<PhoneAction *> values = actions.values();
+foreach (HbAction *action, actions) {
-for (int i = 0; i < values.size (); ++i) {
+m_view.addBubbleCommand(
-PhoneAction *action = values.at (i);
+m_bubbleWrapper->bubbles().value(callId), action);
-m_view.addBubbleCommand(m_bubbleWrapper->bubbles().value(callId),
+}
-*action);
-delete action;
-}
 }
 setExpandedConferenceCallHeader();
 setBubbleSelectionFlag();
 setMenu();
 int bubbleId = m_bubbleWrapper->bubbleManager().expandedBubble();
 callId = m_bubbleWrapper->callIdByBubbleId(bubbleId);
 serviceId = m_bubbleWrapper->serviceIdByCallId(callId);
 }
-QList<PhoneAction*> actions = m_uiCommandController->toolBarActions(
+QList<HbAction *> actions = m_uiCommandController->toolBarActions(
 intParam.Integer(),
 m_bubbleWrapper->callStates(),
 m_bubbleWrapper->serviceIds(),
 serviceId,
 callId );
 if (actions.count()) {
 m_view.setToolbarActions(actions);
 }
-qDeleteAll(actions);
 }
 void PhoneUIQtViewAdapter::writeAudioVolumeLevel (TPhoneCommandParam *commandParam)
 {
 Q_ASSERT (commandParam->ParamId () == TPhoneCommandParam::EPhoneParamIdInteger);
 static_cast<TPhoneCmdParamBoolean*>(commandParam);
 if (booleanParam->Boolean()) {
 m_dialpadAboutToClose = false;
 m_view.showDialpad();
-} else {
+} else if (m_view.isDialpadVisible()) {
 m_clearDialpadOnClose = false;
 m_view.hideDialpad();
 }
 }
 TPhoneCmdParamString* entryContent =
 static_cast<TPhoneCmdParamString*>(commandParam);
 bool phoneVisible = m_visibilityHandler->phoneVisible();
-m_homeScreenToForeground = false;
+m_visibilityHandler->sendToBackground();
-m_visibilityHandler->sendToBackground(m_homeScreenToForeground);
 if (phoneVisible) {
 // Activate logs dialer only if telephone is on the top.
 m_appLauncher->launchLogs(
 XQService::LogsViewAll,
 }
 return ret;
 }
+void PhoneUIQtViewAdapter::playHandsFreeActivatedTone()
+{
+m_toneService->playTone(
+XQSystemToneService::IntegratedHandsFreeActivatedTone);
+}

changeset 78	baacf668fe89
parent 76	cfea66083b62