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.tar.gz rockbox-4f99dd4264f9aaaccbf3da6bba37d5b2c7eb6f32.zip |
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 10407017c9..5bb88d1982 100644 --- a/rbutil/rbutilqt/gui/manualwidget.cpp +++ b/rbutil/rbutilqt/gui/manualwidget.cpp | |||
@@ -28,19 +28,21 @@ ManualWidget::ManualWidget(QWidget *parent) : QWidget(parent) | |||
28 | { | 28 | { |
29 | ui.setupUi(this); | 29 | ui.setupUi(this); |
30 | ui.radioPdf->setChecked(true); | 30 | ui.radioPdf->setChecked(true); |
31 | platform = RbSettings::value(RbSettings::Platform).toString(); | 31 | m_platform = RbSettings::value(RbSettings::Platform).toString(); |
32 | connect(ui.buttonDownloadManual, SIGNAL(clicked()), this, SLOT(downloadManual())); | 32 | connect(ui.buttonDownloadManual, SIGNAL(clicked()), this, SLOT(downloadManual())); |
33 | } | 33 | } |
34 | 34 | ||
35 | 35 | ||
36 | void ManualWidget::updateManual() | 36 | void ManualWidget::updateManual() |
37 | { | 37 | { |
38 | if(!RbSettings::value(RbSettings::Platform).toString().isEmpty()) | 38 | qDebug() << "[ManualWidget] updating manual URLs"; |
39 | m_platform = RbSettings::value(RbSettings::Platform).toString(); | ||
40 | if(!m_platform.isEmpty()) | ||
39 | { | 41 | { |
40 | ui.labelPdfManual->setText(tr("<a href='%1'>PDF Manual</a>") | 42 | ui.labelPdfManual->setText(tr("<a href='%1'>PDF Manual</a>") |
41 | .arg(ServerInfo::platformValue(platform, ServerInfo::ManualPdfUrl).toString())); | 43 | .arg(ServerInfo::platformValue(m_platform, ServerInfo::ManualPdfUrl).toString())); |
42 | ui.labelHtmlManual->setText(tr("<a href='%1'>HTML Manual (opens in browser)</a>") | 44 | ui.labelHtmlManual->setText(tr("<a href='%1'>HTML Manual (opens in browser)</a>") |
43 | .arg(ServerInfo::platformValue(platform, ServerInfo::ManualHtmlUrl).toString())); | 45 | .arg(ServerInfo::platformValue(m_platform, ServerInfo::ManualHtmlUrl).toString())); |
44 | } | 46 | } |
45 | else { | 47 | else { |
46 | ui.labelPdfManual->setText(tr("Select a device for a link to the correct manual")); | 48 | ui.labelPdfManual->setText(tr("Select a device for a link to the correct manual")); |
@@ -74,13 +76,13 @@ void ManualWidget::downloadManual(void) | |||
74 | installer->setCache(true); | 76 | installer->setCache(true); |
75 | 77 | ||
76 | if(ui.radioPdf->isChecked()) { | 78 | if(ui.radioPdf->isChecked()) { |
77 | installer->setUrl(ServerInfo::platformValue(platform, | 79 | installer->setUrl(ServerInfo::platformValue(m_platform, |
78 | ServerInfo::ManualPdfUrl).toString()); | 80 | ServerInfo::ManualPdfUrl).toString()); |
79 | installer->setLogSection("Manual (PDF)"); | 81 | installer->setLogSection("Manual (PDF)"); |
80 | installer->setTarget("/" + manual + ".pdf"); | 82 | installer->setTarget("/" + manual + ".pdf"); |
81 | } | 83 | } |
82 | else { | 84 | else { |
83 | installer->setUrl(ServerInfo::platformValue(platform, | 85 | installer->setUrl(ServerInfo::platformValue(m_platform, |
84 | ServerInfo::ManualZipUrl).toString()); | 86 | ServerInfo::ManualZipUrl).toString()); |
85 | installer->setLogSection("Manual (HTML)"); | 87 | installer->setLogSection("Manual (HTML)"); |
86 | installer->setTarget("/" + manual + "-" + "-html.zip"); | 88 | installer->setTarget("/" + manual + "-" + "-html.zip"); |
diff --git a/rbutil/rbutilqt/gui/manualwidget.h b/rbutil/rbutilqt/gui/manualwidget.h index 31c67c5acd..6e771ddc87 100644 --- a/rbutil/rbutilqt/gui/manualwidget.h +++ b/rbutil/rbutilqt/gui/manualwidget.h | |||
@@ -35,7 +35,7 @@ class ManualWidget : public QWidget | |||
35 | private: | 35 | private: |
36 | void changeEvent(QEvent*); | 36 | void changeEvent(QEvent*); |
37 | Ui::ManualWidgetFrm ui; | 37 | Ui::ManualWidgetFrm ui; |
38 | QString platform; | 38 | QString m_platform; |
39 | }; | 39 | }; |
40 | 40 | ||
41 | #endif | 41 | #endif |