diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2012-05-19 16:49:48 +0200 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2012-05-19 16:52:58 +0200 |
commit | 733eb9af409a0482d92fe8411b1a2bd53375cc71 (patch) | |
tree | 41578ac9fa0e91ba09b23860dd23863b1ef15f52 /rbutil/rbutilqt/base | |
parent | 9f89ffa71c7029803c96a102efee0ab65edc6ead (diff) | |
download | rockbox-733eb9af409a0482d92fe8411b1a2bd53375cc71.tar.gz rockbox-733eb9af409a0482d92fe8411b1a2bd53375cc71.zip |
Show nicer language names in voice creation dialog.
Instead of showing the internal language names show some more human friendly
string. Currently only applies to the voice creation dialog, the language
configuration dialog needs further adjustments to support display strings
differing from values.
Change-Id: Ic94838f1079c1d09a666d7dbd9682c577f686b3f
Diffstat (limited to 'rbutil/rbutilqt/base')
-rw-r--r-- | rbutil/rbutilqt/base/systeminfo.cpp | 6 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/systeminfo.h | 2 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/ttssapi.cpp | 8 |
3 files changed, 10 insertions, 6 deletions
diff --git a/rbutil/rbutilqt/base/systeminfo.cpp b/rbutil/rbutilqt/base/systeminfo.cpp index 1f7be72b1e..44bcf3c84d 100644 --- a/rbutil/rbutilqt/base/systeminfo.cpp +++ b/rbutil/rbutilqt/base/systeminfo.cpp | |||
@@ -143,16 +143,16 @@ QStringList SystemInfo::platforms(enum SystemInfo::PlatformType type, QString va | |||
143 | return result; | 143 | return result; |
144 | } | 144 | } |
145 | 145 | ||
146 | QMap<QString, QString> SystemInfo::languages(void) | 146 | QMap<QString, QStringList> SystemInfo::languages(void) |
147 | { | 147 | { |
148 | ensureSystemInfoExists(); | 148 | ensureSystemInfoExists(); |
149 | 149 | ||
150 | QMap<QString, QString> result; | 150 | QMap<QString, QStringList> result; |
151 | systemInfos->beginGroup("languages"); | 151 | systemInfos->beginGroup("languages"); |
152 | QStringList a = systemInfos->childKeys(); | 152 | QStringList a = systemInfos->childKeys(); |
153 | for(int i = 0; i < a.size(); i++) | 153 | for(int i = 0; i < a.size(); i++) |
154 | { | 154 | { |
155 | result.insert(a.at(i), systemInfos->value(a.at(i), "null").toString()); | 155 | result.insert(a.at(i), systemInfos->value(a.at(i), "null").toStringList()); |
156 | } | 156 | } |
157 | systemInfos->endGroup(); | 157 | systemInfos->endGroup(); |
158 | return result; | 158 | return result; |
diff --git a/rbutil/rbutilqt/base/systeminfo.h b/rbutil/rbutilqt/base/systeminfo.h index f8c31a9de3..420dbf3c80 100644 --- a/rbutil/rbutilqt/base/systeminfo.h +++ b/rbutil/rbutilqt/base/systeminfo.h | |||
@@ -79,7 +79,7 @@ class SystemInfo : public QObject | |||
79 | static QStringList platforms(enum PlatformType type = PlatformAll, | 79 | static QStringList platforms(enum PlatformType type = PlatformAll, |
80 | QString variant=""); | 80 | QString variant=""); |
81 | //! returns a map of all languages | 81 | //! returns a map of all languages |
82 | static QMap<QString, QString> languages(void); | 82 | static QMap<QString, QStringList> languages(void); |
83 | //! returns a map of usb-ids and their targets | 83 | //! returns a map of usb-ids and their targets |
84 | static QMap<int, QString> usbIdMap(enum MapType); | 84 | static QMap<int, QString> usbIdMap(enum MapType); |
85 | //! get a value from system settings | 85 | //! get a value from system settings |
diff --git a/rbutil/rbutilqt/base/ttssapi.cpp b/rbutil/rbutilqt/base/ttssapi.cpp index 00c63550d3..09c1dd0588 100644 --- a/rbutil/rbutilqt/base/ttssapi.cpp +++ b/rbutil/rbutilqt/base/ttssapi.cpp | |||
@@ -38,10 +38,14 @@ TTSBase::Capabilities TTSSapi::capabilities() | |||
38 | void TTSSapi::generateSettings() | 38 | void TTSSapi::generateSettings() |
39 | { | 39 | { |
40 | // language | 40 | // language |
41 | QMap<QString, QString> languages = SystemInfo::languages(); | 41 | QMap<QString, QStringList> languages = SystemInfo::languages(); |
42 | QStringList langs; | ||
43 | for(int i = 0; i < languages.values().size(); ++i) { | ||
44 | langs.append(languages.values().at(i).at(0)); | ||
45 | } | ||
42 | EncTtsSetting* setting =new EncTtsSetting(this,EncTtsSetting::eSTRINGLIST, | 46 | EncTtsSetting* setting =new EncTtsSetting(this,EncTtsSetting::eSTRINGLIST, |
43 | tr("Language:"),RbSettings::subValue("sapi",RbSettings::TtsLanguage), | 47 | tr("Language:"),RbSettings::subValue("sapi",RbSettings::TtsLanguage), |
44 | languages.values()); | 48 | langs); |
45 | connect(setting,SIGNAL(dataChanged()),this,SLOT(updateVoiceList())); | 49 | connect(setting,SIGNAL(dataChanged()),this,SLOT(updateVoiceList())); |
46 | insertSetting(eLANGUAGE,setting); | 50 | insertSetting(eLANGUAGE,setting); |
47 | // voice | 51 | // voice |