--- a/phoneapp/phoneuiqtviewadapter/src/phoneuiqtviewadapter.cpp	Mon Aug 23 15:42:12 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/src/phoneuiqtviewadapter.cpp	Fri Sep 03 13:33:36 2010 +0300
@@ -124,7 +124,7 @@
             m_speakerAsDefaultButton = true;
         }    
     }
-
+    
 }
 
 PhoneUIQtViewAdapter::~PhoneUIQtViewAdapter ()
@@ -182,9 +182,11 @@
         removeAllCallHeaders();
         break;
     case EPhoneViewRemoveNumberEntry:
-    case EPhoneViewClearNumberEntryContent: // Fall through
         removeDialpad();
         break;
+    case EPhoneViewClearNumberEntryContent: 
+        clearDialpad();
+        break;
     case EPhoneViewAddToConference:
         addToConference();
         break;
@@ -511,6 +513,14 @@
         }
     }
     break;
+    case EPhoneViewSetSoftRejectDimmed: {
+        TPhoneCmdParamBoolean *param = static_cast<TPhoneCmdParamBoolean *>(aCommandParam);
+
+        PhoneResourceAdapter::Instance()->buttonsController()->
+                setButtonFlags(PhoneUIQtButtonsController::DisableSoftReject, 
+                               param->Boolean());
+        }
+        break;
     case EPhoneViewStopCapturingKey: {
         TPhoneCmdParamKeyCapture *captureParam = 
                 static_cast<TPhoneCmdParamKeyCapture *>(aCommandParam);        
@@ -557,11 +567,13 @@
 void PhoneUIQtViewAdapter::handleWindowActivated()
 {
     m_indicatorController->disableActiveCallIndicator();
+    m_view.captureKey(Qt::Key_Yes, true);
 }
 
 void PhoneUIQtViewAdapter::handleWindowDeactivated()
 {
     m_indicatorController->enableActiveCallIndicator();
+    m_view.captureKey(Qt::Key_Yes, false);
 }
 
 void PhoneUIQtViewAdapter::setTopApplication (TPhoneCommandParam *commandParam)
@@ -628,7 +640,10 @@
     if (1 == m_bubbleWrapper->bubbles().keys().count()) {
         setHidden(false);
     }
-    m_indicatorController->setActiveCallData();
+    if( EPECallTypeVideo != data.CallType() ){
+        m_indicatorController->setActiveCallData();
+    }
+    
 }
 
 void PhoneUIQtViewAdapter::createEmergencyCallHeader(
@@ -690,8 +705,9 @@
          m_bubbleWrapper->setDivert (bubble, data.Diverted ());
          m_bubbleWrapper->bubbleManager ().endChanges ();
      }
-     m_indicatorController->setActiveCallData();
-
+     if ( EPECallTypeVideo != data.CallType() ) {
+         m_indicatorController->setActiveCallData();
+     }
 }
 
 void PhoneUIQtViewAdapter::updateCallHeaderRemoteInfoAndLabel (int callId, TPhoneCommandParam *commandParam)
@@ -1174,6 +1190,16 @@
     m_view.clearAndHideDialpad();
 }
 
+void PhoneUIQtViewAdapter::clearDialpad()
+{
+    // After the sending of SS strings the view stays in Dialer.
+    if (!m_visibilityHandler->phoneVisible()){ 
+        m_appLauncher->launchLogs( XQService::LogsViewAll, true,QString(""));
+    }else{
+        m_view.clearDialpad();
+    }
+}
+
 void PhoneUIQtViewAdapter::addToConference()
 {
     m_bubbleWrapper->addToConferenceBubble();