mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Language chooser improvements

Browse source 
Show language instead of country, sort the list.
Show country in brackets to avoid ambiguity for locales like
de_DE and de_CH.

Signed-off-by: Sergey Starosek <sergey.starosek@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Sergey Starosek 2013-12-07 17:32:17 +02:00 • committed by Dirk Hohndel
parent 4c3f51291e
commit 482214703b
2 changed files with 2 additions and 1 deletions

2
qt-ui/models.cpp
View file

@ -1772,7 +1772,7 @@ QVariant LanguageModel::data(const QModelIndex& index, int role) const
switch(role){ switch(role){
case Qt::DisplayRole:{ case Qt::DisplayRole:{
QLocale l( currentString.remove("subsurface_")); QLocale l( currentString.remove("subsurface_"));
return currentString == "English" ? currentString : l.countryToString(l.country()); return currentString == "English" ? currentString : QString("%1 (%2)").arg(l.languageToString(l.language())).arg(l.countryToString(l.country()));
}break; }break;
case Qt::UserRole:{ case Qt::UserRole:{
QString currentString = languages.at(index.row()); QString currentString = languages.at(index.row());

1
qt-ui/preferences.cpp
View file

@ -110,6 +110,7 @@ void PreferencesDialog::setUiFromPrefs()
filterModel->setSourceModel(LanguageModel::instance()); filterModel->setSourceModel(LanguageModel::instance());
filterModel->setFilterCaseSensitivity(Qt::CaseInsensitive); filterModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
ui.languageView->setModel(filterModel); ui.languageView->setModel(filterModel);
filterModel->sort(0);
connect(ui.languageFilter, SIGNAL(textChanged(QString)), filterModel, SLOT(setFilterFixedString(QString))); connect(ui.languageFilter, SIGNAL(textChanged(QString)), filterModel, SLOT(setFilterFixedString(QString)));
QSettings s; QSettings s;