diff options
Diffstat (limited to 'rbutil/rbutilqt/installtalkwindow.cpp')
-rw-r--r-- | rbutil/rbutilqt/installtalkwindow.cpp | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/rbutil/rbutilqt/installtalkwindow.cpp b/rbutil/rbutilqt/installtalkwindow.cpp index e1b0b69049..f7202aae40 100644 --- a/rbutil/rbutilqt/installtalkwindow.cpp +++ b/rbutil/rbutilqt/installtalkwindow.cpp | |||
@@ -66,7 +66,7 @@ void InstallTalkWindow::setTalkFolder(QString folder) | |||
66 | void InstallTalkWindow::change() | 66 | void InstallTalkWindow::change() |
67 | { | 67 | { |
68 | Config *cw = new Config(this,4); | 68 | Config *cw = new Config(this,4); |
69 | cw->setSettings(userSettings,devices); | 69 | cw->setSettings(settings); |
70 | cw->show(); | 70 | cw->show(); |
71 | connect(cw, SIGNAL(settingsUpdated()), this, SIGNAL(settingsUpdated())); | 71 | connect(cw, SIGNAL(settingsUpdated()), this, SIGNAL(settingsUpdated())); |
72 | } | 72 | } |
@@ -86,13 +86,13 @@ void InstallTalkWindow::accept() | |||
86 | return; | 86 | return; |
87 | } | 87 | } |
88 | 88 | ||
89 | userSettings->setValue("last_talked_folder", folderToTalk); | 89 | settings->setLastTalkedDir(folderToTalk); |
90 | 90 | ||
91 | userSettings->sync(); | 91 | settings->sync(); |
92 | 92 | ||
93 | talkcreator->setSettings(userSettings,devices); | 93 | talkcreator->setSettings(settings); |
94 | talkcreator->setDir(QDir(folderToTalk)); | 94 | talkcreator->setDir(QDir(folderToTalk)); |
95 | talkcreator->setMountPoint(userSettings->value("mountpoint").toString()); | 95 | talkcreator->setMountPoint(settings->mountpoint()); |
96 | 96 | ||
97 | talkcreator->setOverwriteTalk(ui.OverwriteTalk->isChecked()); | 97 | talkcreator->setOverwriteTalk(ui.OverwriteTalk->isChecked()); |
98 | talkcreator->setOverwriteWav(ui.OverwriteWav->isChecked()); | 98 | talkcreator->setOverwriteWav(ui.OverwriteWav->isChecked()); |
@@ -106,29 +106,27 @@ void InstallTalkWindow::accept() | |||
106 | } | 106 | } |
107 | 107 | ||
108 | 108 | ||
109 | void InstallTalkWindow::setSettings(QSettings *user,QSettings *dev) | 109 | void InstallTalkWindow::setSettings(RbSettings* sett) |
110 | { | 110 | { |
111 | devices = dev; | 111 | settings = sett; |
112 | userSettings = user; | 112 | |
113 | qDebug() << "Install::setDeviceSettings:" << devices; | 113 | QString ttsName = settings->curTTS(); |
114 | |||
115 | QString ttsName = userSettings->value("tts", "none").toString(); | ||
116 | TTSBase* tts = getTTS(ttsName); | 114 | TTSBase* tts = getTTS(ttsName); |
117 | tts->setCfg(userSettings,devices); | 115 | tts->setCfg(settings); |
118 | if(tts->configOk()) | 116 | if(tts->configOk()) |
119 | ui.labelTtsProfile->setText(tr("Selected TTS engine : <b>%1</b>").arg(ttsName)); | 117 | ui.labelTtsProfile->setText(tr("Selected TTS engine : <b>%1</b>").arg(ttsName)); |
120 | else | 118 | else |
121 | ui.labelTtsProfile->setText(tr("Selected TTS Engine: <b>%1</b>").arg("Invalid TTS configuration!")); | 119 | ui.labelTtsProfile->setText(tr("Selected TTS Engine: <b>%1</b>").arg("Invalid TTS configuration!")); |
122 | 120 | ||
123 | QString encoder = userSettings->value("encoder", "none").toString(); | 121 | QString encoder = settings->curEncoder(); |
124 | EncBase* enc = getEncoder(encoder); | 122 | EncBase* enc = getEncoder(encoder); |
125 | enc->setUserCfg(userSettings); | 123 | enc->setCfg(settings); |
126 | if(enc->configOk()) | 124 | if(enc->configOk()) |
127 | ui.labelEncProfile->setText(tr("Selected Encoder: <b>%1</b>").arg(encoder)); | 125 | ui.labelEncProfile->setText(tr("Selected Encoder: <b>%1</b>").arg(encoder)); |
128 | else | 126 | else |
129 | ui.labelEncProfile->setText(tr("Selected Encoder: <b>%1</b>").arg("Invalid encoder configuration!")); | 127 | ui.labelEncProfile->setText(tr("Selected Encoder: <b>%1</b>").arg("Invalid encoder configuration!")); |
130 | 128 | ||
131 | setTalkFolder(userSettings->value("last_talked_folder").toString()); | 129 | setTalkFolder(settings->lastTalkedFolder()); |
132 | 130 | ||
133 | } | 131 | } |
134 | 132 | ||