summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar bunnei2016-08-24 22:15:38 -0400
committerGravatar bunnei2016-08-29 21:42:29 -0400
commit2267f98941ca03e11fbc0ff71ee4b682f8e41933 (patch)
tree29a52864b9661bf391012d76ebd035482e3a19ba /src
parentMerge pull request #2029 from JayFoxRox/appveyor-cache (diff)
downloadyuzu-2267f98941ca03e11fbc0ff71ee4b682f8e41933.tar.gz
yuzu-2267f98941ca03e11fbc0ff71ee4b682f8e41933.tar.xz
yuzu-2267f98941ca03e11fbc0ff71ee4b682f8e41933.zip
qt: Add a configuration tab for Graphics and move relevant fields.
Diffstat (limited to 'src')
-rw-r--r--src/citra_qt/CMakeLists.txt3
-rw-r--r--src/citra_qt/configure.ui27
-rw-r--r--src/citra_qt/configure_dialog.cpp1
-rw-r--r--src/citra_qt/configure_general.cpp6
-rw-r--r--src/citra_qt/configure_general.ui34
-rw-r--r--src/citra_qt/configure_graphics.cpp32
-rw-r--r--src/citra_qt/configure_graphics.h29
-rw-r--r--src/citra_qt/configure_graphics.ui85
8 files changed, 169 insertions, 48 deletions
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
22 configure_debug.cpp 22 configure_debug.cpp
23 configure_dialog.cpp 23 configure_dialog.cpp
24 configure_general.cpp 24 configure_general.cpp
25 configure_graphics.cpp
25 configure_system.cpp 26 configure_system.cpp
26 configure_input.cpp 27 configure_input.cpp
27 game_list.cpp 28 game_list.cpp
@@ -54,6 +55,7 @@ set(HEADERS
54 configure_debug.h 55 configure_debug.h
55 configure_dialog.h 56 configure_dialog.h
56 configure_general.h 57 configure_general.h
58 configure_graphics.h
57 configure_system.h 59 configure_system.h
58 configure_input.h 60 configure_input.h
59 game_list.h 61 game_list.h
@@ -73,6 +75,7 @@ set(UIS
73 configure_audio.ui 75 configure_audio.ui
74 configure_debug.ui 76 configure_debug.ui
75 configure_general.ui 77 configure_general.ui
78 configure_graphics.ui
76 configure_system.ui 79 configure_system.ui
77 configure_input.ui 80 configure_input.ui
78 hotkeys.ui 81 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 @@
34 <string>Input</string> 34 <string>Input</string>
35 </attribute> 35 </attribute>
36 </widget> 36 </widget>
37 <widget class="ConfigureAudio" name="audioTab"> 37 <widget class="ConfigureGraphics" name="graphicsTab">
38 <attribute name="title"> 38 <attribute name="title">
39 <string>Audio</string> 39 <string>Graphics</string>
40 </attribute> 40 </attribute>
41 </widget> 41 </widget>
42 <widget class="ConfigureAudio" name="audioTab">
43 <attribute name="title">
44 <string>Audio</string>
45 </attribute>
46 </widget>
42 <widget class="ConfigureDebug" name="debugTab"> 47 <widget class="ConfigureDebug" name="debugTab">
43 <attribute name="title"> 48 <attribute name="title">
44 <string>Debug</string> 49 <string>Debug</string>
@@ -80,12 +85,18 @@
80 <header>configure_debug.h</header> 85 <header>configure_debug.h</header>
81 <container>1</container> 86 <container>1</container>
82 </customwidget> 87 </customwidget>
83 <customwidget> 88 <customwidget>
84 <class>ConfigureInput</class> 89 <class>ConfigureInput</class>
85 <extends>QWidget</extends> 90 <extends>QWidget</extends>
86 <header>configure_input.h</header> 91 <header>configure_input.h</header>
87 <container>1</container> 92 <container>1</container>
88 </customwidget> 93 </customwidget>
94 <customwidget>
95 <class>ConfigureGraphics</class>
96 <extends>QWidget</extends>
97 <header>configure_graphics.h</header>
98 <container>1</container>
99 </customwidget>
89 </customwidgets> 100 </customwidgets>
90 <resources/> 101 <resources/>
91 <connections> 102 <connections>
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() {
31 ui->generalTab->applyConfiguration(); 31 ui->generalTab->applyConfiguration();
32 ui->systemTab->applyConfiguration(); 32 ui->systemTab->applyConfiguration();
33 ui->inputTab->applyConfiguration(); 33 ui->inputTab->applyConfiguration();
34 ui->graphicsTab->applyConfiguration();
34 ui->audioTab->applyConfiguration(); 35 ui->audioTab->applyConfiguration();
35 ui->debugTab->applyConfiguration(); 36 ui->debugTab->applyConfiguration();
36} 37}
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() {
23 ui->toogle_deepscan->setChecked(UISettings::values.gamedir_deepscan); 23 ui->toogle_deepscan->setChecked(UISettings::values.gamedir_deepscan);
24 ui->toogle_check_exit->setChecked(UISettings::values.confirm_before_closing); 24 ui->toogle_check_exit->setChecked(UISettings::values.confirm_before_closing);
25 ui->region_combobox->setCurrentIndex(Settings::values.region_value); 25 ui->region_combobox->setCurrentIndex(Settings::values.region_value);
26 ui->toogle_hw_renderer->setChecked(Settings::values.use_hw_renderer);
27 ui->toogle_shader_jit->setChecked(Settings::values.use_shader_jit);
28 ui->toogle_scaled_resolution->setChecked(Settings::values.use_scaled_resolution);
29} 26}
30 27
31void ConfigureGeneral::applyConfiguration() { 28void ConfigureGeneral::applyConfiguration() {
32 UISettings::values.gamedir_deepscan = ui->toogle_deepscan->isChecked(); 29 UISettings::values.gamedir_deepscan = ui->toogle_deepscan->isChecked();
33 UISettings::values.confirm_before_closing = ui->toogle_check_exit->isChecked(); 30 UISettings::values.confirm_before_closing = ui->toogle_check_exit->isChecked();
34 Settings::values.region_value = ui->region_combobox->currentIndex(); 31 Settings::values.region_value = ui->region_combobox->currentIndex();
35 Settings::values.use_hw_renderer = ui->toogle_hw_renderer->isChecked();
36 Settings::values.use_shader_jit = ui->toogle_shader_jit->isChecked();
37 Settings::values.use_scaled_resolution = ui->toogle_scaled_resolution->isChecked();
38 Settings::Apply(); 32 Settings::Apply();
39} 33}
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
@@ -107,40 +107,6 @@
107 </widget> 107 </widget>
108 </item> 108 </item>
109 <item> 109 <item>
110 <widget class="QGroupBox" name="groupBox_2">
111 <property name="title">
112 <string>Performance</string>
113 </property>
114 <layout class="QHBoxLayout" name="horizontalLayout_2">
115 <item>
116 <layout class="QVBoxLayout" name="verticalLayout_3">
117 <item>
118 <widget class="QCheckBox" name="toogle_hw_renderer">
119 <property name="text">
120 <string>Enable hardware renderer</string>
121 </property>
122 </widget>
123 </item>
124 <item>
125 <widget class="QCheckBox" name="toogle_shader_jit">
126 <property name="text">
127 <string>Enable shader JIT</string>
128 </property>
129 </widget>
130 </item>
131 <item>
132 <widget class="QCheckBox" name="toogle_scaled_resolution">
133 <property name="text">
134 <string>Enable scaled resolution</string>
135 </property>
136 </widget>
137 </item>
138 </layout>
139 </item>
140 </layout>
141 </widget>
142 </item>
143 <item>
144 <widget class="QGroupBox" name="groupBox_3"> 110 <widget class="QGroupBox" name="groupBox_3">
145 <property name="title"> 111 <property name="title">
146 <string>Hotkeys</string> 112 <string>Hotkeys</string>
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 @@
1// Copyright 2016 Citra Emulator Project
2// Licensed under GPLv2 or any later version
3// Refer to the license.txt file included.
4
5#include "citra_qt/configure_graphics.h"
6#include "ui_configure_graphics.h"
7
8#include "core/settings.h"
9
10ConfigureGraphics::ConfigureGraphics(QWidget *parent) :
11 QWidget(parent),
12 ui(new Ui::ConfigureGraphics)
13{
14 ui->setupUi(this);
15 this->setConfiguration();
16}
17
18ConfigureGraphics::~ConfigureGraphics() {
19}
20
21void ConfigureGraphics::setConfiguration() {
22 ui->toogle_hw_renderer->setChecked(Settings::values.use_hw_renderer);
23 ui->toogle_shader_jit->setChecked(Settings::values.use_shader_jit);
24 ui->toogle_scaled_resolution->setChecked(Settings::values.use_scaled_resolution);
25}
26
27void ConfigureGraphics::applyConfiguration() {
28 Settings::values.use_hw_renderer = ui->toogle_hw_renderer->isChecked();
29 Settings::values.use_shader_jit = ui->toogle_shader_jit->isChecked();
30 Settings::values.use_scaled_resolution = ui->toogle_scaled_resolution->isChecked();
31 Settings::Apply();
32}
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 @@
1// Copyright 2016 Citra Emulator Project
2// Licensed under GPLv2 or any later version
3// Refer to the license.txt file included.
4
5#pragma once
6
7#include <memory>
8#include <QWidget>
9
10namespace Ui {
11class ConfigureGraphics;
12}
13
14class ConfigureGraphics : public QWidget
15{
16 Q_OBJECT
17
18public:
19 explicit ConfigureGraphics(QWidget *parent = nullptr);
20 ~ConfigureGraphics();
21
22 void applyConfiguration();
23
24private:
25 void setConfiguration();
26
27private:
28 std::unique_ptr<Ui::ConfigureGraphics> ui;
29};
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 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<ui version="4.0">
3 <class>ConfigureGraphics</class>
4 <widget class="QWidget" name="ConfigureGraphics">
5 <property name="geometry">
6 <rect>
7 <x>0</x>
8 <y>0</y>
9 <width>400</width>
10 <height>300</height>
11 </rect>
12 </property>
13 <property name="windowTitle">
14 <string>Form</string>
15 </property>
16 <layout class="QVBoxLayout" name="verticalLayout">
17 <item>
18 <layout class="QVBoxLayout" name="verticalLayout_3">
19 <item>
20 <widget class="QGroupBox" name="groupBox">
21 <property name="title">
22 <string>Graphics</string>
23 </property>
24 <layout class="QVBoxLayout" name="verticalLayout_2">
25 <item>
26 <widget class="QCheckBox" name="toogle_hw_renderer">
27 <property name="text">
28 <string>Enable hardware renderer</string>
29 </property>
30 </widget>
31 </item>
32 <item>
33 <widget class="QCheckBox" name="toogle_shader_jit">
34 <property name="text">
35 <string>Enable shader JIT</string>
36 </property>
37 </widget>
38 </item>
39 <item>
40 <widget class="QCheckBox" name="toogle_scaled_resolution">
41 <property name="text">
42 <string>Enable scaled resolution</string>
43 </property>
44 </widget>
45 </item>
46 </layout>
47 </widget>
48 </item>
49 </layout>
50 </item>
51 <item>
52 <spacer name="verticalSpacer">
53 <property name="orientation">
54 <enum>Qt::Vertical</enum>
55 </property>
56 <property name="sizeHint" stdset="0">
57 <size>
58 <width>20</width>
59 <height>40</height>
60 </size>
61 </property>
62 </spacer>
63 </item>
64 </layout>
65 </widget>
66 <resources/>
67 <connections>
68 <connection>
69 <sender>toogle_gdbstub</sender>
70 <signal>toggled(bool)</signal>
71 <receiver>gdbport_spinbox</receiver>
72 <slot>setEnabled(bool)</slot>
73 <hints>
74 <hint type="sourcelabel">
75 <x>84</x>
76 <y>157</y>
77 </hint>
78 <hint type="destinationlabel">
79 <x>342</x>
80 <y>158</y>
81 </hint>
82 </hints>
83 </connection>
84 </connections>
85</ui>
HIC SVNT DRACONES