From e3314686ed9fe6203ed194ab4d73791176c2e051 Mon Sep 17 00:00:00 2001 From: Dirk Rettschlag Date: Mon, 8 Mar 2010 12:46:11 +0100 Subject: [PATCH] sort languages in settings V2 --- src/qtui/settingspages/appearancesettingspage.cpp | 8 +++++--- src/qtui/settingspages/appearancesettingspage.h | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/qtui/settingspages/appearancesettingspage.cpp b/src/qtui/settingspages/appearancesettingspage.cpp index 91369f9c..0795e911 100644 --- a/src/qtui/settingspages/appearancesettingspage.cpp +++ b/src/qtui/settingspages/appearancesettingspage.cpp @@ -87,8 +87,10 @@ void AppearanceSettingsPage::initLanguageComboBox() { if(!rx.cap(1).isEmpty()) continue; QLocale locale(rx.cap(2)); - _locales << locale; - ui.languageComboBox->addItem(QLocale::languageToString(locale.language())); + _locales[QLocale::languageToString(locale.language())] = locale; + } + foreach(QString language, _locales.keys()) { + ui.languageComboBox->addItem(language); } } @@ -208,7 +210,7 @@ QLocale AppearanceSettingsPage::selectedLocale() const { else if(index == 0) locale = QLocale::c(); else if(index > 1) - locale = _locales[index - 2]; + locale = _locales.values()[index - 2]; return locale; } diff --git a/src/qtui/settingspages/appearancesettingspage.h b/src/qtui/settingspages/appearancesettingspage.h index 1b9c0cf6..4f47a33b 100644 --- a/src/qtui/settingspages/appearancesettingspage.h +++ b/src/qtui/settingspages/appearancesettingspage.h @@ -56,7 +56,7 @@ private: Ui::AppearanceSettingsPage ui; QHash settings; - QList _locales; + QMap _locales; inline QString settingsKey() const { return QString("QtUi"); } }; -- 2.20.1