diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2013-09-16 16:59:09 +0200 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2013-09-18 23:37:38 +0200 |
commit | 935c7fbff741349b4ecebda212a870a31c8cb97d (patch) | |
tree | 79cc13082636119533d54224e6efa589f93f2290 /rbutil/rbutilqt | |
parent | 3dcf833edd559509c3258f75958cc39d0d074f83 (diff) | |
download | rockbox-935c7fbff741349b4ecebda212a870a31c8cb97d.tar.gz rockbox-935c7fbff741349b4ecebda212a870a31c8cb97d.zip |
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
Diffstat (limited to 'rbutil/rbutilqt')
-rw-r--r-- | rbutil/rbutilqt/configure.cpp | 20 |
1 files changed, 17 insertions, 3 deletions
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() | |||
734 | this->unsetCursor(); | 734 | this->unsetCursor(); |
735 | if(detected.size() > 1) { | 735 | if(detected.size() > 1) { |
736 | // FIXME: handle multiple found players. | 736 | // FIXME: handle multiple found players. |
737 | QMessageBox::information(this, tr("Device Detection"), | 737 | QString msg; |
738 | tr("Multiple devices have been detected. Please disconnect " | 738 | msg = tr("Multiple devices have been detected. Please disconnect " |
739 | "all players but one and try again.")); | 739 | "all players but one and try again."); |
740 | msg += "<br/>"; | ||
741 | msg += tr("Detected devices:"); | ||
742 | msg += "<ul>"; | ||
743 | for(int i = 0; i < detected.size(); ++i) { | ||
744 | msg += QString("<li>%1</li>").arg( | ||
745 | SystemInfo::platformValue(detected.at(i).device, | ||
746 | SystemInfo::CurPlatformName).toString()); | ||
747 | } | ||
748 | msg += "</ul>"; | ||
749 | msg += tr("Note: detecting connected devices might be ambiguous. " | ||
750 | "You might have less devices connected than listed. " | ||
751 | "In this case it might not be possible to detect your " | ||
752 | "player unambiguously."); | ||
753 | QMessageBox::information(this, tr("Device Detection"), msg); | ||
740 | ui.treeDevices->setEnabled(true); | 754 | ui.treeDevices->setEnabled(true); |
741 | } | 755 | } |
742 | else if(detected.size() == 0) { | 756 | else if(detected.size() == 0) { |