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

equal deleted inserted replaced

-:bab96b7ed1a4
+:f39ed5e045e0
 #include "tphonecmdparamaudiooutput.h"
 #include "tphonecmdparamcallstatedata.h"
 #include "tphonecmdparamcallheaderdata.h"
 #include "tphonecmdparamemergencycallheaderdata.h"
 #include "tphonecmdparamstring.h"
+#include "tphonecmdparamkeycapture.h"
 #include "cphonepubsubproxy.h"
 #include "pevirtualengine.h"
-#include "cphonepubsubproxy.h"
 #include "cphoneringingtonecontroller.h"
 #include "phoneresourceadapter.h"
 #include "phoneui.hrh"
 #include "cphonemediatorfactory.h"
 #include "phoneuiqtbuttonscontroller.h"
 #include "telephonyservice.h"
 #include "phoneuicommandcontroller.h"
 #include "phonemessagecontroller.h"
 #include "phoneindicatorcontroller.h"
 #include "qtphonelog.h"
+#include "phonevisibilityhandler.h"
+#include "phoneapplauncher.h"
+#include "cphonecenrepproxy.h"
 #include <UikonInternalPSKeys.h>
 #include <bubblemanagerif.h>
 #include <hbaction.h>
 #include <pevirtualengine.h>
-#include <xqservicerequest.h>
 #include <QtGlobal>
 #include <xqserviceutil.h>
 #include <hbinstance.h>
 #include <QKeyEvent>
 #include <hbextendedlocale.h>
 #include <hbi18ndef.h>
 #include <eikenv.h>
 #include <w32std.h>
-#include <apgtask.h>
 #include <hbstringutil.h>
-#include <telinformationpskeys.h>
 #include <AknSgcc.h>
 #include <AknCapServerClient.h>
+#include <logsservices.h>
 //CONSTANTS
 static const int PHONE_CALL_NOT_FOUND = -1;
+const TUid KCRUidTelTouchButtons = {0x2001B2E6};
+const TUint32 KTelIncallTouchButtons   = 0x00000001;
 PhoneUIQtViewAdapter::PhoneUIQtViewAdapter (PhoneUIQtViewIF &view, QObject *parent) :
-QObject (parent), m_view (view), m_idleUid(-1),
+QObject (parent),
-m_dialpadAboutToClose(false), m_homeScreenToForeground(false),
+m_view (view),
-m_carModeEnabled(false)
+m_idleUid(-1),
+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_dialpadAboutToClose(false),
+m_homeScreenToForeground(false),
+m_visibilityHandler(0),
+m_appLauncher(0),
+m_clearDialpadOnClose(true),
+m_speakerAsDefaultButton(false)
 {
 m_bubbleWrapper = new PhoneBubbleWrapper(m_view.bubbleManager (), this);
 m_noteController = new PhoneNoteController(this);
 m_uiCommandController = new PhoneUiCommandController(view, this);
-m_messageController = new PhoneMessageController(this);
 TRAPD( error, m_ringingtonecontroller = CPhoneRingingToneController::NewL () );
 qt_symbian_throwIfError(error);
 m_resourceAdapter = PhoneResourceAdapter::Instance(this);
 intParam.SetInteger(m_resourceAdapter->defaultToolbarResourceId());
 setToolbarButtons(&intParam);
 m_telephonyService = new TelephonyService (this, this);
 	m_indicatorController = new PhoneIndicatorController(this);
+m_visibilityHandler = new PhoneVisibilityHandler(view, this);
-// Define car mode pub sub key
+m_appLauncher = new PhoneAppLauncher(this);
-int err = RProperty::Define(
+m_messageController = new PhoneMessageController(*m_appLauncher, this);
-KPSUidTelCarMode,
-KTelCarMode,
+int touchButton(-1);
-RProperty::EInt,
+if ( KErrNone == CPhoneCenRepProxy::Instance()->GetInt(
-KPhoneReadPolicy,
+KCRUidTelTouchButtons,
-KPhoneWritePolicy);
+KTelIncallTouchButtons,
+touchButton ) ) {
-// Start listening to car mode changes
+if ( touchButton == 2 ) {
-if(err == KErrNone) {
+m_speakerAsDefaultButton = true;
-CPhonePubSubProxy::Instance()->NotifyChangeL(KPSUidTelCarMode,
+}
-KTelCarMode, this);
+}
-}
 }
 PhoneUIQtViewAdapter::~PhoneUIQtViewAdapter ()
 {
 delete m_ringingtonecontroller;
 removeConferenceBubble();
 break;
 case EPhoneViewSendToBackground:
 case EPhoneViewBringIdleToForeground:
-if (m_homeScreenToForeground) {
+m_visibilityHandler->sendToBackground(m_homeScreenToForeground);
-RWsSession& wsSession = CEikonEnv::Static()->WsSession();
-TApaTaskList taskList( wsSession );
-_LIT(KPhoneHsAppName,"hsapplication");
-TApaTask task = taskList.FindApp(KPhoneHsAppName);
-task.BringToForeground();
-} else {
-XQServiceUtil::toBackground(true);
-}
 m_homeScreenToForeground = false;
 break;
 case EPhoneViewRemoveAllCallHeaders:
 removeAllCallHeaders();
 break;
 int bubble = m_bubbleWrapper->bubbles().value(aCallId);
 m_view.clearBubbleCommands(bubble);
 m_view.removeExpandAction(bubble);
 m_bubbleWrapper->removeCallHeader (aCallId);
 m_bubbleWrapper->bubbleManager().endChanges();
-m_indicatorController->clearActiveCallData();
+if (!m_bubbleWrapper->bubbles().count()) {
+m_indicatorController->clearActiveCallData();
+}
 }
 break;
 case EPhoneViewRemoveFromConference:
 removeCallFromConference(aCallId);
 break;
 break;
 case EPhoneViewShowQuery:
 m_noteController->showQuery(aCommandParam);
 break;
 case EPhoneViewOpenSoftRejectEditor:
+m_visibilityHandler->hideDeviceDialogs(false);
 m_messageController->openSoftRejectMessageEditor(aCommandParam);
+break;
+case EPhoneViewSetGlobalNotifiersDisabled:
+hideDeviceDialogs(aCommandParam);
+break;
+case EPhoneViewLaunchLogs:
+openLogs(aCommandParam);
 break;
 default:
 break;
 }
 CPhoneMediatorFactory::Instance()->Sender()->SendEvent( aCmdId, *aCommandParam );
 case EPhoneViewHsToForegroundAfterCall: {
 TPhoneCmdParamBoolean *param = static_cast<TPhoneCmdParamBoolean *>(aCommandParam);
 m_homeScreenToForeground = param->Boolean();
 }
 break;
+case EPhoneViewSetIhfFlag: {
+TPhoneCmdParamBoolean *param = static_cast<TPhoneCmdParamBoolean *>(aCommandParam);
+PhoneResourceAdapter::Instance()->buttonsController()->
+setButtonFlags(PhoneUIQtButtonsController::Ihf,
+param->Boolean());
+}
+break;
+case EPhoneViewSetMuteFlag: {
+TPhoneCmdParamBoolean *param = static_cast<TPhoneCmdParamBoolean *>(aCommandParam);
+PhoneResourceAdapter::Instance()->buttonsController()->
+setButtonFlags(PhoneUIQtButtonsController::Mute,
+param->Boolean());
+}
+break;
+case EPhoneViewSetBlueToothFlag: {
+TPhoneCmdParamBoolean *param = static_cast<TPhoneCmdParamBoolean *>(aCommandParam);
+PhoneResourceAdapter::Instance()->buttonsController()->
+setButtonFlags(PhoneUIQtButtonsController::Btaa,
+param->Boolean());
+}
+break;
+case EPhoneViewSetBluetoothAvailableFlag: {
+TPhoneCmdParamBoolean *param = static_cast<TPhoneCmdParamBoolean *>(aCommandParam);
+PhoneResourceAdapter::Instance()->buttonsController()->
+setButtonFlags(PhoneUIQtButtonsController::BluetoothAvailable,
+param->Boolean());
+}
+break;
+case EPhoneViewStartCapturingKey: {
+TPhoneCmdParamKeyCapture *captureParam =
+static_cast<TPhoneCmdParamKeyCapture *>(aCommandParam);
+Qt::Key qtKey;
+if (convertKey(captureParam->KeyCode(), qtKey)) {
+m_view.captureKey(qtKey, true);
+}
+}
+break;
+case EPhoneViewStopCapturingKey: {
+TPhoneCmdParamKeyCapture *captureParam =
+static_cast<TPhoneCmdParamKeyCapture *>(aCommandParam);
+Qt::Key qtKey;
+if (convertKey(captureParam->KeyCode(), qtKey)) {
+m_view.captureKey(qtKey, false);
+}
+}
+break;
 default:
 break;
 }
 }
 return KNullDesC;
 }
 void PhoneUIQtViewAdapter::dialpadClosed()
 {
+if (m_clearDialpadOnClose) {
+m_view.clearDialpad();
+}
 m_dialpadAboutToClose = true;
+m_clearDialpadOnClose = true;
 setCallMenu();
 }
 PhoneNoteController* PhoneUIQtViewAdapter::noteController() const
 {
 m_bubbleWrapper->bubbleManager ().endChanges ();
 if (1 == m_bubbleWrapper->bubbles().keys().count()) {
 setHidden(false);
 }
-m_indicatorController->setActiveCallData( data.CLIText(), KNullDesC );
+m_indicatorController->setActiveCallData();
 }
 void PhoneUIQtViewAdapter::createEmergencyCallHeader(
 int callId,
 TPhoneCommandParam *commandParam)
 int bubble = m_bubbleWrapper->createCallHeader (callId);
 m_bubbleWrapper->setLabel (bubble, data.LabelText ());
 m_bubbleWrapper->setCli (bubble, data.HeaderText ());
 m_bubbleWrapper->setCiphering(bubble, data.CipheringIndicatorAllowed(), data.Ciphering());
 m_bubbleWrapper->bubbleManager ().endChanges ();
+m_indicatorController->setActiveCallData();
 }
 void PhoneUIQtViewAdapter::updateCallHeaderState (
 int callId,
 TPhoneCommandParam *commandParam)
 m_bubbleWrapper->setCli (bubble, data.CLIText ());
 m_bubbleWrapper->setSecondaryCli (bubble, data.CNAPText ());
 m_bubbleWrapper->setDivert (bubble, data.Diverted ());
 m_bubbleWrapper->bubbleManager ().endChanges ();
 }
+m_indicatorController->setActiveCallData();
 }
 void PhoneUIQtViewAdapter::updateCallHeaderRemoteInfoAndLabel (int callId, TPhoneCommandParam *commandParam)
 {
 TPhoneCmdParamBoolean &param =
 static_cast<TPhoneCmdParamBoolean &>(*commandParam);
 bool emergencyCall = param.Boolean();
 m_bubbleWrapper->bubbleManager ().startChanges ();
-m_view.clearParticipantListActions();
 QList<int> bubbles = m_bubbleWrapper->bubbles().keys();
 m_resourceAdapter->buttonsController()->setButtonFlags(
 PhoneUIQtButtonsController::DisableJoin,
 (5 <= m_bubbleWrapper->conferenceCallList().count()));
+setCommonButtonFlags();
 for (int j = 0; j < bubbles.size(); ++j){
 int callId = bubbles.at(j);
 // Clear bubble
 m_view.clearBubbleCommands(m_bubbleWrapper->bubbles().value(callId));
 *action);
 delete action;
 }
 }
-setParticipantListActions();
 setExpandedConferenceCallHeader();
 setBubbleSelectionFlag();
 setMenu();
 m_bubbleWrapper->bubbleManager ().endChanges ();
 Q_ASSERT (commandParam->ParamId () == TPhoneCommandParam::EPhoneParamIdInteger);
 TPhoneCmdParamInteger &intParam =
 static_cast<TPhoneCmdParamInteger &>(*commandParam);
-m_resourceAdapter->buttonsController()->setButtonFlags(
+setCommonButtonFlags();
-PhoneUIQtButtonsController::DisableJoin,
-(5 <= m_bubbleWrapper->conferenceCallList().count()));
+int callId(-1);
+int serviceId(-1);
-QMap<PhoneAction::ActionType, PhoneAction *> actions = m_resourceAdapter->convert (intParam.Integer ());
+if ( 0<m_bubbleWrapper->callStates().keys().size() ) {
-QList<PhoneAction*> values = actions.values();
+int bubbleId = m_bubbleWrapper->bubbleManager().expandedBubble();
+callId = m_bubbleWrapper->callIdByBubbleId(bubbleId);
+serviceId = m_bubbleWrapper->serviceIdByCallId(callId);
+}
+QList<PhoneAction*> actions = m_uiCommandController->toolBarActions(
+intParam.Integer(),
+m_bubbleWrapper->callStates(),
+m_bubbleWrapper->serviceIds(),
+serviceId,
+callId );
 if (actions.count()) {
-m_view.setToolbarActions(values);
+m_view.setToolbarActions(actions);
 }
 qDeleteAll(actions);
 }
 int bubble = m_bubbleWrapper->createConferenceBubble(
 callId, data.CallState(), data.LabelText(), data.CLIText());
 m_bubbleWrapper->setServiceId(callId,data.ServiceId());
 m_bubbleWrapper->setCiphering(bubble, data.CipheringIndicatorAllowed(), data.Ciphering());
+setParticipantListActions();
 }
 void PhoneUIQtViewAdapter::conferenceCallId(int callId, TPhoneCommandParam *commandParam)
 {
 PHONE_DEBUG("PhoneUIQtViewAdapter::conferenceCallId");
 void PhoneUIQtViewAdapter::removeConferenceBubble()
 {
 m_bubbleWrapper->bubbleManager().startChanges();
 m_view.removeExpandAction(m_bubbleWrapper->bubbleId(KConferenceCallId));
+m_view.clearParticipantListActions();
 m_bubbleWrapper->removeConferenceBubble();
 m_bubbleWrapper->bubbleManager().endChanges();
+if (!m_bubbleWrapper->bubbles().count()) {
+m_indicatorController->clearActiveCallData();
+}
 }
 void PhoneUIQtViewAdapter::isConference(TPhoneCommandParam *commandParam)
 {
 Q_ASSERT (commandParam->ParamId () == TPhoneCommandParam::EPhoneParamIdBoolean);
 (KConferenceCallId == callId));
 }
 void PhoneUIQtViewAdapter::bringToForeground()
 {
-if(!m_carModeEnabled) {
+m_visibilityHandler->bringToForeground();
-m_view.bringToForeground();
+}
-}
+void PhoneUIQtViewAdapter::hideDeviceDialogs(TPhoneCommandParam *commandParam)
+{
+Q_ASSERT (commandParam->ParamId () == TPhoneCommandParam::EPhoneParamIdBoolean);
+TPhoneCmdParamBoolean* booleanParam =
+static_cast<TPhoneCmdParamBoolean*>(commandParam);
+m_visibilityHandler->hideDeviceDialogs(booleanParam->Boolean());
 }
 void PhoneUIQtViewAdapter::showGlobalNote(
 TPhoneCommandParam *commandParam)
 {
 if (booleanParam->Boolean()) {
 m_dialpadAboutToClose = false;
 m_view.showDialpad();
 } else {
+m_clearDialpadOnClose = false;
 m_view.hideDialpad();
 }
 }
 void PhoneUIQtViewAdapter::removeAllCallHeaders()
 m_view.removeExpandAction(bubble);
 m_bubbleWrapper->removeCallHeader (callId);
 m_bubbleWrapper->bubbleManager().endChanges();
 }
 }
-m_indicatorController->clearActiveCallData();
+if (!m_bubbleWrapper->bubbles().count()) {
+m_indicatorController->clearActiveCallData();
+}
 }
 void PhoneUIQtViewAdapter::getNumberFromDialpad(
 TPhoneCommandParam *commandParam)
 {
 values().contains(EPEStateDialing) ||
 m_bubbleWrapper->callStates().
 values().contains(EPEStateConnecting));
 m_bubbleWrapper->bubbleManager().setBubbleSelectionDisabled(selectionFlag);
-}
-void PhoneUIQtViewAdapter::HandlePropertyChangedL(const TUid& aCategory,
-const TUint aKey, const TInt aValue)
-{
-if((aCategory == KPSUidTelCarMode) && (aKey == KTelCarMode)) {
-if(aValue == EPSCarModeOff) {
-m_carModeEnabled = false;
-} else if(aValue == EPSCarModeOn) {
-m_carModeEnabled = true;
-} else {
-Q_ASSERT(false);
-}
-}
 }
 void PhoneUIQtViewAdapter::setHidden(bool hidden)
 {
 TRAP_IGNORE(SetHiddenL(hidden));
 CleanupStack::PopAndDestroy( windowGroupName );
 CAknSgcClient::AknSrv()->UpdateTaskList();
 }
 }
 void PhoneUIQtViewAdapter::openContacts()
 {
-XQServiceRequest snd("com.nokia.services.phonebookappservices.Launch","launch()", false);
+m_appLauncher->launchContacts();
-int retValue;
+}
-snd.send(retValue);
-}
+void PhoneUIQtViewAdapter::openLogs(TPhoneCommandParam *commandParam)
+{
+TPhoneCmdParamString* entryContent =
+static_cast<TPhoneCmdParamString*>(commandParam);
+bool phoneVisible = m_visibilityHandler->phoneVisible();
+m_homeScreenToForeground = false;
+m_visibilityHandler->sendToBackground(m_homeScreenToForeground);
+if (phoneVisible) {
+// Activate logs dialer only if telephone is on the top.
+m_appLauncher->launchLogs(
+LogsServices::ViewAll,
+true,
+QString::fromUtf16(
+entryContent->String()->Ptr(),
+entryContent->String()->Length()));
+}
+}
+void PhoneUIQtViewAdapter::setCommonButtonFlags()
+{
+m_resourceAdapter->buttonsController()->setButtonFlags(
+PhoneUIQtButtonsController::FullConference,
+(5 <= m_bubbleWrapper->conferenceCallList().count()));
+m_resourceAdapter->buttonsController()->setButtonFlags(
+PhoneUIQtButtonsController::IhfAsPushButton,
+m_speakerAsDefaultButton);
+}
+bool PhoneUIQtViewAdapter::convertKey(
+TKeyCode symbianKey, Qt::Key &qtKey)
+{
+bool ret = false;
+switch(symbianKey) {
+case EKeyNo: {
+qtKey = Qt::Key_No;
+ret = true;
+}
+break;
+default:
+break;
+}
+return ret;
+}

branch	GCC_SURGE
changeset 51	f39ed5e045e0
parent 30	ebdbd102c78a
parent 46	bc5a64e5bc3c