forked from cerc-io/plugeth
Merge remote-tracking branch 'upstream/develop' into develop
Conflicts: Mist/assets/qml/wallet.qml
This commit is contained in:
commit
a96c5986c5
@ -9,7 +9,7 @@ import Ethereum 1.0
|
|||||||
Rectangle {
|
Rectangle {
|
||||||
id: root
|
id: root
|
||||||
property var title: "Wallet"
|
property var title: "Wallet"
|
||||||
property var iconSource: "../wallet.png"
|
property var iconSource: "../facet.png"
|
||||||
property var menuItem
|
property var menuItem
|
||||||
|
|
||||||
objectName: "walletView"
|
objectName: "walletView"
|
||||||
|
@ -101,16 +101,16 @@ ApplicationWindow {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
menuBar: MenuBar {
|
menuBar: MenuBar {
|
||||||
Menu {
|
Menu {
|
||||||
title: "File"
|
title: "File"
|
||||||
MenuItem {
|
MenuItem {
|
||||||
text: "Import App"
|
text: "Import App"
|
||||||
shortcut: "Ctrl+o"
|
shortcut: "Ctrl+o"
|
||||||
onTriggered: {
|
onTriggered: {
|
||||||
generalFileDialog.show(true, importApp)
|
generalFileDialog.show(true, importApp)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
MenuItem {
|
MenuItem {
|
||||||
|
@ -88,6 +88,10 @@ func (self *JSEthereum) GetStateObject(addr string) otto.Value {
|
|||||||
return self.toVal(&JSStateObject{ethpipe.NewJSObject(self.JSPipe.World().SafeGet(ethutil.Hex2Bytes(addr))), self})
|
return self.toVal(&JSStateObject{ethpipe.NewJSObject(self.JSPipe.World().SafeGet(ethutil.Hex2Bytes(addr))), self})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (self *JSEthereum) Peers() otto.Value {
|
||||||
|
return self.toVal(self.JSPipe.Peers())
|
||||||
|
}
|
||||||
|
|
||||||
func (self *JSEthereum) Transact(key, recipient, valueStr, gasStr, gasPriceStr, dataStr string) otto.Value {
|
func (self *JSEthereum) Transact(key, recipient, valueStr, gasStr, gasPriceStr, dataStr string) otto.Value {
|
||||||
r, err := self.JSPipe.Transact(key, recipient, valueStr, gasStr, gasPriceStr, dataStr)
|
r, err := self.JSPipe.Transact(key, recipient, valueStr, gasStr, gasPriceStr, dataStr)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
Loading…
Reference in New Issue
Block a user