diff options
-rw-r--r-- | rbutil/rbutilqt/configure.cpp | 3 | ||||
-rw-r--r-- | rbutil/rbutilqt/createvoicewindow.cpp | 4 | ||||
-rw-r--r-- | rbutil/rbutilqt/install.cpp | 5 | ||||
-rw-r--r-- | rbutil/rbutilqt/installtalkwindow.cpp | 8 | ||||
-rw-r--r-- | rbutil/rbutilqt/installthemes.cpp | 10 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.cpp | 15 | ||||
-rw-r--r-- | rbutil/rbutilqt/uninstallwindow.cpp | 5 |
7 files changed, 31 insertions, 19 deletions
diff --git a/rbutil/rbutilqt/configure.cpp b/rbutil/rbutilqt/configure.cpp index 8361d7e45e..ab926f1aa0 100644 --- a/rbutil/rbutilqt/configure.cpp +++ b/rbutil/rbutilqt/configure.cpp @@ -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) diff --git a/rbutil/rbutilqt/createvoicewindow.cpp b/rbutil/rbutilqt/createvoicewindow.cpp index 35582297c8..66819aedd6 100644 --- a/rbutil/rbutilqt/createvoicewindow.cpp +++ b/rbutil/rbutilqt/createvoicewindow.cpp @@ -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(); diff --git a/rbutil/rbutilqt/install.cpp b/rbutil/rbutilqt/install.cpp index bd59172870..45004cb2b0 100644 --- a/rbutil/rbutilqt/install.cpp +++ b/rbutil/rbutilqt/install.cpp @@ -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); } diff --git a/rbutil/rbutilqt/installtalkwindow.cpp b/rbutil/rbutilqt/installtalkwindow.cpp index 158365c460..1246d53876 100644 --- a/rbutil/rbutilqt/installtalkwindow.cpp +++ b/rbutil/rbutilqt/installtalkwindow.cpp @@ -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(); diff --git a/rbutil/rbutilqt/installthemes.cpp b/rbutil/rbutilqt/installthemes.cpp index 2d0b1dfcd5..3895d317cd 100644 --- a/rbutil/rbutilqt/installthemes.cpp +++ b/rbutil/rbutilqt/installthemes.cpp @@ -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())); + } diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp index 92532059fb..7574d43095 100644 --- a/rbutil/rbutilqt/rbutilqt.cpp +++ b/rbutil/rbutilqt/rbutilqt.cpp @@ -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) diff --git a/rbutil/rbutilqt/uninstallwindow.cpp b/rbutil/rbutilqt/uninstallwindow.cpp index 86c7400b99..b758a3cc6d 100644 --- a/rbutil/rbutilqt/uninstallwindow.cpp +++ b/rbutil/rbutilqt/uninstallwindow.cpp @@ -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())); + } |