Gav Wood
10 years ago
43 changed files with 1416 additions and 504 deletions
@ -1,94 +0,0 @@ |
|||
/*
|
|||
This file is part of cpp-ethereum. |
|||
|
|||
cpp-ethereum is free software: you can redistribute it and/or modify |
|||
it under the terms of the GNU General Public License as published by |
|||
the Free Software Foundation, either version 3 of the License, or |
|||
(at your option) any later version. |
|||
|
|||
cpp-ethereum is distributed in the hope that it will be useful, |
|||
but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|||
GNU General Public License for more details. |
|||
|
|||
You should have received a copy of the GNU General Public License |
|||
along with cpp-ethereum. If not, see <http://www.gnu.org/licenses/>.
|
|||
*/ |
|||
/** @file ConstantCompilationControl.cpp
|
|||
* @author Yann yann@ethdev.com |
|||
* @date 2014 |
|||
* Ethereum IDE client. |
|||
*/ |
|||
|
|||
#include <QQmlContext> |
|||
#include <QQuickItem> |
|||
#include <QtCore/QFileInfo> |
|||
#include <QApplication> |
|||
#include <QQmlApplicationEngine> |
|||
#include <QtCore/QtCore> |
|||
#include <QDebug> |
|||
#include "ConstantCompilationControl.h" |
|||
#include "QContractDefinition.h" |
|||
#include "AppContext.h" |
|||
#include "CodeModel.h" |
|||
|
|||
using namespace dev::mix; |
|||
|
|||
|
|||
ConstantCompilationControl::ConstantCompilationControl(AppContext* _context): Extension(_context, ExtensionDisplayBehavior::Tab) |
|||
{ |
|||
connect(_context->codeModel(), &CodeModel::compilationComplete, this, &ConstantCompilationControl::update); |
|||
connect(_context->codeModel(), &CodeModel::compilationComplete, this, &ConstantCompilationControl::update); |
|||
} |
|||
|
|||
QString ConstantCompilationControl::contentUrl() const |
|||
{ |
|||
return QStringLiteral("qrc:/qml/BasicContent.qml"); |
|||
} |
|||
|
|||
QString ConstantCompilationControl::title() const |
|||
{ |
|||
return QApplication::tr("compiler"); |
|||
} |
|||
|
|||
void ConstantCompilationControl::start() const |
|||
{ |
|||
} |
|||
|
|||
void ConstantCompilationControl::update() |
|||
{ |
|||
auto result = m_ctx->codeModel()->code(); |
|||
|
|||
QObject* status = m_view->findChild<QObject*>("status", Qt::FindChildrenRecursively); |
|||
QObject* content = m_view->findChild<QObject*>("content", Qt::FindChildrenRecursively); |
|||
if (result->successful()) |
|||
{ |
|||
status->setProperty("text", "succeeded"); |
|||
status->setProperty("color", "green"); |
|||
content->setProperty("text", result->assemblyCode()); |
|||
} |
|||
else |
|||
{ |
|||
status->setProperty("text", "failure"); |
|||
status->setProperty("color", "red"); |
|||
content->setProperty("text", result->compilerMessage()); |
|||
} |
|||
} |
|||
|
|||
void ConstantCompilationControl::resetOutPut() |
|||
{ |
|||
QObject* status = m_view->findChild<QObject*>("status", Qt::FindChildrenRecursively); |
|||
QObject* content = m_view->findChild<QObject*>("content", Qt::FindChildrenRecursively); |
|||
status->setProperty("text", ""); |
|||
content->setProperty("text", ""); |
|||
} |
|||
|
|||
|
|||
void ConstantCompilationControl::displayError(QString const& _error) |
|||
{ |
|||
QObject* status = m_view->findChild<QObject*>("status", Qt::FindChildrenRecursively); |
|||
QObject* content = m_view->findChild<QObject*>("content", Qt::FindChildrenRecursively); |
|||
status->setProperty("text", "failure"); |
|||
status->setProperty("color", "red"); |
|||
content->setProperty("text", _error); |
|||
} |
|||
@ -0,0 +1,66 @@ |
|||
/*
|
|||
This file is part of cpp-ethereum. |
|||
|
|||
cpp-ethereum is free software: you can redistribute it and/or modify |
|||
it under the terms of the GNU General Public License as published by |
|||
the Free Software Foundation, either version 3 of the License, or |
|||
(at your option) any later version. |
|||
|
|||
cpp-ethereum is distributed in the hope that it will be useful, |
|||
but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|||
GNU General Public License for more details. |
|||
|
|||
You should have received a copy of the GNU General Public License |
|||
along with cpp-ethereum. If not, see <http://www.gnu.org/licenses/>.
|
|||
*/ |
|||
/** @file ConstantCompilationControl.cpp
|
|||
* @author Yann yann@ethdev.com |
|||
* @date 2014 |
|||
* Ethereum IDE client. |
|||
*/ |
|||
|
|||
#include <QQmlContext> |
|||
#include <QQuickItem> |
|||
#include <QtCore/QFileInfo> |
|||
#include <QApplication> |
|||
#include <QQmlApplicationEngine> |
|||
#include <QtCore/QtCore> |
|||
#include <QDebug> |
|||
#include "StatusPane.h" |
|||
#include "QContractDefinition.h" |
|||
#include "AppContext.h" |
|||
#include "CodeModel.h" |
|||
|
|||
using namespace dev::mix; |
|||
|
|||
StatusPane::StatusPane(AppContext* _context): Extension(_context, ExtensionDisplayBehavior::HeaderView) |
|||
{ |
|||
connect(_context->codeModel(), &CodeModel::compilationComplete, this, &StatusPane::update); |
|||
_context->appEngine()->rootContext()->setContextProperty("statusPane", this); |
|||
} |
|||
|
|||
QString StatusPane::contentUrl() const |
|||
{ |
|||
return QStringLiteral("qrc:/qml/StatusPane.qml"); |
|||
} |
|||
|
|||
QString StatusPane::title() const |
|||
{ |
|||
return QApplication::tr("compiler"); |
|||
} |
|||
|
|||
void StatusPane::start() const |
|||
{ |
|||
} |
|||
|
|||
CompilationResult* StatusPane::result() const |
|||
{ |
|||
return m_ctx->codeModel()->code(); |
|||
} |
|||
|
|||
void StatusPane::update() |
|||
{ |
|||
QObject* ctrl = m_view->findChild<QObject*>("statusPane", Qt::FindChildrenRecursively); |
|||
QMetaObject::invokeMethod(ctrl, "updateStatus"); |
|||
} |
|||
@ -0,0 +1,35 @@ |
|||
import QtQuick 2.2 |
|||
import QtQuick.Controls 1.1 |
|||
import QtQuick.Layouts 1.0 |
|||
import QtQuick.Controls.Styles 1.1 |
|||
|
|||
RowLayout { |
|||
property string titleStr |
|||
width: parent.width |
|||
height: parent.height / 4 |
|||
|
|||
function update(_value) |
|||
{ |
|||
currentStepValue.text = _value; |
|||
} |
|||
|
|||
Rectangle { |
|||
width: parent.width / 2 |
|||
height: parent.height |
|||
color: "#e5e5e5" |
|||
Text |
|||
{ |
|||
id: title |
|||
font.pixelSize: 12 |
|||
anchors.centerIn: parent |
|||
color: "#a2a2a2" |
|||
font.family: "Sans Serif" |
|||
text: titleStr |
|||
} |
|||
} |
|||
Text |
|||
{ |
|||
font.pixelSize: 13 |
|||
id: currentStepValue |
|||
} |
|||
} |
|||
@ -0,0 +1,83 @@ |
|||
import QtQuick 2.2 |
|||
import QtQuick.Controls 1.1 |
|||
import QtQuick.Layouts 1.0 |
|||
import QtQuick.Controls.Styles 1.1 |
|||
|
|||
ColumnLayout { |
|||
property string title |
|||
property variant listModel; |
|||
property bool collapsible; |
|||
property Component itemDelegate |
|||
spacing: 0 |
|||
RowLayout { |
|||
height: 25 |
|||
id: header |
|||
Image { |
|||
source: "qrc:/qml/img/opentriangleindicator.png" |
|||
width: 15 |
|||
sourceSize.width: 15 |
|||
id: storageImgArrow |
|||
visible: collapsible |
|||
} |
|||
|
|||
Text { |
|||
anchors.left: storageImgArrow.right |
|||
color: "#8b8b8b" |
|||
text: title |
|||
id: storageListTitle |
|||
} |
|||
|
|||
MouseArea |
|||
{ |
|||
enabled: collapsible |
|||
anchors.fill: parent |
|||
onClicked: { |
|||
if (storageContainer.state == "collapsed") |
|||
storageContainer.state = ""; |
|||
else |
|||
storageContainer.state = "collapsed"; |
|||
} |
|||
} |
|||
} |
|||
|
|||
RowLayout |
|||
{ |
|||
height: parent.height - header.height |
|||
clip: true |
|||
Rectangle |
|||
{ |
|||
height: parent.height |
|||
border.width: 3 |
|||
border.color: "#deddd9" |
|||
Layout.fillWidth: true |
|||
states: [ |
|||
State { |
|||
name: "collapsed" |
|||
PropertyChanges { |
|||
target: storageContainer.parent |
|||
height: 0 |
|||
visible: false |
|||
} |
|||
PropertyChanges { |
|||
target: storageImgArrow |
|||
source: "qrc:/qml/img/closedtriangleindicator.png" |
|||
} |
|||
} |
|||
] |
|||
id: storageContainer |
|||
width: parent.width |
|||
ListView { |
|||
clip: true; |
|||
anchors.top: parent.top |
|||
anchors.left: parent.left |
|||
anchors.topMargin: 3 |
|||
anchors.leftMargin: 3 |
|||
width: parent.width - 3 |
|||
height: parent.height - 6 |
|||
id: storageList |
|||
model: listModel |
|||
delegate: itemDelegate |
|||
} |
|||
} |
|||
} |
|||
} |
|||
@ -0,0 +1,71 @@ |
|||
import QtQuick 2.2 |
|||
import QtQuick.Controls 1.1 |
|||
import QtQuick.Layouts 1.0 |
|||
import QtQuick.Controls.Styles 1.1 |
|||
|
|||
Rectangle { |
|||
anchors.fill: parent |
|||
RowLayout |
|||
{ |
|||
id: row; |
|||
anchors.fill: parent |
|||
spacing: 2 |
|||
Rectangle |
|||
{ |
|||
id: firstCol; |
|||
color: "#f7f7f7" |
|||
Layout.fillWidth: true |
|||
Layout.minimumWidth: 35 |
|||
Layout.preferredWidth: 35 |
|||
Layout.maximumWidth: 35 |
|||
Layout.minimumHeight: parent.height |
|||
Text { |
|||
anchors.centerIn: parent |
|||
anchors.leftMargin: 5 |
|||
color: "#8b8b8b" |
|||
text: modelData[0] |
|||
font.pointSize: 9; |
|||
} |
|||
} |
|||
|
|||
Rectangle |
|||
{ |
|||
anchors.left: firstCol.right |
|||
Layout.fillWidth: true |
|||
Layout.minimumWidth: 90 |
|||
Layout.preferredWidth: 90 |
|||
Layout.maximumWidth: 90 |
|||
Layout.minimumHeight: parent.height |
|||
Text { |
|||
anchors.left: parent.left |
|||
anchors.leftMargin: 7 |
|||
anchors.verticalCenter: parent.verticalCenter |
|||
color: "#8b8b8b" |
|||
text: modelData[1] |
|||
font.pointSize: 9 |
|||
} |
|||
} |
|||
|
|||
Rectangle |
|||
{ |
|||
Layout.fillWidth: true |
|||
Layout.minimumWidth: 50 |
|||
Layout.minimumHeight: parent.height |
|||
Text { |
|||
anchors.left: parent.left |
|||
anchors.verticalCenter: parent.verticalCenter |
|||
color: "#ededed" |
|||
font.bold: true |
|||
text: modelData[2] |
|||
font.pointSize: 10 |
|||
} |
|||
} |
|||
} |
|||
|
|||
Rectangle { |
|||
width: parent.width; |
|||
height: 1; |
|||
color: "#cccccc" |
|||
anchors.bottom: parent.bottom |
|||
} |
|||
} |
|||
@ -0,0 +1,116 @@ |
|||
import QtQuick 2.2 |
|||
import QtQuick.Controls 1.1 |
|||
import QtQuick.Layouts 1.1 |
|||
import "js/ErrorLocationFormater.js" as ErrorLocationFormater |
|||
|
|||
Rectangle { |
|||
id: statusHeader |
|||
objectName: "statusPane" |
|||
|
|||
function updateStatus() |
|||
{ |
|||
if (statusPane.result.successful) |
|||
{ |
|||
status.state = ""; |
|||
status.text = qsTr("Compile without errors."); |
|||
logslink.visible = false; |
|||
} |
|||
else |
|||
{ |
|||
status.state = "error"; |
|||
var errorInfo = ErrorLocationFormater.extractErrorInfo(statusPane.result.compilerMessage, true); |
|||
status.text = errorInfo.errorLocation + " " + errorInfo.errorDetail; |
|||
logslink.visible = true; |
|||
} |
|||
debugRunActionIcon.enabled = statusPane.result.successful; |
|||
} |
|||
|
|||
color: "transparent" |
|||
anchors.fill: parent |
|||
Rectangle { |
|||
id: statusContainer |
|||
anchors.horizontalCenter: parent.horizontalCenter |
|||
anchors.verticalCenter: parent.verticalCenter |
|||
radius: 3 |
|||
width: 500 |
|||
height: 30 |
|||
color: "#fcfbfc" |
|||
RowLayout { |
|||
anchors.horizontalCenter: parent.horizontalCenter |
|||
anchors.verticalCenter: parent.verticalCenter |
|||
spacing: 5 |
|||
|
|||
Text { |
|||
font.pointSize: 10 |
|||
height: 9 |
|||
font.family: "sans serif" |
|||
objectName: "status" |
|||
id: status |
|||
states:[ |
|||
State { |
|||
name: "error" |
|||
PropertyChanges { |
|||
target: status |
|||
color: "red" |
|||
} |
|||
PropertyChanges { |
|||
target: statusContainer |
|||
color: "#fffcd5" |
|||
} |
|||
} |
|||
] |
|||
} |
|||
|
|||
Text { |
|||
visible: false |
|||
font.pointSize: 9 |
|||
height: 9 |
|||
text: qsTr("See log.") |
|||
font.family: "Monospace" |
|||
objectName: "status" |
|||
id: logslink |
|||
color: "#8c8a74" |
|||
MouseArea { |
|||
anchors.fill: parent |
|||
onClicked: { |
|||
mainContent.ensureRightView(); |
|||
} |
|||
} |
|||
} |
|||
} |
|||
} |
|||
|
|||
Rectangle |
|||
{ |
|||
color: "transparent" |
|||
width: 100 |
|||
height: parent.height |
|||
anchors.top: statusHeader.top |
|||
anchors.right: statusHeader.right |
|||
RowLayout |
|||
{ |
|||
anchors.fill: parent |
|||
Rectangle { |
|||
color: "transparent" |
|||
anchors.fill: parent |
|||
Button |
|||
{ |
|||
anchors.right: parent.right |
|||
anchors.rightMargin: 7 |
|||
anchors.verticalCenter: parent.verticalCenter |
|||
id: debugImg |
|||
iconSource: "qrc:/qml/img/bugiconinactive.png" |
|||
action: debugRunActionIcon |
|||
} |
|||
Action { |
|||
id: debugRunActionIcon |
|||
onTriggered: { |
|||
mainContent.ensureRightView(); |
|||
clientModel.debugDeployment(); |
|||
} |
|||
enabled: false |
|||
} |
|||
} |
|||
} |
|||
} |
|||
} |
|||
@ -0,0 +1,39 @@ |
|||
import QtQuick 2.2 |
|||
import QtQuick.Controls 1.1 |
|||
import QtQuick.Layouts 1.0 |
|||
import QtQuick.Controls.Styles 1.1 |
|||
|
|||
|
|||
Rectangle { |
|||
id: buttonActionContainer |
|||
property string disableStateImg |
|||
property string enabledStateImg |
|||
signal clicked |
|||
|
|||
function enabled(state) |
|||
{ |
|||
buttonAction.enabled = state; |
|||
if (state) |
|||
debugImg.iconSource = enabledStateImg; |
|||
else |
|||
debugImg.iconSource = disableStateImg; |
|||
} |
|||
|
|||
color: "transparent" |
|||
Button |
|||
{ |
|||
anchors.fill: parent |
|||
id: debugImg |
|||
iconSource: enabledStateImg |
|||
action: buttonAction |
|||
width: buttonActionContainer.width - 3 |
|||
height: buttonActionContainer.height |
|||
} |
|||
|
|||
Action { |
|||
id: buttonAction |
|||
onTriggered: { |
|||
buttonActionContainer.clicked(); |
|||
} |
|||
} |
|||
} |
|||
|
After Width: | Height: | Size: 1.2 KiB |
|
After Width: | Height: | Size: 1.1 KiB |
|
After Width: | Height: | Size: 422 B |
|
After Width: | Height: | Size: 762 B |
|
After Width: | Height: | Size: 678 B |
|
After Width: | Height: | Size: 785 B |
|
After Width: | Height: | Size: 695 B |
|
After Width: | Height: | Size: 700 B |
|
After Width: | Height: | Size: 634 B |
|
After Width: | Height: | Size: 674 B |
|
After Width: | Height: | Size: 580 B |
|
After Width: | Height: | Size: 692 B |
|
After Width: | Height: | Size: 532 B |
|
After Width: | Height: | Size: 717 B |
|
After Width: | Height: | Size: 425 B |
@ -0,0 +1,27 @@ |
|||
function formatLocation(raw, shortMessage) |
|||
{ |
|||
var splitted = raw.split(':'); |
|||
if (!shortMessage) |
|||
return qsTr("Error in line ") + splitted[1] + ", " + qsTr("character ") + splitted[2]; |
|||
else |
|||
return "L" + splitted[1] + "," + "C" + splitted[2]; |
|||
} |
|||
|
|||
function extractErrorInfo(raw, shortMessage) |
|||
{ |
|||
var _return = {}; |
|||
var detail = raw.split('\n')[0]; |
|||
var reg = detail.match(/:\d+:\d+:/g); |
|||
if (reg !== null) |
|||
{ |
|||
_return.errorLocation = ErrorLocationFormater.formatLocation(reg[0], shortMessage); |
|||
_return.errorDetail = detail.replace(reg[0], ""); |
|||
} |
|||
else |
|||
{ |
|||
_return.errorLocation = ""; |
|||
_return.errorDetail = detail; |
|||
} |
|||
_return.errorLine = raw.split('\n')[1]; |
|||
return _return; |
|||
} |
|||
Loading…
Reference in new issue