i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ActivityMonitor: fix non-i18n-friendly string

Browse Source 
Fixes #16008
This commit is contained in:
Adrien Destugues
2020-05-11 17:27:49 +02:00
parent 9cfe144326
commit a22fff485c
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/activitymonitor/ActivityView.cpp
+1 -2
View File
@@ -1448,8 +1448,7 @@ ActivityView::Draw(BRect updateRect)
BString label = source->Label(); BString label = source->Label();
float possibleLabelWidth = frame.right - colorBox.right - 12 - width; float possibleLabelWidth = frame.right - colorBox.right - 12 - width;
// TODO: TruncateString() is broken... remove + 5 when fixed! if (ceilf(StringWidth(label.String())) > possibleLabelWidth)
if (ceilf(StringWidth(label.String()) + 5) > possibleLabelWidth)
label = source->ShortLabel(); label = source->ShortLabel();
TruncateString(&label, B_TRUNCATE_MIDDLE, possibleLabelWidth); TruncateString(&label, B_TRUNCATE_MIDDLE, possibleLabelWidth);
src/apps/activitymonitor/DataSource.cpp
+8 -5
View File
@@ -937,12 +937,15 @@ void
CPUUsageDataSource::_SetCPU(int32 cpu) CPUUsageDataSource::_SetCPU(int32 cpu)
{ {
fCPU = cpu; fCPU = cpu;
fLabel = B_TRANSLATE("CPU");
if (SystemInfo().CPUCount() > 1)
fLabel << " " << cpu + 1;
fShortLabel = fLabel;
fLabel << " " << B_TRANSLATE("usage"); if (SystemInfo().CPUCount() > 1) {
fLabel.SetToFormat(B_TRANSLATE("CPU %d usage"), cpu + 1);
fShortLabel.SetToFormat(B_TRANSLATE("CPU %d"), cpu + 1);
} else {
fLabel = B_TRANSLATE("CPU usage");
fShortLabel = B_TRANSLATE("CPU");
}
const rgb_color kColors[] = { const rgb_color kColors[] = {
// TODO: find some better defaults... // TODO: find some better defaults...