Merge pull request #14595 from jordan-woyak/supported-bt-label
DolphinQt: Remove the "supported Bluetooth device could not be found" label from ControllersPane.
This commit is contained in:
@@ -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};
|
||||
|
||||
@@ -13,9 +13,6 @@ class ControllersPane final : public QWidget
|
||||
public:
|
||||
ControllersPane();
|
||||
|
||||
protected:
|
||||
void showEvent(QShowEvent* event) override;
|
||||
|
||||
private:
|
||||
void CreateMainLayout();
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user