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

rbutil/rbutilqt/base/detect.cpp

@@ -22,10 +22,9 @@
 
 #include <QtCore>
 #include <QDebug>
+
 #include <cstdlib>
 #include <stdio.h>
-#include <QMessageBox>
-
 
 // Windows Includes
 #if defined(Q_OS_WIN32)
@@ -403,9 +402,9 @@ int Detect::installedTargetId(QString mountpoint)
  *  @param settings A pointer to rbutils settings class
  *  @param permission if it should check for permission
  *  @param targetId the targetID to check for. if it is -1 no check is done.
- *  @return true if everything is ok, or user wants to continue
+ *  @return string with error messages if problems occurred, empty strings if none.
  */
-bool Detect::check(RbSettings* settings,bool permission,int targetId)
+QString Detect::check(RbSettings* settings, bool permission, int targetId)
 {
     QString text = "";
 
@@ -415,7 +414,8 @@ bool Detect::check(RbSettings* settings,bool permission,int targetId)
 #if defined(Q_OS_WIN32)
         if(Detect::userPermissions() != Detect::ADMIN)
         {
-            text += QObject::tr("Permissions are not sufficient! \n Run with admin rights. \n\n"); 
+            text += QObject::tr("<li>Permissions insufficient for bootloader "
+                    "installation.\nAdministrator priviledges are necessary.</li>");
         }
 #endif
     }
@@ -426,25 +426,16 @@ bool Detect::check(RbSettings* settings,bool permission,int targetId)
         int installedID = Detect::installedTargetId(settings->mountpoint());
         if( installedID != -1 && installedID != targetId)
         {
-            text += QObject::tr("Target mismatch detected. \n\n"
-                          "Installed target: %1.\n"
-                          "New Target: %2.\n\n").arg(settings->nameOfTargetId(installedID),settings->curName());
-           
+            text += QObject::tr("<li>Target mismatch detected.\n"
+                    "Installed target: %1, selected target: %2.</li>")
+                    .arg(settings->nameOfTargetId(installedID),settings->curName());
         }
     }
 
-    // show message Box
-    if(text != "")
-    {
-        text += QObject::tr("\n Do you want to continue ?");
-        if(QMessageBox::warning(NULL, QObject::tr("Problems detected"),text,
-           QMessageBox::Yes | QMessageBox::No) == QMessageBox::No)
-        {
-            return false;
-        }            
-    }
-
-    return true;
+    if(!text.isEmpty())
+        return QObject::tr("Problem detected:") + "<ul>" + text + "</ul>";
+    else
+        return text;
 }
 
 

rbutil/rbutilqt/base/detect.h

@@ -47,7 +47,7 @@ public:
     static QString installedVersion(QString mountpoint);
     static int installedTargetId(QString mountpoint);
 
-    static bool check(RbSettings* settings,bool permission,int targetId);
+    static QString check(RbSettings* settings, bool permission, int targetId);
 
 };
 #endif

rbutil/rbutilqt/install.cpp

@@ -121,11 +121,17 @@ void Install::accept()
     }
     settings->sync();
 
-    if(Detect::check(settings,false,settings->curTargetId()) == false)
+    QString warning = Detect::check(settings, false, settings->curTargetId());
+    if(!warning.isEmpty())
     {
-        logger->addItem(tr("Aborted!"),LOGERROR);
-        logger->abort();
-        return;
+        if(QMessageBox::warning(this, tr("Really continue?"), warning,
+            QMessageBox::Ok | QMessageBox::Abort, QMessageBox::Abort)
+            == QMessageBox::Abort)
+        {
+            logger->addItem(tr("Aborted!"),LOGERROR);
+            logger->abort();
+            return;
+        }
     }
 
     //! check if we should backup

rbutil/rbutilqt/rbutilqt.cpp

@@ -499,12 +499,17 @@ bool RbUtilQt::installAuto()
 
     // check installed Version and Target
     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

rbutil/rbutilqt/rbutilqt.pro

@@ -74,7 +74,7 @@ SOURCES += rbutilqt.cpp \
  rbsettings.cpp \
  base/rbunzip.cpp \
  base/rbzip.cpp \
- detect.cpp \
+ base/detect.cpp \
  sysinfo.cpp \
  base/bootloaderinstallbase.cpp \
  base/bootloaderinstallmi4.cpp \
@@ -127,7 +127,7 @@ HEADERS += rbutilqt.h \
  base/rbunzip.h \
  base/rbzip.h \
  sysinfo.h \
- detect.h \
+ base/detect.h \
  base/bootloaderinstallbase.h \
  base/bootloaderinstallmi4.h \
  base/bootloaderinstallhex.h \