piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-25 15:19:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

BreakpointWidget: Move delete to the context menu. Selecting rows will be removed, so select -> delete is hard to maintain.

Browse Source
This commit is contained in:
TryTwo
2024-05-14 13:02:11 -07:00
parent e0e09d1074
commit d96840f808
2 changed files with 7 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
Source/Core/DolphinQt/Debugger/BreakpointWidget.cpp
View File

@ -109,7 +109,6 @@ void BreakpointWidget::CreateWidgets()
layout->setSpacing(0); layout->setSpacing(0);
m_new = m_toolbar->addAction(tr("New"), this, &BreakpointWidget::OnNewBreakpoint); m_new = m_toolbar->addAction(tr("New"), this, &BreakpointWidget::OnNewBreakpoint);
m_delete = m_toolbar->addAction(tr("Delete"), this, &BreakpointWidget::OnDelete);
m_clear = m_toolbar->addAction(tr("Clear"), this, &BreakpointWidget::OnClear); m_clear = m_toolbar->addAction(tr("Clear"), this, &BreakpointWidget::OnClear);
m_load = m_toolbar->addAction(tr("Load"), this, &BreakpointWidget::OnLoad); m_load = m_toolbar->addAction(tr("Load"), this, &BreakpointWidget::OnLoad);
@ -128,7 +127,6 @@ void BreakpointWidget::CreateWidgets()
void BreakpointWidget::UpdateIcons() void BreakpointWidget::UpdateIcons()
{ {
m_new->setIcon(Resources::GetThemeIcon("debugger_add_breakpoint")); m_new->setIcon(Resources::GetThemeIcon("debugger_add_breakpoint"));
m_delete->setIcon(Resources::GetThemeIcon("debugger_delete"));
m_clear->setIcon(Resources::GetThemeIcon("debugger_clear")); m_clear->setIcon(Resources::GetThemeIcon("debugger_clear"));
m_load->setIcon(Resources::GetThemeIcon("debugger_load")); m_load->setIcon(Resources::GetThemeIcon("debugger_load"));
m_save->setIcon(Resources::GetThemeIcon("debugger_save")); m_save->setIcon(Resources::GetThemeIcon("debugger_save"));
@ -268,30 +266,6 @@ void BreakpointWidget::Update()
} }
} }
void BreakpointWidget::OnDelete()
{
const auto selected_items = m_table->selectedItems();
if (selected_items.empty())
return;
const auto item = selected_items.constFirst();
const auto address = item->data(ADDRESS_ROLE).toUInt();
const bool is_memcheck = item->data(IS_MEMCHECK_ROLE).toBool();
if (is_memcheck)
{
const QSignalBlocker blocker(Settings::Instance());
m_system.GetPowerPC().GetMemChecks().Remove(address);
}
else
{
m_system.GetPowerPC().GetBreakPoints().Remove(address);
}
emit BreakpointsChanged();
Update();
}
void BreakpointWidget::OnClear() void BreakpointWidget::OnClear()
{ {
m_system.GetPowerPC().GetDebugInterface().ClearAllBreakpoints(); m_system.GetPowerPC().GetDebugInterface().ClearAllBreakpoints();
@ -402,9 +376,9 @@ void BreakpointWidget::OnContextMenu()
return; return;
menu->addAction(tr("Show in Code"), [this, bp_address] { emit ShowCode(bp_address); }); menu->addAction(tr("Show in Code"), [this, bp_address] { emit ShowCode(bp_address); });
menu->addAction(bp_iter->is_enabled ? tr("Disable") : tr("Enable"), [this, &bp_address]() { menu->addAction(tr("Edit..."), [this, bp_address] { OnEditBreakpoint(bp_address, true); });
m_system.GetPowerPC().GetBreakPoints().ToggleBreakPoint(bp_address); menu->addAction(tr("Delete"), [this, &bp_address]() {
m_system.GetPowerPC().GetBreakPoints().Remove(bp_address);
emit BreakpointsChanged(); emit BreakpointsChanged();
Update(); Update();
}); });
@ -419,16 +393,14 @@ void BreakpointWidget::OnContextMenu()
return; return;
menu->addAction(tr("Show in Memory"), [this, bp_address] { emit ShowMemory(bp_address); }); menu->addAction(tr("Show in Memory"), [this, bp_address] { emit ShowMemory(bp_address); });
menu->addAction(mb_iter->is_enabled ? tr("Disable") : tr("Enable"), [this, &bp_address]() { menu->addAction(tr("Edit..."), [this, bp_address] { OnEditBreakpoint(bp_address, false); });
m_system.GetPowerPC().GetMemChecks().ToggleBreakPoint(bp_address); menu->addAction(tr("Delete"), [this, &bp_address]() {
const QSignalBlocker blocker(Settings::Instance());
m_system.GetPowerPC().GetMemChecks().Remove(bp_address);
emit BreakpointsChanged(); emit BreakpointsChanged();
Update(); Update();
}); });
} }
menu->addAction(tr("Edit..."), [this, bp_address, is_memory_breakpoint] {
OnEditBreakpoint(bp_address, !is_memory_breakpoint);
});
menu->exec(QCursor::pos()); menu->exec(QCursor::pos());
} }

2
Source/Core/DolphinQt/Debugger/BreakpointWidget.h
View File

@ -45,7 +45,6 @@ protected:
private: private:
void CreateWidgets(); void CreateWidgets();
void OnDelete();
void OnClear(); void OnClear();
void OnNewBreakpoint(); void OnNewBreakpoint();
void OnEditBreakpoint(u32 address, bool is_instruction_bp); void OnEditBreakpoint(u32 address, bool is_instruction_bp);
@ -60,7 +59,6 @@ private:
QToolBar* m_toolbar; QToolBar* m_toolbar;
QTableWidget* m_table; QTableWidget* m_table;
QAction* m_new; QAction* m_new;
QAction* m_delete;
QAction* m_clear; QAction* m_clear;
QAction* m_load; QAction* m_load;
QAction* m_save; QAction* m_save;