diff -r 84ad3b177aa3 -r 57d5b8e231c4 browserui/browser/FavouritesInc/BrowserBookmarksContainer.h --- a/browserui/browser/FavouritesInc/BrowserBookmarksContainer.h Mon Mar 30 12:49:49 2009 +0300 +++ b/browserui/browser/FavouritesInc/BrowserBookmarksContainer.h Fri May 08 08:18:43 2009 +0300 @@ -63,11 +63,19 @@ void SetGotoActiveL(); /** - * Deactivate Goto Mode + * Activate Search Pane + */ + void SetSearchActiveL(); + /** + * Deactivate Goto Pane */ void SetGotoInactiveL(); + /** + * Deactivate Search Pane + */ + void SetSearchInactiveL(); public: // access to components /** @@ -75,13 +83,24 @@ * @return The Goto Pane. */ inline CBrowserBookmarksGotoPane* GotoPane() const; - - + + /** + * Get the Search Pane. + * @return The Search Pane. + */ + inline CBrowserBookmarksGotoPane* SearchPane() const; + /** * Check if we are in Goto Mode * @return ETrue if we are in Goto Mode; EFalse otherwise. */ inline TBool GotoPaneActive() const; + + /** + * Check if we are in Search Mode + * @return ETrue if we are in Search Mode; EFalse otherwise. + */ + inline TBool SearchPaneActive() const; public: // from CBrowserFavouritesContainer @@ -123,6 +142,11 @@ TBool IsEditing(); /** + * Check if some editing is in progress for Search Pane. + */ + TBool IsEditingSearch(); + + /** * Get tab index belonging to this view. * @return The tab index. */ @@ -154,6 +178,12 @@ */ void HandlePointerEventL(const TPointerEvent& /*aPointerEvent*/); + /** + * HandleResourceChange + * From CCoeControl + */ + void HandleResourceChange(TInt aType); + protected: // Construct / destruct /** @@ -172,6 +202,12 @@ const TRect& aRect, CBrowserFavouritesView& aView ); + /** + * Called by ConstructComponentControlsL. + * Leaves on failure. + */ + virtual void ConstructSearchPaneL(); + protected: // from CBrowserFavouritesContainer /** @@ -196,15 +232,42 @@ * Goto Pane. */ CBrowserBookmarksGotoPane* iGotoPane; - - + + /** + * Owned. + * Search Pane. + */ + CBrowserBookmarksGotoPane* iSearchPane; + /** * ETrue if Goto pane is active, EFalse by default */ TBool iGotoPaneActive; + + /** + * ETrue if Search pane is active, EFalse by default + */ + TBool iSearchPaneActive; TBool iSelectionKeyDownPressed; TBool iSelectionKeyLongPress; + + /** + * Default text in search editor + */ + HBufC* iDefaultSearchText; + + /** + * Saves Search Provider Icon Id, + * used for tracking changes to Icon. + */ + TInt iSearchIconId; + + /** + * Saves Search Icon File Path + * used for tracking changes to Icon. + */ + TFileName iSearchIconFilePath; }; #include "BrowserBookmarksContainer.inl"