lukechilds
/
ethminer
mirror of https://github.com/lukechilds/ethminer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #833 from yann300/debug_design 

design changes on debugging feature.
cl-refactor
Gav Wood 10 years ago
parent
776f71bfab be7f94d815
commit
6ec371cfac
18 changed files with 610 additions and 421 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      mix/AssemblyDebuggerControl.cpp
  2. 5
      mix/ClientModel.cpp
  3. 5
      mix/DebuggingStateWrapper.cpp
  4. 1
      mix/qml.qrc
  5. 4
      mix/qml/DebugBasicInfo.qml
  6. 42
      mix/qml/DebugInfoList.qml
  7. 210
      mix/qml/Debugger.qml
  8. 36
      mix/qml/ItemDelegateDataDump.qml
  9. 61
      mix/qml/MainContent.qml
  10. 2
      mix/qml/NewProjectDialog.qml
  11. 4
      mix/qml/ProjectModel.qml
  12. 47
      mix/qml/Splitter.qml
  13. 2
      mix/qml/StateDialog.qml
  14. 15
      mix/qml/StatusPane.qml
  15. 3
      mix/qml/StepActionImage.qml
  16. 4
      mix/qml/TransactionDialog.qml
  17. 26
      mix/qml/js/Debugger.js
  18. 16
      mix/qml/main.qml

2
mix/AssemblyDebuggerControl.cpp
View File

@ -49,5 +49,5 @@ void AssemblyDebuggerControl::start() const
void AssemblyDebuggerControl::showDebugger() void AssemblyDebuggerControl::showDebugger()
{ {
QObject* debugPanel = m_view->findChild<QObject*>("debugPanel", Qt::FindChildrenRecursively); QObject* debugPanel = m_view->findChild<QObject*>("debugPanel", Qt::FindChildrenRecursively);
QMetaObject::invokeMethod(debugPanel, "update"); QMetaObject::invokeMethod(debugPanel, "update", Q_ARG(QVariant, true));
} }

5
mix/ClientModel.cpp
View File

@ -80,7 +80,10 @@ void ClientModel::debugState(QVariantMap _state)
TransactionSettings transactionSettings(functionId, value, gas, gasPrice); TransactionSettings transactionSettings(functionId, value, gas, gasPrice);
for (auto p = params.cbegin(); p != params.cend(); ++p) for (auto p = params.cbegin(); p != params.cend(); ++p)
transactionSettings.parameterValues.insert(std::make_pair(p.key(), (qvariant_cast<QEther*>(p.value()))->toU256Wei())); {
QBigInt* param = qvariant_cast<QBigInt*>(p.value());
transactionSettings.parameterValues.insert(std::make_pair(p.key(), boost::get<dev::u256>(param->internalValue())));
}
transactionSequence.push_back(transactionSettings); transactionSequence.push_back(transactionSettings);
} }

5
mix/DebuggingStateWrapper.cpp
View File

@ -86,9 +86,8 @@ QBigInt* DebuggingStateWrapper::newMemSize()
QStringList DebuggingStateWrapper::debugStack() QStringList DebuggingStateWrapper::debugStack()
{ {
QStringList stack; QStringList stack;
for (auto i: m_state.stack) for (std::vector<u256>::reverse_iterator i = m_state.stack.rbegin(); i != m_state.stack.rend(); ++i)
stack.append(QString::fromStdString(prettyU256(i))); stack.append(QString::fromStdString(prettyU256(*i)));
return fillList(stack, ""); return fillList(stack, "");
} }

1
mix/qml.qrc
View File

@ -43,5 +43,6 @@
<file>qml/Ether.qml</file> <file>qml/Ether.qml</file>
<file>qml/EtherValue.qml</file> <file>qml/EtherValue.qml</file>
<file>qml/BigIntValue.qml</file> <file>qml/BigIntValue.qml</file>
<file>qml/Splitter.qml</file>
</qresource> </qresource>
</RCC> </RCC>

4
mix/qml/DebugBasicInfo.qml
View File

@ -5,8 +5,6 @@ import QtQuick.Controls.Styles 1.1
RowLayout { RowLayout {
property string titleStr property string titleStr
width: parent.width
height: parent.height / 4
function update(_value) function update(_value)
{ {
@ -14,7 +12,7 @@ RowLayout {
} }
Rectangle { Rectangle {
width: parent.width / 2 width: 120
height: parent.height height: parent.height
color: "#e5e5e5" color: "#e5e5e5"
Text Text

42
mix/qml/DebugInfoList.qml
View File

@ -9,6 +9,23 @@ ColumnLayout {
property bool collapsible; property bool collapsible;
property Component itemDelegate property Component itemDelegate
spacing: 0 spacing: 0
function collapse()
{
storageContainer.state = "collapsed";
}
function show()
{
storageContainer.state = "";
}
Component.onCompleted:
{
if (storageContainer.parent.parent.height === 25)
storageContainer.state = "collapsed";
}
RowLayout { RowLayout {
height: 25 height: 25
id: header id: header
@ -17,7 +34,6 @@ ColumnLayout {
width: 15 width: 15
sourceSize.width: 15 sourceSize.width: 15
id: storageImgArrow id: storageImgArrow
visible: collapsible
} }
Text { Text {
@ -32,40 +48,39 @@ ColumnLayout {
enabled: collapsible enabled: collapsible
anchors.fill: parent anchors.fill: parent
onClicked: { onClicked: {
if (collapsible)
{
if (storageContainer.state == "collapsed") if (storageContainer.state == "collapsed")
{
storageContainer.state = ""; storageContainer.state = "";
storageContainer.parent.parent.height = storageContainer.parent.parent.Layout.maximumHeight;
}
else else
storageContainer.state = "collapsed"; storageContainer.state = "collapsed";
} }
} }
} }
}
RowLayout
{
height: parent.height - header.height
clip: true
Rectangle Rectangle
{ {
height: parent.height
border.width: 3 border.width: 3
border.color: "#deddd9" border.color: "#deddd9"
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true
states: [ states: [
State { State {
name: "collapsed" name: "collapsed"
PropertyChanges {
target: storageContainer.parent
height: 0
visible: false
}
PropertyChanges { PropertyChanges {
target: storageImgArrow target: storageImgArrow
source: "qrc:/qml/img/closedtriangleindicator.png" source: "qrc:/qml/img/closedtriangleindicator.png"
} }
PropertyChanges {
target: storageContainer.parent.parent
height: 25
}
} }
] ]
id: storageContainer id: storageContainer
width: parent.width
ListView { ListView {
clip: true; clip: true;
anchors.top: parent.top anchors.top: parent.top
@ -80,4 +95,3 @@ ColumnLayout {
} }
} }
} }
}

210
mix/qml/Debugger.qml
View File

@ -3,6 +3,7 @@ import QtQuick.Controls.Styles 1.1
import QtQuick.Controls 1.1 import QtQuick.Controls 1.1
import QtQuick.Dialogs 1.1 import QtQuick.Dialogs 1.1
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.1
import Qt.labs.settings 1.0
import "js/Debugger.js" as Debugger import "js/Debugger.js" as Debugger
import "js/ErrorLocationFormater.js" as ErrorLocationFormater import "js/ErrorLocationFormater.js" as ErrorLocationFormater
@ -20,7 +21,13 @@ Rectangle {
Debugger.moveSelection(-1); Debugger.moveSelection(-1);
} }
function update() onVisibleChanged:
{
if (visible)
forceActiveFocus();
}
function update(giveFocus)
{ {
if (statusPane.result.successful) if (statusPane.result.successful)
{ {
@ -39,11 +46,13 @@ Rectangle {
errorDetail.text = errorInfo.errorDetail; errorDetail.text = errorInfo.errorDetail;
errorLine.text = errorInfo.errorLine; errorLine.text = errorInfo.errorLine;
} }
if (giveFocus)
forceActiveFocus();
} }
Connections { Connections {
target: codeModel target: codeModel
onCompilationComplete: update() onCompilationComplete: update(false)
} }
Rectangle Rectangle
@ -95,17 +104,18 @@ Rectangle {
} }
} }
Flickable { Flickable {
property int firstColumnWidth: 170 property int firstColumnWidth: 180
property int secondColumnWidth: 250 property int secondColumnWidth: 250
id: debugScrollArea id: debugScrollArea
flickableDirection: Flickable.VerticalFlick flickableDirection: Flickable.VerticalFlick
anchors.fill: parent anchors.fill: parent
contentHeight: machineStates.height + 300 contentHeight: 4000
contentWidth: machineStates.width contentWidth: parent.width
Rectangle
GridLayout {
anchors.fill: parent
ColumnLayout
{ {
property int sideMargin: 10 property int sideMargin: 10
id: machineStates id: machineStates
@ -115,13 +125,16 @@ Rectangle {
anchors.leftMargin: machineStates.sideMargin anchors.leftMargin: machineStates.sideMargin
anchors.right: parent.right; anchors.right: parent.right;
anchors.rightMargin: machineStates.sideMargin anchors.rightMargin: machineStates.sideMargin
flow: GridLayout.TopToBottom anchors.fill: parent
rowSpacing: 15 Layout.fillWidth: true
Layout.fillHeight: true
RowLayout { RowLayout {
// step button + slider // step button + slider
id: buttonRow
spacing: machineStates.sideMargin spacing: machineStates.sideMargin
height: 27 height: 27
width: debugPanel.width Layout.fillWidth: true
Rectangle Rectangle
{ {
height: parent.height height: parent.height
@ -137,8 +150,9 @@ Rectangle {
enabledStateImg: "qrc:/qml/img/jumpoutback.png" enabledStateImg: "qrc:/qml/img/jumpoutback.png"
disableStateImg: "qrc:/qml/img/jumpoutbackdisabled.png" disableStateImg: "qrc:/qml/img/jumpoutbackdisabled.png"
onClicked: Debugger.stepOutBack() onClicked: Debugger.stepOutBack()
width: 25 width: 28
height: 27 height: 30
buttonTooltip: qsTr("Step Out Back")
} }
StepActionImage StepActionImage
@ -147,8 +161,9 @@ Rectangle {
enabledStateImg: "qrc:/qml/img/jumpintoback.png" enabledStateImg: "qrc:/qml/img/jumpintoback.png"
disableStateImg: "qrc:/qml/img/jumpintobackdisabled.png" disableStateImg: "qrc:/qml/img/jumpintobackdisabled.png"
onClicked: Debugger.stepIntoBack() onClicked: Debugger.stepIntoBack()
width: 25 width: 28
height: 27 height: 30
buttonTooltip: qsTr("Step Into Back")
} }
StepActionImage StepActionImage
@ -157,8 +172,9 @@ Rectangle {
enabledStateImg: "qrc:/qml/img/jumpoverback.png" enabledStateImg: "qrc:/qml/img/jumpoverback.png"
disableStateImg: "qrc:/qml/img/jumpoverbackdisabled.png" disableStateImg: "qrc:/qml/img/jumpoverbackdisabled.png"
onClicked: Debugger.stepOverBack() onClicked: Debugger.stepOverBack()
width: 25 width: 28
height: 27 height: 30
buttonTooltip: qsTr("Step Over Back")
} }
StepActionImage StepActionImage
@ -167,8 +183,9 @@ Rectangle {
enabledStateImg: "qrc:/qml/img/jumpoverforward.png" enabledStateImg: "qrc:/qml/img/jumpoverforward.png"
disableStateImg: "qrc:/qml/img/jumpoverforwarddisabled.png" disableStateImg: "qrc:/qml/img/jumpoverforwarddisabled.png"
onClicked: Debugger.stepOverForward() onClicked: Debugger.stepOverForward()
width: 25 width: 28
height: 27 height: 30
buttonTooltip: qsTr("Step Over Forward")
} }
StepActionImage StepActionImage
@ -177,8 +194,9 @@ Rectangle {
enabledStateImg: "qrc:/qml/img/jumpintoforward.png" enabledStateImg: "qrc:/qml/img/jumpintoforward.png"
disableStateImg: "qrc:/qml/img/jumpintoforwarddisabled.png" disableStateImg: "qrc:/qml/img/jumpintoforwarddisabled.png"
onClicked: Debugger.stepIntoForward() onClicked: Debugger.stepIntoForward()
width: 25 width: 28
height: 27 height: 30
buttonTooltip: qsTr("Step Into Forward")
} }
StepActionImage StepActionImage
@ -187,14 +205,16 @@ Rectangle {
enabledStateImg: "qrc:/qml/img/jumpoutforward.png" enabledStateImg: "qrc:/qml/img/jumpoutforward.png"
disableStateImg: "qrc:/qml/img/jumpoutforwarddisabled.png" disableStateImg: "qrc:/qml/img/jumpoutforwarddisabled.png"
onClicked: Debugger.stepOutForward() onClicked: Debugger.stepOutForward()
width: 25 width: 28
height: 27 height: 30
buttonTooltip: qsTr("Step Out Forward")
} }
} }
} }
Rectangle { Rectangle {
color: "transparent" color: "transparent"
width: debugScrollArea.secondColumnWidth Layout.fillWidth: true
height: parent.height height: parent.height
Slider { Slider {
id: statesSlider id: statesSlider
@ -224,12 +244,15 @@ Rectangle {
RowLayout { RowLayout {
// Assembly code // Assembly code
width: debugPanel.width id: assemblyCodeRow
Layout.fillWidth: true
height: 405 height: 405
implicitHeight: 405
spacing: machineStates.sideMargin spacing: machineStates.sideMargin
Rectangle Rectangle
{ {
id: stateListContainer
width: debugScrollArea.firstColumnWidth width: debugScrollArea.firstColumnWidth
height: parent.height height: parent.height
border.width: 3 border.width: 3
@ -246,7 +269,7 @@ Rectangle {
id: statesList id: statesList
delegate: renderDelegate delegate: renderDelegate
highlight: highlightBar highlight: highlightBar
highlightFollowsCurrentItem: true highlightFollowsCurrentItem: false
} }
Component { Component {
@ -255,8 +278,11 @@ Rectangle {
radius: 4 radius: 4
height: statesList.currentItem.height height: statesList.currentItem.height
width: statesList.currentItem.width; width: statesList.currentItem.width;
y: statesList.currentItem.y
color: "#4A90E2" color: "#4A90E2"
Behavior on y { SpringAnimation { spring: 2; damping: 0.1 } } Behavior on y {
PropertyAnimation { properties: "y"; easing.type: Easing.InOutQuad; duration: 50}
}
} }
} }
@ -288,54 +314,49 @@ Rectangle {
} }
} }
ColumnLayout {
width: debugScrollArea.secondColumnWidth
height: parent.height
Rectangle { Rectangle {
// Info Layout.fillWidth: true
height: parent.height //- 2 * stateListContainer.border.width
ColumnLayout
{
width: parent.width width: parent.width
id: basicInfoColumn anchors.fill: parent
height: 125
color: "transparent"
ColumnLayout {
spacing: 0 spacing: 0
width: parent.width
height: parent.height
DebugBasicInfo { DebugBasicInfo {
id: currentStep id: currentStep
titleStr: qsTr("Current step") titleStr: qsTr("Current Step")
Layout.fillWidth: true
height: 30
} }
DebugBasicInfo { DebugBasicInfo {
id: mem id: mem
titleStr: qsTr("Adding memory") titleStr: qsTr("Adding Memory")
Layout.fillWidth: true
height: 30
} }
DebugBasicInfo { DebugBasicInfo {
id: stepCost id: stepCost
titleStr: qsTr("Step cost") titleStr: qsTr("Step Cost")
Layout.fillWidth: true
height: 30
} }
DebugBasicInfo { DebugBasicInfo {
id: gasSpent id: gasSpent
titleStr: qsTr("Total gas spent") titleStr: qsTr("Total Gas Spent")
} Layout.fillWidth: true
} height: 30
} }
Rectangle {
// Stack
height: 275
width: parent.width
color: "transparent"
DebugInfoList DebugInfoList
{ {
Layout.fillHeight: true
Layout.fillWidth: true
id: stack id: stack
width: parent.width
height: parent.height
collapsible: false collapsible: false
title : qsTr("Stack") title : qsTr("Stack")
itemDelegate: Item { itemDelegate: Item {
id: renderedItem id: renderedItem
height: 27 height: 25
width: parent.width width: parent.width
RowLayout RowLayout
{ {
@ -352,7 +373,8 @@ Rectangle {
Text { Text {
anchors.centerIn: parent anchors.centerIn: parent
anchors.leftMargin: 5 anchors.leftMargin: 5
color: "#8b8b8b" font.family: "monospace"
color: "#4a4a4a"
text: model.index; text: model.index;
font.pointSize: 9 font.pointSize: 9
} }
@ -369,8 +391,9 @@ Rectangle {
Text { Text {
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: 5 anchors.leftMargin: 5
font.family: "monospace"
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
color: "#8b8b8b" color: "#4a4a4a"
text: modelData text: modelData
font.pointSize: 9 font.pointSize: 9
} }
@ -390,18 +413,32 @@ Rectangle {
} }
} }
Rectangle { SplitView
width: debugPanel.width - 2 * machineStates.sideMargin {
height: 2; id: splitInfoList
color: "#e3e3e3" Layout.fillHeight: true
radius: 3 Layout.fillWidth: true
Settings {
id: splitSettings
property alias storageHeightSettings: storageRect.height
property alias memoryDumpHeightSettings: memoryRect.height
property alias callDataHeightSettings: callDataRect.height
} }
orientation: Qt.Vertical
width: debugPanel.width - 2 * machineStates.sideMargin
Rectangle
{
id: storageRect
width: parent.width
Layout.minimumHeight: 25
Layout.maximumHeight: 223
height: 25
DebugInfoList DebugInfoList
{ {
id: storage id: storage
width: debugPanel.width - 2 * machineStates.sideMargin anchors.fill: parent
height: 223
collapsible: true collapsible: true
title : qsTr("Storage") title : qsTr("Storage")
itemDelegate: itemDelegate:
@ -425,8 +462,9 @@ Rectangle {
Text { Text {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.left: parent.left anchors.left: parent.left
font.family: "monospace"
anchors.leftMargin: 5 anchors.leftMargin: 5
color: "#8b8b8b" color: "#4a4a4a"
text: modelData.split(' ')[0].substring(0, 10); text: modelData.split(' ')[0].substring(0, 10);
font.pointSize: 9 font.pointSize: 9
} }
@ -445,8 +483,9 @@ Rectangle {
width: parent.width - 5 width: parent.width - 5
wrapMode: Text.Wrap wrapMode: Text.Wrap
anchors.left: parent.left anchors.left: parent.left
font.family: "monospace"
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
color: "#8b8b8b" color: "#4a4a4a"
text: modelData.split(' ')[1].substring(0, 10); text: modelData.split(' ')[1].substring(0, 10);
font.pointSize: 9 font.pointSize: 9
} }
@ -462,18 +501,18 @@ Rectangle {
} }
} }
} }
Rectangle {
width: debugPanel.width - 2 * machineStates.sideMargin
height: 2;
color: "#e3e3e3"
radius: 3
} }
Rectangle
{
id: memoryRect;
height: 25
width: parent.width
Layout.minimumHeight: 25
Layout.maximumHeight: 223
DebugInfoList { DebugInfoList {
id: memoryDump id: memoryDump
width: debugPanel.width - 2 * machineStates.sideMargin anchors.fill: parent
height: 223
collapsible: true collapsible: true
title: qsTr("Memory Dump") title: qsTr("Memory Dump")
itemDelegate: itemDelegate:
@ -483,20 +522,20 @@ Rectangle {
ItemDelegateDataDump {} ItemDelegateDataDump {}
} }
} }
Rectangle {
width: debugPanel.width - 2 * machineStates.sideMargin
height: 2;
color: "#e3e3e3"
radius: 3
} }
Rectangle
{
id: callDataRect
height: 25
width: parent.width
Layout.minimumHeight: 25
Layout.maximumHeight: 223
DebugInfoList { DebugInfoList {
id: callDataDump id: callDataDump
width: debugPanel.width - 2 * machineStates.sideMargin anchors.fill: parent
height: 223
collapsible: true collapsible: true
title: qsTr("Call data") title: qsTr("Call Data")
itemDelegate: itemDelegate:
Item { Item {
height: 29 height: 29
@ -505,5 +544,14 @@ Rectangle {
} }
} }
} }
Rectangle
{
width: parent.width
Layout.minimumHeight: 25
color: "transparent"
}
}
}
}
} }
} }

36
mix/qml/ItemDelegateDataDump.qml
View File

@ -20,29 +20,33 @@ Rectangle {
Layout.maximumWidth: 35 Layout.maximumWidth: 35
Layout.minimumHeight: parent.height Layout.minimumHeight: parent.height
Text { Text {
anchors.centerIn: parent anchors.verticalCenter: parent.verticalCenter
anchors.leftMargin: 5 anchors.left: parent.left
color: "#8b8b8b" anchors.leftMargin: 3
font.family: "monospace"
font.bold: true
color: "#4a4a4a"
text: modelData[0] text: modelData[0]
font.pointSize: 9; font.pointSize: 8;
} }
} }
Rectangle Rectangle
{ {
anchors.left: firstCol.right
Layout.fillWidth: true Layout.fillWidth: true
Layout.minimumWidth: 90 Layout.minimumWidth: 110
Layout.preferredWidth: 90 Layout.preferredWidth: 110
Layout.maximumWidth: 90 Layout.maximumWidth: 110
Layout.minimumHeight: parent.height Layout.minimumHeight: parent.height
Text { Text {
anchors.left: parent.left font.family: "monospace"
anchors.leftMargin: 7 font.bold: true
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
color: "#8b8b8b" anchors.left: parent.left
anchors.leftMargin: 4
color: "#4a4a4a"
text: modelData[1] text: modelData[1]
font.pointSize: 9 font.pointSize: 8
} }
} }
@ -52,12 +56,12 @@ Rectangle {
Layout.minimumWidth: 50 Layout.minimumWidth: 50
Layout.minimumHeight: parent.height Layout.minimumHeight: parent.height
Text { Text {
anchors.left: parent.left
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
color: "#ededed" anchors.horizontalCenter: parent.horizontalCenter
font.bold: true font.family: "monospace"
color: "#4a4a4a"
text: modelData[2] text: modelData[2]
font.pointSize: 10 font.pointSize: 8
} }
} }
} }

61
mix/qml/MainContent.qml
View File

@ -3,6 +3,7 @@ import QtQuick.Controls 1.1
import QtQuick.Layouts 1.0 import QtQuick.Layouts 1.0
import QtQuick.Controls.Styles 1.1 import QtQuick.Controls.Styles 1.1
import CodeEditorExtensionManager 1.0 import CodeEditorExtensionManager 1.0
import Qt.labs.settings 1.0
Rectangle { Rectangle {
@ -17,6 +18,14 @@ Rectangle {
anchors.fill: parent anchors.fill: parent
id: root id: root
onWidthChanged:
{
if (rightView.visible)
contentView.width = parent.width - projectList.width - rightView.width;
else
contentView.width = parent.width - projectList.width;
}
function toggleRightView() function toggleRightView()
{ {
if (!rightView.visible) if (!rightView.visible)
@ -37,6 +46,11 @@ Rectangle {
rightView.hide(); rightView.hide();
} }
function rightViewVisible()
{
return rightView.visible;
}
CodeEditorExtensionManager { CodeEditorExtensionManager {
headerView: headerPaneTabs; headerView: headerPaneTabs;
rightView: rightPaneTabs; rightView: rightPaneTabs;
@ -78,21 +92,37 @@ Rectangle {
} }
} }
SplitView { Rectangle {
resizing: false
Layout.row: 1
orientation: Qt.Horizontal;
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: root.height - headerView.height; Layout.preferredHeight: root.height - headerView.height;
Settings {
id: splitSettings
property alias projectWidth: projectList.width
property alias contentViewWidth: contentView.width
property alias rightViewWidth: rightView.width
}
ProjectList { ProjectList {
anchors.left: parent.left
id: projectList id: projectList
width: 200 width: 200
height: parent.height height: parent.height
Layout.minimumWidth: 200 Layout.minimumWidth: 200
} }
Splitter
{
id: resizeLeft
itemToStick: projectList
itemMinimumWidth: projectList.Layout.minimumWidth
direction: "right"
brother: contentView
color: "#a2a2a2"
}
Rectangle { Rectangle {
anchors.left: projectList.right
id: contentView id: contentView
width: parent.width - projectList.width width: parent.width - projectList.width
height: parent.height height: parent.height
@ -103,28 +133,39 @@ Rectangle {
} }
} }
Splitter
{
id: resizeRight
visible: false;
itemToStick: rightView
itemMinimumWidth: rightView.Layout.minimumWidth
direction: "left"
brother: contentView
color: "#a2a2a2"
}
Rectangle { Rectangle {
visible: false; visible: false;
id: rightView; id: rightView;
Keys.onEscapePressed: Keys.onEscapePressed: hide()
{
hide();
}
function show() { function show() {
visible = true; visible = true;
resizeRight.visible = true;
contentView.width = parent.width - projectList.width - rightView.width; contentView.width = parent.width - projectList.width - rightView.width;
} }
function hide() { function hide() {
resizeRight.visible = false;
visible = false; visible = false;
contentView.width = parent.width - projectList.width; contentView.width = parent.width - projectList.width;
} }
height: parent.height; height: parent.height;
width: 450 width: 515
Layout.minimumWidth: 450 Layout.minimumWidth: 515
anchors.right: parent.right
Rectangle { Rectangle {
anchors.fill: parent; anchors.fill: parent;
id: rightPaneView id: rightPaneView

2
mix/qml/NewProjectDialog.qml
View File

@ -64,7 +64,7 @@ Window {
Button { Button {
enabled: titleField.text != "" && pathField.text != "" enabled: titleField.text != "" && pathField.text != ""
text: qsTr("Ok"); text: qsTr("OK");
onClicked: { onClicked: {
close(); close();
accepted(); accepted();

4
mix/qml/ProjectModel.qml
View File

@ -85,7 +85,7 @@ Item {
FileDialog { FileDialog {
id: openProjectFileDialog id: openProjectFileDialog
visible: false visible: false
title: qsTr("Open a project") title: qsTr("Open a Project")
selectFolder: true selectFolder: true
onAccepted: { onAccepted: {
var path = openProjectFileDialog.fileUrl.toString(); var path = openProjectFileDialog.fileUrl.toString();
@ -97,7 +97,7 @@ Item {
FileDialog { FileDialog {
id: addExistingFileDialog id: addExistingFileDialog
visible: false visible: false
title: qsTr("Add a file") title: qsTr("Add a File")
selectFolder: false selectFolder: false
onAccepted: { onAccepted: {
var paths = addExistingFileDialog.fileUrls; var paths = addExistingFileDialog.fileUrls;

47
mix/qml/Splitter.qml
View File

@ -0,0 +1,47 @@
import QtQuick 2.2
Rectangle {
property variant itemToStick;
property int itemMinimumWidth;
property string direction;
property variant brother;
Component.onCompleted:
{
if (direction === "left")
anchors.right = itemToStick.left;
else if (direction === "right")
anchors.left = itemToStick.right;
}
width: 5
height: parent.height
anchors.top: parent.top;
MouseArea
{
property int startX: 0;
anchors.fill: parent
onPressed: startX = mouseX;
onPositionChanged:
{
parent.x += mouseX;
var diff = 0;
if (direction == "left")
diff = mouseX - startX;
else if (direction == "right")
diff = -(mouseX - startX);
if (itemMinimumWidth > itemToStick.width - diff)
{
brother.width = brother.width + diff;
itemToStick.width = itemMinimumWidth;
}
else
{
brother.width = brother.width + diff;
itemToStick.width = itemToStick.width - diff;
}
}
cursorShape: Qt.SizeHorCursor
}
}

2
mix/qml/StateDialog.qml
View File

@ -99,7 +99,7 @@ Window {
anchors.right: parent.right; anchors.right: parent.right;
Button { Button {
text: qsTr("Ok"); text: qsTr("OK");
onClicked: { onClicked: {
close(); close();
accepted(); accepted();

15
mix/qml/StatusPane.qml
View File

@ -14,6 +14,7 @@ Rectangle {
status.state = ""; status.state = "";
status.text = qsTr("Compile without errors."); status.text = qsTr("Compile without errors.");
logslink.visible = false; logslink.visible = false;
debugImg.state = "active";
} }
else else
{ {
@ -21,6 +22,7 @@ Rectangle {
var errorInfo = ErrorLocationFormater.extractErrorInfo(statusPane.result.compilerMessage, true); var errorInfo = ErrorLocationFormater.extractErrorInfo(statusPane.result.compilerMessage, true);
status.text = errorInfo.errorLocation + " " + errorInfo.errorDetail; status.text = errorInfo.errorLocation + " " + errorInfo.errorDetail;
logslink.visible = true; logslink.visible = true;
debugImg.state = "";
} }
debugRunActionIcon.enabled = statusPane.result.successful; debugRunActionIcon.enabled = statusPane.result.successful;
} }
@ -65,7 +67,7 @@ Rectangle {
visible: false visible: false
font.pointSize: 9 font.pointSize: 9
height: 9 height: 9
text: qsTr("See log.") text: qsTr("See Log.")
font.family: "Monospace" font.family: "Monospace"
objectName: "status" objectName: "status"
id: logslink id: logslink
@ -96,16 +98,23 @@ Rectangle {
Button Button
{ {
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: 7 anchors.rightMargin: 9
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
id: debugImg id: debugImg
iconSource: "qrc:/qml/img/bugiconinactive.png" iconSource: "qrc:/qml/img/bugiconinactive.png"
action: debugRunActionIcon action: debugRunActionIcon
states: [
State{
name: "active"
PropertyChanges { target: debugImg; iconSource: "qrc:/qml/img/bugiconactive.png"}
}
]
} }
Action { Action {
id: debugRunActionIcon id: debugRunActionIcon
onTriggered: { onTriggered: {
mainContent.ensureRightView(); mainContent.toggleRightView();
if (mainContent.rightViewVisible())
clientModel.debugDeployment(); clientModel.debugDeployment();
} }
enabled: false enabled: false

3
mix/qml/StepActionImage.qml
View File

@ -8,6 +8,7 @@ Rectangle {
id: buttonActionContainer id: buttonActionContainer
property string disableStateImg property string disableStateImg
property string enabledStateImg property string enabledStateImg
property string buttonTooltip
signal clicked signal clicked
function enabled(state) function enabled(state)
@ -19,7 +20,6 @@ Rectangle {
debugImg.iconSource = disableStateImg; debugImg.iconSource = disableStateImg;
} }
color: "transparent"
Button Button
{ {
anchors.fill: parent anchors.fill: parent
@ -31,6 +31,7 @@ Rectangle {
} }
Action { Action {
tooltip: buttonTooltip
id: buttonAction id: buttonAction
onTriggered: { onTriggered: {
buttonActionContainer.clicked(); buttonActionContainer.clicked();

4
mix/qml/TransactionDialog.qml
View File

@ -136,7 +136,7 @@ Window {
} }
Label { Label {
text: qsTr("Gas price") text: qsTr("Gas Price")
} }
Rectangle Rectangle
{ {
@ -183,7 +183,7 @@ Window {
anchors.right: parent.right; anchors.right: parent.right;
Button { Button {
text: qsTr("Ok"); text: qsTr("OK");
onClicked: { onClicked: {
close(); close();
accepted(); accepted();

26
mix/qml/js/Debugger.js
View File

@ -7,7 +7,7 @@ var currentSelectedState = null;
var jumpStartingPoint = null; var jumpStartingPoint = null;
function init() function init()
{ {
if (debugStates === undefined) if (typeof(debugStates) === "undefined")
return; return;
statesSlider.maximumValue = debugStates.length - 1; statesSlider.maximumValue = debugStates.length - 1;
@ -24,6 +24,9 @@ function init()
function moveSelection(incr) function moveSelection(incr)
{ {
if (typeof(debugStates) === "undefined")
return;
if (currentSelectedState + incr >= 0) if (currentSelectedState + incr >= 0)
{ {
if (currentSelectedState + incr < debugStates.length) if (currentSelectedState + incr < debugStates.length)
@ -34,6 +37,9 @@ function moveSelection(incr)
function select(stateIndex) function select(stateIndex)
{ {
if (typeof(debugStates) === "undefined")
return;
var codeLine = codeStr(stateIndex); var codeLine = codeStr(stateIndex);
var state = debugStates[stateIndex]; var state = debugStates[stateIndex];
highlightSelection(codeLine); highlightSelection(codeLine);
@ -53,6 +59,9 @@ function select(stateIndex)
function codeStr(stateIndex) function codeStr(stateIndex)
{ {
if (typeof(debugStates) === "undefined")
return;
var state = debugStates[stateIndex]; var state = debugStates[stateIndex];
return bytesCodeMapping.getValue(state.curPC); return bytesCodeMapping.getValue(state.curPC);
} }
@ -64,6 +73,9 @@ function highlightSelection(index)
function completeCtxInformation(state) function completeCtxInformation(state)
{ {
if (typeof(debugStates) === "undefined")
return;
currentStep.update(state.step); currentStep.update(state.step);
mem.update(state.newMemSize.value() + " " + qsTr("words")); mem.update(state.newMemSize.value() + " " + qsTr("words"));
stepCost.update(state.gasCost.value()); stepCost.update(state.gasCost.value());
@ -83,6 +95,9 @@ function displayReturnValue()
function stepOutBack() function stepOutBack()
{ {
if (typeof(debugStates) === "undefined")
return;
if (jumpStartingPoint != null) if (jumpStartingPoint != null)
{ {
select(jumpStartingPoint); select(jumpStartingPoint);
@ -99,6 +114,9 @@ function stepIntoBack()
function stepOverBack() function stepOverBack()
{ {
if (typeof(debugStates) === "undefined")
return;
var state = debugStates[currentSelectedState]; var state = debugStates[currentSelectedState];
if (state.instruction === "JUMPDEST") if (state.instruction === "JUMPDEST")
{ {
@ -118,6 +136,9 @@ function stepOverBack()
function stepOverForward() function stepOverForward()
{ {
if (typeof(debugStates) === "undefined")
return;
var state = debugStates[currentSelectedState]; var state = debugStates[currentSelectedState];
if (state.instruction === "JUMP") if (state.instruction === "JUMP")
{ {
@ -137,6 +158,9 @@ function stepOverForward()
function stepIntoForward() function stepIntoForward()
{ {
if (typeof(debugStates) === "undefined")
return;
var state = debugStates[currentSelectedState]; var state = debugStates[currentSelectedState];
if (state.instruction === "JUMP") if (state.instruction === "JUMP")
{ {

16
mix/qml/main.qml
View File

@ -97,7 +97,7 @@ ApplicationWindow {
Action { Action {
id: createProjectAction id: createProjectAction
text: qsTr("&New project") text: qsTr("&New Project")
shortcut: "Ctrl+N" shortcut: "Ctrl+N"
enabled: true; enabled: true;
onTriggered: projectModel.createProject(); onTriggered: projectModel.createProject();
@ -105,7 +105,7 @@ ApplicationWindow {
Action { Action {
id: openProjectAction id: openProjectAction
text: qsTr("&Open project") text: qsTr("&Open Project")
shortcut: "Ctrl+O" shortcut: "Ctrl+O"
enabled: true; enabled: true;
onTriggered: projectModel.browseProject(); onTriggered: projectModel.browseProject();
@ -113,7 +113,7 @@ ApplicationWindow {
Action { Action {
id: addNewJsFileAction id: addNewJsFileAction
text: qsTr("New JavaScript file") text: qsTr("New JavaScript File")
shortcut: "Ctrl+Alt+J" shortcut: "Ctrl+Alt+J"
enabled: !projectModel.isEmpty enabled: !projectModel.isEmpty
onTriggered: projectModel.newJsFile(); onTriggered: projectModel.newJsFile();
@ -121,7 +121,7 @@ ApplicationWindow {
Action { Action {
id: addNewHtmlFileAction id: addNewHtmlFileAction
text: qsTr("New HTML file") text: qsTr("New HTML File")
shortcut: "Ctrl+Alt+H" shortcut: "Ctrl+Alt+H"
enabled: !projectModel.isEmpty enabled: !projectModel.isEmpty
onTriggered: projectModel.newHtmlFile(); onTriggered: projectModel.newHtmlFile();
@ -129,7 +129,7 @@ ApplicationWindow {
Action { Action {
id: addNewContractAction id: addNewContractAction
text: qsTr("New contract") text: qsTr("New Contract")
shortcut: "Ctrl+Alt+C" shortcut: "Ctrl+Alt+C"
enabled: !projectModel.isEmpty enabled: !projectModel.isEmpty
onTriggered: projectModel.newContract(); onTriggered: projectModel.newContract();
@ -137,7 +137,7 @@ ApplicationWindow {
Action { Action {
id: addExistingFileAction id: addExistingFileAction
text: qsTr("Add existing file") text: qsTr("Add Existing File")
shortcut: "Ctrl+Alt+A" shortcut: "Ctrl+Alt+A"
enabled: !projectModel.isEmpty enabled: !projectModel.isEmpty
onTriggered: projectModel.addExistingFile(); onTriggered: projectModel.addExistingFile();
@ -145,7 +145,7 @@ ApplicationWindow {
Action { Action {
id: saveAllFilesAction id: saveAllFilesAction
text: qsTr("Save all") text: qsTr("Save All")
shortcut: "Ctrl+S" shortcut: "Ctrl+S"
enabled: !projectModel.isEmpty enabled: !projectModel.isEmpty
onTriggered: projectModel.saveAll(); onTriggered: projectModel.saveAll();
@ -153,7 +153,7 @@ ApplicationWindow {
Action { Action {
id: closeProjectAction id: closeProjectAction
text: qsTr("Close project") text: qsTr("Close Project")
shortcut: "Ctrl+W" shortcut: "Ctrl+W"
enabled: !projectModel.isEmpty enabled: !projectModel.isEmpty
onTriggered: projectModel.closeProject(); onTriggered: projectModel.closeProject();

Write Preview
Loading…
Cancel
Save