--- a/userguide/inc/HelpCategoryView.h	Tue Jun 08 18:34:07 2010 +0800
+++ b/userguide/inc/HelpCategoryView.h	Tue Jun 22 18:36:24 2010 +0800
@@ -18,19 +18,14 @@
 #ifndef HELPCATEGORYVIEW_H
 #define HELPCATEGORYVIEW_H
 
-#include <hbview.h>
+#include <HelpBaseView.h>
 
-#include "HelpCommon.h"
 #include "HelpDocumentLoader.h"
 
 class HbTreeView;
-class HbListView;
-class HbSearchPanel;
 class QStandardItem;
-class HbStaticVkbHost;
-class HbGroupBox;
 
-class HelpCategoryView : public HbView
+class HelpCategoryView : public HelpBaseView
 {
 	Q_OBJECT
 	
@@ -42,64 +37,20 @@
 private:
 	void initDocMl();
 	void initAllList();
-	void initSearchList();
-	void initSearchPanel();
-	void initBackAction();
-	void initEmptyLabel();
-	void initVirtualKeyboard();
-	
-private:
-	HbGroupBox* groupBox();
-
-public:
-    enum ViewMode
-    {
-        ViewModeNull = 0, 
-        ViewModeAll, 
-        ViewModeSearch
-    };
-    void switchViewMode(ViewMode viewMode);
-
-signals:
-    void activateView(HelpViewName viewName);
-    
-private:
-	void updateVisibleItems(bool visible);
-	void ResetSearchPanel();	
 
 private:
 	void expandCollapseAllList(QStandardItem* item, bool expand);
-
-private slots: // handle system event
-    void onCurrentViewChanged(HbView *view);
-
-private slots: // handle button action
-    void onBackAction();
+	void updateExpandCollapseAction(bool expand);
     
 private slots: // handle list event
     void onAllListActivated(const QModelIndex& index);
-    void onSearchListActivated(const QModelIndex& index);
 
-private slots: // handle search panel event
-	void onSearchPanelExitClicked();
-	void onSearchPanelCriteriaChanged(const QString &criteria);
-
-private slots:
-	void onExpandAll();
-	void onCollapseAll();
-
-private slots: // handle virtual keyboard event
-    void onHandleKeypadOpen();
-    void onHandleKeypadClose();
+private slots: // handle menu event
+	void onExpandOrCollapseAll();
 
 private:
-    ViewMode			mViewMode;
-	HbTreeView*			mListAll;
-	HbListView*			mListSearch;
-	HbSearchPanel*		mSearchPanel;
-	HbAction*			mSoftKeyAction;
-	HbStaticVkbHost*	mVirtualKeyboard;
-	HelpUIBuilder		mBuilder;
+	HbTreeView*	mListAll;
+	int			mExpandCount;
 };
 
 #endif //HELPCATEGORYVIEW_H