From 2237a4a7aa32b634a24234fb9362d8f2409a09d8 Mon Sep 17 00:00:00 2001 From: Dentomologist Date: Mon, 24 Apr 2023 20:36:43 -0700 Subject: [PATCH] Qt: Rename GraphicsChoice to ConfigChoice GraphicsChoice is used by the panes in the Graphics config window to create combo boxes that change their associated config setting, and update their own state when something else changes the config setting. Despite its current name nothing about this class is particular to the Graphics window, so renaming it to ConfigChoice better reflects its purpose. This should also make it less confusing when ConfigChoices are eventually added to the other config windows. --- Source/Core/DolphinQt/CMakeLists.txt | 4 ++-- .../ConfigChoice.cpp} | 8 ++++---- .../GraphicsChoice.h => ConfigControls/ConfigChoice.h} | 4 ++-- Source/Core/DolphinQt/Config/FreeLookWidget.cpp | 6 +++--- Source/Core/DolphinQt/Config/FreeLookWidget.h | 4 ++-- .../Core/DolphinQt/Config/Graphics/AdvancedWidget.cpp | 2 +- Source/Core/DolphinQt/Config/Graphics/AdvancedWidget.h | 2 +- .../DolphinQt/Config/Graphics/EnhancementsWidget.cpp | 10 +++++----- .../DolphinQt/Config/Graphics/EnhancementsWidget.h | 6 +++--- .../Core/DolphinQt/Config/Graphics/GeneralWidget.cpp | 6 +++--- Source/Core/DolphinQt/Config/Graphics/GeneralWidget.h | 4 ++-- Source/Core/DolphinQt/DolphinQt.vcxproj | 4 ++-- 12 files changed, 30 insertions(+), 30 deletions(-) rename Source/Core/DolphinQt/Config/{Graphics/GraphicsChoice.cpp => ConfigControls/ConfigChoice.cpp} (75%) rename Source/Core/DolphinQt/Config/{Graphics/GraphicsChoice.h => ConfigControls/ConfigChoice.h} (70%) diff --git a/Source/Core/DolphinQt/CMakeLists.txt b/Source/Core/DolphinQt/CMakeLists.txt index 1ef8c0cb64e7..f60d9fda28fb 100644 --- a/Source/Core/DolphinQt/CMakeLists.txt +++ b/Source/Core/DolphinQt/CMakeLists.txt @@ -43,6 +43,8 @@ add_executable(dolphin-emu Config/CommonControllersWidget.h Config/ConfigControls/ConfigBool.cpp Config/ConfigControls/ConfigBool.h + Config/ConfigControls/ConfigChoice.cpp + Config/ConfigControls/ConfigChoice.h Config/ControllerInterface/ControllerInterfaceWindow.cpp Config/ControllerInterface/ControllerInterfaceWindow.h Config/ControllerInterface/DualShockUDPClientAddServerDialog.cpp @@ -75,8 +77,6 @@ add_executable(dolphin-emu Config/Graphics/EnhancementsWidget.h Config/Graphics/GeneralWidget.cpp Config/Graphics/GeneralWidget.h - Config/Graphics/GraphicsChoice.cpp - Config/Graphics/GraphicsChoice.h Config/Graphics/GraphicsInteger.cpp Config/Graphics/GraphicsInteger.h Config/Graphics/GraphicsRadio.cpp diff --git a/Source/Core/DolphinQt/Config/Graphics/GraphicsChoice.cpp b/Source/Core/DolphinQt/Config/ConfigControls/ConfigChoice.cpp similarity index 75% rename from Source/Core/DolphinQt/Config/Graphics/GraphicsChoice.cpp rename to Source/Core/DolphinQt/Config/ConfigControls/ConfigChoice.cpp index 08d1538dcd2d..42b255b09aa4 100644 --- a/Source/Core/DolphinQt/Config/Graphics/GraphicsChoice.cpp +++ b/Source/Core/DolphinQt/Config/ConfigControls/ConfigChoice.cpp @@ -1,7 +1,7 @@ // Copyright 2017 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "DolphinQt/Config/Graphics/GraphicsChoice.h" +#include "DolphinQt/Config/ConfigControls/ConfigChoice.h" #include @@ -9,11 +9,11 @@ #include "DolphinQt/Settings.h" -GraphicsChoice::GraphicsChoice(const QStringList& options, const Config::Info& setting) +ConfigChoice::ConfigChoice(const QStringList& options, const Config::Info& setting) : m_setting(setting) { addItems(options); - connect(this, qOverload(&QComboBox::currentIndexChanged), this, &GraphicsChoice::Update); + connect(this, qOverload(&QComboBox::currentIndexChanged), this, &ConfigChoice::Update); setCurrentIndex(Config::Get(m_setting)); connect(&Settings::Instance(), &Settings::ConfigChanged, this, [this] { @@ -26,7 +26,7 @@ GraphicsChoice::GraphicsChoice(const QStringList& options, const Config::Info& setting); + ConfigChoice(const QStringList& options, const Config::Info& setting); private: void Update(int choice); diff --git a/Source/Core/DolphinQt/Config/FreeLookWidget.cpp b/Source/Core/DolphinQt/Config/FreeLookWidget.cpp index 87c204b667ad..e0524c06d75c 100644 --- a/Source/Core/DolphinQt/Config/FreeLookWidget.cpp +++ b/Source/Core/DolphinQt/Config/FreeLookWidget.cpp @@ -13,7 +13,7 @@ #include "Core/ConfigManager.h" #include "Core/Core.h" -#include "DolphinQt/Config/Graphics/GraphicsChoice.h" +#include "DolphinQt/Config/ConfigControls/ConfigChoice.h" #include "DolphinQt/Config/Mapping/MappingWindow.h" #include "DolphinQt/Config/ToolTipControls/ToolTipCheckBox.h" #include "DolphinQt/QtUtils/NonDefaultQPushButton.h" @@ -37,8 +37,8 @@ void FreeLookWidget::CreateLayout() "leave this unchecked.")); m_freelook_controller_configure_button = new NonDefaultQPushButton(tr("Configure Controller")); - m_freelook_control_type = new GraphicsChoice({tr("Six Axis"), tr("First Person"), tr("Orbital")}, - Config::FL1_CONTROL_TYPE); + m_freelook_control_type = new ConfigChoice({tr("Six Axis"), tr("First Person"), tr("Orbital")}, + Config::FL1_CONTROL_TYPE); m_freelook_control_type->SetTitle(tr("Free Look Control Type")); m_freelook_control_type->SetDescription(tr( "Changes the in-game camera type during Free Look.

" diff --git a/Source/Core/DolphinQt/Config/FreeLookWidget.h b/Source/Core/DolphinQt/Config/FreeLookWidget.h index 5dbcdf21d0d9..3d04bbd6c6bf 100644 --- a/Source/Core/DolphinQt/Config/FreeLookWidget.h +++ b/Source/Core/DolphinQt/Config/FreeLookWidget.h @@ -5,7 +5,7 @@ #include -class GraphicsChoice; +class ConfigChoice; class QCheckBox; class QPushButton; class ToolTipCheckBox; @@ -25,7 +25,7 @@ class FreeLookWidget final : public QWidget void SaveSettings(); ToolTipCheckBox* m_enable_freelook; - GraphicsChoice* m_freelook_control_type; + ConfigChoice* m_freelook_control_type; QPushButton* m_freelook_controller_configure_button; QCheckBox* m_freelook_background_input; }; diff --git a/Source/Core/DolphinQt/Config/Graphics/AdvancedWidget.cpp b/Source/Core/DolphinQt/Config/Graphics/AdvancedWidget.cpp index e81dd43af2a4..e9138a1f60b7 100644 --- a/Source/Core/DolphinQt/Config/Graphics/AdvancedWidget.cpp +++ b/Source/Core/DolphinQt/Config/Graphics/AdvancedWidget.cpp @@ -16,7 +16,7 @@ #include "Core/Core.h" #include "DolphinQt/Config/ConfigControls/ConfigBool.h" -#include "DolphinQt/Config/Graphics/GraphicsChoice.h" +#include "DolphinQt/Config/ConfigControls/ConfigChoice.h" #include "DolphinQt/Config/Graphics/GraphicsInteger.h" #include "DolphinQt/Config/Graphics/GraphicsWindow.h" #include "DolphinQt/Config/ToolTipControls/ToolTipCheckBox.h" diff --git a/Source/Core/DolphinQt/Config/Graphics/AdvancedWidget.h b/Source/Core/DolphinQt/Config/Graphics/AdvancedWidget.h index 75e0aec4bf4a..c5117910133e 100644 --- a/Source/Core/DolphinQt/Config/Graphics/AdvancedWidget.h +++ b/Source/Core/DolphinQt/Config/Graphics/AdvancedWidget.h @@ -6,7 +6,7 @@ #include "DolphinQt/Config/Graphics/GraphicsWidget.h" class ConfigBool; -class GraphicsChoice; +class ConfigChoice; class GraphicsInteger; class GraphicsWindow; class QCheckBox; diff --git a/Source/Core/DolphinQt/Config/Graphics/EnhancementsWidget.cpp b/Source/Core/DolphinQt/Config/Graphics/EnhancementsWidget.cpp index e015e7ec7bdf..fed400a57716 100644 --- a/Source/Core/DolphinQt/Config/Graphics/EnhancementsWidget.cpp +++ b/Source/Core/DolphinQt/Config/Graphics/EnhancementsWidget.cpp @@ -15,7 +15,7 @@ #include "Core/ConfigManager.h" #include "DolphinQt/Config/ConfigControls/ConfigBool.h" -#include "DolphinQt/Config/Graphics/GraphicsChoice.h" +#include "DolphinQt/Config/ConfigControls/ConfigChoice.h" #include "DolphinQt/Config/Graphics/GraphicsRadio.h" #include "DolphinQt/Config/Graphics/GraphicsSlider.h" #include "DolphinQt/Config/Graphics/GraphicsWindow.h" @@ -82,7 +82,7 @@ void EnhancementsWidget::CreateWidgets() QString::number(static_cast(EFB_HEIGHT) * scale))); } - m_ir_combo = new GraphicsChoice(resolution_options, Config::GFX_EFB_SCALE); + m_ir_combo = new ConfigChoice(resolution_options, Config::GFX_EFB_SCALE); m_ir_combo->setMaxVisibleItems(visible_resolution_option_count); m_aa_combo = new ToolTipComboBox(); @@ -157,9 +157,9 @@ void EnhancementsWidget::CreateWidgets() auto* stereoscopy_layout = new QGridLayout(); stereoscopy_box->setLayout(stereoscopy_layout); - m_3d_mode = new GraphicsChoice({tr("Off"), tr("Side-by-Side"), tr("Top-and-Bottom"), - tr("Anaglyph"), tr("HDMI 3D"), tr("Passive")}, - Config::GFX_STEREO_MODE); + m_3d_mode = new ConfigChoice({tr("Off"), tr("Side-by-Side"), tr("Top-and-Bottom"), tr("Anaglyph"), + tr("HDMI 3D"), tr("Passive")}, + Config::GFX_STEREO_MODE); m_3d_depth = new GraphicsSlider(0, Config::GFX_STEREO_DEPTH_MAXIMUM, Config::GFX_STEREO_DEPTH); m_3d_convergence = new GraphicsSlider(0, Config::GFX_STEREO_CONVERGENCE_MAXIMUM, Config::GFX_STEREO_CONVERGENCE, 100); diff --git a/Source/Core/DolphinQt/Config/Graphics/EnhancementsWidget.h b/Source/Core/DolphinQt/Config/Graphics/EnhancementsWidget.h index f980be8ede35..1a7ede06e1bc 100644 --- a/Source/Core/DolphinQt/Config/Graphics/EnhancementsWidget.h +++ b/Source/Core/DolphinQt/Config/Graphics/EnhancementsWidget.h @@ -8,7 +8,7 @@ #include "DolphinQt/Config/Graphics/GraphicsWidget.h" class ConfigBool; -class GraphicsChoice; +class ConfigChoice; class GraphicsSlider; class GraphicsWindow; class QCheckBox; @@ -34,7 +34,7 @@ class EnhancementsWidget final : public GraphicsWidget void LoadPPShaders(); // Enhancements - GraphicsChoice* m_ir_combo; + ConfigChoice* m_ir_combo; ToolTipComboBox* m_aa_combo; ToolTipComboBox* m_texture_filtering_combo; ToolTipComboBox* m_pp_effect; @@ -48,7 +48,7 @@ class EnhancementsWidget final : public GraphicsWidget ConfigBool* m_arbitrary_mipmap_detection; // Stereoscopy - GraphicsChoice* m_3d_mode; + ConfigChoice* m_3d_mode; GraphicsSlider* m_3d_depth; GraphicsSlider* m_3d_convergence; ConfigBool* m_3d_swap_eyes; diff --git a/Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp b/Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp index 1965b981f8ba..b086a56fbce1 100644 --- a/Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp +++ b/Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp @@ -19,7 +19,7 @@ #include "Core/Core.h" #include "DolphinQt/Config/ConfigControls/ConfigBool.h" -#include "DolphinQt/Config/Graphics/GraphicsChoice.h" +#include "DolphinQt/Config/ConfigControls/ConfigChoice.h" #include "DolphinQt/Config/Graphics/GraphicsRadio.h" #include "DolphinQt/Config/Graphics/GraphicsWindow.h" #include "DolphinQt/Config/ToolTipControls/ToolTipComboBox.h" @@ -57,8 +57,8 @@ void GeneralWidget::CreateWidgets() m_backend_combo = new ToolTipComboBox(); m_aspect_combo = - new GraphicsChoice({tr("Auto"), tr("Force 16:9"), tr("Force 4:3"), tr("Stretch to Window")}, - Config::GFX_ASPECT_RATIO); + new ConfigChoice({tr("Auto"), tr("Force 16:9"), tr("Force 4:3"), tr("Stretch to Window")}, + Config::GFX_ASPECT_RATIO); m_adapter_combo = new ToolTipComboBox; m_enable_vsync = new ConfigBool(tr("V-Sync"), Config::GFX_VSYNC); m_enable_fullscreen = new ConfigBool(tr("Start in Fullscreen"), Config::MAIN_FULLSCREEN); diff --git a/Source/Core/DolphinQt/Config/Graphics/GeneralWidget.h b/Source/Core/DolphinQt/Config/Graphics/GeneralWidget.h index 2a6c907eea39..b3058d1208c4 100644 --- a/Source/Core/DolphinQt/Config/Graphics/GeneralWidget.h +++ b/Source/Core/DolphinQt/Config/Graphics/GeneralWidget.h @@ -7,7 +7,7 @@ #include "DolphinQt/Config/Graphics/GraphicsWidget.h" class ConfigBool; -class GraphicsChoice; +class ConfigChoice; class GraphicsRadioInt; class GraphicsWindow; class QCheckBox; @@ -44,7 +44,7 @@ class GeneralWidget final : public GraphicsWidget QGridLayout* m_video_layout; ToolTipComboBox* m_backend_combo; ToolTipComboBox* m_adapter_combo; - GraphicsChoice* m_aspect_combo; + ConfigChoice* m_aspect_combo; ConfigBool* m_enable_vsync; ConfigBool* m_enable_fullscreen; diff --git a/Source/Core/DolphinQt/DolphinQt.vcxproj b/Source/Core/DolphinQt/DolphinQt.vcxproj index 08a9af5b9fb8..42ea092069d6 100644 --- a/Source/Core/DolphinQt/DolphinQt.vcxproj +++ b/Source/Core/DolphinQt/DolphinQt.vcxproj @@ -55,6 +55,7 @@ + @@ -71,7 +72,6 @@ - @@ -256,6 +256,7 @@ + @@ -271,7 +272,6 @@ -