6 files changed, 47 insertions, 6 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 c76abc4ffe..1673f73d6b 100644
--- a/utils/rbutilqt/base/playerbuildinfo.cpp
+++ b/utils/rbutilqt/base/playerbuildinfo.cpp
@@ -49,6 +49,7 @@ const static struct {
     { PlayerBuildInfo::PuzzFontsUrl,      "other/puzzfonts_url" },
     { PlayerBuildInfo::QuakeUrl,          "other/quake_url"     },
     { PlayerBuildInfo::Wolf3DUrl,         "other/wolf3d_url"    },
+    { PlayerBuildInfo::XRickUrl,          "other/xrick_url"     },
     { PlayerBuildInfo::XWorldUrl,         "other/xworld_url"    },
     { PlayerBuildInfo::MidiPatchsetUrl,   "other/patcheset_url" },
 };
@@ -66,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:"        },
@@ -331,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 85fc2ac6dc..8b7e5934d1 100644
--- a/utils/rbutilqt/base/playerbuildinfo.h
+++ b/utils/rbutilqt/base/playerbuildinfo.h
@@ -53,6 +53,7 @@ public:
         QuakeUrl,
         Wolf3DUrl,
         XWorldUrl,
+        XRickUrl,
         MidiPatchsetUrl,
     };
     enum DeviceInfo {
@@ -66,6 +67,7 @@ public:
         Encoder,
         Brand,
         PlayerPicture,
+        ThemeName,
 
         TargetNamesAll,
         TargetNamesEnabled,
diff --git a/utils/rbutilqt/base/talkfile.cpp b/utils/rbutilqt/base/talkfile.cpp
index aab5fbc29a..f5fae01a85 100644
--- a/utils/rbutilqt/base/talkfile.cpp
+++ b/utils/rbutilqt/base/talkfile.cpp
@@ -143,6 +143,12 @@ bool TalkFileCreator::createTalkList(QDir startDir)
             if(!dir.dirName().isEmpty() && m_talkFolders)
             {
                 // check if we should ignore it
+                if(QFileInfo::exists(dir.path() + "/talkclips.ignore"))
+                {
+                    continue;
+                }
+
+                // check to see if it's already covered
                 if(m_generateOnlyNew && QFileInfo::exists(dir.path() + "/_dirname.talk"))
                 {
                     continue;
@@ -302,4 +308,3 @@ void TalkFileCreator::abort()
     m_abort = true;
     emit aborted();
 }
-
diff --git a/utils/rbutilqt/base/voicefile.cpp b/utils/rbutilqt/base/voicefile.cpp
index dbdd56e53e..267af18010 100644
--- a/utils/rbutilqt/base/voicefile.cpp
+++ b/utils/rbutilqt/base/voicefile.cpp
@@ -247,8 +247,7 @@ void VoiceFileCreator::create(void)
             TalkGenerator::TalkEntry entry;
             entry.toSpeak = voice;
             entry.wavfilename = m_path + "/" + id + ".wav";
-            //voicefont wants them with .mp3 extension
-            entry.talkfilename = m_path + "/" + id + ".mp3";
+            entry.talkfilename = m_path + "/" + id + ".enc";
             entry.voiced = false;
             entry.encoded = false;
             if(id == "VOICE_PAUSE")
@@ -324,6 +323,10 @@ void VoiceFileCreator::create(void)
     voicefont(ids2,m_targetid,m_path.toLocal8Bit().data(), output, m_voiceformat);
     // ids2 and output are closed by voicefont().
 
+    // Copy these two over to the device
+    QFile::copy(m_path + "/VOICE_INVALID_VOICE_FILE.enc",  m_mountpoint + "/.rockbox/langs/InvalidVoice_" + m_lang + ".talk");
+    QFile::copy(m_path + "/VOICE_LANG_NAME.enc", m_mountpoint + "/.rockbox/langs/" + m_lang + ".lng.talk");
+
     //cleanup
     cleanup();
 
@@ -359,4 +362,3 @@ void VoiceFileCreator::cleanup()
 
     return;
 }
-