diff options
| author |  Anton Lundin <glance@acc.umu.se> | 2014-12-07 23:32:08 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2014-12-08 08:38:50 -0800 |
| commit | ac207ee5ff60794c477d6d96c81645c4fc5b1994 (patch) | |
| tree | d0ff2fa7e903ed154266f486d5466f022826600d | |
| parent | a696da91469e117301eaca234ed968a4ba3481cc (diff) | |
| download | subsurface-ac207ee5ff60794c477d6d96c81645c4fc5b1994.tar.gz | |
Emit the successful message the right way
The successful message was emitted in a some what older way then the
other messages so it was always emitted, even on error.
Signed-off-by: Anton Lundin <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | configuredivecomputer.cpp | 5 | ||||
| -rw-r--r-- | configuredivecomputer.h | 2 | ||||
| -rw-r--r-- | qt-ui/configuredivecomputerdialog.cpp | 6 | ||||
| -rw-r--r-- | qt-ui/configuredivecomputerdialog.h | 1 |
4 files changed, 4 insertions, 10 deletions
diff --git a/configuredivecomputer.cpp b/configuredivecomputer.cpp index ad4430cf1..769189b26 100644 --- a/configuredivecomputer.cpp +++ b/configuredivecomputer.cpp @@ -556,7 +556,10 @@ void ConfigureDiveComputer::setError(QString err) void ConfigureDiveComputer::readThreadFinished() { setState(DONE); - emit readFinished(); + if (readThread->lastError.isEmpty()) { + //No error + emit message(tr("Dive computer details read successfully")); + } } void ConfigureDiveComputer::writeThreadFinished() diff --git a/configuredivecomputer.h b/configuredivecomputer.h index 93c50f993..59340335d 100644 --- a/configuredivecomputer.h +++ b/configuredivecomputer.h @@ -41,8 +41,6 @@ public: signals: void message(QString msg); void error(QString err); - void readFinished(); - void writeFinished(); void stateChanged(states newState); void deviceDetailsChanged(DeviceDetails *newDetails); diff --git a/qt-ui/configuredivecomputerdialog.cpp b/qt-ui/configuredivecomputerdialog.cpp index 4b6649959..734952003 100644 --- a/qt-ui/configuredivecomputerdialog.cpp +++ b/qt-ui/configuredivecomputerdialog.cpp @@ -111,7 +111,6 @@ ConfigureDiveComputerDialog::ConfigureDiveComputerDialog(QWidget *parent) : config = new ConfigureDiveComputer(this); connect(config, SIGNAL(error(QString)), this, SLOT(configError(QString))); connect(config, SIGNAL(message(QString)), this, SLOT(configMessage(QString))); - connect(config, SIGNAL(readFinished()), this, SLOT(deviceReadFinished())); connect(config, SIGNAL(deviceDetailsChanged(DeviceDetails*)), this, SLOT(deviceDetailsReceived(DeviceDetails*))); connect(ui.retrieveDetails, SIGNAL(clicked()), this, SLOT(readSettings())); @@ -616,11 +615,6 @@ void ConfigureDiveComputerDialog::on_cancel_clicked() this->close(); } -void ConfigureDiveComputerDialog::deviceReadFinished() -{ - ui.statusLabel->setText(tr("Dive computer details read successfully.")); -} - void ConfigureDiveComputerDialog::on_saveSettingsPushButton_clicked() { populateDeviceDetails(); diff --git a/qt-ui/configuredivecomputerdialog.h b/qt-ui/configuredivecomputerdialog.h index 89efee622..2f7fc296f 100644 --- a/qt-ui/configuredivecomputerdialog.h +++ b/qt-ui/configuredivecomputerdialog.h @@ -62,7 +62,6 @@ private slots: void configMessage(QString msg); void configError(QString err); void on_cancel_clicked(); - void deviceReadFinished(); void on_saveSettingsPushButton_clicked(); void deviceDetailsReceived(DeviceDetails *newDeviceDetails); void reloadValues(); |