diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2020-11-14 16:23:56 +0100 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2020-11-14 16:42:29 +0100 |
commit | 2509def164ee7f4aecbe6a786df57140f19e35f2 (patch) | |
tree | 63a7396e1b94482f9f05c3f3abf6c7cd77e10d26 /rbutil/rbutilqt/gui | |
parent | 440083af872da43c116c5374d8e1511cef65abf2 (diff) | |
download | rockbox-2509def164ee7f4aecbe6a786df57140f19e35f2.tar.gz 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')
-rw-r--r-- | rbutil/rbutilqt/gui/manualwidget.cpp | 16 | ||||
-rw-r--r-- | rbutil/rbutilqt/gui/selectiveinstallwidget.cpp | 36 |
2 files changed, 26 insertions, 26 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"); } diff --git a/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp b/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp index 9b5bc4d653..5baf774fc3 100644 --- a/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp +++ b/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp @@ -69,7 +69,7 @@ void SelectiveInstallWidget::selectedVersionChanged(int index) if(current == "development") ui.selectedDescription->setText(tr("The development version is " "updated on every code change. Last update was on %1").arg( - ServerInfo::value(ServerInfo::BleedingDate).toString())); + ServerInfo::platformValue(ServerInfo::BleedingDate).toString())); if(current == "rc") ui.selectedDescription->setText(tr("This will eventually become the " "next Rockbox version. Install it to help testing.")); @@ -81,8 +81,8 @@ void SelectiveInstallWidget::updateVersion(void) // get some configuration values globally m_mountpoint = RbSettings::value(RbSettings::Mountpoint).toString(); m_target = RbSettings::value(RbSettings::CurrentPlatform).toString(); - m_blmethod = SystemInfo::platformValue(m_target, - SystemInfo::CurBootloaderMethod).toString(); + m_blmethod = SystemInfo::platformValue( + SystemInfo::CurBootloaderMethod, m_target).toString(); if(m_logger != NULL) { delete m_logger; @@ -91,11 +91,11 @@ void SelectiveInstallWidget::updateVersion(void) // re-populate all version items m_versions.clear(); - m_versions.insert("release", ServerInfo::value(ServerInfo::CurReleaseVersion).toString()); + m_versions.insert("release", ServerInfo::platformValue(ServerInfo::CurReleaseVersion).toString()); // Don't populate RC or development selections if target has been retired. - if (ServerInfo::value(ServerInfo::CurStatus) != tr("Stable (Retired)")) { - m_versions.insert("development", ServerInfo::value(ServerInfo::BleedingRevision).toString()); - m_versions.insert("rc", ServerInfo::value(ServerInfo::RelCandidateVersion).toString()); + if (ServerInfo::platformValue(ServerInfo::CurStatus) != tr("Stable (Retired)")) { + m_versions.insert("development", ServerInfo::platformValue(ServerInfo::BleedingRevision).toString()); + m_versions.insert("rc", ServerInfo::platformValue(ServerInfo::RelCandidateVersion).toString()); } ui.selectedVersion->clear(); @@ -237,7 +237,7 @@ void SelectiveInstallWidget::installBootloader(void) // create installer BootloaderInstallBase *bl = BootloaderInstallHelper::createBootloaderInstaller(this, - SystemInfo::value(SystemInfo::CurBootloaderMethod).toString()); + SystemInfo::platformValue(SystemInfo::CurBootloaderMethod).toString()); if(bl == NULL) { m_logger->addItem(tr("No install method known."), LOGERROR); m_logger->setFinished(); @@ -254,7 +254,7 @@ void SelectiveInstallWidget::installBootloader(void) connect(m_logger, SIGNAL(aborted()), bl, SLOT(progressAborted())); // set bootloader filename. Do this now as installed() needs it. - QStringList blfile = SystemInfo::value(SystemInfo::CurBootloaderFile).toStringList(); + QStringList blfile = SystemInfo::platformValue(SystemInfo::CurBootloaderFile).toStringList(); QStringList blfilepath; for(int a = 0; a < blfile.size(); a++) { blfilepath.append(RbSettings::value(RbSettings::Mountpoint).toString() @@ -262,7 +262,7 @@ void SelectiveInstallWidget::installBootloader(void) } bl->setBlFile(blfilepath); QUrl url(SystemInfo::value(SystemInfo::BootloaderUrl).toString() - + SystemInfo::value(SystemInfo::CurBootloaderName).toString()); + + SystemInfo::platformValue(SystemInfo::CurBootloaderName).toString()); bl->setBlUrl(url); bl->setLogfile(RbSettings::value(RbSettings::Mountpoint).toString() + "/.rockbox/rbutil.log"); @@ -282,7 +282,7 @@ void SelectiveInstallWidget::installBootloader(void) else if(bl->installed() == BootloaderInstallBase::BootloaderOther && bl->capabilities() & BootloaderInstallBase::Backup) { - QString targetFolder = SystemInfo::value(SystemInfo::CurPlatformName).toString() + QString targetFolder = SystemInfo::platformValue(SystemInfo::CurPlatformName).toString() + " Firmware Backup"; // remove invalid character(s) targetFolder.remove(QRegExp("[:/]")); @@ -319,7 +319,7 @@ void SelectiveInstallWidget::installBootloader(void) // open dialog to browse to of file QString offile; QString filter - = SystemInfo::value(SystemInfo::CurBootloaderFilter).toString(); + = SystemInfo::platformValue(SystemInfo::CurBootloaderFilter).toString(); if(!filter.isEmpty()) { filter = tr("Bootloader files (%1)").arg(filter) + ";;"; } @@ -385,12 +385,12 @@ void SelectiveInstallWidget::installRockbox(void) RbSettings::setValue(RbSettings::Build, selected); RbSettings::sync(); - if(selected == "release") url = ServerInfo::platformValue(m_target, - ServerInfo::CurReleaseUrl).toString(); - else if(selected == "development") url = ServerInfo::platformValue(m_target, - ServerInfo::CurDevelUrl).toString(); - else if(selected == "rc") url = ServerInfo::platformValue(m_target, - ServerInfo::RelCandidateUrl).toString(); + if(selected == "release") url = ServerInfo::platformValue( + ServerInfo::CurReleaseUrl, m_target).toString(); + else if(selected == "development") url = ServerInfo::platformValue( + ServerInfo::CurDevelUrl, m_target).toString(); + else if(selected == "rc") url = ServerInfo::platformValue( + ServerInfo::RelCandidateUrl, m_target).toString(); //! install build if(m_zipinstaller != NULL) m_zipinstaller->deleteLater(); |