dahjah/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-12-16 04:09:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

AdvancedPane: Use ConfigControls where applicable

Browse Source
This commit is contained in:
Joshua Vandaële 2025-08-13 01:09:01 +02:00
parent 3cf4b02a91
commit e1088659b1
No known key found for this signature in database
GPG Key ID: 6BB95AF71EB0F406
2 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Source/Core/DolphinQt/Settings/AdvancedPane.cpp
View File

@ -4,7 +4,6 @@
#include "DolphinQt/Settings/AdvancedPane.h" #include "DolphinQt/Settings/AdvancedPane.h"
#include <QCheckBox> #include <QCheckBox>
#include <QComboBox>
#include <QDateTimeEdit> #include <QDateTimeEdit>
#include <QFontMetrics> #include <QFontMetrics>
#include <QFormLayout> #include <QFormLayout>
@ -29,6 +28,7 @@
#include "Core/System.h" #include "Core/System.h"
#include "DolphinQt/Config/ConfigControls/ConfigBool.h" #include "DolphinQt/Config/ConfigControls/ConfigBool.h"
#include "DolphinQt/Config/ConfigControls/ConfigChoice.h"
#include "DolphinQt/Config/ConfigControls/ConfigFloatSlider.h" #include "DolphinQt/Config/ConfigControls/ConfigFloatSlider.h"
#include "DolphinQt/Config/ConfigControls/ConfigSlider.h" #include "DolphinQt/Config/ConfigControls/ConfigSlider.h"
#include "DolphinQt/QtUtils/AnalyticsPrompt.h" #include "DolphinQt/QtUtils/AnalyticsPrompt.h"
@ -72,12 +72,12 @@ void AdvancedPane::CreateLayout()
cpu_emulation_engine_layout->setFieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow); cpu_emulation_engine_layout->setFieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow);
cpu_options_group_layout->addLayout(cpu_emulation_engine_layout); cpu_options_group_layout->addLayout(cpu_emulation_engine_layout);
m_cpu_emulation_engine_combobox = new QComboBox(this); std::vector<std::pair<QString, PowerPC::CPUCore>> emulation_engine_choices;
cpu_emulation_engine_layout->addRow(tr("CPU Emulation Engine:"), m_cpu_emulation_engine_combobox);
for (PowerPC::CPUCore cpu_core : PowerPC::AvailableCPUCores()) for (PowerPC::CPUCore cpu_core : PowerPC::AvailableCPUCores())
{ emulation_engine_choices.emplace_back(tr(CPU_CORE_NAMES.at(cpu_core)), cpu_core);
m_cpu_emulation_engine_combobox->addItem(tr(CPU_CORE_NAMES.at(cpu_core))); m_cpu_emulation_engine_combobox =
} new ConfigChoiceMap<PowerPC::CPUCore>(emulation_engine_choices, Config::MAIN_CPU_CORE);
cpu_emulation_engine_layout->addRow(tr("CPU Emulation Engine:"), m_cpu_emulation_engine_combobox);
m_enable_mmu_checkbox = new ConfigBool(tr("Enable MMU"), Config::MAIN_MMU); m_enable_mmu_checkbox = new ConfigBool(tr("Enable MMU"), Config::MAIN_MMU);
m_enable_mmu_checkbox->SetDescription( m_enable_mmu_checkbox->SetDescription(
@ -306,12 +306,6 @@ void AdvancedPane::CreateLayout()
void AdvancedPane::ConnectLayout() void AdvancedPane::ConnectLayout()
{ {
connect(m_cpu_emulation_engine_combobox, &QComboBox::currentIndexChanged, [](int index) {
const auto cpu_cores = PowerPC::AvailableCPUCores();
if (index >= 0 && static_cast<size_t>(index) < cpu_cores.size())
Config::SetBaseOrCurrent(Config::MAIN_CPU_CORE, cpu_cores[index]);
});
m_ram_override_checkbox->setChecked(Config::Get(Config::MAIN_RAM_OVERRIDE_ENABLE)); m_ram_override_checkbox->setChecked(Config::Get(Config::MAIN_RAM_OVERRIDE_ENABLE));
connect(m_ram_override_checkbox, &QCheckBox::toggled, [this](bool enable_ram_override) { connect(m_ram_override_checkbox, &QCheckBox::toggled, [this](bool enable_ram_override) {
Config::SetBaseOrCurrent(Config::MAIN_RAM_OVERRIDE_ENABLE, enable_ram_override); Config::SetBaseOrCurrent(Config::MAIN_RAM_OVERRIDE_ENABLE, enable_ram_override);
@ -334,13 +328,6 @@ void AdvancedPane::Update()
const bool enable_custom_rtc_widgets = const bool enable_custom_rtc_widgets =
Config::Get(Config::MAIN_CUSTOM_RTC_ENABLE) && is_uninitialized; Config::Get(Config::MAIN_CUSTOM_RTC_ENABLE) && is_uninitialized;
const auto available_cpu_cores = PowerPC::AvailableCPUCores();
const auto cpu_core = Config::Get(Config::MAIN_CPU_CORE);
for (size_t i = 0; i < available_cpu_cores.size(); ++i)
{
if (available_cpu_cores[i] == cpu_core)
m_cpu_emulation_engine_combobox->setCurrentIndex(int(i));
}
m_cpu_emulation_engine_combobox->setEnabled(is_uninitialized); m_cpu_emulation_engine_combobox->setEnabled(is_uninitialized);
m_enable_mmu_checkbox->setEnabled(is_uninitialized); m_enable_mmu_checkbox->setEnabled(is_uninitialized);
m_pause_on_panic_checkbox->setEnabled(is_uninitialized); m_pause_on_panic_checkbox->setEnabled(is_uninitialized);

7
Source/Core/DolphinQt/Settings/AdvancedPane.h
View File

@ -6,12 +6,15 @@
#include <QPushButton> #include <QPushButton>
#include <QWidget> #include <QWidget>
#include "Core/PowerPC/PowerPC.h"
class ConfigBool; class ConfigBool;
template <typename T>
class ConfigChoiceMap;
class ConfigFloatSlider; class ConfigFloatSlider;
class ConfigSlider; class ConfigSlider;
class ConfigSliderU32; class ConfigSliderU32;
class QCheckBox; class QCheckBox;
class QComboBox;
class QLabel; class QLabel;
class QRadioButton; class QRadioButton;
class QSlider; class QSlider;
@ -35,7 +38,7 @@ private:
void OnResetButtonClicked(); void OnResetButtonClicked();
QComboBox* m_cpu_emulation_engine_combobox; ConfigChoiceMap<PowerPC::CPUCore>* m_cpu_emulation_engine_combobox;
ConfigBool* m_enable_mmu_checkbox; ConfigBool* m_enable_mmu_checkbox;
ConfigBool* m_pause_on_panic_checkbox; ConfigBool* m_pause_on_panic_checkbox;
ConfigBool* m_accurate_cpu_cache_checkbox; ConfigBool* m_accurate_cpu_cache_checkbox;