FCL/sf/app/phone: comparison phoneuis/dialer/src/cdialer.cpp

equal deleted inserted replaced

-:544e34b3255a
+:91c2fb4b78df
 //
 void CDialer::ConstructL(
 const CCoeControl& aContainer,
 const TRect& aRect,
 MPhoneDialerController* aController )
 {
 DIALER_PRINT("CDialer::ConstructL<");
 LoadResourceL();
 // set window
 SetContainerWindowL( aContainer );
 SetParent( const_cast<CCoeControl*>(&aContainer) );
 iNumberEntry = CDialerNumberEntry::NewL( *this );
 iController = aController;
 iKeypadArea = CDialerKeyPadContainer::NewL( *this, EModeEasyDialing );
 iToolbar = CDialerToolbarContainer::NewL( *this, iController );
 // try to create easydialing plugin. If plugin is not present, iEasydialer gets value NULL.
 LoadEasyDialingPlugin();
 iController = aController;
 iToolbar->SetContentProviderL( iController );
 iNumberEntry->SetNumberEntryPromptTextL( iController->NumberEntryPromptTextL() );
 SizeChanged();
 UpdateToolbar();
+UpdateNumberEntryConfiguration();
 }
 }
 // ---------------------------------------------------------------------------
 // CDialer::Controller
 //
 EXPORT_C MPhoneDialerController* CDialer::Controller()
 {
 return iController;
 }
 // ---------------------------------------------------------------------------
 // CDialer::GetEasyDialingInterface
 // ---------------------------------------------------------------------------
 //
 EXPORT_C CDialingExtensionInterface* CDialer::GetEasyDialingInterface() const
 CSPSettings* serviceProviderSettings = NULL;
 TRAPD( err, serviceProviderSettings = CSPSettings::NewL() );
 if ( !err )
 {
 voipSupported = serviceProviderSettings->IsFeatureSupported(
 ESupportInternetCallFeature );
 delete serviceProviderSettings;
 }
 if ( EasyDialingEnabled() || voipSupported )
 {
 // ---------------------------------------------------------------------------
 // CDialer::RelayoutAndDraw
 // ---------------------------------------------------------------------------
 //
 EXPORT_C void CDialer::RelayoutAndDraw()
-	{
+{
-	if ( iIsUsed )
+if ( iIsUsed )
-		{
+{
-		SetSize( Size() );
+SetSize( Size() );
-		DrawDeferred();
+DrawDeferred();
-		UpdateToolbar();
+UpdateToolbar();
-		}
+}
-	}
+}
 // Methods from MNumberEntry
 // ---------------------------------------------------------------------------
 // CDialer::CreateNumberEntry
 //
 void CDialer::CreateNumberEntry()
 {
 DIALER_PRINT("CDialer::CreateNumberEntry<");
-iIsUsed = ETrue;
+if ( !iIsUsed )
+{
-UpdateNumberEntryConfiguration();
+iIsUsed = ETrue;
+UpdateNumberEntryConfiguration();
-DIALER_PRINT("CDialer::CreateNumberEntry>");
+}
-}
+DIALER_PRINT("CDialer::CreateNumberEntry>");
+}
 // ---------------------------------------------------------------------------
 // CDialer::GetNumberEntry
 //
 // ---------------------------------------------------------------------------
 //
 {
 CCoeControl* control( NULL );
 control = iNumberEntry->GetNumberEntry();
 return control;
 }
 // ---------------------------------------------------------------------------
 // CDialer::IsNumberEntryUsed
 //
 // ---------------------------------------------------------------------------
 //
 TBool CDialer::IsNumberEntryUsed() const
 {
 return iIsUsed;
 }
 // ---------------------------------------------------------------------------
 // CDialer::SetNumberEntryVisible
 //
 // ---------------------------------------------------------------------------
 //
 void CDialer::SetNumberEntryVisible( const TBool& /*aVisibility*/ )
 {
 }
 // ---------------------------------------------------------------------------
 // CDialer::SetTextToNumberEntry
 //
 // ---------------------------------------------------------------------------
 //
 void CDialer::SetTextToNumberEntry( const TDesC& aDesC )
 {
 iNumberEntry->SetTextToNumberEntry( aDesC );
 }
 // ---------------------------------------------------------------------------
 // CDialer::GetTextFromNumberEntry
 //
 // ---------------------------------------------------------------------------
 //
 void CDialer::GetTextFromNumberEntry( TDes& aDes )
 {
 iNumberEntry->GetTextFromNumberEntry( aDes );
 }
 // ---------------------------------------------------------------------------
 // CDialer::RemoveNumberEntry
 //
 // ---------------------------------------------------------------------------
 //
 void CDialer::RemoveNumberEntry()
 {
 ResetEditorToDefaultValues();
+iVirtualKeyBoardOpen = EFalse;
 iIsUsed = EFalse;
 // easydialer change begins
 if (iEasyDialer)
 {
-TRAP_IGNORE( iEasyDialer->HandleCommandL( EEasyDialingClosePopup ) );
+TRAP_IGNORE( iEasyDialer->HandleCommandL( EEasyDialingClosePopup );
+iEasyDialer->HandleCommandL( EEasyDialingVkbClosed ) );
 iEasyDialer->Reset();
 }
 // easydialer change ends
 }
 // ---------------------------------------------------------------------------
 // CDialer::ChangeEditorMode
 //
 // ---------------------------------------------------------------------------
 //
 {
 TInt ret( KErrNotSupported );
 ret = iNumberEntry->ChangeEditorMode( aDefaultMode );
 return ret;
 }
 // ---------------------------------------------------------------------------
 // CDialer::OpenVKBL
 //
 // ---------------------------------------------------------------------------
 //
 {
 iVirtualKeyBoardOpen = ETrue;
 UpdateEdwinState( EVirtualKeyboardEditor );
 iNumberEntry->HandleCommandL( EDialerCmdTouchInput );
+if ( iEasyDialer )
+{
+iEasyDialer->HandleCommandL( EEasyDialingVkbOpened );
+}
 }
 // ---------------------------------------------------------------------------
 // CDialer::GetEditorMode
 //
 // ---------------------------------------------------------------------------
 //
 TInt CDialer::GetEditorMode() const
 {
-TBool vkbOpen = EdwinState()->Flags() & EAknEditorFlagTouchInputModeOpened;
+return ( iEditorType == ENumericEditor ) ?
-return ( iQwertyMode || vkbOpen ) ? EAknEditorTextInputMode :
+EAknEditorNumericInputMode : EAknEditorTextInputMode;
-EAknEditorNumericInputMode;
+}
-}
 // ---------------------------------------------------------------------------
 // CDialer::ResetEditorToDefaultValues
 //
 // ---------------------------------------------------------------------------
 //
 void CDialer::ResetEditorToDefaultValues()
 {
 iNumberEntry->ResetEditorToDefaultValues();
 }
 // ---------------------------------------------------------------------------
 // CDialer::SetNumberEntryPromptText
 //
 // ---------------------------------------------------------------------------
 //
 //
 EXPORT_C void CDialer::HandleQwertyModeChange( TInt aMode )
 {
 iQwertyMode = aMode;
 UpdateNumberEntryConfiguration();
+if ( iEasyDialer && aMode )
+{
+TRAP_IGNORE( iEasyDialer->HandleCommandL( EEasyDialingVkbClosed ) );
+}
 }
 // ---------------------------------------------------------
 // CDialer::HandleKeyboardLayoutChange
 // ---------------------------------------------------------
 {
 count--;
 }
 return count;
 }
 // ---------------------------------------------------------------------------
 // CDialer::ComponentControl(TInt aIndex) const
 //
 // Returns contained control by given index.
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // CDialer::FocusChanged
 // ---------------------------------------------------------------------------
 //
-void CDialer::FocusChanged(TDrawNow aDrawNow)
+void CDialer::FocusChanged( TDrawNow aDrawNow )
 {
 if ( iEasyDialer )
 {
 // Number entry is set to focus if dialer is in focus and easydialing plugin
 // is not in focus.
 TBool numberEntryFocus = IsFocused() && !iEasyDialer->IsFocused();
 iNumberEntry->SetFocus( numberEntryFocus, aDrawNow );
 }
 else
 {
 iNumberEntry->SetFocus( IsFocused(), aDrawNow );
 }
 }
 // ---------------------------------------------------------------------------
 // CDialer::MakeVisible
 // ---------------------------------------------------------------------------
 //
 void CDialer::MakeVisible( TBool aVisible )
 {
 // Clear editor flags and report
 // edwin state changed.
 iVirtualKeyBoardOpen = EFalse;
 UpdateNumberEntryConfiguration();
+if ( iEasyDialer )
+{
+iEasyDialer->HandleCommandL( EEasyDialingVkbClosed );
+}
 }
 }
 // ---------------------------------------------------------------------------
 // CDialer::HandleResourceChange
 {
 ControlEnv()->DeleteResourceFile( iResourceOffset );
 iResourceOffset = 0;
 }
 }
 // ---------------------------------------------------------------------------
 // CDialer::ComponentControlForDialerMode
 //
 // Returns contained control by given index in ohonedialer mode.
 //
 //
 // ---------------------------------------------------------------------------
 //
 void CDialer::UpdateEdwinState( TEditorType aType )
 {
+iEditorType = aType;
 CAknEdwinState* edwinState = EdwinState();
 switch ( aType )
 {
 case ENumericEditor:
 if ( error )
 {
 DIALER_PRINT( "CDialer::LoadEasyDialingPlugin, load failed" )
 delete iEasyDialer;
 iEasyDialer = NULL;
 delete iDialingExtensionObserver;
 iDialingExtensionObserver = NULL;
 }
 // CDialer::LayoutNumberEntry
 // ---------------------------------------------------------------------------
 //
 void CDialer::LayoutNumberEntry( const TRect& aParent, TInt aVariety )
 {
-// Use larger number entry if Easy dialing is not currently enabled.
+TAknLayoutRect neLayoutRect;
+neLayoutRect.LayoutRect( aParent, AknLayoutScalable_Apps::dia3_numentry_pane( aVariety ) );
+TRect neRect = neLayoutRect.Rect();
 if ( EasyDialingEnabled() )
 {
 iNumberEntry->SetOperationMode( EModeEasyDialing );
-AknLayoutUtils::LayoutControl(
-iNumberEntry, aParent,
+// Layout doesn't define any margin between number entry and contact list.
-AknLayoutScalable_Apps::dia3_numentry_pane( aVariety ).LayoutLine() );
+// Add a small margin here.
+neRect.iTl.iY += 2;
 }
 else
 {
 iNumberEntry->SetOperationMode( EModeDialer );
-TAknLayoutRect neLayoutRect;
-neLayoutRect.LayoutRect( aParent, AknLayoutScalable_Apps::dia3_numentry_pane( aVariety ) );
+// Use rect which is an union of layout rects for ED and NE
 TAknLayoutRect edLayoutRect;
 edLayoutRect.LayoutRect( aParent, AknLayoutScalable_Apps::dia3_listscroll_pane( aVariety ) );
+neRect.iTl.iY = edLayoutRect.Rect().iTl.iY;
-// create rect which is union of layout rects for ED and NE
+}
-TRect neRect( edLayoutRect.Rect().iTl, neLayoutRect.Rect().iBr );
+iNumberEntry->SetRect( neRect );
-iNumberEntry->SetRect( neRect );
-}
 }
 // End of File

branch	RCL_3
changeset 25	91c2fb4b78df
parent 19	544e34b3255a
child 31	ba54057fe027