summaryrefslogtreecommitdiff
path: root/src/citra_qt/config.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/citra_qt/config.cpp')
-rw-r--r--src/citra_qt/config.cpp58
1 files changed, 32 insertions, 26 deletions
diff --git a/src/citra_qt/config.cpp b/src/citra_qt/config.cpp
index cf1c09930..d25bdcf9f 100644
--- a/src/citra_qt/config.cpp
+++ b/src/citra_qt/config.cpp
@@ -20,24 +20,23 @@ Config::Config() {
20 20
21const std::array<QVariant, Settings::NativeInput::NUM_INPUTS> Config::defaults = { 21const std::array<QVariant, Settings::NativeInput::NUM_INPUTS> Config::defaults = {
22 // directly mapped keys 22 // directly mapped keys
23 Qt::Key_A, Qt::Key_S, Qt::Key_Z, Qt::Key_X, 23 Qt::Key_A, Qt::Key_S, Qt::Key_Z, Qt::Key_X, Qt::Key_Q, Qt::Key_W, Qt::Key_1, Qt::Key_2,
24 Qt::Key_Q, Qt::Key_W, Qt::Key_1, Qt::Key_2, 24 Qt::Key_M, Qt::Key_N, Qt::Key_B, Qt::Key_T, Qt::Key_G, Qt::Key_F, Qt::Key_H, Qt::Key_I,
25 Qt::Key_M, Qt::Key_N, Qt::Key_B, 25 Qt::Key_K, Qt::Key_J, Qt::Key_L,
26 Qt::Key_T, Qt::Key_G, Qt::Key_F, Qt::Key_H,
27 Qt::Key_I, Qt::Key_K, Qt::Key_J, Qt::Key_L,
28 26
29 // indirectly mapped keys 27 // indirectly mapped keys
30 Qt::Key_Up, Qt::Key_Down, Qt::Key_Left, Qt::Key_Right, 28 Qt::Key_Up, Qt::Key_Down, Qt::Key_Left, Qt::Key_Right, Qt::Key_D,
31 Qt::Key_D,
32}; 29};
33 30
34void Config::ReadValues() { 31void Config::ReadValues() {
35 qt_config->beginGroup("Controls"); 32 qt_config->beginGroup("Controls");
36 for (int i = 0; i < Settings::NativeInput::NUM_INPUTS; ++i) { 33 for (int i = 0; i < Settings::NativeInput::NUM_INPUTS; ++i) {
37 Settings::values.input_mappings[Settings::NativeInput::All[i]] = 34 Settings::values.input_mappings[Settings::NativeInput::All[i]] =
38 qt_config->value(QString::fromStdString(Settings::NativeInput::Mapping[i]), defaults[i]).toInt(); 35 qt_config->value(QString::fromStdString(Settings::NativeInput::Mapping[i]), defaults[i])
36 .toInt();
39 } 37 }
40 Settings::values.pad_circle_modifier_scale = qt_config->value("pad_circle_modifier_scale", 0.5).toFloat(); 38 Settings::values.pad_circle_modifier_scale =
39 qt_config->value("pad_circle_modifier_scale", 0.5).toFloat();
41 qt_config->endGroup(); 40 qt_config->endGroup();
42 41
43 qt_config->beginGroup("Core"); 42 qt_config->beginGroup("Core");
@@ -48,17 +47,19 @@ void Config::ReadValues() {
48 qt_config->beginGroup("Renderer"); 47 qt_config->beginGroup("Renderer");
49 Settings::values.use_hw_renderer = qt_config->value("use_hw_renderer", true).toBool(); 48 Settings::values.use_hw_renderer = qt_config->value("use_hw_renderer", true).toBool();
50 Settings::values.use_shader_jit = qt_config->value("use_shader_jit", true).toBool(); 49 Settings::values.use_shader_jit = qt_config->value("use_shader_jit", true).toBool();
51 Settings::values.use_scaled_resolution = qt_config->value("use_scaled_resolution", false).toBool(); 50 Settings::values.use_scaled_resolution =
51 qt_config->value("use_scaled_resolution", false).toBool();
52 Settings::values.use_vsync = qt_config->value("use_vsync", false).toBool(); 52 Settings::values.use_vsync = qt_config->value("use_vsync", false).toBool();
53 53
54 Settings::values.bg_red = qt_config->value("bg_red", 1.0).toFloat(); 54 Settings::values.bg_red = qt_config->value("bg_red", 1.0).toFloat();
55 Settings::values.bg_green = qt_config->value("bg_green", 1.0).toFloat(); 55 Settings::values.bg_green = qt_config->value("bg_green", 1.0).toFloat();
56 Settings::values.bg_blue = qt_config->value("bg_blue", 1.0).toFloat(); 56 Settings::values.bg_blue = qt_config->value("bg_blue", 1.0).toFloat();
57 qt_config->endGroup(); 57 qt_config->endGroup();
58 58
59 qt_config->beginGroup("Audio"); 59 qt_config->beginGroup("Audio");
60 Settings::values.sink_id = qt_config->value("output_engine", "auto").toString().toStdString(); 60 Settings::values.sink_id = qt_config->value("output_engine", "auto").toString().toStdString();
61 Settings::values.enable_audio_stretching = qt_config->value("enable_audio_stretching", true).toBool(); 61 Settings::values.enable_audio_stretching =
62 qt_config->value("enable_audio_stretching", true).toBool();
62 qt_config->endGroup(); 63 qt_config->endGroup();
63 64
64 qt_config->beginGroup("Data Storage"); 65 qt_config->beginGroup("Data Storage");
@@ -84,10 +85,14 @@ void Config::ReadValues() {
84 qt_config->beginGroup("UILayout"); 85 qt_config->beginGroup("UILayout");
85 UISettings::values.geometry = qt_config->value("geometry").toByteArray(); 86 UISettings::values.geometry = qt_config->value("geometry").toByteArray();
86 UISettings::values.state = qt_config->value("state").toByteArray(); 87 UISettings::values.state = qt_config->value("state").toByteArray();
87 UISettings::values.renderwindow_geometry = qt_config->value("geometryRenderWindow").toByteArray(); 88 UISettings::values.renderwindow_geometry =
88 UISettings::values.gamelist_header_state = qt_config->value("gameListHeaderState").toByteArray(); 89 qt_config->value("geometryRenderWindow").toByteArray();
89 UISettings::values.microprofile_geometry = qt_config->value("microProfileDialogGeometry").toByteArray(); 90 UISettings::values.gamelist_header_state =
90 UISettings::values.microprofile_visible = qt_config->value("microProfileDialogVisible", false).toBool(); 91 qt_config->value("gameListHeaderState").toByteArray();
92 UISettings::values.microprofile_geometry =
93 qt_config->value("microProfileDialogGeometry").toByteArray();
94 UISettings::values.microprofile_visible =
95 qt_config->value("microProfileDialogVisible", false).toBool();
91 qt_config->endGroup(); 96 qt_config->endGroup();
92 97
93 qt_config->beginGroup("Paths"); 98 qt_config->beginGroup("Paths");
@@ -106,10 +111,10 @@ void Config::ReadValues() {
106 QStringList hotkeys = qt_config->childGroups(); 111 QStringList hotkeys = qt_config->childGroups();
107 for (auto hotkey : hotkeys) { 112 for (auto hotkey : hotkeys) {
108 qt_config->beginGroup(hotkey); 113 qt_config->beginGroup(hotkey);
109 UISettings::values.shortcuts.emplace_back( 114 UISettings::values.shortcuts.emplace_back(UISettings::Shortcut(
110 UISettings::Shortcut(group + "/" + hotkey, 115 group + "/" + hotkey,
111 UISettings::ContextualShortcut(qt_config->value("KeySeq").toString(), 116 UISettings::ContextualShortcut(qt_config->value("KeySeq").toString(),
112 qt_config->value("Context").toInt()))); 117 qt_config->value("Context").toInt())));
113 qt_config->endGroup(); 118 qt_config->endGroup();
114 } 119 }
115 120
@@ -119,7 +124,7 @@ void Config::ReadValues() {
119 124
120 UISettings::values.single_window_mode = qt_config->value("singleWindowMode", true).toBool(); 125 UISettings::values.single_window_mode = qt_config->value("singleWindowMode", true).toBool();
121 UISettings::values.display_titlebar = qt_config->value("displayTitleBars", true).toBool(); 126 UISettings::values.display_titlebar = qt_config->value("displayTitleBars", true).toBool();
122 UISettings::values.confirm_before_closing = qt_config->value("confirmClose",true).toBool(); 127 UISettings::values.confirm_before_closing = qt_config->value("confirmClose", true).toBool();
123 UISettings::values.first_start = qt_config->value("firstStart", true).toBool(); 128 UISettings::values.first_start = qt_config->value("firstStart", true).toBool();
124 129
125 qt_config->endGroup(); 130 qt_config->endGroup();
@@ -129,9 +134,10 @@ void Config::SaveValues() {
129 qt_config->beginGroup("Controls"); 134 qt_config->beginGroup("Controls");
130 for (int i = 0; i < Settings::NativeInput::NUM_INPUTS; ++i) { 135 for (int i = 0; i < Settings::NativeInput::NUM_INPUTS; ++i) {
131 qt_config->setValue(QString::fromStdString(Settings::NativeInput::Mapping[i]), 136 qt_config->setValue(QString::fromStdString(Settings::NativeInput::Mapping[i]),
132 Settings::values.input_mappings[Settings::NativeInput::All[i]]); 137 Settings::values.input_mappings[Settings::NativeInput::All[i]]);
133 } 138 }
134 qt_config->setValue("pad_circle_modifier_scale", (double)Settings::values.pad_circle_modifier_scale); 139 qt_config->setValue("pad_circle_modifier_scale",
140 (double)Settings::values.pad_circle_modifier_scale);
135 qt_config->endGroup(); 141 qt_config->endGroup();
136 142
137 qt_config->beginGroup("Core"); 143 qt_config->beginGroup("Core");
@@ -146,9 +152,9 @@ void Config::SaveValues() {
146 qt_config->setValue("use_vsync", Settings::values.use_vsync); 152 qt_config->setValue("use_vsync", Settings::values.use_vsync);
147 153
148 // Cast to double because Qt's written float values are not human-readable 154 // Cast to double because Qt's written float values are not human-readable
149 qt_config->setValue("bg_red", (double)Settings::values.bg_red); 155 qt_config->setValue("bg_red", (double)Settings::values.bg_red);
150 qt_config->setValue("bg_green", (double)Settings::values.bg_green); 156 qt_config->setValue("bg_green", (double)Settings::values.bg_green);
151 qt_config->setValue("bg_blue", (double)Settings::values.bg_blue); 157 qt_config->setValue("bg_blue", (double)Settings::values.bg_blue);
152 qt_config->endGroup(); 158 qt_config->endGroup();
153 159
154 qt_config->beginGroup("Audio"); 160 qt_config->beginGroup("Audio");