diff options
| author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2020-11-14 16:33:48 +0100 |
|---|---|---|
| committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2020-11-14 16:42:29 +0100 |
| commit | be1be797b24acb5d78ad55502dd9bd7306482c0d (patch) | |
| tree | 89b53978c457d63591a1d9238ed859b93c0cc10f /rbutil/rbutilqt/gui/selectiveinstallwidget.cpp | |
| parent | 2509def164ee7f4aecbe6a786df57140f19e35f2 (diff) | |
| download | rockbox-be1be797b2.tar.gz rockbox-be1be797b2.zip | |
rbutil: Rework player configuration.
Rename config entries and remove now unnecessary default value handling.
Change-Id: I5c60ef9769fc01f45f45290dafffb80c1962e674
Diffstat (limited to 'rbutil/rbutilqt/gui/selectiveinstallwidget.cpp')
| -rw-r--r-- | rbutil/rbutilqt/gui/selectiveinstallwidget.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp b/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp index 5baf774fc3..065a139436 100644 --- a/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp +++ b/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp @@ -82,7 +82,7 @@ void SelectiveInstallWidget::updateVersion(void) m_mountpoint = RbSettings::value(RbSettings::Mountpoint).toString(); m_target = RbSettings::value(RbSettings::CurrentPlatform).toString(); m_blmethod = SystemInfo::platformValue( - SystemInfo::CurBootloaderMethod, m_target).toString(); + SystemInfo::BootloaderMethod, m_target).toString(); if(m_logger != NULL) { delete m_logger; @@ -237,7 +237,7 @@ void SelectiveInstallWidget::installBootloader(void) // create installer BootloaderInstallBase *bl = BootloaderInstallHelper::createBootloaderInstaller(this, - SystemInfo::platformValue(SystemInfo::CurBootloaderMethod).toString()); + SystemInfo::platformValue(SystemInfo::BootloaderMethod).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::platformValue(SystemInfo::CurBootloaderFile).toStringList(); + QStringList blfile = SystemInfo::platformValue(SystemInfo::BootloaderFile).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::platformValue(SystemInfo::CurBootloaderName).toString()); + + SystemInfo::platformValue(SystemInfo::BootloaderName).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::platformValue(SystemInfo::CurPlatformName).toString() + QString targetFolder = SystemInfo::platformValue(SystemInfo::PlatformName).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::platformValue(SystemInfo::CurBootloaderFilter).toString(); + = SystemInfo::platformValue(SystemInfo::BootloaderFilter).toString(); if(!filter.isEmpty()) { filter = tr("Bootloader files (%1)").arg(filter) + ";;"; } |