len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 02:27:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

rbutil: move many more connect calls, mainly for safety.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16997 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Wenger 2008-04-06 19:50:38 +00:00
parent 94d65d837c
commit b235b1306e
7 changed files with 31 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

3
rbutil/rbutilqt/configure.cpp
View file

@ -469,8 +469,9 @@ void Config::browseCache()
cbrowser->setFilter(QDir::Drives); cbrowser->setFilter(QDir::Drives);
#endif #endif
cbrowser->setDir(ui.cachePath->text()); cbrowser->setDir(ui.cachePath->text());
cbrowser->show();
connect(cbrowser, SIGNAL(itemChanged(QString)), this, SLOT(setCache(QString))); connect(cbrowser, SIGNAL(itemChanged(QString)), this, SLOT(setCache(QString)));
cbrowser->show();
} }
void Config::setMountpoint(QString m) void Config::setMountpoint(QString m)

4
rbutil/rbutilqt/createvoicewindow.cpp
View file

@ -35,15 +35,15 @@ void CreateVoiceWindow::change()
{ {
Config *cw = new Config(this,4); Config *cw = new Config(this,4);
cw->setSettings(settings); cw->setSettings(settings);
cw->show();
connect(cw, SIGNAL(settingsUpdated()), this, SLOT(updateSettings())); connect(cw, SIGNAL(settingsUpdated()), this, SLOT(updateSettings()));
cw->show();
} }
void CreateVoiceWindow::accept() void CreateVoiceWindow::accept()
{ {
logger = new ProgressLoggerGui(this); logger = new ProgressLoggerGui(this);
logger->show();
connect(logger,SIGNAL(closed()),this,SLOT(close())); connect(logger,SIGNAL(closed()),this,SLOT(close()));
logger->show();
QString lang = ui.comboLanguage->currentText(); QString lang = ui.comboLanguage->currentText();
int wvThreshold = ui.wavtrimthreshold->value(); int wvThreshold = ui.wavtrimthreshold->value();

3
rbutil/rbutilqt/install.cpp
View file

@ -93,10 +93,11 @@ void Install::accept()
installer->setLogVersion(myversion); installer->setLogVersion(myversion);
installer->setMountPoint(mountPoint); installer->setMountPoint(mountPoint);
installer->install(logger);
connect(installer, SIGNAL(done(bool)), this, SLOT(done(bool))); connect(installer, SIGNAL(done(bool)), this, SLOT(done(bool)));
installer->install(logger);
} }
// Zip installer has finished // Zip installer has finished

8
rbutil/rbutilqt/installtalkwindow.cpp
View file

@ -67,15 +67,19 @@ void InstallTalkWindow::change()
{ {
Config *cw = new Config(this,4); Config *cw = new Config(this,4);
cw->setSettings(settings); cw->setSettings(settings);
cw->show();
connect(cw, SIGNAL(settingsUpdated()), this, SLOT(updateSettings())); connect(cw, SIGNAL(settingsUpdated()), this, SLOT(updateSettings()));
cw->show();
} }
void InstallTalkWindow::accept() void InstallTalkWindow::accept()
{ {
logger = new ProgressLoggerGui(this); logger = new ProgressLoggerGui(this);
logger->show();
connect(logger,SIGNAL(closed()),this,SLOT(close())); connect(logger,SIGNAL(closed()),this,SLOT(close()));
logger->show();
QString folderToTalk = ui.lineTalkFolder->text(); QString folderToTalk = ui.lineTalkFolder->text();

8
rbutil/rbutilqt/installthemes.cpp
View file

@ -232,9 +232,11 @@ void ThemesInstallWindow::show()
logger = new ProgressLoggerGui(this); logger = new ProgressLoggerGui(this);
logger->show(); logger->show();
logger->addItem(tr("getting themes information ..."), LOGINFO); logger->addItem(tr("getting themes information ..."), LOGINFO);
downloadInfo();
connect(logger, SIGNAL(aborted()), getter, SLOT(abort())); 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); installer->setMountPoint(mountPoint);
if(!settings->cacheDisabled()) if(!settings->cacheDisabled())
installer->setCache(true); installer->setCache(true);
installer->install(logger);
connect(logger, SIGNAL(closed()), this, SLOT(close())); connect(logger, SIGNAL(closed()), this, SLOT(close()));
installer->install(logger);
} }

11
rbutil/rbutilqt/rbutilqt.cpp
View file

@ -244,9 +244,9 @@ void RbUtilQt::configDialog()
{ {
Config *cw = new Config(this); Config *cw = new Config(this);
cw->setSettings(settings); cw->setSettings(settings);
cw->show();
connect(cw, SIGNAL(settingsUpdated()), this, SLOT(updateSettings())); connect(cw, SIGNAL(settingsUpdated()), this, SLOT(updateSettings()));
connect(cw, SIGNAL(settingsUpdated()), this, SLOT(downloadInfo())); connect(cw, SIGNAL(settingsUpdated()), this, SLOT(downloadInfo()));
cw->show();
} }
@ -500,8 +500,7 @@ void RbUtilQt::install()
bool RbUtilQt::installBootloaderAuto() bool RbUtilQt::installBootloaderAuto()
{ {
installBootloader(); installBootloader();
connect(blinstaller,SIGNAL(done(bool)),this,SLOT(installdone(bool))); return !m_error;
return !m_error;
} }
void RbUtilQt::installBootloaderBtn() void RbUtilQt::installBootloaderBtn()
@ -514,6 +513,7 @@ void RbUtilQt::installBootloaderBtn()
// create logger // create logger
logger = new ProgressLoggerGui(this); logger = new ProgressLoggerGui(this);
logger->show(); logger->show();
connect(blinstaller,SIGNAL(done(bool)),this,SLOT(installdone(bool)));
installBootloader(); installBootloader();
} }
@ -723,9 +723,10 @@ void RbUtilQt::createTalkFiles(void)
if(chkConfig(true)) return; if(chkConfig(true)) return;
InstallTalkWindow *installWindow = new InstallTalkWindow(this); InstallTalkWindow *installWindow = new InstallTalkWindow(this);
installWindow->setSettings(settings); installWindow->setSettings(settings);
installWindow->show();
connect(installWindow, SIGNAL(settingsUpdated()), this, SLOT(downloadInfo())); connect(installWindow, SIGNAL(settingsUpdated()), this, SLOT(downloadInfo()));
connect(installWindow, SIGNAL(settingsUpdated()), this, SLOT(updateSettings())); connect(installWindow, SIGNAL(settingsUpdated()), this, SLOT(updateSettings()));
installWindow->show();
} }
@ -735,9 +736,9 @@ void RbUtilQt::createVoiceFile(void)
CreateVoiceWindow *installWindow = new CreateVoiceWindow(this); CreateVoiceWindow *installWindow = new CreateVoiceWindow(this);
installWindow->setSettings(settings); installWindow->setSettings(settings);
installWindow->show();
connect(installWindow, SIGNAL(settingsUpdated()), this, SLOT(downloadInfo())); connect(installWindow, SIGNAL(settingsUpdated()), this, SLOT(downloadInfo()));
connect(installWindow, SIGNAL(settingsUpdated()), this, SLOT(updateSettings())); connect(installWindow, SIGNAL(settingsUpdated()), this, SLOT(updateSettings()));
installWindow->show();
} }
void RbUtilQt::uninstall(void) void RbUtilQt::uninstall(void)

3
rbutil/rbutilqt/uninstallwindow.cpp
View file

@ -35,6 +35,7 @@ void UninstallWindow::accept()
logger = new ProgressLoggerGui(this); logger = new ProgressLoggerGui(this);
logger->show(); logger->show();
connect(logger,SIGNAL(closed()),this,SLOT(close()));
if(ui.CompleteRadioBtn->isChecked()) if(ui.CompleteRadioBtn->isChecked())
{ {
uninstaller->deleteAll(logger); uninstaller->deleteAll(logger);
@ -43,7 +44,7 @@ void UninstallWindow::accept()
{ {
uninstaller->uninstall(logger); uninstaller->uninstall(logger);
} }
connect(logger,SIGNAL(closed()),this,SLOT(close()));
} }