From 7c171e8067c929a3f49cf9753e75e202744e7344 Mon Sep 17 00:00:00 2001
From: Tapani Mikola <tapani.mikola@nokia.com>
Date: Wed, 12 Aug 2009 17:43:53 +0300
Subject: Small cleanup to webbrowser.qml not to use url as property id. Using
 urlString instead. In addition title back to show the page title.

---
 demos/declarative/webbrowser/webbrowser.qml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/demos/declarative/webbrowser/webbrowser.qml b/demos/declarative/webbrowser/webbrowser.qml
index e501e12..9b6d6f6 100644
--- a/demos/declarative/webbrowser/webbrowser.qml
+++ b/demos/declarative/webbrowser/webbrowser.qml
@@ -6,10 +6,8 @@ import "fieldtext"
 Item {
     id: WebBrowser
 
-    property string url : "http://www.qtsoftware.com/"
+    property string urlString : "http://www.qtsoftware.com/"
 
-    width: 640
-    height: 480
     state: "Normal"
 
     Script {
@@ -78,8 +76,8 @@ Item {
                 Text {
                     id: HeaderText
 
-                    //text: MyWebView.title!='' || MyWebView.progress == 1.0 ? MyWebView.title : 'Loading...'
-                    text: MyWebView.url
+                    text: MyWebView.title!='' || MyWebView.progress == 1.0 ? MyWebView.title : 'Loading...'
+                    //text: MyWebView.url
                     elide: "ElideRight"
 
                     color: "white"
@@ -140,9 +138,9 @@ Item {
                             color: "#555555"
                             focusOnPress: true
                             =======*/
-                            text: WebBrowser.url
+                            text: WebBrowser.urlString
                             label: "url:"
-                            onConfirmed: { print ('OnConfirmed: '+EditUrl.text); WebBrowser.url = EditUrl.text; print (EditUrl.text); MyWebView.focus=true }
+                            onConfirmed: { print ('OnConfirmed: '+EditUrl.text); WebBrowser.urlString = EditUrl.text; print (EditUrl.text); MyWebView.focus=true }
                             onCancelled: { MyWebView.focus=true }
                             onStartEdit: { print (EditUrl.text); MyWebView.focus=false }
 
@@ -197,16 +195,17 @@ Item {
                 id: MyWebView
                 cacheSize: 4000000
 
-                url: WebBrowser.url
+                url: WebBrowser.urlString
                 smooth: !Flick.moving
                 fillColor: "white"
                 focus: true
+                interactive: true
 
                 idealWidth: Flick.width
                 idealHeight: Flick.height/scale
                 scale: (width > 0) ? Flick.width/width*zoomedOut+(1-zoomedOut) : 1
 
-                onUrlChanged: { print ('OnUrlChanged: '+url); WebBrowser.url = url.toString(); print ('Moved to url: ' + WebBrowser.url) }
+                onUrlChanged: { print ('OnUrlChanged: '+url.toString()); WebBrowser.urlString = url.toString(); print ('Moved to url: ' + WebBrowser.urlString) }
                 onDoubleClick: { toggleZoom() }
 
                 property real zoomedOut : 1
-- 
cgit v0.12