diff options
| author | Felix Lange <fjl@twurst.com> | 2015-02-05 10:16:16 +0800 |
|---|---|---|
| committer | Felix Lange <fjl@twurst.com> | 2015-02-06 07:03:59 +0800 |
| commit | 56f777b2fc77275bc636562b66a08b19afe2ec56 (patch) | |
| tree | c9a34bd23e13adb0d850957b9a66cd748d34b3e3 /cmd/mist/assets | |
| parent | 8e8ec8f5f8974aafeac5e4a9ead76878fe22cefd (diff) | |
| download | dexon-56f777b2fc77275bc636562b66a08b19afe2ec56.tar dexon-56f777b2fc77275bc636562b66a08b19afe2ec56.tar.gz dexon-56f777b2fc77275bc636562b66a08b19afe2ec56.tar.bz2 dexon-56f777b2fc77275bc636562b66a08b19afe2ec56.tar.lz dexon-56f777b2fc77275bc636562b66a08b19afe2ec56.tar.xz dexon-56f777b2fc77275bc636562b66a08b19afe2ec56.tar.zst dexon-56f777b2fc77275bc636562b66a08b19afe2ec56.zip | |
cmd/ethereum, cmd/mist, core, eth, javascript, xeth: fixes for new p2p API
Diffstat (limited to 'cmd/mist/assets')
| -rw-r--r-- | cmd/mist/assets/qml/main.qml | 14 | ||||
| -rw-r--r-- | cmd/mist/assets/qml/views/info.qml | 12 |
2 files changed, 13 insertions, 13 deletions
diff --git a/cmd/mist/assets/qml/main.qml b/cmd/mist/assets/qml/main.qml index 357e40846..b1d3f2d19 100644 --- a/cmd/mist/assets/qml/main.qml +++ b/cmd/mist/assets/qml/main.qml @@ -844,6 +844,7 @@ ApplicationWindow { minimumHeight: 50 title: "Connect to peer" + ComboBox { id: addrField anchors.verticalCenter: parent.verticalCenter @@ -872,6 +873,17 @@ ApplicationWindow { } } + ComboBox { + id: nodeidField + anchors.verticalCenter: parent.verticalCenter + anchors.left: parent.left + anchors.right: addPeerButton.left + anchors.leftMargin: 10 + anchors.rightMargin: 10 + + editable: true + } + Button { id: addPeerButton anchors.right: parent.right @@ -879,7 +891,7 @@ ApplicationWindow { anchors.rightMargin: 10 text: "Add" onClicked: { - eth.connectToPeer(addrField.currentText) + eth.connectToPeer(addrField.currentText, nodeidField.currentText) addPeerWin.visible = false } } 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 |