mirror of
https://github.com/Rockbox/rockbox.git
synced 2025-12-09 13:15:18 -05:00
Cleanup and un-gui ZipInstaller class:
- Use signals for updating the progress logger from ZipInstaller class. - Move ZipInstaller class to base folder as it doesn't rely on QtGui anymore. - cleanup debugging output a bit. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20845 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
7cfdd47587
commit
d5f7dab230
6 changed files with 90 additions and 70 deletions
|
|
@ -584,8 +584,11 @@ bool RbUtilQt::installAuto()
|
|||
installer->setMountPoint(settings->value(RbSettings::Mountpoint).toString());
|
||||
|
||||
connect(installer, SIGNAL(done(bool)), this, SLOT(installdone(bool)));
|
||||
|
||||
installer->install(logger);
|
||||
connect(installer, SIGNAL(logItem(QString, int)), logger, SLOT(addItem(QString, int)));
|
||||
connect(installer, SIGNAL(logProgress(int, int)), logger, SLOT(setProgress(int, int)));
|
||||
connect(installer, SIGNAL(done(bool)), logger, SLOT(setFinished()));
|
||||
connect(logger, SIGNAL(aborted()), installer, SLOT(abort()));
|
||||
installer->install();
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
@ -827,7 +830,11 @@ void RbUtilQt::installFonts()
|
|||
installer->setCache(true);
|
||||
|
||||
connect(installer, SIGNAL(done(bool)), this, SLOT(installdone(bool)));
|
||||
installer->install(logger);
|
||||
connect(installer, SIGNAL(logItem(QString, int)), logger, SLOT(addItem(QString, int)));
|
||||
connect(installer, SIGNAL(logProgress(int, int)), logger, SLOT(setProgress(int, int)));
|
||||
connect(installer, SIGNAL(done(bool)), logger, SLOT(setFinished()));
|
||||
connect(logger, SIGNAL(aborted()), installer, SLOT(abort()));
|
||||
installer->install();
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -865,7 +872,11 @@ void RbUtilQt::installVoice()
|
|||
installer->setMountPoint(settings->value(RbSettings::Mountpoint).toString());
|
||||
if(!settings->value(RbSettings::CacheDisabled).toBool())
|
||||
installer->setCache(true);
|
||||
installer->install(logger);
|
||||
connect(installer, SIGNAL(logItem(QString, int)), logger, SLOT(addItem(QString, int)));
|
||||
connect(installer, SIGNAL(logProgress(int, int)), logger, SLOT(setProgress(int, int)));
|
||||
connect(installer, SIGNAL(done(bool)), logger, SLOT(setFinished()));
|
||||
connect(logger, SIGNAL(aborted()), installer, SLOT(abort()));
|
||||
installer->install();
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -912,7 +923,11 @@ void RbUtilQt::installDoom()
|
|||
if(!settings->value(RbSettings::CacheDisabled).toBool())
|
||||
installer->setCache(true);
|
||||
connect(installer, SIGNAL(done(bool)), this, SLOT(installdone(bool)));
|
||||
installer->install(logger);
|
||||
connect(installer, SIGNAL(logItem(QString, int)), logger, SLOT(addItem(QString, int)));
|
||||
connect(installer, SIGNAL(logProgress(int, int)), logger, SLOT(setProgress(int, int)));
|
||||
connect(installer, SIGNAL(done(bool)), logger, SLOT(setFinished()));
|
||||
connect(logger, SIGNAL(aborted()), installer, SLOT(abort()));
|
||||
installer->install();
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -1058,7 +1073,11 @@ void RbUtilQt::downloadManual(void)
|
|||
installer->setUrl(manualurl);
|
||||
installer->setUnzip(false);
|
||||
installer->setTarget(target);
|
||||
installer->install(logger);
|
||||
connect(installer, SIGNAL(logItem(QString, int)), logger, SLOT(addItem(QString, int)));
|
||||
connect(installer, SIGNAL(logProgress(int, int)), logger, SLOT(setProgress(int, int)));
|
||||
connect(installer, SIGNAL(done(bool)), logger, SLOT(setFinished()));
|
||||
connect(logger, SIGNAL(aborted()), installer, SLOT(abort()));
|
||||
installer->install();
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue