len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-08 12:45:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix manual URLs not getting updated properly on device change.

Browse source 
Change-Id: I5aaf62b5b7eb298e4d10fc8d854594dce051b2b6
This commit is contained in:
Dominik Riebeling 2012-09-05 22:39:47 +02:00
parent 05caadbca3
commit 4f99dd4264
2 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
rbutil/rbutilqt/gui/manualwidget.cpp
View file

@ -28,19 +28,21 @@ ManualWidget::ManualWidget(QWidget *parent) : QWidget(parent)
{ {
ui.setupUi(this); ui.setupUi(this);
ui.radioPdf->setChecked(true); ui.radioPdf->setChecked(true);
platform = RbSettings::value(RbSettings::Platform).toString(); m_platform = RbSettings::value(RbSettings::Platform).toString();
connect(ui.buttonDownloadManual, SIGNAL(clicked()), this, SLOT(downloadManual())); connect(ui.buttonDownloadManual, SIGNAL(clicked()), this, SLOT(downloadManual()));
} }
void ManualWidget::updateManual() void ManualWidget::updateManual()
{ {
if(!RbSettings::value(RbSettings::Platform).toString().isEmpty()) qDebug() << "[ManualWidget] updating manual URLs";
m_platform = RbSettings::value(RbSettings::Platform).toString();
if(!m_platform.isEmpty())
{ {
ui.labelPdfManual->setText(tr("<a href='%1'>PDF Manual</a>") ui.labelPdfManual->setText(tr("<a href='%1'>PDF Manual</a>")
.arg(ServerInfo::platformValue(platform, ServerInfo::ManualPdfUrl).toString())); .arg(ServerInfo::platformValue(m_platform, ServerInfo::ManualPdfUrl).toString()));
ui.labelHtmlManual->setText(tr("<a href='%1'>HTML Manual (opens in browser)</a>") ui.labelHtmlManual->setText(tr("<a href='%1'>HTML Manual (opens in browser)</a>")
.arg(ServerInfo::platformValue(platform, ServerInfo::ManualHtmlUrl).toString())); .arg(ServerInfo::platformValue(m_platform, ServerInfo::ManualHtmlUrl).toString()));
} }
else { else {
ui.labelPdfManual->setText(tr("Select a device for a link to the correct manual")); ui.labelPdfManual->setText(tr("Select a device for a link to the correct manual"));
@ -74,13 +76,13 @@ void ManualWidget::downloadManual(void)
installer->setCache(true); installer->setCache(true);
if(ui.radioPdf->isChecked()) { if(ui.radioPdf->isChecked()) {
installer->setUrl(ServerInfo::platformValue(platform, installer->setUrl(ServerInfo::platformValue(m_platform,
ServerInfo::ManualPdfUrl).toString()); ServerInfo::ManualPdfUrl).toString());
installer->setLogSection("Manual (PDF)"); installer->setLogSection("Manual (PDF)");
installer->setTarget("/" + manual + ".pdf"); installer->setTarget("/" + manual + ".pdf");
} }
else { else {
installer->setUrl(ServerInfo::platformValue(platform, installer->setUrl(ServerInfo::platformValue(m_platform,
ServerInfo::ManualZipUrl).toString()); ServerInfo::ManualZipUrl).toString());
installer->setLogSection("Manual (HTML)"); installer->setLogSection("Manual (HTML)");
installer->setTarget("/" + manual + "-" + "-html.zip"); installer->setTarget("/" + manual + "-" + "-html.zip");

2
rbutil/rbutilqt/gui/manualwidget.h
View file

@ -35,7 +35,7 @@ class ManualWidget : public QWidget
private: private:
void changeEvent(QEvent*); void changeEvent(QEvent*);
Ui::ManualWidgetFrm ui; Ui::ManualWidgetFrm ui;
QString platform; QString m_platform;
}; };
#endif #endif