Make Bluetooth naming consistent

Currently, on Linux, after selecting a Bluetooth device the name of the
device is shown. On reopening the download dialog, on the other hand,
the address is shown. In the device selection dialog both are shown.

This patch changes the download dialog such that both, name and address,
are shown. The bulk of the patch introduces the name of the device in
the preferences and DCDeviceData. It has to be noted that DCDeviceData
is an encapsulation of the libdivecomputer device_data_t. Nevertheless,
the new Bluetooth-name field is, at the moment, not passed through to
libdivecomputer.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>

1 files changed, 4 insertions, 0 deletions

diff --git a/core/subsurface-qt/SettingsObjectWrapper.h b/core/subsurface-qt/SettingsObjectWrapper.h
index d16d3fa27..19cfcdd50 100644
--- a/core/subsurface-qt/SettingsObjectWrapper.h
+++ b/core/subsurface-qt/SettingsObjectWrapper.h
@@ -18,24 +18,28 @@ class DiveComputerSettings : public QObject {
 	Q_PROPERTY(QString vendor READ dc_vendor WRITE setVendor NOTIFY vendorChanged)
 	Q_PROPERTY(QString product READ dc_product WRITE setProduct NOTIFY productChanged)
 	Q_PROPERTY(QString device READ dc_device WRITE setDevice NOTIFY deviceChanged)
+	Q_PROPERTY(QString device_name READ dc_device_name WRITE setDeviceName NOTIFY deviceNameChanged)
 	Q_PROPERTY(int download_mode READ downloadMode WRITE setDownloadMode NOTIFY downloadModeChanged)
 public:
 	DiveComputerSettings(QObject *parent);
 	QString dc_vendor() const;
 	QString dc_product() const;
 	QString dc_device() const;
+	QString dc_device_name() const;
 	int downloadMode() const;
 
 public slots:
 	void setVendor(const QString& vendor);
 	void setProduct(const QString& product);
 	void setDevice(const QString& device);
+	void setDeviceName(const QString& device_name);
 	void setDownloadMode(int mode);
 
 signals:
 	void vendorChanged(const QString& vendor);
 	void productChanged(const QString& product);
 	void deviceChanged(const QString& device);
+	void deviceNameChanged(const QString& device_name);
 	void downloadModeChanged(int mode);
 private:
 	const QString group = QStringLiteral("DiveComputer");