summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndras Becsi <andras.becsi@theqtcompany.com>2015-08-03 20:48:52 +0200
committerAndras Becsi <andras.becsi@theqtcompany.com>2015-08-12 17:22:03 +0200
commit5ae767f13550ac93c2265312d716d414dbd48321 (patch)
treeb9d4ee95c98c3daaa5d7afa5d9ba0d615bc02eb2 /src
parentba8f2b4d12dd4df686a9bcfe1a36f93400953b38 (diff)
Show home screen on startup
Diffstat (limited to 'src')
-rw-r--r--src/qml/BrowserWindow.qml1
-rw-r--r--src/qml/HomeScreen.qml2
-rw-r--r--src/qml/NavigationBar.qml4
-rw-r--r--src/qml/PageView.qml1
4 files changed, 3 insertions, 5 deletions
diff --git a/src/qml/BrowserWindow.qml b/src/qml/BrowserWindow.qml
index 7cd67df..ec49775 100644
--- a/src/qml/BrowserWindow.qml
+++ b/src/qml/BrowserWindow.qml
@@ -263,7 +263,6 @@ Item {
return
navigation.webView = tab.webView
- tab.webView.url = engine.fromUserInput("qt.io")
}
onCurrentIndexChanged: {
if (!tabView.get(tabView.currentIndex))
diff --git a/src/qml/HomeScreen.qml b/src/qml/HomeScreen.qml
index ae568b3..39e216e 100644
--- a/src/qml/HomeScreen.qml
+++ b/src/qml/HomeScreen.qml
@@ -52,7 +52,7 @@ Rectangle {
gridView.contentX = p * gridView.page
}
- state: "disabled"
+ state: "enabled"
signal add(string title, string url, string iconUrl, string fallbackColor)
onAdd: {
diff --git a/src/qml/NavigationBar.qml b/src/qml/NavigationBar.qml
index 2b8018a..4d1c98f 100644
--- a/src/qml/NavigationBar.qml
+++ b/src/qml/NavigationBar.qml
@@ -151,10 +151,10 @@ ToolBar {
TextField {
id: urlBar
Layout.fillWidth: true
- text: webView.url
+ text: webView ? webView.url : ""
activeFocusOnPress: true
placeholderText: qsTr("Search or type a URL")
- focus: !webView.focus
+ focus: false
onActiveFocusChanged: {
if (activeFocus)
diff --git a/src/qml/PageView.qml b/src/qml/PageView.qml
index 6e00186..7128c72 100644
--- a/src/qml/PageView.qml
+++ b/src/qml/PageView.qml
@@ -312,7 +312,6 @@ Rectangle {
return
}
- element.item.webView.url = "about:blank"
listModel.append(element)
return element.item
}