From 2267f98941ca03e11fbc0ff71ee4b682f8e41933 Mon Sep 17 00:00:00 2001 From: bunnei Date: Wed, 24 Aug 2016 22:15:38 -0400 Subject: qt: Add a configuration tab for Graphics and move relevant fields. --- src/citra_qt/configure_graphics.cpp | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 src/citra_qt/configure_graphics.cpp (limited to 'src/citra_qt/configure_graphics.cpp') 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(); +} -- cgit v1.2.3 From 08ad9b36d44e3cca0802bb1198036c5d77c844cc Mon Sep 17 00:00:00 2001 From: bunnei Date: Thu, 25 Aug 2016 18:20:47 -0400 Subject: config: Add a setting for graphics V-Sync. --- src/citra_qt/configure_graphics.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/citra_qt/configure_graphics.cpp') 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(); } -- cgit v1.2.3 From 74842116b287165d1db959437a439f13a17c724c Mon Sep 17 00:00:00 2001 From: bunnei Date: Mon, 29 Aug 2016 21:29:58 -0400 Subject: qt: Add an option to settings for enabling V-Sync. --- src/citra_qt/configure_graphics.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/citra_qt/configure_graphics.cpp') 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(); } -- cgit v1.2.3 From a71013cf16668a8d781a890823b6f6f203b865e9 Mon Sep 17 00:00:00 2001 From: bunnei Date: Wed, 31 Aug 2016 22:12:20 -0400 Subject: qt: Rename all "toogle" to "toggle". --- src/citra_qt/configure_graphics.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/citra_qt/configure_graphics.cpp') 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(); } -- cgit v1.2.3