equal
deleted
inserted
replaced
490 |
490 |
491 case EWmlCmdGoToAddressAndSearch: |
491 case EWmlCmdGoToAddressAndSearch: |
492 case EWmlCmdGoToAddress: // MSK for Recent Url page |
492 case EWmlCmdGoToAddress: // MSK for Recent Url page |
493 case EWmlCmdSwitchToGotoActive: |
493 case EWmlCmdSwitchToGotoActive: |
494 { |
494 { |
495 iSoftKeyUpdate = EFalse; |
|
496 DimToolbarButtons(ETrue); |
495 DimToolbarButtons(ETrue); |
497 #ifdef BRDO_SINGLE_CLICK_ENABLED_FF |
496 #ifdef BRDO_SINGLE_CLICK_ENABLED_FF |
498 CEikButtonGroupContainer* cba = Cba()->Current(); |
497 CEikButtonGroupContainer* cba = Cba()->Current(); |
499 CEikCba* eikCba = static_cast<CEikCba*>( cba->ButtonGroup() ); |
498 CEikCba* eikCba = static_cast<CEikCba*>( cba->ButtonGroup() ); |
500 if( eikCba ) |
499 if( eikCba ) |
507 } |
506 } |
508 |
507 |
509 case EIsCmdSearchWeb: |
508 case EIsCmdSearchWeb: |
510 { |
509 { |
511 DimToolbarButtons(ETrue); |
510 DimToolbarButtons(ETrue); |
|
511 #ifdef BRDO_SINGLE_CLICK_ENABLED_FF |
|
512 CEikButtonGroupContainer* cba = Cba()->Current(); |
|
513 CEikCba* eikCba = static_cast<CEikCba*>( cba->ButtonGroup() ); |
|
514 if( eikCba ) |
|
515 { |
|
516 eikCba->EnableItemSpecificSoftkey( EFalse ); |
|
517 } |
|
518 #endif |
512 TheContainer()->SetSearchActiveL(); |
519 TheContainer()->SetSearchActiveL(); |
513 break; |
520 break; |
514 } |
521 } |
515 |
522 |
516 case EWmlCmdEditBookmark: |
523 case EWmlCmdEditBookmark: |
827 // |
834 // |
828 CBrowserBookmarksGotoPane* gotoPanePtr = NULL; |
835 CBrowserBookmarksGotoPane* gotoPanePtr = NULL; |
829 CBrowserBookmarksContainer* theContainer = TheContainer(); |
836 CBrowserBookmarksContainer* theContainer = TheContainer(); |
830 |
837 |
831 // if the container doesn't exist, leave gotoPanePtr at NULL |
838 // if the container doesn't exist, leave gotoPanePtr at NULL |
832 if (theContainer && !iSoftKeyUpdate) |
839 if (theContainer) |
833 { |
840 { |
834 gotoPanePtr = theContainer->GotoPane(); |
841 gotoPanePtr = theContainer->GotoPane(); |
835 } |
842 } |
836 |
843 |
837 // set LSK, RSK, MSK respectively |
844 // set LSK, RSK, MSK respectively |
2073 |
2080 |
2074 if ( iOpenAdaptiveBookmarksWhenActivated ) |
2081 if ( iOpenAdaptiveBookmarksWhenActivated ) |
2075 { |
2082 { |
2076 iInAdaptiveBookmarksFolder = ETrue; |
2083 iInAdaptiveBookmarksFolder = ETrue; |
2077 } |
2084 } |
2078 |
|
2079 if( iPreviousViewID == KUidBrowserBookmarksViewId ) |
|
2080 { |
|
2081 iSoftKeyUpdate = ETrue; |
|
2082 } |
|
2083 CBrowserFavouritesView::DoActivateL |
2085 CBrowserFavouritesView::DoActivateL |
2084 ( aPrevViewId, aCustomMessageId, aCustomMessage ); |
2086 ( aPrevViewId, aCustomMessageId, aCustomMessage ); |
2085 ApiProvider().BrCtlInterface().AddLoadEventObserverL( this ); |
2087 ApiProvider().BrCtlInterface().AddLoadEventObserverL( this ); |
2086 |
2088 |
2087 if ( iPreferencesChanged ) |
2089 if ( iPreferencesChanged ) |
2126 { |
2128 { |
2127 if ( !iSaveStateOnDeactivate ) |
2129 if ( !iSaveStateOnDeactivate ) |
2128 { |
2130 { |
2129 ExitAdaptiveBookmarks(); |
2131 ExitAdaptiveBookmarks(); |
2130 } |
2132 } |
2131 iSoftKeyUpdate = EFalse; |
|
2132 if ( !ApiProvider().ExitInProgress() ) |
2133 if ( !ApiProvider().ExitInProgress() ) |
2133 { |
2134 { |
2134 ApiProvider().BrCtlInterface().RemoveLoadEventObserver( this ); |
2135 ApiProvider().BrCtlInterface().RemoveLoadEventObserver( this ); |
2135 } |
2136 } |
2136 CBrowserFavouritesView::DoDeactivate(); |
2137 CBrowserFavouritesView::DoDeactivate(); |