rbutil: move many more connect calls, mainly for safety.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16997 a1c6a512-1295-4272-9138-f99709370657
diff --git a/rbutil/rbutilqt/configure.cpp b/rbutil/rbutilqt/configure.cpp
index 8361d7e..ab926f1 100644
--- a/rbutil/rbutilqt/configure.cpp
+++ b/rbutil/rbutilqt/configure.cpp
@@ -469,8 +469,9 @@
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)
diff --git a/rbutil/rbutilqt/createvoicewindow.cpp b/rbutil/rbutilqt/createvoicewindow.cpp
index 3558229..66819ae 100644
--- a/rbutil/rbutilqt/createvoicewindow.cpp
+++ b/rbutil/rbutilqt/createvoicewindow.cpp
@@ -35,15 +35,15 @@
{
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();
diff --git a/rbutil/rbutilqt/install.cpp b/rbutil/rbutilqt/install.cpp
index bd59172..45004cb 100644
--- a/rbutil/rbutilqt/install.cpp
+++ b/rbutil/rbutilqt/install.cpp
@@ -93,9 +93,10 @@
installer->setLogVersion(myversion);
installer->setMountPoint(mountPoint);
- installer->install(logger);
-
+
connect(installer, SIGNAL(done(bool)), this, SLOT(done(bool)));
+
+ installer->install(logger);
}
diff --git a/rbutil/rbutilqt/installtalkwindow.cpp b/rbutil/rbutilqt/installtalkwindow.cpp
index 158365c..1246d53 100644
--- a/rbutil/rbutilqt/installtalkwindow.cpp
+++ b/rbutil/rbutilqt/installtalkwindow.cpp
@@ -67,15 +67,19 @@
{
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();
diff --git a/rbutil/rbutilqt/installthemes.cpp b/rbutil/rbutilqt/installthemes.cpp
index 2d0b1df..3895d31 100644
--- a/rbutil/rbutilqt/installthemes.cpp
+++ b/rbutil/rbutilqt/installthemes.cpp
@@ -232,9 +232,11 @@
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 @@
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()));
+
}
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp
index 9253205..7574d43 100644
--- a/rbutil/rbutilqt/rbutilqt.cpp
+++ b/rbutil/rbutilqt/rbutilqt.cpp
@@ -244,9 +244,9 @@
{
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 @@
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 @@
// create logger
logger = new ProgressLoggerGui(this);
logger->show();
-
+ connect(blinstaller,SIGNAL(done(bool)),this,SLOT(installdone(bool)));
+
installBootloader();
}
@@ -723,9 +723,10 @@
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 @@
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)
diff --git a/rbutil/rbutilqt/uninstallwindow.cpp b/rbutil/rbutilqt/uninstallwindow.cpp
index 86c7400..b758a3c 100644
--- a/rbutil/rbutilqt/uninstallwindow.cpp
+++ b/rbutil/rbutilqt/uninstallwindow.cpp
@@ -34,7 +34,8 @@
{
logger = new ProgressLoggerGui(this);
logger->show();
-
+
+ connect(logger,SIGNAL(closed()),this,SLOT(close()));
if(ui.CompleteRadioBtn->isChecked())
{
uninstaller->deleteAll(logger);
@@ -43,7 +44,7 @@
{
uninstaller->uninstall(logger);
}
- connect(logger,SIGNAL(closed()),this,SLOT(close()));
+
}