Merge branch 'master' of https://github.com/dolphin-emu/dolphin into dolphin-emu-master

This commit is contained in:
Nayla Hanegan 2024-10-23 14:29:49 -04:00
commit 4bd7d38a77
1243 changed files with 15939 additions and 15402 deletions

View file

@ -23,6 +23,7 @@
#include "DolphinQt/Debugger/BreakpointDialog.h"
#include "DolphinQt/Debugger/MemoryWidget.h"
#include "DolphinQt/Host.h"
#include "DolphinQt/QtUtils/SetWindowDecorations.h"
#include "DolphinQt/Resources.h"
#include "DolphinQt/Settings.h"
@ -91,6 +92,9 @@ BreakpointWidget::BreakpointWidget(QWidget* parent)
Update();
});
connect(Host::GetInstance(), &Host::PPCSymbolsChanged, this, &BreakpointWidget::Update);
connect(Host::GetInstance(), &Host::PPCBreakpointsChanged, this, &BreakpointWidget::Update);
UpdateIcons();
}
@ -182,8 +186,7 @@ void BreakpointWidget::OnClicked(QTableWidgetItem* item)
else
m_system.GetPowerPC().GetBreakPoints().ToggleEnable(address);
emit BreakpointsChanged();
Update();
emit Host::GetInstance()->PPCBreakpointsChanged();
return;
}
@ -214,9 +217,9 @@ void BreakpointWidget::UpdateButtonsEnabled()
if (!isVisible())
return;
const bool is_initialised = Core::GetState(m_system) != Core::State::Uninitialized;
m_load->setEnabled(is_initialised);
m_save->setEnabled(is_initialised);
const bool is_running = Core::IsRunning(m_system);
m_load->setEnabled(is_running);
m_save->setEnabled(is_running);
}
void BreakpointWidget::Update()
@ -391,8 +394,7 @@ void BreakpointWidget::OnClear()
m_table->setRowCount(0);
emit BreakpointsChanged();
Update();
emit Host::GetInstance()->PPCBreakpointsChanged();
}
void BreakpointWidget::OnNewBreakpoint()
@ -422,8 +424,7 @@ void BreakpointWidget::OnEditBreakpoint(u32 address, bool is_instruction_bp)
dialog->exec();
}
emit BreakpointsChanged();
Update();
emit Host::GetInstance()->PPCBreakpointsChanged();
}
void BreakpointWidget::OnLoad()
@ -452,8 +453,7 @@ void BreakpointWidget::OnLoad()
memchecks.AddFromStrings(new_mcs);
}
emit BreakpointsChanged();
Update();
emit Host::GetInstance()->PPCBreakpointsChanged();
}
void BreakpointWidget::OnSave()
@ -492,8 +492,7 @@ void BreakpointWidget::OnContextMenu(const QPoint& pos)
menu->addAction(tr("Edit..."), [this, bp_address] { OnEditBreakpoint(bp_address, true); });
menu->addAction(tr("Delete"), [this, &bp_address]() {
m_system.GetPowerPC().GetBreakPoints().Remove(bp_address);
emit BreakpointsChanged();
Update();
emit Host::GetInstance()->PPCBreakpointsChanged();
});
}
else
@ -510,8 +509,7 @@ void BreakpointWidget::OnContextMenu(const QPoint& pos)
menu->addAction(tr("Delete"), [this, &bp_address]() {
const QSignalBlocker blocker(Settings::Instance());
m_system.GetPowerPC().GetMemChecks().Remove(bp_address);
emit BreakpointsChanged();
Update();
emit Host::GetInstance()->PPCBreakpointsChanged();
});
}
@ -575,8 +573,7 @@ void BreakpointWidget::AddBP(u32 addr, bool break_on_hit, bool log_on_hit, const
addr, break_on_hit, log_on_hit,
!condition.isEmpty() ? Expression::TryParse(condition.toUtf8().constData()) : std::nullopt);
emit BreakpointsChanged();
Update();
emit Host::GetInstance()->PPCBreakpointsChanged();
}
void BreakpointWidget::EditBreakpoint(u32 address, int edit, std::optional<QString> string)
@ -610,8 +607,7 @@ void BreakpointWidget::EditBreakpoint(u32 address, int edit, std::optional<QStri
m_system.GetPowerPC().GetBreakPoints().Remove(address);
m_system.GetPowerPC().GetBreakPoints().Add(std::move(bp));
emit BreakpointsChanged();
Update();
emit Host::GetInstance()->PPCBreakpointsChanged();
}
void BreakpointWidget::AddAddressMBP(u32 addr, bool on_read, bool on_write, bool do_log,
@ -633,8 +629,7 @@ void BreakpointWidget::AddAddressMBP(u32 addr, bool on_read, bool on_write, bool
m_system.GetPowerPC().GetMemChecks().Add(std::move(check));
}
emit BreakpointsChanged();
Update();
emit Host::GetInstance()->PPCBreakpointsChanged();
}
void BreakpointWidget::AddRangedMBP(u32 from, u32 to, bool on_read, bool on_write, bool do_log,
@ -656,8 +651,7 @@ void BreakpointWidget::AddRangedMBP(u32 from, u32 to, bool on_read, bool on_writ
m_system.GetPowerPC().GetMemChecks().Add(std::move(check));
}
emit BreakpointsChanged();
Update();
emit Host::GetInstance()->PPCBreakpointsChanged();
}
void BreakpointWidget::EditMBP(u32 address, int edit, std::optional<QString> string)
@ -714,6 +708,5 @@ void BreakpointWidget::EditMBP(u32 address, int edit, std::optional<QString> str
m_system.GetPowerPC().GetMemChecks().Remove(address);
}
emit BreakpointsChanged();
Update();
emit Host::GetInstance()->PPCBreakpointsChanged();
}