summaryrefslogtreecommitdiff
path: root/rbutil/rbutilqt/installthemes.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'rbutil/rbutilqt/installthemes.cpp')
-rw-r--r--rbutil/rbutilqt/installthemes.cpp16
1 files changed, 3 insertions, 13 deletions
diff --git a/rbutil/rbutilqt/installthemes.cpp b/rbutil/rbutilqt/installthemes.cpp
index dac7710713..37e2d9ebd7 100644
--- a/rbutil/rbutilqt/installthemes.cpp
+++ b/rbutil/rbutilqt/installthemes.cpp
@@ -65,9 +65,8 @@ void ThemesInstallWindow::downloadInfo()
65 url = QUrl(settings->themeUrl() + "/rbutilqt.php?res=" + resolution()); 65 url = QUrl(settings->themeUrl() + "/rbutilqt.php?res=" + resolution());
66 qDebug() << "downloadInfo()" << url; 66 qDebug() << "downloadInfo()" << url;
67 qDebug() << url.queryItems(); 67 qDebug() << url.queryItems();
68 getter->setProxy(proxy);
69 if(settings->cacheOffline()) 68 if(settings->cacheOffline())
70 getter->setCache(settings->cachePath()); 69 getter->setCache(true);
71 getter->setFile(&themesInfo); 70 getter->setFile(&themesInfo);
72 getter->getFile(url); 71 getter->getFile(url);
73} 72}
@@ -172,9 +171,8 @@ void ThemesInstallWindow::updateDetails(int row)
172 iniDetails.endGroup(); 171 iniDetails.endGroup();
173 172
174 igetter.abort(); 173 igetter.abort();
175 igetter.setProxy(proxy);
176 if(!settings->cacheDisabled()) 174 if(!settings->cacheDisabled())
177 igetter.setCache(settings->cachePath()); 175 igetter.setCache(true);
178 else 176 else
179 { 177 {
180 if(infocachedir=="") 178 if(infocachedir=="")
@@ -248,13 +246,6 @@ void ThemesInstallWindow::abort()
248} 246}
249 247
250 248
251void ThemesInstallWindow::setProxy(QUrl p)
252{
253 proxy = p;
254 qDebug() << "setProxy()" << proxy;
255}
256
257
258void ThemesInstallWindow::acceptAll() 249void ThemesInstallWindow::acceptAll()
259{ 250{
260 ui.listThemes->selectAll(); 251 ui.listThemes->selectAll();
@@ -299,12 +290,11 @@ void ThemesInstallWindow::accept()
299 290
300 installer = new ZipInstaller(this); 291 installer = new ZipInstaller(this);
301 installer->setUrl(themes); 292 installer->setUrl(themes);
302 installer->setProxy(proxy);
303 installer->setLogSection(names); 293 installer->setLogSection(names);
304 installer->setLogVersion(version); 294 installer->setLogVersion(version);
305 installer->setMountPoint(mountPoint); 295 installer->setMountPoint(mountPoint);
306 if(!settings->cacheDisabled()) 296 if(!settings->cacheDisabled())
307 installer->setCache(settings->cachePath()); 297 installer->setCache(true);
308 installer->install(logger); 298 installer->install(logger);
309 connect(logger, SIGNAL(closed()), this, SLOT(close())); 299 connect(logger, SIGNAL(closed()), this, SLOT(close()));
310} 300}