diff --git a/pcsx2-qt/Debugger/Breakpoints/BreakpointDialog.cpp b/pcsx2-qt/Debugger/Breakpoints/BreakpointDialog.cpp index 5cee329a2d..194197e00e 100644 --- a/pcsx2-qt/Debugger/Breakpoints/BreakpointDialog.cpp +++ b/pcsx2-qt/Debugger/Breakpoints/BreakpointDialog.cpp @@ -42,6 +42,7 @@ BreakpointDialog::BreakpointDialog(QWidget* parent, DebugInterface* cpu, Breakpo m_ui.rdoExecute->setChecked(true); m_ui.chkEnable->setChecked(bp->enabled); m_ui.txtAddress->setText(QtUtils::FilledQStringFromValue(bp->addr, 16)); + m_ui.txtDescription->setText(QString::fromStdString(bp->description)); if (bp->hasCond) m_ui.txtCondition->setText(QString::fromStdString(bp->cond.expressionString)); @@ -53,6 +54,8 @@ BreakpointDialog::BreakpointDialog(QWidget* parent, DebugInterface* cpu, Breakpo m_ui.txtAddress->setText(QtUtils::FilledQStringFromValue(mc->start, 16)); m_ui.txtSize->setText(QtUtils::FilledQStringFromValue(mc->end - mc->start, 16)); + m_ui.txtDescription->setText(QString::fromStdString(mc->description)); + m_ui.chkRead->setChecked(mc->memCond & MEMCHECK_READ); m_ui.chkWrite->setChecked(mc->memCond & MEMCHECK_WRITE); m_ui.chkChange->setChecked(mc->memCond & MEMCHECK_WRITE_ONCHANGE); @@ -102,6 +105,7 @@ void BreakpointDialog::accept() } bp->addr = address; + bp->description = m_ui.txtDescription->text().toStdString(); bp->enabled = m_ui.chkEnable->isChecked(); @@ -138,6 +142,7 @@ void BreakpointDialog::accept() mc->start = startAddress; mc->end = startAddress + size; + mc->description = m_ui.txtDescription->text().toStdString(); if (!m_ui.txtCondition->text().isEmpty()) { diff --git a/pcsx2-qt/Debugger/Breakpoints/BreakpointDialog.ui b/pcsx2-qt/Debugger/Breakpoints/BreakpointDialog.ui index a15212baf0..ec751dd211 100644 --- a/pcsx2-qt/Debugger/Breakpoints/BreakpointDialog.ui +++ b/pcsx2-qt/Debugger/Breakpoints/BreakpointDialog.ui @@ -10,7 +10,7 @@ 0 0 375 - 250 + 300 @@ -22,19 +22,19 @@ 375 - 250 + 300 375 - 250 + 300 375 - 250 + 300 @@ -44,7 +44,7 @@ 20 - 210 + 260 341 32 @@ -102,14 +102,17 @@ 110 10 - 251 - 41 + 250 + 79 + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + @@ -139,6 +142,29 @@ + + + + Description + + + + + + + + 0 + 19 + + + + + 16777215 + 19 + + + + @@ -148,7 +174,7 @@ 110 - 50 + 100 251 91 @@ -224,13 +250,13 @@ 110 - 140 + 190 251 61 - + diff --git a/pcsx2-qt/Debugger/DebuggerSettingsManager.cpp b/pcsx2-qt/Debugger/DebuggerSettingsManager.cpp index b78d0b8ec6..bec1acf0ee 100644 --- a/pcsx2-qt/Debugger/DebuggerSettingsManager.cpp +++ b/pcsx2-qt/Debugger/DebuggerSettingsManager.cpp @@ -63,7 +63,7 @@ void DebuggerSettingsManager::loadGameSettings(BreakpointModel* bpModel) } // Breakpoint descriptions were added at debugger settings file version 0.01. If loading - // saved breakpoints from a previous version (only 0.00 exists), the breakpoints will be + // saved breakpoints from a previous version (only 0.00 existed prior), the breakpoints will be // missing a description. This code will add in an empty description so that the previous // version, 0.00, is compatible with 0.01. const QJsonValue savedVersionValue = loadGameSettingsJSON().value("Version");