rbutilqt: made the sapi TTS more configurable, you can now select a specific voice in the config dialog. Also reworked some setSetting functions, to remove depencies.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16111 a1c6a512-1295-4272-9138-f99709370657

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()
     this->close();
 }
 
-
-void Config::setUserSettings(QSettings *user)
+void Config::setSettings(QSettings* user,QSettings* device)
 {
     userSettings = user;
+    devices = device;
+    
+    setUserSettings();
+    setDevices();
+}
+
+void Config::setUserSettings()
+{
     // set proxy
     proxy = userSettings->value("proxy").toString();
 
@@ -214,9 +221,9 @@ void Config::updateCacheInfo(QString path)
 }
 
 
-void Config::setDevices(QSettings *dev)
+void Config::setDevices()
 {
-    devices = dev;
+    
     // setup devices table
     qDebug() << "Config::setDevices()";
     devices->beginGroup("platforms");
@@ -320,7 +327,7 @@ void Config::updateTtsState(int index)
 {
     QString ttsName = ui.comboTts->itemText(index);
     TTSBase* tts = getTTS(ttsName);
-    tts->setUserCfg(userSettings);
+    tts->setCfg(userSettings,devices);
     
     if(tts->configOk())
     {
@@ -624,7 +631,7 @@ void Config::configTts()
 {
     TTSBase* tts =getTTS(ui.comboTts->currentText());
     
-    tts->setUserCfg(userSettings);
+    tts->setCfg(userSettings,devices);
     tts->showCfg();
     updateTtsState(ui.comboTts->currentIndex());
 }