diff options
Diffstat (limited to 'rbutil/rbutilqt/configure.cpp')
-rw-r--r-- | rbutil/rbutilqt/configure.cpp | 30 |
1 files changed, 9 insertions, 21 deletions
diff --git a/rbutil/rbutilqt/configure.cpp b/rbutil/rbutilqt/configure.cpp index ab926f1aa0..68b8fb571d 100644 --- a/rbutil/rbutilqt/configure.cpp +++ b/rbutil/rbutilqt/configure.cpp | |||
@@ -80,8 +80,7 @@ Config::Config(QWidget *parent,int index) : QDialog(parent) | |||
80 | connect(ui.configTts, SIGNAL(clicked()), this, SLOT(configTts())); | 80 | connect(ui.configTts, SIGNAL(clicked()), this, SLOT(configTts())); |
81 | connect(ui.configEncoder, SIGNAL(clicked()), this, SLOT(configEnc())); | 81 | connect(ui.configEncoder, SIGNAL(clicked()), this, SLOT(configEnc())); |
82 | connect(ui.comboTts, SIGNAL(currentIndexChanged(int)), this, SLOT(updateTtsState(int))); | 82 | connect(ui.comboTts, SIGNAL(currentIndexChanged(int)), this, SLOT(updateTtsState(int))); |
83 | connect(ui.comboEncoder, SIGNAL(currentIndexChanged(int)), this, SLOT(updateEncState(int))); | 83 | |
84 | |||
85 | } | 84 | } |
86 | 85 | ||
87 | 86 | ||
@@ -136,10 +135,7 @@ void Config::accept() | |||
136 | // tts settings | 135 | // tts settings |
137 | int i = ui.comboTts->currentIndex(); | 136 | int i = ui.comboTts->currentIndex(); |
138 | settings->setCurTTS(ui.comboTts->itemData(i).toString()); | 137 | settings->setCurTTS(ui.comboTts->itemData(i).toString()); |
139 | //encoder settings | 138 | |
140 | i = ui.comboEncoder->currentIndex(); | ||
141 | settings->setCurEncoder(ui.comboEncoder->itemData(i).toString()); | ||
142 | |||
143 | // sync settings | 139 | // sync settings |
144 | settings->sync(); | 140 | settings->sync(); |
145 | this->close(); | 141 | this->close(); |
@@ -288,22 +284,14 @@ void Config::setDevices() | |||
288 | // tts / encoder tab | 284 | // tts / encoder tab |
289 | 285 | ||
290 | //encoders | 286 | //encoders |
291 | int index; | 287 | updateEncState(); |
292 | QStringList encoders = EncBase::getEncoderList(); | ||
293 | for(int a = 0; a < encoders.size(); a++) | ||
294 | ui.comboEncoder->addItem(EncBase::getEncoderName(encoders.at(a)), encoders.at(a)); | ||
295 | //update index of combobox | ||
296 | index = ui.comboEncoder->findData(settings->curEncoder()); | ||
297 | if(index < 0) index = 0; | ||
298 | ui.comboEncoder->setCurrentIndex(index); | ||
299 | updateEncState(index); | ||
300 | 288 | ||
301 | //tts | 289 | //tts |
302 | QStringList ttslist = TTSBase::getTTSList(); | 290 | QStringList ttslist = TTSBase::getTTSList(); |
303 | for(int a = 0; a < ttslist.size(); a++) | 291 | for(int a = 0; a < ttslist.size(); a++) |
304 | ui.comboTts->addItem(TTSBase::getTTSName(ttslist.at(a)), ttslist.at(a)); | 292 | ui.comboTts->addItem(TTSBase::getTTSName(ttslist.at(a)), ttslist.at(a)); |
305 | //update index of combobox | 293 | //update index of combobox |
306 | index = ui.comboTts->findData(settings->curTTS()); | 294 | int index = ui.comboTts->findData(settings->curTTS()); |
307 | if(index < 0) index = 0; | 295 | if(index < 0) index = 0; |
308 | ui.comboTts->setCurrentIndex(index); | 296 | ui.comboTts->setCurrentIndex(index); |
309 | updateTtsState(index); | 297 | updateTtsState(index); |
@@ -329,9 +317,10 @@ void Config::updateTtsState(int index) | |||
329 | } | 317 | } |
330 | } | 318 | } |
331 | 319 | ||
332 | void Config::updateEncState(int index) | 320 | void Config::updateEncState() |
333 | { | 321 | { |
334 | QString encoder = ui.comboEncoder->itemData(index).toString(); | 322 | ui.encoderName->setText(EncBase::getEncoderName(settings->curEncoder())); |
323 | QString encoder = settings->curEncoder(); | ||
335 | EncBase* enc = EncBase::getEncoder(encoder); | 324 | EncBase* enc = EncBase::getEncoder(encoder); |
336 | enc->setCfg(settings); | 325 | enc->setCfg(settings); |
337 | 326 | ||
@@ -612,10 +601,9 @@ void Config::configTts() | |||
612 | 601 | ||
613 | void Config::configEnc() | 602 | void Config::configEnc() |
614 | { | 603 | { |
615 | int index = ui.comboEncoder->currentIndex(); | 604 | EncBase* enc = EncBase::getEncoder(settings->curEncoder()); |
616 | EncBase* enc = EncBase::getEncoder(ui.comboEncoder->itemData(index).toString()); | ||
617 | 605 | ||
618 | enc->setCfg(settings); | 606 | enc->setCfg(settings); |
619 | enc->showCfg(); | 607 | enc->showCfg(); |
620 | updateEncState(ui.comboEncoder->currentIndex()); | 608 | updateEncState(); |
621 | } | 609 | } |