summaryrefslogtreecommitdiff
path: root/rbutil/rbutilqt/rbutilqt.cpp
diff options
context:
space:
mode:
authorFrank Gevaerts <frank@gevaerts.be>2008-07-07 21:40:44 +0000
committerFrank Gevaerts <frank@gevaerts.be>2008-07-07 21:40:44 +0000
commitee3ed8a163823c2ee7f087985b7a36e10806f5f6 (patch)
tree90ddf4bca6021f759cf3f98cacd6e207311a843b /rbutil/rbutilqt/rbutilqt.cpp
parente6553f821881ace5f904fb077ae8a1aba7154474 (diff)
downloadrockbox-ee3ed8a163823c2ee7f087985b7a36e10806f5f6.tar.gz
rockbox-ee3ed8a163823c2ee7f087985b7a36e10806f5f6.zip
handle new installations (or upgrades) differently from invalid configurations
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17983 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil/rbutilqt/rbutilqt.cpp')
-rw-r--r--rbutil/rbutilqt/rbutilqt.cpp15
1 files changed, 11 insertions, 4 deletions
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp
index 7f2bf0cbed..59ce4839f7 100644
--- a/rbutil/rbutilqt/rbutilqt.cpp
+++ b/rbutil/rbutilqt/rbutilqt.cpp
@@ -176,13 +176,20 @@ void RbUtilQt::downloadDone(bool error)
176 bleeding->setFile(&bleedingInfo); 176 bleeding->setFile(&bleedingInfo);
177 bleeding->getFile(QUrl(settings->bleedingInfo())); 177 bleeding->getFile(QUrl(settings->bleedingInfo()));
178 178
179 if(chkConfig(false)) { 179 if(settings->curVersion() != PUREVERSION) {
180 QApplication::processEvents();
181 QMessageBox::information(this, tr("New installation"),
182 tr("This is a new installation of Rockbox Utility, or a new version. "
183 "The configuration dialog will now open to allow you to setup the program, "
184 " or review your settings."));
185 configDialog();
186 }
187 else if(chkConfig(false)) {
180 QApplication::processEvents(); 188 QApplication::processEvents();
181 QMessageBox::critical(this, tr("Configuration error"), 189 QMessageBox::critical(this, tr("Configuration error"),
182 tr("Your configuration is invalid. This is most likely due " 190 tr("Your configuration is invalid. This is most likely due "
183 "to a new installation of Rockbox Utility or a changed device " 191 "to a changed device path. The configuration dialog will "
184 "path. The configuration dialog will now open to allow you to " 192 "now open to allow you to correct the problem."));
185 "correct the problem."));
186 configDialog(); 193 configDialog();
187 } 194 }
188} 195}