summaryrefslogtreecommitdiffstats
path: root/rbutil/rbutilqt/gui/manualwidget.cpp
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2020-11-14 16:23:56 +0100
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2020-11-14 16:42:29 +0100
commit2509def164ee7f4aecbe6a786df57140f19e35f2 (patch)
tree63a7396e1b94482f9f05c3f3abf6c7cd77e10d26 /rbutil/rbutilqt/gui/manualwidget.cpp
parent440083af872da43c116c5374d8e1511cef65abf2 (diff)
downloadrockbox-2509def164ee7f4aecbe6a786df57140f19e35f2.tar.gz
rockbox-2509def164ee7f4aecbe6a786df57140f19e35f2.tar.bz2
rockbox-2509def164ee7f4aecbe6a786df57140f19e35f2.zip
rbutil: Rework player configuration.
- Split internal configuration into player specific and common parts. Always require passing the player for player specific data instead of implicitly assuming the currently selected one; only use the currently selected one if the player name is explicitly passed as empty. - Similarly adjust handling of server info data; prepare for splitting into build type specific values so the naming becomes cleaner. Change-Id: I894e694f83bd9fe2d22ad46b3f8f7df3e2c68033
Diffstat (limited to 'rbutil/rbutilqt/gui/manualwidget.cpp')
-rw-r--r--rbutil/rbutilqt/gui/manualwidget.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/rbutil/rbutilqt/gui/manualwidget.cpp b/rbutil/rbutilqt/gui/manualwidget.cpp
index 0ba3012aea..23adc3cf46 100644
--- a/rbutil/rbutilqt/gui/manualwidget.cpp
+++ b/rbutil/rbutilqt/gui/manualwidget.cpp
@@ -42,9 +42,9 @@ void ManualWidget::updateManual()
if(!m_platform.isEmpty())
{
ui.labelPdfManual->setText(tr("<a href='%1'>PDF Manual</a>")
- .arg(ServerInfo::platformValue(m_platform, ServerInfo::ManualPdfUrl).toString()));
+ .arg(ServerInfo::platformValue(ServerInfo::ManualPdfUrl, m_platform).toString()));
ui.labelHtmlManual->setText(tr("<a href='%1'>HTML Manual (opens in browser)</a>")
- .arg(ServerInfo::platformValue(m_platform, ServerInfo::ManualHtmlUrl).toString()));
+ .arg(ServerInfo::platformValue(ServerInfo::ManualHtmlUrl, m_platform).toString()));
}
else {
ui.labelPdfManual->setText(tr("Select a device for a link to the correct manual"));
@@ -65,9 +65,9 @@ void ManualWidget::downloadManual(void)
QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes) {
return;
}
- QString manual = SystemInfo::value(SystemInfo::CurManual).toString();
+ QString manual = SystemInfo::platformValue(SystemInfo::CurManual).toString();
if(manual.isEmpty()) {
- manual = "rockbox-" + SystemInfo::value(SystemInfo::CurBuildserverModel).toString();
+ manual = "rockbox-" + SystemInfo::platformValue(SystemInfo::CurBuildserverModel).toString();
}
ProgressLoggerGui* logger = new ProgressLoggerGui(this);
@@ -78,14 +78,14 @@ void ManualWidget::downloadManual(void)
installer->setCache(true);
if(ui.radioPdf->isChecked()) {
- installer->setUrl(ServerInfo::platformValue(m_platform,
- ServerInfo::ManualPdfUrl).toString());
+ installer->setUrl(ServerInfo::platformValue(
+ ServerInfo::ManualPdfUrl, m_platform).toString());
installer->setLogSection("Manual (PDF)");
installer->setTarget("/" + manual + ".pdf");
}
else {
- installer->setUrl(ServerInfo::platformValue(m_platform,
- ServerInfo::ManualZipUrl).toString());
+ installer->setUrl(ServerInfo::platformValue(
+ ServerInfo::ManualZipUrl, m_platform).toString());
installer->setLogSection("Manual (HTML)");
installer->setTarget("/" + manual + "-" + "-html.zip");
}