status-im
/
op-geth
mirror of https://github.com/status-im/op-geth.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
obscuren 2014-10-23 01:01:56 +02:00
parent 411b9800ae 5662176f8c
commit bb03276c19
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mist/assets/qml/views/chain.qml
View File

@ -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 {
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 {
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 {
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);
}); });

2
mist/assets/qml/views/transaction.qml
View File

@ -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"