Merge branch 'macBLE' of github.com:Subsurface-divelog/subsurface

3 files changed, 70 insertions, 12 deletions

diff --git a/desktop-widgets/btdeviceselectiondialog.cpp b/desktop-widgets/btdeviceselectiondialog.cpp
index 049246703..cf70daa3f 100644
--- a/desktop-widgets/btdeviceselectiondialog.cpp
+++ b/desktop-widgets/btdeviceselectiondialog.cpp
@@ -3,6 +3,9 @@
 #include <QDebug>
 #include <QMessageBox>
 #include <QMenu>
+#include "core/btdiscovery.h"
+
+#include <QBluetoothUuid>
 
 #include "ui_btdeviceselectiondialog.h"
 #include "btdeviceselectiondialog.h"
@@ -149,7 +152,9 @@ void BtDeviceSelectionDialog::on_save_clicked()
 
 	// Save the selected device
 	selectedRemoteDeviceInfo = QSharedPointer<QBluetoothDeviceInfo>(new QBluetoothDeviceInfo(remoteDeviceInfo));
-
+	QString address = remoteDeviceInfo.address().isNull() ? remoteDeviceInfo.deviceUuid().toString() :
+								remoteDeviceInfo.address().toString();
+	saveBtDeviceInfo(address.toUtf8().constData(), remoteDeviceInfo);
 	if (remoteDeviceDiscoveryAgent->isActive()) {
 		// Stop the SDP agent if the clear button is pressed and enable the Scan button
 		remoteDeviceDiscoveryAgent->stop();
@@ -236,8 +241,16 @@ void BtDeviceSelectionDialog::addRemoteDevice(const QBluetoothDeviceInfo &remote
 	if (remoteDeviceInfo.address().isNull())
 		pairingColor = QColor(Qt::gray);
 
+	QString deviceLabel;
 
-	QString deviceLabel = tr("%1 (%2)   [State: %3]").arg(remoteDeviceInfo.name(),
+#if defined(Q_OS_MACOS) || defined(Q_OS_IOS)
+	if (!remoteDeviceInfo.deviceUuid().isNull()) {
+		// we have only a Uuid, no address, so show that and reset the pairing color
+		deviceLabel = QString("%1 (%2)").arg(remoteDeviceInfo.name(),remoteDeviceInfo.deviceUuid().toString());
+		pairingColor = QColor(Qt::white);
+	} else
+#endif
+	deviceLabel = tr("%1 (%2)   [State: %3]").arg(remoteDeviceInfo.name(),
 							      remoteDeviceInfo.address().toString(),
 							      pairingStatusLabel);
 #endif
@@ -255,19 +268,24 @@ void BtDeviceSelectionDialog::itemClicked(QListWidgetItem *item)
 	// By default we assume that the devices are paired
 	QBluetoothDeviceInfo remoteDeviceInfo = item->data(Qt::UserRole).value<QBluetoothDeviceInfo>();
 	QString statusMessage = tr("The device %1 can be used for connection. You can press the Save button.")
-				  .arg(remoteDeviceInfo.address().toString());
+				  .arg(remoteDeviceInfo.address().isNull() ?
+					       remoteDeviceInfo.deviceUuid().toString() :
+					       remoteDeviceInfo.address().toString());
 	bool enableSaveButton = true;
 
 #if !defined(Q_OS_WIN)
 	// On other platforms than Windows we can obtain the pairing status so if the devices are not paired we disable the button
-	QBluetoothLocalDevice::Pairing pairingStatus = localDevice->pairingStatus(remoteDeviceInfo.address());
-
-	if (pairingStatus == QBluetoothLocalDevice::Unpaired) {
-		statusMessage = tr("The device %1 must be paired in order to be used. Please use the context menu for pairing options.")
-				  .arg(remoteDeviceInfo.address().toString());
-		enableSaveButton = false;
+	// except on MacOS for those devices that only give us a Uuid and not and address (as we have no pairing status for those, either)
+	if (!remoteDeviceInfo.address().isNull()) {
+		QBluetoothLocalDevice::Pairing pairingStatus = localDevice->pairingStatus(remoteDeviceInfo.address());
+
+		if (pairingStatus == QBluetoothLocalDevice::Unpaired) {
+			statusMessage = tr("The device %1 must be paired in order to be used. Please use the context menu for pairing options.")
+					.arg(remoteDeviceInfo.address().toString());
+			enableSaveButton = false;
+		}
 	}
-	if (remoteDeviceInfo.address().isNull()) {
+	if (remoteDeviceInfo.address().isNull() && remoteDeviceInfo.deviceUuid().isNull()) {
 		statusMessage = tr("A device needs a non-zero address for a connection.");
 		enableSaveButton = false;
 	}
diff --git a/desktop-widgets/downloadfromdivecomputer.cpp b/desktop-widgets/downloadfromdivecomputer.cpp
index 74501dcdb..424cf277a 100644
--- a/desktop-widgets/downloadfromdivecomputer.cpp
+++ b/desktop-widgets/downloadfromdivecomputer.cpp
@@ -112,8 +112,24 @@ void DownloadFromDCWidget::updateProgressBar()
 	}
 	if (!same_string(progress_bar_text , "")) {
 		ui.progressBar->setFormat(progress_bar_text);
+#if defined(Q_OS_MAC)
+		// on mac the progress bar doesn't show its text
+		ui.progressText->setText(progress_bar_text);
+#endif
 	} else {
-		ui.progressBar->setFormat("%p%");
+		if (IS_FP_SAME(progress_bar_fraction, 0.0)) {
+			ui.progressBar->setFormat(tr("Connecting to dive computer"));
+#if defined(Q_OS_MAC)
+		// on mac the progress bar doesn't show its text
+		ui.progressText->setText(tr("Connecting to dive computer"));
+#endif
+		} else {
+			ui.progressBar->setFormat("%p%");
+#if defined(Q_OS_MAC)
+			// on mac the progress bar doesn't show its text
+			ui.progressText->setText(QString("%1%").arg(lrint(progress_bar_fraction * 100)));
+#endif
+		}
 	}
 	ui.progressBar->setValue(lrint(progress_bar_fraction * 100));
 	free(last_text);
@@ -131,6 +147,10 @@ void DownloadFromDCWidget::updateState(states state)
 		markChildrenAsEnabled();
 		timer->stop();
 		progress_bar_text = "";
+#if defined(Q_OS_MAC)
+		// on mac we show the text in a label
+		ui.progressText->setText(progress_bar_text);
+#endif
 	}
 
 	// tries to cancel an on going download
@@ -153,6 +173,10 @@ void DownloadFromDCWidget::updateState(states state)
 		ui.progressBar->hide();
 		markChildrenAsEnabled();
 		progress_bar_text = "";
+#if defined(Q_OS_MAC)
+		// on mac we show the text in a label
+		ui.progressText->setText(progress_bar_text);
+#endif
 	}
 
 	// DOWNLOAD is finally done, but we don't know if there was an error as libdivecomputer doesn't pass
@@ -165,10 +189,15 @@ void DownloadFromDCWidget::updateState(states state)
 			markChildrenAsEnabled();
 			progress_bar_text = "";
 		} else {
-			progress_bar_text = "";
+			if (downloadTable.nr != 0)
+				progress_bar_text = "";
 			ui.progressBar->setValue(100);
 			markChildrenAsEnabled();
 		}
+#if defined(Q_OS_MAC)
+		// on mac we show the text in a label
+		ui.progressText->setText(progress_bar_text);
+#endif
 	}
 
 	// DOWNLOAD is started.
@@ -188,6 +217,10 @@ void DownloadFromDCWidget::updateState(states state)
 		markChildrenAsEnabled();
 		progress_bar_text = "";
 		ui.progressBar->hide();
+#if defined(Q_OS_MAC)
+		// on mac we show the text in a label
+		ui.progressText->setText(progress_bar_text);
+#endif
 	}
 
 	// properly updating the widget state
diff --git a/desktop-widgets/downloadfromdivecomputer.ui b/desktop-widgets/downloadfromdivecomputer.ui
index b1f152034..10d654b46 100644
--- a/desktop-widgets/downloadfromdivecomputer.ui
+++ b/desktop-widgets/downloadfromdivecomputer.ui
@@ -190,6 +190,13 @@
         </widget>
        </item>
        <item>
+        <widget class="QLabel" name="progressText">
+         <property name="text">
+          <string/>
+         </property>
+        </widget>
+       </item>
+       <item>
         <spacer name="aboveOKCancelSpacer">
          <property name="orientation">
           <enum>Qt::Vertical</enum>