poanetwork
/
quorum
mirror of https://github.com/poanetwork/quorum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Refactor hex encode and remove coupling of popup to main window

This commit is contained in:
Maran 2014-05-28 16:14:24 +02:00
parent 1eda1d25b0
commit d4f9daa631
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ethereal/assets/qml/wallet.qml
View File

@ -342,8 +342,6 @@ ApplicationWindow {
property var block property var block
width: root.width width: root.width
height: 240 height: 240
x: root.x
y: root.y + root.height
Component{ Component{
id: blockDetailsDelegate id: blockDetailsDelegate
Rectangle { Rectangle {
@ -442,6 +440,7 @@ ApplicationWindow {
text: "Contract" text: "Contract"
anchors.top: contractLabel.bottom anchors.top: contractLabel.bottom
anchors.left: parent.left anchors.left: parent.left
anchors.bottom: popup.bottom
wrapMode: Text.Wrap wrapMode: Text.Wrap
width: parent.width - 30 width: parent.width - 30
height: 80 height: 80

3
ethereal/ui/ui_lib.go
View File

@ -2,7 +2,6 @@ package ethui
import ( import (
"bitbucket.org/kardianos/osext" "bitbucket.org/kardianos/osext"
"encoding/hex"
"github.com/ethereum/eth-go" "github.com/ethereum/eth-go"
"github.com/ethereum/eth-go/ethchain" "github.com/ethereum/eth-go/ethchain"
"github.com/ethereum/eth-go/ethutil" "github.com/ethereum/eth-go/ethutil"
@ -94,7 +93,7 @@ func (self *UiLib) StartDbWithContractAndData(contractHash, data string) {
dbWindow := NewDebuggerWindow(self) dbWindow := NewDebuggerWindow(self)
object := self.eth.StateManager().CurrentState().GetStateObject(ethutil.FromHex(contractHash)) object := self.eth.StateManager().CurrentState().GetStateObject(ethutil.FromHex(contractHash))
if len(object.Script()) > 0 { if len(object.Script()) > 0 {
dbWindow.SetCode("0x" + hex.EncodeToString(object.Script())) dbWindow.SetCode("0x" + ethutil.Hex(object.Script()))
} }
dbWindow.SetData(data) dbWindow.SetData(data)