len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-10 13:42:29 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

rbutil: Move Manual installation to main tab.

Browse source 
The manual tab didn't show the manual, so it's clearer to have that as
part of the main tab.

Also fixes the wrong manual getting downloaded for releases.

Change-Id: I5d4a287102af037f94f0de8464e025d9ff5f76ed
This commit is contained in:
Dominik Riebeling 2020-11-22 11:19:41 +01:00
parent 5f36aed4bf
commit ba2bbd60bd
16 changed files with 221 additions and 446 deletions
Download patch file Download diff file Expand all files Collapse all files

64
rbutil/rbutilqt/gui/selectiveinstallwidget.cpp
View file

@ -40,6 +40,11 @@ SelectiveInstallWidget::SelectiveInstallWidget(QWidget* parent) : QWidget(parent
ui.themesCheckbox->setChecked(RbSettings::value(RbSettings::InstallThemes).toBool());
ui.gamefileCheckbox->setChecked(RbSettings::value(RbSettings::InstallGamefiles).toBool());
ui.voiceCheckbox->setChecked(RbSettings::value(RbSettings::InstallVoice).toBool());
ui.manualCheckbox->setChecked(RbSettings::value(RbSettings::InstallManual).toBool());
ui.manualCombobox->addItem("PDF", "pdf");
ui.manualCombobox->addItem("HTML (zip)", "zip");
ui.manualCombobox->addItem("HTML", "html");
// check if Rockbox is installed by looking after rockbox-info.txt.
// If installed uncheck bootloader installation.
@ -201,6 +206,7 @@ void SelectiveInstallWidget::saveSettings(void)
RbSettings::setValue(RbSettings::InstallThemes, ui.themesCheckbox->isChecked());
RbSettings::setValue(RbSettings::InstallGamefiles, ui.gamefileCheckbox->isChecked());
RbSettings::setValue(RbSettings::InstallVoice, ui.voiceCheckbox->isChecked());
RbSettings::setValue(RbSettings::InstallManual, ui.manualCheckbox->isChecked());
RbSettings::setValue(RbSettings::VoiceLanguage, ui.voiceCombobox->currentData().toString());
}
@ -244,7 +250,7 @@ void SelectiveInstallWidget::continueInstall(bool error)
if(error) {
LOG_ERROR() << "Last part returned error.";
m_logger->setFinished();
m_installStage = 7;
m_installStage = 9;
}
m_installStage++;
switch(m_installStage) {
@ -255,11 +261,12 @@ void SelectiveInstallWidget::continueInstall(bool error)
case 4: installThemes(); break;
case 5: installGamefiles(); break;
case 6: installVoicefile(); break;
case 7: installBootloaderPost(); break;
case 7: installManual(); break;
case 8: installBootloaderPost(); break;
default: break;
}
if(m_installStage > 6) {
if(m_installStage > 8) {
LOG_INFO() << "All install stages done.";
m_logger->setFinished();
if(m_blmethod != "none") {
@ -548,6 +555,57 @@ void SelectiveInstallWidget::installVoicefile(void)
}
}
void SelectiveInstallWidget::installManual(void)
{
if(ui.manualCheckbox->isChecked() && ui.manualCheckbox->isEnabled()) {
LOG_INFO() << "installing Manual";
QString mantype = ui.manualCombobox->currentData().toString();
RockboxInfo installInfo(m_mountpoint);
QString manualurl;
QString logversion;
QString relversion = installInfo.release();
if(m_buildtype != SystemInfo::BuildRelease) {
// release is empty for non-release versions (i.e. daily / current)
logversion = installInfo.release();
}
manualurl = SystemInfo::value(SystemInfo::ManualUrl, m_buildtype).toString();
manualurl.replace("%RELVERSION%", m_versions[m_buildtype]);
QString model = SystemInfo::platformValue(SystemInfo::Manual, m_target).toString();
if(model.isEmpty())
model = m_target;
manualurl.replace("%MODEL%", model);
if(mantype == "pdf")
manualurl.replace("%FORMAT%", ".pdf");
else
manualurl.replace("%FORMAT%", "-html.zip");
// create new zip installer
if(m_zipinstaller != nullptr) m_zipinstaller->deleteLater();
m_zipinstaller = new ZipInstaller(this);
m_zipinstaller->setUrl(manualurl);
m_zipinstaller->setLogSection("Manual Voice (" + mantype + ")");
m_zipinstaller->setLogVersion(logversion);
m_zipinstaller->setMountPoint(m_mountpoint);
if(!RbSettings::value(RbSettings::CacheDisabled).toBool())
m_zipinstaller->setCache(true);
// if type is html extract it.
m_zipinstaller->setUnzip(mantype == "html");
connect(m_zipinstaller, SIGNAL(done(bool)), this, SLOT(continueInstall(bool)));
connect(m_zipinstaller, SIGNAL(logItem(QString, int)), m_logger, SLOT(addItem(QString, int)));
connect(m_zipinstaller, SIGNAL(logProgress(int, int)), m_logger, SLOT(setProgress(int, int)));
connect(m_logger, SIGNAL(aborted()), m_zipinstaller, SLOT(abort()));
m_zipinstaller->install();
}
else {
LOG_INFO() << "Manual install disabled.";
emit installSkipped(false);
}
}
void SelectiveInstallWidget::customizeThemes(void)
{
if(m_themesinstaller == nullptr)