Marge master into PPU

This commit is contained in:
Clément Le Bihan
2020-03-28 23:35:38 +01:00
38 changed files with 1512 additions and 971 deletions
+79 -25
View File
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>420</width>
<height>438</height>
<width>971</width>
<height>709</height>
</rect>
</property>
<property name="windowTitle">
@@ -21,28 +21,39 @@
<bool>false</bool>
</property>
<widget class="QWidget" name="centralwidget">
<layout class="QGridLayout" name="gridLayout">
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0" rowspan="2">
<widget class="QTableView" name="disassembly">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>1</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="selectionMode">
<enum>QAbstractItemView::ExtendedSelection</enum>
</property>
<property name="selectionBehavior">
<enum>QAbstractItemView::SelectRows</enum>
</property>
<property name="showGrid">
<bool>false</bool>
</property>
<property name="gridStyle">
<enum>Qt::NoPen</enum>
</property>
<attribute name="horizontalHeaderVisible">
<bool>false</bool>
</attribute>
<attribute name="horizontalHeaderHighlightSections">
<bool>false</bool>
</attribute>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="loggerLabel">
<property name="text">
<string>Instructions History</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QTextBrowser" name="logger"/>
</item>
<item row="2" column="1">
<widget class="QPushButton" name="clear">
<property name="text">
<string>Clear History</string>
</property>
</widget>
</item>
<item row="0" column="0" rowspan="3">
<layout class="QFormLayout" name="formLayout">
<item row="0" column="0">
<widget class="QLabel" name="accumulatorLabel">
@@ -150,10 +161,37 @@
<property name="layoutDirection">
<enum>Qt::RightToLeft</enum>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="1">
<layout class="QGridLayout" name="gridLayout">
<item row="2" column="0">
<widget class="QPushButton" name="clear">
<property name="text">
<string>Clear History</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="loggerLabel">
<property name="text">
<string>Instructions History</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QTextBrowser" name="logger"/>
</item>
</layout>
</item>
</layout>
</widget>
<widget class="QToolBar" name="toolBar">
@@ -182,6 +220,7 @@
<bool>false</bool>
</attribute>
<addaction name="actionPause"/>
<addaction name="actionNext"/>
<addaction name="actionStep"/>
</widget>
<action name="actionPause">
@@ -190,13 +229,13 @@
<normaloff>:/resources/icons/play.svg</normaloff>:/resources/icons/play.svg</iconset>
</property>
<property name="text">
<string>Resume</string>
<string>Continue</string>
</property>
<property name="toolTip">
<string>Pause or Resume instruction execution.</string>
</property>
<property name="shortcut">
<string>P</string>
<string>C</string>
</property>
</action>
<action name="actionStep">
@@ -214,6 +253,21 @@
<string>S</string>
</property>
</action>
<action name="actionNext">
<property name="icon">
<iconset resource="../resources/appResources.qrc">
<normaloff>:/resources/icons/continue.svg</normaloff>:/resources/icons/continue.svg</iconset>
</property>
<property name="text">
<string>Next</string>
</property>
<property name="toolTip">
<string>Continue execution to the next line.</string>
</property>
<property name="shortcut">
<string>N</string>
</property>
</action>
</widget>
<resources>
<include location="../resources/appResources.qrc"/>