--- a/userguide/src/HelpMainWindow.cpp	Fri Apr 16 14:53:45 2010 +0300
+++ b/userguide/src/HelpMainWindow.cpp	Mon May 03 12:24:47 2010 +0300
@@ -15,6 +15,7 @@
 *
 */
 
+#include <hbtoolbar.h>
 #include <hbnotificationdialog.h>
 #include <hbaction.h>
 
@@ -22,22 +23,36 @@
 #include "HelpContentsView.h"
 
 #include "HelpMainWindow.h"
-#include "HelpDocumentLoader.h"
 #include "HelpDataProvider.h"
 
 HelpMainWindow::HelpMainWindow() : 
 mCategoryView(NULL),
 mContentsView(NULL)
 {
+	connect(this, SIGNAL(orientationChanged(Qt::Orientation)), this, SLOT(onOrientationChanged(Qt::Orientation)));
+	initToolbar();
     activateCategoryView();
 }
 
 HelpMainWindow::~HelpMainWindow()
 {
-    HelpUIBuilder::destroyInstance();
     HelpDataProvider::destroyInstance();
 }
 
+void HelpMainWindow::initToolbar()
+{
+	mBuilder.load(QRC_DOCML_TOOLBAR);
+	mToolBar = mBuilder.findWidget<HbToolBar*>(DOCML_TOOLBAR);
+
+    HbAction* allAction = mBuilder.findObject<HbAction*>(DOCML_ACTION_ALL);
+    HbAction* findAction = mBuilder.findObject<HbAction*>(DOCML_ACTION_SEARCH);
+	HbAction* onLineSupportAction = mBuilder.findObject<HbAction*>(DOCML_ACTION_LINK_NOKIA);
+
+	connect(allAction, SIGNAL(triggered()), this, SLOT(onToolbarAll()));
+	connect(findAction, SIGNAL(triggered()), this, SLOT(onToolbarFind()));
+	connect(onLineSupportAction, SIGNAL(triggered()), this, SLOT(onToolbarOnlineSupport()));
+}
+
 void HelpMainWindow::onActivateView(HelpViewName viewName)
 {
 	switch(viewName)
@@ -59,10 +74,10 @@
 {
     if(!mCategoryView)
     {
-        HelpUIBuilder::load(QRC_DOCML_CATEGORY);
-        mCategoryView = HelpUIBuilder::findWidget<HelpCategoryView*>(DOCML_VIEW_CATEGORY);
+        mCategoryView = new HelpCategoryView();
         addView(mCategoryView);
         mCategoryView->init();
+		mCategoryView->setToolBar(mToolBar);
         emit currentViewChanged(mCategoryView);
 		connectViewSignal(mCategoryView);
     }
@@ -74,10 +89,10 @@
 {
     if(!mContentsView)
     {
-        HelpUIBuilder::load(QRC_DOCML_CONTENTS);
-        mContentsView = HelpUIBuilder::findWidget<HelpContentsView*>(DOCML_VIEW_CONTENTS);
+		mContentsView = new HelpContentsView();
         addView(mContentsView);
         mContentsView->init();
+		mContentsView->setToolBar(mToolBar);
 
         connectViewSignal(mContentsView);
     }
@@ -88,29 +103,25 @@
 void HelpMainWindow::connectViewSignal(const QObject *object)
 {
     connect(object, SIGNAL(activateView(HelpViewName)), this, SLOT(onActivateView(HelpViewName)));
-    
-    connect(object, SIGNAL(showAllList()), this, SLOT(onShowAllList()));
-    connect(object, SIGNAL(showFindList()), this, SLOT(onShowFindList()));
-    connect(object, SIGNAL(showOnlineSupport()), this, SLOT(onShowOnlineSupport()));
 }
 
 
 ////////////////////////////////////////////////////////////////////////////////////
 // handle view event
 
-void HelpMainWindow::onShowAllList()
+void HelpMainWindow::onToolbarAll()
 {
     activateCategoryView();
     mCategoryView->switchViewMode(HelpCategoryView::ViewModeAll);
 }
 
-void HelpMainWindow::onShowFindList()
+void HelpMainWindow::onToolbarFind()
 {
     activateCategoryView();
     mCategoryView->switchViewMode(HelpCategoryView::ViewModeSearch);
 }
 
-void HelpMainWindow::onShowOnlineSupport()
+void HelpMainWindow::onToolbarOnlineSupport()
 {
     HbNotificationDialog *notificationDialog = new HbNotificationDialog();
     notificationDialog->setParent(this);
@@ -118,5 +129,23 @@
     notificationDialog->show();
 }
 
+void HelpMainWindow::onOrientationChanged(Qt::Orientation orientation)
+{
+    RefreshToolbarText(orientation);
+}
+
+void HelpMainWindow::RefreshToolbarText(Qt::Orientation orientation)
+{
+	bool isLandscape = (Qt::Horizontal==orientation);
+    HbAction* tollbarAction = mBuilder.findObject<HbAction*>(DOCML_ACTION_ALL);
+    tollbarAction->setText(isLandscape ? qtTrId(TXT_BUTTON_ALL) : QString());
+
+    tollbarAction = mBuilder.findObject<HbAction*>(DOCML_ACTION_SEARCH);
+    tollbarAction->setText(isLandscape ? qtTrId(TXT_BUTTON_FIND) : QString());
+
+    tollbarAction = mBuilder.findObject<HbAction*>(DOCML_ACTION_LINK_NOKIA);
+    tollbarAction->setText(isLandscape ? qtTrId(TXT_BUTTON_LINK_SUPPORT) : QString());
+}
+
 // end of file