diff options
Diffstat (limited to 'utils/rbutilqt/base')
-rw-r--r-- | utils/rbutilqt/base/bootloaderinstallhelper.cpp | 31 | ||||
-rw-r--r-- | utils/rbutilqt/base/bootloaderinstallhelper.h | 1 | ||||
-rw-r--r-- | utils/rbutilqt/base/playerbuildinfo.cpp | 3 | ||||
-rw-r--r-- | utils/rbutilqt/base/playerbuildinfo.h | 1 | ||||
-rw-r--r-- | utils/rbutilqt/base/talkfile.cpp | 7 | ||||
-rw-r--r-- | utils/rbutilqt/base/voicefile.cpp | 8 |
6 files changed, 45 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 | |||
97 | return caps; | 97 | return caps; |
98 | } | 98 | } |
99 | 99 | ||
100 | //! @brief Return pre install hints string. | ||
101 | //! @param model model string | ||
102 | //! @return hints. | ||
103 | QString BootloaderInstallHelper::preinstallHints(QString model) | ||
104 | { | ||
105 | bool hint = false; | ||
106 | QString msg = QObject::tr("Before Bootloader installation begins, " | ||
107 | "Please check the following:"); | ||
108 | |||
109 | msg += "<ol>"; | ||
110 | if(model.contains("erosqnative")) { | ||
111 | hint = true; | ||
112 | msg += QObject::tr("<li>Ensure your SD card is formatted as FAT. " | ||
113 | "exFAT is <i>not</i> supported. You can reformat using the " | ||
114 | "Original Firmware on your player if need be. It is located " | ||
115 | "under (System Settings --> Reset --> Format TF Card).</li>" | ||
116 | "<li>Please use a quality SD card from a reputable source. " | ||
117 | "The SD cards that come bundled with players are often of " | ||
118 | "substandard quality and may cause issues.</li>"); | ||
119 | } | ||
120 | msg += "</ol>"; | ||
121 | |||
122 | if(hint) | ||
123 | return msg; | ||
124 | else | ||
125 | return QString(); | ||
126 | } | ||
127 | |||
100 | 128 | ||
101 | //! @brief Return post install hints string. | 129 | //! @brief Return post install hints string. |
102 | //! @param model model string | 130 | //! @param model model string |
@@ -114,7 +142,8 @@ QString BootloaderInstallHelper::postinstallHints(QString model) | |||
114 | } | 142 | } |
115 | if(model == "iriverh100" || model == "iriverh120" || model == "iriverh300" | 143 | if(model == "iriverh100" || model == "iriverh120" || model == "iriverh300" |
116 | || model == "ondavx747" || model == "agptekrocker" | 144 | || model == "ondavx747" || model == "agptekrocker" |
117 | || model == "xduoox3" || model == "xduoox3ii" || model == "xduoox20") { | 145 | || model == "xduoox3" || model == "xduoox3ii" || model == "xduoox20" |
146 | || model.contains("erosqnative")) { | ||
118 | hint = true; | 147 | hint = true; |
119 | msg += QObject::tr("<li>Reboot your player into the original firmware.</li>" | 148 | msg += QObject::tr("<li>Reboot your player into the original firmware.</li>" |
120 | "<li>Perform a firmware upgrade using the update functionality " | 149 | "<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 | |||
30 | public: | 30 | public: |
31 | static BootloaderInstallBase* createBootloaderInstaller(QObject* parent, QString type); | 31 | static BootloaderInstallBase* createBootloaderInstaller(QObject* parent, QString type); |
32 | static BootloaderInstallBase::Capabilities bootloaderInstallerCapabilities(QObject *parent, QString type); | 32 | static BootloaderInstallBase::Capabilities bootloaderInstallerCapabilities(QObject *parent, QString type); |
33 | static QString preinstallHints(QString model); | ||
33 | static QString postinstallHints(QString model); | 34 | static QString postinstallHints(QString model); |
34 | }; | 35 | }; |
35 | 36 | ||
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 { | |||
67 | { PlayerBuildInfo::Encoder, ":target:/encoder" }, | 67 | { PlayerBuildInfo::Encoder, ":target:/encoder" }, |
68 | { PlayerBuildInfo::Brand, ":target:/brand" }, | 68 | { PlayerBuildInfo::Brand, ":target:/brand" }, |
69 | { PlayerBuildInfo::PlayerPicture, ":target:/playerpic" }, | 69 | { PlayerBuildInfo::PlayerPicture, ":target:/playerpic" }, |
70 | { PlayerBuildInfo::ThemeName, ":target:/themename" }, | ||
70 | { PlayerBuildInfo::TargetNamesAll, "_targets/all" }, | 71 | { PlayerBuildInfo::TargetNamesAll, "_targets/all" }, |
71 | { PlayerBuildInfo::TargetNamesEnabled, "_targets/enabled" }, | 72 | { PlayerBuildInfo::TargetNamesEnabled, "_targets/enabled" }, |
72 | { PlayerBuildInfo::LanguageInfo, "languages/:target:" }, | 73 | { PlayerBuildInfo::LanguageInfo, "languages/:target:" }, |
@@ -332,7 +333,7 @@ QVariant PlayerBuildInfo::value(SystemUrl item) | |||
332 | QString PlayerBuildInfo::statusAsString(QString platform) | 333 | QString PlayerBuildInfo::statusAsString(QString platform) |
333 | { | 334 | { |
334 | QString result; | 335 | QString result; |
335 | switch(value(BuildStatus, platform).toInt()) | 336 | switch(value(BuildStatus, platform.split('.').at(0)).toInt()) |
336 | { | 337 | { |
337 | case STATUS_RETIRED: | 338 | case STATUS_RETIRED: |
338 | result = tr("Stable (Retired)"); | 339 | 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: | |||
67 | Encoder, | 67 | Encoder, |
68 | Brand, | 68 | Brand, |
69 | PlayerPicture, | 69 | PlayerPicture, |
70 | ThemeName, | ||
70 | 71 | ||
71 | TargetNamesAll, | 72 | TargetNamesAll, |
72 | TargetNamesEnabled, | 73 | 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) | |||
143 | if(!dir.dirName().isEmpty() && m_talkFolders) | 143 | if(!dir.dirName().isEmpty() && m_talkFolders) |
144 | { | 144 | { |
145 | // check if we should ignore it | 145 | // check if we should ignore it |
146 | if(QFileInfo::exists(dir.path() + "/talkclips.ignore")) | ||
147 | { | ||
148 | continue; | ||
149 | } | ||
150 | |||
151 | // check to see if it's already covered | ||
146 | if(m_generateOnlyNew && QFileInfo::exists(dir.path() + "/_dirname.talk")) | 152 | if(m_generateOnlyNew && QFileInfo::exists(dir.path() + "/_dirname.talk")) |
147 | { | 153 | { |
148 | continue; | 154 | continue; |
@@ -302,4 +308,3 @@ void TalkFileCreator::abort() | |||
302 | m_abort = true; | 308 | m_abort = true; |
303 | emit aborted(); | 309 | emit aborted(); |
304 | } | 310 | } |
305 | |||
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) | |||
247 | TalkGenerator::TalkEntry entry; | 247 | TalkGenerator::TalkEntry entry; |
248 | entry.toSpeak = voice; | 248 | entry.toSpeak = voice; |
249 | entry.wavfilename = m_path + "/" + id + ".wav"; | 249 | entry.wavfilename = m_path + "/" + id + ".wav"; |
250 | //voicefont wants them with .mp3 extension | 250 | entry.talkfilename = m_path + "/" + id + ".enc"; |
251 | entry.talkfilename = m_path + "/" + id + ".mp3"; | ||
252 | entry.voiced = false; | 251 | entry.voiced = false; |
253 | entry.encoded = false; | 252 | entry.encoded = false; |
254 | if(id == "VOICE_PAUSE") | 253 | if(id == "VOICE_PAUSE") |
@@ -324,6 +323,10 @@ void VoiceFileCreator::create(void) | |||
324 | voicefont(ids2,m_targetid,m_path.toLocal8Bit().data(), output, m_voiceformat); | 323 | voicefont(ids2,m_targetid,m_path.toLocal8Bit().data(), output, m_voiceformat); |
325 | // ids2 and output are closed by voicefont(). | 324 | // ids2 and output are closed by voicefont(). |
326 | 325 | ||
326 | // Copy these two over to the device | ||
327 | QFile::copy(m_path + "/VOICE_INVALID_VOICE_FILE.enc", m_mountpoint + "/.rockbox/langs/InvalidVoice_" + m_lang + ".talk"); | ||
328 | QFile::copy(m_path + "/VOICE_LANG_NAME.enc", m_mountpoint + "/.rockbox/langs/" + m_lang + ".lng.talk"); | ||
329 | |||
327 | //cleanup | 330 | //cleanup |
328 | cleanup(); | 331 | cleanup(); |
329 | 332 | ||
@@ -359,4 +362,3 @@ void VoiceFileCreator::cleanup() | |||
359 | 362 | ||
360 | return; | 363 | return; |
361 | } | 364 | } |
362 | |||