Browse Source

ui changes

cl-refactor
yann300 10 years ago
parent
commit
bf761fd22e
  1. 2
      mix/QFunctionDefinition.h
  2. 2
      mix/qml/DeploymentDialogSteps.qml
  3. 6
      mix/qml/RegisteringStep.qml
  4. 4
      mix/qml/ScenarioLoader.qml
  5. 2
      mix/qml/js/NetworkDeployment.js

2
mix/QFunctionDefinition.h

@ -55,6 +55,8 @@ public:
FixedHash<4> hash() const { return m_hash; } FixedHash<4> hash() const { return m_hash; }
/// Get the full hash of this function declaration on the contract ABI. /// Get the full hash of this function declaration on the contract ABI.
FixedHash<32> fullHash() const { return m_fullHash; } FixedHash<32> fullHash() const { return m_fullHash; }
/// Get the hash of this function declaration on the contract ABI. returns QString
Q_INVOKABLE QString qhash() const { return QString::fromStdString(m_hash.hex()); }
private: private:
int m_index; int m_index;

2
mix/qml/DeploymentDialogSteps.qml

@ -87,7 +87,7 @@ Rectangle {
{ {
step: 2, step: 2,
type:"package", type:"package",
label: qsTr("Package files") label: qsTr("Package Dapp")
}, },
{ {
step: 3, step: 3,

6
mix/qml/RegisteringStep.qml

@ -41,7 +41,7 @@ Rectangle {
}); });
} }
else if (projectModel.registerContentHashTrHash !== "" && projectModel.registerContentHashBlockNumber === -1) else if (projectModel.registerContentHashTrHash !== "" && projectModel.registerContentHashBlockNumber === -1)
verificationEthUrl.text = qsTr("waiting verification") verificationEthUrl.text = qsTr("waiting verifications")
verificationUrl.text = "" verificationUrl.text = ""
if (projectModel.registerUrlTrHash !== "" && projectModel.registerUrlBlockNumber !== -1) if (projectModel.registerUrlTrHash !== "" && projectModel.registerUrlBlockNumber !== -1)
@ -52,7 +52,7 @@ Rectangle {
}); });
} }
else if (projectModel.registerUrlTrHash !== "" && projectModel.registerUrlBlockNumber === -1) else if (projectModel.registerUrlTrHash !== "" && projectModel.registerUrlBlockNumber === -1)
verificationUrl.text = qsTr("waiting verification") verificationUrl.text = qsTr("waiting verifications")
} }
function updateVerification(originbn, bn, trLost, ctrl, trContext) function updateVerification(originbn, bn, trLost, ctrl, trContext)
@ -140,6 +140,7 @@ Rectangle {
{ {
id: verificationUrl id: verificationUrl
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
font.italic: true
} }
} }
@ -243,6 +244,7 @@ Rectangle {
Label Label
{ {
id: verificationEthUrl id: verificationEthUrl
font.italic: true
} }
} }
} }

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: 4 anchors.topMargin: 5
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: 6 anchors.topMargin: 5
visible: projectModel.stateListModel.count > 1 visible: projectModel.stateListModel.count > 1
MouseArea MouseArea
{ {

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.hash + encodedParams.join(""); rpcParams.data = func.qhash() + encodedParams.join("");
var requests = [{ var requests = [{
jsonrpc: "2.0", jsonrpc: "2.0",

Loading…
Cancel
Save