Commit bb03276c authored by obscuren's avatar obscuren

Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop

parents 411b9800 5662176f
...@@ -8,7 +8,7 @@ import Ethereum 1.0 ...@@ -8,7 +8,7 @@ import Ethereum 1.0
Rectangle { Rectangle {
id: root id: root
property var title: "Block chain" property var title: "Block Chain"
property var menuItem property var menuItem
objectName: "chainView" objectName: "chainView"
...@@ -63,12 +63,12 @@ Rectangle { ...@@ -63,12 +63,12 @@ Rectangle {
Menu { Menu {
id: contextMenu id: contextMenu
property var row; property var row
MenuItem { MenuItem {
text: "Details" text: "Details"
onTriggered: { onTriggered: {
popup.visible = true popup.visible = true
popup.setDetails(blockModel.get(this.row)) popup.setDetails(blockModel.get(contextMenu.row))
} }
} }
...@@ -77,7 +77,7 @@ Rectangle { ...@@ -77,7 +77,7 @@ Rectangle {
MenuItem { MenuItem {
text: "Copy" text: "Copy"
onTriggered: { onTriggered: {
copyToClipboard(blockModel.get(this.row).hash) copyToClipboard(blockModel.get(contextMenu.row).hash)
} }
} }
...@@ -85,7 +85,7 @@ Rectangle { ...@@ -85,7 +85,7 @@ Rectangle {
text: "Dump State" text: "Dump State"
onTriggered: { onTriggered: {
generalFileDialog.show(false, function(path) { generalFileDialog.show(false, function(path) {
var hash = blockModel.get(this.row).hash; var hash = blockModel.get(contextMenu.row).hash;
gui.dumpState(hash, path); gui.dumpState(hash, path);
}); });
......
...@@ -7,7 +7,7 @@ import QtQuick.Controls.Styles 1.1 ...@@ -7,7 +7,7 @@ import QtQuick.Controls.Styles 1.1
import Ethereum 1.0 import Ethereum 1.0
Rectangle { Rectangle {
property var title: "New transaction" property var title: "New Transaction"
property var menuItem property var menuItem
objectName: "newTxView" objectName: "newTxView"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment