* Reenabled flags via the new BLocaleRoster::GetFlagIconForLanguage() method.

+alpha (also for the previous commit)


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41745 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2011-05-25 17:10:27 +00:00
parent 702526b17f
commit e78a1b6a6f
1 changed files with 2 additions and 8 deletions

View File

@ -63,20 +63,14 @@ public:
BStringItem(label), BStringItem(label),
fLanguage(language) fLanguage(language)
{ {
// Don't use *country* flags for *languages*. Can be re-enabled and adjusted
// accordingly once we have language icons.
#if 0
fIcon = new(std::nothrow) BBitmap(BRect(0, 0, 15, 15), B_RGBA32); fIcon = new(std::nothrow) BBitmap(BRect(0, 0, 15, 15), B_RGBA32);
if (fIcon != NULL if (fIcon != NULL
&& (!fIcon->IsValid() && (!fIcon->IsValid()
|| BLocaleRoster::Default()->GetFlagIconForCountry(fIcon, || BLocaleRoster::Default()->GetFlagIconForLanguage(fIcon,
language) != B_OK)) { language) != B_OK)) {
delete fIcon; delete fIcon;
fIcon = NULL; fIcon = NULL;
} }
#else
fIcon = NULL;
#endif
} }
~LanguageItem() ~LanguageItem()
@ -313,7 +307,7 @@ BootPromptWindow::_PopulateLanguages()
// Try to instantiate a BCatalog for each language, it will only work // Try to instantiate a BCatalog for each language, it will only work
// for translations of this application. So the list of languages will be // for translations of this application. So the list of languages will be
// limited to catalogs written for this application, which is on purpose! // limited to catalogs written for this application, which is on purpose!
const char* languageID; const char* languageID;
LanguageItem* currentItem = NULL; LanguageItem* currentItem = NULL;