diff options
| -rw-r--r-- | Mist/assets/qml/views/wallet.qml | 2 | ||||
| -rw-r--r-- | Mist/assets/qml/wallet.qml | 20 | ||||
| -rw-r--r-- | javascript/types.go | 4 |
3 files changed, 15 insertions, 11 deletions
diff --git a/Mist/assets/qml/views/wallet.qml b/Mist/assets/qml/views/wallet.qml index 2a766bb5b..fbe1dfd0e 100644 --- a/Mist/assets/qml/views/wallet.qml +++ b/Mist/assets/qml/views/wallet.qml @@ -9,7 +9,7 @@ import Ethereum 1.0 Rectangle { id: root property var title: "Wallet" - property var iconSource: "../wallet.png" + property var iconSource: "../facet.png" property var menuItem objectName: "walletView" diff --git a/Mist/assets/qml/wallet.qml b/Mist/assets/qml/wallet.qml index 50cac0520..0e3d321f4 100644 --- a/Mist/assets/qml/wallet.qml +++ b/Mist/assets/qml/wallet.qml @@ -101,16 +101,16 @@ ApplicationWindow { } } - menuBar: MenuBar { - Menu { - title: "File" - MenuItem { - text: "Import App" - shortcut: "Ctrl+o" - onTriggered: { - generalFileDialog.show(true, importApp) - } - } + menuBar: MenuBar { + Menu { + title: "File" + MenuItem { + text: "Import App" + shortcut: "Ctrl+o" + onTriggered: { + generalFileDialog.show(true, importApp) + } + } /* MenuItem { diff --git a/javascript/types.go b/javascript/types.go index afa0a41c6..53a2977a8 100644 --- a/javascript/types.go +++ b/javascript/types.go @@ -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}) } +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 { r, err := self.JSPipe.Transact(key, recipient, valueStr, gasStr, gasPriceStr, dataStr) if err != nil { |