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

Fixed Volume sizes unit in info window, using string_for_size().

Browse Source 
This fix #6395.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37764 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Philippe Houdoin 2010-07-27 08:40:13 +00:00
parent c090a0fd84
commit b599c219a3
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/kits/tracker/InfoWindow.cpp
View File

@ -654,19 +654,19 @@ BInfoWindow::GetSizeString(BString &result, off_t size, int32 fileCount)
// when we show the byte size, format it with a thousands delimiter (comma) // when we show the byte size, format it with a thousands delimiter (comma)
// TODO: use BCountry::FormatNumber // TODO: use BCountry::FormatNumber
if (size >= kKBSize) { if (size >= kKBSize) {
char numStr[128]; char numStr[128];
snprintf(numStr, sizeof(numStr), "%Ld", size); snprintf(numStr, sizeof(numStr), "%Ld", size);
BString bytes; BString bytes;
uint32 length = strlen(numStr); uint32 length = strlen(numStr);
if (length >= 4) { if (length >= 4) {
uint32 charsTillComma = length % 3; uint32 charsTillComma = length % 3;
if (charsTillComma == 0) if (charsTillComma == 0)
charsTillComma = 3; charsTillComma = 3;
uint32 numberIndex = 0; uint32 numberIndex = 0;
while (numStr[numberIndex]) { while (numStr[numberIndex]) {
bytes += numStr[numberIndex++]; bytes += numStr[numberIndex++];
if (--charsTillComma == 0 && numStr[numberIndex]) { if (--charsTillComma == 0 && numStr[numberIndex]) {
@ -675,7 +675,7 @@ BInfoWindow::GetSizeString(BString &result, off_t size, int32 fileCount)
} }
} }
} }
result << " " << B_TRANSLATE("(%bytes bytes)"); result << " " << B_TRANSLATE("(%bytes bytes)");
// "bytes" translation could come from string_for_size // "bytes" translation could come from string_for_size
// which could be part of the localekit itself // which could be part of the localekit itself
@ -1206,7 +1206,7 @@ AttributeView::MouseDown(BPoint point)
{ {
BEntry entry; BEntry entry;
fModel->GetEntry(&entry); fModel->GetEntry(&entry);
// Assume this isn't part of a double click // Assume this isn't part of a double click
fDoubleClick = false; fDoubleClick = false;
@ -1546,16 +1546,11 @@ AttributeView::CheckAndSetSize()
fFreeBytes = freeBytes; fFreeBytes = freeBytes;
char capacityStr[16], usedStr[16], freeStr[16]; char capacityStr[16], usedStr[16], freeStr[16];
sprintf(usedStr, "%.1f", (float)(capacity - fFreeBytes) / kMBSize); string_for_size(capacity, capacityStr, sizeof(capacityStr));
sprintf(freeStr, "%.1f", (float)fFreeBytes / kMBSize); string_for_size(capacity - fFreeBytes, usedStr, sizeof(usedStr));
string_for_size(fFreeBytes, freeStr, sizeof(freeStr));
if (capacity >= kGBSize) { fSizeStr.SetTo(B_TRANSLATE("%capacity (%used used -- %free free)"));
fSizeStr.SetTo(B_TRANSLATE("%capacity GB (%used MB used -- %free MB free)"));
sprintf(capacityStr, "%.1f", (float)capacity / kGBSize);
} else {
fSizeStr.SetTo(B_TRANSLATE("%capacity MB (%used MB used -- %free MB free)"));
sprintf(capacityStr, "%.1f", (float)capacity / kMBSize);
}
fSizeStr.ReplaceFirst("%capacity", capacityStr); fSizeStr.ReplaceFirst("%capacity", capacityStr);
fSizeStr.ReplaceFirst("%used", usedStr); fSizeStr.ReplaceFirst("%used", usedStr);
fSizeStr.ReplaceFirst("%free", freeStr); fSizeStr.ReplaceFirst("%free", freeStr);