diff options
| author | Felix Lange <fjl@twurst.com> | 2015-03-11 00:14:31 +0800 |
|---|---|---|
| committer | Felix Lange <fjl@twurst.com> | 2015-03-11 00:14:31 +0800 |
| commit | 269cfbb8ace76ddc1f50dbd5b218c499308c8a5c (patch) | |
| tree | c2e9e274c64f431f03b9a6b8b3de22585c016027 /cmd/mist/assets | |
| parent | 972e2c1e31067a9bab77228c19348b66964ce643 (diff) | |
| parent | 0542df941f57a75fa7b699089db1d9ae40e4ff71 (diff) | |
| download | go-tangerine-269cfbb8ace76ddc1f50dbd5b218c499308c8a5c.tar go-tangerine-269cfbb8ace76ddc1f50dbd5b218c499308c8a5c.tar.gz go-tangerine-269cfbb8ace76ddc1f50dbd5b218c499308c8a5c.tar.bz2 go-tangerine-269cfbb8ace76ddc1f50dbd5b218c499308c8a5c.tar.lz go-tangerine-269cfbb8ace76ddc1f50dbd5b218c499308c8a5c.tar.xz go-tangerine-269cfbb8ace76ddc1f50dbd5b218c499308c8a5c.tar.zst go-tangerine-269cfbb8ace76ddc1f50dbd5b218c499308c8a5c.zip | |
Merge branch origin/develop into accounts-integration
Conflicts:
cmd/blocktest/main.go
cmd/mist/debugger.go
cmd/utils/cmd.go
Diffstat (limited to 'cmd/mist/assets')
| -rw-r--r-- | cmd/mist/assets/qml/main.qml | 25 | ||||
| -rw-r--r-- | cmd/mist/assets/qml/views/chain.qml | 17 |
2 files changed, 0 insertions, 42 deletions
diff --git a/cmd/mist/assets/qml/main.qml b/cmd/mist/assets/qml/main.qml index 1626a63a9..8558ebd51 100644 --- a/cmd/mist/assets/qml/main.qml +++ b/cmd/mist/assets/qml/main.qml @@ -200,13 +200,6 @@ ApplicationWindow { Menu { title: "Developer" MenuItem { - iconSource: "../icecream.png" - text: "Debugger" - shortcut: "Ctrl+d" - onTriggered: eth.startDebugger() - } - - MenuItem { text: "Import Tx" onTriggered: { txImportDialog.visible = true @@ -761,24 +754,6 @@ ApplicationWindow { } } - Rectangle { - height: 55 - color: "transparent" - visible: true - Text { - text: "DEBUG" - font.family: sourceSansPro.name - font.weight: Font.DemiBold - anchors { - left: parent.left - top: parent.verticalCenter - leftMargin: 16 - } - color: "#AAA0A0" - } - } - - ColumnLayout { id: menuLegacy visible: true diff --git a/cmd/mist/assets/qml/views/chain.qml b/cmd/mist/assets/qml/views/chain.qml index 4d1bc0e03..9892beddf 100644 --- a/cmd/mist/assets/qml/views/chain.qml +++ b/cmd/mist/assets/qml/views/chain.qml @@ -178,7 +178,6 @@ Rectangle { } function showContractData(tx) { - txDetailsDebugButton.tx = tx if(tx.createsContract) { contractData.text = tx.data contractLabel.text = "<h4> Transaction created contract " + tx.address + "</h4>" @@ -202,22 +201,6 @@ Rectangle { id: contractLabel anchors.leftMargin: 10 } - Button { - property var tx - id: txDetailsDebugButton - anchors.right: parent.right - anchors.rightMargin: 10 - anchors.top: parent.top - anchors.topMargin: 10 - text: "Debug contract" - onClicked: { - if(tx && tx.createsContract){ - eth.startDbWithCode(tx.rawData) - }else { - eth.startDbWithContractAndData(tx.address, tx.rawData) - } - } - } TextArea { id: contractData text: "Contract" |