MCL/sf/app/webuis: comparison browserui/browser/FavouritesSrc/BrowserBookmarksContainer.cpp

equal deleted inserted replaced

-:e45c3f40ea5f
+:4530440261a8
 * Initial Contributors:
 * Nokia Corporation - initial contribution.
 *
 * Contributors:
 *
 * Description:
 *       Implementation of CBrowserBookmarksContainer.
 *
 *
 */
 // INCLUDE FILES
 // ---------------------------------------------------------
 //
 CBrowserBookmarksContainer* CBrowserBookmarksContainer::NewL(
 const TRect& aRect,
 CBrowserFavouritesView& aView)
-	{
+{
-	CBrowserBookmarksContainer* container =
+CBrowserBookmarksContainer* container =
 new (ELeave) CBrowserBookmarksContainer;
-	CleanupStack::PushL( container );
+CleanupStack::PushL( container );
-	container->ConstructL( aRect, aView );
+container->ConstructL( aRect, aView );
 CleanupStack::Pop();    // container
-	return container;
+return container;
-	}
+}
 // ---------------------------------------------------------
 // CBrowserBookmarksContainer::~CBrowserBookmarksContainer
 // ---------------------------------------------------------
 //
 // ---------------------------------------------------------
 // CBrowserBookmarksContainer::SetGotoActiveL
 // ---------------------------------------------------------
 //
 void CBrowserBookmarksContainer::SetGotoActiveL()
 {
 if( !iGotoPaneActive)
-	{
+{
-	iGotoPaneActive = ETrue;
+iGotoPaneActive = ETrue;
-	Listbox()->UpdateFilterL();
+Listbox()->UpdateFilterL();
-	if( iSearchPane )
+if( iSearchPane )
-	    {
+{
-	    iGotoPane->SetVKBFlag( EFalse );
+iGotoPane->SetVKBFlag( EFalse );
-	    // Check for Search Configuration Changes //
+// Check for Search Configuration Changes //
-	    if( View().ApiProvider().Preferences().GetIntValue( KBrowserSearchIconId )
+if( View().ApiProvider().Preferences().GetIntValue( KBrowserSearchIconId )
-	            != iSearchIconId )
+!= iSearchIconId )
 {
-	        ConstructSearchPaneL();
+ConstructSearchPaneL();
 }
 iSearchPane->SetFocus( EFalse );
-	// only one editor can be active at a time //
+// only one editor can be active at a time //
-	iSearchPaneActive = EFalse;
+iSearchPaneActive = EFalse;
-	// we still need to display search, when showing for first time //
+// we still need to display search, when showing for first time //
-	iSearchPane->MakeVisible(ETrue);
+iSearchPane->MakeVisible(ETrue);
 iSearchPane->CancelEditingL();
-	    }
+}
-	// redraw
+// redraw
-	SizeChanged();
+SizeChanged();
 // It is important to set the Text and Italic property after SizeChanged, because
 // iInputFrame->SetRect() event on GoTo/Search Pane calls the scalable version
 // ( AknLayoutUtils::LayoutEdwinScalable ) which overwrites all the properties for
 // Char and Para Formats.
 if( iSearchPane )
 {
 iSearchPane->SetTextModeItalicL();
 {
 iSearchPane->SetTextL( *iDefaultSearchText );
 }
 CleanupStack::PopAndDestroy( text );
 }
 iGotoPane->BeginEditingL();
-	DrawDeferred();
+DrawDeferred();
-	}
+}
 }
 // ---------------------------------------------------------
 // CBrowserBookmarksContainer::SetSearchActiveL
 // ---------------------------------------------------------
 //
 void CBrowserBookmarksContainer::SetSearchActiveL()
 {
 if( ! iSearchPaneActive )
 {
 // Check for Search Configuration Changes //
 if( View().ApiProvider().Preferences().GetIntValue( KBrowserSearchIconId )
 != iSearchIconId )
 {
 ConstructSearchPaneL();
 }
 iSearchPane->SetVKBFlag( EFalse );
 iSearchPane->SetFocus( ETrue );
 iSearchPaneActive = ETrue;
 Listbox()->UpdateFilterL();
 // only one editor can be active at a time
 iGotoPaneActive = EFalse;
 iGotoPane->MakeVisible(ETrue);
 iGotoPane->SetFocus( EFalse );
 iGotoPane->CancelEditingL();
 // redraw
 SizeChanged();
 // Not Focused, so set the current Text Mode to italics.
 iGotoPane->SetTextModeItalicL();
 // if gotopane is empty add default text
 HBufC* text = iGotoPane->GetTextL();
 CleanupStack::PushL( text );
 if ( !text->Length() )
 {
 iGotoPane->SetTextL( KWWWString );
 }
 CleanupStack::PopAndDestroy( text );
 iSearchPane->BeginEditingL();
 DrawDeferred();
 }
 }
 // ---------------------------------------------------------
 // CBrowserBookmarksContainer::SetGotoInactiveL();
 // ---------------------------------------------------------
 //
 void CBrowserBookmarksContainer::SetGotoInactiveL()
-	{
+{
-	if( iGotoPaneActive || iSearchPaneActive )
+if( iGotoPaneActive || iSearchPaneActive )
-		{
+{
-		  if( iSearchPane )
+if( iSearchPane )
 {
 /* In Search Feature we have to move between the editors preserving the
 * text added, clear the text when cancel is pressed.
 */
 iGotoPane->SetTextL( KNullDesC , ETrue );
 SetSearchInactiveL();
 }
-		// Deactivate GoTo Pane
+// Deactivate GoTo Pane
-		iGotoPaneActive = EFalse;
+iGotoPaneActive = EFalse;
-		// Deactivate GoTo Pane
+// Deactivate GoTo Pane
-	iGotoPane->MakeVisible( EFalse );
+iGotoPane->MakeVisible( EFalse );
-	iGotoPane->CancelEditingL();
+iGotoPane->CancelEditingL();
-	iGotoPane->SetFocus( EFalse );
+iGotoPane->SetFocus( EFalse );
-		// redraw
+// redraw
-		Listbox()->UpdateFilterL();
+Listbox()->UpdateFilterL();
-		SizeChanged();
+SizeChanged();
-		DrawDeferred();
+DrawDeferred();
-		}
+}
-	}
+}
 void CBrowserBookmarksContainer::SetSearchInactiveL()
 {
 iSearchPaneActive = EFalse;
 iSearchPane->SetTextL( KNullDesC , ETrue);
 iSearchPane->MakeVisible( EFalse );
 iSearchPane->CancelEditingL();
 }
 //
 void CBrowserBookmarksContainer::SizeChanged()
 {
 TRect rect = Rect();
 TInt unfilteredNumberOfItems = Listbox()->UnfilteredNumberOfItems();
 // if goto pane is active
 if( iGotoPaneActive || iSearchPaneActive )
-	{
+{
-	if( iSearchPane )
+if( iSearchPane )
-	    {
+{
-	    TAknWindowLineLayout findPane = AknLayout::find_pane();
+TAknWindowLineLayout findPane = AknLayout::find_pane();
-	    // Enable / disable line in Goto Pane (hide if listbox is empty).
+// Enable / disable line in Goto Pane (hide if listbox is empty).
-	iGotoPane->SetLineState( unfilteredNumberOfItems > 0 );
+iGotoPane->SetLineState( unfilteredNumberOfItems > 0 );
-	TAknWindowLineLayout listLayout = AknLayout::list_gen_pane( 1 );
+TAknWindowLineLayout listLayout = AknLayout::list_gen_pane( 1 );
-	TRect listBoxRect = AknLayoutUtils::RectFromCoords( rect,listLayout.il,
+TRect listBoxRect = AknLayoutUtils::RectFromCoords( rect,listLayout.il,
-	        listLayout.it, listLayout.ir, listLayout.ib, listLayout.iW, listLayout.iH);
+listLayout.it, listLayout.ir, listLayout.ib, listLayout.iW, listLayout.iH);
-	/* Now we need to make room for both Goto and Search Pane.
+/* Now we need to make room for both Goto and Search Pane.
-	 * No layout specification was suitable for this case, so
+* No layout specification was suitable for this case, so
-	 * substracting the height of pane.
+* substracting the height of pane.
-	 */
+*/
-	listBoxRect.iBr.iY -= findPane.iH;
+listBoxRect.iBr.iY -= findPane.iH;
-	// In Goto Mode, the listbox is laid out leaving space for Goto Pane.
+// In Goto Mode, the listbox is laid out leaving space for Goto Pane.
-	Listbox()->SetRect( listBoxRect );
+Listbox()->SetRect( listBoxRect );
-	// Now Lay out Search Pane as if it was the old Find Pane.
+// Now Lay out Search Pane as if it was the old Find Pane.
 AknLayoutUtils::LayoutControl( iSearchPane, rect, findPane );
-	TRect gotoRect = AknLayoutUtils::RectFromCoords( rect,findPane.il, findPane.it,
+TRect gotoRect = AknLayoutUtils::RectFromCoords( rect,findPane.il, findPane.it,
-	        findPane.ir, findPane.ib, findPane.iW, findPane.iH);
+findPane.ir, findPane.ib, findPane.iW, findPane.iH);
-	// Calculate the new position for GoToPane.
+// Calculate the new position for GoToPane.
-	gotoRect.iTl.iY -= ( findPane.iH );
+gotoRect.iTl.iY -= ( findPane.iH );
-	gotoRect.iBr.iY -= ( findPane.iH );
+gotoRect.iBr.iY -= ( findPane.iH );
-	iGotoPane->SetRect( gotoRect );
+iGotoPane->SetRect( gotoRect );
-	    }
+}
-	else
+else
-	    {
+{
-	    // Enable / disable line in Goto Pane (hide if listbox is empty).
+// Enable / disable line in Goto Pane (hide if listbox is empty).
 iGotoPane->SetLineState( unfilteredNumberOfItems > 0 );
 // In Goto Mode, the listbox is laid out leaving space for Goto Pane.
 AknLayoutUtils::LayoutControl( Listbox(), rect, AknLayout::list_gen_pane( 1 ));
 // Lay out Goto Pane as if it was the old Find Pane.
 AknLayoutUtils::LayoutControl( iGotoPane, rect, AknLayout::find_pane() );
-	    }
+}
-	}
+}
-	else
+else
-	{
+{
-	// Fall back upon default behavior in base-class, which lays out the bookmarks list only
+// Fall back upon default behavior in base-class, which lays out the bookmarks list only
-	CBrowserFavouritesContainer::SizeChanged();
+CBrowserFavouritesContainer::SizeChanged();
 }
 }
 // ---------------------------------------------------------
 // CBrowserBookmarksContainer::OfferKeyEventL
 // ---------------------------------------------------------
 //
 TKeyResponse CBrowserBookmarksContainer::OfferKeyEventL
 ( const TKeyEvent& aKeyEvent, TEventCode aType )
-	{
+{
 /*
 LOG_ENTERFN( "BookmarksContainer::OfferKeyEventL" );
 BROWSER_LOG( ( _L("aType: %d, aKeyEvent.iCode: %d, iScanCode: %d, iRepeats: %d"),
 aType, aKeyEvent.iCode, aKeyEvent.iScanCode, aKeyEvent.iRepeats ) );
 */
 TKeyResponse result = EKeyWasNotConsumed;
 TKeyEvent keyEvent( aKeyEvent );
-	// Selection Key handling
+// Selection Key handling
-	if( keyEvent.iScanCode == EStdKeyDevice3 )
+if( keyEvent.iScanCode == EStdKeyDevice3 )
-	    {
+{
 // it is possible to activate BookmarksView from ContentView
 // via a long press of Selection key, so here we must capture
 // the KeyDown. Long press processing will be done only if key
 // was pressed originally in this view.
-	if( aType == EEventKeyDown )
+if( aType == EEventKeyDown )
-	    {
+{
 iSelectionKeyDownPressed = ETrue;
-		result = EKeyWasConsumed;
+result = EKeyWasConsumed;
-	    }
+}
 else if( aType == EEventKeyUp )
-	        {
+{
-	        if( !iSelectionKeyLongPress && iSelectionKeyDownPressed )
+if( !iSelectionKeyLongPress && iSelectionKeyDownPressed )
-	            {
+{
-	            // short press of Selection key, pass it to GotoPane
+// short press of Selection key, pass it to GotoPane
 keyEvent.iCode = EKeyOK;
 result = EKeyWasNotConsumed;
-	        }
+}
-	    else
+else
-	        {
+{
-	        // long press of Selection key was already processed
+// long press of Selection key was already processed
 result = EKeyWasConsumed;
 }
-	        iSelectionKeyDownPressed = EFalse;
+iSelectionKeyDownPressed = EFalse;
-	        iSelectionKeyLongPress = EFalse;
+iSelectionKeyLongPress = EFalse;
-	    }
+}
-	else if( aType == EEventKey )
+else if( aType == EEventKey )
-	    {
+{
-	    if( keyEvent.iRepeats && iSelectionKeyDownPressed )
+if( keyEvent.iRepeats && iSelectionKeyDownPressed )
-	        {
+{
 const CFavouritesItem* item = Listbox()->CurrentItem();
 if ( item )
 {
-				// The option for the user to download the page in new window is disabled
+// The option for the user to download the page in new window is disabled
 CBrowserAppUi::Static()->FetchBookmarkL( *item );
 }
-	        iSelectionKeyLongPress = ETrue;
+iSelectionKeyLongPress = ETrue;
-	        iSelectionKeyDownPressed = EFalse;
+iSelectionKeyDownPressed = EFalse;
-	        }
+}
 if ( (aKeyEvent.iScanCode == EStdKeyHash)  ||
 ( aKeyEvent.iModifiers &
 ( EModifierShift | EModifierLeftShift | EModifierRightShift |
 EModifierCtrl | EModifierLeftCtrl | EModifierRightCtrl ) ) )
 {
 // Hash key press will be used for Mark/UnMark functionality
 // Let Platform Listbox handle this.
 result = EKeyWasNotConsumed;
 }
 else
-	    {
+{
-		result = EKeyWasConsumed;
+result = EKeyWasConsumed;
-	    }
+}
-	    }
+}
-	    }
+}
-		// If the Goto Pane exists and we're not fetching, then decide
-		// if we should pass keystroke to it
+// If the Goto Pane exists and we're not fetching, decide
-	if(iGotoPane && !CBrowserAppUi::Static()->Fetching())
+// if we should pass key event to the goto pane
-		{
+if ( iGotoPane && !CBrowserAppUi::Static()->Fetching() )
-		// If the key so far hadn't been consumed or if the pane is already active,
+{
-		// pass the keystroke on
+// If the key hadn't been consumed, so far, determine if the keystroke
-		if( (result == EKeyWasNotConsumed) || iGotoPaneActive || iSearchPaneActive )
+// should be handled by goto pane
-			{
+if ( ( result == EKeyWasNotConsumed ) || iSearchPaneActive )
-	// Goto pane has highest priority; if it's active, arrow keys go there.
+{
-	// If fetching is in progress, no key events are offered, to prevent it
+// Goto pane has highest priority; if it's active, arrow keys go there.
-	// from getting the focus and popping up a new CBA.
+// If fetching is in progress, no key events are offered, to prevent it
+// from getting the focus and popping up a new CBA.
-	// Enter Key  now handled through HandleCommand in BrowserBookmarksView like MSK
-			// This change affects the enter key on the QWERTY keyboard when we run emulator
+// Enter Key now handled through HandleCommand in BrowserBookmarksView like MSK
-	if(EStdKeyEnter == aKeyEvent.iScanCode && EEventKeyUp == aType && AknLayoutUtils::MSKEnabled() && (iGotoPaneActive || iSearchPaneActive ))
+// This change affects the enter key on the QWERTY keyboard when we run emulator
-				{
+if ( EStdKeyEnter == aKeyEvent.iScanCode && EEventKeyUp == aType &&
-				CEikButtonGroupContainer* myCba = CEikButtonGroupContainer::Current();
+AknLayoutUtils::MSKEnabled() &&
-				if(myCba != NULL)
+( iGotoPaneActive || iSearchPaneActive ) )
-					{
+{
-					TInt cmdId = myCba->ButtonGroup()->CommandId(CEikButtonGroupContainer::EMiddleSoftkeyPosition);
+// Handle MSK press
-					View().HandleCommandL(cmdId);
+CEikButtonGroupContainer* myCba = CEikButtonGroupContainer::Current();
-					result = EKeyWasConsumed;
+if ( myCba != NULL )
-					}
+{
-				}
+TInt cmdId = myCba->ButtonGroup()->CommandId(CEikButtonGroupContainer::EMiddleSoftkeyPosition);
-			else
+View().HandleCommandL(cmdId);
-			    {
+result = EKeyWasConsumed;
-			    if( iSearchPane )
+}
-			        {
+}
-			        // Process separately for Search Feature //
+else
-			        if( iGotoPaneActive )
+{
+if ( iSearchPane )
+{
+			        // Process separately for Search Feature
+			        if ( iGotoPaneActive )
 			            {
 result = iGotoPane->OfferKeyEventL( keyEvent, aType );
 			            }
 else
 {
 result = iSearchPane->OfferKeyEventL( keyEvent, aType );
 }
-			        }
+}
-			    else
+else
-			        result = iGotoPane->OfferKeyEventL( keyEvent, aType );
-				}
-	if( iSearchPane )
-	    {
-	if( ( iGotoPaneActive || iSearchPaneActive) && result == EKeyWasNotConsumed )
 {
+if ( iGotoPaneActive )
-if(  aKeyEvent.iCode == EKeyUpArrow )
+{
+// Once activated let goto pane handle all the keys
+result = iGotoPane->OfferKeyEventL( keyEvent, aType );
+}
+else // if ( !iGotoPaneActive )
+{
+// Only a valid digit or character should popup the goto pane.
+// We will ignore h/w key events, i.e. camera cover, camera
+// shutter, zoom, etc... iCode is only valid for EEventKey,
+// not EEventKeyDown, so we have to use iScanCode. because
+// the goto pane decides to popup on EEventKeyDown. Use
+// upper case of iScanCode since there is no overlap of
+// h/w scan codes and uppercase letters.
+TChar inputCharCode( aKeyEvent.iScanCode );
+TBool isDigit = inputCharCode.IsDigit();
+TUint upperCase = inputCharCode.GetUpperCase();
+if ( isDigit ||
+(( upperCase >= 0x41 /*A*/ ) && ( upperCase <= 0x5A /*Z*/ )) )
+{
+// Valid digit or character was entered, let goto pane
+// determine if it handles the keys from here on.
+result = iGotoPane->OfferKeyEventL( aKeyEvent, aType );
+if ( result == EKeyWasConsumed )
+{
+// goto pane is not active, make it active now
+SetGotoActiveL();
+}
+}
+}
+}
+}
+}
+if ( iSearchPane )
+{
+if ( ( iGotoPaneActive || iSearchPaneActive) &&
+result == EKeyWasNotConsumed )
+{
+if (  aKeyEvent.iCode == EKeyUpArrow )
 {
 result = EKeyWasConsumed;
-if( iSearchPaneActive )
+if ( iSearchPaneActive )
 {
 SetGotoActiveL();
 iGotoPane->SetVKBFlag( ETrue );
 }
 }
-if( aKeyEvent.iCode == EKeyDownArrow )
+if ( aKeyEvent.iCode == EKeyDownArrow )
 {
 result = EKeyWasConsumed;
-if( iGotoPaneActive )
+if ( iGotoPaneActive )
 {
 SetSearchActiveL();
 iSearchPane->SetVKBFlag( ETrue );
 }
 }
 }
-	    }
+}
+}
-			// if key is consumed, goto pane was not active, make it active now.
-	if(result == EKeyWasConsumed && (!iGotoPaneActive && !iSearchPaneActive))
+// For handling Enter key in emulator / Keyboard ( Enter key should behave similar to MSK )
-		{
+if ( EStdKeyEnter == keyEvent.iScanCode && EEventKey == aType &&
-		SetGotoActiveL();
+AknLayoutUtils::MSKEnabled() && result == EKeyWasNotConsumed )
-		}
+{
-	}
+CEikButtonGroupContainer* myCba = CEikButtonGroupContainer::Current();
-		}
+if(myCba != NULL)
-	// For handling Enter key in emulator / Keyboard ( Enter key should behave similar to MSK )
+{
-	if(EStdKeyEnter == keyEvent.iScanCode && EEventKey == aType && AknLayoutUtils::MSKEnabled() && result == EKeyWasNotConsumed )
+TInt cmdId = myCba->ButtonGroup()->CommandId(CEikButtonGroupContainer::EMiddleSoftkeyPosition);
-		{
+if(EAknSoftkeyContextOptions  == cmdId)
-		CEikButtonGroupContainer* myCba = CEikButtonGroupContainer::Current();
+{
-		if(myCba != NULL)
+View().MenuBar()->TryDisplayContextMenuBarL();
-			{
+result = EKeyWasConsumed;
-			TInt cmdId = myCba->ButtonGroup()->CommandId(CEikButtonGroupContainer::EMiddleSoftkeyPosition);
+}
-			if(EAknSoftkeyContextOptions  == cmdId)
+else if(Listbox()->Model()->ItemTextArray()->MdcaCount() == 0)
-				{
+{
-				View().MenuBar()->TryDisplayContextMenuBarL();
+View().HandleCommandL(cmdId);
-				result = EKeyWasConsumed;
+result = EKeyWasConsumed;
-				}
+}
-			else if(Listbox()->Model()->ItemTextArray()->MdcaCount() == 0)
+}
-				{
+}
-				View().HandleCommandL(cmdId);
-				result = EKeyWasConsumed;
-				}
-			}
-		}
 if ( result == EKeyWasNotConsumed )
 {
 // Otherwise, base class handles Find pane, arrows between folders and
 // the listbox.
-result = CBrowserFavouritesContainer::OfferKeyEventL
+result = CBrowserFavouritesContainer::OfferKeyEventL( keyEvent, aType );
-( keyEvent, aType );
 }
 return result;
-	}
+}
 // ---------------------------------------------------------
 // CBrowserBookmarksContainer::HandleCursorChangedL
 // ---------------------------------------------------------
 //
 void CBrowserBookmarksContainer::HandleCursorChangedL
 ( CEikListBox*
 #ifdef _DEBUG
 aListBox  // used only for debugging purposes
 #endif
 )
 {
 // If one item is highlighted, set to current URL.
 url.Set( Util::StripUrl( item->Url() ) );
 }
 }
 iGotoPane->SetTextL( url, ETrue );
-		iGotoPane->SetFocus ( EFalse );
+iGotoPane->SetFocus ( EFalse );
 }
 }
 // ---------------------------------------------------------
 // CBrowserBookmarksContainer::IsEditing
 // ---------------------------------------------------------
 // CBrowserBookmarksContainer::CBrowserBookmarksContainer
 // ---------------------------------------------------------
 //
 CBrowserBookmarksContainer::CBrowserBookmarksContainer()
-: iGotoPaneActive( EFalse ),iSearchPaneActive(EFalse)
+: iGotoPaneActive( EFalse ),
+iSearchPaneActive(EFalse)
 {
 }
 // ---------------------------------------------------------
 // CBrowserBookmarksContainer::ConstructComponentControlsL
 CBrowserFavouritesContainer::ConstructComponentControlsL
 ( aRect, aView );
 // Construct Goto Pane.
 //pass view to bookmarks goto pane
 iGotoPane = CBrowserBookmarksGotoPane::NewL( *this, &aView, KAvkonBitmapFile,
 EMbmAvkonQgn_indi_find_goto,
 EMbmAvkonQgn_indi_find_goto_mask);
 iGotoPane->SetFocus( EFalse );
 if( View().ApiProvider().Preferences().SearchFeature() )
 {
 ConstructSearchPaneL();
 iSearchPane->SetFocus( EFalse );
 iDefaultSearchText = StringLoader::LoadL( R_IS_WEB_SEARCH );
 // ---------------------------------------------------------
 //
 void CBrowserBookmarksContainer::GetHelpContext( TCoeHelpContext& aContext ) const
 {
 aContext.iMajor = KUidBrowserApplication;
-	aContext.iContext = KOSS_HLP_BM_MAIN;
+aContext.iContext = KOSS_HLP_BM_MAIN;
 }
 #endif // __SERIES60_HELP
 // ---------------------------------------------------------
 // CBrowserBookmarksContainer::FocusChanged()
 // ----------------------------------------------------------------------------
 // CBrowserBookmarksContainer::HandlePointerEventL
 // ----------------------------------------------------------------------------
 //
 void CBrowserBookmarksContainer::HandlePointerEventL(const TPointerEvent& aPointerEvent)
 {
 if (AknLayoutUtils::PenEnabled())
 {
-		// if goto is active, if a pointer event falls within its rect,
+// if goto is active, if a pointer event falls within its rect,
-		// pass all pointer events to it (such as, to bring up the editor's letter-entry)
+// pass all pointer events to it (such as, to bring up the editor's letter-entry)
-		//
+//
-		// otherwise, if it falls within the listbox's rect
+// otherwise, if it falls within the listbox's rect
-		//
+//
 // Now we have two different panes so we have to check explicitly before passing controls
 // to any panes.
 if( iGotoPane && ( iGotoPaneActive || iSearchPaneActive) )
 {
 if( iSearchPane )//implies presence of search feature.
 {
 iGotoPane->HandlePointerEventL(aPointerEvent);
 }
 else
 {
 SetGotoActiveL();
 }
 iGotoPane->SetVKBFlag( ETrue );
 }
 else if( iSearchPane->Rect().Contains( aPointerEvent.iPosition) )
 {
 if( iSearchPaneActive )
 {
 iSearchPane->HandlePointerEventL(aPointerEvent);
 }
 else
 {
 SetSearchActiveL();
 }
 iSearchPane->SetVKBFlag( ETrue );
 }
 else
 {
 CBrowserAppUi::Static()->ActiveView()->HandleCommandL(EWmlCmdGotoPaneCancel);
 SetGotoInactiveL();
 {
 iGotoPane->HandlePointerEventL(aPointerEvent);
 }
 }
 else
-	{
+{
-		// normally, pass all pointer events down to the listbox
+// normally, pass all pointer events down to the listbox
-		Listbox()->HandlePointerEventL(aPointerEvent);
+Listbox()->HandlePointerEventL(aPointerEvent);
-	}
+}
 }
 }
 // ----------------------------------------------------------------------------
 // CBrowserBookmarksContainer::ConstructSearchPaneL
 void CBrowserBookmarksContainer::ConstructSearchPaneL()
 {
 TFileName iconFile;
 MPreferences& preferences = View().ApiProvider().Preferences();
 TInt iconId = preferences.GetIntValue( KBrowserSearchIconId );
 // Get the Search Icon File Path.
 preferences.GetStringValueL( KBrowserSearchIconPath, KMaxFileName, iconFile );
 // If Icon File Path Changed or Icon Id Changed, Refresh the Icon for Search Pane.
 // Comparing Icon File path as well, because it may be possible that two different
 // Icon files have same icon id.
 if( iconId != iSearchIconId
 || iSearchIconFilePath.Compare( iconFile ) != 0 )
 {
 TInt iconMaskId = preferences.GetIntValue( KBrowserSearchIconMaskId );
 // Save IconId
 iSearchIconId = iconId;
 // Save Icon File
 iSearchIconFilePath = iconFile;
 // No Icon file or IconId or IconMaskId set , then it means no search provider is still
 // selected and set by search application, in that case we use the default icon for Search.
 if( ! iconFile.Length()
 || iconId == -1
 || iconMaskId == -1 )
 {
 iconId = EMbmAvkonQgn_indi_find_glass;
 iconMaskId = EMbmAvkonQgn_indi_find_glass_mask;
 iconFile = KAvkonBitmapFile;
 }
 if( iSearchPane )
 {
 delete iSearchPane;
 iSearchPane = NULL;
 }
 // iSearchPane != NULL, implies presence of search feature, hence it can be
 // used to validate search feature avoiding repetative calls to utils and
 // avoiding need of separate variable.
 iSearchPane = CBrowserBookmarksGotoPane::NewL( *this,
 &(View()),
 iconFile,
 iconId,
 iconMaskId,
 GOTOPANE_POPUPLIST_DISABLE,
 ETrue
 );
 CBrowserBookmarksView* bookmarkView = REINTERPRET_CAST( CBrowserBookmarksView* ,  &( View() ));
 // Set Pane observer
 iSearchPane->SetGPObserver( bookmarkView );
 }
 }
 {
 CBrowserFavouritesContainer::HandleResourceChange( aType);
 if( aType == KEikDynamicLayoutVariantSwitch)
 {
 // If search feature exsist
 if( iSearchPane  )
 {
 if( iSearchPaneActive )
 {
 iGotoPane->SetTextModeItalicL( );
 }

changeset 10	4530440261a8
parent 1	57d5b8e231c4
child 15	d6f226a5ad2c