devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

rbutil: let rbutil use the new voice.zip files. Also make the download cache working again. (make sure to connect signals before calling getFile() ).

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16917 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Wenger 2008-04-01 18:02:56 +00:00
parent e249ecc85b
commit 2016ab4c96
6 changed files with 39 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

22
rbutil/rbutilqt/installbootloader.cpp
View file

@ -320,11 +320,12 @@ void BootloaderInstaller::gigabeatPrepare()
// get the real file.
getter = new HttpGet(this);
getter->setFile(&downloadFile);
getter->getFile(QUrl(url));
// connect signals from HttpGet
connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool)));
connect(getter, SIGNAL(dataReadProgress(int, int)), this, SLOT(updateDataReadProgress(int, int)));
connect(m_dp, SIGNAL(aborted()), getter, SLOT(abort()));
getter->getFile(QUrl(url));
}
else //UnInstallation
{
@ -518,11 +519,12 @@ void BootloaderInstaller::h10Prepare()
// get the real file.
getter = new HttpGet(this);
getter->setFile(&downloadFile);
getter->getFile(QUrl(url));
// connect signals from HttpGet
connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool)));
connect(getter, SIGNAL(dataReadProgress(int, int)), this, SLOT(updateDataReadProgress(int, int)));
connect(m_dp, SIGNAL(aborted()), getter, SLOT(abort()));
getter->getFile(QUrl(url));
}
else // Uninstallation
{
@ -670,11 +672,13 @@ void BootloaderInstaller::mrobe100Prepare()
// get the real file.
getter = new HttpGet(this);
getter->setFile(&downloadFile);
getter->getFile(QUrl(url));
// connect signals from HttpGet
connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool)));
connect(getter, SIGNAL(dataReadProgress(int, int)), this, SLOT(updateDataReadProgress(int, int)));
connect(m_dp, SIGNAL(aborted()), getter, SLOT(abort()));
getter->getFile(QUrl(url));
}
else // Uninstallation
{
@ -835,11 +839,13 @@ void BootloaderInstaller::ipodPrepare()
// get the real file.
getter = new HttpGet(this);
getter->setFile(&downloadFile);
getter->getFile(QUrl(url));
// connect signals from HttpGet
connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool)));
connect(getter, SIGNAL(dataReadProgress(int, int)), this, SLOT(updateDataReadProgress(int, int)));
connect(m_dp, SIGNAL(aborted()), getter, SLOT(abort()));
getter->getFile(QUrl(url));
}
else // Uninstallation
{
@ -1077,11 +1083,13 @@ void BootloaderInstaller::sansaPrepare()
// get the real file.
getter = new HttpGet(this);
getter->setFile(&downloadFile);
getter->getFile(QUrl(url));
// connect signals from HttpGet
connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool)));
connect(getter, SIGNAL(dataReadProgress(int, int)), this, SLOT(updateDataReadProgress(int, int)));
connect(m_dp, SIGNAL(aborted()), getter, SLOT(abort()));
getter->getFile(QUrl(url));
}
else // Uninstallation
{
@ -1265,11 +1273,13 @@ void BootloaderInstaller::iriverPrepare()
// get the real file.
getter = new HttpGet(this);
getter->setFile(&downloadFile);
getter->getFile(QUrl(url));
// connect signals from HttpGet
connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool)));
connect(getter, SIGNAL(dataReadProgress(int, int)), this, SLOT(updateDataReadProgress(int, int)));
connect(m_dp, SIGNAL(aborted()), getter, SLOT(abort()));
getter->getFile(QUrl(url));
}
void BootloaderInstaller::iriverFinish()

2
rbutil/rbutilqt/installthemes.cpp
View file

@ -183,8 +183,8 @@ void ThemesInstallWindow::updateDetails(int row)
}
igetter.setCache(infocachedir);
}
igetter.getFile(img);
connect(&igetter, SIGNAL(done(bool)), this, SLOT(updateImage(bool)));
igetter.getFile(img);
}

3
rbutil/rbutilqt/installzip.cpp
View file

@ -90,11 +90,12 @@ void ZipInstaller::installStart()
getter->setCache(true);
}
getter->setFile(downloadFile);
getter->getFile(QUrl(m_url));
connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool)));
connect(getter, SIGNAL(dataReadProgress(int, int)), this, SLOT(updateDataReadProgress(int, int)));
connect(m_dp, SIGNAL(aborted()), getter, SLOT(abort()));
getter->getFile(QUrl(m_url));
}

18
rbutil/rbutilqt/rbutilqt.cpp
View file

@ -55,6 +55,8 @@ RbUtilQt::RbUtilQt(QWidget *parent) : QMainWindow(parent)
settings = new RbSettings();
settings->open();
m_gotInfo = false;
// manual tab
updateSettings();
ui.radioPdf->setChecked(true);
@ -186,6 +188,8 @@ void RbUtilQt::downloadBleedingDone(bool error)
versmap.insert("bleed_rev", info.value("bleeding/rev").toString());
versmap.insert("bleed_date", info.value("bleeding/timestamp").toString());
qDebug() << "versmap =" << versmap;
m_gotInfo = true;
}
@ -624,6 +628,14 @@ void RbUtilQt::installFonts()
void RbUtilQt::installVoice()
{
if(chkConfig(true)) return;
if(m_gotInfo == false)
{
QMessageBox::warning(this, tr("Warning"),
tr("The Application is still downloading Information about new Builds. Please try again shortly."));
return;
}
if(QMessageBox::question(this, tr("Confirm Installation"),
tr("Do you really want to install the voice file?"),
QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes) return;
@ -633,19 +645,17 @@ void RbUtilQt::installVoice()
// create zip installer
installer = new ZipInstaller(this);
installer->setUnzip(false);
QString voiceurl = settings->voiceUrl() + "/" ;
QString voiceurl = settings->voiceUrl();
voiceurl += settings->curVoiceName() + "-" +
versmap.value("arch_date") + "-english.voice";
versmap.value("arch_date") + "-english.zip";
qDebug() << voiceurl;
installer->setUrl(voiceurl);
installer->setLogSection("Voice");
installer->setLogVersion(versmap.value("arch_date"));
installer->setMountPoint(settings->mountpoint());
installer->setTarget("/.rockbox/langs/english.voice");
if(!settings->cacheDisabled())
installer->setCache(true);
installer->install(logger);

1
rbutil/rbutilqt/rbutilqt.h
View file

@ -61,6 +61,7 @@ class RbUtilQt : public QMainWindow
volatile bool m_installed;
volatile bool m_error;
bool m_gotInfo;
private slots:
void about(void);

3
rbutil/rbutilqt/voicefile.cpp
View file

@ -91,11 +91,12 @@ bool VoiceFileCreator::createVoiceFile(ProgressloggerInterface* logger)
// get the real file.
getter = new HttpGet(this);
getter->setFile(downloadFile);
getter->getFile(genlangUrl);
connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool)));
connect(getter, SIGNAL(dataReadProgress(int, int)), this, SLOT(updateDataReadProgress(int, int)));
connect(m_logger, SIGNAL(aborted()), getter, SLOT(abort()));
getter->getFile(genlangUrl);
return true;
}