rbutil: Add erosqnative

- Give each brand its own entry, and make ranges
  of OF versions correspond to hardware changes.
- Temporarily disabled target aigoerosq.
- Post-install hint enabled.
- Added pre-install hint function
- Added optional parameter themename, in case
  the target name does not match the themesite name.
- Made Port Status (statusAsString()) only care about platform
  string prior to first '.'
- Manual: Remove note that rbutil does not support this model

Issues:

 - Cannot uninstall the bootloader - manual instructions are available

Change-Id: I574aad7943ea3d1e543e9449f68240446fec0709

4 files changed, 34 insertions, 2 deletions

diff --git a/utils/rbutilqt/base/bootloaderinstallhelper.cpp b/utils/rbutilqt/base/bootloaderinstallhelper.cpp
index 4a1b24883b..34fcefc5bc 100644
--- a/utils/rbutilqt/base/bootloaderinstallhelper.cpp
+++ b/utils/rbutilqt/base/bootloaderinstallhelper.cpp
@@ -97,6 +97,34 @@ BootloaderInstallBase::Capabilities
     return caps;
 }
 
+//! @brief Return pre install hints string.
+//! @param model model string
+//! @return hints.
+QString BootloaderInstallHelper::preinstallHints(QString model)
+{
+    bool hint = false;
+    QString msg = QObject::tr("Before Bootloader installation begins, "
+            "Please check the following:");
+
+    msg += "<ol>";
+    if(model.contains("erosqnative")) {
+        hint = true;
+        msg += QObject::tr("<li>Ensure your SD card is formatted as FAT. "
+                "exFAT is <i>not</i> supported. You can reformat using the "
+                "Original Firmware on your player if need be. It is located "
+                "under (System Settings --> Reset --> Format TF Card).</li>"
+                "<li>Please use a quality SD card from a reputable source. "
+                "The SD cards that come bundled with players are often of "
+                "substandard quality and may cause issues.</li>");
+    }
+    msg += "</ol>";
+
+    if(hint)
+        return msg;
+    else
+        return QString();
+}
+
 
 //! @brief Return post install hints string.
 //! @param model model string
@@ -114,7 +142,8 @@ QString BootloaderInstallHelper::postinstallHints(QString model)
     }
     if(model == "iriverh100" || model == "iriverh120" || model == "iriverh300"
        || model == "ondavx747" || model == "agptekrocker"
-       || model == "xduoox3" || model == "xduoox3ii" || model == "xduoox20") {
+       || model == "xduoox3" || model == "xduoox3ii" || model == "xduoox20"
+       || model.contains("erosqnative")) {
         hint = true;
         msg += QObject::tr("<li>Reboot your player into the original firmware.</li>"
                 "<li>Perform a firmware upgrade using the update functionality "
diff --git a/utils/rbutilqt/base/bootloaderinstallhelper.h b/utils/rbutilqt/base/bootloaderinstallhelper.h
index 9b6fed0866..4b912cd5d5 100644
--- a/utils/rbutilqt/base/bootloaderinstallhelper.h
+++ b/utils/rbutilqt/base/bootloaderinstallhelper.h
@@ -30,6 +30,7 @@ class BootloaderInstallHelper : public QObject
     public:
         static BootloaderInstallBase* createBootloaderInstaller(QObject* parent, QString type);
         static BootloaderInstallBase::Capabilities bootloaderInstallerCapabilities(QObject *parent, QString type);
+        static QString preinstallHints(QString model);
         static QString postinstallHints(QString model);
 };
 
diff --git a/utils/rbutilqt/base/playerbuildinfo.cpp b/utils/rbutilqt/base/playerbuildinfo.cpp
index 7edb7f750c..1673f73d6b 100644
--- a/utils/rbutilqt/base/playerbuildinfo.cpp
+++ b/utils/rbutilqt/base/playerbuildinfo.cpp
@@ -67,6 +67,7 @@ const static struct {
     { PlayerBuildInfo::Encoder,            ":target:/encoder"          },
     { PlayerBuildInfo::Brand,              ":target:/brand"            },
     { PlayerBuildInfo::PlayerPicture,      ":target:/playerpic"        },
+    { PlayerBuildInfo::ThemeName,          ":target:/themename"        },
     { PlayerBuildInfo::TargetNamesAll,     "_targets/all"              },
     { PlayerBuildInfo::TargetNamesEnabled, "_targets/enabled"          },
     { PlayerBuildInfo::LanguageInfo,       "languages/:target:"        },
@@ -332,7 +333,7 @@ QVariant PlayerBuildInfo::value(SystemUrl item)
 QString PlayerBuildInfo::statusAsString(QString platform)
 {
     QString result;
-    switch(value(BuildStatus, platform).toInt())
+    switch(value(BuildStatus, platform.split('.').at(0)).toInt())
     {
     case STATUS_RETIRED:
         result = tr("Stable (Retired)");
diff --git a/utils/rbutilqt/base/playerbuildinfo.h b/utils/rbutilqt/base/playerbuildinfo.h
index 38f6662e09..8b7e5934d1 100644
--- a/utils/rbutilqt/base/playerbuildinfo.h
+++ b/utils/rbutilqt/base/playerbuildinfo.h
@@ -67,6 +67,7 @@ public:
         Encoder,
         Brand,
         PlayerPicture,
+        ThemeName,
 
         TargetNamesAll,
         TargetNamesEnabled,