Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop

mix/qml/Debugger.qml

@@ -164,7 +164,7 @@ Rectangle {
 				Rectangle {
 					// step button + slider
 					id: buttonRow
-					height: 27
+					height: 30
 					Layout.fillWidth: true
 					color: "transparent"
 
@@ -184,7 +184,7 @@ Rectangle {
 								enabledStateImg: "qrc:/qml/img/jumpoutback.png"
 								disableStateImg: "qrc:/qml/img/jumpoutbackdisabled.png"
 								onClicked: Debugger.stepOutBack()
-								width: 28
+								width: 30
 								height: 30
 								buttonShortcut: "Ctrl+Shift+F11"
 								buttonTooltip: qsTr("Step Out Back")
@@ -196,7 +196,7 @@ Rectangle {
 								enabledStateImg: "qrc:/qml/img/jumpintoback.png"
 								disableStateImg: "qrc:/qml/img/jumpintobackdisabled.png"
 								onClicked: Debugger.stepIntoBack()
-								width: 28
+								width: 30
 								height: 30
 								buttonShortcut: "Ctrl+F11"
 								buttonTooltip: qsTr("Step Into Back")
@@ -208,7 +208,7 @@ Rectangle {
 								enabledStateImg: "qrc:/qml/img/jumpoverback.png"
 								disableStateImg: "qrc:/qml/img/jumpoverbackdisabled.png"
 								onClicked: Debugger.stepOverBack()
-								width: 28
+								width: 30
 								height: 30
 								buttonShortcut: "Ctrl+F10"
 								buttonTooltip: qsTr("Step Over Back")
@@ -220,7 +220,7 @@ Rectangle {
 								enabledStateImg: "qrc:/qml/img/jumpoverforward.png"
 								disableStateImg: "qrc:/qml/img/jumpoverforwarddisabled.png"
 								onClicked: Debugger.stepOverForward()
-								width: 28
+								width: 30
 								height: 30
 								buttonShortcut: "F10"
 								buttonTooltip: qsTr("Step Over Forward")
@@ -232,7 +232,7 @@ Rectangle {
 								enabledStateImg: "qrc:/qml/img/jumpintoforward.png"
 								disableStateImg: "qrc:/qml/img/jumpintoforwarddisabled.png"
 								onClicked: Debugger.stepIntoForward()
-								width: 28
+								width: 30
 								height: 30
 								buttonShortcut: "F11"
 								buttonTooltip: qsTr("Step Into Forward")
@@ -244,7 +244,7 @@ Rectangle {
 								enabledStateImg: "qrc:/qml/img/jumpoutforward.png"
 								disableStateImg: "qrc:/qml/img/jumpoutforwarddisabled.png"
 								onClicked: Debugger.stepOutForward()
-								width: 28
+								width: 30
 								height: 30
 								buttonShortcut: "Shift+F11"
 								buttonTooltip: qsTr("Step Out Forward")

mix/qml/ProjectList.qml

@@ -25,11 +25,15 @@ Item {
 			Layout.fillWidth: true
 			Image {
 				id: projectIcon
-				source: "qrc:/qml/img/projecticon.png"
+				source: "qrc:/qml/img/dappProjectIcon.png"
-				sourceSize.height: 30
+				//sourceSize.height: 32
 				anchors.right: projectTitle.left
 				anchors.verticalCenter: parent.verticalCenter
 				anchors.rightMargin: 6
+				//anchors.centerIn: parent
+				fillMode: Image.PreserveAspectFit
+				width: 32
+				height: 32
 			}
 
 			Text
@@ -115,7 +119,7 @@ Item {
 											ci++;
 										}
 									}
-								}
+								}	
 							}
 						}
 

mix/qml/StepActionImage.qml

@@ -16,19 +16,26 @@ Rectangle {
 	{
 		buttonAction.enabled = state;
 		if (state)
-			debugImg.iconSource = enabledStateImg;
+			debugImage.source = enabledStateImg;
 		else
-			debugImg.iconSource = disableStateImg;
+			debugImage.source = disableStateImg;
 	}
 
 	Button
 	{
 		anchors.fill: parent
 		id: debugImg
-		iconSource: enabledStateImg
+/*		iconSource: enabledStateImg
-		action: buttonAction
+*/		action: buttonAction
-		width: buttonActionContainer.width - 3
+	}
-		height: buttonActionContainer.height
+
+	Image {
+		id: debugImage
+		source: enabledStateImg
+		anchors.centerIn: parent
+		fillMode: Image.PreserveAspectFit
+		width: 15
+		height: 15
 	}
 
 	Action {

mix/qml/html/cm/codemirror.css

@@ -5,7 +5,7 @@
   font-family: monospace;
   border: 1px solid black;
   height: 100%;
-  font-size:16px
+  font-size:12px
 }
 
 /* PADDING */

mix/res.qrc

@@ -10,12 +10,14 @@
         <file>qml/StateDialog.qml</file>
         <file>qml/StateList.qml</file>
         <file>qml/StateListModel.qml</file>
+        <file>qml/img/dappProjectIcon.png</file>
         <file>qml/img/jumpintoback.png</file>
         <file>qml/img/jumpintoforward.png</file>
         <file>qml/img/jumpoutback.png</file>
         <file>qml/img/jumpoutforward.png</file>
         <file>qml/img/jumpoverback.png</file>
         <file>qml/img/jumpoverforward.png</file>
+        <file>qml/img/jumpoverforwarddisabled.png</file>
         <file>qml/StepActionImage.qml</file>
         <file>qml/img/jumpintobackdisabled.png</file>
         <file>qml/img/jumpintoforwarddisabled.png</file>