diff options
| author | obscuren <geffobscura@gmail.com> | 2015-02-14 00:00:15 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-02-14 00:00:15 +0800 |
| commit | 8305d409d2ca83583d9fa7e837ec0a46ce6ba78e (patch) | |
| tree | 956c768957f56044113772a88a9cbe7de0ef9cf1 /cmd/mist/assets/qml | |
| parent | b64ad7a2a6544564b68f362f18c70476310396d6 (diff) | |
| parent | 5c251b69282b3992512d0c17ed0063f294a0e663 (diff) | |
| download | go-tangerine-8305d409d2ca83583d9fa7e837ec0a46ce6ba78e.tar go-tangerine-8305d409d2ca83583d9fa7e837ec0a46ce6ba78e.tar.gz go-tangerine-8305d409d2ca83583d9fa7e837ec0a46ce6ba78e.tar.bz2 go-tangerine-8305d409d2ca83583d9fa7e837ec0a46ce6ba78e.tar.lz go-tangerine-8305d409d2ca83583d9fa7e837ec0a46ce6ba78e.tar.xz go-tangerine-8305d409d2ca83583d9fa7e837ec0a46ce6ba78e.tar.zst go-tangerine-8305d409d2ca83583d9fa7e837ec0a46ce6ba78e.zip | |
Merge branch 'develop' into miner
Diffstat (limited to 'cmd/mist/assets/qml')
| -rw-r--r-- | cmd/mist/assets/qml/main.qml | 5 | ||||
| -rw-r--r-- | cmd/mist/assets/qml/views/info.qml | 12 |
2 files changed, 3 insertions, 14 deletions
diff --git a/cmd/mist/assets/qml/main.qml b/cmd/mist/assets/qml/main.qml index d03ef43d9..2b56b7236 100644 --- a/cmd/mist/assets/qml/main.qml +++ b/cmd/mist/assets/qml/main.qml @@ -17,6 +17,7 @@ ApplicationWindow { // Use this to make the window frameless. But then you'll need to do move and resize by hand property var ethx : Eth.ethx + property var catalog; width: 1200 height: 820 @@ -39,7 +40,7 @@ ApplicationWindow { // Takes care of loading all default plugins Component.onCompleted: { - var catalog = addPlugin("./views/catalog.qml", {noAdd: true, close: false, section: "begin"}); + catalog = 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}); @@ -169,7 +170,7 @@ ApplicationWindow { text: "New tab" shortcut: "Ctrl+t" onTriggered: { - newBrowserTab("http://etherian.io"); + activeView(catalog.view, catalog.menuItem); } } diff --git a/cmd/mist/assets/qml/views/info.qml b/cmd/mist/assets/qml/views/info.qml index 14ee0bce1..b2d2f521c 100644 --- a/cmd/mist/assets/qml/views/info.qml +++ b/cmd/mist/assets/qml/views/info.qml @@ -32,18 +32,6 @@ Rectangle { width: 500 } - Label { - text: "Client ID" - } - TextField { - text: gui.getCustomIdentifier() - width: 500 - placeholderText: "Anonymous" - onTextChanged: { - gui.setCustomIdentifier(text) - } - } - TextArea { objectName: "statsPane" width: parent.width |