diff --git a/mix/qml/DebugInfoList.qml b/mix/qml/DebugInfoList.qml
index 5b1a67519..b479d6d28 100644
--- a/mix/qml/DebugInfoList.qml
+++ b/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
}
diff --git a/mix/qml/Debugger.qml b/mix/qml/Debugger.qml
index e5c7e576d..ef83ef390 100644
--- a/mix/qml/Debugger.qml
+++ b/mix/qml/Debugger.qml
@@ -206,8 +206,8 @@ Rectangle {
anchors.top: parent.top
anchors.topMargin: 15
anchors.left: parent.left;
- anchors.leftMargin: machineStates.sideMargin
- width: debugScrollArea.width - machineStates.sideMargin * 2 - 20;
+ anchors.leftMargin: machineStates.sideMargin
+ width: debugScrollArea.width - machineStates.sideMargin * 2 - 20 ;
spacing: machineStates.sideMargin
Rectangle {
@@ -218,15 +218,13 @@ Rectangle {
color: "transparent"
Rectangle {
- anchors.top: parent.top
- anchors.bottom: parent.bottom
- anchors.left: parent.left
+ anchors.fill: parent
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 {
- anchors.top: parent.top
- anchors.bottom: parent.bottom
- anchors.right: parent.right
- width: parent.width * 0.6
- color: "transparent"
- Slider {
- id: statesSlider
- anchors.fill: parent
- tickmarksEnabled: true
- stepSize: 1.0
- onValueChanged: Debugger.jumpTo(value);
- style: SliderStyle {
- groove: Rectangle {
- implicitHeight: 3
- color: "#7da4cd"
- radius: 8
- }
- handle: Rectangle {
- anchors.centerIn: parent
- color: control.pressed ? "white" : "lightgray"
- border.color: "gray"
- border.width: 2
- implicitWidth: 10
- implicitHeight: 10
- radius: 12
+ Rectangle {
+ anchors.top: parent.top
+ anchors.bottom: parent.bottom
+ anchors.right: parent.right
+ color: "transparent"
+ Layout.fillWidth: true
+ Layout.minimumWidth: parent.width * 0.2
+ Layout.alignment: Qt.AlignRight
+
+ Slider {
+ id: statesSlider
+ anchors.fill: parent
+ tickmarksEnabled: true
+ stepSize: 1.0
+ onValueChanged: Debugger.jumpTo(value);
+ style: SliderStyle {
+ groove: Rectangle {
+ implicitHeight: 3
+ color: "#7da4cd"
+ radius: 8
+ }
+ handle: Rectangle {
+ anchors.centerIn: parent
+ color: control.pressed ? "white" : "lightgray"
+ border.color: "gray"
+ 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
{
diff --git a/mix/qml/StatusPane.qml b/mix/qml/StatusPane.qml
index f3bde4a04..75a2edd4f 100644
--- a/mix/qml/StatusPane.qml
+++ b/mix/qml/StatusPane.qml
@@ -230,13 +230,26 @@ Rectangle {
Button
{
z: 4
- anchors.right: parent.right
- anchors.rightMargin: 9
- anchors.verticalCenter: parent.verticalCenter
+ anchors.centerIn: parent
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
+ }
+ }
+ }
}
}
}
diff --git a/mix/qml/html/cm/solarized.css b/mix/qml/html/cm/solarized.css
index d8c31bfb5..b8cede806 100644
--- a/mix/qml/html/cm/solarized.css
+++ b/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; }
diff --git a/mix/qml/img/closedtriangleindicator.png b/mix/qml/img/closedtriangleindicator.png
index 440adb711..ccf6c66d4 100644
Binary files a/mix/qml/img/closedtriangleindicator.png and b/mix/qml/img/closedtriangleindicator.png differ
diff --git a/mix/qml/img/closedtriangleindicator@2x.png b/mix/qml/img/closedtriangleindicator@2x.png
new file mode 100644
index 000000000..b12cfef9c
Binary files /dev/null and b/mix/qml/img/closedtriangleindicator@2x.png differ
diff --git a/mix/qml/img/opentriangleindicator.png b/mix/qml/img/opentriangleindicator.png
index 591a932e0..5da188206 100644
Binary files a/mix/qml/img/opentriangleindicator.png and b/mix/qml/img/opentriangleindicator.png differ
diff --git a/mix/qml/img/opentriangleindicator@2x.png b/mix/qml/img/opentriangleindicator@2x.png
index fd948d73b..320749684 100644
Binary files a/mix/qml/img/opentriangleindicator@2x.png and b/mix/qml/img/opentriangleindicator@2x.png differ
diff --git a/mix/qml/img/signerroricon32.png b/mix/qml/img/signerroricon32.png
deleted file mode 100644
index 703ac5e2c..000000000
Binary files a/mix/qml/img/signerroricon32.png and /dev/null differ
diff --git a/mix/qml/img/warningicon.png b/mix/qml/img/warningicon.png
new file mode 100644
index 000000000..0215030da
Binary files /dev/null and b/mix/qml/img/warningicon.png differ
diff --git a/mix/qml/img/warningicon@2x.png b/mix/qml/img/warningicon@2x.png
new file mode 100644
index 000000000..e41615f37
Binary files /dev/null and b/mix/qml/img/warningicon@2x.png differ
diff --git a/mix/res.qrc b/mix/res.qrc
index f5798ca58..f175fab1f 100644
--- a/mix/res.qrc
+++ b/mix/res.qrc
@@ -20,6 +20,7 @@
qml/img/bugiconactive.png
qml/img/bugiconinactive.png
qml/img/closedtriangleindicator.png
+ qml/img/closedtriangleindicator@2x.png
qml/img/closedtriangleindicator_filesproject.png
qml/img/console.png
qml/img/copy.png
@@ -43,6 +44,7 @@
qml/img/note.png
qml/img/openedfolder.png
qml/img/opentriangleindicator.png
+ qml/img/opentriangleindicator@2x.png
qml/img/opentriangleindicator_filesproject.png
qml/img/plus.png
qml/img/projecticon.png
@@ -63,6 +65,7 @@
qml/img/copyiconactive.png
qml/img/searchicon.png
qml/img/stop_button2x.png
- qml/img/signerroricon32.png
+ qml/img/warningicon.png
+ qml/img/warningicon@2x.png