From cac90f6d1136d69ae885bec1cd0e960714d978a6 Mon Sep 17 00:00:00 2001 From: yann300 Date: Tue, 7 Apr 2015 11:15:12 +0200 Subject: [PATCH 1/4] Replace iconSource --- mix/qml/WebPreview.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mix/qml/WebPreview.qml b/mix/qml/WebPreview.qml index d2b52be65..8f142425f 100644 --- a/mix/qml/WebPreview.qml +++ b/mix/qml/WebPreview.qml @@ -345,7 +345,7 @@ Item { height: 22 width: 22 action: clearAction - iconSource: "qrc:/qml/img/broom.png" + iconSource: "qrc:/qml/img/cleariconactive.png" } Action { From b8fcd98fe5886f6f15d8a4d34dfbaa370b1cdad5 Mon Sep 17 00:00:00 2001 From: yann300 Date: Tue, 7 Apr 2015 11:32:25 +0200 Subject: [PATCH 2/4] Clear historical issues. --- mix/qml/LogsPane.qml | 5 +++++ mix/qml/StatusPane.qml | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) 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..176a89c5f 100644 --- a/mix/qml/StatusPane.qml +++ b/mix/qml/StatusPane.qml @@ -77,7 +77,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"); From 9ffe3926f24fec616f713fc71ce23b5d26802fcb Mon Sep 17 00:00:00 2001 From: yann300 Date: Tue, 7 Apr 2015 11:47:55 +0200 Subject: [PATCH 3/4] fix #1534 --- mix/qml/StatusPane.qml | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/mix/qml/StatusPane.qml b/mix/qml/StatusPane.qml index 176a89c5f..1c0fde257 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) @@ -285,24 +284,15 @@ Rectangle { anchors.rightMargin: 9 anchors.verticalCenter: parent.verticalCenter id: debugImg - iconSource: "qrc:/qml/img/bugiconinactive.png" + iconSource: "qrc:/qml/img/bugiconactive.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(); + mainContent.toggleRightView(); } - enabled: false + enabled: true } } } From 5fdd9da517953c2286b928154bb631236810eabb Mon Sep 17 00:00:00 2001 From: yann300 Date: Tue, 7 Apr 2015 12:17:06 +0200 Subject: [PATCH 4/4] use application.qml action for show/hide right view --- mix/qml/StatusPane.qml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/mix/qml/StatusPane.qml b/mix/qml/StatusPane.qml index 1c0fde257..72d9ded9b 100644 --- a/mix/qml/StatusPane.qml +++ b/mix/qml/StatusPane.qml @@ -284,15 +284,9 @@ Rectangle { anchors.rightMargin: 9 anchors.verticalCenter: parent.verticalCenter id: debugImg + text: "" iconSource: "qrc:/qml/img/bugiconactive.png" - action: debugRunActionIcon - } - Action { - id: debugRunActionIcon - onTriggered: { - mainContent.toggleRightView(); - } - enabled: true + action: showHideRightPanelAction } } }