From 4f99dd4264f9aaaccbf3da6bba37d5b2c7eb6f32 Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Wed, 5 Sep 2012 22:39:47 +0200 Subject: Fix manual URLs not getting updated properly on device change. Change-Id: I5aaf62b5b7eb298e4d10fc8d854594dce051b2b6 --- rbutil/rbutilqt/gui/manualwidget.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'rbutil/rbutilqt/gui/manualwidget.cpp') 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) { 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("PDF Manual") - .arg(ServerInfo::platformValue(platform, ServerInfo::ManualPdfUrl).toString())); + .arg(ServerInfo::platformValue(m_platform, ServerInfo::ManualPdfUrl).toString())); ui.labelHtmlManual->setText(tr("HTML Manual (opens in browser)") - .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"); -- cgit v1.2.3