aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-09-14 18:02:08 +0800
committerobscuren <geffobscura@gmail.com>2014-09-14 18:02:08 +0800
commitddefa11695f9fabaaa0a5f76fe754571829df6ec (patch)
tree36f573cb4b48c79141202b6183b884a3e59a76b0
parent91ca5d724e1c65a7d9725b65ea0f003161301f63 (diff)
downloadgo-tangerine-ddefa11695f9fabaaa0a5f76fe754571829df6ec.tar
go-tangerine-ddefa11695f9fabaaa0a5f76fe754571829df6ec.tar.gz
go-tangerine-ddefa11695f9fabaaa0a5f76fe754571829df6ec.tar.bz2
go-tangerine-ddefa11695f9fabaaa0a5f76fe754571829df6ec.tar.lz
go-tangerine-ddefa11695f9fabaaa0a5f76fe754571829df6ec.tar.xz
go-tangerine-ddefa11695f9fabaaa0a5f76fe754571829df6ec.tar.zst
go-tangerine-ddefa11695f9fabaaa0a5f76fe754571829df6ec.zip
Minor updates to the new filter
-rw-r--r--ethereal/assets/qml/views/transaction.qml2
-rw-r--r--ethereal/assets/qml/wallet.qml2
-rw-r--r--ethereal/gui.go17
3 files changed, 12 insertions, 9 deletions
diff --git a/ethereal/assets/qml/views/transaction.qml b/ethereal/assets/qml/views/transaction.qml
index fb8ba8a6d..7d689733f 100644
--- a/ethereal/assets/qml/views/transaction.qml
+++ b/ethereal/assets/qml/views/transaction.qml
@@ -180,6 +180,8 @@ Rectangle {
txResult.text = "Your transaction has been submitted:\n"
txOutput.text = res[0].address
mainContractColumn.state = "DONE"
+
+ console.log(res)
}
}
}
diff --git a/ethereal/assets/qml/wallet.qml b/ethereal/assets/qml/wallet.qml
index bd4eeba1a..4d8561491 100644
--- a/ethereal/assets/qml/wallet.qml
+++ b/ethereal/assets/qml/wallet.qml
@@ -76,7 +76,7 @@ ApplicationWindow {
return views.view
} catch(e) {
- eth.note(e)
+ ethx.note(e)
}
}
diff --git a/ethereal/gui.go b/ethereal/gui.go
index 7bb4612c2..173974c4b 100644
--- a/ethereal/gui.go
+++ b/ethereal/gui.go
@@ -13,7 +13,6 @@ import (
"strconv"
"strings"
"time"
- "unsafe"
"bitbucket.org/binet/go-ffi/pkg/ffi"
"github.com/ethereum/eth-go"
@@ -119,13 +118,15 @@ func (gui *Gui) Start(assetPath string) {
context.SetVar("gui", gui)
context.SetVar("eth", gui.uiLib)
- vec, errr := LoadExtension("/Users/jeffrey/Desktop/build-libqmltest-Desktop_Qt_5_2_1_clang_64bit-Debug/liblibqmltest_debug.dylib")
- fmt.Printf("Fetched vec with addr: %#x\n", vec)
- if errr != nil {
- fmt.Println(errr)
- } else {
- context.SetVar("vec", (unsafe.Pointer)(vec))
- }
+ /*
+ vec, errr := LoadExtension("/Users/jeffrey/Desktop/build-libqmltest-Desktop_Qt_5_2_1_clang_64bit-Debug/liblibqmltest_debug.dylib")
+ fmt.Printf("Fetched vec with addr: %#x\n", vec)
+ if errr != nil {
+ fmt.Println(errr)
+ } else {
+ context.SetVar("vec", (unsafe.Pointer)(vec))
+ }
+ */
// Load the main QML interface
data, _ := ethutil.Config.Db.Get([]byte("KeyRing"))