mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-28 21:20:19 +00:00
f32e86eb32
The download already worked, but we didn't display the new dives. This introduces a new slot for MainWindow that updates what is displayed in Subsurface after files were imported. With this change we can successfully download ONCE - but when trying to download a second dive the dialog doesn't appear to get refreshed the right way - the OK button doesn't appear to work anymore (Cancel however does). Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
64 lines
1.3 KiB
C++
64 lines
1.3 KiB
C++
#ifndef DOWNLOADFROMDIVECOMPUTER_H
|
|
#define DOWNLOADFROMDIVECOMPUTER_H
|
|
|
|
#include <QDialog>
|
|
#include <QThread>
|
|
#include <QHash>
|
|
#include <QMap>
|
|
#include "../libdivecomputer.h"
|
|
|
|
namespace Ui{
|
|
class DownloadFromDiveComputer;
|
|
}
|
|
struct device_data_t;
|
|
|
|
class DownloadThread : public QThread{
|
|
Q_OBJECT
|
|
public:
|
|
explicit DownloadThread(device_data_t* data);
|
|
virtual void run();
|
|
private:
|
|
device_data_t *data;
|
|
};
|
|
|
|
class InterfaceThread : public QThread{
|
|
Q_OBJECT
|
|
public:
|
|
InterfaceThread(QObject *parent, device_data_t *data) ;
|
|
virtual void run();
|
|
|
|
Q_SIGNALS:
|
|
void updateInterface(int value);
|
|
private:
|
|
device_data_t *data;
|
|
};
|
|
|
|
class QStringListModel;
|
|
class DownloadFromDCWidget : public QDialog{
|
|
Q_OBJECT
|
|
public:
|
|
explicit DownloadFromDCWidget(QWidget* parent = 0, Qt::WindowFlags f = 0);
|
|
static DownloadFromDCWidget *instance();
|
|
public slots:
|
|
void on_ok_clicked();
|
|
void on_cancel_clicked();
|
|
void runDialog();
|
|
void on_vendor_currentIndexChanged(const QString& vendor);
|
|
private:
|
|
Ui::DownloadFromDiveComputer *ui;
|
|
InterfaceThread *thread;
|
|
bool downloading;
|
|
|
|
QStringList vendorList;
|
|
QHash<QString, QStringList> productList;
|
|
QMap<QString, dc_descriptor_t *> descriptorLookup;
|
|
device_data_t data;
|
|
|
|
QStringListModel *vendorModel;
|
|
QStringListModel *productModel;
|
|
void fill_computer_list();
|
|
public:
|
|
bool preferDownloaded();
|
|
};
|
|
|
|
#endif
|