Commit ff9e250a authored by Pierre Rossi's avatar Pierre Rossi Committed by The Qt Project
Browse files

Pimp up our QtQuick browser


Change-Id: I48c0ed54cd946f223dc050b8a1f26282b02964a2
Reviewed-by: default avatarZeno Albisser <zeno.albisser@digia.com>
Showing with 26 additions and 10 deletions
...@@ -41,6 +41,7 @@ ...@@ -41,6 +41,7 @@
import QtQuick 2.0 import QtQuick 2.0
import QtWebEngine 1.0 import QtWebEngine 1.0
import QtQuick.Controls 1.0 import QtQuick.Controls 1.0
import QtQuick.Controls.Styles 1.0
import QtQuick.Layouts 1.0 import QtQuick.Layouts 1.0
ApplicationWindow { ApplicationWindow {
...@@ -62,9 +63,8 @@ ApplicationWindow { ...@@ -62,9 +63,8 @@ ApplicationWindow {
toolBar: ToolBar { toolBar: ToolBar {
id: navigationBar id: navigationBar
ColumnLayout {
anchors.fill: parent
RowLayout { RowLayout {
anchors.fill: parent;
ToolButton { ToolButton {
id: backButton id: backButton
iconSource: "icons/go-previous.png" iconSource: "icons/go-previous.png"
...@@ -82,27 +82,43 @@ ApplicationWindow { ...@@ -82,27 +82,43 @@ ApplicationWindow {
iconSource: webEngineView.loading ? "icons/process-stop.png" : "icons/view-refresh.png" iconSource: webEngineView.loading ? "icons/process-stop.png" : "icons/view-refresh.png"
onClicked: webEngineView.reload() onClicked: webEngineView.reload()
} }
Image {
id: faviconImage
width: 16; height: 16
}
TextField { TextField {
id: addressBar id: addressBar
Image {
anchors.verticalCenter: addressBar.verticalCenter;
x: 5
z: 2
id: faviconImage
width: 16; height: 16
}
style: TextFieldStyle {
padding {
left: 26;
}
}
focus: true focus: true
Layout.fillWidth: true Layout.fillWidth: true
onAccepted: webEngineView.url = utils.fromUserInput(text) onAccepted: webEngineView.url = utils.fromUserInput(text)
} }
} }
ProgressBar { ProgressBar {
Layout.fillWidth: true
id: progressBar id: progressBar
height: 3
anchors {
left: parent.left
top: parent.bottom
right: parent.right
leftMargin: -parent.leftMargin
rightMargin: -parent.rightMargin
}
style: ProgressBarStyle {
background: Item {}
}
z: -2;
minimumValue: 0 minimumValue: 0
maximumValue: 100 maximumValue: 100
} }
}
} }
WebEngineView { WebEngineView {
id: webEngineView id: webEngineView
focus: true focus: true
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment