summaryrefslogtreecommitdiffstats
path: root/rbutil/rbutilqt/configure.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'rbutil/rbutilqt/configure.cpp')
-rw-r--r--rbutil/rbutilqt/configure.cpp34
1 files changed, 19 insertions, 15 deletions
diff --git a/rbutil/rbutilqt/configure.cpp b/rbutil/rbutilqt/configure.cpp
index 3dff2b1397..dafa9997a4 100644
--- a/rbutil/rbutilqt/configure.cpp
+++ b/rbutil/rbutilqt/configure.cpp
@@ -29,6 +29,8 @@
#include "system.h"
#include "encttscfggui.h"
#include "rbsettings.h"
+#include "serverinfo.h"
+#include "systeminfo.h"
#include "utils.h"
#include <stdio.h>
#if defined(Q_OS_WIN32)
@@ -286,14 +288,15 @@ void Config::setDevices()
// setup devices table
qDebug() << "[Config] setting up devices list";
- QStringList platformList = RbSettings::platforms();
+ QStringList platformList = SystemInfo::platforms();
QMap <QString, QString> manuf;
QMap <QString, QString> devcs;
for(int it = 0; it < platformList.size(); it++)
{
- QString curname = RbSettings::name(platformList.at(it));
- QString curbrand = RbSettings::brand(platformList.at(it));
+ QString curname = SystemInfo::name(platformList.at(it)) +
+ " (" +ServerInfo::platformValue(platformList.at(it),ServerInfo::CurStatus).toString() + ")";
+ QString curbrand = SystemInfo::brand(platformList.at(it));
manuf.insertMulti(curbrand, platformList.at(it));
devcs.insert(platformList.at(it), curname);
}
@@ -321,8 +324,9 @@ void Config::setDevices()
// go through platforms again for sake of order
for(int it = 0; it < platformList.size(); it++) {
- QString curname = RbSettings::name(platformList.at(it));
- QString curbrand = RbSettings::brand(platformList.at(it));
+ QString curname = SystemInfo::name(platformList.at(it)) +
+ " (" +ServerInfo::platformValue(platformList.at(it),ServerInfo::CurStatus).toString() +")";
+ QString curbrand = SystemInfo::brand(platformList.at(it));
if(curbrand != brands.at(c)) continue;
qDebug() << "[Config] add supported device:" << brands.at(c) << curname;
@@ -382,10 +386,10 @@ void Config::updateEncState()
return;
QString devname = ui.treeDevices->selectedItems().at(0)->data(0, Qt::UserRole).toString();
- QString encoder = RbSettings::platformValue(devname,
- RbSettings::CurEncoder).toString();
- ui.encoderName->setText(EncBase::getEncoderName(RbSettings::platformValue(devname,
- RbSettings::CurEncoder).toString()));
+ QString encoder = SystemInfo::platformValue(devname,
+ SystemInfo::CurEncoder).toString();
+ ui.encoderName->setText(EncBase::getEncoderName(SystemInfo::platformValue(devname,
+ SystemInfo::CurEncoder).toString()));
EncBase* enc = EncBase::getEncoder(this,encoder);
@@ -601,8 +605,8 @@ void Config::autodetect()
QString text;
text = tr("Detected an unsupported player:\n%1\n"
"Sorry, Rockbox doesn't run on your player.")
- .arg(RbSettings::platformValue(detector.incompatdev(),
- RbSettings::CurName).toString());
+ .arg(SystemInfo::platformValue(detector.incompatdev(),
+ SystemInfo::CurName).toString());
QMessageBox::critical(this, tr("Fatal: player incompatible"),
text, QMessageBox::Ok);
@@ -723,10 +727,10 @@ void Config::configEnc()
return;
QString devname = ui.treeDevices->selectedItems().at(0)->data(0, Qt::UserRole).toString();
- QString encoder = RbSettings::platformValue(devname,
- RbSettings::CurEncoder).toString();
- ui.encoderName->setText(EncBase::getEncoderName(RbSettings::platformValue(devname,
- RbSettings::CurEncoder).toString()));
+ QString encoder = SystemInfo::platformValue(devname,
+ SystemInfo::CurEncoder).toString();
+ ui.encoderName->setText(EncBase::getEncoderName(SystemInfo::platformValue(devname,
+ SystemInfo::CurEncoder).toString()));
EncBase* enc = EncBase::getEncoder(this,encoder);