diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2012-06-18 23:24:00 +0200 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2012-06-18 23:24:00 +0200 |
commit | e9487d35518ba05bf88c19399a5b7c5136e80244 (patch) | |
tree | 2d8a820c0a7c88a92bd358a774824b8f1017fc76 | |
parent | dd79face4d4c3ac049ee513da7c30374c6e648e0 (diff) | |
download | rockbox-e9487d35518ba05bf88c19399a5b7c5136e80244.tar.gz rockbox-e9487d35518ba05bf88c19399a5b7c5136e80244.zip |
Simplify manual installer setup a bit.
Change-Id: Idbef76cee2ddc6537696b5d234d9e33c4a3bd621
-rw-r--r-- | rbutil/rbutilqt/gui/manualwidget.cpp | 11 |
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) | |||
66 | manual = "rockbox-" + SystemInfo::value(SystemInfo::CurBuildserverModel).toString(); | 66 | manual = "rockbox-" + SystemInfo::value(SystemInfo::CurBuildserverModel).toString(); |
67 | } | 67 | } |
68 | 68 | ||
69 | QString manualurl; | ||
70 | |||
71 | ProgressLoggerGui* logger = new ProgressLoggerGui(this); | 69 | ProgressLoggerGui* logger = new ProgressLoggerGui(this); |
72 | logger->show(); | 70 | logger->show(); |
73 | ZipInstaller *installer = new ZipInstaller(this); | 71 | ZipInstaller *installer = new ZipInstaller(this); |
@@ -76,19 +74,18 @@ void ManualWidget::downloadManual(void) | |||
76 | installer->setCache(true); | 74 | installer->setCache(true); |
77 | 75 | ||
78 | if(ui.radioPdf->isChecked()) { | 76 | if(ui.radioPdf->isChecked()) { |
79 | manualurl = ServerInfo::platformValue(platform, ServerInfo::ManualPdfUrl).toString(); | 77 | installer->setUrl(ServerInfo::platformValue(platform, |
78 | ServerInfo::ManualPdfUrl).toString()); | ||
80 | installer->setLogSection("Manual (PDF)"); | 79 | installer->setLogSection("Manual (PDF)"); |
81 | installer->setTarget("/" + manual + ".pdf"); | 80 | installer->setTarget("/" + manual + ".pdf"); |
82 | } | 81 | } |
83 | else { | 82 | else { |
84 | manualurl = ServerInfo::platformValue(platform, ServerInfo::ManualZipUrl).toString(); | 83 | installer->setUrl(ServerInfo::platformValue(platform, |
84 | ServerInfo::ManualZipUrl).toString()); | ||
85 | installer->setLogSection("Manual (HTML)"); | 85 | installer->setLogSection("Manual (HTML)"); |
86 | installer->setTarget("/" + manual + "-" + "-html.zip"); | 86 | installer->setTarget("/" + manual + "-" + "-html.zip"); |
87 | } | 87 | } |
88 | qDebug() << "[ManualWidget] Manual URL:" << manualurl; | ||
89 | |||
90 | installer->setLogVersion(); | 88 | installer->setLogVersion(); |
91 | installer->setUrl(manualurl); | ||
92 | installer->setUnzip(false); | 89 | installer->setUnzip(false); |
93 | 90 | ||
94 | connect(installer, SIGNAL(logItem(QString, int)), logger, SLOT(addItem(QString, int))); | 91 | connect(installer, SIGNAL(logItem(QString, int)), logger, SLOT(addItem(QString, int))); |