diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2007-08-26 11:31:55 +0000 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2007-08-26 11:31:55 +0000 |
commit | b6b10837f286a2e9948191c413ad2e7cda7df8e7 (patch) | |
tree | cf83540480a1aba0f5321d6283a78ec78da57ea7 /rbutil/rbutilqt | |
parent | 12f466d999be50066abbd4b268b817aacd5b7b77 (diff) | |
download | rockbox-b6b10837f286a2e9948191c413ad2e7cda7df8e7.tar.gz rockbox-b6b10837f286a2e9948191c413ad2e7cda7df8e7.zip |
simplify setting of proxy value.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14459 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil/rbutilqt')
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.cpp | 74 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.h | 1 |
2 files changed, 22 insertions, 53 deletions
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp index 3b84c83c39..a0dc521a69 100644 --- a/rbutil/rbutilqt/rbutilqt.cpp +++ b/rbutil/rbutilqt/rbutilqt.cpp | |||
@@ -110,12 +110,7 @@ void RbUtilQt::downloadInfo() | |||
110 | daily = new HttpGet(this); | 110 | daily = new HttpGet(this); |
111 | connect(daily, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); | 111 | connect(daily, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); |
112 | connect(daily, SIGNAL(requestFinished(int, bool)), this, SLOT(downloadDone(int, bool))); | 112 | connect(daily, SIGNAL(requestFinished(int, bool)), this, SLOT(downloadDone(int, bool))); |
113 | if(userSettings->value("defaults/proxytype") == "manual") | 113 | daily->setProxy(proxy()); |
114 | daily->setProxy(QUrl(userSettings->value("defaults/proxy").toString())); | ||
115 | #ifdef __linux | ||
116 | else if(userSettings->value("defaults/proxytype") == "system") | ||
117 | daily->setProxy(QUrl(getenv("http_proxy"))); | ||
118 | #endif | ||
119 | 114 | ||
120 | qDebug() << "downloading build info"; | 115 | qDebug() << "downloading build info"; |
121 | daily->setFile(&buildInfo); | 116 | daily->setFile(&buildInfo); |
@@ -260,12 +255,7 @@ void RbUtilQt::install() | |||
260 | Install *installWindow = new Install(this); | 255 | Install *installWindow = new Install(this); |
261 | installWindow->setUserSettings(userSettings); | 256 | installWindow->setUserSettings(userSettings); |
262 | installWindow->setDeviceSettings(devices); | 257 | installWindow->setDeviceSettings(devices); |
263 | if(userSettings->value("defaults/proxytype") == "manual") | 258 | installWindow->setProxy(proxy()); |
264 | installWindow->setProxy(QUrl(userSettings->value("defaults/proxy").toString())); | ||
265 | #ifdef __linux | ||
266 | else if(userSettings->value("defaults/proxytype") == "system") | ||
267 | installWindow->setProxy(QUrl(getenv("http_proxy"))); | ||
268 | #endif | ||
269 | 259 | ||
270 | buildInfo.open(); | 260 | buildInfo.open(); |
271 | QSettings info(buildInfo.fileName(), QSettings::IniFormat, this); | 261 | QSettings info(buildInfo.fileName(), QSettings::IniFormat, this); |
@@ -331,13 +321,7 @@ void RbUtilQt::installBl() | |||
331 | 321 | ||
332 | blinstaller->setMountPoint(userSettings->value("defaults/mountpoint").toString()); | 322 | blinstaller->setMountPoint(userSettings->value("defaults/mountpoint").toString()); |
333 | 323 | ||
334 | if(userSettings->value("defaults/proxytype") == "manual") | 324 | blinstaller->setProxy(proxy()); |
335 | blinstaller->setProxy(QUrl(userSettings->value("defaults/proxy").toString())); | ||
336 | #ifdef __linux | ||
337 | else if(userSettings->value("defaults/proxytype") == "system") | ||
338 | blinstaller->setProxy(QUrl(getenv("http_proxy"))); | ||
339 | #endif | ||
340 | |||
341 | blinstaller->setDevice(platform); | 325 | blinstaller->setDevice(platform); |
342 | blinstaller->setBootloaderMethod(devices->value(platform + "/bootloadermethod").toString()); | 326 | blinstaller->setBootloaderMethod(devices->value(platform + "/bootloadermethod").toString()); |
343 | blinstaller->setBootloaderName(devices->value(platform + "/bootloadername").toString()); | 327 | blinstaller->setBootloaderName(devices->value(platform + "/bootloadername").toString()); |
@@ -361,15 +345,9 @@ void RbUtilQt::installFonts() | |||
361 | 345 | ||
362 | // create zip installer | 346 | // create zip installer |
363 | installer = new ZipInstaller(this); | 347 | installer = new ZipInstaller(this); |
364 | 348 | ||
365 | installer->setUrl(devices->value("font_url").toString()); | 349 | installer->setUrl(devices->value("font_url").toString()); |
366 | if(userSettings->value("defaults/proxytype") == "manual") | 350 | installer->setProxy(proxy()); |
367 | installer->setProxy(QUrl(userSettings->value("defaults/proxy").toString())); | ||
368 | #ifdef __linux | ||
369 | else if(userSettings->value("defaults/proxytype") == "system") | ||
370 | installer->setProxy(QUrl(getenv("http_proxy"))); | ||
371 | #endif | ||
372 | |||
373 | installer->setLogSection("Fonts"); | 351 | installer->setLogSection("Fonts"); |
374 | installer->setMountPoint(userSettings->value("defaults/mountpoint").toString()); | 352 | installer->setMountPoint(userSettings->value("defaults/mountpoint").toString()); |
375 | installer->install(logger); | 353 | installer->install(logger); |
@@ -390,7 +368,7 @@ void RbUtilQt::installVoice() | |||
390 | // create zip installer | 368 | // create zip installer |
391 | installer = new ZipInstaller(this); | 369 | installer = new ZipInstaller(this); |
392 | installer->setUnzip(false); | 370 | installer->setUnzip(false); |
393 | buildInfo.open(); | 371 | buildInfo.open(); |
394 | QSettings info(buildInfo.fileName(), QSettings::IniFormat, this); | 372 | QSettings info(buildInfo.fileName(), QSettings::IniFormat, this); |
395 | buildInfo.close(); | 373 | buildInfo.close(); |
396 | QString datestring = info.value("dailies/date").toString(); | 374 | QString datestring = info.value("dailies/date").toString(); |
@@ -399,13 +377,8 @@ void RbUtilQt::installVoice() | |||
399 | userSettings->value("defaults/platform").toString() + "-" + | 377 | userSettings->value("defaults/platform").toString() + "-" + |
400 | datestring + "-english.voice"; | 378 | datestring + "-english.voice"; |
401 | qDebug() << voiceurl; | 379 | qDebug() << voiceurl; |
402 | if(userSettings->value("defaults/proxytype") == "manual") | ||
403 | installer->setProxy(QUrl(userSettings->value("defaults/proxy").toString())); | ||
404 | #ifdef __linux | ||
405 | else if(userSettings->value("defaults/proxytype") == "system") | ||
406 | installer->setProxy(QUrl(getenv("http_proxy"))); | ||
407 | #endif | ||
408 | 380 | ||
381 | installer->setProxy(proxy()); | ||
409 | installer->setUrl(voiceurl); | 382 | installer->setUrl(voiceurl); |
410 | installer->setLogSection("Voice"); | 383 | installer->setLogSection("Voice"); |
411 | installer->setMountPoint(userSettings->value("defaults/mountpoint").toString()); | 384 | installer->setMountPoint(userSettings->value("defaults/mountpoint").toString()); |
@@ -429,13 +402,7 @@ void RbUtilQt::installDoom() | |||
429 | installer = new ZipInstaller(this); | 402 | installer = new ZipInstaller(this); |
430 | 403 | ||
431 | installer->setUrl(devices->value("doom_url").toString()); | 404 | installer->setUrl(devices->value("doom_url").toString()); |
432 | if(userSettings->value("defaults/proxytype") == "manual") | 405 | installer->setProxy(proxy()); |
433 | installer->setProxy(QUrl(userSettings->value("defaults/proxy").toString())); | ||
434 | #ifdef __linux | ||
435 | else if(userSettings->value("defaults/proxytype") == "system") | ||
436 | installer->setProxy(QUrl(getenv("http_proxy"))); | ||
437 | #endif | ||
438 | |||
439 | installer->setLogSection("GameAddons"); | 406 | installer->setLogSection("GameAddons"); |
440 | installer->setMountPoint(userSettings->value("defaults/mountpoint").toString()); | 407 | installer->setMountPoint(userSettings->value("defaults/mountpoint").toString()); |
441 | installer->install(logger); | 408 | installer->install(logger); |
@@ -450,12 +417,7 @@ void RbUtilQt::installThemes() | |||
450 | ThemesInstallWindow* tw = new ThemesInstallWindow(this); | 417 | ThemesInstallWindow* tw = new ThemesInstallWindow(this); |
451 | tw->setDeviceSettings(devices); | 418 | tw->setDeviceSettings(devices); |
452 | tw->setUserSettings(userSettings); | 419 | tw->setUserSettings(userSettings); |
453 | if(userSettings->value("defaults/proxytype") == "manual") | 420 | tw->setProxy(proxy()); |
454 | tw->setProxy(QUrl(userSettings->value("defaults/proxy").toString())); | ||
455 | #ifdef __linux | ||
456 | else if(userSettings->value("defaults/proxytype") == "system") | ||
457 | tw->setProxy(QUrl(getenv("http_proxy"))); | ||
458 | #endif | ||
459 | tw->setModal(true); | 421 | tw->setModal(true); |
460 | tw->show(); | 422 | tw->show(); |
461 | } | 423 | } |
@@ -536,12 +498,7 @@ void RbUtilQt::downloadManual(void) | |||
536 | logger->show(); | 498 | logger->show(); |
537 | installer = new ZipInstaller(this); | 499 | installer = new ZipInstaller(this); |
538 | installer->setMountPoint(userSettings->value("defaults/mountpoint").toString()); | 500 | installer->setMountPoint(userSettings->value("defaults/mountpoint").toString()); |
539 | if(userSettings->value("defaults/proxytype") == "manual") | 501 | installer->setProxy(proxy()); |
540 | installer->setProxy(QUrl(userSettings->value("defaults/proxy").toString())); | ||
541 | #ifdef __linux | ||
542 | else if(userSettings->value("defaults/proxytype") == "system") | ||
543 | installer->setProxy(QUrl(getenv("http_proxy"))); | ||
544 | #endif | ||
545 | installer->setLogSection(section); | 502 | installer->setLogSection(section); |
546 | installer->setUrl(manualurl); | 503 | installer->setUrl(manualurl); |
547 | installer->setUnzip(false); | 504 | installer->setUnzip(false); |
@@ -590,3 +547,14 @@ void RbUtilQt::installPortable(void) | |||
590 | } | 547 | } |
591 | 548 | ||
592 | 549 | ||
550 | QUrl RbUtilQt::proxy() | ||
551 | { | ||
552 | if(userSettings->value("defaults/proxytype") == "manual") | ||
553 | return QUrl(userSettings->value("defaults/proxy").toString()); | ||
554 | #ifdef __linux | ||
555 | else if(userSettings->value("defaults/proxytype") == "system") | ||
556 | return QUrl(getenv("http_proxy")); | ||
557 | #endif | ||
558 | return QUrl(""); | ||
559 | } | ||
560 | |||
diff --git a/rbutil/rbutilqt/rbutilqt.h b/rbutil/rbutilqt/rbutilqt.h index 0fb2bc915e..1a6dda8259 100644 --- a/rbutil/rbutilqt/rbutilqt.h +++ b/rbutil/rbutilqt/rbutilqt.h | |||
@@ -51,6 +51,7 @@ class RbUtilQt : public QMainWindow | |||
51 | ProgressLoggerGui *logger; | 51 | ProgressLoggerGui *logger; |
52 | ZipInstaller *installer; | 52 | ZipInstaller *installer; |
53 | BootloaderInstaller* blinstaller; | 53 | BootloaderInstaller* blinstaller; |
54 | QUrl proxy(void); | ||
54 | 55 | ||
55 | private slots: | 56 | private slots: |
56 | void about(void); | 57 | void about(void); |