diff options
Diffstat (limited to 'rbutil/rbutilqt/createvoicewindow.cpp')
-rw-r--r-- | rbutil/rbutilqt/createvoicewindow.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/rbutil/rbutilqt/createvoicewindow.cpp b/rbutil/rbutilqt/createvoicewindow.cpp index 7c2ff732c4..95df4b1b0c 100644 --- a/rbutil/rbutilqt/createvoicewindow.cpp +++ b/rbutil/rbutilqt/createvoicewindow.cpp | |||
@@ -71,24 +71,28 @@ void CreateVoiceWindow::accept() | |||
71 | void CreateVoiceWindow::updateSettings(void) | 71 | void CreateVoiceWindow::updateSettings(void) |
72 | { | 72 | { |
73 | // fill in language combobox | 73 | // fill in language combobox |
74 | QStringList languages = SystemInfo::languages(); | 74 | QMap<QString, QString> languages = SystemInfo::languages(); |
75 | languages.sort(); | 75 | |
76 | ui.comboLanguage->addItems(languages); | 76 | for(int i = 0; i < languages.keys().size(); i++) { |
77 | QString key = languages.keys().at(i); | ||
78 | ui.comboLanguage->addItem(languages.value(key), key); | ||
79 | } | ||
77 | // set saved lang | 80 | // set saved lang |
78 | int sel = ui.comboLanguage->findText(RbSettings::value(RbSettings::VoiceLanguage).toString()); | 81 | int sel = ui.comboLanguage->findText( |
82 | RbSettings::value(RbSettings::VoiceLanguage).toString()); | ||
79 | // if no saved language is found try to figure the language from the UI lang | 83 | // if no saved language is found try to figure the language from the UI lang |
80 | if(sel == -1) { | 84 | if(sel == -1) { |
81 | QString f = RbSettings::value(RbSettings::Language).toString(); | 85 | QString f = RbSettings::value(RbSettings::Language).toString(); |
82 | // if no language is set default to english. Make sure not to check an empty string. | 86 | // if no language is set default to english. Make sure not to check an empty string. |
83 | if(f.isEmpty()) f = "english"; | 87 | if(f.isEmpty()) f = "english"; |
84 | sel = ui.comboLanguage->findText(f, Qt::MatchStartsWith); | 88 | sel = ui.comboLanguage->findData(f); |
85 | qDebug() << "sel =" << sel; | 89 | qDebug() << "sel =" << sel; |
86 | // still nothing found? | 90 | // still nothing found? |
87 | if(sel == -1) | 91 | if(sel == -1) |
88 | sel = ui.comboLanguage->findText("english", Qt::MatchStartsWith); | 92 | sel = ui.comboLanguage->findText("english", Qt::MatchStartsWith); |
89 | } | 93 | } |
90 | ui.comboLanguage->setCurrentIndex(sel); | 94 | ui.comboLanguage->setCurrentIndex(sel); |
91 | 95 | ||
92 | QString ttsName = RbSettings::value(RbSettings::Tts).toString(); | 96 | QString ttsName = RbSettings::value(RbSettings::Tts).toString(); |
93 | TTSBase* tts = TTSBase::getTTS(this,ttsName); | 97 | TTSBase* tts = TTSBase::getTTS(this,ttsName); |
94 | if(tts->configOk()) | 98 | if(tts->configOk()) |