Browse Source

Merge pull request #1177 from yann300/ui_improvement2

small UI change
cl-refactor
Arkadiy Paronyan 10 years ago
parent
commit
728cf01435
  1. 47
      mix/qml/StatusPane.qml
  2. BIN
      mix/qml/img/search_filled.png
  3. 5
      mix/qml/js/TransactionHelper.js
  4. 1
      mix/res.qrc

47
mix/qml/StatusPane.qml

@ -75,7 +75,6 @@ Rectangle {
height: 30
color: "#fcfbfc"
Text {
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
@ -116,27 +115,6 @@ Rectangle {
}
}
Button
{
anchors.verticalCenter: parent.verticalCenter
anchors.left: parent.right
anchors.leftMargin: 10
width: 38
height: 28
visible: false
text: qsTr("Log")
objectName: "status"
id: logslink
action: displayLogAction
}
Action {
id: displayLogAction
onTriggered: {
mainContent.displayCompilationErrorIfAny();
}
}
Button
{
anchors.fill: parent
@ -157,6 +135,25 @@ Rectangle {
}
}
Button
{
id: logslink
anchors.left: statusContainer.right
anchors.leftMargin: 9
visible: false
anchors.verticalCenter: parent.verticalCenter
action: displayLogAction
iconSource: "qrc:/qml/img/search_filled.png"
}
Action {
id: displayLogAction
tooltip: qsTr("Display Log")
onTriggered: {
mainContent.displayCompilationErrorIfAny();
}
}
Rectangle
{
color: "transparent"
@ -167,9 +164,13 @@ Rectangle {
RowLayout
{
anchors.fill: parent
Rectangle {
anchors.top: statusHeader.top
anchors.right: statusHeader.right
Rectangle
{
color: "transparent"
anchors.fill: parent
Button
{
anchors.right: parent.right

BIN
mix/qml/img/search_filled.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 625 B

5
mix/qml/js/TransactionHelper.js

@ -22,13 +22,14 @@ function rpcCall(requests, callBack)
httpRequest.setRequestHeader("Connection", "close");
httpRequest.onreadystatechange = function() {
if (httpRequest.readyState === XMLHttpRequest.DONE) {
if (httpRequest.status !== 200)
if (httpRequest.status !== 200 || httpRequest.responseText === "")
{
var errorText = qsTr("Deployment error: Error while registering Dapp ") + httpRequest.status;
console.log(errorText);
deploymentError(errorText);
}
callBack(httpRequest.status, httpRequest.responseText)
else
callBack(httpRequest.status, httpRequest.responseText)
}
}
httpRequest.send(rpcRequest);

1
mix/res.qrc

@ -102,5 +102,6 @@
<file>qml/WebPreviewStyle.qml</file>
<file>qml/img/available_updates.png</file>
<file>qml/DeploymentDialog.qml</file>
<file>qml/img/search_filled.png</file>
</qresource>
</RCC>

Loading…
Cancel
Save