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

- Right side pane resizing (list fill empty space). 

- Capitalisation.
 - Storage/MemoryDump/CallData add splitter.
 - Small changes on step icons.
 - App resizing: dock the right view on the main window.
 - Assembly code selection change (selection change move faster).
 - Reverse stack list.
 - Misc changes on debug info list.
 - Misc changes on debug button behavior + F10/F9 bug fixes.
cl-refactor
yann300 10 years ago
committed by yann300
parent
72bfea843a
commit
a8fcaee72f
18 changed files with 599 additions and 411 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      mix/AssemblyDebuggerControl.cpp
  2. 5
      mix/ClientModel.cpp
  3. 1
      mix/DebuggingStateWrapper.cpp
  4. 1
      mix/qml.qrc
  5. 4
      mix/qml/DebugBasicInfo.qml
  6. 43
      mix/qml/DebugInfoList.qml
  7. 212
      mix/qml/Debugger.qml
  8. 20
      mix/qml/ItemDelegateDataDump.qml
  9. 61
      mix/qml/MainContent.qml
  10. 2
      mix/qml/NewProjectDialog.qml
  11. 4
      mix/qml/ProjectModel.qml
  12. 51
      mix/qml/Splitter.qml
  13. 2
      mix/qml/StateDialog.qml
  14. 5
      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()
{
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);
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);
}

1
mix/DebuggingStateWrapper.cpp
View File

@ -89,6 +89,7 @@ QStringList DebuggingStateWrapper::debugStack()
for (auto i: m_state.stack)
stack.append(QString::fromStdString(prettyU256(i)));
std::reverse(stack.begin(), stack.end());
return fillList(stack, "");
}

1
mix/qml.qrc
View File

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

4
mix/qml/DebugBasicInfo.qml
View File

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

43
mix/qml/DebugInfoList.qml
View File

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

212
mix/qml/Debugger.qml
View File

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

20
mix/qml/ItemDelegateDataDump.qml
View File

@ -21,8 +21,9 @@ Rectangle {
Layout.minimumHeight: parent.height
Text {
anchors.centerIn: parent
anchors.leftMargin: 5
color: "#8b8b8b"
font.family: "monospace"
font.bold: true
color: "#4a4a4a"
text: modelData[0]
font.pointSize: 9;
}
@ -30,17 +31,16 @@ Rectangle {
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
font.family: "monospace"
font.bold: true
anchors.verticalCenter: parent.verticalCenter
color: "#8b8b8b"
color: "#4a4a4a"
text: modelData[1]
font.pointSize: 9
}
@ -52,12 +52,12 @@ Rectangle {
Layout.minimumWidth: 50
Layout.minimumHeight: parent.height
Text {
anchors.left: parent.left
anchors.verticalCenter: parent.verticalCenter
color: "#ededed"
font.bold: true
anchors.horizontalCenter: parent.horizontalCenter
font.family: "monospace"
color: "#4a4a4a"
text: modelData[2]
font.pointSize: 10
font.pointSize: 9
}
}
}

61
mix/qml/MainContent.qml
View File

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

2
mix/qml/NewProjectDialog.qml
View File

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

4
mix/qml/ProjectModel.qml
View File

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

51
mix/qml/Splitter.qml
View File

@ -0,0 +1,51 @@
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;
Button {
text: qsTr("Ok");
text: qsTr("OK");
onClicked: {
close();
accepted();

5
mix/qml/StatusPane.qml
View File

@ -65,7 +65,7 @@ Rectangle {
visible: false
font.pointSize: 9
height: 9
text: qsTr("See log.")
text: qsTr("See Log.")
font.family: "Monospace"
objectName: "status"
id: logslink
@ -105,7 +105,8 @@ Rectangle {
Action {
id: debugRunActionIcon
onTriggered: {
mainContent.ensureRightView();
mainContent.toggleRightView();
if (mainContent.rightViewVisible())
clientModel.debugDeployment();
}
enabled: false

3
mix/qml/StepActionImage.qml
View File

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

4
mix/qml/TransactionDialog.qml
View File

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

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

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

16
mix/qml/main.qml
View File

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

Write Preview
Loading…
Cancel
Save