Merge pull request #1572 from alexvandesande/UI

UI

mix/qml/DebugInfoList.qml

@@ -40,11 +40,9 @@ ColumnLayout {
 		height: 25
 		id: header
 		Image {
-			source: "qrc:/qml/img/opentriangleindicator.png"
+			source: "img/closedtriangleindicator.png"
 			width: 15
 			height: 15
-			sourceSize.width: 15
-			sourceSize.height: 15
 			id: storageImgArrow
 		}
 

mix/qml/Debugger.qml

@@ -206,8 +206,8 @@ Rectangle {
 				anchors.top: parent.top
 				anchors.topMargin: 15
 				anchors.left: parent.left;
-				anchors.leftMargin: machineStates.sideMargin
+				anchors.leftMargin: machineStates.sideMargin 
-				width: debugScrollArea.width - machineStates.sideMargin * 2 - 20;
+				width: debugScrollArea.width - machineStates.sideMargin * 2 - 20 ;
 				spacing: machineStates.sideMargin
 
 				Rectangle {
@@ -218,15 +218,13 @@ Rectangle {
 					color: "transparent"
 
 					Rectangle {
-						anchors.top: parent.top
+						anchors.fill: parent
-						anchors.bottom: parent.bottom
-						anchors.left: parent.left
 						color: "transparent"
-						width: parent.width * 0.4
 						RowLayout {
-							anchors.horizontalCenter: parent.horizontalCenter
+							anchors.fill: parent
 							id: jumpButtons
 							spacing: 3
+							layoutDirection: Qt.LeftToRight
 
 							StepActionImage
 							{
@@ -239,6 +237,7 @@ Rectangle {
 								buttonShortcut: "Ctrl+Shift+F8"
 								buttonTooltip: qsTr("Start Debugging")
 								visible: true
+								Layout.alignment: Qt.AlignLeft
 							}
 
 							StepActionImage
@@ -351,35 +350,38 @@ Rectangle {
 								buttonTooltip: qsTr("Run Forward")
 								visible: false
 							}
-						}
-					}
 
-					Rectangle {
+							Rectangle {
-						anchors.top: parent.top
+								anchors.top: parent.top
-						anchors.bottom: parent.bottom
+								anchors.bottom: parent.bottom
-						anchors.right: parent.right
+								anchors.right: parent.right
-						width: parent.width * 0.6
+								color: "transparent"
-						color: "transparent"
+								Layout.fillWidth: true
-						Slider {
+								Layout.minimumWidth: parent.width * 0.2
-							id: statesSlider
+								Layout.alignment: Qt.AlignRight
-							anchors.fill: parent
+
-							tickmarksEnabled: true
+								Slider {
-							stepSize: 1.0
+									id: statesSlider
-							onValueChanged: Debugger.jumpTo(value);
+									anchors.fill: parent
-							style: SliderStyle {
+									tickmarksEnabled: true
-								groove: Rectangle {
+									stepSize: 1.0
-									implicitHeight: 3
+									onValueChanged: Debugger.jumpTo(value);
-									color: "#7da4cd"
+									style: SliderStyle {
-									radius: 8
+										groove: Rectangle {
-								}
+											implicitHeight: 3
-								handle: Rectangle {
+											color: "#7da4cd"
-									anchors.centerIn: parent
+											radius: 8
-									color: control.pressed ? "white" : "lightgray"
+										}
-									border.color: "gray"
+										handle: Rectangle {
-									border.width: 2
+											anchors.centerIn: parent
-									implicitWidth: 10
+											color: control.pressed ? "white" : "lightgray"
-									implicitHeight: 10
+											border.color: "gray"
-									radius: 12
+											border.width: 2
+											implicitWidth: 10
+											implicitHeight: 10
+											radius: 12
+										}
+									}
 								}
 							}
 						}
@@ -480,7 +482,7 @@ Rectangle {
 						anchors.top : parent.top
 						anchors.bottom: parent.bottom
 						anchors.right: parent.right
-						height: parent.height //- 2 * stateListContainer.border.width
+						height: parent.height
 						color: "transparent"
 						ColumnLayout
 						{
@@ -520,7 +522,6 @@ Rectangle {
 								title : qsTr("Stack")
 								itemDelegate: Item {
 									id: renderedItem
-									//height: 25
 									width: parent.width
 									RowLayout
 									{

mix/qml/StatusPane.qml

@@ -230,13 +230,26 @@ Rectangle {
 					Button
 					{
 						z: 4
-						anchors.right: parent.right
+						anchors.centerIn: parent
-						anchors.rightMargin: 9
-						anchors.verticalCenter: parent.verticalCenter
 						id: goToLineBtn
 						text: ""
-						iconSource: "qrc:/qml/img/signerroricon32.png"
+						width: 30
+						height: 30
 						action: goToCompilationError
+						style: ButtonStyle {
+							background: Rectangle {
+								color: "transparent"
+
+								Image { 
+									source: "qrc:/qml/img/warningicon.png"
+									height: 30
+									width: 30
+									sourceSize.width: 30
+        							sourceSize.height: 30
+        							anchors.centerIn: parent
+								}
+							}
+						}
 					}
 				}
 			}

mix/qml/html/cm/solarized.css

@@ -154,8 +154,10 @@ http://ethanschoonover.com/solarized/img/solarized-palette.png
 }
 
 /*
+
 Active line. Negative margin compensates left padding of the text in the
 view-port
+
 */
 .cm-s-solarized.cm-s-dark .CodeMirror-activeline-background {
   background: rgba(255, 255, 255, 0.10);
@@ -166,20 +168,24 @@ view-port
 
 /* Code execution */
 .CodeMirror-exechighlight {
-	background: #eee8d5;
+  border-bottom: double 1px #94A2A2;
 }
 
+
 /* Error annotation */
 .CodeMirror-errorannotation {
-	border-bottom: 1px solid #b58900;
+	border-bottom: 1px solid #DD3330;
+  margin-bottom: 4px;
 }
 
 .CodeMirror-errorannotation-context {
 	font-family: monospace;
 	font-size: small;
-	color: #586e75;
+	color: #EEE9D5;
 	background: #b58900;
 	padding: 2px;
+  text-shadow: none !important;
+  border-top: solid 2px #063742;
 }
 
 span.CodeMirror-selectedtext { color: #586e75 !important; }

mix/res.qrc

@@ -20,6 +20,7 @@
         <file>qml/img/bugiconactive.png</file>
         <file>qml/img/bugiconinactive.png</file>
         <file>qml/img/closedtriangleindicator.png</file>
+        <file>qml/img/closedtriangleindicator@2x.png</file>
         <file>qml/img/closedtriangleindicator_filesproject.png</file>
         <file>qml/img/console.png</file>
         <file>qml/img/copy.png</file>
@@ -43,6 +44,7 @@
         <file>qml/img/note.png</file>
         <file>qml/img/openedfolder.png</file>
         <file>qml/img/opentriangleindicator.png</file>
+        <file>qml/img/opentriangleindicator@2x.png</file>
         <file>qml/img/opentriangleindicator_filesproject.png</file>
         <file>qml/img/plus.png</file>
         <file>qml/img/projecticon.png</file>
@@ -63,6 +65,7 @@
         <file>qml/img/copyiconactive.png</file>
         <file>qml/img/searchicon.png</file>
         <file>qml/img/stop_button2x.png</file>
-        <file>qml/img/signerroricon32.png</file>
+        <file>qml/img/warningicon.png</file>
+        <file>qml/img/warningicon@2x.png</file>
     </qresource>
 </RCC>