summaryrefslogtreecommitdiff
path: root/rbutil/rbutilqt/createvoicewindow.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'rbutil/rbutilqt/createvoicewindow.cpp')
-rw-r--r--rbutil/rbutilqt/createvoicewindow.cpp27
1 files changed, 14 insertions, 13 deletions
diff --git a/rbutil/rbutilqt/createvoicewindow.cpp b/rbutil/rbutilqt/createvoicewindow.cpp
index 3ae489c7c7..ff72e9a463 100644
--- a/rbutil/rbutilqt/createvoicewindow.cpp
+++ b/rbutil/rbutilqt/createvoicewindow.cpp
@@ -34,8 +34,7 @@ CreateVoiceWindow::CreateVoiceWindow(QWidget *parent) : QDialog(parent)
34void CreateVoiceWindow::change() 34void CreateVoiceWindow::change()
35{ 35{
36 Config *cw = new Config(this,4); 36 Config *cw = new Config(this,4);
37 cw->setUserSettings(userSettings); 37 cw->setSettings(userSettings,devices);
38 cw->setDevices(devices);
39 cw->show(); 38 cw->show();
40 connect(cw, SIGNAL(settingsUpdated()), this, SIGNAL(settingsUpdated())); 39 connect(cw, SIGNAL(settingsUpdated()), this, SIGNAL(settingsUpdated()));
41} 40}
@@ -47,19 +46,21 @@ void CreateVoiceWindow::accept()
47 connect(logger,SIGNAL(closed()),this,SLOT(close())); 46 connect(logger,SIGNAL(closed()),this,SLOT(close()));
48 47
49 QString platform = userSettings->value("platform").toString(); 48 QString platform = userSettings->value("platform").toString();
50 QString lang = ui.comboLanguage->currentText(); 49 QString lang = ui.comboLanguage->currentText();
50 int wvThreshold = ui.wavtrimthreshold->value();
51 51
52 //safe selected language 52 //safe selected language
53 userSettings->setValue("voicelanguage",lang); 53 userSettings->setValue("voicelanguage",lang);
54 userSettings->setValue("wavtrimthreshold",wvThreshold);
54 userSettings->sync(); 55 userSettings->sync();
55 56
56 //configure voicecreator 57 //configure voicecreator
57 voicecreator->setUserSettings(userSettings); 58 voicecreator->setSettings(userSettings,devices);
58 voicecreator->setDeviceSettings(devices);
59 voicecreator->setMountPoint(userSettings->value("mountpoint").toString()); 59 voicecreator->setMountPoint(userSettings->value("mountpoint").toString());
60 voicecreator->setTargetId(devices->value(platform + "/targetid").toInt()); 60 voicecreator->setTargetId(devices->value(platform + "/targetid").toInt());
61 voicecreator->setLang(lang); 61 voicecreator->setLang(lang);
62 voicecreator->setProxy(m_proxy); 62 voicecreator->setProxy(m_proxy);
63 voicecreator->setWavtrimThreshold(wvThreshold);
63 64
64 //start creating 65 //start creating
65 voicecreator->createVoiceFile(logger); 66 voicecreator->createVoiceFile(logger);
@@ -67,9 +68,10 @@ void CreateVoiceWindow::accept()
67 68
68 69
69 70
70void CreateVoiceWindow::setDeviceSettings(QSettings *dev) 71void CreateVoiceWindow::setSettings(QSettings *user,QSettings *dev)
71{ 72{
72 devices = dev; 73 devices = dev;
74 userSettings = user;
73 qDebug() << "Install::setDeviceSettings:" << devices; 75 qDebug() << "Install::setDeviceSettings:" << devices;
74 76
75 // fill in language combobox 77 // fill in language combobox
@@ -86,15 +88,10 @@ void CreateVoiceWindow::setDeviceSettings(QSettings *dev)
86 ui.comboLanguage->addItems(languages); 88 ui.comboLanguage->addItems(languages);
87 // set saved lang 89 // set saved lang
88 ui.comboLanguage->setCurrentIndex(ui.comboLanguage->findText(userSettings->value("voicelanguage").toString())); 90 ui.comboLanguage->setCurrentIndex(ui.comboLanguage->findText(userSettings->value("voicelanguage").toString()));
89}
90
91void CreateVoiceWindow::setUserSettings(QSettings *user)
92{
93 userSettings = user;
94 91
95 QString ttsName = userSettings->value("tts", "none").toString(); 92 QString ttsName = userSettings->value("tts", "none").toString();
96 TTSBase* tts = getTTS(ttsName); 93 TTSBase* tts = getTTS(ttsName);
97 tts->setUserCfg(userSettings); 94 tts->setCfg(userSettings,devices);
98 if(tts->configOk()) 95 if(tts->configOk())
99 ui.labelTtsProfile->setText(tr("Selected TTS engine : <b>%1</b>").arg(ttsName)); 96 ui.labelTtsProfile->setText(tr("Selected TTS engine : <b>%1</b>").arg(ttsName));
100 else 97 else
@@ -107,8 +104,12 @@ void CreateVoiceWindow::setUserSettings(QSettings *user)
107 ui.labelEncProfile->setText(tr("Selected Encoder: <b>%1</b>").arg(encoder)); 104 ui.labelEncProfile->setText(tr("Selected Encoder: <b>%1</b>").arg(encoder));
108 else 105 else
109 ui.labelEncProfile->setText(tr("Selected Encoder: <b>%1</b>").arg("Invalid encoder configuration!")); 106 ui.labelEncProfile->setText(tr("Selected Encoder: <b>%1</b>").arg("Invalid encoder configuration!"));
110 107
108 ui.wavtrimthreshold->setValue(userSettings->value("wavtrimthreshold", 500).toInt());
109
111} 110}
112 111
113 112
114 113
114
115