From 2267f98941ca03e11fbc0ff71ee4b682f8e41933 Mon Sep 17 00:00:00 2001 From: bunnei Date: Wed, 24 Aug 2016 22:15:38 -0400 Subject: [PATCH 1/6] qt: Add a configuration tab for Graphics and move relevant fields. --- src/citra_qt/CMakeLists.txt | 3 + src/citra_qt/configure.ui | 27 ++++++--- src/citra_qt/configure_dialog.cpp | 1 + src/citra_qt/configure_general.cpp | 6 -- src/citra_qt/configure_general.ui | 34 ------------ src/citra_qt/configure_graphics.cpp | 32 +++++++++++ src/citra_qt/configure_graphics.h | 29 ++++++++++ src/citra_qt/configure_graphics.ui | 85 +++++++++++++++++++++++++++++ 8 files changed, 169 insertions(+), 48 deletions(-) create mode 100644 src/citra_qt/configure_graphics.cpp create mode 100644 src/citra_qt/configure_graphics.h create mode 100644 src/citra_qt/configure_graphics.ui diff --git a/src/citra_qt/CMakeLists.txt b/src/citra_qt/CMakeLists.txt index 4402ad995..e97d33da4 100644 --- a/src/citra_qt/CMakeLists.txt +++ b/src/citra_qt/CMakeLists.txt @@ -22,6 +22,7 @@ set(SRCS configure_debug.cpp configure_dialog.cpp configure_general.cpp + configure_graphics.cpp configure_system.cpp configure_input.cpp game_list.cpp @@ -54,6 +55,7 @@ set(HEADERS configure_debug.h configure_dialog.h configure_general.h + configure_graphics.h configure_system.h configure_input.h game_list.h @@ -73,6 +75,7 @@ set(UIS configure_audio.ui configure_debug.ui configure_general.ui + configure_graphics.ui configure_system.ui configure_input.ui hotkeys.ui diff --git a/src/citra_qt/configure.ui b/src/citra_qt/configure.ui index 15fe17323..28b4a3b90 100644 --- a/src/citra_qt/configure.ui +++ b/src/citra_qt/configure.ui @@ -34,11 +34,16 @@ Input - + - Audio + Graphics + + + Audio + + Debug @@ -80,12 +85,18 @@
configure_debug.h
1 - - ConfigureInput - QWidget -
configure_input.h
- 1 - + + ConfigureInput + QWidget +
configure_input.h
+ 1 + + + ConfigureGraphics + QWidget +
configure_graphics.h
+ 1 + diff --git a/src/citra_qt/configure_dialog.cpp b/src/citra_qt/configure_dialog.cpp index 459fac4bb..7da8ad067 100644 --- a/src/citra_qt/configure_dialog.cpp +++ b/src/citra_qt/configure_dialog.cpp @@ -31,6 +31,7 @@ void ConfigureDialog::applyConfiguration() { ui->generalTab->applyConfiguration(); ui->systemTab->applyConfiguration(); ui->inputTab->applyConfiguration(); + ui->graphicsTab->applyConfiguration(); ui->audioTab->applyConfiguration(); ui->debugTab->applyConfiguration(); } diff --git a/src/citra_qt/configure_general.cpp b/src/citra_qt/configure_general.cpp index 62648e665..3e7a91885 100644 --- a/src/citra_qt/configure_general.cpp +++ b/src/citra_qt/configure_general.cpp @@ -23,17 +23,11 @@ void ConfigureGeneral::setConfiguration() { ui->toogle_deepscan->setChecked(UISettings::values.gamedir_deepscan); ui->toogle_check_exit->setChecked(UISettings::values.confirm_before_closing); ui->region_combobox->setCurrentIndex(Settings::values.region_value); - ui->toogle_hw_renderer->setChecked(Settings::values.use_hw_renderer); - ui->toogle_shader_jit->setChecked(Settings::values.use_shader_jit); - ui->toogle_scaled_resolution->setChecked(Settings::values.use_scaled_resolution); } void ConfigureGeneral::applyConfiguration() { UISettings::values.gamedir_deepscan = ui->toogle_deepscan->isChecked(); UISettings::values.confirm_before_closing = ui->toogle_check_exit->isChecked(); Settings::values.region_value = ui->region_combobox->currentIndex(); - Settings::values.use_hw_renderer = ui->toogle_hw_renderer->isChecked(); - Settings::values.use_shader_jit = ui->toogle_shader_jit->isChecked(); - Settings::values.use_scaled_resolution = ui->toogle_scaled_resolution->isChecked(); Settings::Apply(); } diff --git a/src/citra_qt/configure_general.ui b/src/citra_qt/configure_general.ui index 5eb309793..f993f7525 100644 --- a/src/citra_qt/configure_general.ui +++ b/src/citra_qt/configure_general.ui @@ -106,40 +106,6 @@ - - - - Performance - - - - - - - - Enable hardware renderer - - - - - - - Enable shader JIT - - - - - - - Enable scaled resolution - - - - - - - - diff --git a/src/citra_qt/configure_graphics.cpp b/src/citra_qt/configure_graphics.cpp new file mode 100644 index 000000000..85a120686 --- /dev/null +++ b/src/citra_qt/configure_graphics.cpp @@ -0,0 +1,32 @@ +// Copyright 2016 Citra Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + +#include "citra_qt/configure_graphics.h" +#include "ui_configure_graphics.h" + +#include "core/settings.h" + +ConfigureGraphics::ConfigureGraphics(QWidget *parent) : + QWidget(parent), + ui(new Ui::ConfigureGraphics) +{ + ui->setupUi(this); + this->setConfiguration(); +} + +ConfigureGraphics::~ConfigureGraphics() { +} + +void ConfigureGraphics::setConfiguration() { + ui->toogle_hw_renderer->setChecked(Settings::values.use_hw_renderer); + ui->toogle_shader_jit->setChecked(Settings::values.use_shader_jit); + ui->toogle_scaled_resolution->setChecked(Settings::values.use_scaled_resolution); +} + +void ConfigureGraphics::applyConfiguration() { + Settings::values.use_hw_renderer = ui->toogle_hw_renderer->isChecked(); + Settings::values.use_shader_jit = ui->toogle_shader_jit->isChecked(); + Settings::values.use_scaled_resolution = ui->toogle_scaled_resolution->isChecked(); + Settings::Apply(); +} diff --git a/src/citra_qt/configure_graphics.h b/src/citra_qt/configure_graphics.h new file mode 100644 index 000000000..dfb0c0461 --- /dev/null +++ b/src/citra_qt/configure_graphics.h @@ -0,0 +1,29 @@ +// Copyright 2016 Citra Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + +#pragma once + +#include +#include + +namespace Ui { +class ConfigureGraphics; +} + +class ConfigureGraphics : public QWidget +{ + Q_OBJECT + +public: + explicit ConfigureGraphics(QWidget *parent = nullptr); + ~ConfigureGraphics(); + + void applyConfiguration(); + +private: + void setConfiguration(); + +private: + std::unique_ptr ui; +}; diff --git a/src/citra_qt/configure_graphics.ui b/src/citra_qt/configure_graphics.ui new file mode 100644 index 000000000..336d49b19 --- /dev/null +++ b/src/citra_qt/configure_graphics.ui @@ -0,0 +1,85 @@ + + + ConfigureGraphics + + + + 0 + 0 + 400 + 300 + + + + Form + + + + + + + + Graphics + + + + + + Enable hardware renderer + + + + + + + Enable shader JIT + + + + + + + Enable scaled resolution + + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + toogle_gdbstub + toggled(bool) + gdbport_spinbox + setEnabled(bool) + + + 84 + 157 + + + 342 + 158 + + + + + From 08ad9b36d44e3cca0802bb1198036c5d77c844cc Mon Sep 17 00:00:00 2001 From: bunnei Date: Thu, 25 Aug 2016 18:20:47 -0400 Subject: [PATCH 2/6] config: Add a setting for graphics V-Sync. --- src/citra/config.cpp | 1 + src/citra/default_ini.h | 4 ++++ src/citra/emu_window/emu_window_sdl2.cpp | 1 + src/citra_qt/bootmanager.cpp | 1 + src/citra_qt/config.cpp | 2 ++ src/citra_qt/configure_graphics.cpp | 3 ++- src/citra_qt/configure_graphics.ui | 7 +++++++ src/core/settings.h | 1 + src/video_core/video_core.cpp | 1 + 9 files changed, 20 insertions(+), 1 deletion(-) diff --git a/src/citra/config.cpp b/src/citra/config.cpp index e832ec58d..d71045646 100644 --- a/src/citra/config.cpp +++ b/src/citra/config.cpp @@ -71,6 +71,7 @@ void Config::ReadValues() { Settings::values.use_hw_renderer = sdl2_config->GetBoolean("Renderer", "use_hw_renderer", true); Settings::values.use_shader_jit = sdl2_config->GetBoolean("Renderer", "use_shader_jit", true); Settings::values.use_scaled_resolution = sdl2_config->GetBoolean("Renderer", "use_scaled_resolution", false); + Settings::values.use_vsync = sdl2_config->GetBoolean("Renderer", "use_vsync", false); Settings::values.bg_red = (float)sdl2_config->GetReal("Renderer", "bg_red", 1.0); Settings::values.bg_green = (float)sdl2_config->GetReal("Renderer", "bg_green", 1.0); diff --git a/src/citra/default_ini.h b/src/citra/default_ini.h index 6249ef9e2..b10700e62 100644 --- a/src/citra/default_ini.h +++ b/src/citra/default_ini.h @@ -55,6 +55,10 @@ use_shader_jit = # 0 (default): Native, 1: Scaled use_scaled_resolution = +# Whether to enable V-Sync (caps the framerate at 60FPS) or not. +# 0 (default): Off, 1: On +use_vsync = + # The clear color for the renderer. What shows up on the sides of the bottom screen. # Must be in range of 0.0-1.0. Defaults to 1.0 for all. bg_red = diff --git a/src/citra/emu_window/emu_window_sdl2.cpp b/src/citra/emu_window/emu_window_sdl2.cpp index 591f68aa4..da12307b7 100644 --- a/src/citra/emu_window/emu_window_sdl2.cpp +++ b/src/citra/emu_window/emu_window_sdl2.cpp @@ -108,6 +108,7 @@ EmuWindow_SDL2::EmuWindow_SDL2() { OnResize(); OnMinimalClientAreaChangeRequest(GetActiveConfig().min_client_area_size); SDL_PumpEvents(); + SDL_GL_SetSwapInterval(Settings::values.use_vsync); DoneCurrent(); } diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp index 414b2f8af..a9669c559 100644 --- a/src/citra_qt/bootmanager.cpp +++ b/src/citra_qt/bootmanager.cpp @@ -119,6 +119,7 @@ GRenderWindow::GRenderWindow(QWidget* parent, EmuThread* emu_thread) : QGLFormat fmt; fmt.setVersion(3,3); fmt.setProfile(QGLFormat::CoreProfile); + fmt.setSwapInterval(VideoCore::g_vsync_enabled); // Requests a forward-compatible context, which is required to get a 3.2+ context on OS X fmt.setOption(QGL::NoDeprecatedFunctions); diff --git a/src/citra_qt/config.cpp b/src/citra_qt/config.cpp index 93c6a6e41..ff7af445e 100644 --- a/src/citra_qt/config.cpp +++ b/src/citra_qt/config.cpp @@ -48,6 +48,7 @@ void Config::ReadValues() { Settings::values.use_hw_renderer = qt_config->value("use_hw_renderer", true).toBool(); Settings::values.use_shader_jit = qt_config->value("use_shader_jit", true).toBool(); Settings::values.use_scaled_resolution = qt_config->value("use_scaled_resolution", false).toBool(); + Settings::values.use_vsync = qt_config->value("use_vsync", false).toBool(); Settings::values.bg_red = qt_config->value("bg_red", 1.0).toFloat(); Settings::values.bg_green = qt_config->value("bg_green", 1.0).toFloat(); @@ -139,6 +140,7 @@ void Config::SaveValues() { qt_config->setValue("use_hw_renderer", Settings::values.use_hw_renderer); qt_config->setValue("use_shader_jit", Settings::values.use_shader_jit); qt_config->setValue("use_scaled_resolution", Settings::values.use_scaled_resolution); + qt_config->setValue("use_vsync", Settings::values.use_vsync); // Cast to double because Qt's written float values are not human-readable qt_config->setValue("bg_red", (double)Settings::values.bg_red); diff --git a/src/citra_qt/configure_graphics.cpp b/src/citra_qt/configure_graphics.cpp index 85a120686..22def58d4 100644 --- a/src/citra_qt/configure_graphics.cpp +++ b/src/citra_qt/configure_graphics.cpp @@ -22,11 +22,12 @@ void ConfigureGraphics::setConfiguration() { ui->toogle_hw_renderer->setChecked(Settings::values.use_hw_renderer); ui->toogle_shader_jit->setChecked(Settings::values.use_shader_jit); ui->toogle_scaled_resolution->setChecked(Settings::values.use_scaled_resolution); + ui->toogle_vsync->setChecked(Settings::values.use_vsync); } void ConfigureGraphics::applyConfiguration() { Settings::values.use_hw_renderer = ui->toogle_hw_renderer->isChecked(); Settings::values.use_shader_jit = ui->toogle_shader_jit->isChecked(); - Settings::values.use_scaled_resolution = ui->toogle_scaled_resolution->isChecked(); + Settings::values.use_vsync = ui->toogle_vsync->isChecked(); Settings::Apply(); } diff --git a/src/citra_qt/configure_graphics.ui b/src/citra_qt/configure_graphics.ui index 336d49b19..e68d68c0e 100644 --- a/src/citra_qt/configure_graphics.ui +++ b/src/citra_qt/configure_graphics.ui @@ -43,6 +43,13 @@ + + + + Enable V-Sync + + + diff --git a/src/core/settings.h b/src/core/settings.h index f95e62390..34ff22f3f 100644 --- a/src/core/settings.h +++ b/src/core/settings.h @@ -72,6 +72,7 @@ struct Values { bool use_hw_renderer; bool use_shader_jit; bool use_scaled_resolution; + bool use_vsync; float bg_red; float bg_green; diff --git a/src/video_core/video_core.cpp b/src/video_core/video_core.cpp index c9975876d..bd6e5eb6b 100644 --- a/src/video_core/video_core.cpp +++ b/src/video_core/video_core.cpp @@ -22,6 +22,7 @@ std::unique_ptr g_renderer; ///< Renderer plugin std::atomic g_hw_renderer_enabled; std::atomic g_shader_jit_enabled; std::atomic g_scaled_resolution_enabled; +std::atomic g_vsync_enabled; /// Initialize the video core bool Init(EmuWindow* emu_window) { From 7299895b4833521ebf80cc8812c734382e60225f Mon Sep 17 00:00:00 2001 From: bunnei Date: Mon, 29 Aug 2016 21:28:31 -0400 Subject: [PATCH 3/6] system: Add a function to see if the emulator is running. --- src/core/system.cpp | 10 ++++++++++ src/core/system.h | 1 + 2 files changed, 11 insertions(+) diff --git a/src/core/system.cpp b/src/core/system.cpp index 4a4757af3..4fc266cb0 100644 --- a/src/core/system.cpp +++ b/src/core/system.cpp @@ -17,6 +17,8 @@ namespace System { +static bool is_powered_on{ false }; + Result Init(EmuWindow* emu_window) { Core::Init(); CoreTiming::Init(); @@ -30,9 +32,15 @@ Result Init(EmuWindow* emu_window) { AudioCore::Init(); GDBStub::Init(); + is_powered_on = true; + return Result::Success; } +bool IsPoweredOn() { + return is_powered_on; +} + void Shutdown() { GDBStub::Shutdown(); AudioCore::Shutdown(); @@ -42,6 +50,8 @@ void Shutdown() { HW::Shutdown(); CoreTiming::Shutdown(); Core::Shutdown(); + + is_powered_on = false; } } // namespace diff --git a/src/core/system.h b/src/core/system.h index a4a627ea9..fb0ca4e1b 100644 --- a/src/core/system.h +++ b/src/core/system.h @@ -16,6 +16,7 @@ enum class Result { }; Result Init(EmuWindow* emu_window); +bool IsPoweredOn(); void Shutdown(); } From 02702c66052c10b10ba0a6af6ab34734886d3728 Mon Sep 17 00:00:00 2001 From: bunnei Date: Mon, 29 Aug 2016 21:28:58 -0400 Subject: [PATCH 4/6] qt: Recreate GL context on startup to support changing V-Sync. --- src/citra_qt/bootmanager.cpp | 60 +++++++++++++++++++++--------------- src/citra_qt/bootmanager.h | 2 ++ src/citra_qt/main.cpp | 2 ++ 3 files changed, 39 insertions(+), 25 deletions(-) diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp index a9669c559..6dddde9ba 100644 --- a/src/citra_qt/bootmanager.cpp +++ b/src/citra_qt/bootmanager.cpp @@ -107,37 +107,13 @@ private: }; GRenderWindow::GRenderWindow(QWidget* parent, EmuThread* emu_thread) : - QWidget(parent), keyboard_id(0), emu_thread(emu_thread) { + QWidget(parent), keyboard_id(0), emu_thread(emu_thread), child(nullptr) { std::string window_title = Common::StringFromFormat("Citra | %s-%s", Common::g_scm_branch, Common::g_scm_desc); setWindowTitle(QString::fromStdString(window_title)); keyboard_id = KeyMap::NewDeviceId(); ReloadSetKeymaps(); - - // TODO: One of these flags might be interesting: WA_OpaquePaintEvent, WA_NoBackground, WA_DontShowOnScreen, WA_DeleteOnClose - QGLFormat fmt; - fmt.setVersion(3,3); - fmt.setProfile(QGLFormat::CoreProfile); - fmt.setSwapInterval(VideoCore::g_vsync_enabled); - // Requests a forward-compatible context, which is required to get a 3.2+ context on OS X - fmt.setOption(QGL::NoDeprecatedFunctions); - - child = new GGLWidgetInternal(fmt, this); - QBoxLayout* layout = new QHBoxLayout(this); - - resize(VideoCore::kScreenTopWidth, VideoCore::kScreenTopHeight + VideoCore::kScreenBottomHeight); - layout->addWidget(child); - layout->setMargin(0); - setLayout(layout); - - OnMinimalClientAreaChangeRequest(GetActiveConfig().min_client_area_size); - - OnFramebufferSizeChanged(); - NotifyClientAreaSizeChanged(std::pair(child->width(), child->height())); - - BackupGeometry(); - } void GRenderWindow::moveContext() @@ -282,6 +258,40 @@ void GRenderWindow::OnClientAreaResized(unsigned width, unsigned height) NotifyClientAreaSizeChanged(std::make_pair(width, height)); } +void GRenderWindow::InitRenderTarget() { + if (child) { + delete child; + } + + if (layout()) { + delete layout(); + } + + // TODO: One of these flags might be interesting: WA_OpaquePaintEvent, WA_NoBackground, WA_DontShowOnScreen, WA_DeleteOnClose + QGLFormat fmt; + fmt.setVersion(3, 3); + fmt.setProfile(QGLFormat::CoreProfile); + fmt.setSwapInterval(Settings::values.use_vsync); + + // Requests a forward-compatible context, which is required to get a 3.2+ context on OS X + fmt.setOption(QGL::NoDeprecatedFunctions); + + child = new GGLWidgetInternal(fmt, this); + QBoxLayout* layout = new QHBoxLayout(this); + + resize(VideoCore::kScreenTopWidth, VideoCore::kScreenTopHeight + VideoCore::kScreenBottomHeight); + layout->addWidget(child); + layout->setMargin(0); + setLayout(layout); + + OnMinimalClientAreaChangeRequest(GetActiveConfig().min_client_area_size); + + OnFramebufferSizeChanged(); + NotifyClientAreaSizeChanged(std::pair(child->width(), child->height())); + + BackupGeometry(); +} + void GRenderWindow::OnMinimalClientAreaChangeRequest(const std::pair& minimal_size) { setMinimumSize(minimal_size.first, minimal_size.second); } diff --git a/src/citra_qt/bootmanager.h b/src/citra_qt/bootmanager.h index 0dcf3e5eb..c1da2bc5f 100644 --- a/src/citra_qt/bootmanager.h +++ b/src/citra_qt/bootmanager.h @@ -126,6 +126,8 @@ public: void OnClientAreaResized(unsigned width, unsigned height); + void InitRenderTarget(); + public slots: void moveContext(); // overridden diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp index 68a936087..9fd4482f6 100644 --- a/src/citra_qt/main.cpp +++ b/src/citra_qt/main.cpp @@ -243,7 +243,9 @@ bool GMainWindow::InitializeSystem() { if (emu_thread != nullptr) ShutdownGame(); + render_window->InitRenderTarget(); render_window->MakeCurrent(); + if (!gladLoadGL()) { QMessageBox::critical(this, tr("Error while starting Citra!"), tr("Failed to initialize the video core!\n\n" From 74842116b287165d1db959437a439f13a17c724c Mon Sep 17 00:00:00 2001 From: bunnei Date: Mon, 29 Aug 2016 21:29:58 -0400 Subject: [PATCH 5/6] qt: Add an option to settings for enabling V-Sync. --- src/citra_qt/configure_graphics.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/citra_qt/configure_graphics.cpp b/src/citra_qt/configure_graphics.cpp index 22def58d4..9c3ae1cbd 100644 --- a/src/citra_qt/configure_graphics.cpp +++ b/src/citra_qt/configure_graphics.cpp @@ -6,6 +6,7 @@ #include "ui_configure_graphics.h" #include "core/settings.h" +#include "core/system.h" ConfigureGraphics::ConfigureGraphics(QWidget *parent) : QWidget(parent), @@ -13,6 +14,8 @@ ConfigureGraphics::ConfigureGraphics(QWidget *parent) : { ui->setupUi(this); this->setConfiguration(); + + ui->toogle_vsync->setEnabled(!System::IsPoweredOn()); } ConfigureGraphics::~ConfigureGraphics() { @@ -28,6 +31,7 @@ void ConfigureGraphics::setConfiguration() { void ConfigureGraphics::applyConfiguration() { Settings::values.use_hw_renderer = ui->toogle_hw_renderer->isChecked(); Settings::values.use_shader_jit = ui->toogle_shader_jit->isChecked(); + Settings::values.use_scaled_resolution = ui->toogle_scaled_resolution->isChecked(); Settings::values.use_vsync = ui->toogle_vsync->isChecked(); Settings::Apply(); } From a71013cf16668a8d781a890823b6f6f203b865e9 Mon Sep 17 00:00:00 2001 From: bunnei Date: Wed, 31 Aug 2016 22:12:20 -0400 Subject: [PATCH 6/6] qt: Rename all "toogle" to "toggle". --- src/citra_qt/configure_debug.cpp | 4 ++-- src/citra_qt/configure_debug.ui | 4 ++-- src/citra_qt/configure_general.cpp | 8 ++++---- src/citra_qt/configure_general.ui | 4 ++-- src/citra_qt/configure_graphics.cpp | 18 +++++++++--------- src/citra_qt/configure_graphics.ui | 10 +++++----- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/citra_qt/configure_debug.cpp b/src/citra_qt/configure_debug.cpp index dc3d7b906..fa57a7f72 100644 --- a/src/citra_qt/configure_debug.cpp +++ b/src/citra_qt/configure_debug.cpp @@ -19,13 +19,13 @@ ConfigureDebug::~ConfigureDebug() { } void ConfigureDebug::setConfiguration() { - ui->toogle_gdbstub->setChecked(Settings::values.use_gdbstub); + ui->toggle_gdbstub->setChecked(Settings::values.use_gdbstub); ui->gdbport_spinbox->setEnabled(Settings::values.use_gdbstub); ui->gdbport_spinbox->setValue(Settings::values.gdbstub_port); } void ConfigureDebug::applyConfiguration() { - Settings::values.use_gdbstub = ui->toogle_gdbstub->isChecked(); + Settings::values.use_gdbstub = ui->toggle_gdbstub->isChecked(); Settings::values.gdbstub_port = ui->gdbport_spinbox->value(); Settings::Apply(); } diff --git a/src/citra_qt/configure_debug.ui b/src/citra_qt/configure_debug.ui index 3ba7f44da..bbbb0e3f4 100644 --- a/src/citra_qt/configure_debug.ui +++ b/src/citra_qt/configure_debug.ui @@ -25,7 +25,7 @@ - + Enable GDB Stub @@ -83,7 +83,7 @@ - toogle_gdbstub + toggle_gdbstub toggled(bool) gdbport_spinbox setEnabled(bool) diff --git a/src/citra_qt/configure_general.cpp b/src/citra_qt/configure_general.cpp index 3e7a91885..95aab9f2e 100644 --- a/src/citra_qt/configure_general.cpp +++ b/src/citra_qt/configure_general.cpp @@ -20,14 +20,14 @@ ConfigureGeneral::~ConfigureGeneral() { } void ConfigureGeneral::setConfiguration() { - ui->toogle_deepscan->setChecked(UISettings::values.gamedir_deepscan); - ui->toogle_check_exit->setChecked(UISettings::values.confirm_before_closing); + ui->toggle_deepscan->setChecked(UISettings::values.gamedir_deepscan); + ui->toggle_check_exit->setChecked(UISettings::values.confirm_before_closing); ui->region_combobox->setCurrentIndex(Settings::values.region_value); } void ConfigureGeneral::applyConfiguration() { - UISettings::values.gamedir_deepscan = ui->toogle_deepscan->isChecked(); - UISettings::values.confirm_before_closing = ui->toogle_check_exit->isChecked(); + UISettings::values.gamedir_deepscan = ui->toggle_deepscan->isChecked(); + UISettings::values.confirm_before_closing = ui->toggle_check_exit->isChecked(); Settings::values.region_value = ui->region_combobox->currentIndex(); Settings::Apply(); } diff --git a/src/citra_qt/configure_general.ui b/src/citra_qt/configure_general.ui index f993f7525..343f804c0 100644 --- a/src/citra_qt/configure_general.ui +++ b/src/citra_qt/configure_general.ui @@ -25,14 +25,14 @@ - + Recursive scan for game folder - + Confirm exit while emulation is running diff --git a/src/citra_qt/configure_graphics.cpp b/src/citra_qt/configure_graphics.cpp index 9c3ae1cbd..5a8101795 100644 --- a/src/citra_qt/configure_graphics.cpp +++ b/src/citra_qt/configure_graphics.cpp @@ -15,23 +15,23 @@ ConfigureGraphics::ConfigureGraphics(QWidget *parent) : ui->setupUi(this); this->setConfiguration(); - ui->toogle_vsync->setEnabled(!System::IsPoweredOn()); + ui->toggle_vsync->setEnabled(!System::IsPoweredOn()); } ConfigureGraphics::~ConfigureGraphics() { } void ConfigureGraphics::setConfiguration() { - ui->toogle_hw_renderer->setChecked(Settings::values.use_hw_renderer); - ui->toogle_shader_jit->setChecked(Settings::values.use_shader_jit); - ui->toogle_scaled_resolution->setChecked(Settings::values.use_scaled_resolution); - ui->toogle_vsync->setChecked(Settings::values.use_vsync); + ui->toggle_hw_renderer->setChecked(Settings::values.use_hw_renderer); + ui->toggle_shader_jit->setChecked(Settings::values.use_shader_jit); + ui->toggle_scaled_resolution->setChecked(Settings::values.use_scaled_resolution); + ui->toggle_vsync->setChecked(Settings::values.use_vsync); } void ConfigureGraphics::applyConfiguration() { - Settings::values.use_hw_renderer = ui->toogle_hw_renderer->isChecked(); - Settings::values.use_shader_jit = ui->toogle_shader_jit->isChecked(); - Settings::values.use_scaled_resolution = ui->toogle_scaled_resolution->isChecked(); - Settings::values.use_vsync = ui->toogle_vsync->isChecked(); + Settings::values.use_hw_renderer = ui->toggle_hw_renderer->isChecked(); + Settings::values.use_shader_jit = ui->toggle_shader_jit->isChecked(); + Settings::values.use_scaled_resolution = ui->toggle_scaled_resolution->isChecked(); + Settings::values.use_vsync = ui->toggle_vsync->isChecked(); Settings::Apply(); } diff --git a/src/citra_qt/configure_graphics.ui b/src/citra_qt/configure_graphics.ui index e68d68c0e..da6e19ce1 100644 --- a/src/citra_qt/configure_graphics.ui +++ b/src/citra_qt/configure_graphics.ui @@ -23,28 +23,28 @@ - + Enable hardware renderer - + Enable shader JIT - + Enable scaled resolution - + Enable V-Sync @@ -73,7 +73,7 @@ - toogle_gdbstub + toggle_gdbstub toggled(bool) gdbport_spinbox setEnabled(bool)