summaryrefslogtreecommitdiffstats
path: root/rbutil/rbutilqt/rbutilqt.cpp
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2012-06-02 00:07:30 +0200
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2012-06-02 00:07:30 +0200
commit96e7cc9e80cc33d893b60308cd091e29b2e553d8 (patch)
treecd6a88536fb15a9e6876bd335e5436dfe09b4f7e /rbutil/rbutilqt/rbutilqt.cpp
parent87bb7471bb07f8a41749cb0d6d1dae05163821c9 (diff)
downloadrockbox-96e7cc9e80cc33d893b60308cd091e29b2e553d8.tar.gz
rockbox-96e7cc9e80cc33d893b60308cd091e29b2e553d8.tar.bz2
rockbox-96e7cc9e80cc33d893b60308cd091e29b2e553d8.zip
Only support pregenerated voice file for releases.
The voice file installed needs to match the Rockbox version installed. If not the voice might not match the actual entries. Rockbox Utility always was sloppy on this and installed the latest archived (previously "daily") builds voice file for the latest development (previously "current") build. Archived builds aren't supported anymore in Rockbox Utility, so remove support for installing archived voice files as well. There are no pregenerated voice files for development versions provided, and Rockbox Utility can generate voice files anyway. Also, those files are only provided and most users seem to prefer to use the voices they have installed on their PC. Change-Id: I17817da8a14dc5f8b0ef208579d8d75fa86ab610
Diffstat (limited to 'rbutil/rbutilqt/rbutilqt.cpp')
-rw-r--r--rbutil/rbutilqt/rbutilqt.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp
index 15620209e9..7077673701 100644
--- a/rbutil/rbutilqt/rbutilqt.cpp
+++ b/rbutil/rbutilqt/rbutilqt.cpp
@@ -913,8 +913,12 @@ void RbUtilQt::installVoice()
}
if(relversion.isEmpty()) {
// release is empty for non-release versions (i.e. daily / current)
- voiceurl = SystemInfo::value(SystemInfo::DailyVoiceUrl).toString();
- logversion = installInfo.revision();
+ QMessageBox::critical(this, tr("No voice available"),
+ tr("The installed version of Rockbox is a development version. "
+ "Pre-built voices are only available for release versions "
+ "of Rockbox. Please generate a voice yourself using the "
+ "\"Create voice file\" functionality."));
+ return;
}
else {
voiceurl = SystemInfo::value(SystemInfo::ReleaseVoiceUrl).toString();
@@ -925,11 +929,8 @@ void RbUtilQt::installVoice()
QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes)
return;
- QDate date = QDate::fromString(
- ServerInfo::value(ServerInfo::DailyDate).toString(), Qt::ISODate);
QString model = SystemInfo::value(SystemInfo::CurBuildserverModel).toString();
// replace placeholder in voice url
- voiceurl.replace("%DATE%", date.toString("yyyyMMdd"));
voiceurl.replace("%MODEL%", model);
voiceurl.replace("%RELVERSION%", relversion);