Merge branch 'joshua-gsoc' of git://github.com/thiagomacieira/subsurface into josh

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

Conflicts:
	subsurface.pro

1 files changed, 60 insertions, 0 deletions

diff --git a/qt-ui/configuredivecomputerdialog.h b/qt-ui/configuredivecomputerdialog.h
new file mode 100644
index 000000000..66871efa3
--- /dev/null
+++ b/qt-ui/configuredivecomputerdialog.h
@@ -0,0 +1,60 @@
+#ifndef CONFIGUREDIVECOMPUTERDIALOG_H
+#define CONFIGUREDIVECOMPUTERDIALOG_H
+
+#include <QDialog>
+#include <QStringListModel>
+#include "../libdivecomputer.h"
+#include "configuredivecomputer.h"
+
+namespace Ui {
+class ConfigureDiveComputerDialog;
+}
+
+class ConfigureDiveComputerDialog : public QDialog
+{
+	Q_OBJECT
+
+public:
+	explicit ConfigureDiveComputerDialog(QWidget *parent = 0);
+	~ConfigureDiveComputerDialog();
+
+private slots:
+	void readSettings();
+	void configMessage(QString msg);
+	void configError(QString err);
+	void on_cancel_clicked();
+	void deviceReadFinished();
+	void on_saveSettingsPushButton_clicked();
+	void deviceDetailsReceived(DeviceDetails *newDeviceDetails);
+	void reloadValues();
+	void on_backupButton_clicked();
+
+	void on_restoreBackupButton_clicked();
+
+
+	void on_updateFirmwareButton_clicked();
+
+	void on_DiveComputerList_currentRowChanged(int currentRow);
+
+private:
+	Ui::ConfigureDiveComputerDialog *ui;
+
+	QStringList vendorList;
+	QHash<QString, QStringList> productList;
+
+	ConfigureDiveComputer *config;
+	device_data_t device_data;
+	void getDeviceData();
+
+	QHash<QString, dc_descriptor_t *> descriptorLookup;
+	void fill_device_list(int dc_type);
+	void fill_computer_list();
+
+	DeviceDetails *deviceDetails;
+	void populateDeviceDetails();
+
+	QString selected_vendor;
+	QString selected_product;
+};
+
+#endif // CONFIGUREDIVECOMPUTERDIALOG_H