diff options
| author | 2023-06-19 16:41:25 -0400 | |
|---|---|---|
| committer | 2023-07-21 10:56:55 -0400 | |
| commit | 81a96bafe210c218efed4e3f1138510bb8a0748c (patch) | |
| tree | beaa7611e091276f434ab81eba95b7024e7b49cc /src | |
| parent | settings: Move speed_limit to core (diff) | |
| download | yuzu-81a96bafe210c218efed4e3f1138510bb8a0748c.tar.gz yuzu-81a96bafe210c218efed4e3f1138510bb8a0748c.tar.xz yuzu-81a96bafe210c218efed4e3f1138510bb8a0748c.zip | |
configuration: Move speed_limit to core
Diffstat (limited to 'src')
| -rw-r--r-- | src/yuzu/configuration/configure_graphics.cpp | 6 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_system.cpp | 6 | ||||
| -rw-r--r-- | src/yuzu/configuration/shared_translation.cpp | 6 |
3 files changed, 8 insertions, 10 deletions
diff --git a/src/yuzu/configuration/configure_graphics.cpp b/src/yuzu/configuration/configure_graphics.cpp index 5537118ef..2f041cba6 100644 --- a/src/yuzu/configuration/configure_graphics.cpp +++ b/src/yuzu/configuration/configure_graphics.cpp | |||
| @@ -250,12 +250,6 @@ void ConfigureGraphics::Setup() { | |||
| 250 | setting, translations, combobox_translations, this, runtime_lock, apply_funcs, | 250 | setting, translations, combobox_translations, this, runtime_lock, apply_funcs, |
| 251 | ConfigurationShared::RequestType::ReverseSlider, true, 0.5f, nullptr, | 251 | ConfigurationShared::RequestType::ReverseSlider, true, 0.5f, nullptr, |
| 252 | tr("%1%", "FSR sharpening percentage (e.g. 50%)")); | 252 | tr("%1%", "FSR sharpening percentage (e.g. 50%)")); |
| 253 | } else if (setting->Id() == Settings::values.speed_limit.Id()) { | ||
| 254 | // speed_limit needs a checkbox to set use_speed_limit, as well as a spinbox | ||
| 255 | return new ConfigurationShared::Widget( | ||
| 256 | setting, translations, combobox_translations, this, runtime_lock, apply_funcs, | ||
| 257 | &Settings::values.use_speed_limit, ConfigurationShared::RequestType::SpinBox, | ||
| 258 | tr("%", "Limit speed percentage (e.g. 50%)")); | ||
| 259 | } else { | 253 | } else { |
| 260 | return new ConfigurationShared::Widget(setting, translations, combobox_translations, | 254 | return new ConfigurationShared::Widget(setting, translations, combobox_translations, |
| 261 | this, runtime_lock, apply_funcs); | 255 | this, runtime_lock, apply_funcs); |
diff --git a/src/yuzu/configuration/configure_system.cpp b/src/yuzu/configuration/configure_system.cpp index 51b0629a6..6a985c515 100644 --- a/src/yuzu/configuration/configure_system.cpp +++ b/src/yuzu/configuration/configure_system.cpp | |||
| @@ -142,6 +142,12 @@ void ConfigureSystem::Setup() { | |||
| 142 | return new ConfigurationShared::Widget( | 142 | return new ConfigurationShared::Widget( |
| 143 | setting, translations, combobox_translations, this, runtime_lock, apply_funcs, | 143 | setting, translations, combobox_translations, this, runtime_lock, apply_funcs, |
| 144 | &Settings::values.rng_seed_enabled, ConfigurationShared::RequestType::HexEdit); | 144 | &Settings::values.rng_seed_enabled, ConfigurationShared::RequestType::HexEdit); |
| 145 | } else if (setting->Id() == Settings::values.speed_limit.Id()) { | ||
| 146 | // speed_limit needs a checkbox to set use_speed_limit, as well as a spinbox | ||
| 147 | return new ConfigurationShared::Widget( | ||
| 148 | setting, translations, combobox_translations, this, runtime_lock, apply_funcs, | ||
| 149 | &Settings::values.use_speed_limit, ConfigurationShared::RequestType::SpinBox, | ||
| 150 | tr("%", "Limit speed percentage (e.g. 50%)")); | ||
| 145 | } else { | 151 | } else { |
| 146 | return new ConfigurationShared::Widget(setting, translations, combobox_translations, | 152 | return new ConfigurationShared::Widget(setting, translations, combobox_translations, |
| 147 | this, runtime_lock, apply_funcs); | 153 | this, runtime_lock, apply_funcs); |
diff --git a/src/yuzu/configuration/shared_translation.cpp b/src/yuzu/configuration/shared_translation.cpp index fa9683b21..ec4bddb26 100644 --- a/src/yuzu/configuration/shared_translation.cpp +++ b/src/yuzu/configuration/shared_translation.cpp | |||
| @@ -36,6 +36,8 @@ std::unique_ptr<TranslationMap> InitializeTranslations(QWidget* parent) { | |||
| 36 | INSERT(Settings, use_multi_core, "Multicore CPU Emulation", ""); | 36 | INSERT(Settings, use_multi_core, "Multicore CPU Emulation", ""); |
| 37 | INSERT(Settings, use_unsafe_extended_memory_layout, "Unsafe extended memory layout (8GB DRAM)", | 37 | INSERT(Settings, use_unsafe_extended_memory_layout, "Unsafe extended memory layout (8GB DRAM)", |
| 38 | ""); | 38 | ""); |
| 39 | INSERT(Settings, use_speed_limit, "", ""); | ||
| 40 | INSERT(Settings, speed_limit, "Limit Speed Percent", ""); | ||
| 39 | 41 | ||
| 40 | // Cpu | 42 | // Cpu |
| 41 | INSERT(Settings, cpu_accuracy, "Accuracy:", ""); | 43 | INSERT(Settings, cpu_accuracy, "Accuracy:", ""); |
| @@ -120,10 +122,6 @@ std::unique_ptr<TranslationMap> InitializeTranslations(QWidget* parent) { | |||
| 120 | 122 | ||
| 121 | // Renderer (Debug) | 123 | // Renderer (Debug) |
| 122 | 124 | ||
| 123 | // Renderer (General) | ||
| 124 | INSERT(Settings, use_speed_limit, "", ""); | ||
| 125 | INSERT(Settings, speed_limit, "Limit Speed Percent", ""); | ||
| 126 | |||
| 127 | // System | 125 | // System |
| 128 | INSERT(Settings, rng_seed, "RNG Seed", ""); | 126 | INSERT(Settings, rng_seed, "RNG Seed", ""); |
| 129 | INSERT(Settings, rng_seed_enabled, "", ""); | 127 | INSERT(Settings, rng_seed_enabled, "", ""); |