FCL/sf/app/phone: comparison phoneuis/easydialing/src/easydialingplugin.cpp

equal deleted inserted replaced

-:38529f706030
+:544e34b3255a
 // MODULE DATA STRUCTURES
 // LOCAL FUNCTION PROTOTYPES
-TInt CompareTPsMatchLocation( const TPsMatchLocation& a1, const TPsMatchLocation& a2);
+TInt CompareTPsMatchLocation( const TPsMatchLocation& a1, const TPsMatchLocation& a2 );
 void AppendStringWithMatchDataL(
 TDes& aBuffer,
 const TDesC& aText,
 CPSRequestHandler* aPSHandler,
 static TBool IsItuTCharacter( TChar aChar );
 static TInt Find( const MVPbkContactLink* aLink, const RPointerArray<MVPbkContactLink>& aArray );
 template <class T>
-inline void CleanupResetAndDestroyPushL(T& aRef);
+inline void CleanupResetAndDestroyPushL( T& aRef );
 // -----------------------------------------------------------------------------
 // CEasyDialingPlugin
 // Find a handle to ca launcher extension MCCAConnectionExt.
 // Easydialing has to use the extension API, because it needs function CloseAppL
 // only found in extension.
 // MCCAConnection extension has to be obtained through MCCAParameter extension,
 // since MCCAConnection is not designed to be extensible API.
 MCCAParameter* parameter = TCCAFactory::NewParameterL();
 TAny* any = parameter->CcaParameterExtension( KMCCAConnectionExtUid );
 // Parameter can be deallocated since "any" containing pointer to contact launcher
 // is not tied to parameter in any way.
 parameter->Close();
 iResourceFileOffset = iCoeEnv->AddResourceFileL( resourceFileName );
 SetComponentsToInheritVisibility( ETrue );
 }
-// ---------------------------------------------------------
+// -----------------------------------------------------------------------------
 // ~CEasyDialingPlugin
 // The desctructor
-// ---------------------------------------------------------
+// -----------------------------------------------------------------------------
 //
 CEasyDialingPlugin::~CEasyDialingPlugin()
 {
 iObservers.Reset();
 model->SetItemTextArray( iListBoxModel );
 model->SetOwnershipType( ELbmDoesNotOwnItemArray );
 iContactListBox->MakeVisible( EFalse );
 SetFocus( EFalse );
 iContactListBox->ActivateL();
 GfxTransEffect::Register( iContactListBox,
 KGfxContactListBoxUid, EFalse );
 // Resets easydialing plugin.
 // -----------------------------------------------------------------------------
 //
 void CEasyDialingPlugin::Reset()
 {
-// PCS searches completing must be discarded, if the complete
+// PCS searches completing after the Reset() call must be discarded
-// after Reset() -call.
 iDiscardCompletingSearches = ETrue;
 iNewSearchNeeded = EFalse;
 iSearchString.Zero();
 iListBoxModel->Reset();
 // convert rect to absolute coordinates
 rect.SetRect( PositionRelativeToScreen(), rect.Size() );
 iContactListBox->SetMaxRect( rect );
 iContactListBox->SetRectToNumberOfItems( iNumberOfNames );
+TInt itemToMakeVisible = iContactListBox->CurrentItemIndex();
+if ( itemToMakeVisible == KErrNotFound && iNumberOfNames )
+{
+// if no current item is set, make sure that the list is then
+// scrolled to the bottom.
+itemToMakeVisible = iNumberOfNames - 1;
+}
+iContactListBox->ScrollToMakeItemVisible( itemToMakeVisible );
 }
 // -----------------------------------------------------------------------------
 // FocusChanged
 default:
 break;
 }
 // Reset focus unless it is flagged to be remembered.
-if ( ! iRememberFocus )
+if ( !iRememberFocus )
 {
 SetFocus( EFalse );
 DrawDeferred();
 }
 // not to the keyboard it is made with. While this is not strictly
 // identical to checking the used keyboard, this behaves identically
 // in most of the normal cases, and makes the logic simpler.
 if ( IsItuTCharacter( iSearchString[i] ) )
 {
-item->SetMode( EItut );
+item->SetMode( EPredictiveItuT );
 }
 else
 {
-item->SetMode( EQwerty );
+item->SetMode( EPredictiveDefaultKeyboard );
 }
 iPredictiveSearchQuery->AppendL(*item);
 // Previous CPsQuery::AppendL takes the ownership of item.
 LaunchSearchL();
 }
 // Give up focus, if iRememberFocus flag is not set.
-if ( ! iRememberFocus )
+if ( !iRememberFocus )
 {
 SetFocus( EFalse );
 DrawDeferred();
 }
 iRememberFocus = EFalse;
 // -----------------------------------------------------------------------------
 //
 HBufC* CEasyDialingPlugin::CreateContactStringLC( CPsClientData* aResult,
 CEasyDialingContactDataManager::TNameOrder aNameOrder )
 {
-TPtr firstName = aResult->Data( iFirstNamePCSIndex )->Des();
+TPtrC firstName = *aResult->Data( iFirstNamePCSIndex );
-TPtr lastName = aResult->Data( iLastNamePCSIndex )->Des();
+TPtrC lastName = *aResult->Data( iLastNamePCSIndex );
-TPtr companyName( NULL, 0 );
+TPtrC companyName( KNullDesC );
 if ( iCompanyNamePCSIndex != KErrNotFound )
 {
-companyName.Set( aResult->Data( iCompanyNamePCSIndex )->Des() );
+companyName.Set( *aResult->Data( iCompanyNamePCSIndex ) );
 }
 return EasyDialingUtils::CreateContactStringLC( firstName, lastName, companyName, aNameOrder );
 }
 if ( !aObserver )
 {
 return;
 }
-User::LeaveIfError( iObservers.Append( aObserver ) );
+iObservers.AppendL( aObserver );
 }
 // -----------------------------------------------------------------------------
 // RemoveObserver
 else if ( aMenuResourceId == R_EASYDIALING_OPTIONS_ON_OFF_CASCADE_MENU )
 {
 if ( IsEnabled() )
 {
 aMenuPane.SetItemButtonState( EEasyDialingOn, EEikMenuItemSymbolOn );
 }
 else
 {
 aMenuPane.SetItemButtonState( EEasyDialingOff, EEikMenuItemSymbolOn );
 }
 // Pause contact data manager when panning and flicking listbox.
 // This ensures smooth and responsive listbox touch handling.
 case EEventFlickStarted:
 case EEventPanningStarted:
+case KEasyDialingScrollingStarted:
 iContactDataManager->Pause( ETrue );
 break;
 case EEventFlickStopped:
 case EEventPanningStopped:
+case KEasyDialingScrollingStopped:
 iContactDataManager->Pause( EFalse );
+// Touching the listbox always removes the visual focus from any list item.
+// Move the focus away from the listbox after panning has ended to
+// align our internal state with the visual lack of focus.
+if ( IsFocused() )
+{
+SetFocus( EFalse );
+DrawDeferred();
+}
 break;
 // We are not interested about the other listbox events.
 default:
 break;
 if ( iSearchString.Length() > 0 )
 {
 if ( iContactLauncherActive )
 {
 // Set the flag to make a search when communication launcher exits.
 iNewSearchNeeded = ETrue;
 }
 else
 {
 // We get here if user e.g. leaves dialer open and goes to Contacts
 // application and does some editing.
 // based on their location.
 // -----------------------------------------------------------------------------
 //
 TInt CompareTPsMatchLocation( const TPsMatchLocation& a1, const TPsMatchLocation& a2)
 {
-if ( a1.index == a2.index )
+return a1.index - a2.index;
-{
-return 0;
-}
-return ( a1.index > a2.index ) ? 1 : -1;
 }
 // -----------------------------------------------------------------------------
 // AppendStringWithMatchDataL
 matchIndices.Sort( order );
 TInt numberOfIndices = matchIndices.Count();
 TInt textOffset = 0;
-for (TInt i = 0; i < numberOfIndices ; i++ )
+for ( TInt i = 0; i < numberOfIndices ; i++ )
 {
 TInt matchingPartStart = matchIndices[i].index;
 TInt matchingPartLength = matchIndices[i].length;
 // Append the non-matching part (if exists)
 // Append matching separator charactes.
 aBuffer.Append( KHighlightSeparatorChar );
 TPtrC matchingPart = aText.Mid( matchingPartStart, matchingPartLength );
 aBuffer.Append( matchingPart );
 // Append matching separator charactes.
 aBuffer.Append( KHighlightSeparatorChar );
 textOffset = matchingPartStart + matchingPartLength;
 }
 CleanupStack::PopAndDestroy( &matchIndices );
 CleanupStack::PopAndDestroy( matchingParts );

branch	RCL_3
changeset 19	544e34b3255a
parent 17	38529f706030
child 25	91c2fb4b78df