diff --git a/mix/qml/LogsPane.qml b/mix/qml/LogsPane.qml index d8d73ac0c..082c55386 100644 --- a/mix/qml/LogsPane.qml +++ b/mix/qml/LogsPane.qml @@ -7,6 +7,11 @@ import org.ethereum.qml.SortFilterProxyModel 1.0 Rectangle { property variant currentStatus; + function clear() + { + logsModel.clear(); + } + function push(_level, _type, _content) { _content = _content.replace(/\n/g, " ") diff --git a/mix/qml/StatusPane.qml b/mix/qml/StatusPane.qml index a1f3ebe13..72d9ded9b 100644 --- a/mix/qml/StatusPane.qml +++ b/mix/qml/StatusPane.qml @@ -27,7 +27,6 @@ Rectangle { debugImg.state = ""; currentStatus = { "type": "Comp", "date": Qt.formatDateTime(new Date(), "hh:mm:ss"), "content": status.text, "level": "error" } } - debugRunActionIcon.enabled = codeModel.hasContract; } function infoMessage(text, type) @@ -77,7 +76,11 @@ Rectangle { Connections { target:clientModel - onRunStarted: infoMessage(qsTr("Running transactions..."), "Run"); + onRunStarted: + { + logPane.clear() + infoMessage(qsTr("Running transactions..."), "Run"); + } onRunFailed: errorMessage(format(_message), "Run"); onRunComplete: infoMessage(qsTr("Run complete"), "Run"); onNewBlock: infoMessage(qsTr("New block created"), "State"); @@ -281,24 +284,9 @@ Rectangle { anchors.rightMargin: 9 anchors.verticalCenter: parent.verticalCenter id: debugImg - iconSource: "qrc:/qml/img/bugiconinactive.png" - action: debugRunActionIcon - states: [ - State{ - name: "active" - PropertyChanges { target: debugImg; iconSource: "qrc:/qml/img/bugiconactive.png"} - } - ] - } - Action { - id: debugRunActionIcon - onTriggered: { - if (mainContent.rightViewIsVisible()) - mainContent.hideRightView() - else - mainContent.startQuickDebugging(); - } - enabled: false + text: "" + iconSource: "qrc:/qml/img/bugiconactive.png" + action: showHideRightPanelAction } } } diff --git a/mix/qml/WebPreview.qml b/mix/qml/WebPreview.qml index 5fc2533aa..58bb3c64d 100644 --- a/mix/qml/WebPreview.qml +++ b/mix/qml/WebPreview.qml @@ -355,7 +355,7 @@ Item { height: 22 width: 22 action: clearAction - iconSource: "qrc:/qml/img/broom.png" + iconSource: "qrc:/qml/img/cleariconactive.png" } Action {