diff options
| author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2012-09-05 22:39:47 +0200 |
|---|---|---|
| committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2012-09-05 22:40:15 +0200 |
| commit | 4f99dd4264f9aaaccbf3da6bba37d5b2c7eb6f32 (patch) | |
| tree | 4527d9a0cc4013bff7e08a87e3ee1f6fe505e8e3 | |
| parent | 05caadbca3cf3c40264e39eae96b8eed61ededab (diff) | |
| download | rockbox-4f99dd4264f9aaaccbf3da6bba37d5b2c7eb6f32.zip rockbox-4f99dd4264f9aaaccbf3da6bba37d5b2c7eb6f32.tar.gz rockbox-4f99dd4264f9aaaccbf3da6bba37d5b2c7eb6f32.tar.bz2 rockbox-4f99dd4264f9aaaccbf3da6bba37d5b2c7eb6f32.tar.xz | |
Fix manual URLs not getting updated properly on device change.
Change-Id: I5aaf62b5b7eb298e4d10fc8d854594dce051b2b6
| -rw-r--r-- | rbutil/rbutilqt/gui/manualwidget.cpp | 14 | ||||
| -rw-r--r-- | rbutil/rbutilqt/gui/manualwidget.h | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/rbutil/rbutilqt/gui/manualwidget.cpp b/rbutil/rbutilqt/gui/manualwidget.cpp index 1040701..5bb88d1 100644 --- a/rbutil/rbutilqt/gui/manualwidget.cpp +++ b/rbutil/rbutilqt/gui/manualwidget.cpp @@ -28,19 +28,21 @@ ManualWidget::ManualWidget(QWidget *parent) : QWidget(parent) { ui.setupUi(this); 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())); } 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>") - .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>") - .arg(ServerInfo::platformValue(platform, ServerInfo::ManualHtmlUrl).toString())); + .arg(ServerInfo::platformValue(m_platform, ServerInfo::ManualHtmlUrl).toString())); } else { 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); if(ui.radioPdf->isChecked()) { - installer->setUrl(ServerInfo::platformValue(platform, + installer->setUrl(ServerInfo::platformValue(m_platform, ServerInfo::ManualPdfUrl).toString()); installer->setLogSection("Manual (PDF)"); installer->setTarget("/" + manual + ".pdf"); } else { - installer->setUrl(ServerInfo::platformValue(platform, + installer->setUrl(ServerInfo::platformValue(m_platform, ServerInfo::ManualZipUrl).toString()); installer->setLogSection("Manual (HTML)"); installer->setTarget("/" + manual + "-" + "-html.zip"); diff --git a/rbutil/rbutilqt/gui/manualwidget.h b/rbutil/rbutilqt/gui/manualwidget.h index 31c67c5..6e771dd 100644 --- a/rbutil/rbutilqt/gui/manualwidget.h +++ b/rbutil/rbutilqt/gui/manualwidget.h @@ -35,7 +35,7 @@ class ManualWidget : public QWidget private: void changeEvent(QEvent*); Ui::ManualWidgetFrm ui; - QString platform; + QString m_platform; }; #endif |