From bf761fd22e7e21da8edd8b9f7f3117a888b405c2 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Thu, 23 Jul 2015 11:55:26 +0200
Subject: [PATCH] ui changes

---
 mix/QFunctionDefinition.h         | 2 ++
 mix/qml/DeploymentDialogSteps.qml | 2 +-
 mix/qml/RegisteringStep.qml       | 6 ++++--
 mix/qml/ScenarioLoader.qml        | 4 ++--
 mix/qml/js/NetworkDeployment.js   | 2 +-
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/mix/QFunctionDefinition.h b/mix/QFunctionDefinition.h
index a9c45ffcd..5a056fa75 100644
--- a/mix/QFunctionDefinition.h
+++ b/mix/QFunctionDefinition.h
@@ -55,6 +55,8 @@ public:
 	FixedHash<4> hash() const { return m_hash; }
 	/// Get the full hash of this function declaration on the contract ABI.
 	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:
 	int m_index;
diff --git a/mix/qml/DeploymentDialogSteps.qml b/mix/qml/DeploymentDialogSteps.qml
index 6fe22ed9d..5874d54a8 100644
--- a/mix/qml/DeploymentDialogSteps.qml
+++ b/mix/qml/DeploymentDialogSteps.qml
@@ -87,7 +87,7 @@ Rectangle {
 				{
 					step: 2,
 					type:"package",
-					label: qsTr("Package files")
+					label: qsTr("Package Dapp")
 				},
 				{
 					step: 3,
diff --git a/mix/qml/RegisteringStep.qml b/mix/qml/RegisteringStep.qml
index 319c52da5..9db144dca 100644
--- a/mix/qml/RegisteringStep.qml
+++ b/mix/qml/RegisteringStep.qml
@@ -41,7 +41,7 @@ Rectangle {
 			});
 		}
 		else if (projectModel.registerContentHashTrHash !== "" && projectModel.registerContentHashBlockNumber === -1)
-			verificationEthUrl.text = qsTr("waiting verification")
+			verificationEthUrl.text = qsTr("waiting verifications")
 
 		verificationUrl.text = ""
 		if (projectModel.registerUrlTrHash !== "" && projectModel.registerUrlBlockNumber !== -1)
@@ -52,7 +52,7 @@ Rectangle {
 			});
 		}
 		else if (projectModel.registerUrlTrHash !== "" && projectModel.registerUrlBlockNumber === -1)
-			verificationUrl.text = qsTr("waiting verification")
+			verificationUrl.text = qsTr("waiting verifications")
 	}
 
 	function updateVerification(originbn, bn, trLost, ctrl, trContext)
@@ -140,6 +140,7 @@ Rectangle {
 			{
 				id: verificationUrl
 				anchors.verticalCenter: parent.verticalCenter
+				font.italic: true
 			}
 		}
 
@@ -243,6 +244,7 @@ Rectangle {
 			Label
 			{
 				id: verificationEthUrl
+				font.italic: true
 			}
 		}
 	}
diff --git a/mix/qml/ScenarioLoader.qml b/mix/qml/ScenarioLoader.qml
index 10ee4e8b8..6cf66a31d 100644
--- a/mix/qml/ScenarioLoader.qml
+++ b/mix/qml/ScenarioLoader.qml
@@ -68,7 +68,7 @@ ColumnLayout
 					fillMode: Image.PreserveAspectFit
 					anchors.left: parent.left
 					anchors.top: parent.top
-					anchors.topMargin: 4
+					anchors.topMargin: 5
 					id: editImg
 					MouseArea
 					{
@@ -88,7 +88,7 @@ ColumnLayout
 					color: "#cccccc"
 					id: deleteImg
 					anchors.top: parent.top
-					anchors.topMargin: 6
+					anchors.topMargin: 5
 					visible: projectModel.stateListModel.count > 1
 					MouseArea
 					{
diff --git a/mix/qml/js/NetworkDeployment.js b/mix/qml/js/NetworkDeployment.js
index 7f9d80177..c3060fed7 100644
--- a/mix/qml/js/NetworkDeployment.js
+++ b/mix/qml/js/NetworkDeployment.js
@@ -157,7 +157,7 @@ function executeTr(blockIndex, trIndex, state, ctrAddresses, trHashes, callBack)
 		if (tr.contractId === tr.functionId)
 			rpcParams.code = codeModel.contracts[tr.contractId].codeHex + encodedParams.join("");
 		else
-			rpcParams.data = func.hash + encodedParams.join("");
+			rpcParams.data = func.qhash() + encodedParams.join("");
 
 		var requests = [{
 							jsonrpc: "2.0",