Merge pull request #2831 from alexvandesande/ui-fixes-avsa

edit button changes, color of selected blocks

mix/qml/Block.qml

@@ -23,6 +23,11 @@ ColumnLayout
 	property int blockIndex
 	property variant scenario
 	property string labelColor: "#414141"
+
+
+	property string selectedBlockColor: "#accbf2"
+	property string selectedBlockForeground: "#445e7f"
+
 	property int scenarioIndex
 	signal txSelected(var txIndex)
 
@@ -105,14 +110,15 @@ ColumnLayout
 				}
 			}
 
-			Label
+			Image {
-			{
-				text: qsTr("EDIT")
-				color:  "#1397da"
 				anchors.verticalCenter: parent.verticalCenter
 				anchors.right: parent.right
 				anchors.rightMargin: 14
 				visible: number === -2
+				source: "qrc:/qml/img/edit_combox.png"
+				height: 15
+				fillMode: Image.PreserveAspectFit
+
 				MouseArea
 				{
 					anchors.fill: parent
@@ -122,6 +128,7 @@ ColumnLayout
 						projectModel.stateListModel.editState(scenarioIndex)
 					}
 				}
+			
 			}
 		}
 	}
@@ -237,11 +244,12 @@ ColumnLayout
 
 				function select()
 				{
-					rowContentTr.selected = true
+					rowContentTr.selected = true	
-					rowContentTr.color = "#4F4F4F"
+					rowContentTr.color = selectedBlockColor
-					hash.color = "#EAB920"
+					hash.color = selectedBlockForeground
-					func.color = "#EAB920"
+					func.color = selectedBlockForeground
 					txSelected(index)
+
 				}
 
 				function deselect()
@@ -345,7 +353,7 @@ ColumnLayout
 
 				Image {
 					id: debugImg
-					source: "qrc:/qml/img/rightarrow@2x.png"
+					source: "qrc:/qml/img/rightarrowcircle.png"
 					width: debugActionWidth
 					fillMode: Image.PreserveAspectFit
 					anchors.horizontalCenter: parent.horizontalCenter

mix/qml/Watchers.qml

@@ -12,13 +12,16 @@ import "js/QEtherHelper.js" as QEtherHelper
 import "."
 
 Rectangle {
-	color: "#4F4F4F"
+	color: selectedBlockColor
 	property variant tx
 	property variant currentState
 	property variant bc
 	property var blockIndex
 	property var txIndex
 
+	property string selectedBlockColor: "#accbf2"
+	property string selectedBlockForeground: "#445e7f"
+
 	function clear()
 	{
 		from.text = ""
@@ -83,11 +86,11 @@ Rectangle {
 					id: fromLabel
 					text: qsTr("from")
 					visible: false
-					color: "#EAB920"					
+					color: selectedBlockForeground					
 				}
 				Label {
 					id: from
-					color: "#EAB920"
+					color: selectedBlockForeground
 					elide: Text.ElideRight
 					maximumLineCount: 1
 					clip: true
@@ -97,11 +100,11 @@ Rectangle {
 					id: toLabel
 					text: qsTr("to")
 					visible: false
-					color: "#EAB920"
+					color: selectedBlockForeground
 				}
 				Label {
 					id: to
-					color: "#EAB920"
+					color: selectedBlockForeground
 					elide: Text.ElideRight
 					maximumLineCount: 1
 					clip: true
@@ -109,7 +112,7 @@ Rectangle {
 				}
 				Label {
 					id: value
-					color: "#EAB920"
+					color: selectedBlockForeground
 					font.italic: true
 					clip: true
 				}
@@ -118,9 +121,9 @@ Rectangle {
 			Image {
 				anchors.right: rowHeader.parent.right
 				anchors.top: rowHeader.parent.top
-				anchors.topMargin: -3
+				anchors.topMargin: 5
-				source: "qrc:/qml/img/edittransaction2.png"
+				source: "qrc:/qml/img/edit_combox.png"
-				height: 30
+				height: 15
 				fillMode: Image.PreserveAspectFit
 				visible: from.text !== ""
 				MouseArea

mix/res.qrc

@@ -86,6 +86,7 @@
         <file>qml/img/restoreicon@2x.png</file>
         <file>qml/img/rightarrow.png</file>
         <file>qml/img/rightarrow@2x.png</file>
+        <file>qml/img/rightarrowcircle.png</file>
         <file>qml/img/saveicon.png</file>
         <file>qml/img/saveicon@2x.png</file>
         <file>qml/img/sendtransactionicon.png</file>