From f34838688ebd1c775a3b700824e0c6c2e98e5018 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Mon, 19 Jan 2015 11:23:17 +0100
Subject: Minor browser improvements

---
 cmd/mist/assets/qml/browser.qml | 23 +++++++++++++++++++----
 cmd/mist/assets/qml/main.qml    |  9 +++++++++
 cmd/mist/debugger.go            |  4 ++--
 3 files changed, 30 insertions(+), 6 deletions(-)

(limited to 'cmd')

diff --git a/cmd/mist/assets/qml/browser.qml b/cmd/mist/assets/qml/browser.qml
index 7f0417d46..9cf1fe8be 100644
--- a/cmd/mist/assets/qml/browser.qml
+++ b/cmd/mist/assets/qml/browser.qml
@@ -9,6 +9,10 @@ import Ethereum 1.0
 
 Rectangle {
 	id: window
+    objectName: "browserView"
+    anchors.fill: parent
+    color: "#00000000"
+
 	property var title: "Browser"
 	property var iconSource: "../browser.png"
 	property var menuItem
@@ -106,10 +110,9 @@ Rectangle {
 				anchors {
 					left: back.right
 					right: toggleInspector.left
-					leftMargin: 5
-					rightMargin: 5
+					leftMargin: 10
+					rightMargin: 10
 				}
-				//text: "http://etherian.io"
 				text: webview.url;
 				id: uriNav
 				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 {
 			objectName: "webView"
@@ -144,7 +159,7 @@ Rectangle {
 				left: parent.left
 				right: parent.right
 				bottom: parent.bottom
-				top: navBar.bottom
+				top: divider.bottom
 			}
 
 			//property var cleanPath: false
diff --git a/cmd/mist/assets/qml/main.qml b/cmd/mist/assets/qml/main.qml
index e287e384f..3fee479a0 100644
--- a/cmd/mist/assets/qml/main.qml
+++ b/cmd/mist/assets/qml/main.qml
@@ -446,6 +446,14 @@ ApplicationWindow {
 						 anchors.fill: parent
 						 onClicked: {
 							 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
 		  ********************/
 		  Rectangle {
+              id: rootView
 			  anchors.right: parent.right
 			  anchors.left: menu.right
 			  anchors.bottom: parent.bottom
diff --git a/cmd/mist/debugger.go b/cmd/mist/debugger.go
index b960e52cf..9df140ab1 100644
--- a/cmd/mist/debugger.go
+++ b/cmd/mist/debugger.go
@@ -40,7 +40,7 @@ type DebuggerWindow struct {
 	engine *qml.Engine
 	lib    *UiLib
 
-	vm *vm.DebugVm
+	vm *vm.Vm
 	Db *Debugger
 
 	state *state.StateDB
@@ -57,7 +57,7 @@ func NewDebuggerWindow(lib *UiLib) *DebuggerWindow {
 
 	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)
 
 	return w
-- 
cgit v1.2.3