From 4f7ea2284ff6a3c075224d75ce89acb26dee7d86 Mon Sep 17 00:00:00 2001 From: Magnus Olsen Date: Wed, 25 May 2005 00:04:12 +0000 Subject: [PATCH] Add 24bits mode strings hope it fix qemu svn path=/trunk/; revision=15489 --- reactos/lib/cpl/desk/en.rc | 2 +- reactos/lib/cpl/desk/resource.h | 1 + reactos/lib/cpl/desk/settings.c | 6 +++++- reactos/lib/cpl/desk/sv.rc | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/reactos/lib/cpl/desk/en.rc b/reactos/lib/cpl/desk/en.rc index 8e8c8cad024..a4c4c4fbb9c 100644 --- a/reactos/lib/cpl/desk/en.rc +++ b/reactos/lib/cpl/desk/en.rc @@ -98,7 +98,7 @@ BEGIN IDS_COLOR_4BIT "16 Colors" IDS_COLOR_8BIT "256 Colors" IDS_COLOR_16BIT "High Color (16 Bit)" - IDS_COLOR_32BIT "True Color (24 Bit)" + IDS_COLOR_24BIT "True Color (24 Bit)" IDS_COLOR_32BIT "True Color (32 Bit)" IDS_PIXEL "%lux%lu Pixel" END diff --git a/reactos/lib/cpl/desk/resource.h b/reactos/lib/cpl/desk/resource.h index 3a9f6696481..988dd019073 100644 --- a/reactos/lib/cpl/desk/resource.h +++ b/reactos/lib/cpl/desk/resource.h @@ -61,6 +61,7 @@ #define IDS_COLOR_4BIT 2904 #define IDS_COLOR_8BIT 2908 #define IDS_COLOR_16BIT 2916 +#define IDS_COLOR_24BIT 2924 #define IDS_COLOR_32BIT 2932 #endif /* __CPL_DESK_RESOURCE_H__ */ diff --git a/reactos/lib/cpl/desk/settings.c b/reactos/lib/cpl/desk/settings.c index 0b0597701cd..289b381fb12 100644 --- a/reactos/lib/cpl/desk/settings.c +++ b/reactos/lib/cpl/desk/settings.c @@ -62,14 +62,18 @@ UpdateDisplay(IN HWND hwndDlg) LoadString(hApplet, IDS_PIXEL, Pixel, sizeof(Pixel) / sizeof(TCHAR)); _stprintf(Buffer, Pixel, CurrentDisplayDevice->CurrentSettings->dmPelsWidth, CurrentDisplayDevice->CurrentSettings->dmPelsHeight, Pixel); SendDlgItemMessage(hwndDlg, IDC_SETTINGS_RESOLUTION_TEXT, WM_SETTEXT, 0, (LPARAM)Buffer); - + + for (index = 0; index < CurrentDisplayDevice->ResolutionsCount; index++) + { + if (CurrentDisplayDevice->Resolutions[index].dmPelsWidth == CurrentDisplayDevice->CurrentSettings->dmPelsWidth && CurrentDisplayDevice->Resolutions[index].dmPelsHeight == CurrentDisplayDevice->CurrentSettings->dmPelsHeight) { SendDlgItemMessage(hwndDlg, IDC_SETTINGS_RESOLUTION, TBM_SETPOS, TRUE, index); break; } + } if (LoadString(hApplet, (2900 + CurrentDisplayDevice->CurrentSettings->dmBitsPerPel), Buffer, sizeof(Buffer) / sizeof(TCHAR))) SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_SELECTSTRING, -1, (LPARAM)Buffer); } diff --git a/reactos/lib/cpl/desk/sv.rc b/reactos/lib/cpl/desk/sv.rc index 8cd3b1e259d..172d4c63afb 100644 --- a/reactos/lib/cpl/desk/sv.rc +++ b/reactos/lib/cpl/desk/sv.rc @@ -76,7 +76,7 @@ BEGIN IDS_COLOR_4BIT "16 färger" IDS_COLOR_8BIT "256 färger" IDS_COLOR_16BIT "65 536 färger (16 Bit)" - IDS_COLOR_32BIT "16,7 miljoner färger (24 Bit)" + IDS_COLOR_24BIT "16,7 miljoner färger (24 Bit)" IDS_COLOR_32BIT "16,7 miljoner färger (32 Bit)" IDS_PIXEL "%lux%lu Pixlar" END -- 2.17.1