201027
authorhgs
Tue, 06 Jul 2010 22:42:57 +0800
changeset 31 c91c3c86f666
parent 29 912739058194
child 36 b29c02149a27
201027
userguide/Userguide.pro
userguide/inc/BrowserWrapper.h
userguide/src/BrowserWrapper.cpp
--- a/userguide/Userguide.pro	Wed Jun 30 11:17:20 2010 +0800
+++ b/userguide/Userguide.pro	Tue Jul 06 22:42:57 2010 +0800
@@ -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
 }
--- a/userguide/inc/BrowserWrapper.h	Wed Jun 30 11:17:20 2010 +0800
+++ b/userguide/inc/BrowserWrapper.h	Tue Jul 06 22:42:57 2010 +0800
@@ -21,9 +21,9 @@
 #include <QStack>
 #include <QGraphicsWebView>
 
-#include <hbwidget.h>
+#include <hbview.h>
 
-class BrowserWrapper : public HbWidget
+class BrowserWrapper : public HbView
 {
     Q_OBJECT
     
--- a/userguide/src/BrowserWrapper.cpp	Wed Jun 30 11:17:20 2010 +0800
+++ b/userguide/src/BrowserWrapper.cpp	Tue Jul 06 22:42:57 2010 +0800
@@ -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);