diff options
| author | Alexandre Van de Sande <alex.vandesande@ethdev.com> | 2015-02-23 20:05:15 +0800 |
|---|---|---|
| committer | Alexandre Van de Sande <alex.vandesande@ethdev.com> | 2015-02-23 20:05:15 +0800 |
| commit | dea65840186fe861017524c9cb59ae07ac97ed06 (patch) | |
| tree | 5cb5e339b9ce77a2a3c92cf8a10c4294fcf7965c /cmd/mist/assets/qml/main.qml | |
| parent | bb3338df6363d8267a24190584f0908463241a6c (diff) | |
| parent | dd086791acf477da7641c168f82de70ed0b2dca6 (diff) | |
| download | go-tangerine-dea65840186fe861017524c9cb59ae07ac97ed06.tar go-tangerine-dea65840186fe861017524c9cb59ae07ac97ed06.tar.gz go-tangerine-dea65840186fe861017524c9cb59ae07ac97ed06.tar.bz2 go-tangerine-dea65840186fe861017524c9cb59ae07ac97ed06.tar.lz go-tangerine-dea65840186fe861017524c9cb59ae07ac97ed06.tar.xz go-tangerine-dea65840186fe861017524c9cb59ae07ac97ed06.tar.zst go-tangerine-dea65840186fe861017524c9cb59ae07ac97ed06.zip | |
Merge branch 'develop' into ui
Diffstat (limited to 'cmd/mist/assets/qml/main.qml')
| -rw-r--r-- | cmd/mist/assets/qml/main.qml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/cmd/mist/assets/qml/main.qml b/cmd/mist/assets/qml/main.qml index 3c5772d84..1f7fcbec6 100644 --- a/cmd/mist/assets/qml/main.qml +++ b/cmd/mist/assets/qml/main.qml @@ -256,6 +256,7 @@ ApplicationWindow { } } } + } property var blockModel: ListModel { @@ -895,7 +896,7 @@ ApplicationWindow { } function setWalletValue(value) { - walletValueLabel.text = value + //walletValueLabel.text = value } function loadPlugin(name) { @@ -947,7 +948,8 @@ ApplicationWindow { model: peerModel TableViewColumn{width: 180; role: "addr" ; title: "Remote Address" } TableViewColumn{width: 280; role: "nodeID" ; title: "Node ID" } - TableViewColumn{width: 180; role: "caps" ; title: "Capabilities" } + TableViewColumn{width: 100; role: "name" ; title: "Name" } + TableViewColumn{width: 40; role: "caps" ; title: "Capabilities" } } } } @@ -978,7 +980,7 @@ ApplicationWindow { anchors.top: parent.top anchors.topMargin: 30 font.pointSize: 12 - text: "<h2>Mist (0.7.10)</h2><br><h3>Development</h3>Jeffrey Wilcke<br>Viktor Trón<br>Felix Lange<br>Taylor Gerring<br>Daniel Nagy<br><h3>UX</h3>Alex van de Sande<br>" + text: "<h2>Mist (0.8.5)</h2><br><h3>Development</h3>Jeffrey Wilcke<br>Viktor Trón<br>Felix Lange<br>Taylor Gerring<br>Daniel Nagy<br>Gustav Simonsson<br><h3>UX/UI</h3>Alex van de Sande<br>Fabian Vogelsteller" } } |