# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1282113588 -10800
# Node ID 30223e2ae041c8d542eef9784ee729d3ed238016
# Parent  4533d75b8d4e5b3e8ed45d48cd7d486012ba74f1
Revision: 201031
Kit: 201033

diff -r 4533d75b8d4e -r 30223e2ae041 userguide/Userguide.pro
--- a/userguide/Userguide.pro	Tue Jul 06 14:06:37 2010 +0300
+++ b/userguide/Userguide.pro	Wed Aug 18 09:39:48 2010 +0300
@@ -54,13 +54,17 @@
 			src/HelpBaseView.cpp
 
 symbian {
-	TARGET.UID3 = 0x10005234
+
+		TARGET.UID3 = 0x10005234
   	TARGET.CAPABILITY = CAP_APPLICATION
   	TARGET.EPOCHEAPSIZE = 0x020000 0x1000000
 
     CONFIG += mobility
     MOBILITY = systeminfo
-  	LIBS += -lezip -lxqservice -lxqserviceutil -lcone -leikcore -lmediaclientaudio -leikcoctl -leiksrv -lapparc -lavkon -lefsrv -lcharconv -lws32 -lhal -lgdi -lapgrfx
+    INCLUDEPATH += /sf/mw/webruntime/wrt/runtimecore
+		INCLUDEPATH += /sf/mw/webruntime/wrt
+		DEFINES += CWRT_BUILDING_TENONE
+  	LIBS += -lRuntimeCore -lezip -lxqservice -lxqserviceutil -lcone -leikcore -lmediaclientaudio -leikcoctl -leiksrv -lapparc -lavkon -lefsrv -lcharconv -lws32 -lhal -lgdi -lapgrfx
   	include(rom/userguide.pri)
   	SKINICON = qtg_large_help
 }
diff -r 4533d75b8d4e -r 30223e2ae041 userguide/inc/BrowserWrapper.h
--- a/userguide/inc/BrowserWrapper.h	Tue Jul 06 14:06:37 2010 +0300
+++ b/userguide/inc/BrowserWrapper.h	Wed Aug 18 09:39:48 2010 +0300
@@ -21,9 +21,9 @@
 #include <QStack>
 #include <QGraphicsWebView>
 
-#include <hbwidget.h>
+#include <hbview.h>
 
-class BrowserWrapper : public HbWidget
+class BrowserWrapper : public HbView
 {
     Q_OBJECT
     
diff -r 4533d75b8d4e -r 30223e2ae041 userguide/rom/userguide.iby
--- a/userguide/rom/userguide.iby	Tue Jul 06 14:06:37 2010 +0300
+++ b/userguide/rom/userguide.iby	Wed Aug 18 09:39:48 2010 +0300
@@ -24,10 +24,6 @@
 
 file=ABI_DIR\BUILD_DIR\Userguide.exe             SHARED_LIB_DIR\Userguide.exe
 
-data = DATAZ_\APP_RESOURCE_DIR\Userguide.mif                    APP_RESOURCE_DIR\Userguide.mif
-
-
-
 
 HB_UPGRADABLE_APP_REG_RSC(Userguide)
 
diff -r 4533d75b8d4e -r 30223e2ae041 userguide/src/BrowserWrapper.cpp
--- a/userguide/src/BrowserWrapper.cpp	Tue Jul 06 14:06:37 2010 +0300
+++ b/userguide/src/BrowserWrapper.cpp	Wed Aug 18 09:39:48 2010 +0300
@@ -18,11 +18,16 @@
 #include <QGraphicsScene>
 #include <QGraphicsProxyWidget>
 #include <QGraphicsLinearLayout>
+#include <QWebFrame>
 
 #include "HelpDocumentLoader.h"
 #include "HelpCommon.h"
 #include "BrowserWrapper.h"
 
+#ifdef Q_OS_SYMBIAN
+#include <wrtcontroller.h>
+#endif
+
 BrowserWrapper::BrowserWrapper()
 {
 }
@@ -33,9 +38,15 @@
 
 void BrowserWrapper::init()
 {
+#ifdef Q_OS_SYMBIAN
+    WRT::WrtController* wrtController = new WRT::WrtController(this, WRT::GraphicsWebView);
+    mWebView = wrtController->graphicsWebView();
+#else
 	mWebView = new QGraphicsWebView();
-    mWebView->setZoomFactor(1.5);
+#endif
     mWebView->page()->setLinkDelegationPolicy(QWebPage::DelegateAllLinks);
+    mWebView->page()->mainFrame()->setScrollBarPolicy(Qt::Horizontal, Qt::ScrollBarAlwaysOff);
+    mWebView->page()->mainFrame()->setScrollBarPolicy(Qt::Vertical, Qt::ScrollBarAlwaysOff);
 	mWebView->settings()->setAttribute(QWebSettings::PluginsEnabled, true);
 	mWebView->settings()->setAttribute(QWebSettings::JavascriptEnabled, true);
     mWebView->settings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, true);
diff -r 4533d75b8d4e -r 30223e2ae041 userguide/src/HelpCategoryView.cpp
--- a/userguide/src/HelpCategoryView.cpp	Tue Jul 06 14:06:37 2010 +0300
+++ b/userguide/src/HelpCategoryView.cpp	Wed Aug 18 09:39:48 2010 +0300
@@ -113,7 +113,7 @@
         return;
     }
 
-    QString uid = mListAll->model()->data(index.parent(), UidRole).toString();
+	QString uid = mListAll->model()->data(index, UidRole).toString();
     QString href = mListAll->model()->data(index, HrefRole).toString();
     HelpDataProvider::instance()->setHelpContentUrl(uid, href);
     emit activateView(HelpViewContents);
diff -r 4533d75b8d4e -r 30223e2ae041 userguide/src/HelpDataProvider.cpp
--- a/userguide/src/HelpDataProvider.cpp	Tue Jul 06 14:06:37 2010 +0300
+++ b/userguide/src/HelpDataProvider.cpp	Wed Aug 18 09:39:48 2010 +0300
@@ -228,7 +228,7 @@
 			continue;
 		}
 
-		if(uidList.contains(uid))
+		if(uidList.contains(uid) || mUpdateUidList.contains(uid))
 		{
 			mUpdateUidList.append(uid);
 			constructBuiltInCategoryItem(pathUid, titleStr);
@@ -237,11 +237,23 @@
 
 		HelpStandardItem* item = NULL;
 		item = new HelpStandardItem(titleStr);
+
+		if(!item)
+		{
+			//no memory
+			return;
+		}
+
 		item->setData(pathUid, UidRole);
 
 		if(!mAppItem)
 		{
 			mAppItem = new HelpStandardItem(qtTrId(TXT_APPLICATIONS));
+			if(!mAppItem)
+			{
+				//no memory
+				return;
+			}
 			mAppItem->setData(APPPRIORITY, PriorityRole);
 		}
 		mAppItem->appendRow(item);
@@ -255,13 +267,15 @@
 	
 	HelpStandardItem* item = NULL;
 	item = new HelpStandardItem(title);
-	item->setData(uid, UidRole);
 
-	if(item)
+	if(!item)
 	{
-		item->setData(priority, PriorityRole);
-		mHelpModel->appendRow(item);
+		//no memory
+		return;
 	}
+	item->setData(uid, UidRole);
+	item->setData(priority, PriorityRole);
+	mHelpModel->appendRow(item);
 }
 
 void HelpDataProvider::constructCategory2(HelpStandardItem* itemParent)
@@ -289,8 +303,15 @@
 
 	for(int i = 0; i < hrefList.count(); i++)
 	{
-		HelpStandardItem* item = new HelpStandardItem(titleList[i]);
+		HelpStandardItem* item = NULL;
+		item = new HelpStandardItem(titleList[i]);
+		if(!item)
+		{
+			//no memory
+			return;
+		}
 		item->setData(hrefList[i], HrefRole);
+		item->setData(uid, UidRole);
 		itemParent->appendRow(item);
 		constructKeywordModel(titleList[i], uid, hrefList[i]);
 	}
@@ -300,10 +321,16 @@
 
 void HelpDataProvider::constructKeywordModel(const QString& title, const QString& uid, const QString& href)
 {
-	HelpStandardItem* itemTemp = new HelpStandardItem(title);
-	itemTemp->setData(uid, UidRole);
-	itemTemp->setData(href, HrefRole);
-	mKeywordModel->appendRow(itemTemp);
+	HelpStandardItem* item = NULL;
+	item = new HelpStandardItem(title);
+	if(!item)
+	{
+		//no memory
+		return;
+	}
+	item->setData(uid, UidRole);
+	item->setData(href, HrefRole);
+	mKeywordModel->appendRow(item);
 }
 
 void HelpDataProvider::parseCategoryIndexXml(const QString& path, QStringList& uidList, QStringList& titleList)