summaryrefslogtreecommitdiff
path: root/rbutil/rbutilqt/configure.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'rbutil/rbutilqt/configure.cpp')
-rw-r--r--rbutil/rbutilqt/configure.cpp19
1 files changed, 13 insertions, 6 deletions
diff --git a/rbutil/rbutilqt/configure.cpp b/rbutil/rbutilqt/configure.cpp
index 993757ed5a..e74dc6e30d 100644
--- a/rbutil/rbutilqt/configure.cpp
+++ b/rbutil/rbutilqt/configure.cpp
@@ -150,10 +150,17 @@ void Config::abort()
150 this->close(); 150 this->close();
151} 151}
152 152
153 153void Config::setSettings(QSettings* user,QSettings* device)
154void Config::setUserSettings(QSettings *user)
155{ 154{
156 userSettings = user; 155 userSettings = user;
156 devices = device;
157
158 setUserSettings();
159 setDevices();
160}
161
162void Config::setUserSettings()
163{
157 // set proxy 164 // set proxy
158 proxy = userSettings->value("proxy").toString(); 165 proxy = userSettings->value("proxy").toString();
159 166
@@ -214,9 +221,9 @@ void Config::updateCacheInfo(QString path)
214} 221}
215 222
216 223
217void Config::setDevices(QSettings *dev) 224void Config::setDevices()
218{ 225{
219 devices = dev; 226
220 // setup devices table 227 // setup devices table
221 qDebug() << "Config::setDevices()"; 228 qDebug() << "Config::setDevices()";
222 devices->beginGroup("platforms"); 229 devices->beginGroup("platforms");
@@ -320,7 +327,7 @@ void Config::updateTtsState(int index)
320{ 327{
321 QString ttsName = ui.comboTts->itemText(index); 328 QString ttsName = ui.comboTts->itemText(index);
322 TTSBase* tts = getTTS(ttsName); 329 TTSBase* tts = getTTS(ttsName);
323 tts->setUserCfg(userSettings); 330 tts->setCfg(userSettings,devices);
324 331
325 if(tts->configOk()) 332 if(tts->configOk())
326 { 333 {
@@ -624,7 +631,7 @@ void Config::configTts()
624{ 631{
625 TTSBase* tts =getTTS(ui.comboTts->currentText()); 632 TTSBase* tts =getTTS(ui.comboTts->currentText());
626 633
627 tts->setUserCfg(userSettings); 634 tts->setCfg(userSettings,devices);
628 tts->showCfg(); 635 tts->showCfg();
629 updateTtsState(ui.comboTts->currentIndex()); 636 updateTtsState(ui.comboTts->currentIndex());
630} 637}