Minor browser improvements
This commit is contained in:
parent
bcb1166e52
commit
f34838688e
@ -9,6 +9,10 @@ import Ethereum 1.0
|
|||||||
|
|
||||||
Rectangle {
|
Rectangle {
|
||||||
id: window
|
id: window
|
||||||
|
objectName: "browserView"
|
||||||
|
anchors.fill: parent
|
||||||
|
color: "#00000000"
|
||||||
|
|
||||||
property var title: "Browser"
|
property var title: "Browser"
|
||||||
property var iconSource: "../browser.png"
|
property var iconSource: "../browser.png"
|
||||||
property var menuItem
|
property var menuItem
|
||||||
@ -106,10 +110,9 @@ Rectangle {
|
|||||||
anchors {
|
anchors {
|
||||||
left: back.right
|
left: back.right
|
||||||
right: toggleInspector.left
|
right: toggleInspector.left
|
||||||
leftMargin: 5
|
leftMargin: 10
|
||||||
rightMargin: 5
|
rightMargin: 10
|
||||||
}
|
}
|
||||||
//text: "http://etherian.io"
|
|
||||||
text: webview.url;
|
text: webview.url;
|
||||||
id: uriNav
|
id: uriNav
|
||||||
y: parent.height / 2 - this.height / 2
|
y: parent.height / 2 - this.height / 2
|
||||||
@ -136,6 +139,18 @@ Rectangle {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Border
|
||||||
|
Rectangle {
|
||||||
|
id: divider
|
||||||
|
anchors {
|
||||||
|
left: parent.left
|
||||||
|
right: parent.right
|
||||||
|
top: navBar.bottom
|
||||||
|
}
|
||||||
|
z: -1
|
||||||
|
height: 1
|
||||||
|
color: "#CCCCCC"
|
||||||
|
}
|
||||||
|
|
||||||
WebView {
|
WebView {
|
||||||
objectName: "webView"
|
objectName: "webView"
|
||||||
@ -144,7 +159,7 @@ Rectangle {
|
|||||||
left: parent.left
|
left: parent.left
|
||||||
right: parent.right
|
right: parent.right
|
||||||
bottom: parent.bottom
|
bottom: parent.bottom
|
||||||
top: navBar.bottom
|
top: divider.bottom
|
||||||
}
|
}
|
||||||
|
|
||||||
//property var cleanPath: false
|
//property var cleanPath: false
|
||||||
|
@ -446,6 +446,14 @@ ApplicationWindow {
|
|||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
onClicked: {
|
onClicked: {
|
||||||
mainSplit.setView(view, menuItem)
|
mainSplit.setView(view, menuItem)
|
||||||
|
console.log(view);
|
||||||
|
if (view.objectName === "browserView") {
|
||||||
|
urlPane.visible = false;
|
||||||
|
mainView.anchors.top = rootView.top
|
||||||
|
} else {
|
||||||
|
urlPane.visible = true;
|
||||||
|
mainView.anchors.top = divider.bottom
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -606,6 +614,7 @@ ApplicationWindow {
|
|||||||
* Main view
|
* Main view
|
||||||
********************/
|
********************/
|
||||||
Rectangle {
|
Rectangle {
|
||||||
|
id: rootView
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
anchors.left: menu.right
|
anchors.left: menu.right
|
||||||
anchors.bottom: parent.bottom
|
anchors.bottom: parent.bottom
|
||||||
|
@ -40,7 +40,7 @@ type DebuggerWindow struct {
|
|||||||
engine *qml.Engine
|
engine *qml.Engine
|
||||||
lib *UiLib
|
lib *UiLib
|
||||||
|
|
||||||
vm *vm.DebugVm
|
vm *vm.Vm
|
||||||
Db *Debugger
|
Db *Debugger
|
||||||
|
|
||||||
state *state.StateDB
|
state *state.StateDB
|
||||||
@ -57,7 +57,7 @@ func NewDebuggerWindow(lib *UiLib) *DebuggerWindow {
|
|||||||
|
|
||||||
win := component.CreateWindow(nil)
|
win := component.CreateWindow(nil)
|
||||||
|
|
||||||
w := &DebuggerWindow{engine: engine, win: win, lib: lib, vm: &vm.DebugVm{}}
|
w := &DebuggerWindow{engine: engine, win: win, lib: lib, vm: &vm.Vm{}}
|
||||||
w.Db = NewDebugger(w)
|
w.Db = NewDebugger(w)
|
||||||
|
|
||||||
return w
|
return w
|
||||||
|
Loading…
Reference in New Issue
Block a user