aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-05-21 20:00:54 +0800
committerobscuren <geffobscura@gmail.com>2014-05-21 20:00:54 +0800
commit10e2c40b59010ec594df43d057354d05a34709ff (patch)
tree15994979107d044f9623f568741cb2d1e0c191b6
parent68f4a12a8b6e0cde4a8ba144d2f63e911361cb58 (diff)
downloadgo-tangerine-10e2c40b59010ec594df43d057354d05a34709ff.tar
go-tangerine-10e2c40b59010ec594df43d057354d05a34709ff.tar.gz
go-tangerine-10e2c40b59010ec594df43d057354d05a34709ff.tar.bz2
go-tangerine-10e2c40b59010ec594df43d057354d05a34709ff.tar.lz
go-tangerine-10e2c40b59010ec594df43d057354d05a34709ff.tar.xz
go-tangerine-10e2c40b59010ec594df43d057354d05a34709ff.tar.zst
go-tangerine-10e2c40b59010ec594df43d057354d05a34709ff.zip
Improved on some ui elements
-rw-r--r--ethereal/assets/qml/wallet.qml39
-rw-r--r--ethereal/ui/gui.go1
2 files changed, 40 insertions, 0 deletions
diff --git a/ethereal/assets/qml/wallet.qml b/ethereal/assets/qml/wallet.qml
index 4813aaede..51f064adf 100644
--- a/ethereal/assets/qml/wallet.qml
+++ b/ethereal/assets/qml/wallet.qml
@@ -67,6 +67,7 @@ ApplicationWindow {
networkView.visible = false
historyView.visible = false
newTxView.visible = false
+ infoView.visible = false
view.visible = true
//root.title = "Ethereal - " = view.title
}
@@ -120,6 +121,17 @@ ApplicationWindow {
}
}
}
+
+ Image {
+ source: ui.assetPath("net.png")
+ anchors.horizontalCenter: parent.horizontalCenter
+ MouseArea {
+ anchors.fill: parent
+ onClicked: {
+ setView(infoView)
+ }
+ }
+ }
}
}
@@ -217,6 +229,33 @@ ApplicationWindow {
}
}
+ Rectangle {
+ id: infoView
+ property var title: "Information"
+ visible: false
+ color: "#00000000"
+ anchors.fill: parent
+
+ Label {
+ id: addressLabel
+ text: "Address"
+ anchors {
+ margins: 5
+ top: parent.top
+ left: parent.left
+ }
+ }
+ TextField {
+ anchors {
+ margins: 5
+ left: addressLabel.right
+ top: parent.top
+ }
+ text: pub.getKey().address
+ width: 500
+ }
+ }
+
/*
signal addPlugin(string name)
Component {
diff --git a/ethereal/ui/gui.go b/ethereal/ui/gui.go
index 3e2fc0dbd..6043152f9 100644
--- a/ethereal/ui/gui.go
+++ b/ethereal/ui/gui.go
@@ -74,6 +74,7 @@ func (gui *Gui) Start(assetPath string) {
// Expose the eth library and the ui library to QML
context.SetVar("eth", gui)
+ context.SetVar("pub", gui.pub)
gui.uiLib = NewUiLib(gui.engine, gui.eth, assetPath)
context.SetVar("ui", gui.uiLib)