summaryrefslogtreecommitdiff
path: root/rbutil/rbutilqt/configure.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'rbutil/rbutilqt/configure.cpp')
-rw-r--r--rbutil/rbutilqt/configure.cpp26
1 files changed, 14 insertions, 12 deletions
diff --git a/rbutil/rbutilqt/configure.cpp b/rbutil/rbutilqt/configure.cpp
index 6b784a6383..721727f109 100644
--- a/rbutil/rbutilqt/configure.cpp
+++ b/rbutil/rbutilqt/configure.cpp
@@ -346,18 +346,20 @@ void Config::setDevices()
346 // setup devices table 346 // setup devices table
347 LOG_INFO() << "setting up devices list"; 347 LOG_INFO() << "setting up devices list";
348 348
349 QStringList platformList; 349 QStringList targets;
350 if(ui.showDisabled->isChecked()) 350 if(ui.showDisabled->isChecked())
351 platformList = SystemInfo::platforms(SystemInfo::PlatformAllDisabled); 351 targets = PlayerBuildInfo::instance()->value(
352 PlayerBuildInfo::TargetNamesAll).toStringList();
352 else 353 else
353 platformList = SystemInfo::platforms(SystemInfo::PlatformAll); 354 targets = PlayerBuildInfo::instance()->value(
355 PlayerBuildInfo::TargetNamesEnabled).toStringList();
354 356
355 QMultiMap <QString, QString> manuf; 357 QMultiMap <QString, QString> manuf;
356 for(int it = 0; it < platformList.size(); it++) 358 for(int it = 0; it < targets.size(); it++)
357 { 359 {
358 QString curbrand = PlayerBuildInfo::instance()->value( 360 QString curbrand = PlayerBuildInfo::instance()->value(
359 PlayerBuildInfo::Brand, platformList.at(it)).toString(); 361 PlayerBuildInfo::Brand, targets.at(it)).toString();
360 manuf.insert(curbrand, platformList.at(it)); 362 manuf.insert(curbrand, targets.at(it));
361 } 363 }
362 364
363 // set up devices table 365 // set up devices table
@@ -379,20 +381,20 @@ void Config::setDevices()
379 w->setText(0, brands.at(c)); 381 w->setText(0, brands.at(c));
380 items.append(w); 382 items.append(w);
381 // go through platforms and add all players matching the current brand 383 // go through platforms and add all players matching the current brand
382 for(int it = 0; it < platformList.size(); it++) { 384 for(int it = 0; it < targets.size(); it++) {
383 // skip if not current brand 385 // skip if not current brand
384 if(!manuf.values(brands.at(c)).contains(platformList.at(it))) 386 if(!manuf.values(brands.at(c)).contains(targets.at(it)))
385 continue; 387 continue;
386 // construct display name 388 // construct display name
387 QString curname = QString("%1 (%2)").arg( 389 QString curname = QString("%1 (%2)").arg(
388 PlayerBuildInfo::instance()->value(PlayerBuildInfo::DisplayName, 390 PlayerBuildInfo::instance()->value(PlayerBuildInfo::DisplayName,
389 platformList.at(it)).toString(), 391 targets.at(it)).toString(),
390 PlayerBuildInfo::instance()->statusAsString(platformList.at(it))); 392 PlayerBuildInfo::instance()->statusAsString(targets.at(it)));
391 LOG_INFO() << "add supported device:" << brands.at(c) << curname; 393 LOG_INFO() << "add supported device:" << brands.at(c) << curname;
392 w2 = new QTreeWidgetItem(w, QStringList(curname)); 394 w2 = new QTreeWidgetItem(w, QStringList(curname));
393 w2->setData(0, Qt::UserRole, platformList.at(it)); 395 w2->setData(0, Qt::UserRole, targets.at(it));
394 396
395 if(platformList.at(it) == selected) { 397 if(targets.at(it) == selected) {
396 w2->setSelected(true); 398 w2->setSelected(true);
397 w->setExpanded(true); 399 w->setExpanded(true);
398 w3 = w2; // save pointer to hilight old selection 400 w3 = w2; // save pointer to hilight old selection