diff options
| author | obscuren <geffobscura@gmail.com> | 2014-05-21 20:04:54 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-05-21 20:04:54 +0800 |
| commit | 7f1a4c377c18055137909521d809251248b7b5af (patch) | |
| tree | 75afd9a91da3daa7123f6083647795cdbc3fca7a /ethereal/assets | |
| parent | c07c454935609bfb0f65dc38bb596a90d5493fbb (diff) | |
| parent | 3ddaf56afd919d1bc435379861a3ab37f3392116 (diff) | |
| download | dexon-7f1a4c377c18055137909521d809251248b7b5af.tar dexon-7f1a4c377c18055137909521d809251248b7b5af.tar.gz dexon-7f1a4c377c18055137909521d809251248b7b5af.tar.bz2 dexon-7f1a4c377c18055137909521d809251248b7b5af.tar.lz dexon-7f1a4c377c18055137909521d809251248b7b5af.tar.xz dexon-7f1a4c377c18055137909521d809251248b7b5af.tar.zst dexon-7f1a4c377c18055137909521d809251248b7b5af.zip | |
Merge branch 'release/poc5-rc8'
Diffstat (limited to 'ethereal/assets')
| -rw-r--r-- | ethereal/assets/qml/wallet.qml | 39 | ||||
| -rw-r--r-- | ethereal/assets/samplecoin/samplecoin.html | 2 |
2 files changed, 40 insertions, 1 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/assets/samplecoin/samplecoin.html b/ethereal/assets/samplecoin/samplecoin.html index d47c6323c..3892141cd 100644 --- a/ethereal/assets/samplecoin/samplecoin.html +++ b/ethereal/assets/samplecoin/samplecoin.html @@ -9,7 +9,7 @@ <script type="text/javascript"> -var jefcoinAddr = "739105c31705038744d190332e3a07c8fea8a9eb" +var jefcoinAddr = "fc0a9436890478bb9b1c6ed7455c2535366f4a99" var mAddr = "" function createTransaction() { |