aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoeG <joegoulden@gmail.com>2014-09-19 04:41:45 +0800
committerJoeG <joegoulden@gmail.com>2014-09-19 04:41:45 +0800
commita96c5986c5216b1238decde40bc6c6882da81996 (patch)
tree25ffbdcca995473c05ff780698439e2192597296
parentb27100c8fc48c819c9e6a6b76fcc50cfe118cedb (diff)
parent728005722853028348909e1d458593415cb52660 (diff)
downloadgo-tangerine-a96c5986c5216b1238decde40bc6c6882da81996.tar
go-tangerine-a96c5986c5216b1238decde40bc6c6882da81996.tar.gz
go-tangerine-a96c5986c5216b1238decde40bc6c6882da81996.tar.bz2
go-tangerine-a96c5986c5216b1238decde40bc6c6882da81996.tar.lz
go-tangerine-a96c5986c5216b1238decde40bc6c6882da81996.tar.xz
go-tangerine-a96c5986c5216b1238decde40bc6c6882da81996.tar.zst
go-tangerine-a96c5986c5216b1238decde40bc6c6882da81996.zip
Merge remote-tracking branch 'upstream/develop' into develop
Conflicts: Mist/assets/qml/wallet.qml
-rw-r--r--Mist/assets/qml/views/wallet.qml2
-rw-r--r--Mist/assets/qml/wallet.qml20
-rw-r--r--javascript/types.go4
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 {