aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-12-22 18:56:34 +0800
committerobscuren <geffobscura@gmail.com>2014-12-22 18:56:34 +0800
commita153b47c2be80bbfb38954c5eae310305d54120b (patch)
treeaeea783c2fdbe5f07f60ba0cce8484844e2e98d4
parented7e05fb2a5729d4a52f5c5af110693e45eb076c (diff)
downloadgo-tangerine-a153b47c2be80bbfb38954c5eae310305d54120b.tar.gz
go-tangerine-a153b47c2be80bbfb38954c5eae310305d54120b.tar.zst
go-tangerine-a153b47c2be80bbfb38954c5eae310305d54120b.zip
moved
-rw-r--r--cmd/mist/assets/qml/browser.qml (renamed from cmd/mist/assets/qml/webapp.qml)3
-rw-r--r--cmd/mist/assets/qml/main.qml2
2 files changed, 3 insertions, 2 deletions
diff --git a/cmd/mist/assets/qml/webapp.qml b/cmd/mist/assets/qml/browser.qml
index bd7399dc9..26fef0377 100644
--- a/cmd/mist/assets/qml/webapp.qml
+++ b/cmd/mist/assets/qml/browser.qml
@@ -59,7 +59,8 @@ Rectangle {
}
Component.onCompleted: {
- webview.url = "http://etherian.io"
+ //webview.url = "http://etherian.io"
+ webview.url = "file:///Users/jeffrey/test.html"
}
signal messages(var messages, int id);
diff --git a/cmd/mist/assets/qml/main.qml b/cmd/mist/assets/qml/main.qml
index 65cea439a..06a7bc2a8 100644
--- a/cmd/mist/assets/qml/main.qml
+++ b/cmd/mist/assets/qml/main.qml
@@ -45,7 +45,7 @@ ApplicationWindow {
// Takes care of loading all default plugins
Component.onCompleted: {
var wallet = addPlugin("./views/wallet.qml", {noAdd: true, close: false, section: "ethereum", active: true});
- var browser = addPlugin("./webapp.qml", {noAdd: true, close: false, section: "ethereum", active: true});
+ var browser = addPlugin("./browser.qml", {noAdd: true, close: false, section: "ethereum", active: true});
root.browser = browser;
addPlugin("./views/miner.qml", {noAdd: true, close: false, section: "ethereum", active: true});