diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2008-10-24 22:31:07 +0000 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2008-10-24 22:31:07 +0000 |
commit | b208000c3649526d0eeb73a328e4052759bc773c (patch) | |
tree | 675e8453392a664b859c129154d60b710b577966 /rbutil/rbutilqt/rbutilqt.cpp | |
parent | 637146017289dd394a6f68327c56867fa8747dc5 (diff) | |
download | rockbox-b208000c3649526d0eeb73a328e4052759bc773c.tar.gz rockbox-b208000c3649526d0eeb73a328e4052759bc773c.zip |
Make Detect::check() return an error string instead of a boolean result and move the handling of an occurred error to the application to make detection Gui-clean. Move detect class to base folder.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18873 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil/rbutilqt/rbutilqt.cpp')
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.cpp | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp index e9f6f7fcf2..8c0691c52b 100644 --- a/rbutil/rbutilqt/rbutilqt.cpp +++ b/rbutil/rbutilqt/rbutilqt.cpp @@ -496,17 +496,22 @@ bool RbUtilQt::installAuto() } QString myversion = "r" + versmap.value("bleed_rev"); - + // check installed Version and Target - QString rbVersion = Detect::installedVersion(settings->mountpoint()); + QString rbVersion = Detect::installedVersion(settings->mountpoint()); + QString warning = Detect::check(settings, false, settings->curTargetId()); - if(Detect::check(settings,false,settings->curTargetId()) == false) + if(!warning.isEmpty()) { - logger->addItem(tr("Aborted!"),LOGERROR); - logger->abort(); - return false; + if(QMessageBox::warning(this, tr("Really continue?"), warning, + QMessageBox::Ok | QMessageBox::Abort, QMessageBox::Abort) == QMessageBox::Abort) + { + logger->addItem(tr("Aborted!"), LOGERROR); + logger->abort(); + return false; + } } - + // check version if(rbVersion != "") { @@ -516,7 +521,7 @@ bool RbUtilQt::installAuto() { logger->addItem(tr("Starting backup..."),LOGINFO); QString backupName = settings->mountpoint() + "/.backup/rockbox-backup-"+rbVersion+".zip"; - + //! create dir, if it doesnt exist QFileInfo backupFile(backupName); if(!QDir(backupFile.path()).exists()) |