From a05dd6b7e6b7ffeedc295d5c54c21eeab31c2427 Mon Sep 17 00:00:00 2001 From: Pokechu22 Date: Mon, 31 Jan 2022 10:02:16 -0800 Subject: [PATCH 1/4] MemoryWidget: Fix improperly behaving radio buttons --- Source/Core/DolphinQt/Debugger/MemoryWidget.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Source/Core/DolphinQt/Debugger/MemoryWidget.cpp b/Source/Core/DolphinQt/Debugger/MemoryWidget.cpp index fe1307ec41..04320c8e0d 100644 --- a/Source/Core/DolphinQt/Debugger/MemoryWidget.cpp +++ b/Source/Core/DolphinQt/Debugger/MemoryWidget.cpp @@ -6,6 +6,7 @@ #include #include +#include #include #include #include @@ -103,6 +104,12 @@ void MemoryWidget::CreateWidgets() m_address_splitter->setCollapsible(0, false); m_address_splitter->setStretchFactor(1, 2); + auto* search_type_group = new QButtonGroup(this); + m_find_ascii = new QRadioButton(tr("ASCII")); + m_find_hex = new QRadioButton(tr("Hex string")); + search_type_group->addButton(m_find_ascii); + search_type_group->addButton(m_find_hex); + // Dump m_dump_mram = new QPushButton(tr("Dump &MRAM")); m_dump_exram = new QPushButton(tr("Dump &ExRAM")); @@ -116,8 +123,6 @@ void MemoryWidget::CreateWidgets() m_find_next = new QPushButton(tr("Find &Next")); m_find_previous = new QPushButton(tr("Find &Previous")); - m_find_ascii = new QRadioButton(tr("ASCII")); - m_find_hex = new QRadioButton(tr("Hex string")); m_result_label = new QLabel; search_layout->addWidget(m_find_next); From 99b3ac21e4e51664a67a07c1c6c175a67a352e9d Mon Sep 17 00:00:00 2001 From: Pokechu22 Date: Mon, 31 Jan 2022 10:12:55 -0800 Subject: [PATCH 2/4] NewBreakpointDialog: Fix improperly behaving radio buttons --- Source/Core/DolphinQt/Debugger/NewBreakpointDialog.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Source/Core/DolphinQt/Debugger/NewBreakpointDialog.cpp b/Source/Core/DolphinQt/Debugger/NewBreakpointDialog.cpp index 6a1a3eff7b..3e8bfae69a 100644 --- a/Source/Core/DolphinQt/Debugger/NewBreakpointDialog.cpp +++ b/Source/Core/DolphinQt/Debugger/NewBreakpointDialog.cpp @@ -3,6 +3,7 @@ #include "DolphinQt/Debugger/NewBreakpointDialog.h" +#include #include #include #include @@ -31,10 +32,12 @@ NewBreakpointDialog::NewBreakpointDialog(BreakpointWidget* parent) void NewBreakpointDialog::CreateWidgets() { m_buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel); + auto* type_group = new QButtonGroup(this); // Instruction BP m_instruction_bp = new QRadioButton(tr("Instruction Breakpoint")); m_instruction_bp->setChecked(true); + type_group->addButton(m_instruction_bp); m_instruction_box = new QGroupBox; m_instruction_address = new QLineEdit; @@ -45,11 +48,15 @@ void NewBreakpointDialog::CreateWidgets() // Memory BP m_memory_bp = new QRadioButton(tr("Memory Breakpoint")); + type_group->addButton(m_memory_bp); m_memory_box = new QGroupBox; + auto* memory_type_group = new QButtonGroup(this); m_memory_use_address = new QRadioButton(tr("Address")); m_memory_use_address->setChecked(true); + memory_type_group->addButton(m_memory_use_address); // i18n: A range of memory addresses m_memory_use_range = new QRadioButton(tr("Range")); + memory_type_group->addButton(m_memory_use_range); m_memory_address_from = new QLineEdit; m_memory_address_to = new QLineEdit; m_memory_address_from_label = new QLabel; // Set by OnAddressTypeChanged From 0daee4fe9f4cab476f71224a7d2930ac4b78d686 Mon Sep 17 00:00:00 2001 From: Pokechu22 Date: Sat, 12 Feb 2022 11:39:45 -0800 Subject: [PATCH 3/4] CheatSearchFactoryWidget: Set QButtonGroup's parent --- Source/Core/DolphinQt/CheatSearchFactoryWidget.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/DolphinQt/CheatSearchFactoryWidget.cpp b/Source/Core/DolphinQt/CheatSearchFactoryWidget.cpp index 6e566600f8..96dccfd240 100644 --- a/Source/Core/DolphinQt/CheatSearchFactoryWidget.cpp +++ b/Source/Core/DolphinQt/CheatSearchFactoryWidget.cpp @@ -55,7 +55,7 @@ void CheatSearchFactoryWidget::CreateWidgets() auto* custom_address_space_layout = new QVBoxLayout(); custom_address_space_layout->setMargin(6); - auto* custom_address_space_button_group = new QButtonGroup(); + auto* custom_address_space_button_group = new QButtonGroup(this); m_custom_virtual_address_space = new QRadioButton(tr("Use virtual addresses when possible")); m_custom_virtual_address_space->setChecked(true); m_custom_physical_address_space = new QRadioButton(tr("Use physical addresses")); From f2f9df7541720217b6375b78cc7b8e70e0b958f9 Mon Sep 17 00:00:00 2001 From: Pokechu22 Date: Mon, 31 Jan 2022 10:19:23 -0800 Subject: [PATCH 4/4] Remove unused includes of QButtonGroup --- Source/Core/DolphinQt/Config/ARCodeWidget.cpp | 1 - .../ControllerInterface/DualShockUDPClientAddServerDialog.cpp | 1 - Source/Core/DolphinQt/Settings/USBDeviceAddToWhitelistDialog.cpp | 1 - Source/Core/DolphinQt/Settings/USBDeviceAddToWhitelistDialog.h | 1 - 4 files changed, 4 deletions(-) diff --git a/Source/Core/DolphinQt/Config/ARCodeWidget.cpp b/Source/Core/DolphinQt/Config/ARCodeWidget.cpp index b45cfb3772..b528bfb509 100644 --- a/Source/Core/DolphinQt/Config/ARCodeWidget.cpp +++ b/Source/Core/DolphinQt/Config/ARCodeWidget.cpp @@ -5,7 +5,6 @@ #include -#include #include #include #include diff --git a/Source/Core/DolphinQt/Config/ControllerInterface/DualShockUDPClientAddServerDialog.cpp b/Source/Core/DolphinQt/Config/ControllerInterface/DualShockUDPClientAddServerDialog.cpp index 790b6ca6ce..84185da00d 100644 --- a/Source/Core/DolphinQt/Config/ControllerInterface/DualShockUDPClientAddServerDialog.cpp +++ b/Source/Core/DolphinQt/Config/ControllerInterface/DualShockUDPClientAddServerDialog.cpp @@ -5,7 +5,6 @@ #include -#include #include #include #include diff --git a/Source/Core/DolphinQt/Settings/USBDeviceAddToWhitelistDialog.cpp b/Source/Core/DolphinQt/Settings/USBDeviceAddToWhitelistDialog.cpp index d2272d03b0..1024816e22 100644 --- a/Source/Core/DolphinQt/Settings/USBDeviceAddToWhitelistDialog.cpp +++ b/Source/Core/DolphinQt/Settings/USBDeviceAddToWhitelistDialog.cpp @@ -3,7 +3,6 @@ #include "DolphinQt/Settings/USBDeviceAddToWhitelistDialog.h" -#include #include #include #include diff --git a/Source/Core/DolphinQt/Settings/USBDeviceAddToWhitelistDialog.h b/Source/Core/DolphinQt/Settings/USBDeviceAddToWhitelistDialog.h index 1b0ebcdccc..5ae1199f2e 100644 --- a/Source/Core/DolphinQt/Settings/USBDeviceAddToWhitelistDialog.h +++ b/Source/Core/DolphinQt/Settings/USBDeviceAddToWhitelistDialog.h @@ -7,7 +7,6 @@ class QTimer; class QDialog; -class QButtonGroup; class QHeaderView; class QLabel; class QLineEdit;