Browse Source

ui changes

cl-refactor
DEV Mac Mini 9 years ago
parent
commit
7dab880b79
  1. 1
      mix/qml/DeployContractStep.qml
  2. 2
      mix/qml/DeploymentWorker.qml
  3. 4
      mix/qml/ScenarioLoader.qml
  4. 2
      mix/qml/StatusPane.qml
  5. 2
      mix/qml/js/NetworkDeployment.js

1
mix/qml/DeployContractStep.qml

@ -427,7 +427,6 @@ Rectangle {
{ {
textAddresses.text = "" textAddresses.text = ""
deployedRow.visible = Object.keys(projectModel.deploymentAddresses).length > 0 deployedRow.visible = Object.keys(projectModel.deploymentAddresses).length > 0
//rectDeploymentVariable.visible = Object.keys(projectModel.deploymentAddresses).length > 0
textAddresses.text = JSON.stringify(projectModel.deploymentAddresses, null, ' ') textAddresses.text = JSON.stringify(projectModel.deploymentAddresses, null, ' ')
} }
TextArea TextArea

2
mix/qml/DeploymentWorker.qml

@ -38,6 +38,7 @@ Item
var ids = JSON.parse(arg2)[0].result; var ids = JSON.parse(arg2)[0].result;
requests = []; requests = [];
accounts = []
for (var k in ids) for (var k in ids)
{ {
requests.push({ requests.push({
@ -52,6 +53,7 @@ Item
TransactionHelper.rpcCall(requests, function (request, response){ TransactionHelper.rpcCall(requests, function (request, response){
var balanceRet = JSON.parse(response); var balanceRet = JSON.parse(response);
balances = {}
for (var k in balanceRet) for (var k in balanceRet)
{ {
var ether = QEtherHelper.createEther(balanceRet[k].result, QEther.Wei); var ether = QEtherHelper.createEther(balanceRet[k].result, QEther.Wei);

4
mix/qml/ScenarioLoader.qml

@ -68,7 +68,7 @@ ColumnLayout
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
anchors.left: parent.left anchors.left: parent.left
anchors.top: parent.top anchors.top: parent.top
anchors.topMargin: 5 anchors.topMargin: 4
id: editImg id: editImg
MouseArea MouseArea
{ {
@ -88,7 +88,7 @@ ColumnLayout
color: "#cccccc" color: "#cccccc"
id: deleteImg id: deleteImg
anchors.top: parent.top anchors.top: parent.top
anchors.topMargin: 5 anchors.topMargin: 7
visible: projectModel.stateListModel.count > 1 visible: projectModel.stateListModel.count > 1
MouseArea MouseArea
{ {

2
mix/qml/StatusPane.qml

@ -179,7 +179,7 @@ Rectangle {
function updateWidth() function updateWidth()
{ {
if (text.length > 80) if (text.length > 100)
width = parent.width - 10 width = parent.width - 10
else else
width = undefined width = undefined

2
mix/qml/js/NetworkDeployment.js

@ -157,7 +157,7 @@ function executeTr(blockIndex, trIndex, state, ctrAddresses, trHashes, callBack)
if (tr.contractId === tr.functionId) if (tr.contractId === tr.functionId)
rpcParams.code = codeModel.contracts[tr.contractId].codeHex + encodedParams.join(""); rpcParams.code = codeModel.contracts[tr.contractId].codeHex + encodedParams.join("");
else else
rpcParams.data = func.qhash() + encodedParams.join(""); rpcParams.data = "0x" + func.qhash() + encodedParams.join("");
var requests = [{ var requests = [{
jsonrpc: "2.0", jsonrpc: "2.0",

Loading…
Cancel
Save