diff options
Diffstat (limited to 'rbutil/rbutilqt/rbutilqt.cpp')
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.cpp | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp index f26a1ef54e..5f96a592c1 100644 --- a/rbutil/rbutilqt/rbutilqt.cpp +++ b/rbutil/rbutilqt/rbutilqt.cpp | |||
@@ -128,11 +128,11 @@ void RbUtilQt::downloadInfo() | |||
128 | connect(daily, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); | 128 | connect(daily, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); |
129 | connect(daily, SIGNAL(requestFinished(int, bool)), this, SLOT(downloadDone(int, bool))); | 129 | connect(daily, SIGNAL(requestFinished(int, bool)), this, SLOT(downloadDone(int, bool))); |
130 | daily->setProxy(proxy()); | 130 | daily->setProxy(proxy()); |
131 | 131 | if(userSettings->value("defaults/offline").toBool()) | |
132 | daily->setCache(userSettings->value("defaults/cachepath", QDir::tempPath()).toString()); | ||
132 | qDebug() << "downloading build info"; | 133 | qDebug() << "downloading build info"; |
133 | daily->setFile(&buildInfo); | 134 | daily->setFile(&buildInfo); |
134 | daily->getFile(QUrl(devices->value("server_conf_url").toString())); | 135 | daily->getFile(QUrl(devices->value("server_conf_url").toString())); |
135 | |||
136 | } | 136 | } |
137 | 137 | ||
138 | 138 | ||
@@ -154,7 +154,8 @@ void RbUtilQt::downloadDone(bool error) | |||
154 | connect(bleeding, SIGNAL(done(bool)), this, SLOT(downloadBleedingDone(bool))); | 154 | connect(bleeding, SIGNAL(done(bool)), this, SLOT(downloadBleedingDone(bool))); |
155 | connect(bleeding, SIGNAL(requestFinished(int, bool)), this, SLOT(downloadDone(int, bool))); | 155 | connect(bleeding, SIGNAL(requestFinished(int, bool)), this, SLOT(downloadDone(int, bool))); |
156 | bleeding->setProxy(proxy()); | 156 | bleeding->setProxy(proxy()); |
157 | 157 | if(userSettings->value("defaults/offline").toBool()) | |
158 | bleeding->setCache(userSettings->value("defaults/cachepath", QDir::tempPath()).toString()); | ||
158 | bleeding->setFile(&bleedingInfo); | 159 | bleeding->setFile(&bleedingInfo); |
159 | bleeding->getFile(QUrl(devices->value("bleeding_info").toString())); | 160 | bleeding->getFile(QUrl(devices->value("bleeding_info").toString())); |
160 | } | 161 | } |
@@ -462,6 +463,8 @@ bool RbUtilQt::installAuto() | |||
462 | installer->setProxy(proxy()); | 463 | installer->setProxy(proxy()); |
463 | installer->setLogSection("rockboxbase"); | 464 | installer->setLogSection("rockboxbase"); |
464 | installer->setLogVersion(myversion); | 465 | installer->setLogVersion(myversion); |
466 | if(!userSettings->value("defaults/cachedisable").toBool()) | ||
467 | installer->setCache(userSettings->value("defaults/cachepath", QDir::tempPath()).toString()); | ||
465 | installer->setMountPoint(userSettings->value("defaults/mountpoint").toString()); | 468 | installer->setMountPoint(userSettings->value("defaults/mountpoint").toString()); |
466 | installer->install(logger); | 469 | installer->install(logger); |
467 | 470 | ||
@@ -623,6 +626,8 @@ void RbUtilQt::installFonts() | |||
623 | installer->setLogSection("Fonts"); | 626 | installer->setLogSection("Fonts"); |
624 | installer->setLogVersion(versmap.value("arch_date")); | 627 | installer->setLogVersion(versmap.value("arch_date")); |
625 | installer->setMountPoint(userSettings->value("defaults/mountpoint").toString()); | 628 | installer->setMountPoint(userSettings->value("defaults/mountpoint").toString()); |
629 | if(!userSettings->value("defaults/cachedisable").toBool()) | ||
630 | installer->setCache(userSettings->value("defaults/cachepath", QDir::tempPath()).toString()); | ||
626 | installer->install(logger); | 631 | installer->install(logger); |
627 | } | 632 | } |
628 | 633 | ||
@@ -651,6 +656,8 @@ void RbUtilQt::installVoice() | |||
651 | installer->setLogVersion(versmap.value("arch_date")); | 656 | installer->setLogVersion(versmap.value("arch_date")); |
652 | installer->setMountPoint(userSettings->value("defaults/mountpoint").toString()); | 657 | installer->setMountPoint(userSettings->value("defaults/mountpoint").toString()); |
653 | installer->setTarget("/.rockbox/langs/english.voice"); | 658 | installer->setTarget("/.rockbox/langs/english.voice"); |
659 | if(!userSettings->value("defaults/cachedisable").toBool()) | ||
660 | installer->setCache(userSettings->value("defaults/cachepath", QDir::tempPath()).toString()); | ||
654 | installer->install(logger); | 661 | installer->install(logger); |
655 | 662 | ||
656 | //connect(installer, SIGNAL(done(bool)), this, SLOT(done(bool))); | 663 | //connect(installer, SIGNAL(done(bool)), this, SLOT(done(bool))); |
@@ -684,6 +691,8 @@ void RbUtilQt::installDoom() | |||
684 | installer->setLogSection("Game Addons"); | 691 | installer->setLogSection("Game Addons"); |
685 | installer->setLogVersion(versmap.value("arch_date")); | 692 | installer->setLogVersion(versmap.value("arch_date")); |
686 | installer->setMountPoint(userSettings->value("defaults/mountpoint").toString()); | 693 | installer->setMountPoint(userSettings->value("defaults/mountpoint").toString()); |
694 | if(!userSettings->value("defaults/cachedisable").toBool()) | ||
695 | installer->setCache(userSettings->value("defaults/cachepath", QDir::tempPath()).toString()); | ||
687 | installer->install(logger); | 696 | installer->install(logger); |
688 | 697 | ||
689 | } | 698 | } |
@@ -783,6 +792,8 @@ void RbUtilQt::downloadManual(void) | |||
783 | logger->show(); | 792 | logger->show(); |
784 | installer = new ZipInstaller(this); | 793 | installer = new ZipInstaller(this); |
785 | installer->setMountPoint(userSettings->value("defaults/mountpoint").toString()); | 794 | installer->setMountPoint(userSettings->value("defaults/mountpoint").toString()); |
795 | if(!userSettings->value("defaults/cachedisable").toBool()) | ||
796 | installer->setCache(userSettings->value("defaults/cachepath", QDir::tempPath()).toString()); | ||
786 | installer->setProxy(proxy()); | 797 | installer->setProxy(proxy()); |
787 | installer->setLogSection(section); | 798 | installer->setLogSection(section); |
788 | installer->setUrl(manualurl); | 799 | installer->setUrl(manualurl); |