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

dive download: pass current filename to dialog

Browse source 
Instead of accessing a global variable, pass the filename
from the MainWindow to the dialog. This is supposed to cut
down on the global variable mess.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2024-03-16 10:02:54 +01:00 • committed by bstoeger
parent 981352646c
commit 64419f2b19
5 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

11
desktop-widgets/configuredivecomputerdialog.cpp
View file

@ -294,7 +294,7 @@ void OstcFirmwareCheck::parseOstcFwVersion(QNetworkReply *reply)
disconnect(&manager, &QNetworkAccessManager::finished, this, &OstcFirmwareCheck::parseOstcFwVersion);
}
void OstcFirmwareCheck::checkLatest(QWidget *_parent, device_data_t *data)
void OstcFirmwareCheck::checkLatest(QWidget *_parent, device_data_t *data, const QString &filename)
{
devData = *data;
parent = _parent;
@ -339,21 +339,20 @@ void OstcFirmwareCheck::checkLatest(QWidget *_parent, device_data_t *data)
response.setWindowModality(Qt::WindowModal);
int ret = response.exec();
if (ret == QMessageBox::Accepted)
upgradeFirmware();
upgradeFirmware(filename);
}
}
void OstcFirmwareCheck::upgradeFirmware()
void OstcFirmwareCheck::upgradeFirmware(const QString &filename)
{
// start download of latestFirmwareHexFile
QString saveFileName = latestFirmwareHexFile;
saveFileName.replace("http://www.heinrichsweikamp.net/autofirmware/", "");
saveFileName.replace("firmware", latestFirmwareAvailable);
QString filename = existing_filename ?: prefs.default_filename;
QFileInfo fi(filename);
filename = fi.absolutePath().append(QDir::separator()).append(saveFileName);
saveFileName = fi.absolutePath().append(QDir::separator()).append(saveFileName);
storeFirmware = QFileDialog::getSaveFileName(parent, tr("Save the downloaded firmware as"),
filename, tr("Firmware files") + " (*.hex *.bin)");
saveFileName, tr("Firmware files") + " (*.hex *.bin)");
if (storeFirmware.isEmpty())
return;