[ros-diffs] [gedmurphy] 40299: - Show the underline menu cues when pressing the alt key - Load user preferences on userinit - Add the effects dialog to desk.cpl - Patch by Jan Roeloffzen (jroeloffzen[at]hotmail[dot]com) - Quickly reviewed by Thomas and I, applied a few bug fixes to the patch See issue #3901 for more details.
gedmurphy at svn.reactos.org
gedmurphy at svn.reactos.org
Mon Mar 30 23:21:43 CEST 2009
Author: gedmurphy
Date: Tue Mar 31 01:21:41 2009
New Revision: 40299
URL: http://svn.reactos.org/svn/reactos?rev=40299&view=rev
Log:
- Show the underline menu cues when pressing the alt key
- Load user preferences on userinit
- Add the effects dialog to desk.cpl
- Patch by Jan Roeloffzen (jroeloffzen[at]hotmail[dot]com)
- Quickly reviewed by Thomas and I, applied a few bug fixes to the patch
See issue #3901 for more details.
Added:
trunk/reactos/dll/cpl/desk/effappdlg.c (with props)
Modified:
trunk/reactos/base/system/userinit/userinit.c
trunk/reactos/dll/cpl/desk/appearance.c
trunk/reactos/dll/cpl/desk/appearance.h
trunk/reactos/dll/cpl/desk/desk.rbuild
trunk/reactos/dll/cpl/desk/lang/bg-BG.rc
trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc
trunk/reactos/dll/cpl/desk/lang/de-DE.rc
trunk/reactos/dll/cpl/desk/lang/el-GR.rc
trunk/reactos/dll/cpl/desk/lang/en-US.rc
trunk/reactos/dll/cpl/desk/lang/es-ES.rc
trunk/reactos/dll/cpl/desk/lang/fr-FR.rc
trunk/reactos/dll/cpl/desk/lang/hu-HU.rc
trunk/reactos/dll/cpl/desk/lang/id-ID.rc
trunk/reactos/dll/cpl/desk/lang/it-IT.rc
trunk/reactos/dll/cpl/desk/lang/ja-JP.rc
trunk/reactos/dll/cpl/desk/lang/nl-NL.rc
trunk/reactos/dll/cpl/desk/lang/no-NO.rc
trunk/reactos/dll/cpl/desk/lang/pl-PL.rc
trunk/reactos/dll/cpl/desk/lang/ru-RU.rc
trunk/reactos/dll/cpl/desk/lang/sk-SK.rc
trunk/reactos/dll/cpl/desk/lang/sv-SE.rc
trunk/reactos/dll/cpl/desk/lang/uk-UA.rc
trunk/reactos/dll/cpl/desk/lang/zh-CN.rc
trunk/reactos/dll/cpl/desk/resource.h
trunk/reactos/dll/win32/user32/windows/defwnd.c
trunk/reactos/dll/win32/user32/windows/dialog.c
trunk/reactos/include/reactos/win32k/ntusrtyp.h
trunk/reactos/subsystems/win32/win32k/include/winsta.h
trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c
trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c
Modified: trunk/reactos/base/system/userinit/userinit.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/userinit.c?rev=40299&r1=40298&r2=40299&view=diff
==============================================================================
--- trunk/reactos/base/system/userinit/userinit.c [iso-8859-1] (original)
+++ trunk/reactos/base/system/userinit/userinit.c [iso-8859-1] Tue Mar 31 01:21:41 2009
@@ -30,6 +30,7 @@
#include <shlwapi.h>
#include "resource.h"
#include <wine/debug.h>
+#include <win32k/ntusrtyp.h>
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);
Modified: trunk/reactos/dll/cpl/desk/appearance.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/appearance.c?rev=40299&r1=40298&r2=40299&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/desk/appearance.c [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/appearance.c [iso-8859-1] Tue Mar 31 01:21:41 2009
@@ -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,6 +219,12 @@
return Ret;
}
+static VOID
+_UpdateUserPref(UINT SpiGet,UINT SpiSet,BOOL *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 +352,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 +502,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);
Modified: trunk/reactos/dll/cpl/desk/appearance.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/appearance.h?rev=40299&r1=40298&r2=40299&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/desk/appearance.h [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/appearance.h [iso-8859-1] Tue Mar 31 01:21:41 2009
@@ -30,6 +30,28 @@
#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];
@@ -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);
Modified: trunk/reactos/dll/cpl/desk/desk.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.rbuild?rev=40299&r1=40298&r2=40299&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/desk/desk.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/desk.rbuild [iso-8859-1] Tue Mar 31 01:21:41 2009
@@ -27,6 +27,7 @@
<file>preview.c</file>
<file>screensaver.c</file>
<file>advappdlg.c</file>
+ <file>effappdlg.c</file>
<file>settings.c</file>
<file>monslctl.c</file>
<file>general.c</file>
Added: trunk/reactos/dll/cpl/desk/effappdlg.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/effappdlg.c?rev=40299&view=auto
==============================================================================
--- trunk/reactos/dll/cpl/desk/effappdlg.c (added)
+++ trunk/reactos/dll/cpl/desk/effappdlg.c [iso-8859-1] Tue Mar 31 01:21:41 2009
@@ -1,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, 80);
+ 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;
+}
Propchange: trunk/reactos/dll/cpl/desk/effappdlg.c
------------------------------------------------------------------------------
svn:eol-style = native
Modified: trunk/reactos/dll/cpl/desk/lang/bg-BG.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/bg-BG.rc?rev=40299&r1=40298&r2=40299&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/desk/lang/bg-BG.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/lang/bg-BG.rc [iso-8859-1] Tue Mar 31 01:21:41 2009
@@ -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
@@ -96,6 +97,30 @@
PUSHBUTTON "Îòêàç", IDCANCEL, 191, 220, 50, 14
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
@@ -153,6 +178,18 @@
MENUITEM "&Ðàçïîçíàâàíå", ID_MENU_IDENTIFY
MENUITEM "&Ñâîéñòâà", ID_MENU_PROPERTIES
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
Modified: trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc?rev=40299&r1=40298&r2=40299&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc [iso-8859-1] Tue Mar 31 01:21:41 2009
@@ -60,7 +60,8 @@
WS_VISIBLE | WS_BORDER, 7, 7, 232, 120
LTEXT "Položka:", IDC_STATIC, 7, 159, 26, 9
COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
- PUSHBUTTON "Upøesnit", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15
+ PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15
+ PUSHBUTTON "Upøesnit", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15
END
IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239
@@ -99,6 +100,30 @@
PUSHBUTTON "Storno", IDCANCEL, 191, 220, 50, 14
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
@@ -156,6 +181,18 @@
MENUITEM "&Identifikovat", ID_MENU_IDENTIFY
MENUITEM "&Vlastnosti", ID_MENU_PROPERTIES
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
Modified: trunk/reactos/dll/cpl/desk/lang/de-DE.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/de-DE.rc?rev=40299&r1=40298&r2=40299&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/desk/lang/de-DE.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/lang/de-DE.rc [iso-8859-1] Tue Mar 31 01:21:41 2009
@@ -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
@@ -92,6 +93,30 @@
PUSHBUTTON "Abbrechen", IDCANCEL, 191, 220, 50, 14
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
@@ -149,6 +174,18 @@
MENUITEM "&Identifizieren", ID_MENU_IDENTIFY
MENUITEM "&Eigenschaften", ID_MENU_PROPERTIES
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
Modified: trunk/reactos/dll/cpl/desk/lang/el-GR.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/el-GR.rc?rev=40299&r1=40298&r2=40299&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/desk/lang/el-GR.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/lang/el-GR.rc [iso-8859-1] Tue Mar 31 01:21:41 2009
@@ -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
@@ -92,6 +93,30 @@
PUSHBUTTON "¢êõñï", IDCANCEL, 191, 220, 50, 14
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
@@ -149,6 +174,18 @@
MENUITEM "&Áíáãíþñçóç", ID_MENU_IDENTIFY
MENUITEM "Éäéüôçôåò", ID_MENU_PROPERTIES
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
Modified: trunk/reactos/dll/cpl/desk/lang/en-US.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/en-US.rc?rev=40299&r1=40298&r2=40299&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/desk/lang/en-US.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/lang/en-US.rc [iso-8859-1] Tue Mar 31 01:21:41 2009
@@ -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
@@ -94,6 +95,30 @@
PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14
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
@@ -151,6 +176,18 @@
MENUITEM "&Identify", ID_MENU_IDENTIFY
MENUITEM "P&roperties", ID_MENU_PROPERTIES
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
Modified: trunk/reactos/dll/cpl/desk/lang/es-ES.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/es-ES.rc?rev=40299&r1=40298&r2=40299&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/desk/lang/es-ES.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/lang/es-ES.rc [iso-8859-1] Tue Mar 31 01:21:41 2009
@@ -61,7 +61,8 @@
WS_VISIBLE | WS_BORDER, 7, 7, 232, 120
LTEXT "Combinación 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
@@ -100,6 +101,30 @@
PUSHBUTTON "Cancelar", IDCANCEL, 191, 220, 50, 14
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
@@ -157,6 +182,18 @@
MENUITEM "&Identificar", ID_MENU_IDENTIFY
MENUITEM "P&ropiedades", ID_MENU_PROPERTIES
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
Modified: trunk/reactos/dll/cpl/desk/lang/fr-FR.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/fr-FR.rc?rev=40299&r1=40298&r2=40299&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/desk/lang/fr-FR.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/lang/fr-FR.rc [iso-8859-1] Tue Mar 31 01:21:41 2009
@@ -56,7 +56,8 @@
WS_VISIBLE | WS_BORDER, 7, 7, 232, 120
LTEXT "Modèle 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
@@ -95,6 +96,30 @@
PUSHBUTTON "Annuler", IDCANCEL, 191, 220, 50, 14
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
@@ -152,6 +177,18 @@
MENUITEM "&Identifier", ID_MENU_IDENTIFY
MENUITEM "P&ropriétés", ID_MENU_PROPERTIES
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
Modified: trunk/reactos/dll/cpl/desk/lang/hu-HU.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/hu-HU.rc?rev=40299&r1=40298&r2=40299&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/desk/lang/hu-HU.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/lang/hu-HU.rc [iso-8859-1] Tue Mar 31 01:21:41 2009
@@ -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
@@ -93,6 +94,30 @@
PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14
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
@@ -150,6 +175,18 @@
MENUITEM "&Identify", ID_MENU_IDENTIFY
MENUITEM "P&roperties", ID_MENU_PROPERTIES
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
Modified: trunk/reactos/dll/cpl/desk/lang/id-ID.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/id-ID.rc?rev=40299&r1=40298&r2=40299&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/desk/lang/id-ID.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/lang/id-ID.rc [iso-8859-1] Tue Mar 31 01:21:41 2009
@@ -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
@@ -92,6 +93,30 @@
PUSHBUTTON "Batal", IDCANCEL, 191, 220, 50, 14
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
@@ -149,6 +174,18 @@
MENUITEM "&Identify", ID_MENU_IDENTIFY
MENUITEM "P&roperties", ID_MENU_PROPERTIES
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
Modified: trunk/reactos/dll/cpl/desk/lang/it-IT.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/it-IT.rc?rev=40299&r1=40298&r2=40299&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/desk/lang/it-IT.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/lang/it-IT.rc [iso-8859-1] Tue Mar 31 01:21:41 2009
@@ -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
@@ -92,6 +93,30 @@
PUSHBUTTON "Annulla", IDCANCEL, 191, 220, 50, 14
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
@@ -149,6 +174,18 @@
MENUITEM "&Identifica", ID_MENU_IDENTIFY
MENUITEM "P&roprietà", ID_MENU_PROPERTIES
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
Modified: trunk/reactos/dll/cpl/desk/lang/ja-JP.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ja-JP.rc?rev=40299&r1=40298&r2=40299&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/desk/lang/ja-JP.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/lang/ja-JP.rc [iso-8859-1] Tue Mar 31 01:21:41 2009
@@ -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
@@ -92,6 +93,30 @@
PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14
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
@@ -149,6 +174,18 @@
MENUITEM "&Identify", ID_MENU_IDENTIFY
MENUITEM "P&roperties", ID_MENU_PROPERTIES
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
Modified: trunk/reactos/dll/cpl/desk/lang/nl-NL.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/nl-NL.rc?rev=40299&r1=40298&r2=40299&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/desk/lang/nl-NL.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/lang/nl-NL.rc [iso-8859-1] Tue Mar 31 01:21:41 2009
@@ -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
@@ -94,6 +95,30 @@
PUSHBUTTON "Annuleren", IDCANCEL, 191, 220, 50, 14
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
@@ -151,6 +176,18 @@
MENUITEM "&Identify", ID_MENU_IDENTIFY
MENUITEM "P&roperties", ID_MENU_PROPERTIES
END
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+ IDS_SLIDEEFFECT "Overvloeien"
+ IDS_FADEEFFECT "Schuiven"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+ IDS_STANDARDEFFECT "Standaard"
+ IDS_CLEARTYPEEFFECT "ClearType"
END
STRINGTABLE
Modified: trunk/reactos/dll/cpl/desk/lang/no-NO.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/no-NO.rc?rev=40299&r1=40298&r2=40299&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/desk/lang/no-NO.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/lang/no-NO.rc [iso-8859-1] Tue Mar 31 01:21:41 2009
@@ -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
@@ -94,6 +95,30 @@
PUSHBUTTON "Avbryt", IDCANCEL, 191, 220, 50, 14
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
@@ -151,6 +176,18 @@
MENUITEM "&Identify", ID_MENU_IDENTIFY
MENUITEM "E&genskaper", ID_MENU_PROPERTIES
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
Modified: trunk/reactos/dll/cpl/desk/lang/pl-PL.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/pl-PL.rc?rev=40299&r1=40298&r2=40299&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/desk/lang/pl-PL.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/lang/pl-PL.rc [iso-8859-1] Tue Mar 31 01:21:41 2009
@@ -63,7 +63,8 @@
WS_VISIBLE | WS_BORDER, 7, 7, 232, 120
LTEXT "Schemat kolorów", 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
@@ -102,6 +103,30 @@
PUSHBUTTON "Anuluj", IDCANCEL, 191, 220, 50, 14
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
@@ -159,6 +184,18 @@
MENUITEM "&Identyfikuj", ID_MENU_IDENTIFY
MENUITEM "W&³aœciwoœci", ID_MENU_PROPERTIES
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
Modified: trunk/reactos/dll/cpl/desk/lang/ru-RU.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ru-RU.rc?rev=40299&r1=40298&r2=40299&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/desk/lang/ru-RU.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/lang/ru-RU.rc [iso-8859-1] Tue Mar 31 01:21:41 2009
@@ -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
@@ -92,6 +93,30 @@
PUSHBUTTON "Îòìåíà", IDCANCEL, 191, 220, 50, 14
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
@@ -149,6 +174,18 @@
MENUITEM "Îïð&åäåëåíèå", ID_MENU_IDENTIFY
MENUITEM "Ñâî&éñòâà", ID_MENU_PROPERTIES
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
Modified: trunk/reactos/dll/cpl/desk/lang/sk-SK.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/sk-SK.rc?rev=40299&r1=40298&r2=40299&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/desk/lang/sk-SK.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/lang/sk-SK.rc [iso-8859-1] Tue Mar 31 01:21:41 2009
@@ -63,7 +63,8 @@
WS_VISIBLE | WS_BORDER, 7, 7, 232, 120
LTEXT "&Farebná schéma:", 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
@@ -102,6 +103,30 @@
PUSHBUTTON "Zruši", IDCANCEL, 191, 220, 50, 14
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
@@ -159,6 +184,18 @@
MENUITEM "&Identifikova", ID_MENU_IDENTIFY
MENUITEM "Vl&astnosti", ID_MENU_PROPERTIES
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
Modified: trunk/reactos/dll/cpl/desk/lang/sv-SE.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/sv-SE.rc?rev=40299&r1=40298&r2=40299&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/desk/lang/sv-SE.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/lang/sv-SE.rc [iso-8859-1] Tue Mar 31 01:21:41 2009
@@ -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
@@ -95,6 +96,30 @@
PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14
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
@@ -152,6 +177,18 @@
MENUITEM "&Identify", ID_MENU_IDENTIFY
MENUITEM "P&roperties", ID_MENU_PROPERTIES
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
Modified: trunk/reactos/dll/cpl/desk/lang/uk-UA.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/uk-UA.rc?rev=40299&r1=40298&r2=40299&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/desk/lang/uk-UA.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/lang/uk-UA.rc [iso-8859-1] Tue Mar 31 01:21:41 2009
@@ -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
@@ -100,6 +101,30 @@
PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 191, 220, 50, 14
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
@@ -157,6 +182,18 @@
MENUITEM "&Âèçíà÷åííÿ", ID_MENU_IDENTIFY
MENUITEM "Â&ëàñòèâîñò³", ID_MENU_PROPERTIES
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
Modified: trunk/reactos/dll/cpl/desk/lang/zh-CN.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/zh-CN.rc?rev=40299&r1=40298&r2=40299&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/desk/lang/zh-CN.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/lang/zh-CN.rc [iso-8859-1] Tue Mar 31 01:21:41 2009
@@ -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
@@ -100,6 +101,30 @@
PUSHBUTTON "È¡Ïû", IDCANCEL, 191, 220, 50, 14
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
@@ -157,6 +182,18 @@
MENUITEM "±êʶ(&I)", ID_MENU_IDENTIFY
MENUITEM "ÊôÐÔ(&R)", ID_MENU_PROPERTIES
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
Modified: trunk/reactos/dll/cpl/desk/resource.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/resource.h?rev=40299&r1=40298&r2=40299&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/desk/resource.h [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/resource.h [iso-8859-1] Tue Mar 31 01:21:41 2009
@@ -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
Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/defwnd.c?rev=40299&r1=40298&r2=40299&view=diff
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] Tue Mar 31 01:21:41 2009
@@ -1394,10 +1394,15 @@
{
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 )
+ {
iMenuSysKey = 1;
+ /* mimic behaviour of XP, sending a WM_SYSCOMMAND when pressing <alt> */
+ SendMessageW( top, WM_SYSCOMMAND, SC_KEYMENU, 0L );
+ }
else
iMenuSysKey = 0;
@@ -1405,7 +1410,6 @@
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 +1633,7 @@
case WM_CHANGEUISTATE:
{
- BOOL AlwaysShowCues = TRUE;
+ BOOL AlwaysShowCues = FALSE;
WORD Action = LOWORD(wParam);
WORD Flags = HIWORD(wParam);
PWINDOW Wnd;
@@ -1711,7 +1715,7 @@
case WM_UPDATEUISTATE:
{
BOOL Change = TRUE;
- BOOL AlwaysShowCues = TRUE;
+ BOOL AlwaysShowCues = FALSE;
WORD Action = LOWORD(wParam);
WORD Flags = HIWORD(wParam);
PWINDOW Wnd;
Modified: trunk/reactos/dll/win32/user32/windows/dialog.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/dialog.c?rev=40299&r1=40298&r2=40299&view=diff
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] Tue Mar 31 01:21:41 2009
@@ -2408,6 +2408,14 @@
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 );
Modified: trunk/reactos/include/reactos/win32k/ntusrtyp.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntusrtyp.h?rev=40299&r1=40298&r2=40299&view=diff
==============================================================================
--- trunk/reactos/include/reactos/win32k/ntusrtyp.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/win32k/ntusrtyp.h [iso-8859-1] Tue Mar 31 01:21:41 2009
@@ -20,6 +20,27 @@
RECT r;
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)
Modified: trunk/reactos/subsystems/win32/win32k/include/winsta.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/include/winsta.h?rev=40299&r1=40298&r2=40299&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/include/winsta.h [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/include/winsta.h [iso-8859-1] Tue Mar 31 01:21:41 2009
@@ -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;
Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c?rev=40299&r1=40298&r2=40299&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] Tue Mar 31 01:21:41 2009
@@ -13,6 +13,7 @@
#define NDEBUG
#include <debug.h>
+#include <winsta.h>
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,9 +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(
@@ -147,13 +233,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 +253,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 +287,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;
Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c?rev=40299&r1=40298&r2=40299&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] Tue Mar 31 01:21:41 2009
@@ -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 */
More information about the Ros-diffs
mailing list