summaryrefslogtreecommitdiffstats
path: root/rbutil/rbutilqt/installtalkwindow.cpp
diff options
context:
space:
mode:
authorDominik Wenger <domonoky@googlemail.com>2008-01-19 18:33:33 +0000
committerDominik Wenger <domonoky@googlemail.com>2008-01-19 18:33:33 +0000
commit6b5780dae3561842c858f9c63d00430521628c9c (patch)
tree130cf07117dfa39d29811ddd6d509aa9456de657 /rbutil/rbutilqt/installtalkwindow.cpp
parent2cffb1bf3df30d312944cc283a48c081def2fec8 (diff)
downloadrockbox-6b5780dae3561842c858f9c63d00430521628c9c.tar.gz
rockbox-6b5780dae3561842c858f9c63d00430521628c9c.tar.bz2
rockbox-6b5780dae3561842c858f9c63d00430521628c9c.zip
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
Diffstat (limited to 'rbutil/rbutilqt/installtalkwindow.cpp')
-rw-r--r--rbutil/rbutilqt/installtalkwindow.cpp18
1 files changed, 7 insertions, 11 deletions
diff --git a/rbutil/rbutilqt/installtalkwindow.cpp b/rbutil/rbutilqt/installtalkwindow.cpp
index 4634ba3eaf..e1b0b69049 100644
--- a/rbutil/rbutilqt/installtalkwindow.cpp
+++ b/rbutil/rbutilqt/installtalkwindow.cpp
@@ -66,8 +66,7 @@ void InstallTalkWindow::setTalkFolder(QString folder)
void InstallTalkWindow::change()
{
Config *cw = new Config(this,4);
- cw->setUserSettings(userSettings);
- cw->setDevices(devices);
+ cw->setSettings(userSettings,devices);
cw->show();
connect(cw, SIGNAL(settingsUpdated()), this, SIGNAL(settingsUpdated()));
}
@@ -91,7 +90,7 @@ void InstallTalkWindow::accept()
userSettings->sync();
- talkcreator->setUserSettings(userSettings);
+ talkcreator->setSettings(userSettings,devices);
talkcreator->setDir(QDir(folderToTalk));
talkcreator->setMountPoint(userSettings->value("mountpoint").toString());
@@ -107,14 +106,15 @@ void InstallTalkWindow::accept()
}
-void InstallTalkWindow::setDeviceSettings(QSettings *dev)
+void InstallTalkWindow::setSettings(QSettings *user,QSettings *dev)
{
devices = dev;
+ userSettings = user;
qDebug() << "Install::setDeviceSettings:" << devices;
QString ttsName = userSettings->value("tts", "none").toString();
TTSBase* tts = getTTS(ttsName);
- tts->setUserCfg(userSettings);
+ tts->setCfg(userSettings,devices);
if(tts->configOk())
ui.labelTtsProfile->setText(tr("Selected TTS engine : <b>%1</b>").arg(ttsName));
else
@@ -127,12 +127,8 @@ void InstallTalkWindow::setDeviceSettings(QSettings *dev)
ui.labelEncProfile->setText(tr("Selected Encoder: <b>%1</b>").arg(encoder));
else
ui.labelEncProfile->setText(tr("Selected Encoder: <b>%1</b>").arg("Invalid encoder configuration!"));
-}
-
-void InstallTalkWindow::setUserSettings(QSettings *user)
-{
- userSettings = user;
-
+
setTalkFolder(userSettings->value("last_talked_folder").toString());
}
+