From 5ea121eeb5397932750279d11bcd8fa8e4cc5f43 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Wed, 8 Sep 2021 22:08:43 +0200 Subject: Revert "Revert "DolphinQt: Minor consistency fixes for the Settings window"" This reverts commit e376a985e435b15ef6518003a2810acdfbc4e0b6. A beta build has been released now, so there's no reason to keep it reverted anymore. --- .../Settings/USBDeviceAddToWhitelistDialog.cpp | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) (limited to 'Source/Core/DolphinQt/Settings/USBDeviceAddToWhitelistDialog.cpp') diff --git a/Source/Core/DolphinQt/Settings/USBDeviceAddToWhitelistDialog.cpp b/Source/Core/DolphinQt/Settings/USBDeviceAddToWhitelistDialog.cpp index 5d6280d142..3fab4f4834 100644 --- a/Source/Core/DolphinQt/Settings/USBDeviceAddToWhitelistDialog.cpp +++ b/Source/Core/DolphinQt/Settings/USBDeviceAddToWhitelistDialog.cpp @@ -128,25 +128,13 @@ void USBDeviceAddToWhitelistDialog::AddUSBDeviceToWhitelist() if (!IsValidUSBIDString(vid_string)) { // i18n: Here, VID means Vendor ID (for a USB device). - 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(); + ModalMessageBox::critical(this, tr("USB Whitelist Error"), tr("The entered VID is invalid.")); return; } if (!IsValidUSBIDString(pid_string)) { // i18n: Here, PID means Product ID (for a USB device). - 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(); + ModalMessageBox::critical(this, tr("USB Whitelist Error"), tr("The entered PID is invalid.")); return; } @@ -155,7 +143,8 @@ void USBDeviceAddToWhitelistDialog::AddUSBDeviceToWhitelist() if (SConfig::GetInstance().IsUSBDeviceWhitelisted({vid, pid})) { - ModalMessageBox::critical(this, tr("Error"), tr("This USB device is already whitelisted.")); + ModalMessageBox::critical(this, tr("USB Whitelist Error"), + tr("This USB device is already whitelisted.")); return; } SConfig::GetInstance().m_usb_passthrough_devices.emplace(vid, pid); -- cgit v1.2.3