citra-emu
/
citra-canary
Archived
1
0
Fork 0
Code

Merge pull request #3924 from zhaowenlan1779/settings 

citra_qt: Settings (configuration) default value fix
This commit is contained in:
Weiyi Wang 2018-08-03 23:09:57 +03:00 committed by GitHub
parent 751e00a615 650c20eebf
commit 5bc72cca6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 238 additions and 204 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

438
src/citra_qt/configuration/config.cpp
View File

@ -45,8 +45,7 @@ void Config::ReadValues() {
for (int i = 0; i < Settings::NativeButton::NumButtons; ++i) { for (int i = 0; i < Settings::NativeButton::NumButtons; ++i) {
std::string default_param = InputCommon::GenerateKeyboardParam(default_buttons[i]); std::string default_param = InputCommon::GenerateKeyboardParam(default_buttons[i]);
Settings::values.buttons[i] = Settings::values.buttons[i] =
qt_config ReadSetting(Settings::NativeButton::mapping[i], QString::fromStdString(default_param))
->value(Settings::NativeButton::mapping[i], QString::fromStdString(default_param))
.toString() .toString()
.toStdString(); .toStdString();
if (Settings::values.buttons[i].empty()) if (Settings::values.buttons[i].empty())
@ -58,8 +57,7 @@ void Config::ReadValues() {
default_analogs[i][0], default_analogs[i][1], default_analogs[i][2], default_analogs[i][0], default_analogs[i][1], default_analogs[i][2],
default_analogs[i][3], default_analogs[i][4], 0.5f); default_analogs[i][3], default_analogs[i][4], 0.5f);
Settings::values.analogs[i] = Settings::values.analogs[i] =
qt_config ReadSetting(Settings::NativeAnalog::mapping[i], QString::fromStdString(default_param))
->value(Settings::NativeAnalog::mapping[i], QString::fromStdString(default_param))
.toString() .toString()
.toStdString(); .toStdString();
if (Settings::values.analogs[i].empty()) if (Settings::values.analogs[i].empty())
@ -67,166 +65,161 @@ void Config::ReadValues() {
} }
Settings::values.motion_device = Settings::values.motion_device =
qt_config ReadSetting("motion_device",
->value("motion_device",
"engine:motion_emu,update_period:100,sensitivity:0.01,tilt_clamp:90.0") "engine:motion_emu,update_period:100,sensitivity:0.01,tilt_clamp:90.0")
.toString() .toString()
.toStdString(); .toStdString();
Settings::values.touch_device = Settings::values.touch_device =
qt_config->value("touch_device", "engine:emu_window").toString().toStdString(); ReadSetting("touch_device", "engine:emu_window").toString().toStdString();
qt_config->endGroup(); qt_config->endGroup();
qt_config->beginGroup("Core"); qt_config->beginGroup("Core");
Settings::values.use_cpu_jit = qt_config->value("use_cpu_jit", true).toBool(); Settings::values.use_cpu_jit = ReadSetting("use_cpu_jit", true).toBool();
qt_config->endGroup(); qt_config->endGroup();
qt_config->beginGroup("Renderer"); qt_config->beginGroup("Renderer");
Settings::values.use_hw_renderer = qt_config->value("use_hw_renderer", true).toBool(); Settings::values.use_hw_renderer = ReadSetting("use_hw_renderer", true).toBool();
#ifdef __APPLE__ #ifdef __APPLE__
// Hardware shader is broken on macos thanks to poor drivers. // Hardware shader is broken on macos thanks to poor drivers.
// We still want to provide this option for test/development purposes, but disable it by // We still want to provide this option for test/development purposes, but disable it by
// default. // default.
Settings::values.use_hw_shader = qt_config->value("use_hw_shader", false).toBool(); Settings::values.use_hw_shader = ReadSetting("use_hw_shader", false).toBool();
#else #else
Settings::values.use_hw_shader = qt_config->value("use_hw_shader", true).toBool(); Settings::values.use_hw_shader = ReadSetting("use_hw_shader", true).toBool();
#endif #endif
Settings::values.shaders_accurate_gs = qt_config->value("shaders_accurate_gs", true).toBool(); Settings::values.shaders_accurate_gs = ReadSetting("shaders_accurate_gs", true).toBool();
Settings::values.shaders_accurate_mul = Settings::values.shaders_accurate_mul = ReadSetting("shaders_accurate_mul", false).toBool();
qt_config->value("shaders_accurate_mul", false).toBool(); Settings::values.use_shader_jit = ReadSetting("use_shader_jit", true).toBool();
Settings::values.use_shader_jit = qt_config->value("use_shader_jit", true).toBool();
Settings::values.resolution_factor = Settings::values.resolution_factor =
static_cast<u16>(qt_config->value("resolution_factor", 1).toInt()); static_cast<u16>(ReadSetting("resolution_factor", 1).toInt());
Settings::values.use_vsync = qt_config->value("use_vsync", false).toBool(); Settings::values.use_vsync = ReadSetting("use_vsync", false).toBool();
Settings::values.use_frame_limit = qt_config->value("use_frame_limit", true).toBool(); Settings::values.use_frame_limit = ReadSetting("use_frame_limit", true).toBool();
Settings::values.frame_limit = qt_config->value("frame_limit", 100).toInt(); Settings::values.frame_limit = ReadSetting("frame_limit", 100).toInt();
Settings::values.bg_red = qt_config->value("bg_red", 0.0).toFloat(); Settings::values.bg_red = ReadSetting("bg_red", 0.0).toFloat();
Settings::values.bg_green = qt_config->value("bg_green", 0.0).toFloat(); Settings::values.bg_green = ReadSetting("bg_green", 0.0).toFloat();
Settings::values.bg_blue = qt_config->value("bg_blue", 0.0).toFloat(); Settings::values.bg_blue = ReadSetting("bg_blue", 0.0).toFloat();
qt_config->endGroup(); qt_config->endGroup();
qt_config->beginGroup("Layout"); qt_config->beginGroup("Layout");
Settings::values.toggle_3d = qt_config->value("toggle_3d", false).toBool(); Settings::values.toggle_3d = ReadSetting("toggle_3d", false).toBool();
Settings::values.factor_3d = qt_config->value("factor_3d", 0).toInt(); Settings::values.factor_3d = ReadSetting("factor_3d", 0).toInt();
Settings::values.layout_option = Settings::values.layout_option =
static_cast<Settings::LayoutOption>(qt_config->value("layout_option").toInt()); static_cast<Settings::LayoutOption>(ReadSetting("layout_option").toInt());
Settings::values.swap_screen = qt_config->value("swap_screen", false).toBool(); Settings::values.swap_screen = ReadSetting("swap_screen", false).toBool();
Settings::values.custom_layout = qt_config->value("custom_layout", false).toBool(); Settings::values.custom_layout = ReadSetting("custom_layout", false).toBool();
Settings::values.custom_top_left = qt_config->value("custom_top_left", 0).toInt(); Settings::values.custom_top_left = ReadSetting("custom_top_left", 0).toInt();
Settings::values.custom_top_top = qt_config->value("custom_top_top", 0).toInt(); Settings::values.custom_top_top = ReadSetting("custom_top_top", 0).toInt();
Settings::values.custom_top_right = qt_config->value("custom_top_right", 400).toInt(); Settings::values.custom_top_right = ReadSetting("custom_top_right", 400).toInt();
Settings::values.custom_top_bottom = qt_config->value("custom_top_bottom", 240).toInt(); Settings::values.custom_top_bottom = ReadSetting("custom_top_bottom", 240).toInt();
Settings::values.custom_bottom_left = qt_config->value("custom_bottom_left", 40).toInt(); Settings::values.custom_bottom_left = ReadSetting("custom_bottom_left", 40).toInt();
Settings::values.custom_bottom_top = qt_config->value("custom_bottom_top", 240).toInt(); Settings::values.custom_bottom_top = ReadSetting("custom_bottom_top", 240).toInt();
Settings::values.custom_bottom_right = qt_config->value("custom_bottom_right", 360).toInt(); Settings::values.custom_bottom_right = ReadSetting("custom_bottom_right", 360).toInt();
Settings::values.custom_bottom_bottom = qt_config->value("custom_bottom_bottom", 480).toInt(); Settings::values.custom_bottom_bottom = ReadSetting("custom_bottom_bottom", 480).toInt();
qt_config->endGroup(); qt_config->endGroup();
qt_config->beginGroup("Audio"); qt_config->beginGroup("Audio");
Settings::values.sink_id = qt_config->value("output_engine", "auto").toString().toStdString(); Settings::values.sink_id = ReadSetting("output_engine", "auto").toString().toStdString();
Settings::values.enable_audio_stretching = Settings::values.enable_audio_stretching =
qt_config->value("enable_audio_stretching", true).toBool(); ReadSetting("enable_audio_stretching", true).toBool();
Settings::values.audio_device_id = Settings::values.audio_device_id =
qt_config->value("output_device", "auto").toString().toStdString(); ReadSetting("output_device", "auto").toString().toStdString();
Settings::values.volume = qt_config->value("volume", 1).toFloat(); Settings::values.volume = ReadSetting("volume", 1).toFloat();
qt_config->endGroup(); qt_config->endGroup();
using namespace Service::CAM; using namespace Service::CAM;
qt_config->beginGroup("Camera"); qt_config->beginGroup("Camera");
Settings::values.camera_name[OuterRightCamera] = Settings::values.camera_name[OuterRightCamera] =
qt_config->value("camera_outer_right_name", "blank").toString().toStdString(); ReadSetting("camera_outer_right_name", "blank").toString().toStdString();
Settings::values.camera_config[OuterRightCamera] = Settings::values.camera_config[OuterRightCamera] =
qt_config->value("camera_outer_right_config", "").toString().toStdString(); ReadSetting("camera_outer_right_config", "").toString().toStdString();
Settings::values.camera_flip[OuterRightCamera] = Settings::values.camera_flip[OuterRightCamera] =
qt_config->value("camera_outer_right_flip", "0").toInt(); ReadSetting("camera_outer_right_flip", "0").toInt();
Settings::values.camera_name[InnerCamera] = Settings::values.camera_name[InnerCamera] =
qt_config->value("camera_inner_name", "blank").toString().toStdString(); ReadSetting("camera_inner_name", "blank").toString().toStdString();
Settings::values.camera_config[InnerCamera] = Settings::values.camera_config[InnerCamera] =
qt_config->value("camera_inner_config", "").toString().toStdString(); ReadSetting("camera_inner_config", "").toString().toStdString();
Settings::values.camera_flip[InnerCamera] = qt_config->value("camera_inner_flip", "").toInt(); Settings::values.camera_flip[InnerCamera] = ReadSetting("camera_inner_flip", "").toInt();
Settings::values.camera_name[OuterLeftCamera] = Settings::values.camera_name[OuterLeftCamera] =
qt_config->value("camera_outer_left_name", "blank").toString().toStdString(); ReadSetting("camera_outer_left_name", "blank").toString().toStdString();
Settings::values.camera_config[OuterLeftCamera] = Settings::values.camera_config[OuterLeftCamera] =
qt_config->value("camera_outer_left_config", "").toString().toStdString(); ReadSetting("camera_outer_left_config", "").toString().toStdString();
Settings::values.camera_flip[OuterLeftCamera] = Settings::values.camera_flip[OuterLeftCamera] =
qt_config->value("camera_outer_left_flip", "").toInt(); ReadSetting("camera_outer_left_flip", "").toInt();
qt_config->endGroup(); qt_config->endGroup();
qt_config->beginGroup("Data Storage"); qt_config->beginGroup("Data Storage");
Settings::values.use_virtual_sd = qt_config->value("use_virtual_sd", true).toBool(); Settings::values.use_virtual_sd = ReadSetting("use_virtual_sd", true).toBool();
qt_config->endGroup(); qt_config->endGroup();
qt_config->beginGroup("System"); qt_config->beginGroup("System");
Settings::values.is_new_3ds = qt_config->value("is_new_3ds", false).toBool(); Settings::values.is_new_3ds = ReadSetting("is_new_3ds", false).toBool();
Settings::values.region_value = Settings::values.region_value =
qt_config->value("region_value", Settings::REGION_VALUE_AUTO_SELECT).toInt(); ReadSetting("region_value", Settings::REGION_VALUE_AUTO_SELECT).toInt();
qt_config->endGroup(); qt_config->endGroup();
qt_config->beginGroup("Miscellaneous"); qt_config->beginGroup("Miscellaneous");
Settings::values.log_filter = qt_config->value("log_filter", "*:Info").toString().toStdString(); Settings::values.log_filter = ReadSetting("log_filter", "*:Info").toString().toStdString();
qt_config->endGroup(); qt_config->endGroup();
qt_config->beginGroup("Debugging"); qt_config->beginGroup("Debugging");
Settings::values.use_gdbstub = qt_config->value("use_gdbstub", false).toBool(); Settings::values.use_gdbstub = ReadSetting("use_gdbstub", false).toBool();
Settings::values.gdbstub_port = qt_config->value("gdbstub_port", 24689).toInt(); Settings::values.gdbstub_port = ReadSetting("gdbstub_port", 24689).toInt();
qt_config->endGroup(); qt_config->endGroup();
qt_config->beginGroup("WebService"); qt_config->beginGroup("WebService");
Settings::values.enable_telemetry = qt_config->value("enable_telemetry", true).toBool(); Settings::values.enable_telemetry = ReadSetting("enable_telemetry", true).toBool();
Settings::values.telemetry_endpoint_url = Settings::values.telemetry_endpoint_url =
qt_config->value("telemetry_endpoint_url", "https://services.citra-emu.org/api/telemetry") ReadSetting("telemetry_endpoint_url", "https://services.citra-emu.org/api/telemetry")
.toString() .toString()
.toStdString(); .toStdString();
Settings::values.verify_endpoint_url = Settings::values.verify_endpoint_url =
qt_config->value("verify_endpoint_url", "https://services.citra-emu.org/api/profile") ReadSetting("verify_endpoint_url", "https://services.citra-emu.org/api/profile")
.toString() .toString()
.toStdString(); .toStdString();
Settings::values.announce_multiplayer_room_endpoint_url = Settings::values.announce_multiplayer_room_endpoint_url =
qt_config ReadSetting("announce_multiplayer_room_endpoint_url",
->value("announce_multiplayer_room_endpoint_url",
"https://services.citra-emu.org/api/multiplayer/rooms") "https://services.citra-emu.org/api/multiplayer/rooms")
.toString() .toString()
.toStdString(); .toStdString();
Settings::values.citra_username = qt_config->value("citra_username").toString().toStdString(); Settings::values.citra_username = ReadSetting("citra_username").toString().toStdString();
Settings::values.citra_token = qt_config->value("citra_token").toString().toStdString(); Settings::values.citra_token = ReadSetting("citra_token").toString().toStdString();
qt_config->endGroup(); qt_config->endGroup();
qt_config->beginGroup("UI"); qt_config->beginGroup("UI");
UISettings::values.theme = qt_config->value("theme", UISettings::themes[0].second).toString(); UISettings::values.theme = ReadSetting("theme", UISettings::themes[0].second).toString();
qt_config->beginGroup("Updater"); qt_config->beginGroup("Updater");
UISettings::values.check_for_update_on_start = UISettings::values.check_for_update_on_start =
qt_config->value("check_for_update_on_start", true).toBool(); ReadSetting("check_for_update_on_start", true).toBool();
UISettings::values.update_on_close = qt_config->value("update_on_close", false).toBool(); UISettings::values.update_on_close = ReadSetting("update_on_close", false).toBool();
qt_config->endGroup(); qt_config->endGroup();
qt_config->beginGroup("UILayout"); qt_config->beginGroup("UILayout");
UISettings::values.geometry = qt_config->value("geometry").toByteArray(); UISettings::values.geometry = ReadSetting("geometry").toByteArray();
UISettings::values.state = qt_config->value("state").toByteArray(); UISettings::values.state = ReadSetting("state").toByteArray();
UISettings::values.renderwindow_geometry = UISettings::values.renderwindow_geometry = ReadSetting("geometryRenderWindow").toByteArray();
qt_config->value("geometryRenderWindow").toByteArray(); UISettings::values.gamelist_header_state = ReadSetting("gameListHeaderState").toByteArray();
UISettings::values.gamelist_header_state =
qt_config->value("gameListHeaderState").toByteArray();
UISettings::values.microprofile_geometry = UISettings::values.microprofile_geometry =
qt_config->value("microProfileDialogGeometry").toByteArray(); ReadSetting("microProfileDialogGeometry").toByteArray();
UISettings::values.microprofile_visible = UISettings::values.microprofile_visible =
qt_config->value("microProfileDialogVisible", false).toBool(); ReadSetting("microProfileDialogVisible", false).toBool();
qt_config->endGroup(); qt_config->endGroup();
qt_config->beginGroup("Paths"); qt_config->beginGroup("Paths");
UISettings::values.roms_path = qt_config->value("romsPath").toString(); UISettings::values.roms_path = ReadSetting("romsPath").toString();
UISettings::values.symbols_path = qt_config->value("symbolsPath").toString(); UISettings::values.symbols_path = ReadSetting("symbolsPath").toString();
UISettings::values.game_dir_deprecated = qt_config->value("gameListRootDir", ".").toString(); UISettings::values.game_dir_deprecated = ReadSetting("gameListRootDir", ".").toString();
UISettings::values.game_dir_deprecated_deepscan = UISettings::values.game_dir_deprecated_deepscan =
qt_config->value("gameListDeepScan", false).toBool(); ReadSetting("gameListDeepScan", false).toBool();
int size = qt_config->beginReadArray("gamedirs"); int size = qt_config->beginReadArray("gamedirs");
for (int i = 0; i < size; ++i) { for (int i = 0; i < size; ++i) {
qt_config->setArrayIndex(i); qt_config->setArrayIndex(i);
UISettings::GameDir game_dir; UISettings::GameDir game_dir;
game_dir.path = qt_config->value("path").toString(); game_dir.path = ReadSetting("path").toString();
game_dir.deep_scan = qt_config->value("deep_scan", false).toBool(); game_dir.deep_scan = ReadSetting("deep_scan", false).toBool();
game_dir.expanded = qt_config->value("expanded", true).toBool(); game_dir.expanded = ReadSetting("expanded", true).toBool();
UISettings::values.game_dirs.append(game_dir); UISettings::values.game_dirs.append(game_dir);
} }
qt_config->endArray(); qt_config->endArray();
@ -245,8 +238,8 @@ void Config::ReadValues() {
UISettings::values.game_dirs.append(game_dir); UISettings::values.game_dirs.append(game_dir);
} }
} }
UISettings::values.recent_files = qt_config->value("recentFiles").toStringList(); UISettings::values.recent_files = ReadSetting("recentFiles").toStringList();
UISettings::values.language = qt_config->value("language", "").toString(); UISettings::values.language = ReadSetting("language", "").toString();
qt_config->endGroup(); qt_config->endGroup();
qt_config->beginGroup("Shortcuts"); qt_config->beginGroup("Shortcuts");
@ -259,8 +252,8 @@ void Config::ReadValues() {
qt_config->beginGroup(hotkey); qt_config->beginGroup(hotkey);
UISettings::values.shortcuts.emplace_back(UISettings::Shortcut( UISettings::values.shortcuts.emplace_back(UISettings::Shortcut(
group + "/" + hotkey, group + "/" + hotkey,
UISettings::ContextualShortcut(qt_config->value("KeySeq").toString(), UISettings::ContextualShortcut(ReadSetting("KeySeq").toString(),
qt_config->value("Context").toInt()))); ReadSetting("Context").toInt())));
qt_config->endGroup(); qt_config->endGroup();
} }
@ -268,30 +261,30 @@ void Config::ReadValues() {
} }
qt_config->endGroup(); qt_config->endGroup();
UISettings::values.single_window_mode = qt_config->value("singleWindowMode", true).toBool(); UISettings::values.single_window_mode = ReadSetting("singleWindowMode", true).toBool();
UISettings::values.fullscreen = qt_config->value("fullscreen", false).toBool(); UISettings::values.fullscreen = ReadSetting("fullscreen", false).toBool();
UISettings::values.display_titlebar = qt_config->value("displayTitleBars", true).toBool(); UISettings::values.display_titlebar = ReadSetting("displayTitleBars", true).toBool();
UISettings::values.show_filter_bar = qt_config->value("showFilterBar", true).toBool(); UISettings::values.show_filter_bar = ReadSetting("showFilterBar", true).toBool();
UISettings::values.show_status_bar = qt_config->value("showStatusBar", true).toBool(); UISettings::values.show_status_bar = ReadSetting("showStatusBar", true).toBool();
UISettings::values.confirm_before_closing = qt_config->value("confirmClose", true).toBool(); UISettings::values.confirm_before_closing = ReadSetting("confirmClose", true).toBool();
UISettings::values.first_start = qt_config->value("firstStart", true).toBool(); UISettings::values.first_start = ReadSetting("firstStart", true).toBool();
UISettings::values.callout_flags = qt_config->value("calloutFlags", 0).toUInt(); UISettings::values.callout_flags = ReadSetting("calloutFlags", 0).toUInt();
UISettings::values.show_console = qt_config->value("showConsole", false).toBool(); UISettings::values.show_console = ReadSetting("showConsole", false).toBool();
qt_config->beginGroup("Multiplayer"); qt_config->beginGroup("Multiplayer");
UISettings::values.nickname = qt_config->value("nickname", "").toString(); UISettings::values.nickname = ReadSetting("nickname", "").toString();
UISettings::values.ip = qt_config->value("ip", "").toString(); UISettings::values.ip = ReadSetting("ip", "").toString();
UISettings::values.port = qt_config->value("port", Network::DefaultRoomPort).toString(); UISettings::values.port = ReadSetting("port", Network::DefaultRoomPort).toString();
UISettings::values.room_nickname = qt_config->value("room_nickname", "").toString(); UISettings::values.room_nickname = ReadSetting("room_nickname", "").toString();
UISettings::values.room_name = qt_config->value("room_name", "").toString(); UISettings::values.room_name = ReadSetting("room_name", "").toString();
UISettings::values.room_port = qt_config->value("room_port", "24872").toString(); UISettings::values.room_port = ReadSetting("room_port", "24872").toString();
bool ok; bool ok;
UISettings::values.host_type = qt_config->value("host_type", 0).toUInt(&ok); UISettings::values.host_type = ReadSetting("host_type", 0).toUInt(&ok);
if (!ok) { if (!ok) {
UISettings::values.host_type = 0; UISettings::values.host_type = 0;
} }
UISettings::values.max_player = qt_config->value("max_player", 8).toUInt(); UISettings::values.max_player = ReadSetting("max_player", 8).toUInt();
UISettings::values.game_id = qt_config->value("game_id", 0).toULongLong(); UISettings::values.game_id = ReadSetting("game_id", 0).toULongLong();
qt_config->endGroup(); qt_config->endGroup();
qt_config->endGroup(); qt_config->endGroup();
@ -300,178 +293,215 @@ void Config::ReadValues() {
void Config::SaveValues() { void Config::SaveValues() {
qt_config->beginGroup("Controls"); qt_config->beginGroup("Controls");
for (int i = 0; i < Settings::NativeButton::NumButtons; ++i) { for (int i = 0; i < Settings::NativeButton::NumButtons; ++i) {
qt_config->setValue(QString::fromStdString(Settings::NativeButton::mapping[i]), std::string default_param = InputCommon::GenerateKeyboardParam(default_buttons[i]);
QString::fromStdString(Settings::values.buttons[i])); WriteSetting(QString::fromStdString(Settings::NativeButton::mapping[i]),
QString::fromStdString(Settings::values.buttons[i]),
QString::fromStdString(default_param));
} }
for (int i = 0; i < Settings::NativeAnalog::NumAnalogs; ++i) { for (int i = 0; i < Settings::NativeAnalog::NumAnalogs; ++i) {
qt_config->setValue(QString::fromStdString(Settings::NativeAnalog::mapping[i]), std::string default_param = InputCommon::GenerateAnalogParamFromKeys(
QString::fromStdString(Settings::values.analogs[i])); default_analogs[i][0], default_analogs[i][1], default_analogs[i][2],
default_analogs[i][3], default_analogs[i][4], 0.5f);
WriteSetting(QString::fromStdString(Settings::NativeAnalog::mapping[i]),
QString::fromStdString(Settings::values.analogs[i]),
QString::fromStdString(default_param));
} }
qt_config->setValue("motion_device", QString::fromStdString(Settings::values.motion_device)); WriteSetting("motion_device", QString::fromStdString(Settings::values.motion_device),
qt_config->setValue("touch_device", QString::fromStdString(Settings::values.touch_device)); "engine:motion_emu,update_period:100,sensitivity:0.01,tilt_clamp:90.0");
WriteSetting("touch_device", QString::fromStdString(Settings::values.touch_device),
"engine:emu_window");
qt_config->endGroup(); qt_config->endGroup();
qt_config->beginGroup("Core"); qt_config->beginGroup("Core");
qt_config->setValue("use_cpu_jit", Settings::values.use_cpu_jit); WriteSetting("use_cpu_jit", Settings::values.use_cpu_jit, true);
qt_config->endGroup(); qt_config->endGroup();
qt_config->beginGroup("Renderer"); qt_config->beginGroup("Renderer");
qt_config->setValue("use_hw_renderer", Settings::values.use_hw_renderer); WriteSetting("use_hw_renderer", Settings::values.use_hw_renderer, true);
qt_config->setValue("use_hw_shader", Settings::values.use_hw_shader); WriteSetting("use_hw_shader", Settings::values.use_hw_shader, true);
qt_config->setValue("shaders_accurate_gs", Settings::values.shaders_accurate_gs); WriteSetting("shaders_accurate_gs", Settings::values.shaders_accurate_gs, true);
qt_config->setValue("shaders_accurate_mul", Settings::values.shaders_accurate_mul); WriteSetting("shaders_accurate_mul", Settings::values.shaders_accurate_mul, false);
qt_config->setValue("use_shader_jit", Settings::values.use_shader_jit); WriteSetting("use_shader_jit", Settings::values.use_shader_jit, true);
qt_config->setValue("resolution_factor", Settings::values.resolution_factor); WriteSetting("resolution_factor", Settings::values.resolution_factor, 1);
qt_config->setValue("use_vsync", Settings::values.use_vsync); WriteSetting("use_vsync", Settings::values.use_vsync, false);
qt_config->setValue("use_frame_limit", Settings::values.use_frame_limit); WriteSetting("use_frame_limit", Settings::values.use_frame_limit, true);
qt_config->setValue("frame_limit", Settings::values.frame_limit); WriteSetting("frame_limit", Settings::values.frame_limit, 100);
// Cast to double because Qt's written float values are not human-readable // Cast to double because Qt's written float values are not human-readable
qt_config->setValue("bg_red", (double)Settings::values.bg_red); WriteSetting("bg_red", (double)Settings::values.bg_red, 0.0);
qt_config->setValue("bg_green", (double)Settings::values.bg_green); WriteSetting("bg_green", (double)Settings::values.bg_green, 0.0);
qt_config->setValue("bg_blue", (double)Settings::values.bg_blue); WriteSetting("bg_blue", (double)Settings::values.bg_blue, 0.0);
qt_config->endGroup(); qt_config->endGroup();
qt_config->beginGroup("Layout"); qt_config->beginGroup("Layout");
qt_config->setValue("toggle_3d", Settings::values.toggle_3d); WriteSetting("toggle_3d", Settings::values.toggle_3d, false);
qt_config->setValue("factor_3d", Settings::values.factor_3d); WriteSetting("factor_3d", Settings::values.factor_3d, 0);
qt_config->setValue("layout_option", static_cast<int>(Settings::values.layout_option)); WriteSetting("layout_option", static_cast<int>(Settings::values.layout_option));
qt_config->setValue("swap_screen", Settings::values.swap_screen); WriteSetting("swap_screen", Settings::values.swap_screen, false);
qt_config->setValue("custom_layout", Settings::values.custom_layout); WriteSetting("custom_layout", Settings::values.custom_layout, false);
qt_config->setValue("custom_top_left", Settings::values.custom_top_left); WriteSetting("custom_top_left", Settings::values.custom_top_left, 0);
qt_config->setValue("custom_top_top", Settings::values.custom_top_top); WriteSetting("custom_top_top", Settings::values.custom_top_top, 0);
qt_config->setValue("custom_top_right", Settings::values.custom_top_right); WriteSetting("custom_top_right", Settings::values.custom_top_right, 400);
qt_config->setValue("custom_top_bottom", Settings::values.custom_top_bottom); WriteSetting("custom_top_bottom", Settings::values.custom_top_bottom, 240);
qt_config->setValue("custom_bottom_left", Settings::values.custom_bottom_left); WriteSetting("custom_bottom_left", Settings::values.custom_bottom_left, 40);
qt_config->setValue("custom_bottom_top", Settings::values.custom_bottom_top); WriteSetting("custom_bottom_top", Settings::values.custom_bottom_top, 240);
qt_config->setValue("custom_bottom_right", Settings::values.custom_bottom_right); WriteSetting("custom_bottom_right", Settings::values.custom_bottom_right, 360);
qt_config->setValue("custom_bottom_bottom", Settings::values.custom_bottom_bottom); WriteSetting("custom_bottom_bottom", Settings::values.custom_bottom_bottom, 480);
qt_config->endGroup(); qt_config->endGroup();
qt_config->beginGroup("Audio"); qt_config->beginGroup("Audio");
qt_config->setValue("output_engine", QString::fromStdString(Settings::values.sink_id)); WriteSetting("output_engine", QString::fromStdString(Settings::values.sink_id), "auto");
qt_config->setValue("enable_audio_stretching", Settings::values.enable_audio_stretching); WriteSetting("enable_audio_stretching", Settings::values.enable_audio_stretching, true);
qt_config->setValue("output_device", QString::fromStdString(Settings::values.audio_device_id)); WriteSetting("output_device", QString::fromStdString(Settings::values.audio_device_id), "auto");
qt_config->setValue("volume", Settings::values.volume); WriteSetting("volume", Settings::values.volume, 1.0f);
qt_config->endGroup(); qt_config->endGroup();
using namespace Service::CAM; using namespace Service::CAM;
qt_config->beginGroup("Camera"); qt_config->beginGroup("Camera");
qt_config->setValue("camera_outer_right_name", WriteSetting("camera_outer_right_name",
QString::fromStdString(Settings::values.camera_name[OuterRightCamera])); QString::fromStdString(Settings::values.camera_name[OuterRightCamera]), "blank");
qt_config->setValue("camera_outer_right_config", WriteSetting("camera_outer_right_config",
QString::fromStdString(Settings::values.camera_config[OuterRightCamera])); QString::fromStdString(Settings::values.camera_config[OuterRightCamera]), "");
qt_config->setValue("camera_outer_right_flip", Settings::values.camera_flip[OuterRightCamera]); WriteSetting("camera_outer_right_flip", Settings::values.camera_flip[OuterRightCamera], 0);
qt_config->setValue("camera_inner_name", WriteSetting("camera_inner_name",
QString::fromStdString(Settings::values.camera_name[InnerCamera])); QString::fromStdString(Settings::values.camera_name[InnerCamera]), "blank");
qt_config->setValue("camera_inner_config", WriteSetting("camera_inner_config",
QString::fromStdString(Settings::values.camera_config[InnerCamera])); QString::fromStdString(Settings::values.camera_config[InnerCamera]), "");
qt_config->setValue("camera_inner_flip", Settings::values.camera_flip[InnerCamera]); WriteSetting("camera_inner_flip", Settings::values.camera_flip[InnerCamera], 0);
qt_config->setValue("camera_outer_left_name", WriteSetting("camera_outer_left_name",
QString::fromStdString(Settings::values.camera_name[OuterLeftCamera])); QString::fromStdString(Settings::values.camera_name[OuterLeftCamera]), "blank");
qt_config->setValue("camera_outer_left_config", WriteSetting("camera_outer_left_config",
QString::fromStdString(Settings::values.camera_config[OuterLeftCamera])); QString::fromStdString(Settings::values.camera_config[OuterLeftCamera]), "");
qt_config->setValue("camera_outer_left_flip", Settings::values.camera_flip[OuterLeftCamera]); WriteSetting("camera_outer_left_flip", Settings::values.camera_flip[OuterLeftCamera], 0);
qt_config->endGroup(); qt_config->endGroup();
qt_config->beginGroup("Data Storage"); qt_config->beginGroup("Data Storage");
qt_config->setValue("use_virtual_sd", Settings::values.use_virtual_sd); WriteSetting("use_virtual_sd", Settings::values.use_virtual_sd, true);
qt_config->endGroup(); qt_config->endGroup();
qt_config->beginGroup("System"); qt_config->beginGroup("System");
qt_config->setValue("is_new_3ds", Settings::values.is_new_3ds); WriteSetting("is_new_3ds", Settings::values.is_new_3ds, false);
qt_config->setValue("region_value", Settings::values.region_value); WriteSetting("region_value", Settings::values.region_value, Settings::REGION_VALUE_AUTO_SELECT);
qt_config->endGroup(); qt_config->endGroup();
qt_config->beginGroup("Miscellaneous"); qt_config->beginGroup("Miscellaneous");
qt_config->setValue("log_filter", QString::fromStdString(Settings::values.log_filter)); WriteSetting("log_filter", QString::fromStdString(Settings::values.log_filter), "*:Info");
qt_config->endGroup(); qt_config->endGroup();
qt_config->beginGroup("Debugging"); qt_config->beginGroup("Debugging");
qt_config->setValue("use_gdbstub", Settings::values.use_gdbstub); WriteSetting("use_gdbstub", Settings::values.use_gdbstub, false);
qt_config->setValue("gdbstub_port", Settings::values.gdbstub_port); WriteSetting("gdbstub_port", Settings::values.gdbstub_port, 24689);
qt_config->endGroup(); qt_config->endGroup();
qt_config->beginGroup("WebService"); qt_config->beginGroup("WebService");
qt_config->setValue("enable_telemetry", Settings::values.enable_telemetry); WriteSetting("enable_telemetry", Settings::values.enable_telemetry, true);
qt_config->setValue("telemetry_endpoint_url", WriteSetting("telemetry_endpoint_url",
QString::fromStdString(Settings::values.telemetry_endpoint_url)); QString::fromStdString(Settings::values.telemetry_endpoint_url),
qt_config->setValue("verify_endpoint_url", "https://services.citra-emu.org/api/telemetry");
QString::fromStdString(Settings::values.verify_endpoint_url)); WriteSetting("verify_endpoint_url",
qt_config->setValue( QString::fromStdString(Settings::values.verify_endpoint_url),
"announce_multiplayer_room_endpoint_url", "https://services.citra-emu.org/api/profile");
QString::fromStdString(Settings::values.announce_multiplayer_room_endpoint_url)); WriteSetting("announce_multiplayer_room_endpoint_url",
qt_config->setValue("citra_username", QString::fromStdString(Settings::values.citra_username)); QString::fromStdString(Settings::values.announce_multiplayer_room_endpoint_url),
qt_config->setValue("citra_token", QString::fromStdString(Settings::values.citra_token)); "https://services.citra-emu.org/"
"api/multiplayer/rooms");
WriteSetting("citra_username", QString::fromStdString(Settings::values.citra_username));
WriteSetting("citra_token", QString::fromStdString(Settings::values.citra_token));
qt_config->endGroup(); qt_config->endGroup();
qt_config->beginGroup("UI"); qt_config->beginGroup("UI");
qt_config->setValue("theme", UISettings::values.theme); WriteSetting("theme", UISettings::values.theme, UISettings::themes[0].second);
qt_config->beginGroup("Updater"); qt_config->beginGroup("Updater");
qt_config->setValue("check_for_update_on_start", UISettings::values.check_for_update_on_start); WriteSetting("check_for_update_on_start", UISettings::values.check_for_update_on_start, true);
qt_config->setValue("update_on_close", UISettings::values.update_on_close); WriteSetting("update_on_close", UISettings::values.update_on_close, false);
qt_config->endGroup(); qt_config->endGroup();
qt_config->beginGroup("UILayout"); qt_config->beginGroup("UILayout");
qt_config->setValue("geometry", UISettings::values.geometry); WriteSetting("geometry", UISettings::values.geometry);
qt_config->setValue("state", UISettings::values.state); WriteSetting("state", UISettings::values.state);
qt_config->setValue("geometryRenderWindow", UISettings::values.renderwindow_geometry); WriteSetting("geometryRenderWindow", UISettings::values.renderwindow_geometry);
qt_config->setValue("gameListHeaderState", UISettings::values.gamelist_header_state); WriteSetting("gameListHeaderState", UISettings::values.gamelist_header_state);
qt_config->setValue("microProfileDialogGeometry", UISettings::values.microprofile_geometry); WriteSetting("microProfileDialogGeometry", UISettings::values.microprofile_geometry);
qt_config->setValue("microProfileDialogVisible", UISettings::values.microprofile_visible); WriteSetting("microProfileDialogVisible", UISettings::values.microprofile_visible, false);
qt_config->endGroup(); qt_config->endGroup();
qt_config->beginGroup("Paths"); qt_config->beginGroup("Paths");
qt_config->setValue("romsPath", UISettings::values.roms_path); WriteSetting("romsPath", UISettings::values.roms_path);
qt_config->setValue("symbolsPath", UISettings::values.symbols_path); WriteSetting("symbolsPath", UISettings::values.symbols_path);
qt_config->beginWriteArray("gamedirs"); qt_config->beginWriteArray("gamedirs");
for (int i = 0; i < UISettings::values.game_dirs.size(); ++i) { for (int i = 0; i < UISettings::values.game_dirs.size(); ++i) {
qt_config->setArrayIndex(i); qt_config->setArrayIndex(i);
const auto& game_dir = UISettings::values.game_dirs.at(i); const auto& game_dir = UISettings::values.game_dirs.at(i);
qt_config->setValue("path", game_dir.path); WriteSetting("path", game_dir.path);
qt_config->setValue("deep_scan", game_dir.deep_scan); WriteSetting("deep_scan", game_dir.deep_scan, false);
qt_config->setValue("expanded", game_dir.expanded); WriteSetting("expanded", game_dir.expanded, true);
} }
qt_config->endArray(); qt_config->endArray();
qt_config->setValue("recentFiles", UISettings::values.recent_files); WriteSetting("recentFiles", UISettings::values.recent_files);
qt_config->setValue("language", UISettings::values.language); WriteSetting("language", UISettings::values.language, "");
qt_config->endGroup(); qt_config->endGroup();
qt_config->beginGroup("Shortcuts"); qt_config->beginGroup("Shortcuts");
for (auto shortcut : UISettings::values.shortcuts) { for (auto shortcut : UISettings::values.shortcuts) {
qt_config->setValue(shortcut.first + "/KeySeq", shortcut.second.first); WriteSetting(shortcut.first + "/KeySeq", shortcut.second.first);
qt_config->setValue(shortcut.first + "/Context", shortcut.second.second); WriteSetting(shortcut.first + "/Context", shortcut.second.second);
} }
qt_config->endGroup(); qt_config->endGroup();
qt_config->setValue("singleWindowMode", UISettings::values.single_window_mode); WriteSetting("singleWindowMode", UISettings::values.single_window_mode, true);
qt_config->setValue("fullscreen", UISettings::values.fullscreen); WriteSetting("fullscreen", UISettings::values.fullscreen, false);
qt_config->setValue("displayTitleBars", UISettings::values.display_titlebar); WriteSetting("displayTitleBars", UISettings::values.display_titlebar, true);
qt_config->setValue("showFilterBar", UISettings::values.show_filter_bar); WriteSetting("showFilterBar", UISettings::values.show_filter_bar, true);
qt_config->setValue("showStatusBar", UISettings::values.show_status_bar); WriteSetting("showStatusBar", UISettings::values.show_status_bar, true);
qt_config->setValue("confirmClose", UISettings::values.confirm_before_closing); WriteSetting("confirmClose", UISettings::values.confirm_before_closing, true);
qt_config->setValue("firstStart", UISettings::values.first_start); WriteSetting("firstStart", UISettings::values.first_start, true);
qt_config->setValue("calloutFlags", UISettings::values.callout_flags); WriteSetting("calloutFlags", UISettings::values.callout_flags, 0);
qt_config->setValue("showConsole", UISettings::values.show_console); WriteSetting("showConsole", UISettings::values.show_console, false);
qt_config->beginGroup("Multiplayer"); qt_config->beginGroup("Multiplayer");
qt_config->setValue("nickname", UISettings::values.nickname); WriteSetting("nickname", UISettings::values.nickname, "");
qt_config->setValue("ip", UISettings::values.ip); WriteSetting("ip", UISettings::values.ip, "");
qt_config->setValue("port", UISettings::values.port); WriteSetting("port", UISettings::values.port, Network::DefaultRoomPort);
qt_config->setValue("room_nickname", UISettings::values.room_nickname); WriteSetting("room_nickname", UISettings::values.room_nickname, "");
qt_config->setValue("room_name", UISettings::values.room_name); WriteSetting("room_name", UISettings::values.room_name, "");
qt_config->setValue("room_port", UISettings::values.room_port); WriteSetting("room_port", UISettings::values.room_port, "24872");
qt_config->setValue("host_type", UISettings::values.host_type); WriteSetting("host_type", UISettings::values.host_type, 0);
qt_config->setValue("max_player", UISettings::values.max_player); WriteSetting("max_player", UISettings::values.max_player, 8);
qt_config->setValue("game_id", UISettings::values.game_id); WriteSetting("game_id", UISettings::values.game_id, 0);
qt_config->endGroup(); qt_config->endGroup();
qt_config->endGroup(); qt_config->endGroup();
} }
QVariant Config::ReadSetting(const QString& name) {
return qt_config->value(name);
}
QVariant Config::ReadSetting(const QString& name, const QVariant& default_value) {
QVariant result;
if (qt_config->value(name + "/default", false).toBool()) {
result = default_value;
} else {
result = qt_config->value(name, default_value);
}
return result;
}
void Config::WriteSetting(const QString& name, const QVariant& value) {
qt_config->setValue(name, value);
}
void Config::WriteSetting(const QString& name, const QVariant& value,
const QVariant& default_value) {
qt_config->setValue(name + "/default", value == default_value);
qt_config->setValue(name, value);
}
void Config::Reload() { void Config::Reload() {
ReadValues(); ReadValues();
// To apply default value changes
SaveValues();
Settings::Apply(); Settings::Apply();
} }

4
src/citra_qt/configuration/config.h
View File

@ -17,6 +17,10 @@ class Config {
void ReadValues(); void ReadValues();
void SaveValues(); void SaveValues();
QVariant ReadSetting(const QString& name);
QVariant ReadSetting(const QString& name, const QVariant& default_value);
void WriteSetting(const QString& name, const QVariant& value);
void WriteSetting(const QString& name, const QVariant& value, const QVariant& default_value);
public: public:
Config(); Config();