summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2012-06-18 23:24:00 +0200
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2012-06-18 23:24:00 +0200
commite9487d35518ba05bf88c19399a5b7c5136e80244 (patch)
tree2d8a820c0a7c88a92bd358a774824b8f1017fc76
parentdd79face4d4c3ac049ee513da7c30374c6e648e0 (diff)
downloadrockbox-e9487d35518ba05bf88c19399a5b7c5136e80244.tar.gz
rockbox-e9487d35518ba05bf88c19399a5b7c5136e80244.zip
Simplify manual installer setup a bit.
Change-Id: Idbef76cee2ddc6537696b5d234d9e33c4a3bd621
-rw-r--r--rbutil/rbutilqt/gui/manualwidget.cpp11
1 files changed, 4 insertions, 7 deletions
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)));