Revert cad53fa..8fa3b69

This rolls back to commit cad53fa191.

cmd/mist/assets/qml/main.qml

@@ -12,9 +12,6 @@ import "../ext/http.js" as Http
 ApplicationWindow {
 	id: root
 
-    //flags: Qt.FramelessWindowHint
-    // Use this to make the window frameless. But then you'll need to do move and resize by hand
-
 	property var ethx : Eth.ethx
 
 	width: 1200
@@ -37,11 +34,9 @@ ApplicationWindow {
 
 	// Takes care of loading all default plugins
 	Component.onCompleted: {
-
-        addPlugin("./views/catalog.qml", {noAdd: true, close: false, section: "begin"});
 		var wallet = addPlugin("./views/wallet.qml", {noAdd: true, close: false, section: "ethereum", active: true});
-
 		addPlugin("./views/miner.qml", {noAdd: true, close: false, section: "ethereum", active: true});
+
 		addPlugin("./views/transaction.qml", {noAdd: true, close: false, section: "legacy"});
 		addPlugin("./views/whisper.qml", {noAdd: true, close: false, section: "legacy"});
 		addPlugin("./views/chain.qml", {noAdd: true, close: false, section: "legacy"});
@@ -50,7 +45,7 @@ ApplicationWindow {
 
 		mainSplit.setView(wallet.view, wallet.menuItem);
 
-        newBrowserTab("http://ethereum-dapp-whisper-client.meteor.com/chat/ethereum");
+		newBrowserTab("http://etherian.io");
 
 		// Command setup
 		gui.sendCommand(0)
@@ -329,11 +324,6 @@ ApplicationWindow {
 		id: mainSplit
 		anchors.fill: parent
 		resizing: false
-        handleDelegate: Item {
-            Rectangle {
-                anchors.fill: parent
-            }
-         }
 
 		function setView(view, menu) {
 			for(var i = 0; i < views.length; i++) {
@@ -370,22 +360,10 @@ ApplicationWindow {
 		 ********************/
 		 Rectangle {
 			 id: menu
-             Layout.minimumWidth: 192
+			 Layout.minimumWidth: 210
-             Layout.maximumWidth: 192
+			 Layout.maximumWidth: 210
-
 			 anchors.top: parent.top
-             Rectangle {
+			 color: "#ececec"
-                     width: parent.height
-                     height: parent.width
-                     anchors.centerIn: parent
-                     rotation: 90
-
-                     gradient: Gradient {
-                         GradientStop { position: 0.0; color: "#D5D4D5" }
-                         GradientStop { position: 0.1; color: "#E7E5E7" }
-                         GradientStop { position: 1.0; color: "#E7E5E7" }
-                     }
-             }
 
 			 Component {
 				 id: menuItemTemplate
@@ -402,14 +380,8 @@ ApplicationWindow {
 						 sel.visible = on
 					 }
 
-                     function setAsBigButton(on) {
+					 width: 206
-                        newAppButton.visible = on
+					 height: 28
-                        label.visible = !on
-                        buttonLabel.visible = on
-                     }
-
-                     width: 192
-                     height: 55
 					 color: "#00000000"
 
 					 anchors {
@@ -417,19 +389,6 @@ ApplicationWindow {
 						 leftMargin: 4
 					 }
 
-                     Rectangle {
-                         // New App Button
-                         id: newAppButton
-                         visible: false 
-                         anchors.fill: parent
-                         anchors.rightMargin: 8
-                         border.width: 0
-                         radius: 5
-                         height: 55
-                         width: 180
-                         color: "#F3F1F3"
-                     }
-
 					 Rectangle {
 						 id: sel
 						 visible: false
@@ -438,7 +397,8 @@ ApplicationWindow {
 						 Rectangle {
 							 id: r
 							 anchors.fill: parent
-                             border.width: 0
+							 border.color: "#CCCCCC"
+							 border.width: 1
 							 radius: 5
 							 color: "#FFFFFFFF"
 						 }
@@ -450,28 +410,25 @@ ApplicationWindow {
 							 }
 							 width: 10
 							 color: "#FFFFFFFF"
-                             border.width:0
 
 							 Rectangle {
-                                // Small line on top of selection. What's this for?
 								 anchors {
 									 left: parent.left
 									 right: parent.right
 									 top: parent.top
 								 }
 								 height: 1
-                                 color: "#FFFFFF"
+								 color: "#CCCCCC"
 							 }
 
 							 Rectangle {
-                                // Small line on bottom of selection. What's this for again?
 								 anchors {
 									 left: parent.left
 									 right: parent.right
 									 bottom: parent.bottom
 								 }
 								 height: 1
-                                 color: "#FFFFFF"
+								 color: "#CCCCCC"
 							 }
 						 }
 					 }
@@ -485,12 +442,12 @@ ApplicationWindow {
 
 					 Image {
 						 id: icon
-                         height: 24
+						 height: 20
-                         width: 24
+						 width: 20
 						 anchors {
 							 left: parent.left
 							 verticalCenter: parent.verticalCenter
-                             leftMargin: 6
+							 leftMargin: 3
 						 }
 						 MouseArea {
 							 anchors.fill: parent
@@ -505,21 +462,11 @@ ApplicationWindow {
 						 anchors {
 							 left: icon.right
 							 verticalCenter: parent.verticalCenter
-                             leftMargin: 6
+							 leftMargin: 3
 						 }
 
-                         color: "#665F5F"
+						 color: "#0D0A01"
-                         font.pixelSize: 14
+						 font.pixelSize: 12
-                     }
-                     
-                     Text {
-                        id: buttonLabel
-                        visible: false
-                        text: "GO TO NEW APP"
-                        font.bold: true
-                        anchors.horizontalCenter: parent.horizontalCenter
-                        anchors.verticalCenter: parent.verticalCenter
-                        color: "#AAA0A0"
 					 }
 
 					 Text {
@@ -529,7 +476,7 @@ ApplicationWindow {
 							 rightMargin: 8
 							 verticalCenter: parent.verticalCenter
 						 }
-                         color: "#6691C2"
+						 color: "#AEADBE"
 						 font.pixelSize: 12
 					 }
 
@@ -563,9 +510,6 @@ ApplicationWindow {
 
 				 var section;
 				 switch(options.section) {
-                     case "begin":
-                     section = menuBegin
-                     break;
 					 case "ethereum":
 					 section = menuDefault;
 					 break;
@@ -579,17 +523,13 @@ ApplicationWindow {
 
 				 var comp = menuItemTemplate.createObject(section)
 				 comp.view = view
-                 comp.title = options.section // view.title
+				 comp.title = view.title
 
 				 if(view.hasOwnProperty("iconSource")) {
 					 comp.icon = view.iconSource;
 				 }
 				 comp.closable = options.close;
 
-                 if (options.section === "begin") {
-                    comp.setAsBigButton(true)
-                 }
-
 				 return comp
 			 }
 
@@ -601,32 +541,15 @@ ApplicationWindow {
 				 anchors.right: parent.right
 				 spacing: 3
 
-
-
-                ColumnLayout {
-                     id: menuBegin
-                     spacing: 3
-                     anchors {
-                         left: parent.left
-                         right: parent.right
-                     }
-                 }
-
-                 Rectangle {
-                     height: 55
-                     color: "transparent"
 				 Text {
 					 text: "ETHEREUM"
 					 font.bold: true
 					 anchors {
 						 left: parent.left
-                             top: parent.verticalCenter
+						 leftMargin: 5
-                             leftMargin: 16
 					 }
-                         color: "#AAA0A0"
+					 color: "#888888"
 				 }
-                 }
-
 
 				 ColumnLayout {
 					 id: menuDefault
@@ -637,19 +560,15 @@ ApplicationWindow {
 					 }
 				 }
 
-                 Rectangle {
+
-                     height: 55
-                     color: "transparent"
 				 Text {
-                         text: "APPS"
+					 text: "NET"
 					 font.bold: true
 					 anchors {
 						 left: parent.left
-                             top: parent.verticalCenter
+						 leftMargin: 5
-                             leftMargin: 16
-                         }
-                         color: "#AAA0A0"
 					 }
+					 color: "#888888"
 				 }
 
 				 ColumnLayout {
@@ -661,21 +580,15 @@ ApplicationWindow {
 					 }
 				 }
 
-                 Rectangle {
-                     height: 55
-                     color: "transparent"
 				 Text {
 					 text: "DEBUG"
 					 font.bold: true
 					 anchors {
 						 left: parent.left
-                             top: parent.verticalCenter
+						 leftMargin: 5
-                             leftMargin: 16
 					 }
-                         color: "#AAA0A0"
+					 color: "#888888"
 				 }
-                 }
-
 
 				 ColumnLayout {
 					 id: menuLegacy

cmd/mist/assets/qml/views/browser.qml

@@ -56,7 +56,6 @@ Rectangle {
 
 			//uriNav.text = uri.text.replace(/(^https?\:\/\/(?:www\.)?)([a-zA-Z0-9_\-]*\.\w{2,3})(.*)/, "$1$2<span style='color:#CCC'>$3</span>");
 			uriNav.text = uri;
-
 		} else {
 			// Prevent inf loop.
 			window.cleanPath = false;
@@ -74,157 +73,43 @@ Rectangle {
 
 		RowLayout {
 			id: navBar
-			height: 74
+			height: 40
-			
-
 			anchors {
 				left: parent.left
 				right: parent.right
+				leftMargin: 7
 			}
 
 			Button {
 				id: back
-
 				onClicked: {
 					webview.goBack()
 				}
-
-				anchors{
-					left: parent.left
-					leftMargin: 6
-				}
-
 				style: ButtonStyle {
 					background: Image {
-						source: "../../backButton.png"
+						source: "../../back.png"
-						width: 20
+						width: 30
 						height: 30
 					}
 				}
 			}
 
-			Rectangle {
+			TextField {
-				id: appInfoPane
-			    height: 28
-			    color: "#FFFFFF"
-			    radius: 6
-
-			   MouseArea {
-			    	anchors.fill: parent
-			    	z: 10
-			    	hoverEnabled: true
-			    	onEntered: {
-			    		uriNav.visible = true
-			    		appTitle.visible = false
-			    		appDomain.visible = false
-			    	}	    	
-			    }
-
 				anchors {
 					left: back.right
-					right: parent.right
+					right: toggleInspector.left
 					leftMargin: 10
 					rightMargin: 10
 				}
-
-				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
-				    }
-
-				    horizontalAlignment: Text.AlignHCenter
-                    
-                    style: TextFieldStyle {
-                        textColor: "#928484"
-                        background: Rectangle {
-                            border.width: 0
-                            color: "transparent"
-                        }
-                    }
 				text: webview.url;
+				id: uriNav
 				y: parent.height / 2 - this.height / 2
-				    z: 20
+
-				    activeFocusOnPress: true
 				Keys.onReturnPressed: {
 					webview.url = this.text;
 				}
-
 			}
 
-   				
-
-
-
-                 			    /*text {
-			    	id: appTitle
-			    	anchors.left: parent.left
-			    	anchors.right: parent.horizontalCenter
-			    	text: "APP TITLE"
-			    	font.bold: true
-			    	color: "#928484"
-			    }*/
-			    z:2
-			}
-			
-			Rectangle {
-				id: appInfoPaneShadow
-			    width: 10
-			    height: 30
-			    color: "#BDB6B6"
-			    radius: 6
-
-			    anchors {
-					left: back.right
-					right: parent.right
-					leftMargin:10
-					rightMargin:10
-					top: parent.top 
-					topMargin: 23
-				}
-
-				z:1
-			}
-		/*
 			Button {
 				id: toggleInspector
 				anchors {
@@ -241,17 +126,7 @@ Rectangle {
 						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
@@ -284,17 +159,6 @@ Rectangle {
 					});
 					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: {
@@ -344,3 +208,4 @@ Rectangle {
 		]
 	}
 }
+

cmd/mist/assets/qml/views/catalog.qml

@@ -1,346 +0,0 @@
-import QtQuick 2.0
-import QtQuick.Controls 1.0;
-import QtQuick.Controls.Styles 1.0
-import QtQuick.Layouts 1.0;
-import QtWebEngine 1.0
-//import QtWebEngine.experimental 1.0
-import QtQuick.Window 2.0;
-
-Rectangle {
-	id: window
-	anchors.fill: parent
-	color: "#00000000"
-
-	property var title: ""
-	property var iconSource: ""
-	property var menuItem
-	property var hideUrl: true
-
-	property alias url: webview.url
-	property alias windowTitle: webview.title
-	property alias webView: webview
-
-	property var cleanPath: false
-	property var open: function(url) {
-		if(!window.cleanPath) {
-			var uri = url;
-			if(!/.*\:\/\/.*/.test(uri)) {
-				uri = "http://" + uri;
-			}
-
-			var reg = /(^https?\:\/\/(?:www\.)?)([a-zA-Z0-9_\-]*\.eth)(.*)/
-
-			if(reg.test(uri)) {
-				uri.replace(reg, function(match, pre, domain, path) {
-					uri = pre;
-
-					var lookup = eth.lookupDomain(domain.substring(0, domain.length - 4));
-					var ip = [];
-					for(var i = 0, l = lookup.length; i < l; i++) {
-						ip.push(lookup.charCodeAt(i))
-					}
-
-					if(ip.length != 0) {
-						uri += lookup;
-					} else {
-						uri += domain;
-					}
-
-					uri += path;
-				});
-			}
-
-			window.cleanPath = true;
-
-			webview.url = uri;
-
-			//uriNav.text = uri.text.replace(/(^https?\:\/\/(?:www\.)?)([a-zA-Z0-9_\-]*\.\w{2,3})(.*)/, "$1$2<span style='color:#CCC'>$3</span>");
-			uriNav.text = uri;
-
-		} else {
-			// Prevent inf loop.
-			window.cleanPath = false;
-		}
-	}
-
-	Component.onCompleted: {
-	}
-
-	Item {
-		objectName: "root"
-		id: root
-		anchors.fill: parent
-		state: "inspectorShown"
-
-		RowLayout {
-			id: navBar
-			height: 74
-			
-
-			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
-			    color: "#FFFFFF"
-			    radius: 6
-
-			   MouseArea {
-			    	anchors.fill: parent
-			    	z: 10
-			    	hoverEnabled: true
-			    	onEntered: {
-			    		uriNav.visible = true
-			    		appTitle.visible = false
-			    		appDomain.visible = false
-			    	}	    	
-			    }
-
-			    anchors {
-					left: back.right
-					right: parent.right
-					leftMargin: 10
-					rightMargin: 10
-				}
-
-				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
-				    }
-
-				    horizontalAlignment: Text.AlignHCenter
-                    
-                    style: TextFieldStyle {
-                        textColor: "#928484"
-                        background: Rectangle {
-                            border.width: 0
-                            color: "transparent"
-                        }
-                    }
-    				text: webview.url;
-				    y: parent.height / 2 - this.height / 2
-				    z: 20
-				    activeFocusOnPress: true
-				    Keys.onReturnPressed: {
-				    	webview.url = this.text;
-				    }
-
-			    }
-   				
-   				
-
-
-
-                 			    /*text {
-			    	id: appTitle
-			    	anchors.left: parent.left
-			    	anchors.right: parent.horizontalCenter
-			    	text: "APP TITLE"
-			    	font.bold: true
-			    	color: "#928484"
-			    }*/
-			    z:2
-			}
-			
-			Rectangle {
-				id: appInfoPaneShadow
-			    width: 10
-			    height: 30
-			    color: "#BDB6B6"
-			    radius: 6
-
-			    anchors {
-					left: back.right
-					right: parent.right
-					leftMargin:10
-					rightMargin:10
-					top: parent.top 
-					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"
-			id: webview
-			anchors {
-				left: parent.left
-				right: parent.right
-				bottom: parent.bottom
-				top: divider.bottom
-			}
-
-			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: {
-				console.log(sourceID + ":" + lineNumber + ":" + JSON.stringify(message));
-			}
-		}
-
-		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
-			visible: false
-			anchors {
-				left: root.left
-				right: root.right
-				top: sizeGrip.bottom
-				bottom: root.bottom
-			}
-
-		}
-
-		states: [
-			State {
-				name: "inspectorShown"
-				PropertyChanges {
-					target: inspector
-				}
-			}
-		]
-	}
-}