diff options
Diffstat (limited to 'rbutil/rbutilqt/rbutilqt.cpp')
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp index a28defc413..bbba56e2e8 100644 --- a/rbutil/rbutilqt/rbutilqt.cpp +++ b/rbutil/rbutilqt/rbutilqt.cpp | |||
@@ -253,8 +253,7 @@ void RbUtilQt::help() | |||
253 | void RbUtilQt::configDialog() | 253 | void RbUtilQt::configDialog() |
254 | { | 254 | { |
255 | Config *cw = new Config(this); | 255 | Config *cw = new Config(this); |
256 | cw->setUserSettings(userSettings); | 256 | cw->setSettings(userSettings,devices); |
257 | cw->setDevices(devices); | ||
258 | cw->show(); | 257 | cw->show(); |
259 | connect(cw, SIGNAL(settingsUpdated()), this, SLOT(downloadInfo())); | 258 | connect(cw, SIGNAL(settingsUpdated()), this, SLOT(downloadInfo())); |
260 | connect(cw, SIGNAL(settingsUpdated()), this, SLOT(updateSettings())); | 259 | connect(cw, SIGNAL(settingsUpdated()), this, SLOT(updateSettings())); |
@@ -748,8 +747,7 @@ void RbUtilQt::createTalkFiles(void) | |||
748 | { | 747 | { |
749 | if(chkConfig(true)) return; | 748 | if(chkConfig(true)) return; |
750 | InstallTalkWindow *installWindow = new InstallTalkWindow(this); | 749 | InstallTalkWindow *installWindow = new InstallTalkWindow(this); |
751 | installWindow->setUserSettings(userSettings); | 750 | installWindow->setSettings(userSettings,devices); |
752 | installWindow->setDeviceSettings(devices); | ||
753 | installWindow->show(); | 751 | installWindow->show(); |
754 | connect(installWindow, SIGNAL(settingsUpdated()), this, SLOT(downloadInfo())); | 752 | connect(installWindow, SIGNAL(settingsUpdated()), this, SLOT(downloadInfo())); |
755 | connect(installWindow, SIGNAL(settingsUpdated()), this, SLOT(updateSettings())); | 753 | connect(installWindow, SIGNAL(settingsUpdated()), this, SLOT(updateSettings())); |
@@ -760,8 +758,7 @@ void RbUtilQt::createVoiceFile(void) | |||
760 | { | 758 | { |
761 | if(chkConfig(true)) return; | 759 | if(chkConfig(true)) return; |
762 | CreateVoiceWindow *installWindow = new CreateVoiceWindow(this); | 760 | CreateVoiceWindow *installWindow = new CreateVoiceWindow(this); |
763 | installWindow->setUserSettings(userSettings); | 761 | installWindow->setSettings(userSettings,devices); |
764 | installWindow->setDeviceSettings(devices); | ||
765 | installWindow->setProxy(proxy()); | 762 | installWindow->setProxy(proxy()); |
766 | 763 | ||
767 | installWindow->show(); | 764 | installWindow->show(); |