Merge branch 'develop'

This commit is contained in:
obscuren 2014-02-28 13:08:55 +01:00
commit a9d89d1f59
2 changed files with 17 additions and 4 deletions

BIN
facet.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 27 KiB

View File

@ -321,14 +321,27 @@ ApplicationWindow {
id: aboutWin id: aboutWin
visible: false visible: false
title: "About" title: "About"
minimumWidth: 300 minimumWidth: 350
maximumWidth: 300 maximumWidth: 350
maximumHeight: 200 maximumHeight: 200
minimumHeight: 200 minimumHeight: 200
Image {
id: aboutIcon
height: 150
width: 150
fillMode: Image.PreserveAspectFit
smooth: true
source: "facet.png"
x: 10
y: 10
}
Text { Text {
font.pointSize: 18 anchors.left: aboutIcon.right
text: "Eth Go" 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>"
} }
} }