summaryrefslogtreecommitdiff
path: root/src/yuzu/configuration
diff options
context:
space:
mode:
Diffstat (limited to 'src/yuzu/configuration')
-rw-r--r--src/yuzu/configuration/config.cpp86
-rw-r--r--src/yuzu/configuration/configure.ui22
-rw-r--r--src/yuzu/configuration/configure_general.cpp12
-rw-r--r--src/yuzu/configuration/configure_general.ui109
-rw-r--r--src/yuzu/configuration/configure_graphics.cpp16
-rw-r--r--src/yuzu/configuration/configure_graphics.ui177
6 files changed, 60 insertions, 362 deletions
diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp
index 362f4ffe2..047e347d1 100644
--- a/src/yuzu/configuration/config.cpp
+++ b/src/yuzu/configuration/config.cpp
@@ -73,10 +73,7 @@ void Config::ReadValues() {
qt_config->endGroup();
qt_config->beginGroup("Renderer");
- 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.resolution_factor = qt_config->value("resolution_factor", 1.0).toFloat();
- Settings::values.use_vsync = qt_config->value("use_vsync", false).toBool();
Settings::values.toggle_framelimit = qt_config->value("toggle_framelimit", true).toBool();
Settings::values.bg_red = qt_config->value("bg_red", 0.0).toFloat();
@@ -84,39 +81,10 @@ void Config::ReadValues() {
Settings::values.bg_blue = qt_config->value("bg_blue", 0.0).toFloat();
qt_config->endGroup();
- qt_config->beginGroup("Layout");
- Settings::values.layout_option =
- static_cast<Settings::LayoutOption>(qt_config->value("layout_option").toInt());
- Settings::values.swap_screen = qt_config->value("swap_screen", false).toBool();
- Settings::values.custom_layout = qt_config->value("custom_layout", false).toBool();
- Settings::values.custom_top_left = qt_config->value("custom_top_left", 0).toInt();
- Settings::values.custom_top_top = qt_config->value("custom_top_top", 0).toInt();
- Settings::values.custom_top_right = qt_config->value("custom_top_right", 400).toInt();
- Settings::values.custom_top_bottom = qt_config->value("custom_top_bottom", 240).toInt();
- Settings::values.custom_bottom_left = qt_config->value("custom_bottom_left", 40).toInt();
- Settings::values.custom_bottom_top = qt_config->value("custom_bottom_top", 240).toInt();
- Settings::values.custom_bottom_right = qt_config->value("custom_bottom_right", 360).toInt();
- Settings::values.custom_bottom_bottom = qt_config->value("custom_bottom_bottom", 480).toInt();
- qt_config->endGroup();
-
- qt_config->beginGroup("Audio");
- Settings::values.sink_id = qt_config->value("output_engine", "auto").toString().toStdString();
- Settings::values.enable_audio_stretching =
- qt_config->value("enable_audio_stretching", true).toBool();
- Settings::values.audio_device_id =
- qt_config->value("output_device", "auto").toString().toStdString();
- qt_config->endGroup();
-
qt_config->beginGroup("Data Storage");
Settings::values.use_virtual_sd = qt_config->value("use_virtual_sd", true).toBool();
qt_config->endGroup();
- qt_config->beginGroup("System");
- Settings::values.is_new_3ds = qt_config->value("is_new_3ds", false).toBool();
- Settings::values.region_value =
- qt_config->value("region_value", Settings::REGION_VALUE_AUTO_SELECT).toInt();
- qt_config->endGroup();
-
qt_config->beginGroup("Miscellaneous");
Settings::values.log_filter = qt_config->value("log_filter", "*:Info").toString().toStdString();
qt_config->endGroup();
@@ -126,23 +94,7 @@ void Config::ReadValues() {
Settings::values.gdbstub_port = qt_config->value("gdbstub_port", 24689).toInt();
qt_config->endGroup();
- qt_config->beginGroup("WebService");
- Settings::values.enable_telemetry = qt_config->value("enable_telemetry", true).toBool();
- Settings::values.telemetry_endpoint_url =
- qt_config->value("telemetry_endpoint_url", "https://services.citra-emu.org/api/telemetry")
- .toString()
- .toStdString();
- Settings::values.verify_endpoint_url =
- qt_config->value("verify_endpoint_url", "https://services.citra-emu.org/api/profile")
- .toString()
- .toStdString();
- Settings::values.citra_username = qt_config->value("citra_username").toString().toStdString();
- Settings::values.citra_token = qt_config->value("citra_token").toString().toStdString();
- qt_config->endGroup();
-
qt_config->beginGroup("UI");
- UISettings::values.theme = qt_config->value("theme", UISettings::themes[0].second).toString();
-
qt_config->beginGroup("UILayout");
UISettings::values.geometry = qt_config->value("geometry").toByteArray();
UISettings::values.state = qt_config->value("state").toByteArray();
@@ -213,10 +165,7 @@ void Config::SaveValues() {
qt_config->endGroup();
qt_config->beginGroup("Renderer");
- 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("resolution_factor", (double)Settings::values.resolution_factor);
- qt_config->setValue("use_vsync", Settings::values.use_vsync);
qt_config->setValue("toggle_framelimit", Settings::values.toggle_framelimit);
// Cast to double because Qt's written float values are not human-readable
@@ -225,35 +174,10 @@ void Config::SaveValues() {
qt_config->setValue("bg_blue", (double)Settings::values.bg_blue);
qt_config->endGroup();
- qt_config->beginGroup("Layout");
- qt_config->setValue("layout_option", static_cast<int>(Settings::values.layout_option));
- qt_config->setValue("swap_screen", Settings::values.swap_screen);
- qt_config->setValue("custom_layout", Settings::values.custom_layout);
- qt_config->setValue("custom_top_left", Settings::values.custom_top_left);
- qt_config->setValue("custom_top_top", Settings::values.custom_top_top);
- qt_config->setValue("custom_top_right", Settings::values.custom_top_right);
- qt_config->setValue("custom_top_bottom", Settings::values.custom_top_bottom);
- qt_config->setValue("custom_bottom_left", Settings::values.custom_bottom_left);
- qt_config->setValue("custom_bottom_top", Settings::values.custom_bottom_top);
- qt_config->setValue("custom_bottom_right", Settings::values.custom_bottom_right);
- qt_config->setValue("custom_bottom_bottom", Settings::values.custom_bottom_bottom);
- qt_config->endGroup();
-
- qt_config->beginGroup("Audio");
- qt_config->setValue("output_engine", QString::fromStdString(Settings::values.sink_id));
- qt_config->setValue("enable_audio_stretching", Settings::values.enable_audio_stretching);
- qt_config->setValue("output_device", QString::fromStdString(Settings::values.audio_device_id));
- qt_config->endGroup();
-
qt_config->beginGroup("Data Storage");
qt_config->setValue("use_virtual_sd", Settings::values.use_virtual_sd);
qt_config->endGroup();
- qt_config->beginGroup("System");
- qt_config->setValue("is_new_3ds", Settings::values.is_new_3ds);
- qt_config->setValue("region_value", Settings::values.region_value);
- qt_config->endGroup();
-
qt_config->beginGroup("Miscellaneous");
qt_config->setValue("log_filter", QString::fromStdString(Settings::values.log_filter));
qt_config->endGroup();
@@ -263,16 +187,6 @@ void Config::SaveValues() {
qt_config->setValue("gdbstub_port", Settings::values.gdbstub_port);
qt_config->endGroup();
- qt_config->beginGroup("WebService");
- qt_config->setValue("enable_telemetry", Settings::values.enable_telemetry);
- qt_config->setValue("telemetry_endpoint_url",
- QString::fromStdString(Settings::values.telemetry_endpoint_url));
- qt_config->setValue("verify_endpoint_url",
- QString::fromStdString(Settings::values.verify_endpoint_url));
- qt_config->setValue("citra_username", QString::fromStdString(Settings::values.citra_username));
- qt_config->setValue("citra_token", QString::fromStdString(Settings::values.citra_token));
- qt_config->endGroup();
-
qt_config->beginGroup("UI");
qt_config->setValue("theme", UISettings::values.theme);
diff --git a/src/yuzu/configuration/configure.ui b/src/yuzu/configuration/configure.ui
index 6abd1917e..8b92a907c 100644
--- a/src/yuzu/configuration/configure.ui
+++ b/src/yuzu/configuration/configure.ui
@@ -39,21 +39,11 @@
<string>Graphics</string>
</attribute>
</widget>
- <widget class="ConfigureAudio" name="audioTab">
- <attribute name="title">
- <string>Audio</string>
- </attribute>
- </widget>
<widget class="ConfigureDebug" name="debugTab">
<attribute name="title">
<string>Debug</string>
</attribute>
</widget>
- <widget class="ConfigureWeb" name="webTab">
- <attribute name="title">
- <string>Web</string>
- </attribute>
- </widget>
</widget>
</item>
<item>
@@ -79,12 +69,6 @@
<container>1</container>
</customwidget>
<customwidget>
- <class>ConfigureAudio</class>
- <extends>QWidget</extends>
- <header>configuration/configure_audio.h</header>
- <container>1</container>
- </customwidget>
- <customwidget>
<class>ConfigureDebug</class>
<extends>QWidget</extends>
<header>configuration/configure_debug.h</header>
@@ -102,12 +86,6 @@
<header>configuration/configure_graphics.h</header>
<container>1</container>
</customwidget>
- <customwidget>
- <class>ConfigureWeb</class>
- <extends>QWidget</extends>
- <header>configuration/configure_web.h</header>
- <container>1</container>
- </customwidget>
</customwidgets>
<resources/>
<connections>
diff --git a/src/yuzu/configuration/configure_general.cpp b/src/yuzu/configuration/configure_general.cpp
index 4a1002c17..92fd6ab02 100644
--- a/src/yuzu/configuration/configure_general.cpp
+++ b/src/yuzu/configuration/configure_general.cpp
@@ -13,10 +13,6 @@ ConfigureGeneral::ConfigureGeneral(QWidget* parent)
ui->setupUi(this);
- for (auto theme : UISettings::themes) {
- ui->theme_combobox->addItem(theme.first, theme.second);
- }
-
this->setConfiguration();
ui->cpu_core_combobox->setEnabled(!Core::System::GetInstance().IsPoweredOn());
@@ -27,20 +23,12 @@ ConfigureGeneral::~ConfigureGeneral() {}
void ConfigureGeneral::setConfiguration() {
ui->toggle_deepscan->setChecked(UISettings::values.gamedir_deepscan);
ui->toggle_check_exit->setChecked(UISettings::values.confirm_before_closing);
-
- // The first item is "auto-select" with actual value -1, so plus one here will do the trick
- ui->region_combobox->setCurrentIndex(Settings::values.region_value + 1);
-
- ui->theme_combobox->setCurrentIndex(ui->theme_combobox->findData(UISettings::values.theme));
ui->cpu_core_combobox->setCurrentIndex(static_cast<int>(Settings::values.cpu_core));
}
void ConfigureGeneral::applyConfiguration() {
UISettings::values.gamedir_deepscan = ui->toggle_deepscan->isChecked();
UISettings::values.confirm_before_closing = ui->toggle_check_exit->isChecked();
- UISettings::values.theme =
- ui->theme_combobox->itemData(ui->theme_combobox->currentIndex()).toString();
- Settings::values.region_value = ui->region_combobox->currentIndex() - 1;
Settings::values.cpu_core =
static_cast<Settings::CpuCore>(ui->cpu_core_combobox->currentIndex());
Settings::Apply();
diff --git a/src/yuzu/configuration/configure_general.ui b/src/yuzu/configuration/configure_general.ui
index e88c37936..573c4cb0e 100644
--- a/src/yuzu/configuration/configure_general.ui
+++ b/src/yuzu/configuration/configure_general.ui
@@ -71,102 +71,6 @@
</widget>
</item>
<item>
- <widget class="QGroupBox" name="groupBox_4">
- <property name="title">
- <string>Emulation</string>
- </property>
- <layout class="QHBoxLayout" name="horizontalLayout_5">
- <item>
- <layout class="QVBoxLayout" name="verticalLayout_6">
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_6">
- <item>
- <widget class="QLabel" name="label">
- <property name="text">
- <string>Region:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QComboBox" name="region_combobox">
- <item>
- <property name="text">
- <string>Auto-select</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string notr="true">JPN</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string notr="true">USA</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string notr="true">EUR</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string notr="true">AUS</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string notr="true">CHN</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string notr="true">KOR</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string notr="true">TWN</string>
- </property>
- </item>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <widget class="QGroupBox" name="theme_group_box">
- <property name="title">
- <string>Theme</string>
- </property>
- <layout class="QHBoxLayout" name="theme_qhbox_layout">
- <item>
- <layout class="QVBoxLayout" name="theme_qvbox_layout">
- <item>
- <layout class="QHBoxLayout" name="theme_qhbox_layout_2">
- <item>
- <widget class="QLabel" name="theme_label">
- <property name="text">
- <string>Theme:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QComboBox" name="theme_combobox">
- </widget>
- </item>
- </layout>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
- </item>
- <item>
<widget class="QGroupBox" name="groupBox_3">
<property name="title">
<string>Hotkeys</string>
@@ -182,6 +86,19 @@
</layout>
</widget>
</item>
+ <item>
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
</layout>
</item>
</layout>
diff --git a/src/yuzu/configuration/configure_graphics.cpp b/src/yuzu/configuration/configure_graphics.cpp
index 379e13301..5f91d5492 100644
--- a/src/yuzu/configuration/configure_graphics.cpp
+++ b/src/yuzu/configuration/configure_graphics.cpp
@@ -13,10 +13,6 @@ ConfigureGraphics::ConfigureGraphics(QWidget* parent)
ui->setupUi(this);
this->setConfiguration();
-
- ui->toggle_vsync->setEnabled(!Core::System::GetInstance().IsPoweredOn());
-
- ui->layoutBox->setEnabled(!Settings::values.custom_layout);
}
ConfigureGraphics::~ConfigureGraphics() {}
@@ -91,26 +87,14 @@ Resolution FromResolutionFactor(float factor) {
}
void ConfigureGraphics::setConfiguration() {
- ui->toggle_hw_renderer->setChecked(Settings::values.use_hw_renderer);
- ui->resolution_factor_combobox->setEnabled(Settings::values.use_hw_renderer);
- ui->toggle_shader_jit->setChecked(Settings::values.use_shader_jit);
ui->resolution_factor_combobox->setCurrentIndex(
static_cast<int>(FromResolutionFactor(Settings::values.resolution_factor)));
- ui->toggle_vsync->setChecked(Settings::values.use_vsync);
ui->toggle_framelimit->setChecked(Settings::values.toggle_framelimit);
- ui->layout_combobox->setCurrentIndex(static_cast<int>(Settings::values.layout_option));
- ui->swap_screen->setChecked(Settings::values.swap_screen);
}
void ConfigureGraphics::applyConfiguration() {
- Settings::values.use_hw_renderer = ui->toggle_hw_renderer->isChecked();
- Settings::values.use_shader_jit = ui->toggle_shader_jit->isChecked();
Settings::values.resolution_factor =
ToResolutionFactor(static_cast<Resolution>(ui->resolution_factor_combobox->currentIndex()));
- Settings::values.use_vsync = ui->toggle_vsync->isChecked();
Settings::values.toggle_framelimit = ui->toggle_framelimit->isChecked();
- Settings::values.layout_option =
- static_cast<Settings::LayoutOption>(ui->layout_combobox->currentIndex());
- Settings::values.swap_screen = ui->swap_screen->isChecked();
Settings::Apply();
}
diff --git a/src/yuzu/configuration/configure_graphics.ui b/src/yuzu/configuration/configure_graphics.ui
index 5667b14b6..489156805 100644
--- a/src/yuzu/configuration/configure_graphics.ui
+++ b/src/yuzu/configuration/configure_graphics.ui
@@ -23,27 +23,6 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
- <widget class="QCheckBox" name="toggle_hw_renderer">
- <property name="text">
- <string>Enable hardware renderer</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="toggle_shader_jit">
- <property name="text">
- <string>Enable shader JIT</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="toggle_vsync">
- <property name="text">
- <string>Enable V-Sync</string>
- </property>
- </widget>
- </item>
- <item>
<widget class="QCheckBox" name="toggle_framelimit">
<property name="text">
<string>Limit framerate</string>
@@ -51,134 +30,79 @@
</widget>
</item>
<item>
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <widget class="QLabel" name="label">
- <property name="text">
- <string>Internal Resolution:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QComboBox" name="resolution_factor_combobox">
- <item>
- <property name="text">
- <string>Auto (Window Size)</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Native (400x240)</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>2x Native (800x480)</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>3x Native (1200x720)</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>4x Native (1600x960)</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>5x Native (2000x1200)</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>6x Native (2400x1440)</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>7x Native (2800x1680)</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>8x Native (3200x1920)</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>9x Native (3600x2160)</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>10x Native (4000x2400)</string>
- </property>
- </item>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <widget class="QGroupBox" name="layoutBox">
- <property name="title">
- <string>Layout</string>
- </property>
- <layout class="QHBoxLayout" name="horizontalLayout_3">
- <item>
- <layout class="QVBoxLayout" name="verticalLayout_4">
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_4">
+ <layout class="QHBoxLayout" name="horizontalLayout">
<item>
- <widget class="QLabel" name="label1">
+ <widget class="QLabel" name="label">
<property name="text">
- <string>Screen Layout:</string>
+ <string>Internal Resolution:</string>
</property>
</widget>
</item>
<item>
- <widget class="QComboBox" name="layout_combobox">
+ <widget class="QComboBox" name="resolution_factor_combobox">
+ <item>
+ <property name="text">
+ <string>Auto (Window Size)</string>
+ </property>
+ </item>
<item>
<property name="text">
- <string>Default</string>
+ <string>Native (400x240)</string>
</property>
</item>
<item>
<property name="text">
- <string>Single Screen</string>
+ <string>2x Native (800x480)</string>
</property>
</item>
<item>
<property name="text">
- <string>Large Screen</string>
+ <string>3x Native (1200x720)</string>
</property>
</item>
<item>
<property name="text">
- <string>Side by Side</string>
+ <string>4x Native (1600x960)</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>5x Native (2000x1200)</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>6x Native (2400x1440)</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>7x Native (2800x1680)</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>8x Native (3200x1920)</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>9x Native (3600x2160)</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>10x Native (4000x2400)</string>
</property>
</item>
</widget>
</item>
</layout>
</item>
- <item>
- <widget class="QCheckBox" name="swap_screen">
- <property name="text">
- <string>Swap Screens</string>
- </property>
- </widget>
- </item>
</layout>
- </item>
- </layout>
- </widget>
+ </widget>
+ </item>
+ </layout>
</item>
<item>
<spacer name="verticalSpacer">
@@ -196,12 +120,5 @@
</layout>
</widget>
<resources/>
- <connections>
- <connection>
- <sender>toggle_hw_renderer</sender>
- <signal>toggled(bool)</signal>
- <receiver>resolution_factor_combobox</receiver>
- <slot>setEnabled(bool)</slot>
- </connection>
- </connections>
+ <connections/>
</ui>
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-27 05:35:10 +0000