diff options
author | Dominik Wenger <domonoky@googlemail.com> | 2008-04-01 18:02:56 +0000 |
---|---|---|
committer | Dominik Wenger <domonoky@googlemail.com> | 2008-04-01 18:02:56 +0000 |
commit | 2016ab4c96f920efbeecf85dc1dfe188b9356c16 (patch) | |
tree | 4ed70664cc9b1481c9e5de1cf50acb0f6328c133 /rbutil/rbutilqt/rbutilqt.cpp | |
parent | e249ecc85b30687764289a500c92d32dd2d10b0a (diff) | |
download | rockbox-2016ab4c96f920efbeecf85dc1dfe188b9356c16.tar.gz rockbox-2016ab4c96f920efbeecf85dc1dfe188b9356c16.zip |
rbutil: let rbutil use the new voice.zip files. Also make the download cache working again. (make sure to connect signals before calling getFile() ).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16917 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil/rbutilqt/rbutilqt.cpp')
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.cpp | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp index 041fafdd60..71415d70eb 100644 --- a/rbutil/rbutilqt/rbutilqt.cpp +++ b/rbutil/rbutilqt/rbutilqt.cpp | |||
@@ -55,6 +55,8 @@ RbUtilQt::RbUtilQt(QWidget *parent) : QMainWindow(parent) | |||
55 | settings = new RbSettings(); | 55 | settings = new RbSettings(); |
56 | settings->open(); | 56 | settings->open(); |
57 | 57 | ||
58 | m_gotInfo = false; | ||
59 | |||
58 | // manual tab | 60 | // manual tab |
59 | updateSettings(); | 61 | updateSettings(); |
60 | ui.radioPdf->setChecked(true); | 62 | ui.radioPdf->setChecked(true); |
@@ -186,6 +188,8 @@ void RbUtilQt::downloadBleedingDone(bool error) | |||
186 | versmap.insert("bleed_rev", info.value("bleeding/rev").toString()); | 188 | versmap.insert("bleed_rev", info.value("bleeding/rev").toString()); |
187 | versmap.insert("bleed_date", info.value("bleeding/timestamp").toString()); | 189 | versmap.insert("bleed_date", info.value("bleeding/timestamp").toString()); |
188 | qDebug() << "versmap =" << versmap; | 190 | qDebug() << "versmap =" << versmap; |
191 | |||
192 | m_gotInfo = true; | ||
189 | } | 193 | } |
190 | 194 | ||
191 | 195 | ||
@@ -624,6 +628,14 @@ void RbUtilQt::installFonts() | |||
624 | void RbUtilQt::installVoice() | 628 | void RbUtilQt::installVoice() |
625 | { | 629 | { |
626 | if(chkConfig(true)) return; | 630 | if(chkConfig(true)) return; |
631 | |||
632 | if(m_gotInfo == false) | ||
633 | { | ||
634 | QMessageBox::warning(this, tr("Warning"), | ||
635 | tr("The Application is still downloading Information about new Builds. Please try again shortly.")); | ||
636 | return; | ||
637 | } | ||
638 | |||
627 | if(QMessageBox::question(this, tr("Confirm Installation"), | 639 | if(QMessageBox::question(this, tr("Confirm Installation"), |
628 | tr("Do you really want to install the voice file?"), | 640 | tr("Do you really want to install the voice file?"), |
629 | QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes) return; | 641 | QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes) return; |
@@ -633,19 +645,17 @@ void RbUtilQt::installVoice() | |||
633 | 645 | ||
634 | // create zip installer | 646 | // create zip installer |
635 | installer = new ZipInstaller(this); | 647 | installer = new ZipInstaller(this); |
636 | installer->setUnzip(false); | 648 | |
637 | 649 | QString voiceurl = settings->voiceUrl(); | |
638 | QString voiceurl = settings->voiceUrl() + "/" ; | ||
639 | 650 | ||
640 | voiceurl += settings->curVoiceName() + "-" + | 651 | voiceurl += settings->curVoiceName() + "-" + |
641 | versmap.value("arch_date") + "-english.voice"; | 652 | versmap.value("arch_date") + "-english.zip"; |
642 | qDebug() << voiceurl; | 653 | qDebug() << voiceurl; |
643 | 654 | ||
644 | installer->setUrl(voiceurl); | 655 | installer->setUrl(voiceurl); |
645 | installer->setLogSection("Voice"); | 656 | installer->setLogSection("Voice"); |
646 | installer->setLogVersion(versmap.value("arch_date")); | 657 | installer->setLogVersion(versmap.value("arch_date")); |
647 | installer->setMountPoint(settings->mountpoint()); | 658 | installer->setMountPoint(settings->mountpoint()); |
648 | installer->setTarget("/.rockbox/langs/english.voice"); | ||
649 | if(!settings->cacheDisabled()) | 659 | if(!settings->cacheDisabled()) |
650 | installer->setCache(true); | 660 | installer->setCache(true); |
651 | installer->install(logger); | 661 | installer->install(logger); |