Index: base/system/userinit/userinit.c =================================================================== --- base/system/userinit/userinit.c (revision 40249) +++ base/system/userinit/userinit.c (working copy) @@ -30,6 +30,7 @@ #include #include "resource.h" #include +#include WINE_DEFAULT_DEBUG_CHANNEL(userinit); @@ -535,6 +536,61 @@ WARN("RegOpenKeyEx() failed with error %lu\n", rc); } +static VOID SetUserPreference(UINT uiAction,BOOL bValue,UINT fWinIni) +{ + DWORD dwvalue = bValue; + SystemParametersInfo(uiAction, 0, (PVOID)dwvalue, fWinIni); +} + +static VOID SetUserPreferences(VOID) +{ + HKEY hKey; + DWORD Type, Size; + LONG rc; + USERPREFERENCESMASK Preferences; + + TRACE("()\n"); + + rc = RegOpenKeyEx(HKEY_CURRENT_USER, REGSTR_PATH_DESKTOP, + 0, KEY_QUERY_VALUE, &hKey); + if (rc == ERROR_SUCCESS) + { + Size = sizeof(USERPREFERENCESMASK); + ERR("USERPREFERENCESMASK size: %d\n",Size); + + rc = RegQueryValueEx(hKey, + L"UserPreferencesMask", + NULL, + &Type, + (LPBYTE)&Preferences, + &Size); + if (rc == ERROR_SUCCESS && Type == REG_BINARY) + { + SetUserPreference(SPI_SETUIEFFECTS, Preferences.bUiEffects, SPIF_SENDCHANGE); + SetUserPreference(SPI_SETACTIVEWINDOWTRACKING, Preferences.bActiveWindowTracking, SPIF_SENDCHANGE); + SetUserPreference(SPI_SETMENUANIMATION, Preferences.bMenuAnimation, SPIF_SENDCHANGE); + SetUserPreference(SPI_SETCOMBOBOXANIMATION, Preferences.bComboBoxAnimation, SPIF_SENDCHANGE); + SetUserPreference(SPI_SETLISTBOXSMOOTHSCROLLING, Preferences.bListBoxSmoothScrolling, SPIF_SENDCHANGE); + SetUserPreference(SPI_SETGRADIENTCAPTIONS, Preferences.bGradientCaptions, SPIF_SENDCHANGE); + SetUserPreference(SPI_SETKEYBOARDCUES, Preferences.bKeyboardCues, SPIF_SENDCHANGE); + SetUserPreference(SPI_SETACTIVEWNDTRKZORDER, Preferences.bActiveWndTrkZorder, SPIF_SENDCHANGE); + SetUserPreference(SPI_SETHOTTRACKING, Preferences.bHotTracking, SPIF_SENDCHANGE); + SetUserPreference(SPI_SETMENUFADE, Preferences.bMenuFade, SPIF_SENDCHANGE); + SetUserPreference(SPI_SETSELECTIONFADE, Preferences.bSelectionFade, SPIF_SENDCHANGE); + SetUserPreference(SPI_SETTOOLTIPANIMATION, Preferences.bTooltipAnimation, SPIF_SENDCHANGE); + SetUserPreference(SPI_SETTOOLTIPFADE, Preferences.bTooltipFade, SPIF_SENDCHANGE); + SetUserPreference(SPI_SETCURSORSHADOW, Preferences.bCursorShadow, SPIF_SENDCHANGE); + } + else + { + ERR("No User Preferences set in registry or incorrect type (error %lu)\n", rc); + } + RegCloseKey(hKey); + } + else + WARN("RegOpenKeyEx() failed with error %lu\n", rc); +} + static VOID SetUserSettings(VOID) { @@ -543,6 +599,7 @@ SetUserSysColors(); SetUserMetrics(); SetUserWallpaper(); + SetUserPreferences(); } typedef DWORD (WINAPI *PCMP_REPORT_LOGON)(DWORD, DWORD); Index: dll/cpl/desk/appearance.c =================================================================== --- dll/cpl/desk/appearance.c (revision 40249) +++ dll/cpl/desk/appearance.c (working copy) @@ -127,6 +127,19 @@ g->Theme.lfFont[FONT_INFO] = NonClientMetrics.lfStatusFont; g->Theme.lfFont[FONT_DIALOG] = NonClientMetrics.lfMessageFont; SystemParametersInfo(SPI_GETICONTITLELOGFONT, sizeof(LOGFONT), &g->Theme.lfFont[FONT_ICON], 0); + + /* Effects */ + /* "Use the following transition effect for menus and tooltips" */ + SystemParametersInfo(SPI_GETMENUANIMATION, sizeof(BOOL), &g->Theme.Effects.bMenuAnimation, 0); + SystemParametersInfo(SPI_GETMENUFADE, sizeof(BOOL), &g->Theme.Effects.bMenuFade, 0); + /* FIXME: XP seems to use grayed checkboxes to reflect differences between menu and tooltips settings + * Just keep them in sync for now: + */ + g->Theme.Effects.bTooltipAnimation = g->Theme.Effects.bMenuAnimation; + g->Theme.Effects.bTooltipFade = g->Theme.Effects.bMenuFade; + + /* "Hide underlined letters for keyboard navigation until I press the Alt key" */ + SystemParametersInfo(SPI_GETKEYBOARDCUES, sizeof(BOOL), &g->Theme.Effects.bKeyboardCues, 0); } @@ -206,7 +219,18 @@ return Ret; } +static VOID +_UpdateUserPref(UINT SpiGet,UINT SpiSet,BOOL *pbFlag) +{ + BOOL oldFlag; + SystemParametersInfo(SpiGet, sizeof(BOOL), &oldFlag, 0); + if(oldFlag != *pbFlag) { + SystemParametersInfo(SpiSet, 0, (PVOID)*pbFlag, SPIF_UPDATEINIFILE|SPIF_SENDCHANGE); + } +} +#define UPDATE_USERPREF(NAME,pbFlag) _UpdateUserPref(SPI_GET ## NAME, SPI_SET ## NAME, pbFlag) + static VOID ApplyTheme(GLOBALS* g) { @@ -333,6 +357,27 @@ RegCloseKey(hKey); } + + /* Effects, save only when needed: */ + /* FIXME: XP seems to use grayed checkboxes to reflect differences between menu and tooltips settings + * Just keep them in sync for now. + */ + g->Theme.Effects.bTooltipAnimation = g->Theme.Effects.bMenuAnimation; + g->Theme.Effects.bTooltipFade = g->Theme.Effects.bMenuFade; + UPDATE_USERPREF(KEYBOARDCUES, &g->Theme.Effects.bKeyboardCues); + //UPDATE_USERPREF(ACTIVEWINDOWTRACKING, &g->Theme.Effects.bActiveWindowTracking); + UPDATE_USERPREF(MENUANIMATION, &g->Theme.Effects.bMenuAnimation); + //UPDATE_USERPREF(COMBOBOXANIMATION, &g->Theme.Effects.bComboBoxAnimation); + //UPDATE_USERPREF(LISTBOXSMOOTHSCROLLING, &g->Theme.Effects.bListBoxSmoothScrolling); + //UPDATE_USERPREF(GRADIENTCAPTIONS, &g->Theme.Effects.bGradientCaptions); + //UPDATE_USERPREF(ACTIVEWNDTRKZORDER, &g->Theme.Effects.bActiveWndTrkZorder); + //UPDATE_USERPREF(HOTTRACKING, &g->Theme.Effects.bHotTracking); + UPDATE_USERPREF(MENUFADE, &g->Theme.Effects.bMenuFade); + //UPDATE_USERPREF(SELECTIONFADE, &g->Theme.Effects.bSelectionFade); + UPDATE_USERPREF(TOOLTIPANIMATION, &g->Theme.Effects.bTooltipAnimation); + UPDATE_USERPREF(TOOLTIPFADE, &g->Theme.Effects.bTooltipFade); + //UPDATE_USERPREF(CURSORSHADOW, &g->Theme.Effects.bCursorShadow); + //UPDATE_USERPREF(UIEFFECTS, &g->Theme.Effects.bUiEffects); /* Save ThemeId */ Result = RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Appearance\\New Schemes"), 0, KEY_ALL_ACCESS, &hKey); if (Result == ERROR_SUCCESS) @@ -462,6 +507,19 @@ case WM_COMMAND: switch (LOWORD(wParam)) { + case IDC_APPEARANCE_EFFECTS: + DialogBoxParam(hApplet, (LPCTSTR)IDD_EFFAPPEARANCE, + hwndDlg, EffAppearanceDlgProc, (LPARAM)g); + + /* Was anything changed in the effects appearance dialog? */ + if (memcmp(&g->Theme, &g->ThemeAdv, sizeof(THEME)) != 0) + { + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + g->Theme = g->ThemeAdv; + g->Theme.bHasChanged = TRUE; + } + break; + case IDC_APPEARANCE_ADVANCED: DialogBoxParam(hApplet, (LPCTSTR)IDD_ADVAPPEARANCE, hwndDlg, AdvAppearanceDlgProc, (LPARAM)g); Index: dll/cpl/desk/appearance.h =================================================================== --- dll/cpl/desk/appearance.h (revision 40249) +++ dll/cpl/desk/appearance.h (working copy) @@ -30,8 +30,30 @@ #define MAX_TEMPLATENAMELENTGH 80 /* Some typedefs for appearance */ + +/* Most (but not all) fields below correspond to HKCU\Control Panel\Desktop\UserPreferencesMask */ typedef struct { + BOOL bActiveWindowTracking; + BOOL bMenuAnimation; + BOOL bComboBoxAnimation; + BOOL bListBoxSmoothScrolling; + BOOL bGradientCaptions; + BOOL bKeyboardCues; + BOOL bActiveWndTrkZorder; + BOOL bHotTracking; + BOOL bMenuFade; + BOOL bSelectionFade; + BOOL bTooltipAnimation; + BOOL bTooltipFade; + BOOL bCursorShadow; + BOOL bUiEffects; + BOOL bFontSmoothing; + UINT uiFontSmoothingType; +} EFFECTS; + +typedef struct +{ COLORREF crColor[NUM_COLORS]; LOGFONT lfFont[NUM_FONTS]; UINT64 Size[NUM_SIZES]; @@ -39,6 +61,7 @@ BOOL bFlatMenus; BOOL bHasChanged; BOOL bIsCustom; + EFFECTS Effects; } THEME; typedef struct @@ -87,5 +110,8 @@ /* prototypes for appearance.c */ INT_PTR CALLBACK AppearancePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); -/* prototypes for advappearancedlg.c */ +/* prototypes for advappdlg.c */ INT_PTR CALLBACK AdvAppearanceDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); + +/* prototypes for effappdlg.c */ +INT_PTR CALLBACK EffAppearanceDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); Index: dll/cpl/desk/desk.rbuild =================================================================== --- dll/cpl/desk/desk.rbuild (revision 40249) +++ dll/cpl/desk/desk.rbuild (working copy) @@ -27,6 +27,7 @@ preview.c screensaver.c advappdlg.c + effappdlg.c settings.c monslctl.c general.c Index: dll/cpl/desk/effappdlg.c =================================================================== --- dll/cpl/desk/effappdlg.c (revision 0) +++ dll/cpl/desk/effappdlg.c (revision 0) @@ -0,0 +1,137 @@ +/* $Id: effappdlg.c 24836 2007-02-12 03:12:56Z tkreuzer $ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Display Control Panel + * FILE: dll/cpl/desk/effappdlg.c + * PURPOSE: Effects appearance dialog + * + * PROGRAMMER: Jan Roeloffzen (jroeloffzen[at]hotmail[dot]com) + * + */ + +#include "desk.h" +#include "appearance.h" + +/* Update all the controls with the current values for the selected screen element */ +static VOID +UpdateControls(HWND hwndDlg, GLOBALS *g) +{ + WPARAM state; + state = SendDlgItemMessage(hwndDlg, IDC_EFFAPPEARANCE_ANIMATION, BM_GETCHECK, 0, 0); + g->ThemeAdv.Effects.bMenuAnimation = (state == BST_CHECKED) ? TRUE : FALSE; + EnableWindow(GetDlgItem(hwndDlg, IDC_EFFAPPEARANCE_ANIMATIONTYPE), g->ThemeAdv.Effects.bMenuAnimation); + + //A boolean as an index for a 2-value list: + SendDlgItemMessage(hwndDlg, IDC_EFFAPPEARANCE_ANIMATIONTYPE, CB_SETCURSEL, (WPARAM)g->ThemeAdv.Effects.bMenuFade, 0); + + state = SendDlgItemMessage(hwndDlg, IDC_EFFAPPEARANCE_KEYBOARDCUES, BM_GETCHECK, 0, 0); + g->ThemeAdv.Effects.bKeyboardCues = (state == BST_CHECKED) ? FALSE : TRUE; +} + + +static VOID +SaveCurrentValues(HWND hwndDlg, GLOBALS *g) +{ +} + +static VOID +AddToCombo(HWND hwndDlg, INT From, INT To, INT Combo) +{ + INT iElement, iListIndex, i=0; + TCHAR tstrText[80]; + + for (iElement = From; iElement<=To; iElement++) + { + LoadString(hApplet, iElement, (LPTSTR)&tstrText, 79); + iListIndex = SendDlgItemMessage(hwndDlg, Combo, CB_ADDSTRING, 0, (LPARAM)&tstrText); + SendDlgItemMessage(hwndDlg, Combo, CB_SETITEMDATA, (WPARAM)iListIndex, (LPARAM)i++ ); + } +} + +/* Initialize the effects appearance dialog */ +static VOID +EffAppearanceDlg_Init(HWND hwndDlg, GLOBALS *g) +{ + WPARAM state; + + /* Copy the current theme values */ + g->ThemeAdv = g->Theme; + + AddToCombo(hwndDlg, IDS_SLIDEEFFECT, IDS_FADEEFFECT, IDC_EFFAPPEARANCE_ANIMATIONTYPE); + + state = g->ThemeAdv.Effects.bMenuAnimation ? BST_CHECKED : BST_UNCHECKED; + SendDlgItemMessage(hwndDlg, IDC_EFFAPPEARANCE_ANIMATION, BM_SETCHECK, state, 0); + + state = g->ThemeAdv.Effects.bKeyboardCues ? BST_UNCHECKED : BST_CHECKED; + SendDlgItemMessage(hwndDlg, IDC_EFFAPPEARANCE_KEYBOARDCUES, BM_SETCHECK, state, 0); + + /* 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) +{ + GLOBALS* g; + + g = (GLOBALS*)GetWindowLongPtr(hwndDlg, DWLP_USER); + + switch (uMsg) + { + case WM_INITDIALOG: + g = (GLOBALS*)lParam; + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)g); + EffAppearanceDlg_Init(hwndDlg, g); + break; + + case WM_DESTROY: + EffAppearanceDlg_CleanUp(hwndDlg, g); + break; + + case WM_COMMAND: + switch(LOWORD(wParam)) + { + case IDOK: + SaveCurrentValues(hwndDlg, g); + EndDialog(hwndDlg, 0); + break; + + case IDCANCEL: + g->ThemeAdv = g->Theme; + EndDialog(hwndDlg, 0); + break; + + case IDC_EFFAPPEARANCE_ANIMATION: + case IDC_EFFAPPEARANCE_KEYBOARDCUES: + if (HIWORD(wParam) == BN_CLICKED) + { + UpdateControls(hwndDlg, g); + } + break; + + case IDC_EFFAPPEARANCE_ANIMATIONTYPE: + if (HIWORD(wParam) == CBN_SELCHANGE) + { + SaveCurrentValues(hwndDlg, g); + g->ThemeAdv.Effects.bMenuFade = SendDlgItemMessage(hwndDlg, IDC_EFFAPPEARANCE_ANIMATIONTYPE, CB_GETCURSEL, 0, 0); + UpdateControls(hwndDlg, g); + } + break; + + default: + return FALSE; + } + break; + + default: + return FALSE; + } + + return TRUE; +} Index: dll/cpl/desk/lang/bg-BG.rc =================================================================== --- dll/cpl/desk/lang/bg-BG.rc (revision 40249) +++ dll/cpl/desk/lang/bg-BG.rc (working copy) @@ -57,7 +57,8 @@ WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "", IDC_STATIC, 7, 140, 64, 9 COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 134, 90 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 + PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 + PUSHBUTTON "", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 @@ -98,6 +99,30 @@ DEFPUSHBUTTON "", IDOK, 137, 220, 50, 14 END +IDD_EFFAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 285, 185 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "Effects" +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, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 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, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + CONTROL "Us&e large icons",IDC_EFFAPPEARANCE_LARGEICONS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 285, 19 + CONTROL "Show sh&adows under menus",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19 + CONTROL "Show &window contents while dragging",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 110, 285, 19 + CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 285, 19 + PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 +END + IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "" @@ -155,6 +180,18 @@ END END +STRINGTABLE DISCARDABLE +BEGIN + IDS_SLIDEEFFECT "Slide effect" + IDS_FADEEFFECT "Fade effect" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STANDARDEFFECT "Standard" + IDS_CLEARTYPEEFFECT "ClearType" +END + STRINGTABLE BEGIN IDS_MULTIPLEMONITORS "( )" Index: dll/cpl/desk/lang/cs-CZ.rc =================================================================== --- dll/cpl/desk/lang/cs-CZ.rc (revision 40249) +++ dll/cpl/desk/lang/cs-CZ.rc (working copy) @@ -60,7 +60,8 @@ WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Poloka:", IDC_STATIC, 7, 159, 26, 9 COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Upesnit", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 + PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 + PUSHBUTTON "Upesnit", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 @@ -101,6 +102,30 @@ DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 END +IDD_EFFAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 285, 185 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "Effects" +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, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 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, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + CONTROL "Us&e large icons",IDC_EFFAPPEARANCE_LARGEICONS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 285, 19 + CONTROL "Show sh&adows under menus",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19 + CONTROL "Show &window contents while dragging",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 110, 285, 19 + CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 285, 19 + PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 +END + IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Nastaven" @@ -158,6 +183,18 @@ END END +STRINGTABLE DISCARDABLE +BEGIN + IDS_SLIDEEFFECT "Slide effect" + IDS_FADEEFFECT "Fade effect" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STANDARDEFFECT "Standard" + IDS_CLEARTYPEEFFECT "ClearType" +END + STRINGTABLE BEGIN IDS_MULTIPLEMONITORS "(Nkolik monitor)" Index: dll/cpl/desk/lang/de-DE.rc =================================================================== --- dll/cpl/desk/lang/de-DE.rc (revision 40249) +++ dll/cpl/desk/lang/de-DE.rc (working copy) @@ -53,7 +53,8 @@ WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Farbschema:", IDC_STATIC, 7, 140, 64, 7 COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 134, 90 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Erweitert", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 + PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 + PUSHBUTTON "Erweitert", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 @@ -94,6 +95,30 @@ DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 END +IDD_EFFAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 285, 185 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "Effects" +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, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 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, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + CONTROL "Us&e large icons",IDC_EFFAPPEARANCE_LARGEICONS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 285, 19 + CONTROL "Show sh&adows under menus",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19 + CONTROL "Show &window contents while dragging",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 110, 285, 19 + CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 285, 19 + PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 +END + IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Einstellungen" @@ -151,6 +176,18 @@ END END +STRINGTABLE DISCARDABLE +BEGIN + IDS_SLIDEEFFECT "Slide effect" + IDS_FADEEFFECT "Fade effect" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STANDARDEFFECT "Standard" + IDS_CLEARTYPEEFFECT "ClearType" +END + STRINGTABLE BEGIN IDS_MULTIPLEMONITORS "(Mehrere Monitore)" Index: dll/cpl/desk/lang/el-GR.rc =================================================================== --- dll/cpl/desk/lang/el-GR.rc (revision 40249) +++ dll/cpl/desk/lang/el-GR.rc (working copy) @@ -53,7 +53,8 @@ WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT " ", IDC_STATIC, 7, 140, 64, 7 COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON " ", IDC_APPEARANCE_ADVANCED, 178, 150, 68, 15 + PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 + PUSHBUTTON " ", IDC_APPEARANCE_ADVANCED, 178, 170, 68, 15 END IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 @@ -94,6 +95,30 @@ DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 END +IDD_EFFAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 285, 185 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "Effects" +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, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 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, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + CONTROL "Us&e large icons",IDC_EFFAPPEARANCE_LARGEICONS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 285, 19 + CONTROL "Show sh&adows under menus",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19 + CONTROL "Show &window contents while dragging",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 110, 285, 19 + CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 285, 19 + PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 +END + IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "" @@ -151,6 +176,18 @@ END END +STRINGTABLE DISCARDABLE +BEGIN + IDS_SLIDEEFFECT "Slide effect" + IDS_FADEEFFECT "Fade effect" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STANDARDEFFECT "Standard" + IDS_CLEARTYPEEFFECT "ClearType" +END + STRINGTABLE BEGIN IDS_MULTIPLEMONITORS "( )" Index: dll/cpl/desk/lang/en-US.rc =================================================================== --- dll/cpl/desk/lang/en-US.rc (revision 40249) +++ dll/cpl/desk/lang/en-US.rc (working copy) @@ -55,7 +55,8 @@ WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Colorscheme", IDC_STATIC, 7, 140, 64, 7 COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 134, 90 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Advanced", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 + PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 + PUSHBUTTON "Ad&vanced...", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 @@ -96,6 +97,30 @@ DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 END +IDD_EFFAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 285, 185 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "Effects" +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, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 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, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + CONTROL "Us&e large icons",IDC_EFFAPPEARANCE_LARGEICONS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 285, 19 + CONTROL "Show sh&adows under menus",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19 + CONTROL "Show &window contents while dragging",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 110, 285, 19 + CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 285, 19 + PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 +END + IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Settings" @@ -153,6 +178,18 @@ END END +STRINGTABLE DISCARDABLE +BEGIN + IDS_SLIDEEFFECT "Slide effect" + IDS_FADEEFFECT "Fade effect" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STANDARDEFFECT "Standard" + IDS_CLEARTYPEEFFECT "ClearType" +END + STRINGTABLE BEGIN IDS_MULTIPLEMONITORS "(Multiple Monitors)" Index: dll/cpl/desk/lang/es-ES.rc =================================================================== --- dll/cpl/desk/lang/es-ES.rc (revision 40249) +++ dll/cpl/desk/lang/es-ES.rc (working copy) @@ -61,7 +61,8 @@ WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Combinacin de colores", IDC_STATIC, 7, 140, 90, 7 //84 COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Avanzado", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 + PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 + PUSHBUTTON "Avanzado", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 @@ -102,6 +103,30 @@ DEFPUSHBUTTON "Aceptar", IDOK, 137, 220, 50, 14 END +IDD_EFFAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 285, 185 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "Effects" +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, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 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, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + CONTROL "Us&e large icons",IDC_EFFAPPEARANCE_LARGEICONS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 285, 19 + CONTROL "Show sh&adows under menus",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19 + CONTROL "Show &window contents while dragging",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 110, 285, 19 + CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 285, 19 + PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 +END + IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Configuracin" @@ -159,6 +184,18 @@ END END +STRINGTABLE DISCARDABLE +BEGIN + IDS_SLIDEEFFECT "Slide effect" + IDS_FADEEFFECT "Fade effect" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STANDARDEFFECT "Standard" + IDS_CLEARTYPEEFFECT "ClearType" +END + STRINGTABLE BEGIN IDS_MULTIPLEMONITORS "(Mltiples Monitores)" Index: dll/cpl/desk/lang/fr-FR.rc =================================================================== --- dll/cpl/desk/lang/fr-FR.rc (revision 40249) +++ dll/cpl/desk/lang/fr-FR.rc (working copy) @@ -56,7 +56,8 @@ WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Modle de couleurs", IDC_STATIC, 7, 140, 64, 7 COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Avanc", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 + PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 + PUSHBUTTON "Avanc", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 @@ -97,6 +98,30 @@ DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 END +IDD_EFFAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 285, 185 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "Effects" +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, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 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, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + CONTROL "Us&e large icons",IDC_EFFAPPEARANCE_LARGEICONS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 285, 19 + CONTROL "Show sh&adows under menus",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19 + CONTROL "Show &window contents while dragging",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 110, 285, 19 + CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 285, 19 + PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 +END + IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Paramtres" @@ -154,6 +179,18 @@ END END +STRINGTABLE DISCARDABLE +BEGIN + IDS_SLIDEEFFECT "Slide effect" + IDS_FADEEFFECT "Fade effect" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STANDARDEFFECT "Standard" + IDS_CLEARTYPEEFFECT "ClearType" +END + STRINGTABLE BEGIN IDS_MULTIPLEMONITORS "(Moniteurs multiples)" Index: dll/cpl/desk/lang/hu-HU.rc =================================================================== --- dll/cpl/desk/lang/hu-HU.rc (revision 40249) +++ dll/cpl/desk/lang/hu-HU.rc (working copy) @@ -54,7 +54,8 @@ WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Colorscheme", IDC_STATIC, 7, 140, 64, 7 COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Advanced", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 + PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 + PUSHBUTTON "Advanced", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 @@ -95,6 +96,30 @@ DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 END +IDD_EFFAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 285, 185 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "Effects" +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, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 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, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + CONTROL "Us&e large icons",IDC_EFFAPPEARANCE_LARGEICONS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 285, 19 + CONTROL "Show sh&adows under menus",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19 + CONTROL "Show &window contents while dragging",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 110, 285, 19 + CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 285, 19 + PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 +END + IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Belltsok" @@ -152,6 +177,18 @@ END END +STRINGTABLE DISCARDABLE +BEGIN + IDS_SLIDEEFFECT "Slide effect" + IDS_FADEEFFECT "Fade effect" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STANDARDEFFECT "Standard" + IDS_CLEARTYPEEFFECT "ClearType" +END + STRINGTABLE BEGIN IDS_MULTIPLEMONITORS "(Multiple Monitors)" Index: dll/cpl/desk/lang/id-ID.rc =================================================================== --- dll/cpl/desk/lang/id-ID.rc (revision 40249) +++ dll/cpl/desk/lang/id-ID.rc (working copy) @@ -53,7 +53,8 @@ WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "SkemaWarna", IDC_STATIC, 7, 140, 64, 7 COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 134, 90 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Lanjutan", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 + PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 + PUSHBUTTON "Lanjutan", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 @@ -94,6 +95,30 @@ DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 END +IDD_EFFAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 285, 185 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "Effects" +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, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 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, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + CONTROL "Us&e large icons",IDC_EFFAPPEARANCE_LARGEICONS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 285, 19 + CONTROL "Show sh&adows under menus",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19 + CONTROL "Show &window contents while dragging",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 110, 285, 19 + CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 285, 19 + PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 +END + IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Setelan" @@ -151,6 +176,18 @@ END END +STRINGTABLE DISCARDABLE +BEGIN + IDS_SLIDEEFFECT "Slide effect" + IDS_FADEEFFECT "Fade effect" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STANDARDEFFECT "Standard" + IDS_CLEARTYPEEFFECT "ClearType" +END + STRINGTABLE BEGIN IDS_MULTIPLEMONITORS "(Multiple Monitors)" Index: dll/cpl/desk/lang/it-IT.rc =================================================================== --- dll/cpl/desk/lang/it-IT.rc (revision 40249) +++ dll/cpl/desk/lang/it-IT.rc (working copy) @@ -53,7 +53,8 @@ WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Schema dei colori", IDC_STATIC, 7, 140, 64, 7 COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Avanzato", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 + PUSHBUTTON "&Effetti...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 + PUSHBUTTON "A&vanzato...", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 @@ -94,6 +95,30 @@ DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 END +IDD_EFFAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 285, 185 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "Effects" +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, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 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, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + CONTROL "Us&e large icons",IDC_EFFAPPEARANCE_LARGEICONS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 285, 19 + CONTROL "Show sh&adows under menus",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19 + CONTROL "Show &window contents while dragging",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 110, 285, 19 + CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 285, 19 + PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 +END + IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Impostazioni" @@ -151,6 +176,18 @@ END END +STRINGTABLE DISCARDABLE +BEGIN + IDS_SLIDEEFFECT "Slide effect" + IDS_FADEEFFECT "Fade effect" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STANDARDEFFECT "Standard" + IDS_CLEARTYPEEFFECT "ClearType" +END + STRINGTABLE BEGIN IDS_MULTIPLEMONITORS "(Monitor Multipli)" Index: dll/cpl/desk/lang/ja-JP.rc =================================================================== --- dll/cpl/desk/lang/ja-JP.rc (revision 40249) +++ dll/cpl/desk/lang/ja-JP.rc (working copy) @@ -53,7 +53,8 @@ WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Colorscheme", IDC_STATIC, 7, 140, 64, 7 COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Advanced", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 + PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 + PUSHBUTTON "Advanced", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 @@ -94,6 +95,30 @@ DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 END +IDD_EFFAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 285, 185 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "Effects" +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, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 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, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + CONTROL "Us&e large icons",IDC_EFFAPPEARANCE_LARGEICONS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 285, 19 + CONTROL "Show sh&adows under menus",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19 + CONTROL "Show &window contents while dragging",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 110, 285, 19 + CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 285, 19 + PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 +END + IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "ݒ" @@ -151,6 +176,18 @@ END END +STRINGTABLE DISCARDABLE +BEGIN + IDS_SLIDEEFFECT "Slide effect" + IDS_FADEEFFECT "Fade effect" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STANDARDEFFECT "Standard" + IDS_CLEARTYPEEFFECT "ClearType" +END + STRINGTABLE BEGIN IDS_MULTIPLEMONITORS "(Multiple Monitors)" Index: dll/cpl/desk/lang/nl-NL.rc =================================================================== --- dll/cpl/desk/lang/nl-NL.rc (revision 40249) +++ dll/cpl/desk/lang/nl-NL.rc (working copy) @@ -55,7 +55,8 @@ WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Kleurenschema:", IDC_STATIC, 7, 140, 64, 7 COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Geavan&ceerd", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 + PUSHBUTTON "&Effecten...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 + PUSHBUTTON "Geavan&ceerd...", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 @@ -96,6 +97,30 @@ DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 END +IDD_EFFAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 305, 185 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "Effecten" +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, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 90, 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, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + CONTROL "&Grote pictogrammen gebruiken",IDC_EFFAPPEARANCE_LARGEICONS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 285, 19 + CONTROL "Sch&aduw onder menu's weergeven",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19 + CONTROL "De in&houd van het venster tijdens het slepen weergeven",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 110, 285, 19 + CONTROL "Onderstreepte letters voor toetsenbordnavigatie &verbergen tot ALT wordt ingedrukt",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 285, 19 + PUSHBUTTON "Annuleren", IDCANCEL, 246, 165, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 192, 165, 50, 14 +END + IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Instellingen" @@ -153,6 +178,18 @@ END END +STRINGTABLE DISCARDABLE +BEGIN + IDS_SLIDEEFFECT "Overvloeien" + IDS_FADEEFFECT "Schuiven" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STANDARDEFFECT "Standaard" + IDS_CLEARTYPEEFFECT "ClearType" +END + STRINGTABLE BEGIN IDS_MULTIPLEMONITORS "(Multiple Monitors)" Index: dll/cpl/desk/lang/no-NO.rc =================================================================== --- dll/cpl/desk/lang/no-NO.rc (revision 40249) +++ dll/cpl/desk/lang/no-NO.rc (working copy) @@ -55,7 +55,8 @@ WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Fargevalg", IDC_STATIC, 7, 140, 64, 9 COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 134, 90 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Avansert", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 + PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 + PUSHBUTTON "Avansert", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 @@ -96,6 +97,30 @@ DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 END +IDD_EFFAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 285, 185 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "Effects" +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, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 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, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + CONTROL "Us&e large icons",IDC_EFFAPPEARANCE_LARGEICONS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 285, 19 + CONTROL "Show sh&adows under menus",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19 + CONTROL "Show &window contents while dragging",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 110, 285, 19 + CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 285, 19 + PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 +END + IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Innstillinger" @@ -153,6 +178,18 @@ END END +STRINGTABLE DISCARDABLE +BEGIN + IDS_SLIDEEFFECT "Slide effect" + IDS_FADEEFFECT "Fade effect" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STANDARDEFFECT "Standard" + IDS_CLEARTYPEEFFECT "ClearType" +END + STRINGTABLE BEGIN IDS_MULTIPLEMONITORS "(Sammensatt skjermer)" Index: dll/cpl/desk/lang/pl-PL.rc =================================================================== --- dll/cpl/desk/lang/pl-PL.rc (revision 40249) +++ dll/cpl/desk/lang/pl-PL.rc (working copy) @@ -63,7 +63,8 @@ WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Schemat kolorw", IDC_STATIC, 7, 140, 64, 7 COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Zaawansowane", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 + PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 + PUSHBUTTON "Zaawansowane", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 @@ -104,6 +105,30 @@ DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 END +IDD_EFFAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 285, 185 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "Effects" +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, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 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, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + CONTROL "Us&e large icons",IDC_EFFAPPEARANCE_LARGEICONS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 285, 19 + CONTROL "Show sh&adows under menus",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19 + CONTROL "Show &window contents while dragging",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 110, 285, 19 + CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 285, 19 + PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 +END + IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Ustawienia" @@ -161,6 +186,18 @@ END END +STRINGTABLE DISCARDABLE +BEGIN + IDS_SLIDEEFFECT "Slide effect" + IDS_FADEEFFECT "Fade effect" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STANDARDEFFECT "Standard" + IDS_CLEARTYPEEFFECT "ClearType" +END + STRINGTABLE BEGIN IDS_MULTIPLEMONITORS "(Kilka Monitorw)" Index: dll/cpl/desk/lang/ru-RU.rc =================================================================== --- dll/cpl/desk/lang/ru-RU.rc (revision 40249) +++ dll/cpl/desk/lang/ru-RU.rc (working copy) @@ -53,7 +53,8 @@ WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT " :", IDC_STATIC, 7, 139, 154, 10 COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 155, 200 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "", IDC_APPEARANCE_ADVANCED, 168, 150, 70, 14 + PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 + PUSHBUTTON "", IDC_APPEARANCE_ADVANCED, 168, 170, 70, 14 END IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 @@ -94,6 +95,30 @@ DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 END +IDD_EFFAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 285, 185 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "Effects" +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, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 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, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + CONTROL "Us&e large icons",IDC_EFFAPPEARANCE_LARGEICONS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 285, 19 + CONTROL "Show sh&adows under menus",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19 + CONTROL "Show &window contents while dragging",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 110, 285, 19 + CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 285, 19 + PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 +END + IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 249, 197 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "" @@ -151,6 +176,18 @@ END END +STRINGTABLE DISCARDABLE +BEGIN + IDS_SLIDEEFFECT "Slide effect" + IDS_FADEEFFECT "Fade effect" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STANDARDEFFECT "Standard" + IDS_CLEARTYPEEFFECT "ClearType" +END + STRINGTABLE BEGIN IDS_MULTIPLEMONITORS "( )" Index: dll/cpl/desk/lang/sk-SK.rc =================================================================== --- dll/cpl/desk/lang/sk-SK.rc (revision 40249) +++ dll/cpl/desk/lang/sk-SK.rc (working copy) @@ -63,7 +63,8 @@ WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "&Farebn schma:", IDC_STATIC, 7, 140, 64, 7 COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 134, 90 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Spresni", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 + PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 + PUSHBUTTON "&Spresni", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 @@ -104,6 +105,30 @@ DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 END +IDD_EFFAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 285, 185 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "Effects" +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, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 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, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + CONTROL "Us&e large icons",IDC_EFFAPPEARANCE_LARGEICONS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 285, 19 + CONTROL "Show sh&adows under menus",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19 + CONTROL "Show &window contents while dragging",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 110, 285, 19 + CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 285, 19 + PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 +END + IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Nastavenie" @@ -161,6 +186,18 @@ END END +STRINGTABLE DISCARDABLE +BEGIN + IDS_SLIDEEFFECT "Slide effect" + IDS_FADEEFFECT "Fade effect" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STANDARDEFFECT "Standard" + IDS_CLEARTYPEEFFECT "ClearType" +END + STRINGTABLE BEGIN IDS_MULTIPLEMONITORS "(Viacero monitorov)" Index: dll/cpl/desk/lang/sv-SE.rc =================================================================== --- dll/cpl/desk/lang/sv-SE.rc (revision 40249) +++ dll/cpl/desk/lang/sv-SE.rc (working copy) @@ -56,7 +56,8 @@ WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Item:", IDC_STATIC, 7, 159, 26, 9 COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Advanced", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 + PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 + PUSHBUTTON "Advanced", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 @@ -97,6 +98,30 @@ DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 END +IDD_EFFAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 285, 185 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "Effects" +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, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 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, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + CONTROL "Us&e large icons",IDC_EFFAPPEARANCE_LARGEICONS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 285, 19 + CONTROL "Show sh&adows under menus",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19 + CONTROL "Show &window contents while dragging",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 110, 285, 19 + CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 285, 19 + PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 +END + IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Instllningar" @@ -154,6 +179,18 @@ END END +STRINGTABLE DISCARDABLE +BEGIN + IDS_SLIDEEFFECT "Slide effect" + IDS_FADEEFFECT "Fade effect" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STANDARDEFFECT "Standard" + IDS_CLEARTYPEEFFECT "ClearType" +END + STRINGTABLE BEGIN IDS_MULTIPLEMONITORS "(Multiple Monitors)" Index: dll/cpl/desk/lang/uk-UA.rc =================================================================== --- dll/cpl/desk/lang/uk-UA.rc (revision 40249) +++ dll/cpl/desk/lang/uk-UA.rc (working copy) @@ -61,7 +61,8 @@ WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT " ", IDC_STATIC, 7, 140, 64, 7 COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 + PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 + PUSHBUTTON "", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 @@ -102,6 +103,30 @@ DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 END +IDD_EFFAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 285, 185 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "Effects" +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, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 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, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + CONTROL "Us&e large icons",IDC_EFFAPPEARANCE_LARGEICONS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 285, 19 + CONTROL "Show sh&adows under menus",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19 + CONTROL "Show &window contents while dragging",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 110, 285, 19 + CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 285, 19 + PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 +END + IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "" @@ -159,6 +184,18 @@ END END +STRINGTABLE DISCARDABLE +BEGIN + IDS_SLIDEEFFECT "Slide effect" + IDS_FADEEFFECT "Fade effect" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STANDARDEFFECT "Standard" + IDS_CLEARTYPEEFFECT "ClearType" +END + STRINGTABLE BEGIN IDS_MULTIPLEMONITORS "( )" Index: dll/cpl/desk/lang/zh-CN.rc =================================================================== --- dll/cpl/desk/lang/zh-CN.rc (revision 40249) +++ dll/cpl/desk/lang/zh-CN.rc (working copy) @@ -61,7 +61,8 @@ WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "ɫʷ:", IDC_STATIC, 7, 140, 64, 7 COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 134, 90 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "߼", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 + PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 + PUSHBUTTON "߼", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 @@ -102,6 +103,30 @@ DEFPUSHBUTTON "ȷ", IDOK, 137, 220, 50, 14 END +IDD_EFFAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 285, 185 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "Effects" +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, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 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, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + CONTROL "Us&e large icons",IDC_EFFAPPEARANCE_LARGEICONS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 285, 19 + CONTROL "Show sh&adows under menus",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19 + CONTROL "Show &window contents while dragging",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 110, 285, 19 + CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 285, 19 + PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 +END + IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "" @@ -159,6 +184,18 @@ END END +STRINGTABLE DISCARDABLE +BEGIN + IDS_SLIDEEFFECT "Slide effect" + IDS_FADEEFFECT "Fade effect" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STANDARDEFFECT "Standard" + IDS_CLEARTYPEEFFECT "ClearType" +END + STRINGTABLE BEGIN IDS_MULTIPLEMONITORS "()" Index: dll/cpl/desk/resource.h =================================================================== --- dll/cpl/desk/resource.h (revision 40249) +++ dll/cpl/desk/resource.h (working copy) @@ -23,6 +23,7 @@ #define IDD_APPEARANCE 102 #define IDD_SETTINGS 103 #define IDD_ADVAPPEARANCE 104 +#define IDD_EFFAPPEARANCE 105 #define IDD_ADVANCED_GENERAL 200 /* Background Page */ @@ -162,6 +163,22 @@ #define IDS_APPLY_FAILED 3500 #define IDS_APPLY_NEEDS_RESTART 3501 +/* Effects Appearance Dialog */ +#define IDC_EFFAPPEARANCE_KEYBOARDCUES 3601 +#define IDC_EFFAPPEARANCE_ANIMATION 3602 +#define IDC_EFFAPPEARANCE_ANIMATIONTYPE 3603 +#define IDC_EFFAPPEARANCE_SMOOTHING 3604 +#define IDC_EFFAPPEARANCE_SMOOTHINGTYPE 3605 +#define IDC_EFFAPPEARANCE_LARGEICONS 3606 +#define IDC_EFFAPPEARANCE_SETDROPSHADOW 3607 +#define IDC_EFFAPPEARANCE_DRAGFULLWINDOWS 3608 + +#define IDS_SLIDEEFFECT 3701 +#define IDS_FADEEFFECT 3702 + +#define IDS_STANDARDEFFECT 3711 +#define IDS_CLEARTYPEEFFECT 3712 + /* Advanced General Dialog */ #define IDC_FONTSIZE_COMBO 5000 #define IDC_FONTSIZE_COSTOM 5001 Index: dll/win32/user32/windows/defwnd.c =================================================================== --- dll/win32/user32/windows/defwnd.c (revision 40249) +++ dll/win32/user32/windows/defwnd.c (working copy) @@ -1394,18 +1394,20 @@ { if (HIWORD(lParam) & KEYDATA_ALT) { + HWND top = GetAncestor(hWnd, GA_ROOT); /* if( HIWORD(lParam) & ~KEYDATA_PREVSTATE ) */ if ( (wParam == VK_MENU || wParam == VK_LMENU - || wParam == VK_RMENU) && !iMenuSysKey ) + || wParam == VK_RMENU) && !iMenuSysKey ) { iMenuSysKey = 1; - else + /* mimic behaviour of XP, sending a WM_SYSCOMMAND when pressing */ + SendMessageW( top, WM_SYSCOMMAND, SC_KEYMENU, 0L ); + } else iMenuSysKey = 0; iF10Key = 0; if (wParam == VK_F4) /* Try to close the window */ { - HWND top = GetAncestor(hWnd, GA_ROOT); if (!(GetClassLongW(top, GCL_STYLE) & CS_NOCLOSE)) { if (bUnicode) @@ -1629,7 +1631,7 @@ case WM_CHANGEUISTATE: { - BOOL AlwaysShowCues = TRUE; + BOOL AlwaysShowCues = FALSE; WORD Action = LOWORD(wParam); WORD Flags = HIWORD(wParam); PWINDOW Wnd; @@ -1711,7 +1713,7 @@ case WM_UPDATEUISTATE: { BOOL Change = TRUE; - BOOL AlwaysShowCues = TRUE; + BOOL AlwaysShowCues = FALSE; WORD Action = LOWORD(wParam); WORD Flags = HIWORD(wParam); PWINDOW Wnd; Index: dll/win32/user32/windows/dialog.c =================================================================== --- dll/win32/user32/windows/dialog.c (revision 40249) +++ dll/win32/user32/windows/dialog.c (working copy) @@ -2408,6 +2408,13 @@ if (lpMsg->lParam & (1 << 29)) SendMessageW(hDlg, WM_CHANGEUISTATE, MAKEWPARAM(UIS_CLEAR, UISF_HIDEACCEL | UISF_HIDEFOCUS), 0); break; + + case WM_SYSCOMMAND: + /* If the ALT key is being pressed display the keyboard cues */ + if (lpMsg->wParam == SC_KEYMENU) { + SendMessageW(hDlg, WM_CHANGEUISTATE, MAKEWPARAM(UIS_CLEAR, UISF_HIDEACCEL | UISF_HIDEFOCUS), 0); + } + break; } TranslateMessage( lpMsg ); Index: include/reactos/win32k/ntusrtyp.h =================================================================== --- include/reactos/win32k/ntusrtyp.h (revision 40249) +++ include/reactos/win32k/ntusrtyp.h (working copy) @@ -21,6 +21,27 @@ HBRUSH hBrush; } PATRECT, * PPATRECT; +/* Bitfields for UserpreferencesMask SPI_ values (with defaults) */ +/* See also http://technet.microsoft.com/nl-nl/library/cc957204(en-us).aspx */ +typedef struct { + DWORD bActiveWindowTracking:1; //0 SPI_GETACTIVEWINDOWTRACKING + DWORD bMenuAnimation:1; //1 SPI_GETMENUANIMATION + DWORD bComboBoxAnimation:1; //1 SPI_GETCOMBOBOXANIMATION + DWORD bListBoxSmoothScrolling:1; //1 SPI_GETLISTBOXSMOOTHSCROLLING + DWORD bGradientCaptions:1; //1 SPI_GETGRADIENTCAPTIONS + DWORD bKeyboardCues:1; //0 SPI_GETKEYBOARDCUES + DWORD bActiveWndTrkZorder:1; //0 SPI_GETACTIVEWNDTRKZORDER + DWORD bHotTracking:1; //1 SPI_GETHOTTRACKING + DWORD bReserved1:1; //0 Reserved + DWORD bMenuFade:1; //1 SPI_GETMENUFADE + DWORD bSelectionFade:1; //1 SPI_GETSELECTIONFADE + DWORD bTooltipAnimation:1; //1 SPI_GETTOOLTIPANIMATION + DWORD bTooltipFade:1; //1 SPI_GETTOOLTIPFADE + DWORD bCursorShadow:1; //1 SPI_GETCURSORSHADOW + DWORD bReserved2:17; //0 Reserved + DWORD bUiEffects:1; //1 SPI_GETUIEFFECTS +} USERPREFERENCESMASK, *PUSERPREFERENCESMASK; + /* Structures for reading icon/cursor files and resources */ #pragma pack(push,1) typedef struct _ICONIMAGE Index: subsystems/win32/win32k/include/winsta.h =================================================================== --- subsystems/win32/win32k/include/winsta.h (revision 40249) +++ subsystems/win32/win32k/include/winsta.h (working copy) @@ -34,7 +34,15 @@ HANDLE ShellWindow; HANDLE ShellListView; + /* Effects */ + BOOL FontSmoothing; /* enable */ + UINT FontSmoothingType; /* 1:Standard,2:ClearType */ + /* FIXME: Big Icons (SPI_GETICONMETRICS?) */ + BOOL DropShadow; + BOOL DragFullWindows; BOOL FlatMenu; + USERPREFERENCESMASK UserPreferences; + /* ScreenSaver */ BOOL ScreenSaverRunning; UINT ScreenSaverTimeOut; Index: subsystems/win32/win32k/ntuser/sysparams.c =================================================================== --- subsystems/win32/win32k/ntuser/sysparams.c (revision 40249) +++ subsystems/win32/win32k/ntuser/sysparams.c (working copy) @@ -13,6 +13,7 @@ #define NDEBUG #include +#include VOID FASTCALL IntGetFontMetricSetting(LPWSTR lpValueName, PLOGFONTW font) @@ -45,8 +46,12 @@ } } -VOID -IntWriteSystemParametersSettings(PUNICODE_STRING SubKeyName, PUNICODE_STRING KeyName, ULONG Type, PVOID Data, ULONG DataSize) +static NTSTATUS FASTCALL +IntWriteSystemParametersSettings(PUNICODE_STRING SubKeyName, + PUNICODE_STRING KeyName, + ULONG Type, + PVOID Data, + ULONG DataSize) { UNICODE_STRING KeyPath; NTSTATUS Status; @@ -56,14 +61,14 @@ /* Get a handle to the current users settings */ Status = RtlFormatCurrentUserKeyPath(&KeyPath); if(!NT_SUCCESS(Status)) - return; + return Status; InitializeObjectAttributes(&ObjectAttributes, &KeyPath, OBJ_CASE_INSENSITIVE, NULL, NULL); /* Open the HKCU key */ Status = ZwOpenKey(&CurrentUserKey, KEY_WRITE, &ObjectAttributes); RtlFreeUnicodeString(&KeyPath); if(!NT_SUCCESS(Status)) - return; + return Status; /* Open up the settings to read the values */ @@ -76,10 +81,90 @@ ZwSetValueKey(KeyHandle, KeyName, 0, Type, Data, DataSize); ZwClose(KeyHandle); } + return Status; } +#if 0 +/* not used at the moment */ +/* FIXME: currently only supporting known DataSize */ +static NTSTATUS FASTCALL +IntReadSystemParametersSettings(PUNICODE_STRING SubKeyName, + PUNICODE_STRING KeyName, + ULONG Type, + PVOID Data, + ULONG DataSize) +{ + UNICODE_STRING KeyPath; + ULONG Length, ReqLength; + NTSTATUS Status; + HANDLE CurrentUserKey, KeyHandle; + OBJECT_ATTRIBUTES KeyAttributes, ObjectAttributes; + PKEY_VALUE_PARTIAL_INFORMATION KeyValuePartialInfo; + /* Get a handle to the current users settings */ + Status = RtlFormatCurrentUserKeyPath(&KeyPath); + if(!NT_SUCCESS(Status)) { + return Status; + } + InitializeObjectAttributes(&ObjectAttributes, &KeyPath, OBJ_CASE_INSENSITIVE, NULL, NULL); + /* Open the HKCU key */ + Status = ZwOpenKey(&CurrentUserKey, KEY_READ, &ObjectAttributes); + if(!NT_SUCCESS(Status)) { + RtlFreeUnicodeString(&KeyPath); + return Status; + } + RtlFreeUnicodeString(&KeyPath); + + /* Open up the settings to read the values */ + InitializeObjectAttributes(&KeyAttributes, SubKeyName, OBJ_CASE_INSENSITIVE, CurrentUserKey, NULL); + Status = ZwOpenKey(&KeyHandle, KEY_READ, &KeyAttributes); + ZwClose(CurrentUserKey); + RtlFreeUnicodeString(&KeyPath); + if(!NT_SUCCESS(Status)) { + return Status; + } + + Length = sizeof(KEY_VALUE_PARTIAL_INFORMATION)+DataSize; + KeyValuePartialInfo = ExAllocatePoolWithTag(PagedPool, Length, TAG_WINSTA); + if(KeyValuePartialInfo) { + Status = ZwQueryValueKey(KeyHandle, KeyName, KeyValuePartialInformation, (PVOID)KeyValuePartialInfo, Length, &ReqLength); + if(NT_SUCCESS(Status)) { + RtlCopyMemory(Data, KeyValuePartialInfo->Data, DataSize); + } else { + } + ExFreePoolWithTag(KeyValuePartialInfo, TAG_WINSTA); + } else { + Status = STATUS_INSUFFICIENT_RESOURCES; + } + ZwClose(KeyHandle); + + return Status; +} +#endif + +static ULONG FASTCALL +IntUpdateUserPreferencesMask(PWINSTATION_OBJECT WinStaObject, UINT fWinIni) +{ + NTSTATUS Status = STATUS_SUCCESS; + UNICODE_STRING SubKeyName = RTL_CONSTANT_STRING(L"Control Panel\\Desktop"); + UNICODE_STRING UserPreferencesMask = RTL_CONSTANT_STRING(L"UserPreferencesMask"); + + if (fWinIni & SPIF_UPDATEINIFILE) { + Status = IntWriteSystemParametersSettings( + &SubKeyName, + &UserPreferencesMask, + REG_BINARY, + &WinStaObject->UserPreferences, + sizeof(USERPREFERENCESMASK)); + if(!NT_SUCCESS(Status)) + { + DPRINT1("Registry update of UserPreferencesMask failed (%0X)\n",Status); + } + } + return Status; +} + ULONG FASTCALL IntSystemParametersInfo( UINT uiAction, @@ -147,13 +232,11 @@ *(PBOOL)pvParam = FALSE; break; - - - case SPI_GETKEYBOARDCUES: - /* FIXME: Implement this, don't just return constant */ - *(PBOOL)pvParam = FALSE; - break; - + case SPI_SETKEYBOARDCUES: + case SPI_SETMENUANIMATION: + case SPI_SETMENUFADE: + case SPI_SETTOOLTIPANIMATION: + case SPI_SETTOOLTIPFADE: case SPI_SETDOUBLECLKWIDTH: case SPI_SETDOUBLECLKHEIGHT: case SPI_SETDOUBLECLICKTIME: @@ -169,6 +252,11 @@ case SPI_SETMOUSEBUTTONSWAP: /* We will change something, so set the flag here */ bChanged = TRUE; + case SPI_GETKEYBOARDCUES: + case SPI_GETMENUANIMATION: + case SPI_GETMENUFADE: + case SPI_GETTOOLTIPANIMATION: + case SPI_GETTOOLTIPFADE: case SPI_GETDESKWALLPAPER: case SPI_GETWHEELSCROLLLINES: case SPI_GETWHEELSCROLLCHARS: @@ -198,7 +286,44 @@ { case SPI_GETKEYBOARDCUES: ASSERT(pvParam); - *((BOOL*)pvParam) = TRUE; + *((BOOL*)pvParam) = (BOOL)WinStaObject->UserPreferences.bKeyboardCues; + break; + case SPI_GETMENUANIMATION: + ASSERT(pvParam); + *((BOOL*)pvParam) = (BOOL)WinStaObject->UserPreferences.bMenuAnimation; + break; + case SPI_GETMENUFADE: + ASSERT(pvParam); + *((BOOL*)pvParam) = (BOOL)WinStaObject->UserPreferences.bMenuFade; + break; + case SPI_GETTOOLTIPANIMATION: + ASSERT(pvParam); + *((BOOL*)pvParam) = (BOOL)WinStaObject->UserPreferences.bTooltipAnimation; + break; + case SPI_GETTOOLTIPFADE: + ASSERT(pvParam); + *((BOOL*)pvParam) = (BOOL)WinStaObject->UserPreferences.bTooltipFade; + break; + case SPI_SETKEYBOARDCUES: + WinStaObject->UserPreferences.bKeyboardCues = (BOOL)pvParam; + IntUpdateUserPreferencesMask(WinStaObject,fWinIni); + break; + case SPI_SETMENUANIMATION: + WinStaObject->UserPreferences.bMenuAnimation = (BOOL)pvParam; + IntUpdateUserPreferencesMask(WinStaObject,fWinIni); + break; + case SPI_SETMENUFADE: + WinStaObject->UserPreferences.bMenuFade = (BOOL)pvParam; + IntUpdateUserPreferencesMask(WinStaObject,fWinIni); + break; + case SPI_SETTOOLTIPANIMATION: + WinStaObject->UserPreferences.bTooltipAnimation = (BOOL)pvParam; + IntUpdateUserPreferencesMask(WinStaObject,fWinIni); + break; + case SPI_SETTOOLTIPFADE: + WinStaObject->UserPreferences.bTooltipFade = (BOOL)pvParam; + IntUpdateUserPreferencesMask(WinStaObject,fWinIni); + break; case SPI_GETFLATMENU: ASSERT(pvParam); *((UINT*)pvParam) = WinStaObject->FlatMenu; Index: subsystems/win32/win32k/ntuser/winsta.c =================================================================== --- subsystems/win32/win32k/ntuser/winsta.c (revision 40249) +++ subsystems/win32/win32k/ntuser/winsta.c (working copy) @@ -556,6 +556,21 @@ WindowStationObject->ScreenSaverActive = FALSE; WindowStationObject->ScreenSaverTimeOut = 10; WindowStationObject->SystemCursor = CurInfo; + + RtlZeroMemory(&WindowStationObject->UserPreferences, sizeof(USERPREFERENCESMASK)); + /* Set all fields with default value = 1 : */ + WindowStationObject->UserPreferences.bMenuAnimation = 1; + WindowStationObject->UserPreferences.bComboBoxAnimation = 1; + WindowStationObject->UserPreferences.bListBoxSmoothScrolling = 1; + WindowStationObject->UserPreferences.bGradientCaptions = 1; + WindowStationObject->UserPreferences.bHotTracking = 1; + WindowStationObject->UserPreferences.bMenuFade = 1; + WindowStationObject->UserPreferences.bSelectionFade = 1; + WindowStationObject->UserPreferences.bMenuFade = 1; + WindowStationObject->UserPreferences.bTooltipAnimation = 1; + WindowStationObject->UserPreferences.bTooltipFade = 1; + WindowStationObject->UserPreferences.bCursorShadow = 1; + WindowStationObject->UserPreferences.bUiEffects = 1; /* END FIXME loading from register */