Mercurial > hg > sonic-visualiser
comparison main/main.cpp @ 1469:c8183f084ad8 3.0-integration
Avoid accidentally resetting locale to the empty string when reading pref
author | Chris Cannam |
---|---|
date | Tue, 03 Jan 2017 16:45:43 +0000 |
parents | 8ca62b402846 |
children | 9fbaf30a09ab |
comparison
equal
deleted
inserted
replaced
1468:7362be7580d1 | 1469:c8183f084ad8 |
---|---|
306 icon.addFile(QString(":icons/sv-%1x%2.png").arg(sizes[i]).arg(sizes[i])); | 306 icon.addFile(QString(":icons/sv-%1x%2.png").arg(sizes[i]).arg(sizes[i])); |
307 } | 307 } |
308 QApplication::setWindowIcon(icon); | 308 QApplication::setWindowIcon(icon); |
309 | 309 |
310 QString language = QLocale::system().name(); | 310 QString language = QLocale::system().name(); |
311 SVDEBUG << "System language is: " << language << endl; | |
311 | 312 |
312 settings.beginGroup("Preferences"); | 313 settings.beginGroup("Preferences"); |
313 language = settings.value("locale", language).toString(); | 314 QString prefLanguage = settings.value("locale", language).toString(); |
315 if (prefLanguage != QString()) language = prefLanguage; | |
314 settings.endGroup(); | 316 settings.endGroup(); |
315 | 317 |
316 QTranslator qtTranslator; | 318 QTranslator qtTranslator; |
317 QString qtTrName = QString("qt_%1").arg(language); | 319 QString qtTrName = QString("qt_%1").arg(language); |
318 SVDEBUG << "Loading " << qtTrName << "... "; | 320 SVDEBUG << "Loading " << qtTrName << "... "; |