From: Soeren Apel <redacted>
Date: Sat, 27 May 2017 14:31:15 +0000 (+0200)
Subject: DeviceManager: Show progress dialog while scanning for devices
X-Git-Tag: pulseview-0.4.0~71
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=bc9177b394e33bfec1f3fc85fb09c2f74c1c7de3;p=pulseview.git

DeviceManager: Show progress dialog while scanning for devices

We don't want users to wonder why nothing happens when they
start PV and no window shows up. Providing this dialog lets
them know that PV is starting and doing something.
---

diff --git a/pv/devicemanager.cpp b/pv/devicemanager.cpp
index a51148b1..58f507c9 100644
--- a/pv/devicemanager.cpp
+++ b/pv/devicemanager.cpp
@@ -22,12 +22,17 @@
 
 #include <cassert>
 #include <functional>
+#include <memory>
 #include <sstream>
 #include <stdexcept>
 #include <string>
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
+#include <QApplication>
+#include <QObject>
+#include <QProgressDialog>
+
 #include <boost/filesystem.hpp>
 
 #include <pv/devices/hardwaredevice.hpp>
@@ -39,6 +44,7 @@ using std::placeholders::_1;
 using std::placeholders::_2;
 using std::shared_ptr;
 using std::string;
+using std::unique_ptr;
 
 using Glib::VariantBase;
 
@@ -51,8 +57,24 @@ namespace pv {
 DeviceManager::DeviceManager(shared_ptr<Context> context) :
 	context_(context)
 {
-	for (auto entry : context->drivers())
+	unique_ptr<QProgressDialog> progress(new QProgressDialog("",
+		QObject::tr("Cancel"), 0, context->drivers().size()));
+	progress->setWindowModality(Qt::WindowModal);
+	progress->setMinimumDuration(1);  // To show the dialog immediately
+
+	int entry_num = 1;
+
+	for (auto entry : context->drivers()) {
+		progress->setLabelText(QObject::tr("Scanning for %1...")
+			.arg(QString::fromStdString(entry.first)));
+
 		driver_scan(entry.second, map<const ConfigKey *, VariantBase>());
+
+		progress->setValue(entry_num++);
+		QApplication::processEvents();
+		if (progress->wasCanceled())
+			break;
+	}
 }
 
 const shared_ptr<sigrok::Context>& DeviceManager::context() const