diff options
| author | obscuren <geffobscura@gmail.com> | 2014-02-28 20:08:55 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-02-28 20:08:55 +0800 |
| commit | a9d89d1f59d405755eeef83f04765739ccaeed96 (patch) | |
| tree | efd9a2b455fad864a22c705143bb11e0f0f12f9e | |
| parent | 0adfa489de3fb88c995246d0b70af8bbd06f8db7 (diff) | |
| parent | f6a9aa41101b6154ce5f019a77e6c897df662466 (diff) | |
| download | go-tangerine-a9d89d1f59d405755eeef83f04765739ccaeed96.tar.gz go-tangerine-a9d89d1f59d405755eeef83f04765739ccaeed96.tar.zst go-tangerine-a9d89d1f59d405755eeef83f04765739ccaeed96.zip | |
Merge branch 'develop'
| -rw-r--r-- | facet.png | bin | 0 -> 27302 bytes | |||
| -rw-r--r-- | wallet.qml | 21 |
2 files changed, 17 insertions, 4 deletions
diff --git a/facet.png b/facet.png Binary files differnew file mode 100644 index 000000000..49a266e96 --- /dev/null +++ b/facet.png diff --git a/wallet.qml b/wallet.qml index 8c91039fc..e86551ad6 100644 --- a/wallet.qml +++ b/wallet.qml @@ -321,14 +321,27 @@ ApplicationWindow { id: aboutWin visible: false title: "About" - minimumWidth: 300 - maximumWidth: 300 + minimumWidth: 350 + maximumWidth: 350 maximumHeight: 200 minimumHeight: 200 + Image { + id: aboutIcon + height: 150 + width: 150 + fillMode: Image.PreserveAspectFit + smooth: true + source: "facet.png" + x: 10 + y: 10 + } + Text { - font.pointSize: 18 - text: "Eth Go" + anchors.left: aboutIcon.right + anchors.leftMargin: 10 + font.pointSize: 12 + text: "<h2>Ethereum(Go)</h2><br><h3>Development</h3>Jeffrey Wilcke<br><h3>Binary Distribution</h3>Jarrad Hope<br>" } } |
