From 95059226a90e7adc56ed66c7d5da53c9294e568b Mon Sep 17 00:00:00 2001
From: Alexandre Van de Sande <alex.vandesande@ethdev.com>
Date: Fri, 6 Feb 2015 12:08:13 -0200
Subject: [PATCH] transparent top bar and separated catalog

---
 cmd/mist/assets/backButton.png        | Bin 0 -> 663 bytes
 cmd/mist/assets/backButton@2x.png     | Bin 0 -> 1499 bytes
 cmd/mist/assets/qml/views/browser.qml |   6 +-
 cmd/mist/assets/qml/views/catalog.qml | 159 ++------------------------
 4 files changed, 14 insertions(+), 151 deletions(-)
 create mode 100644 cmd/mist/assets/backButton.png
 create mode 100644 cmd/mist/assets/backButton@2x.png

diff --git a/cmd/mist/assets/backButton.png b/cmd/mist/assets/backButton.png
new file mode 100644
index 0000000000000000000000000000000000000000..eef997434b96c0da97018a7d36742629a017a829
GIT binary patch
literal 663
zcmV;I0%-k-P)<h;3K|Lk000e1NJLTq000yK0015c1^@s6ED}Cz00001b5ch_0Itp)
z=>Px%QAtEWR7eeDU>F62LSXs)`L;kcjJVV>;gY~6zH-5WFcv1JgR2%S$iOBK5+mBc
zRdeUs02MD{VrD+|;?t*jxD3SUbYu-HX3bJ#Vq-hb%);`)Js@BeH#hfMMn=Xn$ZBA0
z78nB;y=vY(QAQ@F?Lhq3!PRv=(6F08wdZlE$Lr-)eSMsa%*>mCu8}acvRWY|CUzfa
z&<Y^`FUbZrG&C?V2nj9w|Np<KhMwM1Ic4QXKtq-S4f}!1FpxM-FKa6(^fNFr2FNKW
zEYmhHcmPzp3~1N~kS2TptCxYvqY!9Vo{)&h7Bf4$TR;Oqk?;(kK`=QC16RzS9|Vm0
z9xiU~!%kjaXMqa00}TU31W^FP%gl_7SwPn@0mJPs(1c?^!%h)p5>ydJI(+irf#ung
zCpZ83{hQ_Q_wR;bsi~ltB^qFOSz2CR)zZ#x**_p)WM$p9blNmQqD=!T#4r#jwnkJ!
z;<k~w`7)r_6<N8t*RN`5U?bL03<H5-_6?|csgj!7BUMe!Wxz18V^mO>OSXX^jX*=+
z0jU-Grl$AArKQ&a1!90DOd~OdVz>~d325jeAbW$Yv-4#>e*Qf`e%;D>^WtIhxM-XP
zf;0dPxdNp2x%m1XV`pbS11unBuUxp$5tm^gal8hC6aWo9%*4cW*45W{H?a76$n^jJ
zx)rl$Yl7sk0fGiXHErSG;=1nO?!J+Uh2_P6W@bKYhJnN|5;iV{z*2`DD3=7pAj9SY
xUH%4}T4G%Y^7>Dp0n32+6A*(89|c1t1OPU#j@Q^5D<S{@002ovPDHLkV1hG$AxZ!M

literal 0
HcmV?d00001

diff --git a/cmd/mist/assets/backButton@2x.png b/cmd/mist/assets/backButton@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..b72fd73f43920d77d173d75e2dd1c827e557f542
GIT binary patch
literal 1499
zcmV<11tj{3P)<h;3K|Lk000e1NJLTq001Ze002A)1^@s66uJ1|00001b5ch_0Itp)
z=>Px)l}SWFRA>e5m|IL7RT#%-W{15>*;2}_kS>B;4AroLTuLo0$fc`dVyH>e#0T0$
z6Mc{u(>LCHzy}{BbtCNpN`-ZyT-v47s`1iDtr4QAZHyKb>!pQSTSP8p{D0#d!b8K(
z?9TYKUvl`)*>m}ReCM3+oHHC3lb8o$9*B9sP!I5ij*h|mySoo^lC<~RnVIL>+S*pN
z+A|dJZNI<DBnaa$VwN~={MPDfb4yFhEiI6umd0Az296)UpXd3L=wp`qNm9CHVL`J)
zG<Q$~8Swj4c|n*!+nv;2lBBE4D=Vc34<DXY(|=<d-2r>r+a1>J+dqQ$+_E8_UnnXm
zIg*{9-+|xOHX2ux7t}OT+a}Q5Yyw>WIvmHXK3H5F1l%@^aR8qDZ@SeEh<3WJLEh_q
zjpKPQv!9)pH+)|~!HiOlht@n}x&b1byaa$}6&NlpBjapQY3a05{tLPno?T+~YPBwa
z*s)K;H7_%x&aGP~c6&UZDrJHqID*tHQ3E2@?Sb)bSeB>HX19OiX>5E~A-Mw`K>hEU
z$&?OJ0S1m8%fp%*LbA|!aiaK>$Lk#tM3L>*(}4RvQaI`tF<{Tpqsg2oj=^n-G>{+&
zb9?IQ25mMQTW22v?hC4mMj`_A`FwV(#WD)GEHV!LcS&VsFfl3VrULUN;68{3jP=zF
zhy!0pv|3MKfQOYq?i9M+1DP(@Z%X+J^sthTT4@f{1zB0I!fF$<d~a^<a9&~I4@&tD
zXbRM{Idl<C9>f{jis^iTSx!w)Kj$th`${R(Err6#KdfF4ts1butLrHkY-dK}oz9Du
zwYBG!@-p-Zz_B&RnnkTu0V14~!_r#-ke7tjX1i3=&@ir8r;zdv>VA!y<}L$-1q^g{
z<{+GmU}~+@UlhgJntl6*MYEZ$vk>6EyUW<R{1kqZh+-Gul9)AjdHI;l;b80R6Tp4W
z>Wt9g0eQX^*Y!nae0p-Sesy`-gz_}t&avN((r`|AIXgOf=;r*q4=v??XiGxEg}SDu
z-2i0M9Da}pTaYI<6<jhCvvYGR78e$zKj-IjsPWR$QpWVuR9tXq=)Fxl>rfefiaG8{
z*l|2mQ8AI6mi8I5De(M}Kv!1_D;uTN08%)iILB4i)SPj|$4@aBO!4ao-jA}f5jrd&
zAbx@2K_m$`7OA?iF=RHI+0iEA8WZg6>?||_j>ZfNNR0q_2}%ykR;zVoZ$raLlgUKq
zF5P6d;QkkS)8|X0vfiQ!kc<M7-nkbjpWt-fF0ZNz;<wvWhR(EDET`znNo74nHK1bj
z4D@Bnr|#Hs?SbOr0no|cTL9^{B`5dM(^F}yi_!!L2*hkIh;)^#(~}Y*Xye`QG0y9y
z>zHn$36QJ;as`Smtn$r;o|f?D`iX-2=W+9Sk=p7ZngPiuAZYFNBFSem!q0iE%ZpS;
zf{pV^zu!;sGir$lkgNidc5whnKJKb<{j%EawA-mpKp^k!^ZQGv9F0T_NJard@$eMo
z>H1Y&Uq51si=((nm3Bam;@#|$%Mt#G3Xp69auVue%Hxz-e8l4!fdAz6iMkYgzzq5Q
zekavOB2fd9QGn2;L4KQTOG&v=TvkRqT|OSM9t#{iKZvJl9JSRdx&SIhhoFC?{LY-5
z+5BC*<l~Xb_y?--RDFZ;T17WNK+tCCLz*Lq!lI(f87|it<rT>fbadRq3TicGKwqKz
zBSt)gWT%ne4~1%P%*|a}yMFz^{?^v@n>p2~5#0gFC?GSTo<S1V*4B8Gui$dg125AH
zP?P93#T%^x<Y$!W3%`6t1Dp%_Cy+FYA%H{y$giPjcQZ+XCpCYgW}OYwfO;HhKT_B?
zxM2{R4Gb^=$&j_ancY}j%mXnG#5@r5!2jfde*xJLW6vh_UjG09002ovPDHLkV1iD2
B-L?P#

literal 0
HcmV?d00001

diff --git a/cmd/mist/assets/qml/views/browser.qml b/cmd/mist/assets/qml/views/browser.qml
index 08985c558f..516fbd2123 100644
--- a/cmd/mist/assets/qml/views/browser.qml
+++ b/cmd/mist/assets/qml/views/browser.qml
@@ -282,11 +282,11 @@ Rectangle {
 			onLoadingChanged: {
 				if (loadRequest.status == WebEngineView.LoadSucceededStatus) {
 					webview.runJavaScript("document.title", function(pageTitle) {
-						//menuItem.title = pageTitle;	
+						menuItem.title = pageTitle;	
 					});
 
 					//var topBarStyle
-					webView.runJavaScript("$(\"meta[name='ethereum-dapp-url-bar-style']\").attr('content');", function(topBarStyle){
+					webView.runJavaScript("document.querySelector(\"meta[name='ethereum-dapp-url-bar-style']\").getAttribute(\"content\")", function(topBarStyle){
 						if (topBarStyle=="transparent") {
 
 							// Adjust for a transparent sidebar Dapp
@@ -295,7 +295,7 @@ Rectangle {
 							appInfoPane.anchors.leftMargin = -16;
 							appInfoPaneShadow.anchors.leftMargin = -16;
 							webview.anchors.topMargin = -74;
-							webview.runJavaScript("$('body').addClass('ethereum-dapp-url-bar-style-transparent')")
+							webview.runJavaScript("document.querySelector('body').classList.add('ethereum-dapp-url-bar-style-transparent')")
 
 						};	
 					});
diff --git a/cmd/mist/assets/qml/views/catalog.qml b/cmd/mist/assets/qml/views/catalog.qml
index 8f682e9f38..4b384c3527 100644
--- a/cmd/mist/assets/qml/views/catalog.qml
+++ b/cmd/mist/assets/qml/views/catalog.qml
@@ -74,35 +74,13 @@ Rectangle {
 
 		RowLayout {
 			id: navBar
-			height: 74
-			
+			height: 184
 
 			anchors {
 				left: parent.left
 				right: parent.right
 			}
 
-			Button {
-				id: back
-
-				onClicked: {
-					webview.goBack()
-				}
-
-				anchors{
-					left: parent.left
-					leftMargin: 6
-				}
-
-				style: ButtonStyle {
-					background: Image {
-						source: "../../backButton.png"
-						width: 20
-						height: 30
-					}
-				}
-			}
-
 			Rectangle {
 				id: appInfoPane
 			    height: 28
@@ -121,55 +99,22 @@ Rectangle {
 			    }
 
 			    anchors {
-					left: back.right
+					left: parent.left
 					right: parent.right
 					leftMargin: 10
 					rightMargin: 10
+					top: parent.verticalCenter 
+					topMargin: 23
 				}
 
-				Text {
-   					 id: appTitle
-                     text: "LOADING"
-                     font.bold: true
-                     font.capitalization: Font.AllUppercase 
-                     horizontalAlignment: Text.AlignRight
-                     verticalAlignment: Text.AlignVCenter
-                     
-                     anchors {
-                         left: parent.left
-                         right: parent.horizontalCenter
-                         top: parent.top
-                         bottom: parent.bottom
-                         rightMargin: 10
-                     }
-                     color: "#928484"
-                 }
-
-                 Text {
-                 	 id: appDomain
-                     text: "loading domain"
-                     font.bold: false
-                     horizontalAlignment: Text.AlignLeft
-                     verticalAlignment: Text.AlignVCenter
-                     
-                     anchors {
-                         left: parent.horizontalCenter
-                         right: parent.right
-                         top: parent.top
-                         bottom: parent.bottom
-                         leftMargin: 10
-                     }
-                     color: "#C0AFAF"
-                 }
-
-
 				TextField {
 				    id: uriNav
-				    visible: false
 				    anchors {
 				    	left: parent.left
 				    	right: parent.right
 				    	leftMargin: 16
+						top: parent.verticalCenter 
+						topMargin: -10
 				    }
 
 				    horizontalAlignment: Text.AlignHCenter
@@ -181,28 +126,17 @@ Rectangle {
                             color: "transparent"
                         }
                     }
-    				text: webview.url;
+    				text: "Type the address of a new Dapp";
 				    y: parent.height / 2 - this.height / 2
 				    z: 20
 				    activeFocusOnPress: true
 				    Keys.onReturnPressed: {
-				    	webview.url = this.text;
+        				newBrowserTab(this.text);
+        				this.text = "Type the address of a new Dapp";
 				    }
 
 			    }
    				
-   				
-
-
-
-                 			    /*text {
-			    	id: appTitle
-			    	anchors.left: parent.left
-			    	anchors.right: parent.horizontalCenter
-			    	text: "APP TITLE"
-			    	font.bold: true
-			    	color: "#928484"
-			    }*/
 			    z:2
 			}
 			
@@ -214,58 +148,19 @@ Rectangle {
 			    radius: 6
 
 			    anchors {
-					left: back.right
+					left: parent.left
 					right: parent.right
 					leftMargin:10
 					rightMargin:10
-					top: parent.top 
+					top: parent.verticalCenter 
 					topMargin: 23
 				}
 
 				z:1
 			}
-		/*
-			Button {
-				id: toggleInspector
-				anchors {
-					right: parent.right
-				}
-				iconSource: "../../bug.png"
-				onClicked: {
-					// XXX soon
-					return
-					if(inspector.visible == true){
-						inspector.visible = false
-					}else{
-						inspector.visible = true
-						inspector.url = webview.experimental.remoteInspectorUrl
-					}
-				}
-			}*/
-
-			Rectangle {
-                anchors.fill: parent
-                gradient: Gradient {
-                    GradientStop { position: 0.0; color: "#F6F1F2" }
-                    GradientStop { position: 1.0; color: "#DED5D5" }
-                }
-                z:-1
-            }
 
 		}
 
-		// Border
-		Rectangle {
-			id: divider
-			anchors {
-				left: parent.left
-				right: parent.right
-				top: navBar.bottom
-			}
-			z: -1
-			height: 1
-			color: "#CCCCCC"
-		}
 
 		WebEngineView {
 			objectName: "webView"
@@ -279,22 +174,8 @@ Rectangle {
 
 			onLoadingChanged: {
 				if (loadRequest.status == WebEngineView.LoadSucceededStatus) {
-					webview.runJavaScript("document.title", function(pageTitle) {
-						menuItem.title = pageTitle;	
-					});
 					webview.runJavaScript(eth.readFile("bignumber.min.js"));
 					webview.runJavaScript(eth.readFile("ethereum.js/dist/ethereum.js"));
-
-					var cleanTitle = webview.url.toString()
-					var matches = cleanTitle.match(/^[a-z]*\:\/\/([^\/?#]+)(?:[\/?#]|$)/i);
-					var domain = matches && matches[1];
-
-					uriNav.visible = false
-			    	appDomain.visible = true
-			    	appDomain.text = domain //webview.url.replace("a", "z")
-
-			    	appTitle.visible = true
-			    	appTitle.text = webview.title
 				}
 			}
 			onJavaScriptConsoleMessage: {
@@ -302,25 +183,7 @@ Rectangle {
 			}
 		}
 
-		Rectangle {
-			id: sizeGrip
-			color: "gray"
-			visible: false
-			height: 10
-			anchors {
-				left: root.left
-				right: root.right
-			}
-			y: Math.round(root.height * 2 / 3)
 
-			MouseArea {
-				anchors.fill: parent
-				drag.target: sizeGrip
-				drag.minimumY: 0
-				drag.maximumY: root.height
-				drag.axis: Drag.YAxis
-			}
-		}
 
 		WebEngineView {
 			id: inspector