diff options
Diffstat (limited to 'rbutil/rbutilqt/installtalkwindow.cpp')
-rw-r--r-- | rbutil/rbutilqt/installtalkwindow.cpp | 55 |
1 files changed, 8 insertions, 47 deletions
diff --git a/rbutil/rbutilqt/installtalkwindow.cpp b/rbutil/rbutilqt/installtalkwindow.cpp index caceb03176..4634ba3eaf 100644 --- a/rbutil/rbutilqt/installtalkwindow.cpp +++ b/rbutil/rbutilqt/installtalkwindow.cpp | |||
@@ -79,26 +79,7 @@ void InstallTalkWindow::accept() | |||
79 | connect(logger,SIGNAL(closed()),this,SLOT(close())); | 79 | connect(logger,SIGNAL(closed()),this,SLOT(close())); |
80 | 80 | ||
81 | QString folderToTalk = ui.lineTalkFolder->text(); | 81 | QString folderToTalk = ui.lineTalkFolder->text(); |
82 | 82 | ||
83 | // tts | ||
84 | QString preset = userSettings->value("ttspreset").toString(); | ||
85 | userSettings->beginGroup(preset); | ||
86 | QString pathTTS = userSettings->value("binary").toString(); | ||
87 | QString ttsOpts = userSettings->value("options").toString(); | ||
88 | QString ttsLanguage = userSettings->value("language").toString(); | ||
89 | QString ttsTemplate = userSettings->value("template").toString(); | ||
90 | QString ttsType =userSettings->value("type").toString(); | ||
91 | userSettings->endGroup(); | ||
92 | |||
93 | //encoder | ||
94 | QString encoderPreset = userSettings->value("encpreset").toString(); | ||
95 | userSettings->beginGroup(encoderPreset); | ||
96 | QString pathEncoder = userSettings->value("binary").toString(); | ||
97 | QString encOpts = userSettings->value("options").toString(); | ||
98 | QString encTemplate = userSettings->value("template").toString(); | ||
99 | QString encType =userSettings->value("type").toString(); | ||
100 | userSettings->endGroup(); | ||
101 | |||
102 | if(!QFileInfo(folderToTalk).isDir()) | 83 | if(!QFileInfo(folderToTalk).isDir()) |
103 | { | 84 | { |
104 | logger->addItem(tr("The Folder to Talk is wrong!"),LOGERROR); | 85 | logger->addItem(tr("The Folder to Talk is wrong!"),LOGERROR); |
@@ -106,20 +87,6 @@ void InstallTalkWindow::accept() | |||
106 | return; | 87 | return; |
107 | } | 88 | } |
108 | 89 | ||
109 | if(!QFileInfo(pathEncoder).isExecutable()) | ||
110 | { | ||
111 | logger->addItem(tr("Path to Encoder is wrong!"),LOGERROR); | ||
112 | logger->abort(); | ||
113 | return; | ||
114 | } | ||
115 | |||
116 | if(!QFileInfo(pathTTS).exists()) | ||
117 | { | ||
118 | logger->addItem(tr("Path to TTS is wrong!"),LOGERROR); | ||
119 | logger->abort(); | ||
120 | return; | ||
121 | } | ||
122 | |||
123 | userSettings->setValue("last_talked_folder", folderToTalk); | 90 | userSettings->setValue("last_talked_folder", folderToTalk); |
124 | 91 | ||
125 | userSettings->sync(); | 92 | userSettings->sync(); |
@@ -127,11 +94,6 @@ void InstallTalkWindow::accept() | |||
127 | talkcreator->setUserSettings(userSettings); | 94 | talkcreator->setUserSettings(userSettings); |
128 | talkcreator->setDir(QDir(folderToTalk)); | 95 | talkcreator->setDir(QDir(folderToTalk)); |
129 | talkcreator->setMountPoint(userSettings->value("mountpoint").toString()); | 96 | talkcreator->setMountPoint(userSettings->value("mountpoint").toString()); |
130 | talkcreator->setTTSexe(pathTTS); | ||
131 | talkcreator->setTTsOpts(ttsOpts); | ||
132 | talkcreator->setTTsLanguage(ttsLanguage); | ||
133 | talkcreator->setTTsType(ttsType); | ||
134 | talkcreator->setTTsTemplate(ttsTemplate); | ||
135 | 97 | ||
136 | talkcreator->setOverwriteTalk(ui.OverwriteTalk->isChecked()); | 98 | talkcreator->setOverwriteTalk(ui.OverwriteTalk->isChecked()); |
137 | talkcreator->setOverwriteWav(ui.OverwriteWav->isChecked()); | 99 | talkcreator->setOverwriteWav(ui.OverwriteWav->isChecked()); |
@@ -150,14 +112,13 @@ void InstallTalkWindow::setDeviceSettings(QSettings *dev) | |||
150 | devices = dev; | 112 | devices = dev; |
151 | qDebug() << "Install::setDeviceSettings:" << devices; | 113 | qDebug() << "Install::setDeviceSettings:" << devices; |
152 | 114 | ||
153 | QString profile; | 115 | QString ttsName = userSettings->value("tts", "none").toString(); |
154 | 116 | TTSBase* tts = getTTS(ttsName); | |
155 | profile = userSettings->value("ttspreset", "none").toString(); | 117 | tts->setUserCfg(userSettings); |
156 | devices->beginGroup("tts"); | 118 | if(tts->configOk()) |
157 | ui.labelTtsProfile->setText(tr("TTS Profile: <b>%1</b>") | 119 | ui.labelTtsProfile->setText(tr("Selected TTS engine : <b>%1</b>").arg(ttsName)); |
158 | .arg(devices->value(profile, tr("Invalid TTS profile!")).toString())); | 120 | else |
159 | qDebug() << profile; | 121 | ui.labelTtsProfile->setText(tr("Selected TTS Engine: <b>%1</b>").arg("Invalid TTS configuration!")); |
160 | devices->endGroup(); | ||
161 | 122 | ||
162 | QString encoder = userSettings->value("encoder", "none").toString(); | 123 | QString encoder = userSettings->value("encoder", "none").toString(); |
163 | EncBase* enc = getEncoder(encoder); | 124 | EncBase* enc = getEncoder(encoder); |