summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2012-01-03 21:52:19 +0000
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2012-01-03 21:52:19 +0000
commitf36f7825d7d219304fac22021b9f060a666ddc3b (patch)
tree8537926979b6006ad70f0418366775dd98db7f4f
parent2b04f7bba56480e24e78ce51137d26b155dbbb28 (diff)
downloadrockbox-f36f7825d7d219304fac22021b9f060a666ddc3b.tar.gz
rockbox-f36f7825d7d219304fac22021b9f060a666ddc3b.zip
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
-rw-r--r--rbutil/rbutilqt/rbutilqt.cpp9
1 files 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"),