mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Clear the BTH discovered devices list on each search

Browse source 
Clear the Bluetooth discovered devices list on each search.
In this way we will show only the devices that are in range
and active during the last scannning. Also if we clear the
list before each call we don't need to check anymore if the
discovered device is already in the list.

Signed-off-by: Claudiu Olteanu <olteanu.claudiu@ymail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Claudiu Olteanu 2015-08-18 20:15:49 +03:00 • committed by Dirk Hohndel
parent 14ca6a4e77
commit a83f59ff09
1 changed files with 21 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
qt-ui/btdeviceselectiondialog.cpp
View file

@ -118,6 +118,7 @@ void BtDeviceSelectionDialog::on_clear_clicked()
void BtDeviceSelectionDialog::on_scan_clicked()
{
ui->dialogStatus->setText("Scanning for remote devices...");
ui->discoveredDevicesList->clear();
remoteDeviceDiscoveryAgent->start();
ui->scan->setEnabled(false);
}
@ -145,28 +146,28 @@ void BtDeviceSelectionDialog::hostModeStateChanged(QBluetoothLocalDevice::HostMo
void BtDeviceSelectionDialog::addRemoteDevice(const QBluetoothDeviceInfo &remoteDeviceInfo)
{
QString deviceLabel = QString("%1 (%2)").arg(remoteDeviceInfo.name()).arg(remoteDeviceInfo.address().toString());
QList<QListWidgetItem *> itemsWithSameSignature = ui->discoveredDevicesList->findItems(deviceLabel, Qt::MatchStartsWith);
// By default we use the status label and the color for the UNPAIRED state
QColor pairingColor = QColor(Qt::red);
QString pairingStatusLabel = QString("UNPAIRED");
QBluetoothLocalDevice::Pairing pairingStatus = localDevice->pairingStatus(remoteDeviceInfo.address());
// Check if the remote device is already in the list
if (itemsWithSameSignature.empty()) {
QListWidgetItem *item = new QListWidgetItem(deviceLabel);
QBluetoothLocalDevice::Pairing pairingStatus = localDevice->pairingStatus(remoteDeviceInfo.address());
item->setData(Qt::UserRole, QVariant::fromValue(remoteDeviceInfo));
if (pairingStatus == QBluetoothLocalDevice::Paired) {
item->setText(QString("%1 [State: PAIRED]").arg(item->text()));
item->setBackgroundColor(QColor(Qt::gray));
} else if (pairingStatus == QBluetoothLocalDevice::AuthorizedPaired) {
item->setText(QString("%1 [State: AUTHORIZED_PAIRED]").arg(item->text()));
item->setBackgroundColor(QColor(Qt::blue));
} else {
item->setText(QString("%1 [State: UNPAIRED]").arg(item->text()));
item->setTextColor(QColor(Qt::black));
}
ui->discoveredDevicesList->addItem(item);
if (pairingStatus == QBluetoothLocalDevice::Paired) {
pairingStatusLabel = QString("PAIRED");
pairingColor = QColor(Qt::gray);
} else if (pairingStatus == QBluetoothLocalDevice::AuthorizedPaired) {
pairingStatusLabel = QString("AUTHORIZED_PAIRED");
pairingColor = QColor(Qt::blue);
}
QString deviceLabel = QString("%1 (%2) [State: %3]").arg(remoteDeviceInfo.name(),
remoteDeviceInfo.address().toString(),
pairingStatusLabel);
QListWidgetItem *item = new QListWidgetItem(deviceLabel);
item->setData(Qt::UserRole, QVariant::fromValue(remoteDeviceInfo));
item->setBackgroundColor(pairingColor);
ui->discoveredDevicesList->addItem(item);
}
void BtDeviceSelectionDialog::itemClicked(QListWidgetItem *item)