From 81be0001a907aae50259a3d7230829908af34d38 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Tue, 14 Apr 2026 13:25:44 -0500 Subject: [PATCH] DolphinQt: Remove the "supported Bluetooth device could not be found" label from ControllersPane. It just confuses DolphinBar users and isn't relevant these days now that Windows users do not use alternative Bluetooth stacks. --- Source/Core/DolphinQt/Config/ControllersPane.cpp | 7 ------- Source/Core/DolphinQt/Config/ControllersPane.h | 3 --- .../Core/DolphinQt/Config/WiimoteControllersWidget.cpp | 9 --------- Source/Core/DolphinQt/Config/WiimoteControllersWidget.h | 5 +---- 4 files changed, 1 insertion(+), 23 deletions(-) diff --git a/Source/Core/DolphinQt/Config/ControllersPane.cpp b/Source/Core/DolphinQt/Config/ControllersPane.cpp index 201f208098..32134a2f7b 100644 --- a/Source/Core/DolphinQt/Config/ControllersPane.cpp +++ b/Source/Core/DolphinQt/Config/ControllersPane.cpp @@ -14,13 +14,6 @@ ControllersPane::ControllersPane() CreateMainLayout(); } -void ControllersPane::showEvent(QShowEvent* event) -{ - QWidget::showEvent(event); - - m_wiimote_controllers->UpdateBluetoothAvailableStatus(); -} - void ControllersPane::CreateMainLayout() { auto* const layout = new QVBoxLayout{this}; diff --git a/Source/Core/DolphinQt/Config/ControllersPane.h b/Source/Core/DolphinQt/Config/ControllersPane.h index 2c632ced95..4b0d1371c5 100644 --- a/Source/Core/DolphinQt/Config/ControllersPane.h +++ b/Source/Core/DolphinQt/Config/ControllersPane.h @@ -13,9 +13,6 @@ class ControllersPane final : public QWidget public: ControllersPane(); -protected: - void showEvent(QShowEvent* event) override; - private: void CreateMainLayout(); diff --git a/Source/Core/DolphinQt/Config/WiimoteControllersWidget.cpp b/Source/Core/DolphinQt/Config/WiimoteControllersWidget.cpp index 29b431d292..2a39a684fd 100644 --- a/Source/Core/DolphinQt/Config/WiimoteControllersWidget.cpp +++ b/Source/Core/DolphinQt/Config/WiimoteControllersWidget.cpp @@ -66,11 +66,6 @@ WiimoteControllersWidget::~WiimoteControllersWidget() m_bluetooth_adapter_refresh_thread.WaitForCompletion(); } -void WiimoteControllersWidget::UpdateBluetoothAvailableStatus() -{ - m_bluetooth_unavailable->setHidden(WiimoteReal::IsScannerReady()); -} - void WiimoteControllersWidget::StartBluetoothAdapterRefresh() { #ifdef __LIBUSB__ @@ -285,10 +280,6 @@ void WiimoteControllersWidget::CreateLayout() m_wiimote_layout->addLayout(left_of_refresh_button_layout, continuous_scanning_row, 0, 1, 3); m_wiimote_layout->addWidget(m_wiimote_refresh, continuous_scanning_row, 3); - m_bluetooth_unavailable = new QLabel(tr("A supported Bluetooth device could not be found.\n" - "You must manually connect your Wii Remote.")); - m_wiimote_layout->addWidget(m_bluetooth_unavailable, m_wiimote_layout->rowCount(), 1, 1, -1); - auto* layout = new QVBoxLayout; layout->setContentsMargins(0, 0, 0, 0); layout->setAlignment(Qt::AlignTop); diff --git a/Source/Core/DolphinQt/Config/WiimoteControllersWidget.h b/Source/Core/DolphinQt/Config/WiimoteControllersWidget.h index 6903d9eab3..eaca7fdbcf 100644 --- a/Source/Core/DolphinQt/Config/WiimoteControllersWidget.h +++ b/Source/Core/DolphinQt/Config/WiimoteControllersWidget.h @@ -32,9 +32,7 @@ class WiimoteControllersWidget final : public QWidget Q_OBJECT public: explicit WiimoteControllersWidget(QWidget* parent); - ~WiimoteControllersWidget(); - - void UpdateBluetoothAvailableStatus(); + ~WiimoteControllersWidget() override; private: void SaveSettings(); @@ -81,5 +79,4 @@ private: QCheckBox* m_wiimote_ciface; QToolButton* m_wiimote_refresh; QLabel* m_wiimote_refresh_indicator; - QLabel* m_bluetooth_unavailable; };