userguide/src/HelpContentsView.cpp
changeset 18 375271912456
parent 15 c0dfc135a46c
child 23 99b096216bc8
--- a/userguide/src/HelpContentsView.cpp	Mon May 03 12:24:47 2010 +0300
+++ b/userguide/src/HelpContentsView.cpp	Fri May 14 15:42:52 2010 +0300
@@ -51,22 +51,13 @@
 
 void HelpContentsView::initDocMl()
 {
- // Create widget hierarchy
-    setObjectName( DOCML_VIEW_CONTENTS );
-
-    // List existing root elements - this allows us to refer to objects in the XML 
-    // which are created outside the document.
-    QObjectList roots;
-    roots.append( this );
-
-	mBuilder.setObjectTree(roots);
-
+	initBaseDocMl();
     mBuilder.load(QRC_DOCML_CONTENTS);
 }
 
 void HelpContentsView::initBackAction()
 {
-    mSoftKeyAction = new HbAction(Hb::BackAction);
+    mSoftKeyAction = new HbAction(Hb::BackNaviAction  );
     connect(mSoftKeyAction, SIGNAL(triggered()), this, SLOT(onBackAction()));
 }
 
@@ -112,7 +103,7 @@
     QString html;
     QString baseUrl = url.toString();
     HelpDataProvider::instance()->getHelpContentData(html, baseUrl);
-    mBrowser->setHtml(html, baseUrl);
+	mBrowser->setHtml(html, baseUrl);
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////
@@ -121,6 +112,7 @@
 {
     if(this == view)
     {
+		setVisible(true);
         setNavigationAction(mSoftKeyAction);
         openHelpContent();
     }
@@ -140,7 +132,7 @@
 	}
 	else
 	{
-		emit activateView(HelpViewCategory);
+		emit activateView(PreviousView);
 	}
 }