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

Screen preferences: some ui fixes

Browse Source 
- When there is no refresh rate info available, disable the menu rather
  than showing "nan Hz"
- Rework the screen info tooltip generation, to avoid a confusing %s
  that was mistakenly moved to the end of the string in the French
  translation.

Change-Id: I4c29863a30c8c761021be57f8a2e2010709b16d5
Reviewed-on: https://review.haiku-os.org/c/haiku/+/7364
Reviewed-by: waddlesplash <waddlesplash@gmail.com>
Tested-by: Commit checker robot <no-reply+buildbot@haiku-os.org>
This commit is contained in:
PulkoMandy 2024-02-01 20:41:09 +01:00 committed by Adrien Destugues
parent e925863d95
commit e96dd82392
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/preferences/screen/ScreenWindow.cpp
View File

@ -795,6 +795,15 @@ ScreenWindow::_CheckRefreshMenu()
void
ScreenWindow::_UpdateRefreshControl()
{
if (isnan(fSelected.refresh)) {
fRefreshMenu->SetEnabled(false);
fOtherRefresh->SetLabel(B_TRANSLATE("Unknown"));
fOtherRefresh->SetMarked(true);
return;
} else {
fRefreshMenu->SetEnabled(true);
}
for (int32 i = 0; i < fRefreshMenu->CountItems(); i++) {
BMenuItem* item = fRefreshMenu->ItemAt(i);
if (item->Message()->FindFloat("refresh") == fSelected.refresh) {
@ -805,7 +814,7 @@ ScreenWindow::_UpdateRefreshControl()
return;
}
}
// this is a non-standard refresh rate
if (fOtherRefresh != NULL) {
fOtherRefresh->Message()->ReplaceFloat("refresh", fSelected.refresh);
@ -1383,9 +1392,13 @@ ScreenWindow::_UpdateMonitor()
info.max_pixel_clock / 1000.0);
}
if (info.serial_number[0] && length < sizeof(text)) {
if (length > 0) {
text[length++] = '\n';
text[length++] = '\n';
text[length] = '\0';
}
length += snprintf(text + length, sizeof(text) - length,
B_TRANSLATE("%sSerial no.: %s"), length ? "\n\n" : "",
info.serial_number);
B_TRANSLATE("Serial no.: %s"), info.serial_number);
if (info.produced.week != 0 && info.produced.year != 0
&& length < sizeof(text)) {
length += snprintf(text + length, sizeof(text) - length,