- Localization of the global popup menu name is removed as invidible to the end-user;
- In consistency with other applications, following units were replaced: MB -> MiB, KB -> KiB; Pointed out by Jean-Loic Charroud. Thanks. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40777 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -153,12 +153,12 @@ KernelMemoryBarMenuItem::DrawBar(bool force)
|
|||||||
|
|
||||||
char infos[128];
|
char infos[128];
|
||||||
snprintf(infos, sizeof(infos),
|
snprintf(infos, sizeof(infos),
|
||||||
B_TRANSLATE("%.1f MB"), fCachedMemory / 1024.f);
|
B_TRANSLATE("%.1f MiB"), fCachedMemory / 1024.f);
|
||||||
BPoint loc(cadre.left, cadre.bottom + 1);
|
BPoint loc(cadre.left, cadre.bottom + 1);
|
||||||
loc.x -= kMargin + gMemoryTextWidth / 2 + menu->StringWidth(infos);
|
loc.x -= kMargin + gMemoryTextWidth / 2 + menu->StringWidth(infos);
|
||||||
menu->DrawString(infos, loc);
|
menu->DrawString(infos, loc);
|
||||||
snprintf(infos, sizeof(infos),
|
snprintf(infos, sizeof(infos),
|
||||||
B_TRANSLATE("%.1f MB"), fCommittedMemory / 1024.f);
|
B_TRANSLATE("%.1f MiB"), fCommittedMemory / 1024.f);
|
||||||
loc.x = cadre.left - kMargin - menu->StringWidth(infos);
|
loc.x = cadre.left - kMargin - menu->StringWidth(infos);
|
||||||
menu->DrawString(infos, loc);
|
menu->DrawString(infos, loc);
|
||||||
fLastSum = sum;
|
fLastSum = sum;
|
||||||
|
|||||||
@@ -57,7 +57,7 @@ MemoryBarMenu::MemoryBarMenu(const char* name, info_pack* infos, system_info& sy
|
|||||||
fTeamList[k++] = -1;
|
fTeamList[k++] = -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
gMemoryTextWidth = 2 * StringWidth(B_TRANSLATE("99999 KB")) + 20;
|
gMemoryTextWidth = 2 * StringWidth(B_TRANSLATE("99999 KiB")) + 20;
|
||||||
|
|
||||||
fRecycleCount = EXTRA;
|
fRecycleCount = EXTRA;
|
||||||
fRecycleList = (MRecycleItem*)malloc(sizeof(MRecycleItem) * fRecycleCount);
|
fRecycleList = (MRecycleItem*)malloc(sizeof(MRecycleItem) * fRecycleCount);
|
||||||
|
|||||||
@@ -214,13 +214,13 @@ MemoryBarMenuItem::DrawBar(bool force)
|
|||||||
menu->SetHighColor(kBlack);
|
menu->SetHighColor(kBlack);
|
||||||
|
|
||||||
char infos[128];
|
char infos[128];
|
||||||
snprintf(infos, sizeof(infos), B_TRANSLATE("%d KB"), fWriteMemory);
|
snprintf(infos, sizeof(infos), B_TRANSLATE("%d KiB"), fWriteMemory);
|
||||||
|
|
||||||
BPoint loc(rect.left - kMargin - gMemoryTextWidth / 2 - menu->StringWidth(infos),
|
BPoint loc(rect.left - kMargin - gMemoryTextWidth / 2 - menu->StringWidth(infos),
|
||||||
rect.bottom + 1);
|
rect.bottom + 1);
|
||||||
menu->DrawString(infos, loc);
|
menu->DrawString(infos, loc);
|
||||||
|
|
||||||
snprintf(infos, sizeof(infos), B_TRANSLATE("%d KB"), fAllMemory);
|
snprintf(infos, sizeof(infos), B_TRANSLATE("%d KiB"), fAllMemory);
|
||||||
loc.x = rect.left - kMargin - menu->StringWidth(infos);
|
loc.x = rect.left - kMargin - menu->StringWidth(infos);
|
||||||
menu->DrawString(infos, loc);
|
menu->DrawString(infos, loc);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -670,7 +670,7 @@ thread_popup(void *arg)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
BPopUpMenu* popup = new BPopUpMenu(B_TRANSLATE("Global Popup"), false, false);
|
BPopUpMenu* popup = new BPopUpMenu("Global Popup", false, false);
|
||||||
popup->SetFont(be_plain_font);
|
popup->SetFont(be_plain_font);
|
||||||
|
|
||||||
// Quit section
|
// Quit section
|
||||||
|
|||||||
Reference in New Issue
Block a user