FCL/sf/app/commonemail: comparison emailuis/emailui/src/ncsaifeditor.cpp

equal deleted inserted replaced

-:968773a0b6ef
+:c8382f7b54ef
 const TDesC& otherDn = entry.Address().DisplayName();
 return ownDn.Compare( otherDn ) == 0;
 }
 // ---------------------------------------------------------------------------
-// constructor/destructor
+// Constructor
 // ---------------------------------------------------------------------------
 //
 CNcsAifEditor::CNcsAifEditor(
 MNcsFieldSizeObserver* aSizeObserver, const TDesC& aCaptionText )
-: CNcsEditor( aSizeObserver, ETrue, ENcsEditorAddress, aCaptionText ), iAddressPopupList( NULL ),
+: CNcsEditor( aSizeObserver, ETrue, ENcsEditorAddress, aCaptionText ),
+iAddressPopupList( NULL ),
 iAddLeftover( ETrue )
 {
 FUNC_LOG;
-	SetEdwinObserver( this );
+SetEdwinObserver( this );
 }
 // ---------------------------------------------------------------------------
 // second phase constructor
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 //
 CNcsAifEditor::~CNcsAifEditor()
 {
 FUNC_LOG;
-	iArray.ResetAndDestroy();
+iArray.ResetAndDestroy();
-	iAddressArray.Reset();
+iAddressArray.Reset();
-	if ( iAsyncCallBack )
+if ( iAsyncCallBack )
-	    {
+{
-	    iAsyncCallBack->Cancel();
+iAsyncCallBack->Cancel();
-	    delete iAsyncCallBack;
+delete iAsyncCallBack;
-	    }
+}
 }
 // -----------------------------------------------------------------------------
 // CNcsAifEditor::CursorLineNumber() const
 // -----------------------------------------------------------------------------
 //
 // Check if we need to highlight a contact
 if ( ret == EKeyWasNotConsumed )
 {
 ret = SetEditorSelectionL( aKeyEvent, aType );
 }
 //when press a key down, record the coursor position
 if ( aType == EEventKeyDown )
-	{
+{
-	iLastTimeCursorPos = CursorPos();
+iLastTimeCursorPos = CursorPos();
-	}
+}
 if ( ret == EKeyWasNotConsumed )
 {
 // enter completes the address entry
-if( aType == EEventKey && (aKeyEvent.iCode == EKeyEnter ||
+if ( aType == EEventKey && ( aKeyEvent.iCode == EKeyEnter ||
-	aKeyEvent.iScanCode == EStdKeyEnter) )
+aKeyEvent.iScanCode == EStdKeyEnter ) )
-	{
+{
-	// make sure there is really some text inputted
+// make sure there is really some text inputted
+const TInt cursorPos = CursorPos();
+TCursorSelection selection = NonEntryTextAtPos( cursorPos );
+const TInt length = selection.Length();
+if ( length > 0 )
+{
+HBufC* text = HBufC::NewLC( length );
+TPtr ptr = text->Des();
+Text()->Extract( ptr, selection.LowerPos(), length );
+ptr.Trim();
+// complete the entry by adding a semicolon,
+// address will be added in HandleTextUpdateL
+if ( ptr.Length() > 0 )
+{
+Text()->InsertL( cursorPos, KCharAddressDelimeterSemiColon );
+HandleTextChangedL();
+SetCursorPosL( cursorPos + 1, EFalse );
+iLastTimeCursorPos = CursorPos();
+HandleTextUpdateL();
+}
+CleanupStack::PopAndDestroy( text );
+}
+}
+else if ( IsCharacterKey( aKeyEvent ) )
+{
+PrepareForTextInputL( CursorPos() );
+}
+iTextSelection = Selection();
+ret = CNcsEditor::OfferKeyEventL( aKeyEvent, aType );
+}
+// for Korean we need to simulate event 'text update' as FEP
+// doesn't send it and the MRU is not shown
+if ( User::Language() == ELangKorean )
+{
+if ( ret == EKeyWasNotConsumed && aType == EEventKeyUp )
+{
 TInt cursorPos( CursorPos() );
 TCursorSelection selection = NonEntryTextAtPos( cursorPos );
 TInt length( selection.Length() );
 HBufC* text = HBufC::NewLC( length );
 TPtr ptr = text->Des();
 Text()->Extract( ptr, selection.LowerPos(), length );
 ptr.Trim();
-// complete the entry by adding a semicolon,
+if ( TFsEmailUiUtility::IsKoreanWord( ptr ) )
-// address will be added in HandleTextUpdateL
+{
-if( ptr.Length() > 0 )
+HandleTextUpdateDeferred();
-	{
+}
-				Text()->InsertL( cursorPos, KCharAddressDelimeterSemiColon );
-				HandleTextChangedL();
+CleanupStack::PopAndDestroy( text );
-				SetCursorPosL( cursorPos + 1, EFalse );
+}
-	}
-CleanupStack::PopAndDestroy( text );
-	}
-iTextSelection = Selection();
-ret = CNcsEditor::OfferKeyEventL( aKeyEvent, aType );
 }
 return ret;
 }
 // We need to offer the key to the editor control first so it can
 // move the cursor for us.  Then we check if it's in an entry.
 if ( aKeyEvent.iCode == EKeyUpArrow || aKeyEvent.iCode == EKeyDownArrow )
 {
 CompleteEntryL();
 response = CNcsEditor::OfferKeyEventL( aKeyEvent,aType );
 if ( response == EKeyWasConsumed )
 {
 // We're moving to a new line.
 entry = GetEntryAt( CursorPos() );
 SetSelectionL( entry->iCursorPos, entry->iAnchorPos );
 }
 }
 }
 // Check if the cursor is in any of the addresses
-else if( aKeyEvent.iCode == EKeyLeftArrow || aKeyEvent.iCode == EKeyBackspace )
+else if ( aKeyEvent.iCode == EKeyLeftArrow || aKeyEvent.iCode == EKeyBackspace )
 {
 // We're moving left, but haven't yet.
-entry = GetEntryAt( CursorPos(), EDirectionLeft );
+const TInt cursorPos = CursorPos();
+entry = GetEntryAt( cursorPos, EDirectionLeft );
 if ( entry )
 {
 if ( selection.Length() && aKeyEvent.iCode == EKeyLeftArrow)
 {
 // Adds or removes the entry from the current selection.
 {
 SetSelectionL( entry->LowerPos(), entry->HigherPos() );
 response = EKeyWasConsumed;
 }
 }
-}
+else
-else if( aKeyEvent.iCode == EKeyRightArrow || aKeyEvent.iCode == EKeyDelete )
+{
+// Complete entry, if cursor is being moved to the previous row.
+TCursorSelection selection = NonEntryTextAndSpaceAtPos( cursorPos );
+if ( cursorPos > 0 && selection.LowerPos() + 1 == cursorPos )
+{
+if ( IsDelimiter( CharAtPos( selection.LowerPos() ) ) )
+{
+CompleteEntryL();
+SetCursorPosL( cursorPos, EFalse );
+}
+}
+}
+}
+else if ( aKeyEvent.iCode == EKeyRightArrow || aKeyEvent.iCode == EKeyDelete )
 {
 // We're moving right, but haven't yet.
-entry = GetEntryAt( CursorPos(), EDirectionRight );
+const TInt cursorPos = CursorPos();
+entry = GetEntryAt( cursorPos, EDirectionRight );
 if ( entry )
 {
 if ( selection.Length() && aKeyEvent.iCode == EKeyRightArrow  )
 {
 // Adds or removes the entry form the current selection.
 }
 else if ( !selection.Length() )
 {
 SetSelectionL( entry->HigherPos(), entry->LowerPos() );
 response = EKeyWasConsumed;
+}
+}
+else
+{
+// Complete entry, if cursor is being moved to the next row.
+TCursorSelection selection = NonEntryTextAndSpaceAtPos( cursorPos );
+if ( cursorPos > 0 && selection.HigherPos() - 1 == cursorPos )
+{
+if ( IsDelimiter( CharAtPos( selection.HigherPos() - 1 ) ) )
+{
+CompleteEntryL();
+}
 }
 }
 }
 // to fix problems with updating CBA when hash key is pressed and hold
 else if ( aKeyEvent.iScanCode == EStdKeyHash )
 {
 entry = iArray[ii];
 break;
 }
 }
+SetCursorVisible( EFalse );
 ClearSelectionL();
+RepositionEntries( entry );
-RepositionEntriesL( entry );
+SetCursorVisible( ETrue );
 // The key event is set consumed only on delete and backpace
 // events, other events need to be forwarded to the editor.
 if ( aKeyEvent.iCode == EKeyDelete ||
 aKeyEvent.iCode == EKeyBackspace )
 // ---------------------------------------------------------------------------
 // CNcsAifEditor::DoCharChangeL
 // ---------------------------------------------------------------------------
 //
 void CNcsAifEditor::DoCharChangeL()
-	{
+{
 FUNC_LOG;
-	RecalculateEntryPositions();
+RecalculateEntryPositions();
-	TChar previousChar = CharAtPos( CursorPos() - 1 );
+TChar previousChar = CharAtPos( CursorPos() - 1 );
-	TBool sentinel = ( previousChar == KCharAddressDelimeterSemiColon ||
+TBool sentinel = ( previousChar == KCharAddressDelimeterSemiColon ||
-	    previousChar == KCharAddressDelimeterComma );
+previousChar == KCharAddressDelimeterComma );
-	if ( sentinel )
+if ( sentinel )
 {
 // if comma was pressed we replace it with semicolon
-		if ( previousChar == KCharAddressDelimeterComma )
+if ( previousChar == KCharAddressDelimeterComma )
 {
-			CPlainText* text = Text();
+CPlainText* text = Text();
-			text->DeleteL( CursorPos() - 1, 1 );
+text->DeleteL( CursorPos() - 1, 1 );
-			text->InsertL( CursorPos() - 1, KCharAddressDelimeterSemiColon );
+text->InsertL( CursorPos() - 1, KCharAddressDelimeterSemiColon );
 }
-		ParseNewAddressL();
+ParseNewAddressL();
 }
-	UpdateAddressAutoCompletionL();
+UpdateAddressAutoCompletionL();
-	}
+}
 // ---------------------------------------------------------------------------
 // CNcsAddressInputField::CharAtPos
 // ---------------------------------------------------------------------------
 //
 TChar CNcsAifEditor::CharAtPos( TInt aPos ) const
 {
 FUNC_LOG;
-	if ( aPos >= 0 && aPos < TextLength() )
+if ( aPos >= 0 && aPos < TextLength() )
 {
-		TBuf<1> buf;
+TBuf<1> buf;
-		Text()->Extract( buf, aPos, 1 );
+Text()->Extract( buf, aPos, 1 );
-		return buf[0];
+return buf[0];
 }
-	else
+else
 {
-		return 0;
+return 0;
 }
 }
 // -----------------------------------------------------------------------------
 // CNcsAifEditor::SetAddressesL()
 // -----------------------------------------------------------------------------
 // CNcsAifEditor::AppendAddressesL()
 // -----------------------------------------------------------------------------
 //
-void CNcsAifEditor::AppendAddressesL( const RPointerArray<CNcsEmailAddressObject>& aAddresses )
+void CNcsAifEditor::AppendAddressesL(
+const RPointerArray<CNcsEmailAddressObject>& aAddresses )
 {
 FUNC_LOG;
 // First, add all the addresses without updating the editor text contents
 for ( TInt i=0 ; i<aAddresses.Count() ; i++ )
 {
 AddAddressL( *aAddresses[i], EFalse );
 }
-// Update editor text content after all the items have been added
-RepositionEntriesL( NULL );
+// Update editor text content after all the items have been added.
+SetCursorVisible( EFalse );
+const TInt count = iArray.Count();
+CNcsAifEntry* lastEntry = count ? iArray[count-1] : NULL;
+RepositionEntries( lastEntry );
+SetCursorVisible( ETrue );
 }
 // -----------------------------------------------------------------------------
 // CNcsAifEditor::GetAddressesL()
 // -----------------------------------------------------------------------------
 //
 const RPointerArray<CNcsEmailAddressObject>& CNcsAifEditor::GetAddressesL()
 {
-	// Clear the existing array since it may be out of sync
+// Clear the existing array since it may be out of sync
-	iAddressArray.Reset();
+iAddressArray.Reset();
-	for ( TInt i=0 ; i<iArray.Count() ; i++ )
+for ( TInt i=0; i<iArray.Count(); i++ )
 {
-		iAddressArray.AppendL(&iArray[i]->Address());
+iAddressArray.AppendL( &iArray[i]->Address() );
 }
-	return iAddressArray;
+return iAddressArray;
 }
 // -----------------------------------------------------------------------------
 // CNcsAifEditor::GetEntryAt()
 // -----------------------------------------------------------------------------
 //
 CNcsAifEntry* CNcsAifEditor::GetEntryAt(
 // -----------------------------------------------------------------------------
 //
 void CNcsAifEditor::ParseNewAddressL()
 	{
 FUNC_LOG;
-	HBufC* text = GetNonEntryTextLC();
+HBufC* text = GetNonEntryTextLC();
-	__ASSERT_ALWAYS( text, Panic(EFSEmailUiNullPointerException) );
+__ASSERT_ALWAYS( text, Panic(EFSEmailUiNullPointerException) );
-	if ( text->Length() )
+if ( text->Length() )
-		{
+{
 // if changing focus leftover text is parsed to email
 // object - we don't need to add it anymore
 iAddLeftover = EFalse;
 // check if there is a name for the email address
 HBufC* name = CFsDelayedLoader::InstanceL()->GetContactHandlerL()->GetLastSearchNameL( *text );
-	if ( name )
+if ( name )
-		{
+{
 CleanupStack::PushL( name );
-		AddAddressL( *name, *text, ETrue );
+AddAddressL( *name, *text, ETrue );
-		CleanupStack::PopAndDestroy( name );
+CleanupStack::PopAndDestroy( name );
-		}
+}
-	else
+else
-		{
+{
-		AddAddressL( KNullDesC, *text );
+AddAddressL( KNullDesC, *text );
-		}
+}
-	    }
+}
-	CleanupStack::PopAndDestroy(text);
+CleanupStack::PopAndDestroy(text);
 	}
 // -----------------------------------------------------------------------------
 // CNcsAifEditor::GetNonEntryTextL()
 // This will extract any text that was entered that is not
 // -----------------------------------------------------------------------------
 // CNcsAifEditor::AddAddressL()
 // -----------------------------------------------------------------------------
 //
-void CNcsAifEditor::AddAddressL( const CNcsEmailAddressObject& aAddress, TBool aUpdateEditorText /*= ETrue*/ )
+void CNcsAifEditor::AddAddressL( const CNcsEmailAddressObject& aAddress,
+TBool aUpdateEditorText /*= ETrue*/ )
 {
 FUNC_LOG;
 CNcsAifEntry* entry = CNcsAifEntry::NewL( aAddress );
 CleanupStack::PushL( entry );
 AddAddressL( entry, aUpdateEditorText );
 TBool aUpdateEditorText /*= ETrue*/ )
 {
 FUNC_LOG;
 CNcsAifEntry* entry = CNcsAifEntry::NewL( aDisplayName, aEmail, aDisplayFull );
 CleanupStack::PushL( entry );
-	AddAddressL( entry, aUpdateEditorText );
+AddAddressL( entry, aUpdateEditorText );
-	CleanupStack::Pop( entry );
+CleanupStack::Pop( entry );
 }
 void CNcsAifEditor::AddAddressL( CNcsAifEntry* aNewEntry, TBool aUpdateEditorText )
 {
 FUNC_LOG;
-	TInt idx;
+TInt idx;
-	// Check for duplicate display names
+// Check for duplicate display names
-	for ( idx=0 ; idx<iArray.Count() ; idx++ )
+for ( idx=0 ; idx<iArray.Count() ; idx++ )
 {
-		if ( iArray[idx]->IsSameDN(*aNewEntry) )
+if ( iArray[idx]->IsSameDN(*aNewEntry) )
 {
-			iArray[idx]->SetDupL();
+iArray[idx]->SetDupL();
-			aNewEntry->SetDupL();
+aNewEntry->SetDupL();
 }
 }
-	// Find the location where we need to insert the address.
+// Find the location where we need to insert the address.
-	// Browse from back to forth to make last index as default index.
+// Browse from back to forth to make last index as default index.
-	// This ensures items remain in correct order when populating field from
+// This ensures items remain in correct order when populating field from
-	// existing message.
+// existing message.
-	TInt cursorPos = CursorPos();
+TInt cursorPos = CursorPos();
 // if we are at the end of editor the address was
 // added from MRU list or separator was typed in
 if ( cursorPos == Text()->DocumentLength() )
 {
 iAddLeftover = EFalse;
 }
-	for ( idx = iArray.Count() ; idx > 0 ; idx-- )
+for ( idx = iArray.Count() ; idx > 0 ; idx-- )
 {
-		if ( cursorPos >= iArray[idx-1]->End() ) break;
+if ( cursorPos >= iArray[idx-1]->End() ) break;
 }
-	if ( idx == iArray.Count() )
+if ( idx == iArray.Count() )
 {
-		// Tack the address onto the end of the array
+// Tack the address onto the end of the array
-		iArray.AppendL( aNewEntry );
+iArray.AppendL( aNewEntry );
 }
-	else
+else
 {
-		iArray.InsertL( aNewEntry, idx );
+iArray.InsertL( aNewEntry, idx );
 }
-	if ( aUpdateEditorText )
+if ( aUpdateEditorText )
-	    {
+{
-	    // Trap because we must not leave after we have taken the ownership of aNewEntry.
+// Trap because we must not leave after we have taken the ownership of
-	    // Otherwise douple deletion might happen.
+// aNewEntry. Otherwise douple deletion might happen.
-	    TRAP_IGNORE( RepositionEntriesL( aNewEntry ) );
+SetCursorVisible( EFalse );
-	    }
+RepositionEntries( aNewEntry );
+SetCursorVisible( ETrue );
+}
 }
 // ---------------------------------------------------------------------------
 // CNcsAifEditor::RecalculateEntryPositions()
 // The text has changed, so recalculate the positions of the items.
 		pos++; // for whitespace
 		}
 	}
 // ---------------------------------------------------------------------------
+// CNcsAifEditor::RepositionEntries()
+// ---------------------------------------------------------------------------
+//
+TInt CNcsAifEditor::RepositionEntries( const CNcsAifEntry* aPosEntry )
+{
+FUNC_LOG;
+TRAPD( err, RepositionEntriesL( aPosEntry ) );
+return err;
+}
+// ---------------------------------------------------------------------------
 // CNcsAifEditor::RepositionEntriesL()
 // ---------------------------------------------------------------------------
 //
 void CNcsAifEditor::RepositionEntriesL( const CNcsAifEntry* aPosEntry )
-	{
+{
 FUNC_LOG;
-	TInt pos = 0;
+TInt pos = 0;
-	CNcsAifEntry* entry;
+CNcsAifEntry* entry;
-	for ( TInt i=0 ; i<iArray.Count() ; i++ )
+for ( TInt i=0 ; i<iArray.Count() ; i++ )
-		{
+{
-		entry = iArray[i];
+entry = iArray[i];
-		pos = entry->SetPos( pos );
+pos = entry->SetPos( pos );
-		pos++; // for whitespace
+pos++; // for whitespace
-		}
+}
 // Reset the text
-	HBufC* text = NULL;
+HBufC* text = GetFormattedAddressListLC( iArray );
-	text = GetFormattedAddressListLC( iArray );
+// fix for dissapearing text PWAN-82DNEJ
-	// fix for dissapearing text PWAN-82DNEJ
+//SetCursorPosL( 0, EFalse ); //In case the cursor pos is invalid
-	SetCursorPosL( 0, EFalse ); //In case the cursor pos is invalid
 if ( iAddLeftover )
 {
 TInt lengthBefore = Text()->DocumentLength();
 HBufC* textBefore = HBufC::NewLC( lengthBefore );
 TPtr ptrBefore = textBefore->Des();
 KCharAddressDelimeterSemiColon ) + 1;
 TPtrC leftover = ptrBefore.Mid( colon );
 HBufC* newText = HBufC::NewLC( text->Length() + leftover.Length() );
 TPtr newTextPtr = newText->Des();
 // add all email addresses
-newTextPtr.Append( text->Des() );
+newTextPtr.Append( *text );
 // add the text that was after last email object
 newTextPtr.Append( leftover );
 SetTextL( newText );
 CleanupStack::PopAndDestroy( newText );
 CleanupStack::PopAndDestroy( textBefore );
 }
 else
 {
 SetTextL( text );
 }
+if ( !aPosEntry )
+{
+// Set cursor at the beginning of the document.
+SetCursorPosL( 0, EFalse );
+}
+else
+{
+// Set the cursor at the end of the given entry
+SetCursorPosL( aPosEntry->End(), EFalse );
+}
 CleanupStack::PopAndDestroy( text );
 HandleTextChangedL();
+}
-// Set the cursor at the end of the given entry
-if ( !aPosEntry )
-	{
-	    SetCursorPosL( 0, EFalse );
-	}
-else
-	{
-	SetCursorPosL( aPosEntry->End(), EFalse );
-	}
-	}
 // ---------------------------------------------------------------------------
 // CNcsAifEditor::CheckAndRemoveInvalidEntriesL()
 // ---------------------------------------------------------------------------
 //
 // ---------------------------------------------------------------------------
 //
 HBufC* CNcsAifEditor::GetLookupTextLC() const
 {
 FUNC_LOG;
-	HBufC* text = GetTextInHBufL();
+HBufC* text = GetTextInHBufL();
+CleanupStack::PushL( text );
-	if (text == NULL) return NULL;
+if ( text )
+{
-	CleanupStack::PushL( text );
+TPtr ptr( text->Des() );
-	TPtr ptr( text->Des() );
+TInt location = ptr.LocateReverse( KCharAddressDelimeterSemiColon );
-	TInt location = ptr.LocateReverse( KCharAddressDelimeterSemiColon );
+if ( location != KErrNotFound )
-	if( location != KErrNotFound )
+{
-{
+ptr = ptr.RightTPtr( ptr.Length() - location -1 );
-		ptr = ptr.RightTPtr( ptr.Length() - location -1 );
+ptr.TrimLeft();
-		ptr.TrimLeft();
+}
 }
-	return text;
+return text;
 }
 // ---------------------------------------------------------------------------
 // CNcsAifEditor::GetFormattedAddressListLC()
 // ---------------------------------------------------------------------------
 HBufC* CNcsAifEditor::GetFormattedAddressListLC(
 RPointerArray<CNcsAifEntry>& aEntries,
 TBool aDisplayList ) const
 {
 FUNC_LOG;
-	TInt length = CalculateAddressListLength( aEntries, aDisplayList );
+TInt length = CalculateAddressListLength( aEntries, aDisplayList );
-	if ( length <= 0 )
+if ( length <= 0 )
 {
-		return HBufC::NewLC(0);
+return HBufC::NewLC(0);
 }
-	HBufC* buf = HBufC::NewLC( length );
+HBufC* buf = HBufC::NewLC( length );
-	TPtr ptr = buf->Des();
+TPtr ptr = buf->Des();
-	TInt count = aEntries.Count();
+TInt count = aEntries.Count();
-	for ( TInt i = 0; i < count; i++ )
+for ( TInt i = 0; i < count; i++ )
 {
 if ( aDisplayList )
 {
 ptr.Append( aEntries[i]->DisplayString() );
 }
 // ---------------------------------------------------------------------------
 //
 HBufC* CNcsAifEditor::GetFormattedAddressListL(
 RPointerArray<CNcsAifEntry>& aEntries,
 TBool aDisplayList ) const
-	{
+{
 FUNC_LOG;
 HBufC* buf = GetFormattedAddressListLC( aEntries, aDisplayList );
 CleanupStack::Pop( buf );
 return buf;
-	}
+}
 // ---------------------------------------------------------------------------
 // CNcsAifEditor::CalculateAddressListLength()
 // ---------------------------------------------------------------------------
 //
 // ---------------------------------------------------------------------------
 //
 void CNcsAifEditor::UpdateAddressAutoCompletionL()
 {
 FUNC_LOG;
-	HBufC* text = GetNonEntryTextLC();
+HBufC* text = GetNonEntryTextLC();
-	__ASSERT_ALWAYS( text, Panic(EFSEmailUiNullPointerException) );
+__ASSERT_ALWAYS( text, Panic(EFSEmailUiNullPointerException) );
-		iAddressPopupList->UpdatePopupContactListL( *text, EFalse );
+iAddressPopupList->UpdatePopupContactListL( *text, EFalse );
-		CleanupStack::PopAndDestroy( text );
+CleanupStack::PopAndDestroy( text );
 }
 // ---------------------------------------------------------------------------
 // CNcsAifEditor::UpdateAddressAutoCompletionL()
 // ---------------------------------------------------------------------------
 //
 // ---------------------------------------------------------------------------
 //
 void CNcsAifEditor::UpdateAddressListAllL()
 {
 FUNC_LOG;
-	iAddressPopupList->UpdatePopupContactListL( KNullDesC, ETrue );
+iAddressPopupList->UpdatePopupContactListL( KNullDesC, ETrue );
 }
 // ---------------------------------------------------------------------------
 // Updates the duplicate markings in the entry array.
 // ---------------------------------------------------------------------------
 //
 void CNcsAifEditor::HandleTextUpdateL()
 {
 FUNC_LOG;
 RecalculateEntryPositions();
 TCursorSelection textSelection = NonEntryTextAtPos( CursorPos() );
-TBool newEntryCreated = EFalse;
 if ( textSelection.Length() )
 {
 // Check non-entry text for complete entries.
-newEntryCreated = HandleTextUpdateL( textSelection );
+const TBool newEntriesAdded = HandleTextUpdateL( textSelection );
-}
+if ( newEntriesAdded )
+{
-if ( newEntryCreated )
+iAddressPopupList->ClosePopupContactListL();
-{
+iSizeObserver->UpdateFieldSizeL( ETrue );
-iAddressPopupList->ClosePopupContactListL();
+iPartialRemove = EFalse;
+}
-// add line feed after new entry
+else
-TInt cursorPos( CursorPos() );
+{
-// related to PWAN-82DNEJ cursorPos shouldn't be 0 here
+MoveNonEntryTextToDedicatedRowsL( CursorPos() );
-if (cursorPos == 0)
+}
-{
+textSelection = NonEntryTextAtPos( CursorPos() );
-cursorPos = TextLength();
+}
-}
+UpdateAddressAutoCompletionL( textSelection );
-if ( !iPartialRemove )
-{
-Text()->InsertL( cursorPos, TChar(CEditableText::ELineBreak) );
-}
-HandleTextChangedL();
-SetCursorPosL( cursorPos + 1, EFalse );
-iSizeObserver->UpdateFieldSizeL( ETrue );
-iPartialRemove = EFalse;
-}
-else
-{
-UpdateAddressAutoCompletionL( textSelection );
-}
 }
 // ---------------------------------------------------------------------------
 // CNcsAifEditor::HandleTextUpdateL()
 // ---------------------------------------------------------------------------
 {
 FUNC_LOG;
 iAddLeftover = ETrue;
 TInt firstCharacter = aSelection.LowerPos();
 TInt lastCharacter = aSelection.HigherPos();
 // get the inputted text
-TInt length = lastCharacter - firstCharacter;
+const TInt length = lastCharacter - firstCharacter;
 HBufC* text = HBufC::NewLC( length );
 TPtr ptr = text->Des();
 Text()->Extract( ptr, firstCharacter, length );
 ptr.Trim();
 }
 addAddress = EFalse;
 }
 }
 }
 // add email that wasn't ended with semicolon
 if ( lastSentinel != KErrNotFound )
 {
 if ( lastSentinel < end && start < end )
 {
 AddAddressL( KNullDesC(), ptr.Mid(start, end-start) );
-}
+entriesFound = ETrue;
 }
+}
 CleanupStack::PopAndDestroy( text );
 return entriesFound;
 }
 // ---------------------------------------------------------------------------
+// Moves inputted non-entry text to separate row
+// ---------------------------------------------------------------------------
+//
+void CNcsAifEditor::MoveNonEntryTextToDedicatedRowsL( TUint aPosition )
+{
+// Get the non-entry text and whitespace at given location
+TCursorSelection textSelection = NonEntryTextAndSpaceAtPos( aPosition );
+const TInt start = textSelection.LowerPos();
+const TInt end = textSelection.HigherPos();
+const TInt length = end - start;
+const TChar lineBreak = TChar( CEditableText::ELineBreak );
+const TChar paragraphDelimiter =
+TChar( CEditableText::EParagraphDelimiter );
+// Make sure that the inputted non-entry text is not on the same lines
+// with existing entries.
+if ( length )
+{
+HBufC* text = HBufC::NewLC( length );
+TPtr ptr = text->Des();
+Text()->Extract( ptr, start, length );
+const TChar firstCharacter = TChar( ptr[0] );
+const TChar lastCharacter = TChar( ptr[length-1] );
+const TInt documentLength = Text()->DocumentLength();
+TBool textChanged = EFalse;
+if ( end < documentLength &&
+lastCharacter != paragraphDelimiter &&
+lastCharacter != lineBreak )
+{
+Text()->InsertL( end, lineBreak );
+HandleTextChangedL();
+textChanged = ETrue;
+}
+if ( start > 0 && start < end &&
+firstCharacter != paragraphDelimiter &&
+firstCharacter != lineBreak )
+{
+Text()->InsertL( start, lineBreak );
+SetCursorVisible( EFalse );
+HandleTextChangedL();
+SetCursorPosL( CursorPos() + 1, EFalse );
+SetCursorVisible( ETrue );
+textChanged = ETrue;
+}
+if ( textChanged )
+{
+RecalculateEntryPositions();
+}
+CleanupStack::PopAndDestroy( text );
+}
+}
+// ---------------------------------------------------------------------------
+// Prepares for text entry to given cursor position making sure that the
+// new text will not be entered on same row with existing
+// ---------------------------------------------------------------------------
+//
+void CNcsAifEditor::PrepareForTextInputL( TUint aPosition )
+{
+FUNC_LOG;
+// Get the non-entry text and whitespace at given position.
+TCursorSelection textSelection = NonEntryTextAndSpaceAtPos( aPosition );
+const TInt start = textSelection.LowerPos();
+const TInt end = textSelection.HigherPos();
+const TInt length = end - start;
+const TChar lineBreak = TChar( CEditableText::ELineBreak );
+if ( start > 0 && ( !length || aPosition == start ) )
+{
+Text()->InsertL( start, lineBreak );
+HandleTextChangedL();
+SetCursorPosL( start + 1, EFalse );
+}
+}
+// ---------------------------------------------------------------------------
 // Handles navigation event.
 // ---------------------------------------------------------------------------
 //
 void CNcsAifEditor::HandleNavigationEventL()
 {
 FUNC_LOG;
-// Close the contact popup when cursor is moved withing the field to make it less distracting.
+// Close the contact popup when cursor is moved withing the field to make
-// It's reopened when user types something.
+// it less distracting. It's reopened when user types something.
 iAddressPopupList->ClosePopupContactListL();
 }
 // ---------------------------------------------------------------------------
 // Gets the range of non-entry text at the given position.
 // ---------------------------------------------------------------------------
 //
 TCursorSelection CNcsAifEditor::NonEntryTextAtPos( TUint aPosition ) const
+{
+FUNC_LOG;
+// Get the range of non-entry text and whitespace at given position.
+TCursorSelection text = NonEntryTextAndSpaceAtPos( aPosition );
+// Get the selected text to remove whitespace
+const TInt length = text.Length();
+HBufC* selectedText = NULL;
+TRAPD( err, selectedText = HBufC::NewL( length ) );
+if( err == KErrNone )
+{
+TPtr ptr = selectedText->Des();
+Text()->Extract( ptr, text.LowerPos(), length );
+// trim from end
+TInt index( length - 1 );
+while( index >= 0 && IsWhitespace( ptr[index--] ) )
+{
+text.iCursorPos--;
+}
+// trim from begin
+index = 0;
+while( index < length && IsWhitespace( ptr[index++] ) )
+{
+text.iAnchorPos++;
+}
+delete selectedText;
+selectedText = NULL;
+}
+return text;
+}
+// ---------------------------------------------------------------------------
+// Gets non-entry text including surrounding whitespace at given position.
+// ---------------------------------------------------------------------------
+//
+TCursorSelection CNcsAifEditor::NonEntryTextAndSpaceAtPos(
+TUint aPosition ) const
 {
 FUNC_LOG;
 TCursorSelection text( TextLength(), 0 );
 for ( TInt ii = iArray.Count() - 1; ii >= 0; --ii )
 {
 text.iAnchorPos = iArray[ii]->HigherPos();
 break;
 }
 }
-// get the selected text to remove whitespace
-TInt length( text.Length() );
-HBufC* selectedText = NULL;
-TRAPD( err, selectedText = HBufC::NewL( length ) );
-if( err == KErrNone )
-	{
-		TPtr ptr = selectedText->Des();
-		Text()->Extract( ptr, text.LowerPos(), length );
-		// trim from end
-		TInt index( length - 1 );
-		while( index >= 0 && IsWhitespace( ptr[index--] ) )
-			{
-			text.iCursorPos--;
-			}
-		// trim from begin
-		index = 0;
-		while( index < length && IsWhitespace( ptr[index++] ) )
-			{
-			text.iAnchorPos++;
-			}
-		delete selectedText;
-		selectedText = NULL;
-	}
 return text;
 }
 // ---------------------------------------------------------------------------
 // Gets the range of text immediatelly before given position that does not
 return ( aCharacter == KCharAddressDelimeterSemiColon ||
 aCharacter == KCharAddressDelimeterComma || aCharacter == KCharSpace );
 }
 // ---------------------------------------------------------------------------
+// Checks whether given character is considered as line delimiter.
+// ---------------------------------------------------------------------------
+//
+//
+TBool CNcsAifEditor::IsDelimiter( TChar aCharacter ) const
+{
+FUNC_LOG;
+return ( aCharacter == TChar( CEditableText::ELineBreak) ||
+aCharacter == TChar( CEditableText::EParagraphDelimiter) );
+}
+// ---------------------------------------------------------------------------
 // Checks whether given character is considered as whitespace.
 // ---------------------------------------------------------------------------
 //
 TBool CNcsAifEditor::IsWhitespace( TChar aCharacter ) const
 {
 FUNC_LOG;
 return ( aCharacter == KCharSpace ||
-		 aCharacter == TChar(CEditableText::ELineBreak) ||
+aCharacter == TChar(CEditableText::ELineBreak) ||
-		 aCharacter == TChar(CEditableText::EParagraphDelimiter) );
+aCharacter == TChar(CEditableText::EParagraphDelimiter) );
 }
 // ---------------------------------------------------------------------------
 // Checks whether given event is considered as navigation event.
 // ---------------------------------------------------------------------------
 TInt cursorPos = CursorPos();
 TPoint touchPoint( aPointerEvent.iPosition );
 //adjust touch point to mach editor coordinates
 touchPoint.iX -= Position().iX;
-TInt pointerLineNbr = textLayout->GetLineNumber( textLayout->XyPosToDocPosL( touchPoint ));
+TInt pointerLineNbr = textLayout->GetLineNumber(
+textLayout->XyPosToDocPosL( touchPoint ) );
 TInt cursorLineNbr = textLayout->GetLineNumber( cursorPos );
 if ( pointerLineNbr != cursorLineNbr )
 {
 CompleteEntryL();
 // We're moving to a new line.
-CNcsAifEntry* entry = NULL;
+CNcsAifEntry* entry = GetEntryAt( CursorPos() );
-entry = GetEntryAt( CursorPos() );
 if ( entry )
 {
 SetSelectionL( entry->iCursorPos, entry->iAnchorPos );
 }
 }
 }
 CEikEdwin::HandlePointerEventL( aPointerEvent );
+// Do not allow to insert cursor into the middle of some entry
+CNcsAifEntry* entry = GetEntryAt( CursorPos() );
+if ( entry )
+{
+SetSelectionL( entry->iCursorPos, entry->iAnchorPos );
+}
 }
 // -----------------------------------------------------------------------------
 // CNcsAifEditor::CompleteEntryL()
-// Adds semicolol to the of the entry
+// Adds semicolon to the end of the entry.
 // -----------------------------------------------------------------------------
 //
 void CNcsAifEditor::CompleteEntryL()
 {
 // make sure there is really some text inputted
-TInt cursorPos( CursorPos() );
+const TInt cursorPos = CursorPos();
 TCursorSelection selection = NonEntryTextAtPos( cursorPos );
+const TInt length =  selection.Length();
-TInt length( selection.Length() );
+if ( length > 0 && selection.LowerPos() >= 0 )
-HBufC* text = HBufC::NewLC( length );
+{
-TPtr ptr = text->Des();
+HBufC* text = HBufC::NewLC( length );
+TPtr ptr = text->Des();
-if( selection.LowerPos() >= 0 )
-{
 Text()->Extract( ptr, selection.LowerPos(), length );
 ptr.Trim();
 // complete the entry
-if( ptr.Length() > 0 )
+if ( ptr.Length() > 0 )
 {
 Text()->InsertL( selection.HigherPos(), KCharAddressDelimeterSemiColon );
 HandleTextChangedL();
-HandleTextUpdateL( TCursorSelection(selection.LowerPos(), selection.HigherPos() + 1) );
+HandleTextUpdateL( TCursorSelection( selection.LowerPos(),
-}
+selection.HigherPos() + 1 ) );
 }
 CleanupStack::PopAndDestroy( text );
 }
+}
 // End of File

branch	RCL_3
changeset 73	c8382f7b54ef
parent 64	3533d4323edc
child 80	726fba06891a