diff options
Diffstat (limited to 'demos/declarative/webbrowser/content')
-rw-r--r-- | demos/declarative/webbrowser/content/Header.qml | 30 | ||||
-rw-r--r-- | demos/declarative/webbrowser/content/pics/edit-delete.png | bin | 1333 -> 831 bytes | |||
-rw-r--r-- | demos/declarative/webbrowser/content/pics/go-jump-locationbar.png | bin | 714 -> 408 bytes | |||
-rw-r--r-- | demos/declarative/webbrowser/content/pics/go-next-view.png | bin | 1187 -> 1310 bytes | |||
-rw-r--r-- | demos/declarative/webbrowser/content/pics/go-previous-view.png | bin | 1226 -> 1080 bytes |
5 files changed, 26 insertions, 4 deletions
diff --git a/demos/declarative/webbrowser/content/Header.qml b/demos/declarative/webbrowser/content/Header.qml index 5abf440..d3ccae3 100644 --- a/demos/declarative/webbrowser/content/Header.qml +++ b/demos/declarative/webbrowser/content/Header.qml @@ -51,7 +51,6 @@ Image { x: webView.contentX < 0 ? -webView.contentX : webView.contentX > webView.contentWidth-webView.width ? -webView.contentX+webView.contentWidth-webView.width : 0 - y: { if (webView.progress < 1.0) return 0; @@ -59,7 +58,6 @@ Image { webView.contentY < 0 ? -webView.contentY : webView.contentY > height ? -height : -webView.contentY } } - Column { width: parent.width @@ -101,14 +99,38 @@ Image { Button { id: reloadButton - anchors { right: parent.right; rightMargin: 4 } + anchors { right: quitButton.left; rightMargin: 10 } action: webView.reload; image: "pics/view-refresh.png" visible: webView.progress == 1.0 && !header.urlChanged } + Text { + id: quitButton + color: "white" + style: Text.Sunken + anchors.right: parent.right + anchors.top: parent.top + anchors.bottom: parent.bottom + verticalAlignment: Text.AlignVCenter + horizontalAlignment: Text.AlignHCenter + font.pixelSize: 18 + width: 60 + text: "Quit" + MouseArea { + anchors.fill: parent + onClicked: Qt.quit() + } + Rectangle { + width: 1 + y: 5 + height: parent.height-10 + anchors.right: parent.left + color: "darkgray" + } + } Button { id: stopButton - anchors { right: parent.right; rightMargin: 4 } + anchors { right: quitButton.left; rightMargin: 10 } action: webView.stop; image: "pics/edit-delete.png" visible: webView.progress < 1.0 && !header.urlChanged } diff --git a/demos/declarative/webbrowser/content/pics/edit-delete.png b/demos/declarative/webbrowser/content/pics/edit-delete.png Binary files differindex 351659b..df2a147 100644 --- a/demos/declarative/webbrowser/content/pics/edit-delete.png +++ b/demos/declarative/webbrowser/content/pics/edit-delete.png diff --git a/demos/declarative/webbrowser/content/pics/go-jump-locationbar.png b/demos/declarative/webbrowser/content/pics/go-jump-locationbar.png Binary files differindex 636fe38..61f779c 100644 --- a/demos/declarative/webbrowser/content/pics/go-jump-locationbar.png +++ b/demos/declarative/webbrowser/content/pics/go-jump-locationbar.png diff --git a/demos/declarative/webbrowser/content/pics/go-next-view.png b/demos/declarative/webbrowser/content/pics/go-next-view.png Binary files differindex 3bce02d..a585cab 100644 --- a/demos/declarative/webbrowser/content/pics/go-next-view.png +++ b/demos/declarative/webbrowser/content/pics/go-next-view.png diff --git a/demos/declarative/webbrowser/content/pics/go-previous-view.png b/demos/declarative/webbrowser/content/pics/go-previous-view.png Binary files differindex 3ec011e..612fb34 100644 --- a/demos/declarative/webbrowser/content/pics/go-previous-view.png +++ b/demos/declarative/webbrowser/content/pics/go-previous-view.png |