From d7b4d98678957832235971ebca3e3ea9b2dfc207 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Mon, 2 Mar 2015 11:26:31 +0100
Subject: [PATCH]  - Replace "Display Log" by an icon.

---
 mix/qml/StatusPane.qml          |  47 ++++++++++++++++----------------
 mix/qml/img/search_filled.png   | Bin 0 -> 625 bytes
 mix/qml/js/TransactionHelper.js |   5 ++--
 mix/res.qrc                     |   1 +
 4 files changed, 28 insertions(+), 25 deletions(-)
 create mode 100644 mix/qml/img/search_filled.png

diff --git a/mix/qml/StatusPane.qml b/mix/qml/StatusPane.qml
index ff2173a22..414a051ec 100644
--- a/mix/qml/StatusPane.qml
+++ b/mix/qml/StatusPane.qml
@@ -75,7 +75,6 @@ Rectangle {
 		height: 30
 		color: "#fcfbfc"
 
-
 		Text {
 			anchors.verticalCenter: parent.verticalCenter
 			anchors.horizontalCenter: parent.horizontalCenter
@@ -116,27 +115,6 @@ Rectangle {
 			}
 		}
 
-		Button
-		{
-			anchors.verticalCenter: parent.verticalCenter
-			anchors.left: parent.right
-			anchors.leftMargin: 10
-			width: 38
-			height: 28
-			visible: false
-			text: qsTr("Log")
-			objectName: "status"
-			id: logslink
-			action: displayLogAction
-		}
-
-		Action {
-			id: displayLogAction
-			onTriggered: {
-				mainContent.displayCompilationErrorIfAny();
-			}
-		}
-
 		Button
 		{
 			anchors.fill: parent
@@ -157,6 +135,25 @@ Rectangle {
 		}
 	}
 
+	Button
+	{
+		id: logslink
+		anchors.left: statusContainer.right
+		anchors.leftMargin: 9
+		visible: false
+		anchors.verticalCenter: parent.verticalCenter
+		action: displayLogAction
+		iconSource: "qrc:/qml/img/search_filled.png"
+	}
+
+	Action {
+		id: displayLogAction
+		tooltip: qsTr("Display Log")
+		onTriggered: {
+			mainContent.displayCompilationErrorIfAny();
+		}
+	}
+
 	Rectangle
 	{
 		color: "transparent"
@@ -167,9 +164,13 @@ Rectangle {
 		RowLayout
 		{
 			anchors.fill: parent
-			Rectangle {
+			anchors.top: statusHeader.top
+			anchors.right: statusHeader.right
+			Rectangle
+			{
 				color: "transparent"
 				anchors.fill: parent
+
 				Button
 				{
 					anchors.right: parent.right
diff --git a/mix/qml/img/search_filled.png b/mix/qml/img/search_filled.png
new file mode 100644
index 0000000000000000000000000000000000000000..c459e7cbddfec54248dcfeb1fc5c54289c95798f
GIT binary patch
literal 625
zcmV-%0*?KOP)<h;3K|Lk000e1NJLTq0015U0015c1^@s7OgEl100004XF*Lt006O%
z3;baP00006VoOIv0RI600RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru
z-va^(COXI#*BAf*0q#jeK~zY`)mAZ1#4r#X`vr77fC!m_20DZgv|NrR53zI-1uuZ+
zkn#@Xh6_C)M8`EW5pX<!h8J+5vC*Dm$M)qwVk^t>?s#`6I|lk$QPz!rw<zm50C4h+
z*(aILwF#mXW&PBOt3hd4uB2%CCCXg*N(yE$&m5PXnB?~y5%bnbz0PgSF@TYc%i`PN
zO2zW301U`hrKA{k)qw$+FVvuYjYdg9TmQp@Yo8<8XLc^UlQ)5Vt|JctQ~>5hS)Wq}
zU3X_nY?;5omtItms6H;!XFKYalA`W(*5u56D6TwBMF+atEjATpJpwQWaI2&^a`m|)
zEwd3X_43f!XKlljE8ETwsnw>=+kKqx(`M~rtIUC2CB;<ltpWJd`|C=I4=+hbfX2i7
zOi3|Y38#62e@23ABsuHrX88BUI*Mx)f_AOx@Of2IY!+n=CB;&6#2yJ30Imq<m{DBK
zzkL7`a(<?y$dZ69`gjG(Q=yz*AT*n~OPK*2060l(+YJQ^&2=BGpHm+&<oq;s08!iT
zLD-#C;778a^mvUnR6&B|(l3Bx%OQ$jM90i8cW3Ka)PLNivPudT^B@SZnnh$|zXNTn
z0GtB&0`L+m4{X(=P^-Y3M=9P7`&SMel4H{Xj^8y-BrW>`ys&)(-$3vAgPY?M00000
LNkvXXu0mjfqs<AD

literal 0
HcmV?d00001

diff --git a/mix/qml/js/TransactionHelper.js b/mix/qml/js/TransactionHelper.js
index ca004e126..95208a82d 100644
--- a/mix/qml/js/TransactionHelper.js
+++ b/mix/qml/js/TransactionHelper.js
@@ -22,13 +22,14 @@ function rpcCall(requests, callBack)
 	httpRequest.setRequestHeader("Connection", "close");
 	httpRequest.onreadystatechange = function() {
 		if (httpRequest.readyState === XMLHttpRequest.DONE) {
-			if (httpRequest.status !== 200)
+			if (httpRequest.status !== 200 || httpRequest.responseText === "")
 			{
 				var errorText = qsTr("Deployment error: Error while registering Dapp ") + httpRequest.status;
 				console.log(errorText);
 				deploymentError(errorText);
 			}
-			callBack(httpRequest.status, httpRequest.responseText)
+			else
+				callBack(httpRequest.status, httpRequest.responseText)
 		}
 	}
 	httpRequest.send(rpcRequest);
diff --git a/mix/res.qrc b/mix/res.qrc
index b2a6385a1..852983eae 100644
--- a/mix/res.qrc
+++ b/mix/res.qrc
@@ -102,5 +102,6 @@
         <file>qml/WebPreviewStyle.qml</file>
         <file>qml/img/available_updates.png</file>
         <file>qml/DeploymentDialog.qml</file>
+        <file>qml/img/search_filled.png</file>
     </qresource>
 </RCC>