From e9487d35518ba05bf88c19399a5b7c5136e80244 Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Mon, 18 Jun 2012 23:24:00 +0200 Subject: Simplify manual installer setup a bit. Change-Id: Idbef76cee2ddc6537696b5d234d9e33c4a3bd621 --- rbutil/rbutilqt/gui/manualwidget.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'rbutil') diff --git a/rbutil/rbutilqt/gui/manualwidget.cpp b/rbutil/rbutilqt/gui/manualwidget.cpp index 4dac771627..78d41723c5 100644 --- a/rbutil/rbutilqt/gui/manualwidget.cpp +++ b/rbutil/rbutilqt/gui/manualwidget.cpp @@ -66,8 +66,6 @@ void ManualWidget::downloadManual(void) manual = "rockbox-" + SystemInfo::value(SystemInfo::CurBuildserverModel).toString(); } - QString manualurl; - ProgressLoggerGui* logger = new ProgressLoggerGui(this); logger->show(); ZipInstaller *installer = new ZipInstaller(this); @@ -76,19 +74,18 @@ void ManualWidget::downloadManual(void) installer->setCache(true); if(ui.radioPdf->isChecked()) { - manualurl = ServerInfo::platformValue(platform, ServerInfo::ManualPdfUrl).toString(); + installer->setUrl(ServerInfo::platformValue(platform, + ServerInfo::ManualPdfUrl).toString()); installer->setLogSection("Manual (PDF)"); installer->setTarget("/" + manual + ".pdf"); } else { - manualurl = ServerInfo::platformValue(platform, ServerInfo::ManualZipUrl).toString(); + installer->setUrl(ServerInfo::platformValue(platform, + ServerInfo::ManualZipUrl).toString()); installer->setLogSection("Manual (HTML)"); installer->setTarget("/" + manual + "-" + "-html.zip"); } - qDebug() << "[ManualWidget] Manual URL:" << manualurl; - installer->setLogVersion(); - installer->setUrl(manualurl); installer->setUnzip(false); connect(installer, SIGNAL(logItem(QString, int)), logger, SLOT(addItem(QString, int))); -- cgit v1.2.3