FCL/sf/mw/classicui: comparison commonuis/CommonUi/src/FindItemDialog.cpp

equal deleted inserted replaced

-:fcdfafb36fe7
+:aecbbf00d063
 #include <akncontext.h> // for AknContextPane
 #include <bautils.h> // BaflUtils
 #include <eikbtgpc.h> // for ButtonGroupContainer
 #include <uikon.hrh> // for EKeyOk
-#include <favouriteslimits.h> // KFavouritesMaxUrl
-#include <favouritesitem.h> // for CBookmarkItem
-#include <favouritesdb.h>
 #include <apgcli.h> // RApaLsSession for WMLBrowser launch
 #ifndef RD_VIRTUAL_PHONEBOOK
 #include <CPbkContactEngine.h> // Phonebook Engine
 #include <RPbkViewResourceFile.h> // Phonebook view dll resource loader
 #else // RD_VIRTUAL_PHONEBOOK
 #include <AiwServiceHandler.h> // CAiwServiceHandler
 #include <AiwContactAssignDataTypes.h> // AiwContactAssign
 #endif // !RD_VIRTUAL_PHONEBOOK
-#include <sendui.h> // for CSendAppUi
-#include <CMessageData.h> // for CMessageData
-#include <SendUiConsts.h> // Mtm uids
 #include <commonphoneparser.h> // Phonenumber parser
 #include <baclipb.h> // For CClipboard
-#include <schemehandler.h> // For CSchemeHandler
 #include <aknnotewrappers.h>
 #include <finditemui.rsg>
 #include <txtfrmat.h>  // for TCharFormat
 #include <aknnavilabel.h> // for changing the lable of navipane
 #include <AknTasHook.h> // for testability hooks
-#include <touchfeedback.h>
 _LIT( KResFileName, "z:\\resource\\finditemui.rsc" );
 // Panic
 _LIT( KFindItemPanic, "FindItemDialog" );
 // Space for WML Browser's parameter
 // phonebook to know it can exit
 return ETrue;
 }
 NONSHARABLE_CLASS(CItemFinderExtension) : public CBase
-{
+	{
 public:
-~CItemFinderExtension();
+	~CItemFinderExtension();
-static CItemFinderExtension* NewL();
+	static CItemFinderExtension* NewL();
-//new function
+	//new function
 public:
-PBAiwNotify* CallBack();
+	PBAiwNotify* CallBack();
 private:
-CItemFinderExtension();
+	CItemFinderExtension();
-void ConstructL();
+	void ConstructL();
 public:
-PBAiwNotify iCallBack;
+	PBAiwNotify iCallBack;
-};
+	};
 CItemFinderExtension::~CItemFinderExtension()
-{
+	{
-}
+	}
 CItemFinderExtension* CItemFinderExtension::NewL()
-{
+	{
-CItemFinderExtension* self = new ( ELeave )CItemFinderExtension;
+	CItemFinderExtension* self = new ( ELeave )CItemFinderExtension;
-CleanupStack::PushL(self);
+	CleanupStack::PushL(self);
-self->ConstructL();
+	self->ConstructL();
-CleanupStack::Pop();
+	CleanupStack::Pop();
-return self;
+	return self;
-}
+	}
 PBAiwNotify* CItemFinderExtension::CallBack()
-{
+	{
-return &iCallBack;
+	return &iCallBack;
-}
+	}
 CItemFinderExtension::CItemFinderExtension()
-{
+	{
-}
+	}
 void CItemFinderExtension::ConstructL()
-{
+	{
-}
+	}
 // ================= MEMBER FUNCTIONS =======================
 }
 delete iNaviDecorator;
 delete iSBFrame;
 delete iItemArrayForScrollBar;
-delete iSendUi;
 #ifndef RD_VIRTUAL_PHONEBOOK
 delete iPbkDataSave;
 delete iPbkEngine;
 iPbkResourceFile.Close();
 #endif //RD_VIRTUAL_PHONEBOOK
 delete iIdle;
 delete iServiceHandler;
 delete iFindItemVoIPExtension;
-delete iSchemeHandler;
 delete iBgContext;
 delete iTitleText;
 FeatureManager::FeatureSupported( KFeatureIdEmailUi );
 iFindItemVoIPExtension = CFindItemVoIPExtension::NewL();
 iExtension = CItemFinderExtension::NewL();
-iFeedback = MTouchFeedback::Instance();
+}
-}
-// -----------------------------------------------------------------------------
-// CFindItemDialog::HandlePointerEventL
-// -----------------------------------------------------------------------------
-//
-void CFindItemDialog::HandlePointerEventL( const TPointerEvent& aPointerEvent )
-{
-if ( !iSingleClick )
-{
-if ( aPointerEvent.iType == TPointerEvent::EButton1Down )
-{
-this->PointerEvent( NULL, aPointerEvent );
-}
-}
-else
-{
-DoHandlePointerEventL( aPointerEvent );
-}
-}
-// -----------------------------------------------------------------------------
-// CFindItemDialog::DoHandlePointerEventL
-// -----------------------------------------------------------------------------
-//
-void CFindItemDialog::DoHandlePointerEventL ( const TPointerEvent& aPointerEvent )
-{
-if ( aPointerEvent.iType == TPointerEvent::EButton1Up ||
-aPointerEvent.iType == TPointerEvent::EButton1Down )
-{
-TPoint tapPoint( aPointerEvent.iPosition - iTappingOffset );
-TInt pos = 0;
-TInt len = iEdwin->TextLayout()->PosRangeInBand( pos );
-CFindItemEngine::SFoundItem item;
-TRect rect;
-TInt i = 0;
-while ( i < iController->ItemCount() ) // Check visible rects
-{
-if ( !iController->Item( i, item ) ) // Get item.
-{
-break; // Error: invalid item.
-}
-TInt end = item.iStartPos + item.iLength - 1;
-if ( end < pos )
-{
-i++;
-continue; // item not visible.
-}
-TInt start = item.iStartPos;
-if ( start >= ( pos + len ) )
-{
-break; // item not visible.
-}
-TInt lastLine = iEdwin->TextLayout()->GetLineNumber( end );
-TInt nextLine = 0;
-TInt lastPos = start;
-do // Check all rects of one item.
-{
-TInt error = KErrNone;
-TRAP( error, rect =
-iEdwin->TextLayout()->GetLineRectL( start, end ) );
-if ( error == KErrNone )
-{
-if ( rect.Contains( tapPoint ) ) // Item rect tapped.
-{
-if ( aPointerEvent.iType == TPointerEvent::EButton1Down )
-{
-TRAP( error, iController->TappedItemL( i ) );
-// Change selection
-if ( error != KErrNone )
-{
-return; // Error: no selection made.
-}
-if ( iFeedback )
-{
-iFeedback->InstantFeedback( ETouchFeedbackBasicButton );
-}
-iLastTappedItem = TPoint ( item.iStartPos, item.iLength
-+ item.iStartPos );
-return; // Hit, no further handling.
-}
-else if ( aPointerEvent.iType == TPointerEvent::EButton1Up )
-{
-if ( iLastTappedItem == TPoint ( item.iStartPos,
-item.iLength + item.iStartPos ) )
-{
-iIsSensitiveMenu = ETrue;
-iMenuBar->SetMenuType( CEikMenuBar::EMenuContext );
-TRAP_IGNORE( CAknDialog::DisplayMenuL() );
-}
-return; // Hit, no further handling.
-}
-}
-}
-else
-{
-return; // Error: no rect.
-}
-TPoint midPoint( rect.iBr.iX,
-( rect.iBr.iY + rect.iTl.iY ) / 2 );
-TRAP( error, lastPos =
-iEdwin->TextLayout()->XyPosToDocPosL( midPoint ) );
-if ( error != KErrNone )
-{
-return; // Error: no last pos.
-}
-start = lastPos + 1;
-nextLine = iEdwin->TextLayout()->GetLineNumber( lastPos );
-} while ( nextLine != lastLine );
-i++;
-}
-}
-return;   // No hit, no further handling.
-}
 // -----------------------------------------------------------------------------
 // CFindItemDialog::DoCopyToClipboardL
 //  Copies the selected item to EPOC clipboard
 // -----------------------------------------------------------------------------
 //  Sends message (SMS, MMS or E-mail) to selected item
 // -----------------------------------------------------------------------------
 //
 void CFindItemDialog::SendMessageL( const TUid aMtmUid )
 {
-__ASSERT_DEBUG( iEdwin->SelectionLength() > 0, Panic( ENoItemSelected ) );
-if ( !iSendUi )
-{
-return;
-}
-// Hide options menu if showing
-if ( CAknDialog::MenuShowing() )
-{
-CAknDialog::HideMenu();
-}
-TCursorSelection selection = iEdwin->Selection();
-HBufC* number = HBufC::NewLC( selection.Length() );
-TPtr numberPtr = number->Des();
-numberPtr.Append(
-iPlainText.Mid(
-selection.LowerPos(), selection.Length() ) );
-if ( iSearchCase & CFindItemEngine::EFindItemSearchPhoneNumberBin )
-{
-CommonPhoneParser::ParsePhoneNumber(
-numberPtr, CommonPhoneParser::EPlainPhoneNumber );
-AknTextUtils::ConvertDigitsTo( numberPtr, EDigitTypeWestern );
-}
-CMessageData* messageData = CMessageData::NewL();
-CleanupStack::PushL( messageData );
-messageData->AppendToAddressL( *number );
-iSendUi->CreateAndSendMessageL( aMtmUid, messageData );
-CleanupStack::PopAndDestroy(2); // messageData, number
 }
 // -----------------------------------------------------------------------------
 // CFindItemDialog::LaunchGenericUriL
 //  Handles URIs launching. If parent application is Browser,
 CleanupStack::PopAndDestroy(); // itemtext
 return ETrue;
 }
 // If current app is other than Browser, use schemehandler for launching
 // file
-else
-{
-if ( iSchemeHandler )
-{
-delete iSchemeHandler;
-iSchemeHandler = 0;
-}
-iSchemeHandler = CSchemeHandler::NewL( itemtextPtr );
-if ( itemtext->FindF( KRtspUrlAddress ) != KErrNotFound )
-{
-iSchemeHandler->HandleUrlEmbeddedL();
-}
-else
-{
-iSchemeHandler->HandleUrlStandaloneL();
-}
-}
 CleanupStack::PopAndDestroy(); // itemtext
 return EFalse;
 }
 HBufC *parameters = HBufC::NewLC( paramLength );
 TPtr paramPtr = parameters->Des();
 paramPtr.Copy( KWmlBrowserParameter );
 paramPtr.Append( KSpace );
-paramPtr.Append(
+paramPtr.Append( aItemtextPtr.Mid( 0, aItemtextPtr.Length() ) );
-aItemtextPtr.Mid(
-0, Min( aItemtextPtr.Length(), KFavouritesMaxUrl ) ) );
 TApaTaskList taskList( iEikonEnv->WsSession() );
 TApaTask task = taskList.FindApp( KWapUid );
 if ( task.Exists() )
 {
 //
 void CFindItemDialog::AddToBookmarkL()
 {
 __ASSERT_DEBUG( iEdwin->SelectionLength() > 0, Panic( ENoItemSelected ) );
-// Create an item and fill with meaningful data.
-CFavouritesItem* item = CFavouritesItem::NewLC();
-item->SetParentFolder( KFavouritesRootUid );
-item->SetType( CFavouritesItem::EItem );
 // Read default name from resources
 HBufC* defaultName =
 iEikonEnv->AllocReadResourceLC( R_FINDITEM_DEFAULT_BOOKMARK_NAME );
 TBuf<KMaxBookmarkNameLength> retName;
 CAknTextQueryDialog* dlg = CAknTextQueryDialog::NewL( retName );
 dlg->SetMaxLength( KMaxBookmarkNameLength );
 if ( !dlg->ExecuteLD( R_FINDITEM_BOOKMARK_QUERY_DIALOG ) )
 {
 // User press cancel - do not add bookmark
-CleanupStack::PopAndDestroy( ); // item
 return;
 }
-item->SetNameL( retName );
 TCursorSelection selection = iEdwin->Selection();
-item->SetUrlL( iPlainText.Mid( selection.LowerPos(), selection.Length() ) );
-RFavouritesSession sess;
-RFavouritesDb db;
-User::LeaveIfError( sess.Connect() );
-CleanupClosePushL<RFavouritesSession>( sess );
-User::LeaveIfError( db.Open( sess, KBrowserBookmarks ) );
-CleanupClosePushL<RFavouritesDb>( db );
-// Add item.
-db.Add( *item, ETrue );
-// Close the database.
-db.Close();
 HBufC* msgBuffer =
 iCoeEnv->AllocReadResourceLC( R_FINDITEM_BOOKMARK_SAVED );
 CAknConfirmationNote* note = new (ELeave)CAknConfirmationNote( ETrue );
 note->ExecuteLD( *msgBuffer );
-CleanupStack::PopAndDestroy( 4 );   // magBuffer, db, sess, item
+CleanupStack::PopAndDestroy();   // magBuffer
 }
 // -----------------------------------------------------------------------------
-// CFindItemDialog::EnableSingleClick
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CFindItemDialog::EnableSingleClick ( TBool aEnable )
-{
-iSingleClick = aEnable;
-}
 // CFindItemDialog::ProcessCommandL
 //  Prosesses menu commands
 // -----------------------------------------------------------------------------
 //
 EXPORT_C void CFindItemDialog::ProcessCommandL( TInt aCommandId )
 contextPane->SetPictureToDefaultL();
 break;
 }
 // Phone number cmds
 case EFindItemCmdCall:
-{
+{ // bit awkward but correct functionality provided.
-if ( !iHideCallSubMenu )
+TKeyEvent keyEvent;
-{ // bit awkward but correct functionality provided.
+keyEvent.iCode = EKeyPhoneSend;
-TKeyEvent keyEvent;
+OfferKeyEventL( keyEvent, EEventKey );
-keyEvent.iCode = EKeyPhoneSend;
-OfferKeyEventL( keyEvent, EEventKey );
-}
-else
-{
-if ( !iDialData )
-{
-break;
-}
-FormatDialDataL( aCommandId );
-CAiwGenericParamList& paramList =
-iServiceHandler->InParamListL();
-if ( iFindItemVoIPExtension->VoIPProfilesExistL() &&
-( iSearchCase ==
-CFindItemEngine::EFindItemSearchMailAddressBin ||
-iSearchCase == KSearchTelInternetNumber ) )
-{
-//voip
-iDialData->SetCallType( CAiwDialData::EAIWVoiP );
-}
-iDialData->FillInParamListL( paramList );
-iServiceHandler->ExecuteServiceCmdL(
-KAiwCmdCall,
-paramList,
-iServiceHandler->OutParamListL(),
-0, // No options used.
-NULL ); // Dial results are not wanted.
-}
 break;
 }
 // fix for FAMZ-7JVQ4Y
 case EFindItemSubMenuSend:
 {
-CFindItemEngine::SFoundItem item;
-TBool founditem = iController->Item( item );
-TSendingCapabilities sendingCapabilities;
-sendingCapabilities.iFlags = TSendingCapabilities::ESupportsEditor;
-CArrayFixFlat<TUid>* mtmFilter = new(ELeave) CArrayFixFlat<TUid>( 1 );
-CleanupStack::PushL(mtmFilter);
-mtmFilter->AppendL(KSenduiMtmPostcardUid);// hide postcard
-// Hide MMs
-#ifndef RD_UNIFIED_EDITOR
-if( !iMMSFeatureSupported )
-{
-mtmFilter->AppendL(KSenduiMtmMmsUid);
-}
-#endif
-// Hide Sms
-if ( iSearchCase == CFindItemEngine::EFindItemSearchMailAddressBin ||
-( iFindItemVoIPExtension->IsVoIPSupported() &&
-founditem && item.iItemType == CFindItemEngine::EFindItemSearchMailAddressBin &&
-iSearchCase == KSearchTelInternetNumber ) )
-{
-#ifndef RD_UNIFIED_EDITOR
-if ( !iEmailOverSmsFeatureSupported )
-{
-mtmFilter->AppendL(KSenduiMtmSmsUid);
-}
-#endif
-}
-// Hide Mail
-else if ( !iEmailUiFeatureSupported ||
-( iSearchCase == CFindItemEngine::EFindItemSearchPhoneNumberBin ||
-( iFindItemVoIPExtension->IsVoIPSupported() && founditem &&
-item.iItemType == CFindItemEngine::EFindItemSearchPhoneNumberBin &&
-iSearchCase == KSearchTelInternetNumber ) ) )
-{
-mtmFilter->AppendL(KSenduiMtmSmtpUid);
-mtmFilter->AppendL(KSenduiMtmImap4Uid);
-mtmFilter->AppendL(KSenduiMtmPop3Uid);
-mtmFilter->AppendL(KSenduiMtmSyncMLEmailUid);
-}
-// Hide Audio
-if ( iSearchCase != CFindItemEngine::EFindItemSearchPhoneNumberBin ||
-!iAudioMessagingFeatureSupported )
-{
-mtmFilter->AppendL(KSenduiMtmAudioMessageUid);
-}
-TUid uid = iSendUi->ShowTypedQueryL( CSendUi::EWriteMenu, NULL, sendingCapabilities, mtmFilter );
-CleanupStack::PopAndDestroy();
-if ( uid == KNullUid )
-{
-break;
-}
-SendMessageL(uid);
 break;
 }
 case EFindItemCmdGoToUrl:
 {
 if ( LaunchGenericUriL() )
 {
 return;
 }
 CFindItemEngine::SFoundItem item;
-TBool foundItem = iController->Item( item );
+TBool founditem = iController->Item( item );
-if ( iSingleClick )
-{
-// foundItem remains as ETrue, if item found by controller is exactly
-// same as highlighted selection
-foundItem = foundItem && ( item.iLength == iEdwin->SelectionLength()
-&& item.iStartPos == Min( iEdwin->Selection().iCursorPos,
-iEdwin->Selection().iAnchorPos ) );
-}
 if ( aMenuId == R_FINDITEM_CALLUI_AIW_SUBMENU )
 {
 if ( iFindItemVoIPExtension->IsVoIPSupported() &&
 ( iSearchCase ==
 CFindItemEngine::EFindItemSearchMailAddressBin ||
 ( iSearchCase == KSearchTelInternetNumber &&
-foundItem && item.iItemType ==
+founditem && item.iItemType ==
 CFindItemEngine::EFindItemSearchMailAddressBin ) ) )
 {
 CAiwGenericParamList* inList = CAiwGenericParamList::NewLC();
 // SIP Address
 ;
 }
 aMenuPane->AddMenuItemsL( resource, EAknFormMaxDefault - 1, ETrue );
 if ( iSearchCase == KSearchTelInternetNumber &&
 iFindItemVoIPExtension->VoIPProfilesExistL() ||
 iSearchCase == KSearchTelInternetNumber &&
 !iFindItemVoIPExtension->VoIPProfilesExistL() &&
-foundItem &&
+founditem &&
 item.iItemType ==
 CFindItemEngine::EFindItemSearchPhoneNumberBin ||
 iSearchCase & CFindItemEngine::EFindItemSearchMailAddressBin &&
 iFindItemVoIPExtension->VoIPProfilesExistL() )
 {
 {
 aMenuPane->DeleteMenuItem(EFindItemCmdCall);
 }
 else if (
 iSearchCase & CFindItemEngine::EFindItemSearchPhoneNumberBin &&
-!iHideCallMenu && !iHideCallSubMenu )
+!iHideCallMenu )
 {
 aMenuPane->SetItemDimmed( EFindItemCmdCall, ETrue );
 aMenuPane->AddMenuItemsL(
 R_FINDITEM_CALLUI_AIW_ITEM,
 EFindItemCmdCall );
 iPbkDataSave->DynInitMenuPaneL( aMenuId, aMenuPane );
 #endif // !RD_VIRTUAL_PHONEBOOK
 }
 }
-// -----------------------------------------------------------------------------
-// CFindItemDialog::SetCallSubMenuVisibility
-// Sets AIW submenu visibility
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CFindItemDialog::SetCallSubMenuVisibility( TBool aVisible )
-{
-iHideCallSubMenu = !aVisible;
-}
 // -----------------------------------------------------------------------------
 // CFindItemDialog::OfferKeyEventL
 //  Handles key events
 // -----------------------------------------------------------------------------
 //
 {
 case EKeyRightArrow:
 iController->NextItemL();
 break;
 case EKeyDownArrow:
 iController->MoveDownL();
 break;
 case EKeyLeftArrow:
 iController->PrevItemL();
 break;
 case EKeyUpArrow:
 iController->MoveUpL();
 break;
 case EKeyOK:
 iIsSensitiveMenu = ETrue;
 iMenuBar->SetMenuType(CEikMenuBar::EMenuContext);
 CAknDialog::DisplayMenuL();
 break;
 case EKeyPhoneSend:
 if ( !iDialData )
 {
 break;
 }
 CFindItemEngine::SFoundItem item;
 founditem = iController->Item( item );
 if ( iSearchCase ==
 CFindItemEngine::EFindItemSearchPhoneNumberBin ||
 // change the color of the text according to the skin color
 TRgb color;
 MAknsSkinInstance* skin = AknsUtils::SkinInstance();
 TInt error = AknsUtils::GetCachedColor(skin, color, KAknsIIDQsnTextColors,
-EAknsCIQsnTextColorsCG6 );
+												EAknsCIQsnTextColorsCG6 );
 if(error==KErrNone)
-{
+	{
-TCharFormat charFormat;
+	TCharFormat charFormat;
-TCharFormatMask charFormatMask;
+	TCharFormatMask charFormatMask;
-charFormatMask.SetAttrib(EAttColor);
+	charFormatMask.SetAttrib(EAttColor);
-charFormat.iFontPresentation.iTextColor = color;
+	charFormat.iFontPresentation.iTextColor = color;
-CRichText * richText = NULL;
+	CRichText * richText = NULL;
-richText = iEdwin->RichText();
+	richText = iEdwin->RichText();
-if( NULL!=richText )
+	if( NULL!=richText )
-{
+		{
-TInt length = richText->DocumentLength();
+		TInt length = richText->DocumentLength();
-length++;
+		length++;
-// apply the color to text
+		// apply the color to text
-TRAP_IGNORE(richText->ApplyCharFormatL( charFormat,
+		TRAP_IGNORE(richText->ApplyCharFormatL( charFormat, charFormatMask, 0, length ));
-charFormatMask, 0, length ));
+		}
-}
 	}
 if ( anyFound )
 {
 // Insert paragraphs inside the text if needed, i.e. if text is
 // bandformatted and there's not enough paragraphs already. The
 aItem1, point1, CLayoutData::EFWholeTBoxesOnly ) );
 if ( error != KErrNone )
 {
 return EFalse;
 }
 TBool pos2 = EFalse;
 TPoint point2;
 TRAP( error, pos2 = iEdwin->TextLayout()->DocPosToXyPosL(
 aItem2, point2, CLayoutData::EFWholeTBoxesOnly ) );
 if ( error != KErrNone )
 {
 TInt resource = 0;
 if ( iSearchCase == KSearchTelInternetNumber )
 {
 resource = R_FINDITEM_TITLE_TELINTERNET;
-iSendUi = CSendUi::NewL();
 }
 else if ( iSearchCase & CFindItemEngine::EFindItemSearchURLBin )
 {
 resource = R_FINDITEM_TITLE_URL;
 }
 else if ( iSearchCase & CFindItemEngine::EFindItemSearchMailAddressBin )
 {
 resource = R_FINDITEM_TITLE_MAIL;
-iSendUi = CSendUi::NewL();
 }
 else if ( iSearchCase & CFindItemEngine::EFindItemSearchPhoneNumberBin )
 {
 resource = R_FINDITEM_TITLE_PHONE;
-iSendUi = CSendUi::NewL();
 }
 else
 {
 __ASSERT_ALWAYS( 0, Panic( ENoSearchCase ) );
 return;
 TBuf<16> naviText;
 naviText.Format(
 KPosIndicator, iController->Position() + 1, iController->ItemCount() );
 if(NULL == iNaviDecorator)
-{
+	{
-iNaviDecorator = iNaviPane->CreateNavigationLabelL( naviText );
+	iNaviDecorator = iNaviPane->CreateNavigationLabelL( naviText );
-iNaviDecorator->SetNaviDecoratorObserver( this );
+	iNaviDecorator->SetNaviDecoratorObserver( this );
-iNaviDecorator->MakeScrollButtonVisible( ETrue );
+	iNaviDecorator->MakeScrollButtonVisible( ETrue );
-}
+	}
 else
-{
+	{
-// Change the label on Nave pane control...
+	// Change the label on Nave pane control...
-CAknNaviLabel * label =( CAknNaviLabel* )iNaviDecorator->DecoratedControl();
+	CAknNaviLabel * label =( CAknNaviLabel* )iNaviDecorator->DecoratedControl();
-label->SetTextL(naviText);
+	label->SetTextL(naviText);
-}
+	}
 // Dimm arrows if needed
 if ( iController->LastItem() )
 {
 iNaviDecorator->SetScrollButtonDimmed(
 // -----------------------------------------------------------------------------
 void CFindItemDialog::HandleResourceChange( TInt aType )
 {
 	//Update Horizantal Scroll bar color if skin changes
 if( aType == KAknsMessageSkinChange)
-{
+	{
-CAknScrollBar *scrollBar = iSBFrame->VerticalScrollBar();
+	CAknScrollBar *scrollBar = iSBFrame->VerticalScrollBar();
-scrollBar->HandleResourceChange(aType);
+	scrollBar->HandleResourceChange(aType);
-}
+	}
 CAknDialog::HandleResourceChange( aType );
 }
 // -----------------------------------------------------------------------------
 // CFindItemDialog::SizeChanged
 {
 iBgContext->SetRect( Rect() );
 }
 iTappingOffset = iEdwin->Rect().iTl - Rect().iTl;
-CFindItemEngine::SFoundItem item;
-TBool anyFound = iController->Item( item );
-if( anyFound )
-	{
-TInt pos = 0;
-TInt length = iEdwin->TextLayout()->PosRangeInBand( pos );
-if( item.iStartPos >= pos + length )
-{
-TRAP_IGNORE( iEdwin->MoveDisplayL( TCursorPosition::EFPageDown ) );
-}
-}
 TRAP_IGNORE( UpdateScrollIndicatorL() );
 }
 // ----------------------------------------------------------------------------
 const TPointerEvent& aPointerEvent )
 {
 if ( AknLayoutUtils::PenEnabled() &&
 aPointerEvent.iType == TPointerEvent::EButton1Down )
 {
 TPoint tapPoint( aPointerEvent.iPosition - iTappingOffset );
 TInt pos = 0;
 TInt len = iEdwin->TextLayout()->PosRangeInBand( pos );
 CFindItemEngine::SFoundItem item;
 TRect rect;
 TInt i = 0;
 {
 if ( !iController->Item( i, item ) ) // Get item.
 {
 break; // Error: invalid item.
 };
 TInt end = item.iStartPos + item.iLength - 1;
 if ( end < pos )
 {
 i++;
 continue; // item not visible.
 };
 TInt start = item.iStartPos;
 if ( start >= ( pos + len ) )
 {
 break; // item not visible.
 }
 TInt lastLine = iEdwin->TextLayout()->GetLineNumber( end );
 TInt nextLine = 0;
 TInt lastPos = start;
 do // Check all rects of one item.
 {
 TInt error = KErrNone;
 TRAP( error, rect = iEdwin->TextLayout()->GetLineRectL( start, end ) );
 if ( error == KErrNone )
 {
 if ( rect.Contains( tapPoint ) ) // Item rect tapped.
 {
 TRAP( error, iController->TappedItemL( i ) ); // Change selection
 if ( error != KErrNone )
 {
 return false; // Error: no selection made.
 }
 }
 }
 else
 {
 return false; // Error: no rect.
 }
 TPoint midPoint( rect.iBr.iX, ( rect.iBr.iY + rect.iTl.iY) / 2 );
 TRAP( error, lastPos = iEdwin->TextLayout()->XyPosToDocPosL( midPoint ) );
 if ( error != KErrNone )
 {
 return false; // Error: no last pos.
 }
 start = lastPos + 1;
 nextLine = iEdwin->TextLayout()->GetLineNumber( lastPos );
 } while ( nextLine != lastLine );
 i++;
 }
 }
 return false;   // No hit, no further handling.
 iController->NextItemL();
 break;
 default:
 break;
 }
 }
 //
 // CONTAINER CLASS
 //
 // change the color of the text according to the skin color
 // this is needed if finditemdialog is active and theme is changed.
 TRgb color;
 MAknsSkinInstance* skin = AknsUtils::SkinInstance();
 TInt error = AknsUtils::GetCachedColor(skin, color, KAknsIIDQsnTextColors,
-EAknsCIQsnTextColorsCG6 );
+												EAknsCIQsnTextColorsCG6 );
 if(error==KErrNone)
-{
+	{
-TCharFormat charFormat;
+	TCharFormat charFormat;
-TCharFormatMask charFormatMask;
+	TCharFormatMask charFormatMask;
-charFormatMask.SetAttrib(EAttColor);
+	charFormatMask.SetAttrib(EAttColor);
-charFormat.iFontPresentation.iTextColor = color;
+	charFormat.iFontPresentation.iTextColor = color;
-CRichText * richText = NULL;
+	CRichText * richText = NULL;
-richText = iEditor->RichText();
+	richText = iEditor->RichText();
-if( NULL!=richText )
+	if( NULL!=richText )
-{
+		{
-TInt length = richText->DocumentLength();
+		TInt length = richText->DocumentLength();
-length++;
+		length++;
-// apply the color to the text
+		// apply the color to the text
-TRAP_IGNORE(richText->ApplyCharFormatL( charFormat, charFormatMask, 0, length ));
+		TRAP_IGNORE(richText->ApplyCharFormatL( charFormat, charFormatMask, 0, length ));
-}
+		}
-}
+	}
 }
 }
 // -----------------------------------------------------------------------------
 // CRichTextEditorContainer::HandleResourceChange

branch	RCL_3
changeset 55	aecbbf00d063
parent 51	fcdfafb36fe7
child 56	d48ab3b357f1