diff --git a/reactos/dll/cpl/desk/appearance.h b/reactos/dll/cpl/desk/appearance.h index 1523dc22202..73ea6a77897 100644 --- a/reactos/dll/cpl/desk/appearance.h +++ b/reactos/dll/cpl/desk/appearance.h @@ -47,10 +47,11 @@ typedef struct BOOL bTooltipAnimation; BOOL bTooltipFade; BOOL bCursorShadow; + BOOL bDropShadow; BOOL bUiEffects; BOOL bFontSmoothing; - BOOL bDragFullWindows; UINT uiFontSmoothingType; + BOOL bDragFullWindows; } EFFECTS; typedef struct diff --git a/reactos/dll/cpl/desk/effappdlg.c b/reactos/dll/cpl/desk/effappdlg.c index 57be021c037..c8ea2197137 100644 --- a/reactos/dll/cpl/desk/effappdlg.c +++ b/reactos/dll/cpl/desk/effappdlg.c @@ -4,8 +4,8 @@ * FILE: dll/cpl/desk/effappdlg.c * PURPOSE: Effects appearance dialog * - * PROGRAMMER: Jan Roeloffzen (jroeloffzen[at]hotmail[dot]com) - * + * PROGRAMMERS: Jan Roeloffzen (jroeloffzen[at]hotmail[dot]com) + * Ismael Ferreras Morezuelas (swyterzone+reactos@gmail.com) */ #include "desk.h" @@ -15,41 +15,63 @@ static VOID UpdateControls(HWND hwndDlg, GLOBALS *g) { WPARAM state; - state = SendDlgItemMessage(hwndDlg, IDC_EFFAPPEARANCE_ANIMATION, BM_GETCHECK, 0, 0); - g->SchemeAdv.Effects.bMenuAnimation = (state == BST_CHECKED) ? TRUE : FALSE; - EnableWindow(GetDlgItem(hwndDlg, IDC_EFFAPPEARANCE_ANIMATIONTYPE), g->SchemeAdv.Effects.bMenuAnimation); - // A boolean as an index for a 2-value list: - SendDlgItemMessage(hwndDlg, IDC_EFFAPPEARANCE_ANIMATIONTYPE, CB_SETCURSEL, (WPARAM)g->SchemeAdv.Effects.bMenuFade, 0); +#define SAVE_CHECKBOX(__CONTROL_ID, __MEMBER) \ +do { \ + state = SendDlgItemMessageW(hwndDlg, __CONTROL_ID, BM_GETCHECK, 0, 0); \ + g->SchemeAdv.Effects.__MEMBER = /* Do a XOR of both the conditions */ \ + ((state == BST_CHECKED) != (__CONTROL_ID == IDC_EFFAPPEARANCE_KEYBOARDCUES)); \ +} while(0) + +#define RSET_COMBOBOX(__CONTROL_ID, __PARENT_MEMBER, __MEMBER) \ +do { \ + SendDlgItemMessageW(hwndDlg, __CONTROL_ID, CB_SETCURSEL, (WPARAM)g->SchemeAdv.Effects.__MEMBER, 0); \ + EnableWindow(GetDlgItem(hwndDlg, __CONTROL_ID), g->SchemeAdv.Effects.__PARENT_MEMBER); \ +} while(0) + + /* Animated menu transitions section (checkbox + combo) */ + SAVE_CHECKBOX(IDC_EFFAPPEARANCE_ANIMATION, bMenuAnimation); + RSET_COMBOBOX(IDC_EFFAPPEARANCE_ANIMATIONTYPE, bMenuAnimation, bMenuFade); + + /* Font antialiasing section (checkbox + combo) */ + SAVE_CHECKBOX(IDC_EFFAPPEARANCE_SMOOTHING, bFontSmoothing); + RSET_COMBOBOX(IDC_EFFAPPEARANCE_SMOOTHINGTYPE, bFontSmoothing, uiFontSmoothingType - 1); + + /* Other checkboxes */ + SAVE_CHECKBOX(IDC_EFFAPPEARANCE_SETDROPSHADOW, bDropShadow); + SAVE_CHECKBOX(IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, bDragFullWindows); + SAVE_CHECKBOX(IDC_EFFAPPEARANCE_KEYBOARDCUES, bKeyboardCues); + +#undef SAVE_CHECKBOX +#undef RSET_COMBOBOX - state = SendDlgItemMessage(hwndDlg, IDC_EFFAPPEARANCE_KEYBOARDCUES, BM_GETCHECK, 0, 0); - g->SchemeAdv.Effects.bKeyboardCues = (state == BST_CHECKED) ? TRUE : FALSE; - state = SendDlgItemMessage(hwndDlg, IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, BM_GETCHECK, 0, 0); - g->SchemeAdv.Effects.bDragFullWindows = (state == BST_CHECKED) ? TRUE : FALSE; g->bSchemeChanged = TRUE; } - static VOID SaveCurrentValues(HWND hwndDlg, GLOBALS *g) { + /* The settings get saved at the end of ApplyScheme() in theme.c, + * when clicking Apply in the main dialog. */ } static VOID -AddToCombo(HWND hwndDlg, INT From, INT To, INT Combo) +AddToCombobox(INT Combo, HWND hwndDlg, INT From, INT To) { - INT iElement, iListIndex, i=0; + INT iElement, iListIndex, i = 0; TCHAR tstrText[80]; + if (Combo == IDC_EFFAPPEARANCE_SMOOTHINGTYPE) i = 1; + for (iElement = From; iElement<=To; iElement++) { - LoadString(hApplet, iElement, (LPTSTR)tstrText, 80); + LoadString(hApplet, iElement, (LPTSTR)tstrText, ARRAYSIZE(tstrText)); iListIndex = SendDlgItemMessage(hwndDlg, Combo, CB_ADDSTRING, 0, (LPARAM)tstrText); - SendDlgItemMessage(hwndDlg, Combo, CB_SETITEMDATA, (WPARAM)iListIndex, (LPARAM)i++ ); + SendDlgItemMessageW(hwndDlg, Combo, CB_SETITEMDATA, (WPARAM)iListIndex, (LPARAM)i++); } } -/* Initialize the effects appearance dialog */ +/* Initialize the effects appearance dialog from the scheme populated in LoadCurrentScheme(), in theme.c */ static VOID EffAppearanceDlg_Init(HWND hwndDlg, GLOBALS *g) { @@ -58,27 +80,39 @@ EffAppearanceDlg_Init(HWND hwndDlg, GLOBALS *g) /* Copy the current theme values */ g->SchemeAdv = g->Scheme; - AddToCombo(hwndDlg, IDS_SLIDEEFFECT, IDS_FADEEFFECT, IDC_EFFAPPEARANCE_ANIMATIONTYPE); +#define INIT_CHECKBOX(__CONTROL_ID, __MEMBER) \ +do { \ + state = /* Do a XOR of both the conditions */ \ + ((g->SchemeAdv.Effects.__MEMBER) != (__CONTROL_ID == IDC_EFFAPPEARANCE_KEYBOARDCUES)) \ + ? BST_CHECKED : BST_UNCHECKED; \ + SendDlgItemMessageW(hwndDlg, __CONTROL_ID, BM_SETCHECK, state, 0); \ +} while(0) - state = g->SchemeAdv.Effects.bMenuAnimation ? BST_CHECKED : BST_UNCHECKED; - SendDlgItemMessage(hwndDlg, IDC_EFFAPPEARANCE_ANIMATION, BM_SETCHECK, state, 0); +#define FILL_COMBOBOX(__CONTROL_ID, __FIRST_STR, __LAST_STR) \ + AddToCombobox(__CONTROL_ID, hwndDlg, __FIRST_STR, __LAST_STR) - state = g->SchemeAdv.Effects.bKeyboardCues ? BST_CHECKED : BST_UNCHECKED; - SendDlgItemMessage(hwndDlg, IDC_EFFAPPEARANCE_KEYBOARDCUES, BM_SETCHECK, state, 0); + /* Animated menu transitions section (checkbox + combo) */ + INIT_CHECKBOX(IDC_EFFAPPEARANCE_ANIMATION, bMenuAnimation); + FILL_COMBOBOX(IDC_EFFAPPEARANCE_ANIMATIONTYPE, IDS_SLIDEEFFECT, + IDS_FADEEFFECT); - state = g->SchemeAdv.Effects.bDragFullWindows ? BST_CHECKED : BST_UNCHECKED; - SendDlgItemMessage(hwndDlg, IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, BM_SETCHECK, state, 0); + /* Font antialiasing section (checkbox + combo) */ + INIT_CHECKBOX(IDC_EFFAPPEARANCE_SMOOTHING, bFontSmoothing); + FILL_COMBOBOX(IDC_EFFAPPEARANCE_SMOOTHINGTYPE, IDS_STANDARDEFFECT, + IDS_CLEARTYPEEFFECT); + + /* Sundry checkboxes */ + INIT_CHECKBOX(IDC_EFFAPPEARANCE_SETDROPSHADOW, bDropShadow); + INIT_CHECKBOX(IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, bDragFullWindows); + INIT_CHECKBOX(IDC_EFFAPPEARANCE_KEYBOARDCUES, bKeyboardCues); + +#undef INIT_CHECKBOX +#undef FILL_COMBOBOX /* Update the controls */ UpdateControls(hwndDlg, g); } - -static VOID -EffAppearanceDlg_CleanUp(HWND hwndDlg, GLOBALS* g) -{ -} - INT_PTR CALLBACK EffAppearanceDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { @@ -95,7 +129,6 @@ EffAppearanceDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) break; case WM_DESTROY: - EffAppearanceDlg_CleanUp(hwndDlg, g); break; case WM_COMMAND: @@ -112,8 +145,10 @@ EffAppearanceDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) break; case IDC_EFFAPPEARANCE_ANIMATION: - case IDC_EFFAPPEARANCE_KEYBOARDCUES: + case IDC_EFFAPPEARANCE_SMOOTHING: + case IDC_EFFAPPEARANCE_SETDROPSHADOW: case IDC_EFFAPPEARANCE_DRAGFULLWINDOWS: + case IDC_EFFAPPEARANCE_KEYBOARDCUES: if (HIWORD(wParam) == BN_CLICKED) { UpdateControls(hwndDlg, g); @@ -121,10 +156,14 @@ EffAppearanceDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) break; case IDC_EFFAPPEARANCE_ANIMATIONTYPE: + case IDC_EFFAPPEARANCE_SMOOTHINGTYPE: if (HIWORD(wParam) == CBN_SELCHANGE) { - SaveCurrentValues(hwndDlg, g); - g->SchemeAdv.Effects.bMenuFade = SendDlgItemMessage(hwndDlg, IDC_EFFAPPEARANCE_ANIMATIONTYPE, CB_GETCURSEL, 0, 0); + INT fontTypeIndex = SendDlgItemMessageW(hwndDlg, IDC_EFFAPPEARANCE_SMOOTHINGTYPE, CB_GETCURSEL, 0, 0); + + g->SchemeAdv.Effects.bMenuFade = SendDlgItemMessageW(hwndDlg, IDC_EFFAPPEARANCE_ANIMATIONTYPE, CB_GETCURSEL, 0, 0); + g->SchemeAdv.Effects.uiFontSmoothingType = SendDlgItemMessageW(hwndDlg, IDC_EFFAPPEARANCE_SMOOTHINGTYPE, CB_GETITEMDATA, fontTypeIndex, 0); + UpdateControls(hwndDlg, g); } break; diff --git a/reactos/dll/cpl/desk/lang/bg-BG.rc b/reactos/dll/cpl/desk/lang/bg-BG.rc index 20c2acefa1e..7440d85a8df 100644 --- a/reactos/dll/cpl/desk/lang/bg-BG.rc +++ b/reactos/dll/cpl/desk/lang/bg-BG.rc @@ -95,16 +95,16 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "Из&ползване на следните преходни ефекти за изборниците и подсказките", IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19, CBS_DROPDOWNLIST | + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP CONTROL "&Използване на следния похват за изглаждане ръбовете на екранните шрифтове", IDC_EFFAPPEARANCE_SMOOTHING, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19, CBS_DROPDOWNLIST | - CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP CONTROL "Използван&е на големи значета", IDC_EFFAPPEARANCE_LARGEICONS, "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19 CONTROL "Изобразяване на &сенки под изборницте", IDC_EFFAPPEARANCE_SETDROPSHADOW, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 267, 19 + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19 CONTROL "Показване на съдържанието на &прозорците по време на влачене", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "С&криване на подчертаването за клавиатурното насочване, до натискане на Alt", @@ -178,7 +178,7 @@ END STRINGTABLE BEGIN IDS_STANDARDEFFECT "Обичаен" - IDS_CLEARTYPEEFFECT "Изчистен" + IDS_CLEARTYPEEFFECT "FreeType Antialised" END STRINGTABLE diff --git a/reactos/dll/cpl/desk/lang/cs-CZ.rc b/reactos/dll/cpl/desk/lang/cs-CZ.rc index 12b2450485d..5d230aebfeb 100644 --- a/reactos/dll/cpl/desk/lang/cs-CZ.rc +++ b/reactos/dll/cpl/desk/lang/cs-CZ.rc @@ -101,16 +101,16 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "Použít následující &efekt přechodu pro nabídky a popisky", IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19, CBS_DROPDOWNLIST | + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP CONTROL "Použít následující metodu vyhlazování &hran obrazovkových písem", IDC_EFFAPPEARANCE_SMOOTHING, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19, CBS_DROPDOWNLIST | - CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP CONTROL "Použít velké &ikony", IDC_EFFAPPEARANCE_LARGEICONS, "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19 CONTROL "Zobrazovat &stíny pod nabídkami", IDC_EFFAPPEARANCE_SETDROPSHADOW, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 267, 19 + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19 CONTROL "Zobrazovat &obsah okna během přesouvání", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "&Nezobrazovat podtržení písmen u klávesových zkratek, dokud nestisknu klávesu Alt", @@ -184,7 +184,7 @@ END STRINGTABLE BEGIN IDS_STANDARDEFFECT "Standardní" - IDS_CLEARTYPEEFFECT "ClearType" + IDS_CLEARTYPEEFFECT "FreeType Antialised" END STRINGTABLE diff --git a/reactos/dll/cpl/desk/lang/de-DE.rc b/reactos/dll/cpl/desk/lang/de-DE.rc index 59f05c7c752..92a34f8240a 100644 --- a/reactos/dll/cpl/desk/lang/de-DE.rc +++ b/reactos/dll/cpl/desk/lang/de-DE.rc @@ -95,16 +95,16 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "&Verwende folgenden Übergangseffekt für Menüs und Tooltips", IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19, CBS_DROPDOWNLIST | + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP CONTROL "V&erwende folgende Kantenglättungsmethode für Bildschirmschriften", IDC_EFFAPPEARANCE_SMOOTHING, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19, CBS_DROPDOWNLIST | - CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP CONTROL "Ve&rwende große Icons", IDC_EFFAPPEARANCE_LARGEICONS, "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19 CONTROL "Zeige Menüsch&atten", IDC_EFFAPPEARANCE_SETDROPSHADOW, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 267, 19 + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19 CONTROL "Zeige &Fensterinhalt beim Verschieben", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "Ver&stecke Unterstrich der Tastaturnavigation bis zum Druck der Alt-Taste", @@ -178,7 +178,7 @@ END STRINGTABLE BEGIN IDS_STANDARDEFFECT "Standard" - IDS_CLEARTYPEEFFECT "ClearType" + IDS_CLEARTYPEEFFECT "FreeType Antialised" END STRINGTABLE diff --git a/reactos/dll/cpl/desk/lang/el-GR.rc b/reactos/dll/cpl/desk/lang/el-GR.rc index 65a7f6d182f..5ff82b86190 100644 --- a/reactos/dll/cpl/desk/lang/el-GR.rc +++ b/reactos/dll/cpl/desk/lang/el-GR.rc @@ -95,16 +95,16 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "&Use the following transition effect for menus and tooltips", IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19, CBS_DROPDOWNLIST | + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP CONTROL "U&se the following method to smooth edges of screen fonts", IDC_EFFAPPEARANCE_SMOOTHING, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19, CBS_DROPDOWNLIST | - CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP CONTROL "Us&e large icons", IDC_EFFAPPEARANCE_LARGEICONS, "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19 CONTROL "Show sh&adows under menus", IDC_EFFAPPEARANCE_SETDROPSHADOW, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 267, 19 + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19 CONTROL "Show &window contents while dragging", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key", @@ -178,7 +178,7 @@ END STRINGTABLE BEGIN IDS_STANDARDEFFECT "Standard" - IDS_CLEARTYPEEFFECT "ClearType" + IDS_CLEARTYPEEFFECT "FreeType Antialised" END STRINGTABLE diff --git a/reactos/dll/cpl/desk/lang/en-US.rc b/reactos/dll/cpl/desk/lang/en-US.rc index 608c95eea83..db9c56e9649 100644 --- a/reactos/dll/cpl/desk/lang/en-US.rc +++ b/reactos/dll/cpl/desk/lang/en-US.rc @@ -95,16 +95,16 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "&Use the following transition effect for menus and tooltips", IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19, CBS_DROPDOWNLIST | + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP CONTROL "U&se the following method to smooth edges of screen fonts", IDC_EFFAPPEARANCE_SMOOTHING, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19, CBS_DROPDOWNLIST | - CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP CONTROL "Us&e large icons", IDC_EFFAPPEARANCE_LARGEICONS, "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19 CONTROL "Show sh&adows under menus", IDC_EFFAPPEARANCE_SETDROPSHADOW, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 267, 19 + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19 CONTROL "Show &window contents while dragging", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key", @@ -178,7 +178,7 @@ END STRINGTABLE BEGIN IDS_STANDARDEFFECT "Standard" - IDS_CLEARTYPEEFFECT "ClearType" + IDS_CLEARTYPEEFFECT "FreeType Antialised" END STRINGTABLE diff --git a/reactos/dll/cpl/desk/lang/es-ES.rc b/reactos/dll/cpl/desk/lang/es-ES.rc index 40e7018b3f3..b14a07a7703 100644 --- a/reactos/dll/cpl/desk/lang/es-ES.rc +++ b/reactos/dll/cpl/desk/lang/es-ES.rc @@ -97,16 +97,16 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "&Animar transiciones de menús y sugerencias emergentes", IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19, CBS_DROPDOWNLIST | + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP CONTROL "U&sar el siguiente método para suavizar los bordes de las fuentes de pantalla", IDC_EFFAPPEARANCE_SMOOTHING, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19, CBS_DROPDOWNLIST | - CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP CONTROL "Usar i&conos grandes", IDC_EFFAPPEARANCE_LARGEICONS, "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19 CONTROL "Mostrar som&bras bajo los menús", IDC_EFFAPPEARANCE_SETDROPSHADOW, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 267, 19 + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19 CONTROL "&Mostrar el contenido de la ventana mientras se arrastra", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "&Ocultar el subrayado de acceso rápido hasta presionar la tecla Alt", @@ -180,7 +180,7 @@ END STRINGTABLE BEGIN IDS_STANDARDEFFECT "Estándar" - IDS_CLEARTYPEEFFECT "ClearType" + IDS_CLEARTYPEEFFECT "Suavizado de FreeType" END STRINGTABLE diff --git a/reactos/dll/cpl/desk/lang/fr-FR.rc b/reactos/dll/cpl/desk/lang/fr-FR.rc index d4e201767cd..0629d0764c8 100644 --- a/reactos/dll/cpl/desk/lang/fr-FR.rc +++ b/reactos/dll/cpl/desk/lang/fr-FR.rc @@ -97,16 +97,16 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "&Utilisez l'effet de transition suivant pour les menus et les bulles d'aides", IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19, CBS_DROPDOWNLIST | + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP CONTROL "U&tilisez la méthode suivante pour aplanir les bords des polices d'écran", IDC_EFFAPPEARANCE_SMOOTHING, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19, CBS_DROPDOWNLIST | - CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP CONTROL "Uti&liser de grandes icones", IDC_EFFAPPEARANCE_LARGEICONS, "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19 CONTROL "&Montrer ombrage sous les menus", IDC_EFFAPPEARANCE_SETDROPSHADOW, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 267, 19 + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19 CONTROL "Montrer contenu des fenêtres lorsqu'elles sont bougés", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "&Cacher les lettres soulignées pour la navigation du clavier jusqu'à ce que j'appuie sur la touche Alt", diff --git a/reactos/dll/cpl/desk/lang/he-IL.rc b/reactos/dll/cpl/desk/lang/he-IL.rc index e6463978dff..f6611fe0d38 100644 --- a/reactos/dll/cpl/desk/lang/he-IL.rc +++ b/reactos/dll/cpl/desk/lang/he-IL.rc @@ -95,16 +95,16 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "&Use the following transition effect for menus and tooltips", IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19, CBS_DROPDOWNLIST | + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP CONTROL "U&se the following method to smooth edges of screen fonts", IDC_EFFAPPEARANCE_SMOOTHING, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19, CBS_DROPDOWNLIST | - CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP CONTROL "השתמש בסמלים גדולים", IDC_EFFAPPEARANCE_LARGEICONS, "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19 CONTROL "Show sh&adows under menus", IDC_EFFAPPEARANCE_SETDROPSHADOW, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 267, 19 + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19 CONTROL "Show &window contents while dragging", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key", diff --git a/reactos/dll/cpl/desk/lang/hu-HU.rc b/reactos/dll/cpl/desk/lang/hu-HU.rc index 23ddfe04eae..06a13a6c424 100644 --- a/reactos/dll/cpl/desk/lang/hu-HU.rc +++ b/reactos/dll/cpl/desk/lang/hu-HU.rc @@ -97,16 +97,16 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "&Use the following transition effect for menus and tooltips", IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19, CBS_DROPDOWNLIST | + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP CONTROL "U&se the following method to smooth edges of screen fonts", IDC_EFFAPPEARANCE_SMOOTHING, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19, CBS_DROPDOWNLIST | - CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP CONTROL "Us&e large icons", IDC_EFFAPPEARANCE_LARGEICONS, "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19 CONTROL "Show sh&adows under menus", IDC_EFFAPPEARANCE_SETDROPSHADOW, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 267, 19 + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19 CONTROL "Show &window contents while dragging", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key", diff --git a/reactos/dll/cpl/desk/lang/id-ID.rc b/reactos/dll/cpl/desk/lang/id-ID.rc index ae16fe07a69..6ce69784ffa 100644 --- a/reactos/dll/cpl/desk/lang/id-ID.rc +++ b/reactos/dll/cpl/desk/lang/id-ID.rc @@ -95,16 +95,16 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "&Use the following transition effect for menus and tooltips", IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19, CBS_DROPDOWNLIST | + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP CONTROL "U&se the following method to smooth edges of screen fonts", IDC_EFFAPPEARANCE_SMOOTHING, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19, CBS_DROPDOWNLIST | - CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP CONTROL "Us&e large icons", IDC_EFFAPPEARANCE_LARGEICONS, "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19 CONTROL "Show sh&adows under menus", IDC_EFFAPPEARANCE_SETDROPSHADOW, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 267, 19 + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19 CONTROL "Show &window contents while dragging", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key", diff --git a/reactos/dll/cpl/desk/lang/it-IT.rc b/reactos/dll/cpl/desk/lang/it-IT.rc index 103e0d6af85..3e5a6c7e989 100644 --- a/reactos/dll/cpl/desk/lang/it-IT.rc +++ b/reactos/dll/cpl/desk/lang/it-IT.rc @@ -95,16 +95,16 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "&Usare il seguente effetto per le transizioni in menu e tooltip", IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19, CBS_DROPDOWNLIST | + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP CONTROL "U&sare il seguente metodo per arrotondare i bordi dei font per lo schermo", IDC_EFFAPPEARANCE_SMOOTHING, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19, CBS_DROPDOWNLIST | - CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP CONTROL "Usare le icone grandi", IDC_EFFAPPEARANCE_LARGEICONS, "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19 CONTROL "&Ombreggiatura sotto i menu", IDC_EFFAPPEARANCE_SETDROPSHADOW, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 267, 19 + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19 CONTROL "Mostrare il contenuto delle finestr mentre le si trascina", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "&Nascondere la sottolineatura delle lettere di navigazione finche non è premuto il tasto Alt", diff --git a/reactos/dll/cpl/desk/lang/ja-JP.rc b/reactos/dll/cpl/desk/lang/ja-JP.rc index 1d434e55885..48f27cfdc15 100644 --- a/reactos/dll/cpl/desk/lang/ja-JP.rc +++ b/reactos/dll/cpl/desk/lang/ja-JP.rc @@ -95,16 +95,16 @@ FONT 9, "MS UI Gothic" BEGIN CONTROL "次のアニメーション効果をメニューとツール チップに使用する(&U):", IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19, CBS_DROPDOWNLIST | + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP CONTROL "次の方法でスクリーン フォントの縁を滑らかにする(&S):", IDC_EFFAPPEARANCE_SMOOTHING, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19, CBS_DROPDOWNLIST | - CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP CONTROL "大きいアイコンを使用する(&E)", IDC_EFFAPPEARANCE_LARGEICONS, "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19 CONTROL "メニューの下に影を表示する(&A)", IDC_EFFAPPEARANCE_SETDROPSHADOW, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 267, 19 + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19 CONTROL "ドラッグ中にウィンドウの内容を表示する(&W)", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "Alt キーを押すまでキーボード ナビゲーションの下線を隠しておく(&H)", diff --git a/reactos/dll/cpl/desk/lang/nl-NL.rc b/reactos/dll/cpl/desk/lang/nl-NL.rc index 270405e2ad5..a705563a0b3 100644 --- a/reactos/dll/cpl/desk/lang/nl-NL.rc +++ b/reactos/dll/cpl/desk/lang/nl-NL.rc @@ -95,16 +95,16 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "De volgende overgangseffecten voor men&u's en knopinfo gebruiken", IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19, CBS_DROPDOWNLIST | + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP CONTROL "Randen van letter&s vloeiend op het scherm weergeven, en wel als volgt", IDC_EFFAPPEARANCE_SMOOTHING, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19, CBS_DROPDOWNLIST | - CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP CONTROL "&Grote pictogrammen gebruiken", IDC_EFFAPPEARANCE_LARGEICONS, "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19 CONTROL "Sch&aduw onder menu's weergeven", IDC_EFFAPPEARANCE_SETDROPSHADOW, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 267, 19 + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19 CONTROL "De in&houd van het venster tijdens het slepen weergeven", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "Onderstreepte letters voor toetsenbordnavigatie &verbergen tot ALT wordt ingedrukt", diff --git a/reactos/dll/cpl/desk/lang/no-NO.rc b/reactos/dll/cpl/desk/lang/no-NO.rc index 231c9241498..5254ab831a7 100644 --- a/reactos/dll/cpl/desk/lang/no-NO.rc +++ b/reactos/dll/cpl/desk/lang/no-NO.rc @@ -95,16 +95,16 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "&Bruk følgende overgang effekter for menyer og verktøytips", IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19, CBS_DROPDOWNLIST | + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP CONTROL "B&ruk følgende metode for kantutjevning av skjerm skifter", IDC_EFFAPPEARANCE_SMOOTHING, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19, CBS_DROPDOWNLIST | - CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP CONTROL "Br&uk store ikoner", IDC_EFFAPPEARANCE_LARGEICONS, "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19 CONTROL "Vis sk&ygger under menyer", IDC_EFFAPPEARANCE_SETDROPSHADOW, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 267, 19 + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19 CONTROL "Vis &vindu innholdet ved flytting", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "&Skjul visning av understrekning for tastatur hurtigtast til jeg trykker på Alt tasten", diff --git a/reactos/dll/cpl/desk/lang/pl-PL.rc b/reactos/dll/cpl/desk/lang/pl-PL.rc index 2762b052f7c..b05d2bee014 100644 --- a/reactos/dll/cpl/desk/lang/pl-PL.rc +++ b/reactos/dll/cpl/desk/lang/pl-PL.rc @@ -104,16 +104,16 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "&Użyj następującego efektu przejścia dla menu i etykiet narzędzi:", IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19, CBS_DROPDOWNLIST | + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP CONTROL "Użyj n&astępującej metody wygładzania krawędzi czcionek ekranowych:", IDC_EFFAPPEARANCE_SMOOTHING, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19, CBS_DROPDOWNLIST | - CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP CONTROL "Użyj &dużych ikon", IDC_EFFAPPEARANCE_LARGEICONS, "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19 CONTROL "&Pokaż cienie pod menu", IDC_EFFAPPEARANCE_SETDROPSHADOW, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 267, 19 + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19 CONTROL "Pokaż &zawartość okna podczas przeciągania", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "Ukryj podkreślenie liter do nawigacji &klawiaturą, dopóki nie nacisnę klawisza Alt", diff --git a/reactos/dll/cpl/desk/lang/pt-BR.rc b/reactos/dll/cpl/desk/lang/pt-BR.rc index 726d040111c..b8de7ba9f52 100644 --- a/reactos/dll/cpl/desk/lang/pt-BR.rc +++ b/reactos/dll/cpl/desk/lang/pt-BR.rc @@ -95,16 +95,16 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "&Usar este efeito de transição para menus e dicas de ferramenta:", IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19, CBS_DROPDOWNLIST | + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP CONTROL "U&sar este método para suavizar as bordas das fontes de tela:", IDC_EFFAPPEARANCE_SMOOTHING, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19, CBS_DROPDOWNLIST | - CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP CONTROL "Usar íco&nes grandes", IDC_EFFAPPEARANCE_LARGEICONS, "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19 CONTROL "Mostr&ar sombras sob menus", IDC_EFFAPPEARANCE_SETDROPSHADOW, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 267, 19 + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19 CONTROL "&Mostrar conteúdo da janela ao arrastar", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "&Ocultar sublinhados para navegação do teclado até eu pressionar a tecla Alt", diff --git a/reactos/dll/cpl/desk/lang/ro-RO.rc b/reactos/dll/cpl/desk/lang/ro-RO.rc index 0d6ebc1c3ca..4a12a0d6dec 100644 --- a/reactos/dll/cpl/desk/lang/ro-RO.rc +++ b/reactos/dll/cpl/desk/lang/ro-RO.rc @@ -100,16 +100,16 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "Aplică &efect de tranziție pentru meniuri și ponturi:", IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19, CBS_DROPDOWNLIST | + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP CONTROL "&Rotunjește marginile de text folosind metoda:", IDC_EFFAPPEARANCE_SMOOTHING, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19, CBS_DROPDOWNLIST | - CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP CONTROL "&Pictograme mari", IDC_EFFAPPEARANCE_LARGEICONS, "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19 CONTROL "Afișează &umbre sub meniuri", IDC_EFFAPPEARANCE_SETDROPSHADOW, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 267, 19 + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19 CONTROL "Afișează ferestrele și în timpul &mișcării lor", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "&Amână sublinierea literelor navigării din tastatură până la apăsarea tastei «Alt»", diff --git a/reactos/dll/cpl/desk/lang/ru-RU.rc b/reactos/dll/cpl/desk/lang/ru-RU.rc index 1f57fcc69a1..04ec90ffcf7 100644 --- a/reactos/dll/cpl/desk/lang/ru-RU.rc +++ b/reactos/dll/cpl/desk/lang/ru-RU.rc @@ -95,16 +95,16 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "&Применять следующий переходный эффект для меню и подсказок", IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19, CBS_DROPDOWNLIST | + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP CONTROL "Пр&именять следующий метод сглаживания для экранных шрифтов", IDC_EFFAPPEARANCE_SMOOTHING, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19, CBS_DROPDOWNLIST | - CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP CONTROL "Применять &крупные значки", IDC_EFFAPPEARANCE_LARGEICONS, "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19 CONTROL "Отображать &тени, отбрасываемые меню", IDC_EFFAPPEARANCE_SETDROPSHADOW, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 267, 19 + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19 CONTROL "&Отображать содержимое окна при перетаскивании", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "Скр&ывать указатели вызова с клавиатуры до нажатия ", diff --git a/reactos/dll/cpl/desk/lang/sk-SK.rc b/reactos/dll/cpl/desk/lang/sk-SK.rc index 345febd4a6d..1c27bb3ed3f 100644 --- a/reactos/dll/cpl/desk/lang/sk-SK.rc +++ b/reactos/dll/cpl/desk/lang/sk-SK.rc @@ -97,16 +97,16 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "&Používať nasledovný efekt prechodu pre ponuky a názvy tlačidiel", IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19, CBS_DROPDOWNLIST | + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP CONTROL "Po&užívať nasledovnú metódu vyhladenia okrajov zobrazeného písma", IDC_EFFAPPEARANCE_SMOOTHING, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19, CBS_DROPDOWNLIST | - CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP CONTROL "Používať &veľké ikony", IDC_EFFAPPEARANCE_LARGEICONS, "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19 CONTROL "&Zobrazovať tiene pod ponukami", IDC_EFFAPPEARANCE_SETDROPSHADOW, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 267, 19 + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19 CONTROL "Zobrazovať &obsah okna počas presúvania", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "&Skrývať podčiarknuté písmená (klávesové skratky) až do stlačenia klávesu Alt", diff --git a/reactos/dll/cpl/desk/lang/sq-AL.rc b/reactos/dll/cpl/desk/lang/sq-AL.rc index 0cf430bcd84..a3ab6b0800b 100644 --- a/reactos/dll/cpl/desk/lang/sq-AL.rc +++ b/reactos/dll/cpl/desk/lang/sq-AL.rc @@ -99,16 +99,16 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "&Përdorni efektin e mëposhtme tranzicionit për menutë dhe ndihmesa", IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19, CBS_DROPDOWNLIST | + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP CONTROL "Përdor metodën e mëposhtme për të zbutë skajet e fonts ekran", IDC_EFFAPPEARANCE_SMOOTHING, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19, CBS_DROPDOWNLIST | - CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP CONTROL "Përdor ikona të mëdha", IDC_EFFAPPEARANCE_LARGEICONS, "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19 CONTROL "Shfaq hije poshte menus", IDC_EFFAPPEARANCE_SETDROPSHADOW, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 267, 19 + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19 CONTROL "Shfaq &përmbajtjen dritare ndërsa zvarritet", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "Fsheh gërma të nënvizuara për kërkimin e tastierës deri sa të shtypni butonin Alt", diff --git a/reactos/dll/cpl/desk/lang/sv-SE.rc b/reactos/dll/cpl/desk/lang/sv-SE.rc index 94004458710..e376a9e58b9 100644 --- a/reactos/dll/cpl/desk/lang/sv-SE.rc +++ b/reactos/dll/cpl/desk/lang/sv-SE.rc @@ -97,16 +97,16 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "&Use the following transition effect for menus and tooltips", IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19, CBS_DROPDOWNLIST | + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP CONTROL "U&se the following method to smooth edges of screen fonts", IDC_EFFAPPEARANCE_SMOOTHING, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19, CBS_DROPDOWNLIST | - CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP CONTROL "Us&e large icons", IDC_EFFAPPEARANCE_LARGEICONS, "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19 CONTROL "Show sh&adows under menus", IDC_EFFAPPEARANCE_SETDROPSHADOW, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 267, 19 + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19 CONTROL "Show &window contents while dragging", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key", diff --git a/reactos/dll/cpl/desk/lang/tr-TR.rc b/reactos/dll/cpl/desk/lang/tr-TR.rc index d474309be63..c2223af5abb 100644 --- a/reactos/dll/cpl/desk/lang/tr-TR.rc +++ b/reactos/dll/cpl/desk/lang/tr-TR.rc @@ -97,16 +97,16 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "&Araç İpuçları ve Seçkeler İçin Aşağıdaki Geçiş Etkisi Kullan:", IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19, CBS_DROPDOWNLIST | + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP CONTROL "&Görüntülük Yazı Tiplerinin Kıyılarını Yumuşatmak İçin Aşağıdaki Yöntemi Kullan:", IDC_EFFAPPEARANCE_SMOOTHING, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19, CBS_DROPDOWNLIST | - CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP CONTROL "&Büyük Simgeler Kullan", IDC_EFFAPPEARANCE_LARGEICONS, "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19 CONTROL "&Seçkeler Altında Gölge Göster", IDC_EFFAPPEARANCE_SETDROPSHADOW, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 267, 19 + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19 CONTROL "S&ürüklerken Pencere İçeriğini Göster", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "S&eçenek Düğmesine Basana Dek Düğme Takımıyla Gezinme İçin Altı Çizili Harfleri Gizle", diff --git a/reactos/dll/cpl/desk/lang/uk-UA.rc b/reactos/dll/cpl/desk/lang/uk-UA.rc index 7bf91ea210c..b7d050eb423 100644 --- a/reactos/dll/cpl/desk/lang/uk-UA.rc +++ b/reactos/dll/cpl/desk/lang/uk-UA.rc @@ -103,16 +103,16 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "&Застосовувати наступний перехідний ефект для меню та підказок", IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19, CBS_DROPDOWNLIST | + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP CONTROL "З&астосовувати наступний метод згладжування для екранних шрифтів", IDC_EFFAPPEARANCE_SMOOTHING, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19, CBS_DROPDOWNLIST | - CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP CONTROL "Застосовувати &великі значки", IDC_EFFAPPEARANCE_LARGEICONS, "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19 CONTROL "Відображати тіні від меню", IDC_EFFAPPEARANCE_SETDROPSHADOW, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 267, 19 + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19 CONTROL "Показати &вміст вікна під час перетягування", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "&Приховувати покажчики виклику з клавіатури до натиснення ", @@ -186,7 +186,7 @@ END STRINGTABLE BEGIN IDS_STANDARDEFFECT "Звичайний" - IDS_CLEARTYPEEFFECT "Відкритий тип" + IDS_CLEARTYPEEFFECT "FreeType Antialised" END STRINGTABLE diff --git a/reactos/dll/cpl/desk/lang/zh-CN.rc b/reactos/dll/cpl/desk/lang/zh-CN.rc index d0d335b6668..9a671aa835e 100644 --- a/reactos/dll/cpl/desk/lang/zh-CN.rc +++ b/reactos/dll/cpl/desk/lang/zh-CN.rc @@ -102,16 +102,16 @@ FONT 9, "MS Shell Dlg" BEGIN CONTROL "为菜单和工具提示使用以下过渡效果(&U):", IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19, CBS_DROPDOWNLIST | + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP CONTROL "使用下列方式使屏幕字体的边缘平滑(&S)", IDC_EFFAPPEARANCE_SMOOTHING, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19, CBS_DROPDOWNLIST | - CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP CONTROL "使用大图标(&E)", IDC_EFFAPPEARANCE_LARGEICONS, "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19 CONTROL "在菜单下显示阴影(&A)", IDC_EFFAPPEARANCE_SETDROPSHADOW, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 267, 19 + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19 CONTROL "拖动时显示窗口内容(&W)", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "直到我按 Alt 键之前,请隐藏有下划线的字母供键盘使用", @@ -185,7 +185,7 @@ END STRINGTABLE BEGIN IDS_STANDARDEFFECT "标准" - IDS_CLEARTYPEEFFECT "清晰字体" + IDS_CLEARTYPEEFFECT "FreeType Antialised" END STRINGTABLE diff --git a/reactos/dll/cpl/desk/lang/zh-TW.rc b/reactos/dll/cpl/desk/lang/zh-TW.rc index 38fff1b405f..642bf55e288 100644 --- a/reactos/dll/cpl/desk/lang/zh-TW.rc +++ b/reactos/dll/cpl/desk/lang/zh-TW.rc @@ -97,16 +97,16 @@ FONT 9, "MS Shell Dlg" BEGIN CONTROL "為選單和工具提示使用以下過渡效果(&U):", IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19, CBS_DROPDOWNLIST | + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP CONTROL "使用下列方式使螢幕字型的邊緣平滑(&S)", IDC_EFFAPPEARANCE_SMOOTHING, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19, CBS_DROPDOWNLIST | - CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP CONTROL "使用大圖示(&E)", IDC_EFFAPPEARANCE_LARGEICONS, "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19 CONTROL "在選單下顯示陰影(&A)", IDC_EFFAPPEARANCE_SETDROPSHADOW, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 267, 19 + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19 CONTROL "拖動時顯示視窗內容(&W)", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "直到我按 Alt 鍵之前,請隱藏有下劃線的字母供鍵盤使用", @@ -180,7 +180,7 @@ END STRINGTABLE BEGIN IDS_STANDARDEFFECT "標準" - IDS_CLEARTYPEEFFECT "清晰字型" + IDS_CLEARTYPEEFFECT "FreeType Antialised" END STRINGTABLE diff --git a/reactos/dll/cpl/desk/theme.c b/reactos/dll/cpl/desk/theme.c index ff501bed194..7114fdf9018 100644 --- a/reactos/dll/cpl/desk/theme.c +++ b/reactos/dll/cpl/desk/theme.c @@ -5,6 +5,7 @@ * PURPOSE: Handling themes and visual effects * * PROGRAMMERS: Katayama Hirofumi MZ + * Ismael Ferreras Morezuelas (swyterzone+reactos@gmail.com) */ #include "desk.h" @@ -61,7 +62,7 @@ static const WCHAR *g_RegColorNames[NUM_COLORS] = { VOID SchemeSetMetric(IN COLOR_SCHEME *scheme, int id, int value) { - switch(id) + switch (id) { case SIZE_BORDER_WIDTH: scheme->ncMetrics.iBorderWidth = value; break; case SIZE_SCROLL_WIDTH: scheme->ncMetrics.iScrollWidth = value; break; @@ -173,6 +174,26 @@ LoadCurrentScheme(OUT COLOR_SCHEME *scheme) scheme->Effects.bTooltipAnimation = scheme->Effects.bMenuAnimation; scheme->Effects.bTooltipFade = scheme->Effects.bMenuFade; + /* Use the following transition effect for menus and tooltips */ + ret = SystemParametersInfoW(SPI_GETFONTSMOOTHING, + 0, + &scheme->Effects.bFontSmoothing, + 0); + if (!ret) return FALSE; + + ret = SystemParametersInfoW(SPI_GETFONTSMOOTHINGTYPE, + 0, + &scheme->Effects.uiFontSmoothingType, + 0); + if (!ret) return FALSE; + + /* Show shadows under menus */ + ret = SystemParametersInfoW(SPI_GETDROPSHADOW, + 0, + &scheme->Effects.bDropShadow, + 0); + if (!ret) return FALSE; + /* Show content of windows during dragging */ ret = SystemParametersInfoW(SPI_GETDRAGFULLWINDOWS, 0, @@ -180,7 +201,7 @@ LoadCurrentScheme(OUT COLOR_SCHEME *scheme) 0); if (!ret) return FALSE; - /* Hide underlined letters for keyboard navigation until I press the Alt key */ + /* Hide underlined letters for keyboard navigation until the Alt key is pressed */ ret = SystemParametersInfoW(SPI_GETKEYBOARDCUES, 0, &scheme->Effects.bKeyboardCues, @@ -339,23 +360,53 @@ ApplyScheme(IN COLOR_SCHEME *scheme, IN PTHEME_SELECTION pSelectedTheme) /* FIXME: XP seems to use grayed checkboxes to reflect differences between menu and tooltips settings * Just keep them in sync for now. */ + +#define SYS_CONFIG(__uiAction, __uiParam, __pvParam) \ + SystemParametersInfoW(__uiAction, __uiParam, __pvParam, SPIF_UPDATEINIFILE | SPIF_SENDCHANGE) + scheme->Effects.bTooltipAnimation = scheme->Effects.bMenuAnimation; - scheme->Effects.bTooltipFade = scheme->Effects.bMenuFade; - SystemParametersInfoW(SPI_SETDRAGFULLWINDOWS, scheme->Effects.bDragFullWindows, (PVOID)&scheme->Effects.bDragFullWindows, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); - SystemParametersInfoW(SPI_SETKEYBOARDCUES, 0, IntToPtr(scheme->Effects.bKeyboardCues), SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); - //SystemParametersInfoW(SPI_SETACTIVEWINDOWTRACKING, 0, (PVOID)&scheme->Effects.bActiveWindowTracking, SPIF_UPDATEINIFILE|SPIF_SENDCHANGE); - //SystemParametersInfoW(SPI_SETMENUANIMATION, 0, (PVOID)&scheme->Effects.bMenuAnimation, SPIF_UPDATEINIFILE|SPIF_SENDCHANGE); - //SystemParametersInfoW(SPI_SETCOMBOBOXANIMATION, 0, (PVOID)&scheme->Effects.bComboBoxAnimation, SPIF_UPDATEINIFILE|SPIF_SENDCHANGE); - //SystemParametersInfoW(SPI_SETLISTBOXSMOOTHSCROLLING, 0, (PVOID)&scheme->Effects.bListBoxSmoothScrolling, SPIF_UPDATEINIFILE|SPIF_SENDCHANGE); - //SystemParametersInfoW(SPI_SETGRADIENTCAPTIONS, 0, (PVOID)&scheme->Effects.bGradientCaptions, SPIF_UPDATEINIFILE|SPIF_SENDCHANGE); - //SystemParametersInfoW(SPI_SETACTIVEWNDTRKZORDER, 0, (PVOID)&scheme->Effects.bActiveWndTrkZorder, SPIF_UPDATEINIFILE|SPIF_SENDCHANGE); - //SystemParametersInfoW(SPI_SETHOTTRACKING, 0, (PVOID)&scheme->Effects.bHotTracking, SPIF_UPDATEINIFILE|SPIF_SENDCHANGE); - SystemParametersInfoW(SPI_SETMENUFADE, 0, (PVOID)&scheme->Effects.bMenuFade, SPIF_UPDATEINIFILE|SPIF_SENDCHANGE); - //SystemParametersInfoW(SPI_SETSELECTIONFADE, 0, (PVOID)&scheme->Effects.bSelectionFade, SPIF_UPDATEINIFILE|SPIF_SENDCHANGE); - SystemParametersInfoW(SPI_SETTOOLTIPANIMATION, 0, (PVOID)&scheme->Effects.bTooltipAnimation, SPIF_UPDATEINIFILE|SPIF_SENDCHANGE); - SystemParametersInfoW(SPI_SETTOOLTIPFADE, 0, (PVOID)&scheme->Effects.bTooltipFade, SPIF_UPDATEINIFILE|SPIF_SENDCHANGE); - //SystemParametersInfoW(SPI_SETCURSORSHADOW, 0, (PVOID)&scheme->Effects.bCursorShadow, SPIF_UPDATEINIFILE|SPIF_SENDCHANGE); - //SystemParametersInfoW(SPI_SETUIEFFECTS, 0, (PVOID)&scheme->Effects.bUiEffects, SPIF_UPDATEINIFILE|SPIF_SENDCHANGE); + scheme->Effects.bTooltipFade = scheme->Effects.bMenuFade; + + /* Use the following transition effect for menus and tooltips */ + SYS_CONFIG(SPI_SETMENUANIMATION, 0, IntToPtr(scheme->Effects.bMenuAnimation)); + SYS_CONFIG(SPI_SETMENUFADE, 0, IntToPtr(scheme->Effects.bMenuFade)); + + /* Use the following method to smooth edges of screen fonts */ + SYS_CONFIG(SPI_SETFONTSMOOTHING, scheme->Effects.bFontSmoothing, 0); + SYS_CONFIG(SPI_SETFONTSMOOTHINGTYPE, 0, IntToPtr(scheme->Effects.uiFontSmoothingType)); + + /* + * Refresh and redraw all the windows, otherwise the font smoothing changes + * only appear after any future partial region invalidation. + * Not everyone listens for this WM_SETTINGCHANGE, including the shell and most third party programs. + */ + InvalidateRect(NULL, NULL, TRUE); + + /* Use large icons */ + //SYS_CONFIG(SPI_GETDRAGFULLWINDOWS, (PVOID) g->SchemeAdv.Effects.bMenuFade); + + /* Show shadows under menus */ + SYS_CONFIG(SPI_SETDROPSHADOW, 0, IntToPtr(scheme->Effects.bDropShadow)); + + /* Show window contents while dragging */ + SYS_CONFIG(SPI_SETDRAGFULLWINDOWS, scheme->Effects.bDragFullWindows, 0); + + /* Hide underlined letters for keyboard navigation until I press the Alt key */ + SYS_CONFIG(SPI_SETKEYBOARDCUES, 0, IntToPtr(scheme->Effects.bKeyboardCues)); + + // SYS_CONFIG(SPI_SETACTIVEWINDOWTRACKING, 0, IntToPtr(scheme->Effects.bActiveWindowTracking)); + // SYS_CONFIG(SPI_SETCOMBOBOXANIMATION, 0, IntToPtr(scheme->Effects.bComboBoxAnimation)); + // SYS_CONFIG(SPI_SETLISTBOXSMOOTHSCROLLING, 0, IntToPtr(scheme->Effects.bListBoxSmoothScrolling)); + // SYS_CONFIG(SPI_SETGRADIENTCAPTIONS, 0, IntToPtr(scheme->Effects.bGradientCaptions)); + // SYS_CONFIG(SPI_SETACTIVEWNDTRKZORDER, 0, IntToPtr(scheme->Effects.bActiveWndTrkZorder)); + // SYS_CONFIG(SPI_SETHOTTRACKING, 0, IntToPtr(scheme->Effects.bHotTracking)); + // SYS_CONFIG(SPI_SETSELECTIONFADE, 0, IntToPtr(scheme->Effects.bSelectionFade)); + SYS_CONFIG(SPI_SETTOOLTIPANIMATION, 0, IntToPtr(scheme->Effects.bTooltipAnimation)); + SYS_CONFIG(SPI_SETTOOLTIPFADE, 0, IntToPtr(scheme->Effects.bTooltipFade)); + // SYS_CONFIG(SPI_SETCURSORSHADOW, 0, IntToPtr(scheme->Effects.bCursorShadow)); + // SYS_CONFIG(SPI_SETUIEFFECTS, 0, IntToPtr(scheme->Effects.bUiEffects)); + +#undef SYS_CONFIG /* Save SchemeId in the registry */ if (pSelectedTheme->Theme != NULL && pSelectedTheme->ThemeActive == FALSE) @@ -668,7 +719,7 @@ EnumThemeProc(IN LPVOID lpReserved, * the visual styles of the system */ PTHEME -LoadThemes() +LoadThemes(VOID) { HRESULT hret; PTHEME pClassicTheme;