Browse Source

Merge pull request #1540 from yann300/ui_macos

Mix - Various fixes
cl-refactor
Arkadiy Paronyan 10 years ago
parent
commit
59cc48b3b9
  1. 5
      mix/qml/LogsPane.qml
  2. 28
      mix/qml/StatusPane.qml
  3. 2
      mix/qml/WebPreview.qml

5
mix/qml/LogsPane.qml

@ -7,6 +7,11 @@ import org.ethereum.qml.SortFilterProxyModel 1.0
Rectangle Rectangle
{ {
property variant currentStatus; property variant currentStatus;
function clear()
{
logsModel.clear();
}
function push(_level, _type, _content) function push(_level, _type, _content)
{ {
_content = _content.replace(/\n/g, " ") _content = _content.replace(/\n/g, " ")

28
mix/qml/StatusPane.qml

@ -27,7 +27,6 @@ Rectangle {
debugImg.state = ""; debugImg.state = "";
currentStatus = { "type": "Comp", "date": Qt.formatDateTime(new Date(), "hh:mm:ss"), "content": status.text, "level": "error" } currentStatus = { "type": "Comp", "date": Qt.formatDateTime(new Date(), "hh:mm:ss"), "content": status.text, "level": "error" }
} }
debugRunActionIcon.enabled = codeModel.hasContract;
} }
function infoMessage(text, type) function infoMessage(text, type)
@ -77,7 +76,11 @@ Rectangle {
Connections { Connections {
target:clientModel target:clientModel
onRunStarted: infoMessage(qsTr("Running transactions..."), "Run"); onRunStarted:
{
logPane.clear()
infoMessage(qsTr("Running transactions..."), "Run");
}
onRunFailed: errorMessage(format(_message), "Run"); onRunFailed: errorMessage(format(_message), "Run");
onRunComplete: infoMessage(qsTr("Run complete"), "Run"); onRunComplete: infoMessage(qsTr("Run complete"), "Run");
onNewBlock: infoMessage(qsTr("New block created"), "State"); onNewBlock: infoMessage(qsTr("New block created"), "State");
@ -281,24 +284,9 @@ Rectangle {
anchors.rightMargin: 9 anchors.rightMargin: 9
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
id: debugImg id: debugImg
iconSource: "qrc:/qml/img/bugiconinactive.png" text: ""
action: debugRunActionIcon iconSource: "qrc:/qml/img/bugiconactive.png"
states: [ action: showHideRightPanelAction
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
} }
} }
} }

2
mix/qml/WebPreview.qml

@ -355,7 +355,7 @@ Item {
height: 22 height: 22
width: 22 width: 22
action: clearAction action: clearAction
iconSource: "qrc:/qml/img/broom.png" iconSource: "qrc:/qml/img/cleariconactive.png"
} }
Action { Action {

Loading…
Cancel
Save