diff options
Diffstat (limited to 'rbutil/rbutilqt/createvoicewindow.cpp')
-rw-r--r-- | rbutil/rbutilqt/createvoicewindow.cpp | 36 |
1 files changed, 12 insertions, 24 deletions
diff --git a/rbutil/rbutilqt/createvoicewindow.cpp b/rbutil/rbutilqt/createvoicewindow.cpp index efd9f6a93f..c8c6b85435 100644 --- a/rbutil/rbutilqt/createvoicewindow.cpp +++ b/rbutil/rbutilqt/createvoicewindow.cpp | |||
@@ -22,6 +22,7 @@ | |||
22 | 22 | ||
23 | #include "browsedirtree.h" | 23 | #include "browsedirtree.h" |
24 | #include "configure.h" | 24 | #include "configure.h" |
25 | #include "rbsettings.h" | ||
25 | 26 | ||
26 | CreateVoiceWindow::CreateVoiceWindow(QWidget *parent) : QDialog(parent) | 27 | CreateVoiceWindow::CreateVoiceWindow(QWidget *parent) : QDialog(parent) |
27 | { | 28 | { |
@@ -34,7 +35,6 @@ CreateVoiceWindow::CreateVoiceWindow(QWidget *parent) : QDialog(parent) | |||
34 | void CreateVoiceWindow::change() | 35 | void CreateVoiceWindow::change() |
35 | { | 36 | { |
36 | Config *cw = new Config(this,4); | 37 | Config *cw = new Config(this,4); |
37 | cw->setSettings(settings); | ||
38 | connect(cw, SIGNAL(settingsUpdated()), this, SLOT(updateSettings())); | 38 | connect(cw, SIGNAL(settingsUpdated()), this, SLOT(updateSettings())); |
39 | cw->show(); | 39 | cw->show(); |
40 | } | 40 | } |
@@ -49,14 +49,13 @@ void CreateVoiceWindow::accept() | |||
49 | int wvThreshold = ui.wavtrimthreshold->value(); | 49 | int wvThreshold = ui.wavtrimthreshold->value(); |
50 | 50 | ||
51 | //safe selected language | 51 | //safe selected language |
52 | settings->setValue(RbSettings::Language, lang); | 52 | RbSettings::setValue(RbSettings::Language, lang); |
53 | settings->setValue(RbSettings::WavtrimThreshold, wvThreshold); | 53 | RbSettings::setValue(RbSettings::WavtrimThreshold, wvThreshold); |
54 | settings->sync(); | 54 | RbSettings::sync(); |
55 | 55 | ||
56 | //configure voicecreator | 56 | //configure voicecreator |
57 | voicecreator->setSettings(settings); | 57 | voicecreator->setMountPoint(RbSettings::value(RbSettings::Mountpoint).toString()); |
58 | voicecreator->setMountPoint(settings->value(RbSettings::Mountpoint).toString()); | 58 | voicecreator->setTargetId(RbSettings::value(RbSettings::CurTargetId).toInt()); |
59 | voicecreator->setTargetId(settings->value(RbSettings::CurTargetId).toInt()); | ||
60 | voicecreator->setLang(lang); | 59 | voicecreator->setLang(lang); |
61 | voicecreator->setWavtrimThreshold(wvThreshold); | 60 | voicecreator->setWavtrimThreshold(wvThreshold); |
62 | 61 | ||
@@ -65,28 +64,19 @@ void CreateVoiceWindow::accept() | |||
65 | } | 64 | } |
66 | 65 | ||
67 | 66 | ||
68 | /** @brief set settings object | ||
69 | */ | ||
70 | void CreateVoiceWindow::setSettings(RbSettings* sett) | ||
71 | { | ||
72 | settings = sett; | ||
73 | updateSettings(); | ||
74 | } | ||
75 | |||
76 | |||
77 | /** @brief update displayed settings | 67 | /** @brief update displayed settings |
78 | */ | 68 | */ |
79 | void CreateVoiceWindow::updateSettings(void) | 69 | void CreateVoiceWindow::updateSettings(void) |
80 | { | 70 | { |
81 | // fill in language combobox | 71 | // fill in language combobox |
82 | QStringList languages = settings->languages(); | 72 | QStringList languages = RbSettings::languages(); |
83 | languages.sort(); | 73 | languages.sort(); |
84 | ui.comboLanguage->addItems(languages); | 74 | ui.comboLanguage->addItems(languages); |
85 | // set saved lang | 75 | // set saved lang |
86 | int sel = ui.comboLanguage->findText(settings->value(RbSettings::VoiceLanguage).toString()); | 76 | int sel = ui.comboLanguage->findText(RbSettings::value(RbSettings::VoiceLanguage).toString()); |
87 | // if no saved language is found try to figure the language from the UI lang | 77 | // if no saved language is found try to figure the language from the UI lang |
88 | if(sel == -1) { | 78 | if(sel == -1) { |
89 | QString f = settings->value(RbSettings::Language).toString(); | 79 | QString f = RbSettings::value(RbSettings::Language).toString(); |
90 | // if no language is set default to english. Make sure not to check an empty string. | 80 | // if no language is set default to english. Make sure not to check an empty string. |
91 | if(f.isEmpty()) f = "english"; | 81 | if(f.isEmpty()) f = "english"; |
92 | sel = ui.comboLanguage->findText(f, Qt::MatchStartsWith); | 82 | sel = ui.comboLanguage->findText(f, Qt::MatchStartsWith); |
@@ -97,9 +87,8 @@ void CreateVoiceWindow::updateSettings(void) | |||
97 | } | 87 | } |
98 | ui.comboLanguage->setCurrentIndex(sel); | 88 | ui.comboLanguage->setCurrentIndex(sel); |
99 | 89 | ||
100 | QString ttsName = settings->value(RbSettings::Tts).toString(); | 90 | QString ttsName = RbSettings::value(RbSettings::Tts).toString(); |
101 | TTSBase* tts = TTSBase::getTTS(this,ttsName); | 91 | TTSBase* tts = TTSBase::getTTS(this,ttsName); |
102 | tts->setCfg(settings); | ||
103 | if(tts->configOk()) | 92 | if(tts->configOk()) |
104 | ui.labelTtsProfile->setText(tr("Selected TTS engine: <b>%1</b>") | 93 | ui.labelTtsProfile->setText(tr("Selected TTS engine: <b>%1</b>") |
105 | .arg(TTSBase::getTTSName(ttsName))); | 94 | .arg(TTSBase::getTTSName(ttsName))); |
@@ -107,11 +96,10 @@ void CreateVoiceWindow::updateSettings(void) | |||
107 | ui.labelTtsProfile->setText(tr("Selected TTS engine: <b>%1</b>") | 96 | ui.labelTtsProfile->setText(tr("Selected TTS engine: <b>%1</b>") |
108 | .arg("Invalid TTS configuration!")); | 97 | .arg("Invalid TTS configuration!")); |
109 | 98 | ||
110 | QString encoder = settings->value(RbSettings::CurEncoder).toString(); | 99 | QString encoder = RbSettings::value(RbSettings::CurEncoder).toString(); |
111 | // only proceed if encoder setting is set | 100 | // only proceed if encoder setting is set |
112 | EncBase* enc = EncBase::getEncoder(this,encoder); | 101 | EncBase* enc = EncBase::getEncoder(this,encoder); |
113 | if(enc != NULL) { | 102 | if(enc != NULL) { |
114 | enc->setCfg(settings); | ||
115 | if(enc->configOk()) | 103 | if(enc->configOk()) |
116 | ui.labelEncProfile->setText(tr("Selected encoder: <b>%1</b>") | 104 | ui.labelEncProfile->setText(tr("Selected encoder: <b>%1</b>") |
117 | .arg(EncBase::getEncoderName(encoder))); | 105 | .arg(EncBase::getEncoderName(encoder))); |
@@ -122,7 +110,7 @@ void CreateVoiceWindow::updateSettings(void) | |||
122 | else | 110 | else |
123 | ui.labelEncProfile->setText(tr("Selected encoder: <b>%1</b>") | 111 | ui.labelEncProfile->setText(tr("Selected encoder: <b>%1</b>") |
124 | .arg("Invalid encoder configuration!")); | 112 | .arg("Invalid encoder configuration!")); |
125 | ui.wavtrimthreshold->setValue(settings->value(RbSettings::WavtrimThreshold).toInt()); | 113 | ui.wavtrimthreshold->setValue(RbSettings::value(RbSettings::WavtrimThreshold).toInt()); |
126 | emit settingsUpdated(); | 114 | emit settingsUpdated(); |
127 | } | 115 | } |
128 | 116 | ||