From 935c7fbff741349b4ecebda212a870a31c8cb97d Mon Sep 17 00:00:00 2001
From: Dominik Riebeling <Dominik.Riebeling@gmail.com>
Date: Mon, 16 Sep 2013 16:59:09 +0200
Subject: List detected devices if multiple are found.

In preparation of giving the user a list to choose from add displaying a list
of all devices connected. Since devices might be ambiguous (multiple devices
share the same USB ID but detecting by other means failed) the listed devices
might exceed the number of actually attached ones.

Change-Id: Ice52da15523e5f3493a6fb687392301c4d5b8a36
---
 rbutil/rbutilqt/configure.cpp | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

(limited to 'rbutil/rbutilqt')

diff --git a/rbutil/rbutilqt/configure.cpp b/rbutil/rbutilqt/configure.cpp
index acd68aa52d..7416a55ccb 100644
--- a/rbutil/rbutilqt/configure.cpp
+++ b/rbutil/rbutilqt/configure.cpp
@@ -734,9 +734,23 @@ void Config::autodetect()
     this->unsetCursor();
     if(detected.size() > 1) {
         // FIXME: handle multiple found players.
-        QMessageBox::information(this, tr("Device Detection"),
-                tr("Multiple devices have been detected. Please disconnect "
-                   "all players but one and try again."));
+        QString msg;
+        msg = tr("Multiple devices have been detected. Please disconnect "
+                 "all players but one and try again.");
+        msg += "<br/>";
+        msg += tr("Detected devices:");
+        msg += "<ul>";
+        for(int i = 0; i < detected.size(); ++i) {
+            msg += QString("<li>%1</li>").arg(
+                        SystemInfo::platformValue(detected.at(i).device,
+                                      SystemInfo::CurPlatformName).toString());
+        }
+        msg += "</ul>";
+        msg += tr("Note: detecting connected devices might be ambiguous. "
+                  "You might have less devices connected than listed. "
+                  "In this case it might not be possible to detect your "
+                  "player unambiguously.");
+        QMessageBox::information(this, tr("Device Detection"), msg);
         ui.treeDevices->setEnabled(true);
     }
     else if(detected.size() == 0) {
-- 
cgit v1.2.3