VERY experimental Nintendo Switch 2 emulator
C++
yuzu: Remove console id setting
german77d4ce7b7ad61d
diff --git a/src/yuzu/configuration/configure_system.cpp b/src/yuzu/configuration/configure_system.cppindex 9ea4c02da9..b01ffdbac5 100644--- a/src/yuzu/configuration/configure_system.cpp+++ b/src/yuzu/configuration/configure_system.cpp@@ -40,8 +40,6 @@ static bool IsValidLocale(u32 region_index, u32 language_index) {ConfigureSystem::ConfigureSystem(Core::System& system_, QWidget* parent): QWidget(parent), ui{std::make_unique<Ui::ConfigureSystem>()}, system{system_} {ui->setupUi(this);- connect(ui->button_regenerate_console_id, &QPushButton::clicked, this,- &ConfigureSystem::RefreshConsoleID);connect(ui->rng_seed_checkbox, &QCheckBox::stateChanged, this, [this](int state) {ui->rng_seed_edit->setEnabled(state == Qt::Checked);@@ -76,9 +74,6 @@ ConfigureSystem::ConfigureSystem(Core::System& system_, QWidget* parent)locale_check);connect(ui->combo_region, qOverload<int>(&QComboBox::currentIndexChanged), this, locale_check);- ui->label_console_id->setVisible(Settings::IsConfiguringGlobal());- ui->button_regenerate_console_id->setVisible(Settings::IsConfiguringGlobal());-SetupPerGameUI();SetConfiguration();@@ -202,23 +197,6 @@ void ConfigureSystem::ApplyConfiguration() {}}-void ConfigureSystem::RefreshConsoleID() {- QMessageBox::StandardButton reply;- QString warning_text = tr("This will replace your current virtual Switch with a new one. "- "Your current virtual Switch will not be recoverable. "- "This might have unexpected effects in games. This might fail, "- "if you use an outdated config savegame. Continue?");- reply = QMessageBox::critical(this, tr("Warning"), warning_text,- QMessageBox::No | QMessageBox::Yes);- if (reply == QMessageBox::No) {- return;- }-- u64 console_id{};- ui->label_console_id->setText(- tr("Console ID: 0x%1").arg(QString::number(console_id, 16).toUpper()));-}-void ConfigureSystem::SetupPerGameUI() {if (Settings::IsConfiguringGlobal()) {ui->combo_language->setEnabled(Settings::values.language_index.UsingGlobal());diff --git a/src/yuzu/configuration/configure_system.h b/src/yuzu/configuration/configure_system.hindex a7f0862581..ec28724a19 100644--- a/src/yuzu/configuration/configure_system.h+++ b/src/yuzu/configuration/configure_system.h@@ -35,8 +35,6 @@ private:void ReadSystemSettings();- void RefreshConsoleID();-void SetupPerGameUI();std::unique_ptr<Ui::ConfigureSystem> ui;diff --git a/src/yuzu/configuration/configure_system.ui b/src/yuzu/configuration/configure_system.uiindex 0459cd9242..254a441475 100644--- a/src/yuzu/configuration/configure_system.ui+++ b/src/yuzu/configuration/configure_system.ui@@ -411,7 +411,7 @@</item></widget></item>- <item row="5" column="0">+ <item row="4" column="0"><widget class="QCheckBox" name="custom_rtc_checkbox"><property name="text"><string>Custom RTC</string>@@ -425,14 +425,14 @@</property></widget></item>- <item row="6" column="0">+ <item row="5" column="0"><widget class="QCheckBox" name="rng_seed_checkbox"><property name="text"><string>RNG Seed</string></property></widget></item>- <item row="7" column="0">+ <item row="6" column="0"><widget class="QLabel" name="device_name_label"><property name="text"><string>Device Name</string>@@ -458,13 +458,6 @@</item></widget></item>- <item row="4" column="0">- <widget class="QLabel" name="label_console_id">- <property name="text">- <string>Console ID:</string>- </property>- </widget>- </item><item row="3" column="0"><widget class="QLabel" name="label_sound"><property name="text">@@ -472,7 +465,7 @@</property></widget></item>- <item row="5" column="1">+ <item row="4" column="1"><widget class="QDateTimeEdit" name="custom_rtc_edit"><property name="minimumDate"><date>@@ -483,14 +476,14 @@</property></widget></item>- <item row="7" column="1">+ <item row="6" column="1"><widget class="QLineEdit" name="device_name_edit"><property name="maxLength"><number>128</number></property></widget></item>- <item row="6" column="1">+ <item row="5" column="1"><widget class="QLineEdit" name="rng_seed_edit"><property name="sizePolicy"><sizepolicy hsizetype="Minimum" vsizetype="Fixed">@@ -511,22 +504,6 @@</property></widget></item>- <item row="4" column="1">- <widget class="QPushButton" name="button_regenerate_console_id">- <property name="sizePolicy">- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">- <horstretch>0</horstretch>- <verstretch>0</verstretch>- </sizepolicy>- </property>- <property name="layoutDirection">- <enum>Qt::RightToLeft</enum>- </property>- <property name="text">- <string>Regenerate</string>- </property>- </widget>- </item></layout></item></layout>