diff options
Diffstat (limited to 'rbutil/rbutilqt/base')
-rw-r--r-- | rbutil/rbutilqt/base/rbsettings.cpp | 1 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/rbsettings.h | 1 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/systeminfo.cpp | 8 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/systeminfo.h | 5 |
4 files changed, 11 insertions, 4 deletions
diff --git a/rbutil/rbutilqt/base/rbsettings.cpp b/rbutil/rbutilqt/base/rbsettings.cpp index 827c0f96fd..5baa53bee0 100644 --- a/rbutil/rbutilqt/base/rbsettings.cpp +++ b/rbutil/rbutilqt/base/rbsettings.cpp @@ -47,6 +47,7 @@ const static struct { { RbSettings::InstallFonts, "install_fonts", "true" }, { RbSettings::InstallThemes, "install_themes", "false" }, { RbSettings::InstallGamefiles, "install_gamefiles", "true" }, + { RbSettings::InstallVoice, "install_voice", "false" }, #if defined(Q_OS_WIN32) { RbSettings::Tts, "tts", "sapi" }, #elif defined(Q_OS_MACX) diff --git a/rbutil/rbutilqt/base/rbsettings.h b/rbutil/rbutilqt/base/rbsettings.h index 7406aab1ad..a25eabbcee 100644 --- a/rbutil/rbutilqt/base/rbsettings.h +++ b/rbutil/rbutilqt/base/rbsettings.h @@ -46,6 +46,7 @@ class RbSettings : public QObject InstallFonts, InstallThemes, InstallGamefiles, + InstallVoice, Tts, UseTtsCorrections, TalkFolders, diff --git a/rbutil/rbutilqt/base/systeminfo.cpp b/rbutil/rbutilqt/base/systeminfo.cpp index 2aece49110..2ad3c7a7d4 100644 --- a/rbutil/rbutilqt/base/systeminfo.cpp +++ b/rbutil/rbutilqt/base/systeminfo.cpp @@ -159,7 +159,7 @@ QStringList SystemInfo::platforms(enum SystemInfo::PlatformType type, QString va return result; } -QMap<QString, QStringList> SystemInfo::languages(void) +QMap<QString, QStringList> SystemInfo::languages(bool namesOnly) { ensureSystemInfoExists(); @@ -168,7 +168,11 @@ QMap<QString, QStringList> SystemInfo::languages(void) QStringList a = systemInfos->childKeys(); for(int i = 0; i < a.size(); i++) { - result.insert(a.at(i), systemInfos->value(a.at(i), "null").toStringList()); + QStringList data = systemInfos->value(a.at(i), "null").toStringList(); + if(namesOnly) + result.insert(data.at(0), QStringList(data.at(1))); + else + result.insert(a.at(i), data); } systemInfos->endGroup(); return result; diff --git a/rbutil/rbutilqt/base/systeminfo.h b/rbutil/rbutilqt/base/systeminfo.h index 12b9eb4bfb..9bcfe6d253 100644 --- a/rbutil/rbutilqt/base/systeminfo.h +++ b/rbutil/rbutilqt/base/systeminfo.h @@ -90,8 +90,9 @@ class SystemInfo : public QObject //! return a list of all platforms (rbutil internal names) static QStringList platforms(enum PlatformType type = PlatformAll, QString variant=""); - //! returns a map of all languages - static QMap<QString, QStringList> languages(void); + //! returns a map of all languages. + //! Maps <language code> to (<language name>, <display name>) + static QMap<QString, QStringList> languages(bool namesOnly = false); //! returns a map of usb-ids and their targets static QMap<int, QStringList> usbIdMap(enum MapType type); //! get a value from system settings |