diff options
| author | obscuren <geffobscura@gmail.com> | 2014-10-23 07:01:56 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-10-23 07:01:56 +0800 |
| commit | bb03276c19184f0f8c926f69d914b1b33435a48b (patch) | |
| tree | 318ce1ccc369dd04e23ea6f33fa0ca7e477ed16e | |
| parent | 411b9800aed6bff666df5ffad799c49b17af9a43 (diff) | |
| parent | 5662176f8c16f37751c50e31e055b9a1908bc02e (diff) | |
| download | dexon-bb03276c19184f0f8c926f69d914b1b33435a48b.tar dexon-bb03276c19184f0f8c926f69d914b1b33435a48b.tar.gz dexon-bb03276c19184f0f8c926f69d914b1b33435a48b.tar.bz2 dexon-bb03276c19184f0f8c926f69d914b1b33435a48b.tar.lz dexon-bb03276c19184f0f8c926f69d914b1b33435a48b.tar.xz dexon-bb03276c19184f0f8c926f69d914b1b33435a48b.tar.zst dexon-bb03276c19184f0f8c926f69d914b1b33435a48b.zip | |
Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
| -rw-r--r-- | mist/assets/qml/views/chain.qml | 10 | ||||
| -rw-r--r-- | mist/assets/qml/views/transaction.qml | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/mist/assets/qml/views/chain.qml b/mist/assets/qml/views/chain.qml index 93bff2d97..c4ceecfc0 100644 --- a/mist/assets/qml/views/chain.qml +++ b/mist/assets/qml/views/chain.qml @@ -8,7 +8,7 @@ import Ethereum 1.0 Rectangle { id: root - property var title: "Block chain" + property var title: "Block Chain" property var menuItem objectName: "chainView" @@ -63,12 +63,12 @@ Rectangle { Menu { id: contextMenu - property var row; + property var row MenuItem { text: "Details" onTriggered: { popup.visible = true - popup.setDetails(blockModel.get(this.row)) + popup.setDetails(blockModel.get(contextMenu.row)) } } @@ -77,7 +77,7 @@ Rectangle { MenuItem { text: "Copy" onTriggered: { - copyToClipboard(blockModel.get(this.row).hash) + copyToClipboard(blockModel.get(contextMenu.row).hash) } } @@ -85,7 +85,7 @@ Rectangle { text: "Dump State" onTriggered: { generalFileDialog.show(false, function(path) { - var hash = blockModel.get(this.row).hash; + var hash = blockModel.get(contextMenu.row).hash; gui.dumpState(hash, path); }); diff --git a/mist/assets/qml/views/transaction.qml b/mist/assets/qml/views/transaction.qml index 744a4da65..8792e31eb 100644 --- a/mist/assets/qml/views/transaction.qml +++ b/mist/assets/qml/views/transaction.qml @@ -7,7 +7,7 @@ import QtQuick.Controls.Styles 1.1 import Ethereum 1.0 Rectangle { - property var title: "New transaction" + property var title: "New Transaction" property var menuItem objectName: "newTxView" |