From e376a985e435b15ef6518003a2810acdfbc4e0b6 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Tue, 31 Aug 2021 09:15:03 +0200 Subject: [PATCH] Revert "DolphinQt: Minor consistency fixes for the Settings window" This reverts commit 9d45bac17538bf0e64cfad025bd82109c971f9d6. --- Source/Core/DolphinQt/CMakeLists.txt | 2 - Source/Core/DolphinQt/DolphinQt.vcxproj | 2 - .../Core/DolphinQt/Settings/AdvancedPane.cpp | 27 ++--- Source/Core/DolphinQt/Settings/AudioPane.cpp | 15 ++- .../BroadbandAdapterSettingsDialog.cpp | 112 ------------------ .../Settings/BroadbandAdapterSettingsDialog.h | 28 ----- .../Core/DolphinQt/Settings/GameCubePane.cpp | 43 ++++--- .../Core/DolphinQt/Settings/GeneralPane.cpp | 34 +++--- .../USBDeviceAddToWhitelistDialog.cpp | 19 ++- Source/Core/DolphinQt/Settings/WiiPane.cpp | 2 +- 10 files changed, 81 insertions(+), 203 deletions(-) delete mode 100644 Source/Core/DolphinQt/Settings/BroadbandAdapterSettingsDialog.cpp delete mode 100644 Source/Core/DolphinQt/Settings/BroadbandAdapterSettingsDialog.h diff --git a/Source/Core/DolphinQt/CMakeLists.txt b/Source/Core/DolphinQt/CMakeLists.txt index 93b6f73257..439d7296a7 100644 --- a/Source/Core/DolphinQt/CMakeLists.txt +++ b/Source/Core/DolphinQt/CMakeLists.txt @@ -287,8 +287,6 @@ add_executable(dolphin-emu Settings/AdvancedPane.h Settings/AudioPane.cpp Settings/AudioPane.h - Settings/BroadbandAdapterSettingsDialog.cpp - Settings/BroadbandAdapterSettingsDialog.h Settings/GameCubePane.cpp Settings/GameCubePane.h Settings/GeneralPane.cpp diff --git a/Source/Core/DolphinQt/DolphinQt.vcxproj b/Source/Core/DolphinQt/DolphinQt.vcxproj index 028980080b..63c2bfdca8 100644 --- a/Source/Core/DolphinQt/DolphinQt.vcxproj +++ b/Source/Core/DolphinQt/DolphinQt.vcxproj @@ -179,7 +179,6 @@ - @@ -347,7 +346,6 @@ - diff --git a/Source/Core/DolphinQt/Settings/AdvancedPane.cpp b/Source/Core/DolphinQt/Settings/AdvancedPane.cpp index e38533ee94..34bb0491dc 100644 --- a/Source/Core/DolphinQt/Settings/AdvancedPane.cpp +++ b/Source/Core/DolphinQt/Settings/AdvancedPane.cpp @@ -46,27 +46,26 @@ void AdvancedPane::CreateLayout() auto* main_layout = new QVBoxLayout(); setLayout(main_layout); - auto* cpu_options_group = new QGroupBox(tr("CPU Options")); - auto* cpu_options_group_layout = new QVBoxLayout(); - cpu_options_group->setLayout(cpu_options_group_layout); - main_layout->addWidget(cpu_options_group); - - auto* cpu_emulation_engine_layout = new QFormLayout; - cpu_emulation_engine_layout->setFormAlignment(Qt::AlignLeft | Qt::AlignTop); - cpu_emulation_engine_layout->setFieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow); - cpu_options_group_layout->addLayout(cpu_emulation_engine_layout); + auto* cpu_options = new QGroupBox(tr("CPU Options")); + auto* cpu_options_layout = new QVBoxLayout(); + cpu_options->setLayout(cpu_options_layout); + main_layout->addWidget(cpu_options); + QGridLayout* cpu_emulation_layout = new QGridLayout(); + QLabel* cpu_emulation_engine_label = new QLabel(tr("CPU Emulation Engine:")); m_cpu_emulation_engine_combobox = new QComboBox(this); - cpu_emulation_engine_layout->addRow(tr("CPU Emulation Engine:"), m_cpu_emulation_engine_combobox); for (PowerPC::CPUCore cpu_core : PowerPC::AvailableCPUCores()) { m_cpu_emulation_engine_combobox->addItem(tr(CPU_CORE_NAMES.at(cpu_core))); } + cpu_emulation_layout->addWidget(cpu_emulation_engine_label, 0, 0); + cpu_emulation_layout->addWidget(m_cpu_emulation_engine_combobox, 0, 1, Qt::AlignLeft); + cpu_options_layout->addLayout(cpu_emulation_layout); m_enable_mmu_checkbox = new QCheckBox(tr("Enable MMU")); m_enable_mmu_checkbox->setToolTip(tr( "Enables the Memory Management Unit, needed for some games. (ON = Compatible, OFF = Fast)")); - cpu_options_group_layout->addWidget(m_enable_mmu_checkbox); + cpu_options_layout->addWidget(m_enable_mmu_checkbox); auto* clock_override = new QGroupBox(tr("Clock Override")); auto* clock_override_layout = new QVBoxLayout(); @@ -266,7 +265,7 @@ void AdvancedPane::Update() int core_clock = SystemTimers::GetTicksPerSecond() / std::pow(10, 6); int percent = static_cast(std::round(SConfig::GetInstance().m_OCFactor * 100.f)); int clock = static_cast(std::round(SConfig::GetInstance().m_OCFactor * core_clock)); - return tr("%1% (%2 MHz)").arg(QString::number(percent), QString::number(clock)); + return tr("%1 % (%2 MHz)").arg(QString::number(percent), QString::number(clock)); }()); m_ram_override_checkbox->setEnabled(!running); @@ -282,7 +281,7 @@ void AdvancedPane::Update() m_mem1_override_slider_label->setText([] { const u32 mem1_size = Config::Get(Config::MAIN_MEM1_SIZE) / 0x100000; - return tr("%1 MB (MEM1)").arg(QString::number(mem1_size)); + return tr("%1MB (MEM1)").arg(QString::number(mem1_size)); }()); m_mem2_override_slider->setEnabled(enable_ram_override_widgets && !running); @@ -296,7 +295,7 @@ void AdvancedPane::Update() m_mem2_override_slider_label->setText([] { const u32 mem2_size = Config::Get(Config::MAIN_MEM2_SIZE) / 0x100000; - return tr("%1 MB (MEM2)").arg(QString::number(mem2_size)); + return tr("%1MB (MEM2)").arg(QString::number(mem2_size)); }()); m_custom_rtc_checkbox->setEnabled(!running); diff --git a/Source/Core/DolphinQt/Settings/AudioPane.cpp b/Source/Core/DolphinQt/Settings/AudioPane.cpp index 723a1cf697..07160f347c 100644 --- a/Source/Core/DolphinQt/Settings/AudioPane.cpp +++ b/Source/Core/DolphinQt/Settings/AudioPane.cpp @@ -87,9 +87,8 @@ void AudioPane::CreateWidgets() m_latency_spin = new QSpinBox(); m_latency_spin->setMinimum(0); m_latency_spin->setMaximum(200); - m_latency_spin->setToolTip( - tr("Sets the latency in milliseconds. Higher values may reduce audio " - "crackling. Certain backends only.")); + m_latency_spin->setToolTip(tr("Sets the latency (in ms). Higher values may reduce audio " + "crackling. Certain backends only.")); } m_dolby_pro_logic->setToolTip( @@ -402,7 +401,7 @@ void AudioPane::OnEmulationStateChanged(bool running) void AudioPane::OnVolumeChanged(int volume) { m_volume_slider->setValue(volume); - m_volume_indicator->setText(tr("%1%").arg(volume)); + m_volume_indicator->setText(tr("%1 %").arg(volume)); } void AudioPane::CheckNeedForLatencyControl() @@ -432,13 +431,13 @@ QString AudioPane::GetDPL2ApproximateLatencyLabel(AudioCommon::DPL2Quality value switch (value) { case AudioCommon::DPL2Quality::Lowest: - return tr("Latency: ~10 ms"); + return tr("Latency: ~10ms"); case AudioCommon::DPL2Quality::Low: - return tr("Latency: ~20 ms"); + return tr("Latency: ~20ms"); case AudioCommon::DPL2Quality::Highest: - return tr("Latency: ~80 ms"); + return tr("Latency: ~80ms"); default: - return tr("Latency: ~40 ms"); + return tr("Latency: ~40ms"); } } diff --git a/Source/Core/DolphinQt/Settings/BroadbandAdapterSettingsDialog.cpp b/Source/Core/DolphinQt/Settings/BroadbandAdapterSettingsDialog.cpp deleted file mode 100644 index c458acac74..0000000000 --- a/Source/Core/DolphinQt/Settings/BroadbandAdapterSettingsDialog.cpp +++ /dev/null @@ -1,112 +0,0 @@ -// Copyright 2021 Dolphin Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "DolphinQt/Settings/BroadbandAdapterSettingsDialog.h" - -#include -#include - -#include -#include -#include -#include -#include - -#include "Common/StringUtil.h" -#include "Core/ConfigManager.h" -#include "DolphinQt/QtUtils/ModalMessageBox.h" - -BroadbandAdapterSettingsDialog::BroadbandAdapterSettingsDialog(QWidget* parent, Type bba_type) - : QDialog(parent) -{ - m_bba_type = bba_type; - InitControls(); -} - -void BroadbandAdapterSettingsDialog::InitControls() -{ - QLabel* address_label = nullptr; - QLabel* description = nullptr; - QString address_placeholder; - QString current_address; - QString window_title; - - switch (m_bba_type) - { - case Type::Ethernet: - // i18n: MAC stands for Media Access Control. A MAC address uniquely identifies a network - // interface (physical) like a serial number. "MAC" should be kept in translations. - address_label = new QLabel(tr("Enter new Broadband Adapter MAC address:")); - address_placeholder = QString::fromStdString("aa:bb:cc:dd:ee:ff"); - current_address = QString::fromStdString(SConfig::GetInstance().m_bba_mac); - description = new QLabel(tr("For setup instructions, refer to this page.")); - - // i18n: MAC stands for Media Access Control. A MAC address uniquely identifies a network - // interface (physical) like a serial number. "MAC" should be kept in translations. - window_title = tr("Broadband Adapter MAC Address"); - break; - - case Type::XLinkKai: - address_label = new QLabel(tr("Enter IP address of device running the XLink Kai Client:")); - address_placeholder = QString::fromStdString("127.0.0.1"); - current_address = QString::fromStdString(SConfig::GetInstance().m_bba_xlink_ip); - description = - new QLabel(tr("For setup instructions, refer to this page.")); - window_title = tr("XLink Kai BBA Destination Address"); - break; - } - - setWindowTitle(window_title); - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); - - m_address_input = new QLineEdit(current_address); - m_address_input->setPlaceholderText(address_placeholder); - - auto buttonbox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel); - connect(buttonbox, &QDialogButtonBox::accepted, this, - &BroadbandAdapterSettingsDialog::SaveAddress); - connect(buttonbox, &QDialogButtonBox::rejected, this, &BroadbandAdapterSettingsDialog::reject); - - description->setTextFormat(Qt::RichText); - description->setWordWrap(true); - description->setTextInteractionFlags(Qt::TextBrowserInteraction); - description->setOpenExternalLinks(true); - - auto* main_layout = new QVBoxLayout(); - main_layout->addWidget(address_label); - main_layout->addWidget(m_address_input); - main_layout->addWidget(description); - main_layout->addWidget(buttonbox); - - setLayout(main_layout); -} - -void BroadbandAdapterSettingsDialog::SaveAddress() -{ - const std::string bba_new_address(StripSpaces(m_address_input->text().toStdString())); - - switch (m_bba_type) - { - case Type::Ethernet: - if (!std::regex_match(bba_new_address, std::regex("([0-9A-Fa-f]{2}:){5}([0-9A-Fa-f]{2})"))) - { - ModalMessageBox::critical( - this, tr("Broadband Adapter Error"), - // i18n: MAC stands for Media Access Control. A MAC address uniquely identifies a network - // interface (physical) like a serial number. "MAC" should be kept in translations. - tr("The entered MAC address is invalid.")); - return; - } - SConfig::GetInstance().m_bba_mac = bba_new_address; - break; - - case Type::XLinkKai: - SConfig::GetInstance().m_bba_xlink_ip = bba_new_address; - break; - } - - accept(); -} diff --git a/Source/Core/DolphinQt/Settings/BroadbandAdapterSettingsDialog.h b/Source/Core/DolphinQt/Settings/BroadbandAdapterSettingsDialog.h deleted file mode 100644 index 0d532e2da0..0000000000 --- a/Source/Core/DolphinQt/Settings/BroadbandAdapterSettingsDialog.h +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright 2021 Dolphin Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include - -class QLineEdit; - -class BroadbandAdapterSettingsDialog final : public QDialog -{ - Q_OBJECT -public: - enum class Type - { - Ethernet, - XLinkKai, - }; - - explicit BroadbandAdapterSettingsDialog(QWidget* target, Type bba_type); - -private: - QLineEdit* m_address_input; - Type m_bba_type; - - void InitControls(); - void SaveAddress(); -}; diff --git a/Source/Core/DolphinQt/Settings/GameCubePane.cpp b/Source/Core/DolphinQt/Settings/GameCubePane.cpp index 22ae9bb14a..8f9f57c052 100644 --- a/Source/Core/DolphinQt/Settings/GameCubePane.cpp +++ b/Source/Core/DolphinQt/Settings/GameCubePane.cpp @@ -7,7 +7,6 @@ #include #include #include -#include #include #include #include @@ -34,7 +33,6 @@ #include "DolphinQt/GCMemcardManager.h" #include "DolphinQt/QtUtils/ModalMessageBox.h" #include "DolphinQt/Settings.h" -#include "DolphinQt/Settings/BroadbandAdapterSettingsDialog.h" enum { @@ -57,20 +55,12 @@ void GameCubePane::CreateWidgets() // IPL Settings QGroupBox* ipl_box = new QGroupBox(tr("IPL Settings"), this); - QVBoxLayout* ipl_box_layout = new QVBoxLayout(ipl_box); - ipl_box->setLayout(ipl_box_layout); + QGridLayout* ipl_layout = new QGridLayout(ipl_box); + ipl_box->setLayout(ipl_layout); m_skip_main_menu = new QCheckBox(tr("Skip Main Menu"), ipl_box); - ipl_box_layout->addWidget(m_skip_main_menu); - - QFormLayout* ipl_language_layout = new QFormLayout; - ipl_language_layout->setFormAlignment(Qt::AlignLeft | Qt::AlignTop); - ipl_language_layout->setFieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow); - ipl_box_layout->addLayout(ipl_language_layout); - m_language_combo = new QComboBox(ipl_box); m_language_combo->setCurrentIndex(-1); - ipl_language_layout->addRow(tr("System Language:"), m_language_combo); // Add languages for (const auto& entry : {std::make_pair(tr("English"), 0), std::make_pair(tr("German"), 1), @@ -80,6 +70,10 @@ void GameCubePane::CreateWidgets() m_language_combo->addItem(entry.first, entry.second); } + ipl_layout->addWidget(m_skip_main_menu, 0, 0); + ipl_layout->addWidget(new QLabel(tr("System Language:")), 1, 0); + ipl_layout->addWidget(m_language_combo, 1, 1); + // Device Settings QGroupBox* device_box = new QGroupBox(tr("Device Settings"), this); QGridLayout* device_layout = new QGridLayout(device_box); @@ -88,12 +82,12 @@ void GameCubePane::CreateWidgets() for (int i = 0; i < SLOT_COUNT; i++) { m_slot_combos[i] = new QComboBox(device_box); - m_slot_combos[i]->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed); m_slot_buttons[i] = new QPushButton(tr("..."), device_box); m_slot_buttons[i]->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); } // Add slot devices + for (const auto& entry : {std::make_pair(tr(""), ExpansionInterface::EXIDEVICE_NONE), std::make_pair(tr("Dummy"), ExpansionInterface::EXIDEVICE_DUMMY), @@ -108,6 +102,7 @@ void GameCubePane::CreateWidgets() } // Add SP1 devices + std::vector> sp1Entries{ std::make_pair(tr(""), ExpansionInterface::EXIDEVICE_NONE), std::make_pair(tr("Dummy"), ExpansionInterface::EXIDEVICE_DUMMY), @@ -280,12 +275,26 @@ void GameCubePane::OnConfigPressed(int slot) return; case ExpansionInterface::EXIDEVICE_ETH: { - BroadbandAdapterSettingsDialog(this, BroadbandAdapterSettingsDialog::Type::Ethernet).exec(); + bool ok; + const auto new_mac = QInputDialog::getText( + // i18n: MAC stands for Media Access Control. A MAC address uniquely identifies a network + // interface (physical) like a serial number. "MAC" should be kept in translations. + this, tr("Broadband Adapter MAC address"), tr("Enter new Broadband Adapter MAC address:"), + QLineEdit::Normal, QString::fromStdString(SConfig::GetInstance().m_bba_mac), &ok); + if (ok) + SConfig::GetInstance().m_bba_mac = new_mac.toStdString(); return; } case ExpansionInterface::EXIDEVICE_ETHXLINK: { - BroadbandAdapterSettingsDialog(this, BroadbandAdapterSettingsDialog::Type::XLinkKai).exec(); + bool ok; + const auto new_dest = QInputDialog::getText( + this, tr("Broadband Adapter (XLink Kai) Destination Address"), + tr("Enter IP address of device running the XLink Kai Client.\nFor more information see" + " https://www.teamxlink.co.uk/wiki/Dolphin"), + QLineEdit::Normal, QString::fromStdString(SConfig::GetInstance().m_bba_xlink_ip), &ok); + if (ok) + SConfig::GetInstance().m_bba_xlink_ip = new_dest.toStdString(); return; } default: @@ -451,9 +460,11 @@ void GameCubePane::LoadSettings() } m_skip_main_menu->setEnabled(have_menu); - m_skip_main_menu->setToolTip(have_menu ? QString{} : tr("Put IPL ROMs in User/GC/.")); + m_skip_main_menu->setToolTip(have_menu ? QString{} : + tr("Put Main Menu roms in User/GC/{region}.")); // Device Settings + for (int i = 0; i < SLOT_COUNT; i++) { QSignalBlocker blocker(m_slot_combos[i]); diff --git a/Source/Core/DolphinQt/Settings/GeneralPane.cpp b/Source/Core/DolphinQt/Settings/GeneralPane.cpp index b94bc63fcd..5aa1c4d980 100644 --- a/Source/Core/DolphinQt/Settings/GeneralPane.cpp +++ b/Source/Core/DolphinQt/Settings/GeneralPane.cpp @@ -175,16 +175,16 @@ void GeneralPane::CreateBasic() void GeneralPane::CreateAutoUpdate() { auto* auto_update_group = new QGroupBox(tr("Auto Update Settings")); - auto* auto_update_group_layout = new QFormLayout; - auto_update_group->setLayout(auto_update_group_layout); + auto* layout = new QFormLayout; + auto_update_group->setLayout(layout); m_main_layout->addWidget(auto_update_group); - auto_update_group_layout->setFormAlignment(Qt::AlignLeft | Qt::AlignTop); - auto_update_group_layout->setFieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow); + layout->setFormAlignment(Qt::AlignLeft | Qt::AlignTop); + layout->setFieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow); m_combobox_update_track = new QComboBox(this); - auto_update_group_layout->addRow(tr("&Auto Update:"), m_combobox_update_track); + layout->addRow(tr("&Auto Update:"), m_combobox_update_track); for (const QString& option : {tr("Don't Update"), tr("Stable (once a year)"), tr("Beta (once a month)"), tr("Dev (multiple times a day)")}) @@ -194,26 +194,28 @@ void GeneralPane::CreateAutoUpdate() void GeneralPane::CreateFallbackRegion() { auto* fallback_region_group = new QGroupBox(tr("Fallback Region")); - auto* fallback_region_group_layout = new QVBoxLayout; - fallback_region_group->setLayout(fallback_region_group_layout); + auto* layout = new QVBoxLayout; + fallback_region_group->setLayout(layout); m_main_layout->addWidget(fallback_region_group); - auto* fallback_region_dropdown_layout = new QFormLayout; - fallback_region_dropdown_layout->setFormAlignment(Qt::AlignLeft | Qt::AlignTop); - fallback_region_dropdown_layout->setFieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow); - fallback_region_group_layout->addLayout(fallback_region_dropdown_layout); - m_combobox_fallback_region = new QComboBox(this); - fallback_region_dropdown_layout->addRow(tr("Fallback Region:"), m_combobox_fallback_region); - for (const QString& option : {tr("NTSC-J"), tr("NTSC-U"), tr("PAL"), tr("NTSC-K")}) - m_combobox_fallback_region->addItem(option); + auto* form_widget = new QWidget; + auto* form_layout = new QFormLayout; + form_widget->setLayout(form_layout); + form_layout->setAlignment(Qt::AlignLeft | Qt::AlignTop); + form_layout->setFieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow); + form_layout->addRow(tr("Fallback Region:"), m_combobox_fallback_region); + layout->addWidget(form_widget); auto* fallback_region_description = new QLabel(tr("Dolphin will use this for titles whose region cannot be determined " "automatically.")); fallback_region_description->setWordWrap(true); - fallback_region_group_layout->addWidget(fallback_region_description); + layout->addWidget(fallback_region_description); + + for (const QString& option : {tr("NTSC-J"), tr("NTSC-U"), tr("PAL"), tr("NTSC-K")}) + m_combobox_fallback_region->addItem(option); } #if defined(USE_ANALYTICS) && USE_ANALYTICS diff --git a/Source/Core/DolphinQt/Settings/USBDeviceAddToWhitelistDialog.cpp b/Source/Core/DolphinQt/Settings/USBDeviceAddToWhitelistDialog.cpp index 3fab4f4834..5d6280d142 100644 --- a/Source/Core/DolphinQt/Settings/USBDeviceAddToWhitelistDialog.cpp +++ b/Source/Core/DolphinQt/Settings/USBDeviceAddToWhitelistDialog.cpp @@ -128,13 +128,25 @@ void USBDeviceAddToWhitelistDialog::AddUSBDeviceToWhitelist() if (!IsValidUSBIDString(vid_string)) { // i18n: Here, VID means Vendor ID (for a USB device). - ModalMessageBox::critical(this, tr("USB Whitelist Error"), tr("The entered VID is invalid.")); + ModalMessageBox vid_warning_box(this); + vid_warning_box.setIcon(QMessageBox::Warning); + vid_warning_box.setWindowTitle(tr("USB Whitelist Error")); + // i18n: Here, VID means Vendor ID (for a USB device). + vid_warning_box.setText(tr("The entered VID is invalid.")); + vid_warning_box.setStandardButtons(QMessageBox::Ok); + vid_warning_box.exec(); return; } if (!IsValidUSBIDString(pid_string)) { // i18n: Here, PID means Product ID (for a USB device). - ModalMessageBox::critical(this, tr("USB Whitelist Error"), tr("The entered PID is invalid.")); + ModalMessageBox pid_warning_box(this); + pid_warning_box.setIcon(QMessageBox::Warning); + pid_warning_box.setWindowTitle(tr("USB Whitelist Error")); + // i18n: Here, PID means Product ID (for a USB device). + pid_warning_box.setText(tr("The entered PID is invalid.")); + pid_warning_box.setStandardButtons(QMessageBox::Ok); + pid_warning_box.exec(); return; } @@ -143,8 +155,7 @@ void USBDeviceAddToWhitelistDialog::AddUSBDeviceToWhitelist() if (SConfig::GetInstance().IsUSBDeviceWhitelisted({vid, pid})) { - ModalMessageBox::critical(this, tr("USB Whitelist Error"), - tr("This USB device is already whitelisted.")); + ModalMessageBox::critical(this, tr("Error"), tr("This USB device is already whitelisted.")); return; } SConfig::GetInstance().m_usb_passthrough_devices.emplace(vid, pid); diff --git a/Source/Core/DolphinQt/Settings/WiiPane.cpp b/Source/Core/DolphinQt/Settings/WiiPane.cpp index cdb094d01b..5cc6c86f9c 100644 --- a/Source/Core/DolphinQt/Settings/WiiPane.cpp +++ b/Source/Core/DolphinQt/Settings/WiiPane.cpp @@ -179,7 +179,7 @@ void WiiPane::CreateWiiRemoteSettings() auto* wii_remote_settings_group_layout = new QGridLayout(); wii_remote_settings_group->setLayout(wii_remote_settings_group_layout); m_main_layout->addWidget(wii_remote_settings_group); - m_wiimote_motor = new QCheckBox(tr("Enable Rumble")); + m_wiimote_motor = new QCheckBox(tr("Wii Remote Rumble")); m_wiimote_sensor_position_label = new QLabel(tr("Sensor Bar Position:")); m_wiimote_ir_sensor_position = new QComboBox();