From f36f7825d7d219304fac22021b9f060a666ddc3b Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Tue, 3 Jan 2012 21:52:19 +0000 Subject: [PATCH] Update displayed settings on startup. Update the target values in the main window immediately on startup. Downloading the target information might not complete successfully, and in that case a previously selected target will not be shown. If the target information download finishes the displayed values are updated again (to show target status information). git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31546 a1c6a512-1295-4272-9138-f99709370657 --- rbutil/rbutilqt/rbutilqt.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp index ab86a16581..bf4aa1c2e8 100644 --- a/rbutil/rbutilqt/rbutilqt.cpp +++ b/rbutil/rbutilqt/rbutilqt.cpp @@ -107,6 +107,7 @@ RbUtilQt::RbUtilQt(QWidget *parent) : QMainWindow(parent) RegCloseKey(hk); } #endif + updateSettings(); downloadInfo(); m_gotInfo = false; @@ -242,7 +243,7 @@ void RbUtilQt::downloadDone(bool error) buildInfo.open(); ServerInfo::readBuildInfo(buildInfo.fileName()); buildInfo.close(); - + // start bleeding info download bleeding = new HttpGet(this); connect(bleeding, SIGNAL(done(bool)), this, SLOT(downloadBleedingDone(bool))); @@ -271,11 +272,11 @@ void RbUtilQt::downloadBleedingDone(bool error) bleedingInfo.open(); ServerInfo::readBleedingInfo(bleedingInfo.fileName()); bleedingInfo.close(); - + ui.statusbar->showMessage(tr("Download build information finished."), 5000); updateSettings(); m_gotInfo = true; - + //start check for updates checkUpdate(); } @@ -345,7 +346,7 @@ void RbUtilQt::updateSettings() HttpGet::setGlobalProxy(proxy()); HttpGet::setGlobalCache(RbSettings::value(RbSettings::CachePath).toString()); HttpGet::setGlobalDumbCache(RbSettings::value(RbSettings::CacheOffline).toBool()); - + if(RbSettings::value(RbSettings::RbutilVersion) != PUREVERSION) { QApplication::processEvents(); QMessageBox::information(this, tr("New installation"),