mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move OSTC firmware check around a bit

Browse source 
This rearranges the code so we can call it from the download dialog and
tell the user if there is a newer version of the firmware available.

This needs a proper dialog and needs to be hooked up so that the user can
accept the suggestion and go directly to the firmware update code.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2014-12-27 08:31:51 -08:00
parent 9f95f3ce18
commit 52084c80f7
4 changed files with 51 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

21
qt-ui/downloadfromdivecomputer.cpp
View file

@ -1,11 +1,11 @@
#include "downloadfromdivecomputer.h"
#include "../divecomputer.h"
#include "../libdivecomputer.h"
#include "../helpers.h"
#include "../display.h"
#include "../divelist.h"
#include "divecomputer.h"
#include "libdivecomputer.h"
#include "helpers.h"
#include "display.h"
#include "divelist.h"
#include "mainwindow.h"
#include <cstdlib>
#include <QThread>
#include <QDebug>
@ -46,7 +46,8 @@ DownloadFromDCWidget::DownloadFromDCWidget(QWidget *parent, Qt::WindowFlags f) :
productModel(0),
timer(new QTimer(this)),
dumpWarningShown(false),
currentState(INITIAL)
currentState(INITIAL),
ostcFirmwareCheck(0)
{
ui.setupUi(this);
ui.progressBar->hide();
@ -302,6 +303,9 @@ void DownloadFromDCWidget::on_ok_clicked()
previousLast = dive_table.nr;
thread->start();
if (ui.product->currentText() == "OSTC 3" || ui.product->currentText() == "OSTC sport")
ostcFirmwareCheck = new OstcFirmwareCheck();
}
bool DownloadFromDCWidget::preferDownloaded()
@ -397,6 +401,9 @@ void DownloadFromDCWidget::onDownloadThreadFinished()
// (but not visible as selected)
MainWindow::instance()->dive_list()->unselectDives();
MainWindow::instance()->dive_list()->selectDive(idx, true);
QString dcName = data.devname;
if (ostcFirmwareCheck)
ostcFirmwareCheck->checkLatest(data.libdc_firmware);
}
} else if (currentState == CANCELLING || currentState == CANCELLED) {
if (import_thread_cancelled) {