summaryrefslogtreecommitdiffstats
path: root/configuredivecomputer.cpp
diff options
context:
space:
mode:
authorGravatar Anton Lundin <glance@acc.umu.se>2015-01-20 22:40:52 +0100
committerGravatar Dirk Hohndel <dirk@hohndel.org>2015-01-21 17:03:24 +1200
commit724170f4b6840aaf65b07bbdb0975f350bdf171a (patch)
tree28b66b6292caa8b33066ac99c5f3d480c5107a10 /configuredivecomputer.cpp
parent1d67bae745e491cfe28806dc99f0db005649083d (diff)
downloadsubsurface-724170f4b6840aaf65b07bbdb0975f350bdf171a.tar.gz
Connect the progress events to the progress bar
Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'configuredivecomputer.cpp')
-rw-r--r--configuredivecomputer.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/configuredivecomputer.cpp b/configuredivecomputer.cpp
index 4f7e873fe..ec69c776a 100644
--- a/configuredivecomputer.cpp
+++ b/configuredivecomputer.cpp
@@ -30,6 +30,7 @@ void ConfigureDiveComputer::readSettings(device_data_t *data)
connect(readThread, SIGNAL(error(QString)), this, SLOT(setError(QString)));
connect(readThread, SIGNAL(devicedetails(DeviceDetails *)), this,
SIGNAL(deviceDetailsChanged(DeviceDetails *)));
+ connect(readThread, SIGNAL(progress(int)), this, SLOT(progressEvent(int)));
readThread->start();
}
@@ -45,6 +46,7 @@ void ConfigureDiveComputer::saveDeviceDetails(DeviceDetails *details, device_dat
connect(writeThread, SIGNAL(finished()),
this, SLOT(writeThreadFinished()), Qt::QueuedConnection);
connect(writeThread, SIGNAL(error(QString)), this, SLOT(setError(QString)));
+ connect(writeThread, SIGNAL(progress(int)), this, SLOT(progressEvent(int)));
writeThread->setDeviceDetails(details);
writeThread->start();
@@ -504,6 +506,8 @@ void ConfigureDiveComputer::startFirmwareUpdate(QString fileName, device_data_t
connect(firmwareThread, SIGNAL(finished()),
this, SLOT(firmwareThreadFinished()), Qt::QueuedConnection);
connect(firmwareThread, SIGNAL(error(QString)), this, SLOT(setError(QString)));
+ connect(firmwareThread, SIGNAL(progress(int)), this, SLOT(progressEvent(int)));
+
firmwareThread->start();
}
@@ -518,10 +522,16 @@ void ConfigureDiveComputer::resetSettings(device_data_t *data)
connect(resetThread, SIGNAL(finished()),
this, SLOT(resetThreadFinished()), Qt::QueuedConnection);
connect(resetThread, SIGNAL(error(QString)), this, SLOT(setError(QString)));
+ connect(resetThread, SIGNAL(progress(int)), this, SLOT(progressEvent(int)));
resetThread->start();
}
+void ConfigureDiveComputer::progressEvent(int percent)
+{
+ emit progress(percent);
+}
+
void ConfigureDiveComputer::setState(ConfigureDiveComputer::states newState)
{
currentState = newState;