diff options
Diffstat (limited to 'rbutil/rbutilqt/createvoicewindow.cpp')
-rw-r--r-- | rbutil/rbutilqt/createvoicewindow.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/rbutil/rbutilqt/createvoicewindow.cpp b/rbutil/rbutilqt/createvoicewindow.cpp index d1db0145e4..a45425a0ef 100644 --- a/rbutil/rbutilqt/createvoicewindow.cpp +++ b/rbutil/rbutilqt/createvoicewindow.cpp | |||
@@ -52,7 +52,7 @@ void CreateVoiceWindow::accept() | |||
52 | 52 | ||
53 | //configure voicecreator | 53 | //configure voicecreator |
54 | voicecreator->setMountPoint(RbSettings::value(RbSettings::Mountpoint).toString()); | 54 | voicecreator->setMountPoint(RbSettings::value(RbSettings::Mountpoint).toString()); |
55 | voicecreator->setLang(ui.comboLanguage->currentText()); | 55 | voicecreator->setLang(ui.comboLanguage->itemData(ui.comboLanguage->currentIndex()).toString()); |
56 | voicecreator->setWavtrimThreshold(ui.wavtrimthreshold->value()); | 56 | voicecreator->setWavtrimThreshold(ui.wavtrimthreshold->value()); |
57 | 57 | ||
58 | //start creating | 58 | //start creating |
@@ -69,25 +69,25 @@ void CreateVoiceWindow::accept() | |||
69 | void CreateVoiceWindow::updateSettings(void) | 69 | void CreateVoiceWindow::updateSettings(void) |
70 | { | 70 | { |
71 | // fill in language combobox | 71 | // fill in language combobox |
72 | QMap<QString, QString> languages = SystemInfo::languages(); | 72 | QMap<QString, QStringList> languages = SystemInfo::languages(); |
73 | 73 | ||
74 | for(int i = 0; i < languages.keys().size(); i++) { | 74 | for(int i = 0; i < languages.keys().size(); i++) { |
75 | QString key = languages.keys().at(i); | 75 | QString key = languages.keys().at(i); |
76 | ui.comboLanguage->addItem(languages.value(key), key); | 76 | ui.comboLanguage->addItem(languages.value(key).at(1), languages.value(key).at(0)); |
77 | } | 77 | } |
78 | // set saved lang | 78 | // set saved lang |
79 | int sel = ui.comboLanguage->findText( | 79 | int sel = ui.comboLanguage->findData( |
80 | RbSettings::value(RbSettings::VoiceLanguage).toString()); | 80 | RbSettings::value(RbSettings::VoiceLanguage).toString()); |
81 | // if no saved language is found try to figure the language from the UI lang | 81 | // if no saved language is found try to figure the language from the UI lang |
82 | if(sel == -1) { | 82 | if(sel == -1) { |
83 | QString f = RbSettings::value(RbSettings::Language).toString(); | 83 | QString uilang = RbSettings::value(RbSettings::Language).toString(); |
84 | // if no language is set default to english. Make sure not to check an empty string. | 84 | // if no language is set default to english. Make sure not to check an empty string. |
85 | if(f.isEmpty()) f = "english"; | 85 | QString f = "english"; |
86 | if(!uilang.isEmpty() && languages.contains(uilang)) { | ||
87 | f = languages.value(uilang).at(0); | ||
88 | } | ||
86 | sel = ui.comboLanguage->findData(f); | 89 | sel = ui.comboLanguage->findData(f); |
87 | qDebug() << "sel =" << sel; | 90 | qDebug() << "[CreateVoiceWindow] Selected language index:" << sel; |
88 | // still nothing found? | ||
89 | if(sel == -1) | ||
90 | sel = ui.comboLanguage->findText("english", Qt::MatchStartsWith); | ||
91 | } | 91 | } |
92 | ui.comboLanguage->setCurrentIndex(sel); | 92 | ui.comboLanguage->setCurrentIndex(sel); |
93 | 93 | ||
@@ -125,7 +125,7 @@ void CreateVoiceWindow::saveSettings(void) | |||
125 | { | 125 | { |
126 | // save selected language | 126 | // save selected language |
127 | RbSettings::setValue(RbSettings::VoiceLanguage, | 127 | RbSettings::setValue(RbSettings::VoiceLanguage, |
128 | ui.comboLanguage->currentText()); | 128 | ui.comboLanguage->itemData(ui.comboLanguage->currentIndex()).toString()); |
129 | // save wavtrim threshold value | 129 | // save wavtrim threshold value |
130 | RbSettings::setValue(RbSettings::WavtrimThreshold, | 130 | RbSettings::setValue(RbSettings::WavtrimThreshold, |
131 | ui.wavtrimthreshold->value()); | 131 | ui.wavtrimthreshold->value()); |