summaryrefslogtreecommitdiffstats
path: root/qt-ui/configuredivecomputerdialog.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 /qt-ui/configuredivecomputerdialog.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 'qt-ui/configuredivecomputerdialog.cpp')
-rw-r--r--qt-ui/configuredivecomputerdialog.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/qt-ui/configuredivecomputerdialog.cpp b/qt-ui/configuredivecomputerdialog.cpp
index ab9f032f9..182bf76cb 100644
--- a/qt-ui/configuredivecomputerdialog.cpp
+++ b/qt-ui/configuredivecomputerdialog.cpp
@@ -114,6 +114,7 @@ ConfigureDiveComputerDialog::ConfigureDiveComputerDialog(QWidget *parent) : QDia
deviceDetails = new DeviceDetails(this);
config = new ConfigureDiveComputer();
+ connect(config, SIGNAL(progress(int)), ui.progressBar, SLOT(setValue(int)));
connect(config, SIGNAL(error(QString)), this, SLOT(configError(QString)));
connect(config, SIGNAL(message(QString)), this, SLOT(configMessage(QString)));
connect(config, SIGNAL(deviceDetailsChanged(DeviceDetails *)),
@@ -676,6 +677,7 @@ void ConfigureDiveComputerDialog::readSettings()
ui.progressBar->setTextVisible(true);
getDeviceData();
+ ui.progressBar->reset();
config->readSettings(&device_data);
}
@@ -686,6 +688,7 @@ void ConfigureDiveComputerDialog::resetSettings()
ui.progressBar->setTextVisible(true);
getDeviceData();
+ ui.progressBar->reset();
config->resetSettings(&device_data);
}
@@ -1069,6 +1072,7 @@ void ConfigureDiveComputerDialog::on_updateFirmwareButton_clicked()
ui.progressBar->setTextVisible(true);
getDeviceData();
+ ui.progressBar->reset();
config->startFirmwareUpdate(firmwarePath, &device_data);
}
}