Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Moved the resource loading into a separate private function

Browse Source 
load_resources_if_needed().
* Renamed the Esperanto flag resource to "eo" since it is a language; language
  specific flags are now found by their two letter language code.
* This closes ticket #7614, as the Esperanto flag is now found and displayed
  by ReadOnlyBootPrompt.
* Rearranged code in BLocaleRoster::GetFlagIconForCountry() to make it more
  readable.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42403 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2011-07-10 16:21:09 +00:00
parent b5a7089a43
commit 3191427a6e
3 changed files with 59 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/kits/locale/Jamfile
View File

@ -52,7 +52,7 @@ Includes [ FGristFiles $(sources) ] : $(HAIKU_ICU_HEADERS_DEPENDENCY) ;
# Dependency needed to trigger downloading/unzipping the package before
# compiling the files.
AddResources liblocale.so : CountryFlags.rdef ;
AddResources liblocale.so : CountryFlags.rdef LanguageFlags.rdef ;
SharedLibrary liblocale.so
: $(sources)
@ -72,7 +72,7 @@ SEARCH on [ FGristFiles Dragger.cpp ] += [ FDirName $(HAIKU_TOP) src kits interf
SEARCH on [ FGristFiles Menu.cpp ] += [ FDirName $(HAIKU_TOP) src kits interface ] ;
SEARCH on [ FGristFiles PrintJob.cpp ] += [ FDirName $(HAIKU_TOP) src kits interface ] ;
SEARCH on [ FGristFiles ZombieReplicantView.cpp ] += [ FDirName $(HAIKU_TOP) src kits interface ] ;
DoCatalogs liblocale.so
: system
:

2
src/kits/locale/LanguageFlags.rdef
View File

@ -1,5 +1,5 @@
// Flag data for Esperanto
resource(0,"EO") #'VICN' array {
resource(5000, "eo") #'VICN' array {
$"6E6369660305FF057E03009900020A0AC46BC0C0C35DC3FF50C1FEC8E2C3FFC7"
$"D4C0C0CA97BEBFC72DBEBF50BB7FC512BEBFC1A8BEBF0A0421295F295F572157"
$"040A02010102401084000000000000401642C01084C0C8590A000101023D18C6"

75
src/kits/locale/LocaleRoster.cpp
View File

@ -66,6 +66,26 @@ int32 BLocaleRoster::kEmbeddedCatResId = 0xCADA;
// this may live in an app- or add-on-file
static status_t
load_resources_if_needed(RosterData* rosterData)
{
if (rosterData->fAreResourcesLoaded)
return B_OK;
status_t result = rosterData->fResources.SetToImage(
(const void*)&BLocaleRoster::Default);
if (result != B_OK)
return result;
result = rosterData->fResources.PreloadResourceType();
if (result != B_OK)
return result;
rosterData->fAreResourcesLoaded = true;
return B_OK;
}
static const char*
country_code_for_language(const BLanguage& language)
{
@ -302,31 +322,23 @@ BLocaleRoster::GetFlagIconForCountry(BBitmap* flagIcon, const char* countryCode)
if (!lock.IsLocked())
return B_ERROR;
if (!rosterData->fAreResourcesLoaded) {
status_t result = rosterData->fResources.SetToImage(
(const void*)&BLocaleRoster::Default);
if (result != B_OK)
return result;
status_t status = load_resources_if_needed(rosterData);
if (status != B_OK)
return status;
result = rosterData->fResources.PreloadResourceType();
if (result != B_OK)
return result;
rosterData->fAreResourcesLoaded = true;
}
size_t size;
// normalize the country code : 2 letters uparcase
// filter things out so that "pt_BR" gived the flag for brazil
char normalizedCode[3];
normalizedCode[2] = '\0';
// Normalize the country code: 2 letters uppercase
// filter things out so that "pt_BR" gives the flag for brazil
int codeLength = strlen(countryCode);
if (codeLength < 2)
return B_BAD_VALUE;
char normalizedCode[3];
normalizedCode[0] = toupper(countryCode[codeLength - 2]);
normalizedCode[1] = toupper(countryCode[codeLength - 1]);
normalizedCode[2] = '\0';
size_t size;
const void* buffer = rosterData->fResources.LoadResource(
B_VECTOR_ICON_TYPE, normalizedCode, &size);
if (buffer == NULL || size == 0)
@ -345,7 +357,32 @@ BLocaleRoster::GetFlagIconForLanguage(BBitmap* flagIcon,
|| languageCode[1] == '\0')
return B_BAD_VALUE;
// TODO: Languages like Esperanto have a flag, but no country
RosterData* rosterData = RosterData::Default();
BAutolock lock(rosterData->fLock);
if (!lock.IsLocked())
return B_ERROR;
status_t status = load_resources_if_needed(rosterData);
if (status != B_OK)
return status;
// Normalize the language code: first two letters, lowercase
char normalizedCode[3];
normalizedCode[0] = tolower(languageCode[0]);
normalizedCode[1] = tolower(languageCode[1]);
normalizedCode[2] = '\0';
size_t size;
const void* buffer = rosterData->fResources.LoadResource(
B_VECTOR_ICON_TYPE, normalizedCode, &size);
if (buffer != NULL && size != 0) {
return BIconUtils::GetVectorIcon(static_cast<const uint8*>(buffer),
size, flagIcon);
}
// There is no language flag, try to get the default country's flag for
// the language instead.
BLanguage language(languageCode);
const char* countryCode = country_code_for_language(language);