mirror of
https://github.com/Rockbox/rockbox.git
synced 2025-10-13 18:17:39 -04:00
rbutil: move many more connect calls, mainly for safety.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16997 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
94d65d837c
commit
b235b1306e
7 changed files with 31 additions and 19 deletions
|
@ -469,8 +469,9 @@ void Config::browseCache()
|
|||
cbrowser->setFilter(QDir::Drives);
|
||||
#endif
|
||||
cbrowser->setDir(ui.cachePath->text());
|
||||
cbrowser->show();
|
||||
connect(cbrowser, SIGNAL(itemChanged(QString)), this, SLOT(setCache(QString)));
|
||||
cbrowser->show();
|
||||
|
||||
}
|
||||
|
||||
void Config::setMountpoint(QString m)
|
||||
|
|
|
@ -35,15 +35,15 @@ void CreateVoiceWindow::change()
|
|||
{
|
||||
Config *cw = new Config(this,4);
|
||||
cw->setSettings(settings);
|
||||
cw->show();
|
||||
connect(cw, SIGNAL(settingsUpdated()), this, SLOT(updateSettings()));
|
||||
cw->show();
|
||||
}
|
||||
|
||||
void CreateVoiceWindow::accept()
|
||||
{
|
||||
logger = new ProgressLoggerGui(this);
|
||||
logger->show();
|
||||
connect(logger,SIGNAL(closed()),this,SLOT(close()));
|
||||
logger->show();
|
||||
|
||||
QString lang = ui.comboLanguage->currentText();
|
||||
int wvThreshold = ui.wavtrimthreshold->value();
|
||||
|
|
|
@ -93,9 +93,10 @@ void Install::accept()
|
|||
|
||||
installer->setLogVersion(myversion);
|
||||
installer->setMountPoint(mountPoint);
|
||||
installer->install(logger);
|
||||
|
||||
|
||||
connect(installer, SIGNAL(done(bool)), this, SLOT(done(bool)));
|
||||
|
||||
installer->install(logger);
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -67,15 +67,19 @@ void InstallTalkWindow::change()
|
|||
{
|
||||
Config *cw = new Config(this,4);
|
||||
cw->setSettings(settings);
|
||||
cw->show();
|
||||
|
||||
connect(cw, SIGNAL(settingsUpdated()), this, SLOT(updateSettings()));
|
||||
|
||||
cw->show();
|
||||
}
|
||||
|
||||
void InstallTalkWindow::accept()
|
||||
{
|
||||
logger = new ProgressLoggerGui(this);
|
||||
logger->show();
|
||||
|
||||
connect(logger,SIGNAL(closed()),this,SLOT(close()));
|
||||
logger->show();
|
||||
|
||||
|
||||
QString folderToTalk = ui.lineTalkFolder->text();
|
||||
|
||||
|
|
|
@ -232,9 +232,11 @@ void ThemesInstallWindow::show()
|
|||
logger = new ProgressLoggerGui(this);
|
||||
logger->show();
|
||||
logger->addItem(tr("getting themes information ..."), LOGINFO);
|
||||
downloadInfo();
|
||||
connect(logger, SIGNAL(aborted()), getter, SLOT(abort()));
|
||||
connect(logger, SIGNAL(aborted()), this, SLOT(close()));
|
||||
connect(logger, SIGNAL(aborted()), this, SLOT(close()));
|
||||
|
||||
downloadInfo();
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
@ -295,7 +297,9 @@ void ThemesInstallWindow::accept()
|
|||
installer->setMountPoint(mountPoint);
|
||||
if(!settings->cacheDisabled())
|
||||
installer->setCache(true);
|
||||
|
||||
connect(logger, SIGNAL(closed()), this, SLOT(close()));
|
||||
installer->install(logger);
|
||||
connect(logger, SIGNAL(closed()), this, SLOT(close()));
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -244,9 +244,9 @@ void RbUtilQt::configDialog()
|
|||
{
|
||||
Config *cw = new Config(this);
|
||||
cw->setSettings(settings);
|
||||
cw->show();
|
||||
connect(cw, SIGNAL(settingsUpdated()), this, SLOT(updateSettings()));
|
||||
connect(cw, SIGNAL(settingsUpdated()), this, SLOT(downloadInfo()));
|
||||
cw->show();
|
||||
}
|
||||
|
||||
|
||||
|
@ -500,8 +500,7 @@ void RbUtilQt::install()
|
|||
bool RbUtilQt::installBootloaderAuto()
|
||||
{
|
||||
installBootloader();
|
||||
connect(blinstaller,SIGNAL(done(bool)),this,SLOT(installdone(bool)));
|
||||
return !m_error;
|
||||
return !m_error;
|
||||
}
|
||||
|
||||
void RbUtilQt::installBootloaderBtn()
|
||||
|
@ -514,7 +513,8 @@ void RbUtilQt::installBootloaderBtn()
|
|||
// create logger
|
||||
logger = new ProgressLoggerGui(this);
|
||||
logger->show();
|
||||
|
||||
connect(blinstaller,SIGNAL(done(bool)),this,SLOT(installdone(bool)));
|
||||
|
||||
installBootloader();
|
||||
}
|
||||
|
||||
|
@ -723,9 +723,10 @@ void RbUtilQt::createTalkFiles(void)
|
|||
if(chkConfig(true)) return;
|
||||
InstallTalkWindow *installWindow = new InstallTalkWindow(this);
|
||||
installWindow->setSettings(settings);
|
||||
installWindow->show();
|
||||
|
||||
connect(installWindow, SIGNAL(settingsUpdated()), this, SLOT(downloadInfo()));
|
||||
connect(installWindow, SIGNAL(settingsUpdated()), this, SLOT(updateSettings()));
|
||||
installWindow->show();
|
||||
|
||||
}
|
||||
|
||||
|
@ -734,10 +735,10 @@ void RbUtilQt::createVoiceFile(void)
|
|||
if(chkConfig(true)) return;
|
||||
CreateVoiceWindow *installWindow = new CreateVoiceWindow(this);
|
||||
installWindow->setSettings(settings);
|
||||
|
||||
installWindow->show();
|
||||
|
||||
connect(installWindow, SIGNAL(settingsUpdated()), this, SLOT(downloadInfo()));
|
||||
connect(installWindow, SIGNAL(settingsUpdated()), this, SLOT(updateSettings()));
|
||||
installWindow->show();
|
||||
}
|
||||
|
||||
void RbUtilQt::uninstall(void)
|
||||
|
|
|
@ -34,7 +34,8 @@ void UninstallWindow::accept()
|
|||
{
|
||||
logger = new ProgressLoggerGui(this);
|
||||
logger->show();
|
||||
|
||||
|
||||
connect(logger,SIGNAL(closed()),this,SLOT(close()));
|
||||
if(ui.CompleteRadioBtn->isChecked())
|
||||
{
|
||||
uninstaller->deleteAll(logger);
|
||||
|
@ -43,7 +44,7 @@ void UninstallWindow::accept()
|
|||
{
|
||||
uninstaller->uninstall(logger);
|
||||
}
|
||||
connect(logger,SIGNAL(closed()),this,SLOT(close()));
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue