From 666ef482392340ba111fa3347160468266ff3cb5 Mon Sep 17 00:00:00 2001
From: Alexandre Van de Sande <alex.vandesande@ethdev.com>
Date: Mon, 16 Feb 2015 20:55:14 +0100
Subject: SideIcons work. Copy paste still doesn't.

---
 cmd/mist/assets/ext/mist.js           | 35 +++++++++++++++++++++++++++++++++++
 cmd/mist/assets/qml/views/browser.qml | 23 +++++++++++------------
 cmd/mist/assets/qml/views/catalog.qml | 10 +++++++++-
 3 files changed, 55 insertions(+), 13 deletions(-)
 create mode 100644 cmd/mist/assets/ext/mist.js

(limited to 'cmd/mist')

diff --git a/cmd/mist/assets/ext/mist.js b/cmd/mist/assets/ext/mist.js
new file mode 100644
index 000000000..8734f8dc7
--- /dev/null
+++ b/cmd/mist/assets/ext/mist.js
@@ -0,0 +1,35 @@
+// Copyright (c) 2015, ETHDEV. All rights reserved.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+// MA 02110-1301  USA
+
+// this function is included locally, but you can also include separately via a header definition
+
+console.log("loaded?");
+
+document.onkeydown = function(evt) {
+    evt = evt || window.event;
+    if (evt.ctrlKey && evt.keyCode == 67) {
+    	window.document.execCommand("copy");
+        console.log("Ctrl-C");
+    } else if (evt.ctrlKey && evt.keyCode == 88) {
+    	window.document.execCommand("cut");
+        console.log("Ctrl-X");
+    } if (evt.ctrlKey && evt.keyCode == 86) {
+        console.log("Ctrl-V");
+    } if (evt.ctrlKey && evt.keyCode == 90) {
+        console.log("Ctrl-Z");
+    }
+};
\ No newline at end of file
diff --git a/cmd/mist/assets/qml/views/browser.qml b/cmd/mist/assets/qml/views/browser.qml
index 6ded02fcb..9bee12cc6 100644
--- a/cmd/mist/assets/qml/views/browser.qml
+++ b/cmd/mist/assets/qml/views/browser.qml
@@ -3,7 +3,7 @@ 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 QtWebEngine.experimental 1.0
 import QtQuick.Window 2.0;
 
 Rectangle {
@@ -340,8 +340,8 @@ Rectangle {
 		WebEngineView {
 			objectName: "webView"
 			id: webview
-			experimental.settings.javascriptCanAccessClipboard: true
-			experimental.settings.localContentCanAccessRemoteUrls: true
+			//experimental.settings.javascriptCanAccessClipboard: true
+			//experimental.settings.localContentCanAccessRemoteUrls: true
 			anchors {
 				left: parent.left
 				right: parent.right
@@ -367,7 +367,12 @@ Rectangle {
 						menuItem.title = pageTitle;	
 					});
 
-
+                    webView.runJavaScript("document.querySelector(\"link[rel='icon']\").getAttribute(\"href\")", function(sideIcon){
+                            if(sideIcon){
+                                menuItem.icon = "http://localhost:3000/whisper-icon@2x.png"
+                            }; 
+                    });
+                    
 					webView.runJavaScript("try{document.querySelector(\"meta[name='ethereum-dapp-url-bar-style']\").getAttribute(\"content\")}catch(e){}", function(topBarStyle){
 						if (!topBarStyle) {
 							showFullUrlBar(true);
@@ -397,15 +402,9 @@ Rectangle {
 						};	
 					});
 
-                    // webView.runJavaScript("document.querySelector(\"link[rel='icon']\").getAttribute(\"href\")", function(sideIcon){
-                    //         if(sideIcon){
-                    //             window.iconSource = "http://localhost:3000/whisper-icon@2x.png" //webview.url + sideIcon
-                    //             console.log(iconSource)
-                    //         }; 
-                    // });
-                    
+
 					webview.runJavaScript(eth.readFile("bignumber.min.js"));
-					webview.runJavaScript(eth.readFile("ethereum.js/dist/ethereum.js"));
+                    webview.runJavaScript(eth.readFile("ethereum.js/dist/ethereum.js"));
 
 					var cleanTitle = webview.url.toString()
 					var matches = cleanTitle.match(/^[a-z]*\:\/\/([^\/?#]+)(?:[\/?#]|$)/i);
diff --git a/cmd/mist/assets/qml/views/catalog.qml b/cmd/mist/assets/qml/views/catalog.qml
index 18a835ad2..497d69ed1 100644
--- a/cmd/mist/assets/qml/views/catalog.qml
+++ b/cmd/mist/assets/qml/views/catalog.qml
@@ -85,7 +85,7 @@ Rectangle {
 			property var domain: "ethereum-dapp-catalog.meteor.com"
 			url: protocol + domain
 
-			
+			//experimental.settings.javascriptCanAccessClipboard: true
 
 
 			onJavaScriptConsoleMessage: {
@@ -112,10 +112,18 @@ Rectangle {
                 	
                 }
             }
+			// onLoadingChanged: {
+			// 	if (loadRequest.status == WebEngineView.LoadSucceededStatus) {
+   //                  webview.runJavaScript(eth.readFile("mist.js"));
+			// 	}
+			// }
 		}
 
 
 
+
+
+
 		WebEngineView {
 			id: inspector
 			visible: false
-- 
cgit