jeena/telldus
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Connect the showMessage() signals from the devices

Browse source
This commit is contained in:
Micke Prag 2011-02-23 16:17:15 +00:00
parent f5f0714c85
commit 429620b957
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
telldus-gui/TelldusGui/devicemodel.cpp
View file

@ -24,11 +24,12 @@ DeviceModel::DeviceModel(QObject *parent)
for( int i = 0; i < numberOfDevices; ++i ) {
int id = tdGetDeviceId(i);
Device *device = new Device(id, SUPPORTED_METHODS, this);
connect(device, SIGNAL(showMessage(QString,QString,QString)), this, SIGNAL(showMessage(QString,QString,QString)));
devices.append(device);
connect(device, SIGNAL(stateChanged(int)), this, SLOT(deviceStateChanged(int)), Qt::QueuedConnection);
connect(device, SIGNAL(nameChanged(int,QString)), this, SLOT(nameChanged(int,QString)), Qt::QueuedConnection);
}
deviceChangeCallbackId = tdRegisterDeviceChangeEvent( reinterpret_cast<TDDeviceChangeEvent>(&DeviceModel::deviceChangeEvent), this);
}
@ -77,9 +78,9 @@ QVariant DeviceModel::data(const QModelIndex &index, int role) const {
Device *device = devices[index.row()];
int lastSentCommand = device->lastSentCommand();
return QIcon( QString(":/images/state_%1.png").arg(lastSentCommand) );
} else if (role == Qt::TextAlignmentRole) {
return Qt::AlignCenter;
}
} else if (role == Qt::TextAlignmentRole) {
return Qt::AlignCenter;
}
} else if (index.column() == 1) {
if (role == Qt::DisplayRole) {
return devices[index.row()]->name();
@ -143,6 +144,7 @@ void DeviceModel::deviceChanged( int deviceId, int eventType, int changeType ) {
//We are not running in the DeviceModel-thread here. Move the device to the correct thread
device->moveToThread(this->thread());
device->setParent(this);
connect(device, SIGNAL(showMessage(QString,QString,QString)), this, SIGNAL(showMessage(QString,QString,QString)));
devices.append(device);
connect(device, SIGNAL(stateChanged(int)), this, SLOT(deviceStateChanged(int)));
connect(device, SIGNAL(nameChanged(int,QString)), this, SLOT(nameChanged(int,QString)));
@ -157,7 +159,7 @@ void DeviceModel::deviceChanged( int deviceId, int eventType, int changeType ) {
endRemoveRows();
}
}
}
void DeviceModel::nameChanged(int deviceId, const QString &) {