tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Take into account the integrated filter in the DevicesModel

Browse source
This commit is contained in:
Aleix Pol 2015-03-16 02:31:59 +01:00
parent 63bb2bda85
commit fda4556dfc
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
interfaces/devicesmodel.cpp
View file

@ -84,9 +84,12 @@ void DevicesModel::deviceAdded(const QString& id)
const QModelIndex idx = index(row, 0); const QModelIndex idx = index(row, 0);
Q_EMIT dataChanged(idx, idx); Q_EMIT dataChanged(idx, idx);
} else { } else {
beginInsertRows(QModelIndex(), m_deviceList.count(), m_deviceList.count()); DeviceDbusInterface* dev = new DeviceDbusInterface(id, this);
appendDevice(id); if (dev->isReachable() == bool(m_displayFilter & StatusReachable) && dev->isPaired() == bool(m_displayFilter & StatusPaired)) {
endInsertRows(); beginInsertRows(QModelIndex(), m_deviceList.count(), m_deviceList.count());
appendDevice(dev);
endInsertRows();
}
} }
} }
@ -152,14 +155,13 @@ void DevicesModel::receivedDeviceList(QDBusPendingCallWatcher* watcher)
beginInsertRows(QModelIndex(), 0, deviceIds.count()-1); beginInsertRows(QModelIndex(), 0, deviceIds.count()-1);
Q_FOREACH(const QString& id, deviceIds) { Q_FOREACH(const QString& id, deviceIds) {
appendDevice(id); appendDevice(new DeviceDbusInterface(id, this));
} }
endInsertRows(); endInsertRows();
} }
void DevicesModel::appendDevice(const QString& id) void DevicesModel::appendDevice(DeviceDbusInterface* dev)
{ {
DeviceDbusInterface* dev = new DeviceDbusInterface(id, this);
m_deviceList.append(dev); m_deviceList.append(dev);
connect(dev, SIGNAL(nameChanged(QString)), SLOT(nameChanged(QString))); connect(dev, SIGNAL(nameChanged(QString)), SLOT(nameChanged(QString)));
} }

2
interfaces/devicesmodel.h
View file

@ -83,7 +83,7 @@ Q_SIGNALS:
private: private:
void clearDevices(); void clearDevices();
int rowForDeviceId(const QString& id) const; int rowForDeviceId(const QString& id) const;
void appendDevice(const QString& id); void appendDevice(DeviceDbusInterface* dev);
DaemonDbusInterface* m_dbusInterface; DaemonDbusInterface* m_dbusInterface;
QVector<DeviceDbusInterface*> m_deviceList; QVector<DeviceDbusInterface*> m_deviceList;