Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cfinck] 28822: Build fixes for MSVC, now mkhive can be built with MSVC again
by cfinck＠svn.reactos.org 03 Sep '07

03 Sep '07

Author: cfinck Date: Mon Sep 3 23:33:03 2007 New Revision: 28822 URL: http://svn.reactos.org/svn/reactos?rev=28822&view=rev Log: Build fixes for MSVC, now mkhive can be built with MSVC again Modified: trunk/reactos/include/reactos/typedefs_host.h trunk/reactos/tools/mkhive/mkhive.vcproj Modified: trunk/reactos/include/reactos/typedefs_host.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/typedefs_h… ============================================================================== --- trunk/reactos/include/reactos/typedefs_host.h (original) +++ trunk/reactos/include/reactos/typedefs_host.h Mon Sep 3 23:33:03 2007 @@ -21,13 +21,13 @@ #error Unknown compiler #endif -#ifndef __fastcall +#if !defined(_MSC_VER) && !defined(__fastcall) #define __fastcall __attribute__((fastcall)) #endif -#ifndef __cdecl +#if !defined(_MSC_VER) && !defined(__cdecl) #define __cdecl __attribute__((cdecl)) #endif -#ifndef __stdcall +#if !defined(_MSC_VER) && !defined(__stdcall) #define __stdcall __attribute__((stdcall)) #endif Modified: trunk/reactos/tools/mkhive/mkhive.vcproj URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/mkhive.vcproj… ============================================================================== --- trunk/reactos/tools/mkhive/mkhive.vcproj (original) +++ trunk/reactos/tools/mkhive/mkhive.vcproj Mon Sep 3 23:33:03 2007 @@ -62,7 +62,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="kernel32.lib ../../obj-i386/lib/cmlib/cmlib.a ../../obj-i386/lib/inflib_host/infcore.o ../../obj-i386/lib/inflib_host/infget.o ../../obj-i386/lib/inflib_host/infhostgen.o ../../obj-i386/lib/inflib_host/infhostget.o ../../obj-i386/lib/inflib_host/infhostglue.o ../../obj-i386/lib/inflib_host/infhostput.o ../../obj-i386/lib/inflib_host/infput.o ../../obj-i386/lib/rtl/rtl.a $(NOINHERIT)" + AdditionalDependencies="kernel32.lib ../../obj-i386/lib/cmlib_host/cminit.o ../../obj-i386/lib/cmlib_host/hivebin.o ../../obj-i386/lib/cmlib_host/hivecell.o ../../obj-i386/lib/cmlib_host/hiveinit.o ../../obj-i386/lib/cmlib_host/hivesum.o ../../obj-i386/lib/cmlib_host/hivewrt.o ../../obj-i386/lib/inflib_host/infcore.o ../../obj-i386/lib/inflib_host/infget.o ../../obj-i386/lib/inflib_host/infhostgen.o ../../obj-i386/lib/inflib_host/infhostget.o ../../obj-i386/lib/inflib_host/infhostput.o ../../obj-i386/lib/inflib_host/infput.o $(NOINHERIT)" LinkIncremental="2" GenerateDebugInformation="true" SubSystem="1" @@ -118,7 +118,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" + AdditionalIncludeDirectories="../../include/ddk;../../include/psdk;../../include/reactos;../../lib/cmlib;../../lib/inflib;../../lib/rtl" PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_WARNINGS" RuntimeLibrary="2" UsePrecompiledHeader="0" @@ -137,7 +137,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="kernel32.lib $(NOINHERIT)" + AdditionalDependencies="kernel32.lib ../../obj-i386/lib/cmlib_host/cminit.o ../../obj-i386/lib/cmlib_host/hivebin.o ../../obj-i386/lib/cmlib_host/hivecell.o ../../obj-i386/lib/cmlib_host/hiveinit.o ../../obj-i386/lib/cmlib_host/hivesum.o ../../obj-i386/lib/cmlib_host/hivewrt.o ../../obj-i386/lib/inflib_host/infcore.o ../../obj-i386/lib/inflib_host/infget.o ../../obj-i386/lib/inflib_host/infhostgen.o ../../obj-i386/lib/inflib_host/infhostget.o ../../obj-i386/lib/inflib_host/infhostput.o ../../obj-i386/lib/inflib_host/infput.o $(NOINHERIT)" LinkIncremental="1" GenerateDebugInformation="true" SubSystem="1"

1 0

[cwittich] 28821: fix a small bug in set and added missing german translations
by cwittich＠svn.reactos.org 03 Sep '07

03 Sep '07

Author: cwittich Date: Mon Sep 3 21:40:30 2007 New Revision: 28821 URL: http://svn.reactos.org/svn/reactos?rev=28821&view=rev Log: fix a small bug in set and added missing german translations Modified: trunk/reactos/base/shell/cmd/lang/de-DE.rc trunk/reactos/base/shell/cmd/set.c Modified: trunk/reactos/base/shell/cmd/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/de-DE.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/de-DE.rc (original) +++ trunk/reactos/base/shell/cmd/lang/de-DE.rc Mon Sep 3 21:40:30 2007 @@ -643,4 +643,9 @@ STRING_SCREEN_COL, "ungültige Spalten-Angabe" STRING_SCREEN_ROW, "ungültige Zeilen-Angabe" STRING_TIMER_TIME "Timer %d ist %s: " + +STRING_INVALID_OPERAND, "Ungültiger Operand." +STRING_EXPECTED_CLOSE_PAREN, "Erwartet ')'." +STRING_EXPECTED_NUMBER_OR_VARIABLE,"Erwartet Nummer oder Variablennamen." +STRING_SYNTAX_COMMAND_INCORRECT, "Syntaxfehler." } Modified: trunk/reactos/base/shell/cmd/set.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/set.c?rev=2… ============================================================================== --- trunk/reactos/base/shell/cmd/set.c (original) +++ trunk/reactos/base/shell/cmd/set.c Mon Sep 3 21:40:30 2007 @@ -112,6 +112,13 @@ return Success; } + if ( !_tcsnicmp (param, _T("/"), 1) ) + { + LoadString(CMD_ModuleHandle, STRING_SYNTAX_COMMAND_INCORRECT, szMsg, RC_STRING_MAX_SIZE); + ConErrPrintf (szMsg, param); + return 0; + } + p = _tcschr (param, _T('=')); if (p) {

1 0

[gedmurphy] 28820: add a new serial port icon. I'll do the hard disk controller one later
by gedmurphy＠svn.reactos.org 03 Sep '07

03 Sep '07

Author: gedmurphy Date: Mon Sep 3 20:03:31 2007 New Revision: 28820 URL: http://svn.reactos.org/svn/reactos?rev=28820&view=rev Log: add a new serial port icon. I'll do the hard disk controller one later Modified: trunk/reactos/dll/win32/setupapi/res/icons/23.ico Modified: trunk/reactos/dll/win32/setupapi/res/icons/23.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/res/ico… ============================================================================== Binary files - no diff available.

1 0

[janderwald] 28819: - improve error checking
by janderwald＠svn.reactos.org 03 Sep '07

03 Sep '07

Author: janderwald Date: Mon Sep 3 20:02:26 2007 New Revision: 28819 URL: http://svn.reactos.org/svn/reactos?rev=28819&view=rev Log: - improve error checking Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.cpp (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp Mon Sep 3 20:02:26 2007 @@ -261,17 +261,25 @@ #endif - m_BootCmd = m_EmuPath + _T(" -L ") + qemudir + _T(" -m ") + m_MaxMem + _T(" -hda ") + m_HDDImage + _T(" -serial ") + pipe; + m_BootCmd = m_EmuPath + _T(" -L ") + qemudir + _T(" -m ") + m_MaxMem + _T(" -serial ") + pipe; if (m_CDImage.length()) { /* boot from cdrom */ m_BootCmd += _T(" -boot d -cdrom ") + m_CDImage; } + else if (m_HDDImage.length ()) + { + /* boot from hdd */ + m_BootCmd += _T(" -boot c -hda ") + m_HDDImage; + } else { - /* boot from hdd */ - m_BootCmd += _T(" -boot c "); + /* + * no boot device provided + */ + cerr << "Error: no bootdevice provided" << endl; + return false; } #ifdef __LINUX__

1 0

[gedmurphy] 28818: Add the icon mask to the imagelist. The device manager icons now look correct
by gedmurphy＠svn.reactos.org 03 Sep '07

03 Sep '07

Author: gedmurphy Date: Mon Sep 3 19:40:24 2007 New Revision: 28818 URL: http://svn.reactos.org/svn/reactos?rev=28818&view=rev Log: Add the icon mask to the imagelist. The device manager icons now look correct Modified: trunk/reactos/dll/win32/setupapi/devclass.c Modified: trunk/reactos/dll/win32/setupapi/devclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devclas… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devclass.c (original) +++ trunk/reactos/dll/win32/setupapi/devclass.c Mon Sep 3 19:40:24 2007 @@ -1449,7 +1449,7 @@ /* Prepare a HIMAGELIST */ InitCommonControls(); - ClassImageListData->ImageList = ImageList_Create(16, 16, ILC_COLOR32, 100, 10); + ClassImageListData->ImageList = ImageList_Create(16, 16, ILC_COLOR32 | ILC_MASK, 100, 10); if (!ClassImageListData->ImageList) goto cleanup;

1 0

[gedmurphy] 28817: set the correct icon image for the Keyboard class
by gedmurphy＠svn.reactos.org 03 Sep '07

03 Sep '07

Author: gedmurphy Date: Mon Sep 3 18:53:46 2007 New Revision: 28817 URL: http://svn.reactos.org/svn/reactos?rev=28817&view=rev Log: set the correct icon image for the Keyboard class Modified: trunk/reactos/media/inf/keyboard.inf Modified: trunk/reactos/media/inf/keyboard.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/keyboard.inf?rev… ============================================================================== --- trunk/reactos/media/inf/keyboard.inf (original) +++ trunk/reactos/media/inf/keyboard.inf Mon Sep 3 18:53:46 2007 @@ -19,7 +19,7 @@ [KeyboardClass.NT.AddReg] HKR, , , 0, %KeyboardClassName% -HKR, , Icon, 0, "-2" +HKR, , Icon, 0, "-3" HKR, , Installer32, 0, "syssetup.dll,KeyboardClassInstaller" HKR, , NoInstallClass, 0, 1 HKR, , UpperFilters, 0x00010000, "kbdclass"

1 0

[gedmurphy] 28816: - load icon resources using LoadImage. ExtractIcon loads sequential numbers, not resource numbers. - fixes the device image list
by gedmurphy＠svn.reactos.org 03 Sep '07

03 Sep '07

Author: gedmurphy Date: Mon Sep 3 18:51:06 2007 New Revision: 28816 URL: http://svn.reactos.org/svn/reactos?rev=28816&view=rev Log: - load icon resources using LoadImage. ExtractIcon loads sequential numbers, not resource numbers. - fixes the device image list Modified: trunk/reactos/dll/win32/setupapi/devclass.c Modified: trunk/reactos/dll/win32/setupapi/devclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devclas… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devclass.c (original) +++ trunk/reactos/dll/win32/setupapi/devclass.c Mon Sep 3 18:51:06 2007 @@ -1449,7 +1449,7 @@ /* Prepare a HIMAGELIST */ InitCommonControls(); - ClassImageListData->ImageList = ImageList_Create(16, 16, ILC_COLOR, 100, 10); + ClassImageListData->ImageList = ImageList_Create(16, 16, ILC_COLOR32, 100, 10); if (!ClassImageListData->ImageList) goto cleanup; @@ -1464,7 +1464,10 @@ &hIcon, NULL); if (ret) + { list->IconIndexes[i] = ImageList_AddIcon(ClassImageListData->ImageList, hIcon); + DestroyIcon(hIcon); + } else list->IconIndexes[i] = -1; /* Special value to tell that icon is unavailable */ } @@ -1612,7 +1615,8 @@ TRACE("Icon index %d, dll name %s\n", iconIndex, debugstr_w(DllName)); if (LargeIcon) { - if (1 != ExtractIconEx(DllName, iconIndex, LargeIcon, NULL, 1)) + *LargeIcon = LoadImage(hInstance, MAKEINTRESOURCE(iconIndex), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR); + if (!*LargeIcon) { SetLastError(ERROR_INVALID_INDEX); goto cleanup;

1 0

[ekohl] 28815: - Convert RADIOBUTTONs to AUTORADIOBUTTONs. - Replace Trackbars by Comboboxes in the filter keys dialogs. - Fix some typos and minor translation issues in the german dialogs. - Add missing functionality for the repeat key dialog. @dreimer: Did I fix all bugs?
by ekohl＠svn.reactos.org 03 Sep '07

03 Sep '07

Author: ekohl Date: Mon Sep 3 18:44:08 2007 New Revision: 28815 URL: http://svn.reactos.org/svn/reactos?rev=28815&view=rev Log: - Convert RADIOBUTTONs to AUTORADIOBUTTONs. - Replace Trackbars by Comboboxes in the filter keys dialogs. - Fix some typos and minor translation issues in the german dialogs. - Add missing functionality for the repeat key dialog. @dreimer: Did I fix all bugs? Modified: trunk/reactos/dll/cpl/access/keyboard.c trunk/reactos/dll/cpl/access/lang/cs-CZ.rc trunk/reactos/dll/cpl/access/lang/de-DE.rc trunk/reactos/dll/cpl/access/lang/en-US.rc trunk/reactos/dll/cpl/access/lang/es-ES.rc trunk/reactos/dll/cpl/access/lang/fr-FR.rc trunk/reactos/dll/cpl/access/lang/hu-HU.rc trunk/reactos/dll/cpl/access/lang/id-ID.rc trunk/reactos/dll/cpl/access/lang/it-IT.rc trunk/reactos/dll/cpl/access/lang/ja-JP.rc trunk/reactos/dll/cpl/access/lang/nl-NL.rc trunk/reactos/dll/cpl/access/lang/pl-PL.rc trunk/reactos/dll/cpl/access/lang/ru-RU.rc trunk/reactos/dll/cpl/access/resource.h Modified: trunk/reactos/dll/cpl/access/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/keyboard.c?… ============================================================================== --- trunk/reactos/dll/cpl/access/keyboard.c (original) +++ trunk/reactos/dll/cpl/access/keyboard.c Mon Sep 3 18:44:08 2007 @@ -32,6 +32,15 @@ #define BOUNCETICKS 5 static INT nBounceArray[BOUNCETICKS] = {500, 700, 1000, 1500, 2000}; +#define DELAYTICKS 5 +static INT nDelayArray[DELAYTICKS] = {300, 700, 1000, 1500, 2000}; + +#define REPEATTICKS 6 +static INT nRepeatArray[REPEATTICKS] = {300, 500, 700, 1000, 1500, 2000}; + +#define WAITTICKS 10 +static INT nWaitArray[WAITTICKS] = {0, 300, 500, 700, 1000, 1500, 2000, 5000, 10000, 20000}; + /* Property page dialog callback */ INT_PTR CALLBACK @@ -118,7 +127,7 @@ static VOID -SetDlgItemTime(HWND hwnd, INT nId, INT nTimeMs) +AddComboBoxTime(HWND hwnd, INT nId, INT nTimeMs) { TCHAR szBuffer[32]; TCHAR szSeconds[20]; @@ -130,7 +139,7 @@ nTimeMs / 1000, (nTimeMs % 1000) / 100, szSeconds); - SetDlgItemText(hwnd, nId, szBuffer); + SendDlgItemMessage(hwnd, nId, CB_ADDSTRING, 0, (LPARAM)szBuffer); } @@ -141,7 +150,7 @@ LPARAM lParam) { PGLOBAL_DATA pGlobalData; - INT i; + INT i, n; pGlobalData = (PGLOBAL_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER); @@ -151,47 +160,35 @@ pGlobalData = (PGLOBAL_DATA)lParam; SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGlobalData); - /* Set the range */ - SendDlgItemMessage(hwndDlg, IDC_BOUNCE_TIME_TRACK, TBM_SETRANGE, - TRUE, MAKELONG(0, BOUNCETICKS - 1)); - - /* Determine the current thumb position */ + /* Determine the current bounce time */ if (pGlobalData->filterKeys.iBounceMSec == 0) pGlobalData->filterKeys.iBounceMSec = nBounceArray[0]; + for (n = 0; n < BOUNCETICKS; n++) + { + if (pGlobalData->filterKeys.iBounceMSec < nBounceArray[n]) + break; + } + n--; + for (i = 0; i < BOUNCETICKS; i++) { - if (pGlobalData->filterKeys.iBounceMSec < nBounceArray[i]) - break; - } - i--; - - /* Set the thumb position */ - SendDlgItemMessage(hwndDlg, IDC_BOUNCE_TIME_TRACK, TBM_SETPOS, TRUE, i); - - /* Set the bounce delay */ - SetDlgItemTime(hwndDlg, IDC_BOUNCE_TIME_EDIT, nBounceArray[i]); - break; - - case WM_HSCROLL: - switch (GetWindowLong((HWND) lParam, GWL_ID)) - { - case IDC_BOUNCE_TIME_TRACK: - i = SendDlgItemMessage(hwndDlg, IDC_BOUNCE_TIME_TRACK, TBM_GETPOS, 0, 0); - if (i >= 0 && i < BOUNCETICKS) - { - /* Update the bounce delay */ - pGlobalData->filterKeys.iBounceMSec = nBounceArray[i]; - SetDlgItemTime(hwndDlg, IDC_BOUNCE_TIME_EDIT, nBounceArray[i]); - } - break; - } + AddComboBoxTime(hwndDlg, IDC_BOUNCE_TIME_COMBO, nBounceArray[i]); + } + + SendDlgItemMessage(hwndDlg, IDC_BOUNCE_TIME_COMBO, CB_SETCURSEL, n, 0); break; case WM_COMMAND: switch (LOWORD(wParam)) { case IDOK: + i = SendDlgItemMessage(hwndDlg, IDC_BOUNCE_TIME_COMBO, CB_GETCURSEL, 0, 0); + if (i != CB_ERR) + { + pGlobalData->filterKeys.iBounceMSec = nBounceArray[i]; + } + EndDialog(hwndDlg, TRUE); break; @@ -216,6 +213,7 @@ LPARAM lParam) { PGLOBAL_DATA pGlobalData; + INT i, n; pGlobalData = (PGLOBAL_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER); @@ -224,12 +222,99 @@ case WM_INITDIALOG: pGlobalData = (PGLOBAL_DATA)lParam; SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGlobalData); + + CheckRadioButton(hwndDlg, + IDC_REPEAT_NOREPEAT_RADIO, + IDC_REPEAT_REPEAT_RADIO, + (pGlobalData->filterKeys.iDelayMSec == 0) ? IDC_REPEAT_NOREPEAT_RADIO : IDC_REPEAT_REPEAT_RADIO); + + /* Initialize the delay combobox */ + for (n = 0; n < DELAYTICKS; n++) + { + if (pGlobalData->filterKeys.iDelayMSec < nDelayArray[n]) + break; + } + n--; + + for (i = 0; i < DELAYTICKS; i++) + { + AddComboBoxTime(hwndDlg, IDC_REPEAT_DELAY_COMBO, nDelayArray[i]); + } + + SendDlgItemMessage(hwndDlg, IDC_REPEAT_DELAY_COMBO, CB_SETCURSEL, n, 0); + + /* Initialize the repeat combobox */ + for (n = 0; n < REPEATTICKS; n++) + { + if (pGlobalData->filterKeys.iRepeatMSec < nRepeatArray[n]) + break; + } + n--; + + for (i = 0; i < REPEATTICKS; i++) + { + AddComboBoxTime(hwndDlg, IDC_REPEAT_REPEAT_COMBO, nRepeatArray[i]); + } + + SendDlgItemMessage(hwndDlg, IDC_REPEAT_REPEAT_COMBO, CB_SETCURSEL, n, 0); + + /* Disable the delay and repeat comboboxes if needed */ + if (pGlobalData->filterKeys.iDelayMSec == 0) + { + EnableWindow(GetDlgItem(hwndDlg, IDC_REPEAT_DELAY_COMBO), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_REPEAT_REPEAT_COMBO), FALSE); + } + + /* Initialize the wait combobox */ + for (n = 0; n < WAITTICKS; n++) + { + if (pGlobalData->filterKeys.iWaitMSec < nWaitArray[n]) + break; + } + n--; + + for (i = 0; i < WAITTICKS; i++) + { + AddComboBoxTime(hwndDlg, IDC_REPEAT_WAIT_COMBO, nWaitArray[i]); + } + + SendDlgItemMessage(hwndDlg, IDC_REPEAT_WAIT_COMBO, CB_SETCURSEL, n, 0); break; case WM_COMMAND: switch (LOWORD(wParam)) { + case IDC_REPEAT_NOREPEAT_RADIO: + pGlobalData->filterKeys.iDelayMSec = 0; + pGlobalData->filterKeys.iRepeatMSec = 0; + EnableWindow(GetDlgItem(hwndDlg, IDC_REPEAT_DELAY_COMBO), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_REPEAT_REPEAT_COMBO), FALSE); + break; + + case IDC_REPEAT_REPEAT_RADIO: + EnableWindow(GetDlgItem(hwndDlg, IDC_REPEAT_DELAY_COMBO), TRUE); + EnableWindow(GetDlgItem(hwndDlg, IDC_REPEAT_REPEAT_COMBO), TRUE); + break; + case IDOK: + i = SendDlgItemMessage(hwndDlg, IDC_REPEAT_DELAY_COMBO, CB_GETCURSEL, 0, 0); + if (i != CB_ERR) + { + pGlobalData->filterKeys.iDelayMSec = nDelayArray[i]; + } + + i = SendDlgItemMessage(hwndDlg, IDC_REPEAT_REPEAT_COMBO, CB_GETCURSEL, 0, 0); + if (i != CB_ERR) + { + pGlobalData->filterKeys.iRepeatMSec = nRepeatArray[i]; + } + + i = SendDlgItemMessage(hwndDlg, IDC_REPEAT_WAIT_COMBO, CB_GETCURSEL, 0, 0); + if (i != CB_ERR) + { + pGlobalData->filterKeys.iWaitMSec = nWaitArray[i]; + } + EndDialog(hwndDlg, TRUE); break; Modified: trunk/reactos/dll/cpl/access/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/cs-CZ.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/cs-CZ.rc (original) +++ trunk/reactos/dll/cpl/access/lang/cs-CZ.rc Mon Sep 3 18:44:08 2007 @@ -225,14 +225,11 @@ BEGIN GROUPBOX "Bounce Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) LTEXT "&Ignore keystrokes repeated faster than:",-1,PROPSHEETPADDING(2),LABELLINE(2)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) - - LTEXT "",IDC_BOUNCE_TIME_EDIT,PROPSHEETPADDING(2),LABELLINE(3)+4,PROPSHEETPADDING(9),LABELLINE(1) - LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1) - CONTROL "",IDC_BOUNCE_TIME_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(3)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) - LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1) - - LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(6),LABELLINE(1) - EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL + COMBOBOX IDC_BOUNCE_TIME_COMBO, PROPSHEETPADDING(2), LABELLINE(3)+5, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(8),LABELLINE(1) + EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(10),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(11),14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 @@ -247,36 +244,24 @@ GROUPBOX "Repeat Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(12) LTEXT "Override settings on the Keyboard control panel:",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) - RADIOBUTTON "&No keyboard repeat",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP - RADIOBUTTON "&Slow down keyboard repeat rates",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1) + AUTORADIOBUTTON "&No keyboard repeat",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP + AUTORADIOBUTTON "&Slow down keyboard repeat rates",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1) LTEXT "Repeat &delay:",-1,PROPSHEETPADDING(4),LABELLINE(6)+4,PROPSHEETPADDING(10),LABELLINE(1) - - LTEXT "0.5 seconds",IDC_REPEAT_DELAY_EDIT,PROPSHEETPADDING(4),LABELLINE(7)+6,PROPSHEETPADDING(9),LABELLINE(1) - - LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1) - CONTROL "",IDC_REPEAT_DELAY_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(7)+3,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) - LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1) + COMBOBOX IDC_REPEAT_DELAY_COMBO, PROPSHEETPADDING(4), LABELLINE(7)+6, PROPSHEETWIDTH-PROPSHEETPADDING(6), LABELLINE(6), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP LTEXT "Repeat &rate:",-1,PROPSHEETPADDING(4),LABELLINE(9)+6,PROPSHEETPADDING(10),LABELLINE(1) - - LTEXT "0.5 seconds",IDC_REPEAT_REPEAT_EDIT,PROPSHEETPADDING(4),LABELLINE(10)+8,PROPSHEETPADDING(9),LABELLINE(1) - - LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1) - CONTROL "",IDC_REPEAT_REPEAT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(10)+6,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) - LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1) + COMBOBOX IDC_REPEAT_REPEAT_COMBO, PROPSHEETPADDING(4), LABELLINE(10)+8, PROPSHEETWIDTH-PROPSHEETPADDING(6), LABELLINE(7), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP GROUPBOX "Slow Keys",-1,PROPSHEETPADDING(1),LABELLINE(14),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+4 LTEXT "&Keys must be held down for:",-1,PROPSHEETPADDING(2),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) - - LTEXT "0.5 seconds",IDC_REPEAT_WAIT_EDIT,PROPSHEETPADDING(2),LABELLINE(16)+4,PROPSHEETPADDING(9),LABELLINE(1) - - LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1) - CONTROL "",IDC_REPEAT_WAIT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(16)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) - LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1) - - LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(6),LABELLINE(1) - EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL + COMBOBOX IDC_REPEAT_WAIT_COMBO, PROPSHEETPADDING(2), LABELLINE(16)+4, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(8), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(8),LABELLINE(1) + EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(10),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(11),14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 Modified: trunk/reactos/dll/cpl/access/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/de-DE.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/access/lang/de-DE.rc Mon Sep 3 18:44:08 2007 @@ -134,7 +134,7 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Tastenkombination",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - LTEXT "Die Tastenkombination für die Anschlagverzögerung ist: \n<Right Shift> für acht Sekunden gedrückt halten.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + LTEXT "Die Tastenkombination für die Anschlagverzögerung ist:\n<Right Shift> für acht Sekunden gedrückt halten.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) AUTOCHECKBOX "T&astenkombination verwenden",IDC_FILTER_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 GROUPBOX "Filter Optionen",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(8)+5 @@ -159,8 +159,8 @@ CAPTION "Toggle Keys Einstellungen" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Schnelltaste",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - LTEXT "Die Schnelltaste für ToggleKeys ist: \n<Num Lock> für fünf Sekunden gedrückt halten.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + GROUPBOX "Tastenkombination",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "Die Tastenkombination für ToggleKeys ist:\n<Num Lock> für fünf Sekunden gedrückt halten.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) AUTOCHECKBOX "Wähle &Schnelltaste",IDC_TOGGLE_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 @@ -173,12 +173,12 @@ CAPTION "Hoher Konstrast Einstellungen" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Schnelltaste",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - LTEXT "Die Schnelltaste für hohen Kontrast ist: \nDrücke <Left Alt+Left Shift+Print Screen>.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + GROUPBOX "Tastenkombination",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "Die Tastenkombination für hohen Kontrast ist:\nDrücke <Left Alt+Left Shift+Print Screen>.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) AUTOCHECKBOX "&Wähle Schnelltaste",IDC_CONTRAST_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 GROUPBOX "Hoher Kontrast Farbschema",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) - LTEXT "Derzetiges Farbschema:",-1,PROPSHEETPADDING(2),LABELLINE(10)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + LTEXT "Derzeitiges Farbschema:",-1,PROPSHEETPADDING(2),LABELLINE(10)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) COMBOBOX IDC_CONTRAST_COMBO, PROPSHEETPADDING(2), LABELLINE(11)+2, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP @@ -193,7 +193,7 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Tastenkombiation",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - LTEXT "Die Tastenkombination für die Tastaturmaus ist: \nDrücke <Left Alt+Left Shift+Num Lock>.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + LTEXT "Die Tastenkombination für die Tastaturmaus ist:\nDrücke <Left Alt+Left Shift+Num Lock>.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) AUTOCHECKBOX "&Tastenkombination verwenden",IDC_MOUSEKEYS_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 GROUPBOX "Cursorgeschwindigkeit",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(9) @@ -228,14 +228,11 @@ BEGIN GROUPBOX "Bounce Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) LTEXT "&Tastenanschläge igorieren, die schneller wiederholt werden als:",-1,PROPSHEETPADDING(2),LABELLINE(2)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) - - LTEXT "",IDC_BOUNCE_TIME_EDIT,PROPSHEETPADDING(2),LABELLINE(3)+4,PROPSHEETPADDING(9),LABELLINE(1) - LTEXT "Kurz",-1,PROPSHEETPADDING(13),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1) - CONTROL "",IDC_BOUNCE_TIME_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(3)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) - LTEXT "Lang",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1) - - LTEXT "T&estbereich:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(6),LABELLINE(1) - EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL + COMBOBOX IDC_BOUNCE_TIME_COMBO, PROPSHEETPADDING(2), LABELLINE(3)+5, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + LTEXT "T&estbereich:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(8),LABELLINE(1) + EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(10),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(11),14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Abbrechen", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 @@ -248,38 +245,26 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Repeat Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(12) - LTEXT "Tastatureinstellungen in der Systmsteuereung übergehen:",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) - - RADIOBUTTON "&Keine Wiederholung",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP - RADIOBUTTON "&Wiederholungsraten verlangsamen",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1) + LTEXT "Tastatureinstellungen in der Systmsteuerung übergehen:",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + + AUTORADIOBUTTON "&Keine Wiederholung",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP + AUTORADIOBUTTON "&Wiederholungsraten verlangsamen",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1) LTEXT "&Verzögerung:",-1,PROPSHEETPADDING(4),LABELLINE(6)+4,PROPSHEETPADDING(10),LABELLINE(1) - - LTEXT "0.5 Sekunden",IDC_REPEAT_DELAY_EDIT,PROPSHEETPADDING(4),LABELLINE(7)+6,PROPSHEETPADDING(9),LABELLINE(1) - - LTEXT "Kurz",-1,PROPSHEETPADDING(13),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1) - CONTROL "",IDC_REPEAT_DELAY_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(7)+3,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) - LTEXT "Lang",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1) + COMBOBOX IDC_REPEAT_DELAY_COMBO, PROPSHEETPADDING(4), LABELLINE(7)+6, PROPSHEETWIDTH-PROPSHEETPADDING(6), LABELLINE(6), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP LTEXT "Wiede&rholrate:",-1,PROPSHEETPADDING(4),LABELLINE(9)+6,PROPSHEETPADDING(10),LABELLINE(1) - - LTEXT "0.5 Sekunden",IDC_REPEAT_REPEAT_EDIT,PROPSHEETPADDING(4),LABELLINE(10)+8,PROPSHEETPADDING(9),LABELLINE(1) - - LTEXT "Kurz",-1,PROPSHEETPADDING(13),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1) - CONTROL "",IDC_REPEAT_REPEAT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(10)+6,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) - LTEXT "Lang",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1) + COMBOBOX IDC_REPEAT_REPEAT_COMBO, PROPSHEETPADDING(4), LABELLINE(10)+8, PROPSHEETWIDTH-PROPSHEETPADDING(6), LABELLINE(7), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP GROUPBOX "Tasten&haltedauer",-1,PROPSHEETPADDING(1),LABELLINE(14),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+4 LTEXT "&Tasten müssen wie folgt gedrückt bleiben:",-1,PROPSHEETPADDING(2),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) - - LTEXT "0.5 Sekunden",IDC_REPEAT_WAIT_EDIT,PROPSHEETPADDING(2),LABELLINE(16)+4,PROPSHEETPADDING(9),LABELLINE(1) - - LTEXT "Kurz",-1,PROPSHEETPADDING(13),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1) - CONTROL "",IDC_REPEAT_WAIT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(16)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) - LTEXT "Lang",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1) - - LTEXT "T&estbereich:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(6),LABELLINE(1) - EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL + COMBOBOX IDC_REPEAT_WAIT_COMBO, PROPSHEETPADDING(2), LABELLINE(16)+4, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(8), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + LTEXT "T&estbereich:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(8),LABELLINE(1) + EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(10),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(11),14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Abbrechen", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 Modified: trunk/reactos/dll/cpl/access/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/en-US.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/en-US.rc (original) +++ trunk/reactos/dll/cpl/access/lang/en-US.rc Mon Sep 3 18:44:08 2007 @@ -225,14 +225,11 @@ BEGIN GROUPBOX "Bounce Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) LTEXT "&Ignore keystrokes repeated faster than:",-1,PROPSHEETPADDING(2),LABELLINE(2)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) - - LTEXT "",IDC_BOUNCE_TIME_EDIT,PROPSHEETPADDING(2),LABELLINE(3)+4,PROPSHEETPADDING(9),LABELLINE(1) - LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1) - CONTROL "",IDC_BOUNCE_TIME_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(3)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) - LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1) - - LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(6),LABELLINE(1) - EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL + COMBOBOX IDC_BOUNCE_TIME_COMBO, PROPSHEETPADDING(2), LABELLINE(3)+5, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(8),LABELLINE(1) + EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(10),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(11),14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 @@ -247,36 +244,24 @@ GROUPBOX "Repeat Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(12) LTEXT "Override settings on the Keyboard control panel:",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) - RADIOBUTTON "&No keyboard repeat",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP - RADIOBUTTON "&Slow down keyboard repeat rates",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1) + AUTORADIOBUTTON "&No keyboard repeat",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP + AUTORADIOBUTTON "&Slow down keyboard repeat rates",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1) LTEXT "Repeat &delay:",-1,PROPSHEETPADDING(4),LABELLINE(6)+4,PROPSHEETPADDING(10),LABELLINE(1) - - LTEXT "0.5 seconds",IDC_REPEAT_DELAY_EDIT,PROPSHEETPADDING(4),LABELLINE(7)+6,PROPSHEETPADDING(9),LABELLINE(1) - - LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1) - CONTROL "",IDC_REPEAT_DELAY_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(7)+3,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) - LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1) + COMBOBOX IDC_REPEAT_DELAY_COMBO, PROPSHEETPADDING(4), LABELLINE(7)+6, PROPSHEETWIDTH-PROPSHEETPADDING(6), LABELLINE(6), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP LTEXT "Repeat &rate:",-1,PROPSHEETPADDING(4),LABELLINE(9)+6,PROPSHEETPADDING(10),LABELLINE(1) - - LTEXT "0.5 seconds",IDC_REPEAT_REPEAT_EDIT,PROPSHEETPADDING(4),LABELLINE(10)+8,PROPSHEETPADDING(9),LABELLINE(1) - - LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1) - CONTROL "",IDC_REPEAT_REPEAT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(10)+6,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) - LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1) + COMBOBOX IDC_REPEAT_REPEAT_COMBO, PROPSHEETPADDING(4), LABELLINE(10)+8, PROPSHEETWIDTH-PROPSHEETPADDING(6), LABELLINE(7), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP GROUPBOX "Slow Keys",-1,PROPSHEETPADDING(1),LABELLINE(14),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+4 LTEXT "&Keys must be held down for:",-1,PROPSHEETPADDING(2),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) - - LTEXT "0.5 seconds",IDC_REPEAT_WAIT_EDIT,PROPSHEETPADDING(2),LABELLINE(16)+4,PROPSHEETPADDING(9),LABELLINE(1) - - LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1) - CONTROL "",IDC_REPEAT_WAIT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(16)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) - LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1) - - LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(6),LABELLINE(1) - EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL + COMBOBOX IDC_REPEAT_WAIT_COMBO, PROPSHEETPADDING(2), LABELLINE(16)+4, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(8), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(8),LABELLINE(1) + EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(10),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(11),14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 Modified: trunk/reactos/dll/cpl/access/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/es-ES.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/es-ES.rc (original) +++ trunk/reactos/dll/cpl/access/lang/es-ES.rc Mon Sep 3 18:44:08 2007 @@ -228,14 +228,11 @@ BEGIN GROUPBOX "Bounce Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) LTEXT "&Ignore keystrokes repeated faster than:",-1,PROPSHEETPADDING(2),LABELLINE(2)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) - - LTEXT "",IDC_BOUNCE_TIME_EDIT,PROPSHEETPADDING(2),LABELLINE(3)+4,PROPSHEETPADDING(9),LABELLINE(1) - LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1) - CONTROL "",IDC_BOUNCE_TIME_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(3)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) - LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1) - - LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(6),LABELLINE(1) - EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL + COMBOBOX IDC_BOUNCE_TIME_COMBO, PROPSHEETPADDING(2), LABELLINE(3)+5, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(8),LABELLINE(1) + EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(10),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(11),14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 @@ -250,36 +247,24 @@ GROUPBOX "Repeat Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(12) LTEXT "Override settings on the Keyboard control panel:",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) - RADIOBUTTON "&No keyboard repeat",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP - RADIOBUTTON "&Slow down keyboard repeat rates",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1) + AUTORADIOBUTTON "&No keyboard repeat",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP + AUTORADIOBUTTON "&Slow down keyboard repeat rates",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1) LTEXT "Repeat &delay:",-1,PROPSHEETPADDING(4),LABELLINE(6)+4,PROPSHEETPADDING(10),LABELLINE(1) - - LTEXT "0.5 seconds",IDC_REPEAT_DELAY_EDIT,PROPSHEETPADDING(4),LABELLINE(7)+6,PROPSHEETPADDING(9),LABELLINE(1) - - LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1) - CONTROL "",IDC_REPEAT_DELAY_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(7)+3,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) - LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1) + COMBOBOX IDC_REPEAT_DELAY_COMBO, PROPSHEETPADDING(4), LABELLINE(7)+6, PROPSHEETWIDTH-PROPSHEETPADDING(6), LABELLINE(6), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP LTEXT "Repeat &rate:",-1,PROPSHEETPADDING(4),LABELLINE(9)+6,PROPSHEETPADDING(10),LABELLINE(1) - - LTEXT "0.5 seconds",IDC_REPEAT_REPEAT_EDIT,PROPSHEETPADDING(4),LABELLINE(10)+8,PROPSHEETPADDING(9),LABELLINE(1) - - LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1) - CONTROL "",IDC_REPEAT_REPEAT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(10)+6,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) - LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1) + COMBOBOX IDC_REPEAT_REPEAT_COMBO, PROPSHEETPADDING(4), LABELLINE(10)+8, PROPSHEETWIDTH-PROPSHEETPADDING(6), LABELLINE(7), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP GROUPBOX "Slow Keys",-1,PROPSHEETPADDING(1),LABELLINE(14),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+4 LTEXT "&Keys must be held down for:",-1,PROPSHEETPADDING(2),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) - - LTEXT "0.5 seconds",IDC_REPEAT_WAIT_EDIT,PROPSHEETPADDING(2),LABELLINE(16)+4,PROPSHEETPADDING(9),LABELLINE(1) - - LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1) - CONTROL "",IDC_REPEAT_WAIT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(16)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) - LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1) - - LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(6),LABELLINE(1) - EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL + COMBOBOX IDC_REPEAT_WAIT_COMBO, PROPSHEETPADDING(2), LABELLINE(16)+4, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(8), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(8),LABELLINE(1) + EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(10),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(11),14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 Modified: trunk/reactos/dll/cpl/access/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/fr-FR.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/fr-FR.rc (original) +++ trunk/reactos/dll/cpl/access/lang/fr-FR.rc Mon Sep 3 18:44:08 2007 @@ -227,14 +227,11 @@ BEGIN GROUPBOX "Bounce Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) LTEXT "&Ignore keystrokes repeated faster than:",-1,PROPSHEETPADDING(2),LABELLINE(2)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) - - LTEXT "",IDC_BOUNCE_TIME_EDIT,PROPSHEETPADDING(2),LABELLINE(3)+4,PROPSHEETPADDING(9),LABELLINE(1) - LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1) - CONTROL "",IDC_BOUNCE_TIME_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(3)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) - LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1) - - LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(6),LABELLINE(1) - EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL + COMBOBOX IDC_BOUNCE_TIME_COMBO, PROPSHEETPADDING(2), LABELLINE(3)+5, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(8),LABELLINE(1) + EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(10),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(11),14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 @@ -249,36 +246,24 @@ GROUPBOX "Repeat Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(12) LTEXT "Override settings on the Keyboard control panel:",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) - RADIOBUTTON "&No keyboard repeat",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP - RADIOBUTTON "&Slow down keyboard repeat rates",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1) + AUTORADIOBUTTON "&No keyboard repeat",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP + AUTORADIOBUTTON "&Slow down keyboard repeat rates",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1) LTEXT "Repeat &delay:",-1,PROPSHEETPADDING(4),LABELLINE(6)+4,PROPSHEETPADDING(10),LABELLINE(1) - - LTEXT "0.5 seconds",IDC_REPEAT_DELAY_EDIT,PROPSHEETPADDING(4),LABELLINE(7)+6,PROPSHEETPADDING(9),LABELLINE(1) - - LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1) - CONTROL "",IDC_REPEAT_DELAY_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(7)+3,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) - LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1) + COMBOBOX IDC_REPEAT_DELAY_COMBO, PROPSHEETPADDING(4), LABELLINE(7)+6, PROPSHEETWIDTH-PROPSHEETPADDING(6), LABELLINE(6), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP LTEXT "Repeat &rate:",-1,PROPSHEETPADDING(4),LABELLINE(9)+6,PROPSHEETPADDING(10),LABELLINE(1) - - LTEXT "0.5 seconds",IDC_REPEAT_REPEAT_EDIT,PROPSHEETPADDING(4),LABELLINE(10)+8,PROPSHEETPADDING(9),LABELLINE(1) - - LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1) - CONTROL "",IDC_REPEAT_REPEAT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(10)+6,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) - LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1) + COMBOBOX IDC_REPEAT_REPEAT_COMBO, PROPSHEETPADDING(4), LABELLINE(10)+8, PROPSHEETWIDTH-PROPSHEETPADDING(6), LABELLINE(7), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP GROUPBOX "Slow Keys",-1,PROPSHEETPADDING(1),LABELLINE(14),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+4 LTEXT "&Keys must be held down for:",-1,PROPSHEETPADDING(2),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) - - LTEXT "0.5 seconds",IDC_REPEAT_WAIT_EDIT,PROPSHEETPADDING(2),LABELLINE(16)+4,PROPSHEETPADDING(9),LABELLINE(1) - - LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1) - CONTROL "",IDC_REPEAT_WAIT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(16)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) - LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1) - - LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(6),LABELLINE(1) - EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL + COMBOBOX IDC_REPEAT_WAIT_COMBO, PROPSHEETPADDING(2), LABELLINE(16)+4, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(8), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(8),LABELLINE(1) + EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(10),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(11),14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 Modified: trunk/reactos/dll/cpl/access/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/hu-HU.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/hu-HU.rc (original) +++ trunk/reactos/dll/cpl/access/lang/hu-HU.rc Mon Sep 3 18:44:08 2007 @@ -226,14 +226,11 @@ BEGIN GROUPBOX "Bounce Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) LTEXT "&Ignore keystrokes repeated faster than:",-1,PROPSHEETPADDING(2),LABELLINE(2)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) - - LTEXT "",IDC_BOUNCE_TIME_EDIT,PROPSHEETPADDING(2),LABELLINE(3)+4,PROPSHEETPADDING(9),LABELLINE(1) - LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1) - CONTROL "",IDC_BOUNCE_TIME_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(3)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) - LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1) - - LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(6),LABELLINE(1) - EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL + COMBOBOX IDC_BOUNCE_TIME_COMBO, PROPSHEETPADDING(2), LABELLINE(3)+5, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(8),LABELLINE(1) + EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(10),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(11),14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 @@ -248,36 +245,24 @@ GROUPBOX "Repeat Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(12) LTEXT "Override settings on the Keyboard control panel:",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) - RADIOBUTTON "&No keyboard repeat",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP - RADIOBUTTON "&Slow down keyboard repeat rates",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1) + AUTORADIOBUTTON "&No keyboard repeat",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP + AUTORADIOBUTTON "&Slow down keyboard repeat rates",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1) LTEXT "Repeat &delay:",-1,PROPSHEETPADDING(4),LABELLINE(6)+4,PROPSHEETPADDING(10),LABELLINE(1) - - LTEXT "0.5 seconds",IDC_REPEAT_DELAY_EDIT,PROPSHEETPADDING(4),LABELLINE(7)+6,PROPSHEETPADDING(9),LABELLINE(1) - - LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1) - CONTROL "",IDC_REPEAT_DELAY_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(7)+3,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) - LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1) + COMBOBOX IDC_REPEAT_DELAY_COMBO, PROPSHEETPADDING(4), LABELLINE(7)+6, PROPSHEETWIDTH-PROPSHEETPADDING(6), LABELLINE(6), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP LTEXT "Repeat &rate:",-1,PROPSHEETPADDING(4),LABELLINE(9)+6,PROPSHEETPADDING(10),LABELLINE(1) - - LTEXT "0.5 seconds",IDC_REPEAT_REPEAT_EDIT,PROPSHEETPADDING(4),LABELLINE(10)+8,PROPSHEETPADDING(9),LABELLINE(1) - - LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1) - CONTROL "",IDC_REPEAT_REPEAT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(10)+6,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) - LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1) + COMBOBOX IDC_REPEAT_REPEAT_COMBO, PROPSHEETPADDING(4), LABELLINE(10)+8, PROPSHEETWIDTH-PROPSHEETPADDING(6), LABELLINE(7), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP GROUPBOX "Slow Keys",-1,PROPSHEETPADDING(1),LABELLINE(14),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+4 LTEXT "&Keys must be held down for:",-1,PROPSHEETPADDING(2),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) - - LTEXT "0.5 seconds",IDC_REPEAT_WAIT_EDIT,PROPSHEETPADDING(2),LABELLINE(16)+4,PROPSHEETPADDING(9),LABELLINE(1) - - LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1) - CONTROL "",IDC_REPEAT_WAIT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(16)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) - LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1) - - LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(6),LABELLINE(1) - EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL + COMBOBOX IDC_REPEAT_WAIT_COMBO, PROPSHEETPADDING(2), LABELLINE(16)+4, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(8), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(8),LABELLINE(1) + EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(10),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(11),14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 Modified: trunk/reactos/dll/cpl/access/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/id-ID.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/id-ID.rc (original) +++ trunk/reactos/dll/cpl/access/lang/id-ID.rc Mon Sep 3 18:44:08 2007 @@ -227,14 +227,11 @@ BEGIN GROUPBOX "Bounce Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) LTEXT "&Ignore keystrokes repeated faster than:",-1,PROPSHEETPADDING(2),LABELLINE(2)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) - - LTEXT "",IDC_BOUNCE_TIME_EDIT,PROPSHEETPADDING(2),LABELLINE(3)+4,PROPSHEETPADDING(9),LABELLINE(1) - LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1) - CONTROL "",IDC_BOUNCE_TIME_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(3)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) - LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1) - - LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(6),LABELLINE(1) - EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL + COMBOBOX IDC_BOUNCE_TIME_COMBO, PROPSHEETPADDING(2), LABELLINE(3)+5, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(8),LABELLINE(1) + EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(10),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(11),14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 @@ -249,36 +246,24 @@ GROUPBOX "Repeat Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(12) LTEXT "Override settings on the Keyboard control panel:",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) - RADIOBUTTON "&No keyboard repeat",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP - RADIOBUTTON "&Slow down keyboard repeat rates",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1) + AUTORADIOBUTTON "&No keyboard repeat",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP + AUTORADIOBUTTON "&Slow down keyboard repeat rates",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1) LTEXT "Repeat &delay:",-1,PROPSHEETPADDING(4),LABELLINE(6)+4,PROPSHEETPADDING(10),LABELLINE(1) - - LTEXT "0.5 seconds",IDC_REPEAT_DELAY_EDIT,PROPSHEETPADDING(4),LABELLINE(7)+6,PROPSHEETPADDING(9),LABELLINE(1) - - LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1) - CONTROL "",IDC_REPEAT_DELAY_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(7)+3,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) - LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1) + COMBOBOX IDC_REPEAT_DELAY_COMBO, PROPSHEETPADDING(4), LABELLINE(7)+6, PROPSHEETWIDTH-PROPSHEETPADDING(6), LABELLINE(6), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP LTEXT "Repeat &rate:",-1,PROPSHEETPADDING(4),LABELLINE(9)+6,PROPSHEETPADDING(10),LABELLINE(1) - - LTEXT "0.5 seconds",IDC_REPEAT_REPEAT_EDIT,PROPSHEETPADDING(4),LABELLINE(10)+8,PROPSHEETPADDING(9),LABELLINE(1) - - LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1) - CONTROL "",IDC_REPEAT_REPEAT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(10)+6,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) - LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1) + COMBOBOX IDC_REPEAT_REPEAT_COMBO, PROPSHEETPADDING(4), LABELLINE(10)+8, PROPSHEETWIDTH-PROPSHEETPADDING(6), LABELLINE(7), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP GROUPBOX "Slow Keys",-1,PROPSHEETPADDING(1),LABELLINE(14),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+4 LTEXT "&Keys must be held down for:",-1,PROPSHEETPADDING(2),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) - - LTEXT "0.5 seconds",IDC_REPEAT_WAIT_EDIT,PROPSHEETPADDING(2),LABELLINE(16)+4,PROPSHEETPADDING(9),LABELLINE(1) - - LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1) - CONTROL "",IDC_REPEAT_WAIT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(16)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) - LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1) - - LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(6),LABELLINE(1) - EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL + COMBOBOX IDC_REPEAT_WAIT_COMBO, PROPSHEETPADDING(2), LABELLINE(16)+4, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(8), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(8),LABELLINE(1) + EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(10),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(11),14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 Modified: trunk/reactos/dll/cpl/access/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/it-IT.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/it-IT.rc (original) +++ trunk/reactos/dll/cpl/access/lang/it-IT.rc Mon Sep 3 18:44:08 2007 @@ -225,14 +225,11 @@ BEGIN GROUPBOX "Bounce Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) LTEXT "&Ignore keystrokes repeated faster than:",-1,PROPSHEETPADDING(2),LABELLINE(2)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) - - LTEXT "",IDC_BOUNCE_TIME_EDIT,PROPSHEETPADDING(2),LABELLINE(3)+4,PROPSHEETPADDING(9),LABELLINE(1) - LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1) - CONTROL "",IDC_BOUNCE_TIME_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(3)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) - LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1) - - LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(6),LABELLINE(1) - EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL + COMBOBOX IDC_BOUNCE_TIME_COMBO, PROPSHEETPADDING(2), LABELLINE(3)+5, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(8),LABELLINE(1) + EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(10),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(11),14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 @@ -247,36 +244,24 @@ GROUPBOX "Repeat Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(12) LTEXT "Override settings on the Keyboard control panel:",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) - RADIOBUTTON "&No keyboard repeat",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP - RADIOBUTTON "&Slow down keyboard repeat rates",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1) + AUTORADIOBUTTON "&No keyboard repeat",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP + AUTORADIOBUTTON "&Slow down keyboard repeat rates",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1) LTEXT "Repeat &delay:",-1,PROPSHEETPADDING(4),LABELLINE(6)+4,PROPSHEETPADDING(10),LABELLINE(1) - - LTEXT "0.5 seconds",IDC_REPEAT_DELAY_EDIT,PROPSHEETPADDING(4),LABELLINE(7)+6,PROPSHEETPADDING(9),LABELLINE(1) - - LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1) - CONTROL "",IDC_REPEAT_DELAY_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(7)+3,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) - LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1) + COMBOBOX IDC_REPEAT_DELAY_COMBO, PROPSHEETPADDING(4), LABELLINE(7)+6, PROPSHEETWIDTH-PROPSHEETPADDING(6), LABELLINE(6), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP LTEXT "Repeat &rate:",-1,PROPSHEETPADDING(4),LABELLINE(9)+6,PROPSHEETPADDING(10),LABELLINE(1) - - LTEXT "0.5 seconds",IDC_REPEAT_REPEAT_EDIT,PROPSHEETPADDING(4),LABELLINE(10)+8,PROPSHEETPADDING(9),LABELLINE(1) - - LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1) - CONTROL "",IDC_REPEAT_REPEAT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(10)+6,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) - LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1) + COMBOBOX IDC_REPEAT_REPEAT_COMBO, PROPSHEETPADDING(4), LABELLINE(10)+8, PROPSHEETWIDTH-PROPSHEETPADDING(6), LABELLINE(7), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP GROUPBOX "Slow Keys",-1,PROPSHEETPADDING(1),LABELLINE(14),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+4 LTEXT "&Keys must be held down for:",-1,PROPSHEETPADDING(2),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) - - LTEXT "0.5 seconds",IDC_REPEAT_WAIT_EDIT,PROPSHEETPADDING(2),LABELLINE(16)+4,PROPSHEETPADDING(9),LABELLINE(1) - - LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1) - CONTROL "",IDC_REPEAT_WAIT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(16)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) - LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1) - - LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(6),LABELLINE(1) - EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL + COMBOBOX IDC_REPEAT_WAIT_COMBO, PROPSHEETPADDING(2), LABELLINE(16)+4, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(8), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(8),LABELLINE(1) + EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(10),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(11),14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 Modified: trunk/reactos/dll/cpl/access/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/ja-JP.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/ja-JP.rc (original) +++ trunk/reactos/dll/cpl/access/lang/ja-JP.rc Mon Sep 3 18:44:08 2007 @@ -225,14 +225,11 @@ BEGIN GROUPBOX "Bounce Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) LTEXT "&Ignore keystrokes repeated faster than:",-1,PROPSHEETPADDING(2),LABELLINE(2)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) - - LTEXT "",IDC_BOUNCE_TIME_EDIT,PROPSHEETPADDING(2),LABELLINE(3)+4,PROPSHEETPADDING(9),LABELLINE(1) - LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1) - CONTROL "",IDC_BOUNCE_TIME_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(3)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) - LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1) - - LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(6),LABELLINE(1) - EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL + COMBOBOX IDC_BOUNCE_TIME_COMBO, PROPSHEETPADDING(2), LABELLINE(3)+5, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(8),LABELLINE(1) + EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(10),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(11),14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 @@ -247,36 +244,24 @@ GROUPBOX "Repeat Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(12) LTEXT "Override settings on the Keyboard control panel:",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) - RADIOBUTTON "&No keyboard repeat",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP - RADIOBUTTON "&Slow down keyboard repeat rates",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1) + AUTORADIOBUTTON "&No keyboard repeat",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP + AUTORADIOBUTTON "&Slow down keyboard repeat rates",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1) LTEXT "Repeat &delay:",-1,PROPSHEETPADDING(4),LABELLINE(6)+4,PROPSHEETPADDING(10),LABELLINE(1) - - LTEXT "0.5 seconds",IDC_REPEAT_DELAY_EDIT,PROPSHEETPADDING(4),LABELLINE(7)+6,PROPSHEETPADDING(9),LABELLINE(1) - - LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1) - CONTROL "",IDC_REPEAT_DELAY_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(7)+3,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) - LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1) + COMBOBOX IDC_REPEAT_DELAY_COMBO, PROPSHEETPADDING(4), LABELLINE(7)+6, PROPSHEETWIDTH-PROPSHEETPADDING(6), LABELLINE(6), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP LTEXT "Repeat &rate:",-1,PROPSHEETPADDING(4),LABELLINE(9)+6,PROPSHEETPADDING(10),LABELLINE(1) - - LTEXT "0.5 seconds",IDC_REPEAT_REPEAT_EDIT,PROPSHEETPADDING(4),LABELLINE(10)+8,PROPSHEETPADDING(9),LABELLINE(1) - - LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1) - CONTROL "",IDC_REPEAT_REPEAT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(10)+6,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) - LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1) + COMBOBOX IDC_REPEAT_REPEAT_COMBO, PROPSHEETPADDING(4), LABELLINE(10)+8, PROPSHEETWIDTH-PROPSHEETPADDING(6), LABELLINE(7), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP GROUPBOX "Slow Keys",-1,PROPSHEETPADDING(1),LABELLINE(14),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+4 LTEXT "&Keys must be held down for:",-1,PROPSHEETPADDING(2),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) - - LTEXT "0.5 seconds",IDC_REPEAT_WAIT_EDIT,PROPSHEETPADDING(2),LABELLINE(16)+4,PROPSHEETPADDING(9),LABELLINE(1) - - LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1) - CONTROL "",IDC_REPEAT_WAIT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(16)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) - LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1) - - LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(6),LABELLINE(1) - EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL + COMBOBOX IDC_REPEAT_WAIT_COMBO, PROPSHEETPADDING(2), LABELLINE(16)+4, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(8), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(8),LABELLINE(1) + EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(10),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(11),14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 Modified: trunk/reactos/dll/cpl/access/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/nl-NL.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/nl-NL.rc (original) +++ trunk/reactos/dll/cpl/access/lang/nl-NL.rc Mon Sep 3 18:44:08 2007 @@ -227,14 +227,11 @@ BEGIN GROUPBOX "Bounce Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) LTEXT "&Ignore keystrokes repeated faster than:",-1,PROPSHEETPADDING(2),LABELLINE(2)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) - - LTEXT "",IDC_BOUNCE_TIME_EDIT,PROPSHEETPADDING(2),LABELLINE(3)+4,PROPSHEETPADDING(9),LABELLINE(1) - LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1) - CONTROL "",IDC_BOUNCE_TIME_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(3)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) - LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1) - - LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(6),LABELLINE(1) - EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL + COMBOBOX IDC_BOUNCE_TIME_COMBO, PROPSHEETPADDING(2), LABELLINE(3)+5, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(8),LABELLINE(1) + EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(10),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(11),14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 @@ -249,36 +246,24 @@ GROUPBOX "Repeat Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(12) LTEXT "Override settings on the Keyboard control panel:",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) - RADIOBUTTON "&No keyboard repeat",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP - RADIOBUTTON "&Slow down keyboard repeat rates",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1) + AUTORADIOBUTTON "&No keyboard repeat",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP + AUTORADIOBUTTON "&Slow down keyboard repeat rates",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1) LTEXT "Repeat &delay:",-1,PROPSHEETPADDING(4),LABELLINE(6)+4,PROPSHEETPADDING(10),LABELLINE(1) - - LTEXT "0.5 seconds",IDC_REPEAT_DELAY_EDIT,PROPSHEETPADDING(4),LABELLINE(7)+6,PROPSHEETPADDING(9),LABELLINE(1) - - LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1) - CONTROL "",IDC_REPEAT_DELAY_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(7)+3,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) - LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1) + COMBOBOX IDC_REPEAT_DELAY_COMBO, PROPSHEETPADDING(4), LABELLINE(7)+6, PROPSHEETWIDTH-PROPSHEETPADDING(6), LABELLINE(6), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP LTEXT "Repeat &rate:",-1,PROPSHEETPADDING(4),LABELLINE(9)+6,PROPSHEETPADDING(10),LABELLINE(1) - - LTEXT "0.5 seconds",IDC_REPEAT_REPEAT_EDIT,PROPSHEETPADDING(4),LABELLINE(10)+8,PROPSHEETPADDING(9),LABELLINE(1) - - LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1) - CONTROL "",IDC_REPEAT_REPEAT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(10)+6,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) - LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1) + COMBOBOX IDC_REPEAT_REPEAT_COMBO, PROPSHEETPADDING(4), LABELLINE(10)+8, PROPSHEETWIDTH-PROPSHEETPADDING(6), LABELLINE(7), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP GROUPBOX "Slow Keys",-1,PROPSHEETPADDING(1),LABELLINE(14),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+4 LTEXT "&Keys must be held down for:",-1,PROPSHEETPADDING(2),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) - - LTEXT "0.5 seconds",IDC_REPEAT_WAIT_EDIT,PROPSHEETPADDING(2),LABELLINE(16)+4,PROPSHEETPADDING(9),LABELLINE(1) - - LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1) - CONTROL "",IDC_REPEAT_WAIT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(16)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) - LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1) - - LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(6),LABELLINE(1) - EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL + COMBOBOX IDC_REPEAT_WAIT_COMBO, PROPSHEETPADDING(2), LABELLINE(16)+4, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(8), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(8),LABELLINE(1) + EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(10),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(11),14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 Modified: trunk/reactos/dll/cpl/access/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/pl-PL.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/pl-PL.rc (original) +++ trunk/reactos/dll/cpl/access/lang/pl-PL.rc Mon Sep 3 18:44:08 2007 @@ -228,14 +228,11 @@ BEGIN GROUPBOX "Bounce Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) LTEXT "&Ignore keystrokes repeated faster than:",-1,PROPSHEETPADDING(2),LABELLINE(2)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) - - LTEXT "",IDC_BOUNCE_TIME_EDIT,PROPSHEETPADDING(2),LABELLINE(3)+4,PROPSHEETPADDING(9),LABELLINE(1) - LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1) - CONTROL "",IDC_BOUNCE_TIME_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(3)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) - LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1) - - LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(6),LABELLINE(1) - EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL + COMBOBOX IDC_BOUNCE_TIME_COMBO, PROPSHEETPADDING(2), LABELLINE(3)+5, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(8),LABELLINE(1) + EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(10),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(11),14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 @@ -250,36 +247,24 @@ GROUPBOX "Repeat Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(12) LTEXT "Override settings on the Keyboard control panel:",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) - RADIOBUTTON "&No keyboard repeat",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP - RADIOBUTTON "&Slow down keyboard repeat rates",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1) + AUTORADIOBUTTON "&No keyboard repeat",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP + AUTORADIOBUTTON "&Slow down keyboard repeat rates",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1) LTEXT "Repeat &delay:",-1,PROPSHEETPADDING(4),LABELLINE(6)+4,PROPSHEETPADDING(10),LABELLINE(1) - - LTEXT "0.5 seconds",IDC_REPEAT_DELAY_EDIT,PROPSHEETPADDING(4),LABELLINE(7)+6,PROPSHEETPADDING(9),LABELLINE(1) - - LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1) - CONTROL "",IDC_REPEAT_DELAY_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(7)+3,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) - LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1) + COMBOBOX IDC_REPEAT_DELAY_COMBO, PROPSHEETPADDING(4), LABELLINE(7)+6, PROPSHEETWIDTH-PROPSHEETPADDING(6), LABELLINE(6), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP LTEXT "Repeat &rate:",-1,PROPSHEETPADDING(4),LABELLINE(9)+6,PROPSHEETPADDING(10),LABELLINE(1) - - LTEXT "0.5 seconds",IDC_REPEAT_REPEAT_EDIT,PROPSHEETPADDING(4),LABELLINE(10)+8,PROPSHEETPADDING(9),LABELLINE(1) - - LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1) - CONTROL "",IDC_REPEAT_REPEAT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(10)+6,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) - LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1) + COMBOBOX IDC_REPEAT_REPEAT_COMBO, PROPSHEETPADDING(4), LABELLINE(10)+8, PROPSHEETWIDTH-PROPSHEETPADDING(6), LABELLINE(7), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP GROUPBOX "Slow Keys",-1,PROPSHEETPADDING(1),LABELLINE(14),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+4 LTEXT "&Keys must be held down for:",-1,PROPSHEETPADDING(2),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) - - LTEXT "0.5 seconds",IDC_REPEAT_WAIT_EDIT,PROPSHEETPADDING(2),LABELLINE(16)+4,PROPSHEETPADDING(9),LABELLINE(1) - - LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1) - CONTROL "",IDC_REPEAT_WAIT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(16)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) - LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1) - - LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(6),LABELLINE(1) - EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL + COMBOBOX IDC_REPEAT_WAIT_COMBO, PROPSHEETPADDING(2), LABELLINE(16)+4, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(8), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(8),LABELLINE(1) + EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(10),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(11),14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 Modified: trunk/reactos/dll/cpl/access/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/ru-RU.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/ru-RU.rc (original) +++ trunk/reactos/dll/cpl/access/lang/ru-RU.rc Mon Sep 3 18:44:08 2007 @@ -225,14 +225,11 @@ BEGIN GROUPBOX "Bounce Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) LTEXT "&Ignore keystrokes repeated faster than:",-1,PROPSHEETPADDING(2),LABELLINE(2)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) - - LTEXT "",IDC_BOUNCE_TIME_EDIT,PROPSHEETPADDING(2),LABELLINE(3)+4,PROPSHEETPADDING(9),LABELLINE(1) - LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1) - CONTROL "",IDC_BOUNCE_TIME_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(3)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) - LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1) - - LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(6),LABELLINE(1) - EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL + COMBOBOX IDC_BOUNCE_TIME_COMBO, PROPSHEETPADDING(2), LABELLINE(3)+5, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(8),LABELLINE(1) + EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(10),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(11),14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 @@ -247,36 +244,24 @@ GROUPBOX "Repeat Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(12) LTEXT "Override settings on the Keyboard control panel:",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) - RADIOBUTTON "&No keyboard repeat",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP - RADIOBUTTON "&Slow down keyboard repeat rates",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1) + AUTORADIOBUTTON "&No keyboard repeat",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP + AUTORADIOBUTTON "&Slow down keyboard repeat rates",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1) LTEXT "Repeat &delay:",-1,PROPSHEETPADDING(4),LABELLINE(6)+4,PROPSHEETPADDING(10),LABELLINE(1) - - LTEXT "0.5 seconds",IDC_REPEAT_DELAY_EDIT,PROPSHEETPADDING(4),LABELLINE(7)+6,PROPSHEETPADDING(9),LABELLINE(1) - - LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1) - CONTROL "",IDC_REPEAT_DELAY_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(7)+3,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) - LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1) + COMBOBOX IDC_REPEAT_DELAY_COMBO, PROPSHEETPADDING(4), LABELLINE(7)+6, PROPSHEETWIDTH-PROPSHEETPADDING(6), LABELLINE(6), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP LTEXT "Repeat &rate:",-1,PROPSHEETPADDING(4),LABELLINE(9)+6,PROPSHEETPADDING(10),LABELLINE(1) - - LTEXT "0.5 seconds",IDC_REPEAT_REPEAT_EDIT,PROPSHEETPADDING(4),LABELLINE(10)+8,PROPSHEETPADDING(9),LABELLINE(1) - - LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1) - CONTROL "",IDC_REPEAT_REPEAT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(10)+6,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) - LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1) + COMBOBOX IDC_REPEAT_REPEAT_COMBO, PROPSHEETPADDING(4), LABELLINE(10)+8, PROPSHEETWIDTH-PROPSHEETPADDING(6), LABELLINE(7), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP GROUPBOX "Slow Keys",-1,PROPSHEETPADDING(1),LABELLINE(14),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+4 LTEXT "&Keys must be held down for:",-1,PROPSHEETPADDING(2),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) - - LTEXT "0.5 seconds",IDC_REPEAT_WAIT_EDIT,PROPSHEETPADDING(2),LABELLINE(16)+4,PROPSHEETPADDING(9),LABELLINE(1) - - LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1) - CONTROL "",IDC_REPEAT_WAIT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(16)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2) - LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1) - - LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(6),LABELLINE(1) - EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL + COMBOBOX IDC_REPEAT_WAIT_COMBO, PROPSHEETPADDING(2), LABELLINE(16)+4, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(8), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(8),LABELLINE(1) + EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(10),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(11),14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 Modified: trunk/reactos/dll/cpl/access/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/resource.h?… ============================================================================== --- trunk/reactos/dll/cpl/access/resource.h (original) +++ trunk/reactos/dll/cpl/access/resource.h Mon Sep 3 18:44:08 2007 @@ -82,19 +82,15 @@ #define IDC_FILTER_SOUND_CHECK 236 #define IDC_FILTER_STATUS_CHECK 237 -#define IDC_BOUNCE_TIME_EDIT 238 -#define IDC_BOUNCE_TIME_TRACK 239 -#define IDC_BOUNCE_TEST_EDIT 240 +#define IDC_BOUNCE_TIME_COMBO 238 +#define IDC_BOUNCE_TEST_EDIT 239 -#define IDC_REPEAT_NOREPEAT_RADIO 241 -#define IDC_REPEAT_REPEAT_RADIO 242 -#define IDC_REPEAT_DELAY_EDIT 243 -#define IDC_REPEAT_DELAY_TRACK 244 -#define IDC_REPEAT_REPEAT_EDIT 245 -#define IDC_REPEAT_REPEAT_TRACK 246 -#define IDC_REPEAT_WAIT_EDIT 247 -#define IDC_REPEAT_WAIT_TRACK 248 -#define IDC_REPEAT_TEST_EDIT 249 +#define IDC_REPEAT_NOREPEAT_RADIO 240 +#define IDC_REPEAT_REPEAT_RADIO 241 +#define IDC_REPEAT_DELAY_COMBO 242 +#define IDC_REPEAT_REPEAT_COMBO 243 +#define IDC_REPEAT_WAIT_COMBO 244 +#define IDC_REPEAT_TEST_EDIT 245 #define IDC_TOGGLE_ACTIVATE_CHECK 250

1 0

[hpoussin] 28814: Build openfirmware interface tool only if target is powerpc
by hpoussin＠svn.reactos.org 03 Sep '07

03 Sep '07

Author: hpoussin Date: Mon Sep 3 17:50:31 2007 New Revision: 28814 URL: http://svn.reactos.org/svn/reactos?rev=28814&view=rev Log: Build openfirmware interface tool only if target is powerpc Modified: trunk/reactos/Makefile Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=28814&r1=2881… ============================================================================== --- trunk/reactos/Makefile (original) +++ trunk/reactos/Makefile Mon Sep 3 17:50:31 2007 @@ -38,7 +38,7 @@ # This can require several minutes to complete. If you only need to check # dependencies for a single or few modules then you can use the # module_depends targets instead. This target can also repair a damaged or -# missing makefile.auto if needed. +# missing makefile-{ROS_ARCH}.auto if needed. # # module_depends # These targets do a dependency check of individual modules. Replace module @@ -65,13 +65,13 @@ # files are generated files that are needed to generate the final # output files. Examples of intermediate files include *.o, *.a, and # *.coff. N.B. Don't put a path separator at the end. The variable -# defaults to .\obj-i386. +# defaults to .\obj-{ROS_ARCH}. # # ROS_OUTPUT # This variable controls where to put output files. Output files are # generated files that makes up the result of the build process. # Examples of output files include *.exe, *.dll, and *.sys. N.B. Don't -# put a path separator at the end. The variable defaults to .\output-i386. +# put a path separator at the end. The variable defaults to .\output-{ROS_ARCH}. # # ROS_CDOUTPUT # This variable controls the name of the ReactOS directory on cdrom. @@ -89,7 +89,7 @@ # ROS_INSTALL # This variable controls where to install output files to when using # 'make install'. N.B. Don't put a path separator at the end. The variable -# defaults to .\reactos. +# defaults to .\{ROS_CDOUTPUT}. # # ROS_BUILDMAP # This variable controls if map files are to be generated for executable @@ -146,6 +146,12 @@ .PHONY: clean .PHONY: world .PHONY: universe + +ifneq ($(ROS_ARCH),) + ARCH := $(ROS_ARCH) +else + ARCH := i386 +endif ifeq ($(ROS_AUTOMAKE),) ROS_AUTOMAKE=makefile.auto @@ -327,31 +333,17 @@ endif endif -ifneq ($(ROS_ARCH),) - ARCH := $(ROS_ARCH) -else - ARCH := i386 -endif - ifneq ($(ROS_INTERMEDIATE),) INTERMEDIATE := $(ROS_INTERMEDIATE) else - ifneq ($(ROS_CDOUTPUT),) - INTERMEDIATE := obj-$(ROS_CDOUTPUT) - else - INTERMEDIATE := obj-$(ARCH) - endif + INTERMEDIATE := obj-$(ARCH) endif INTERMEDIATE_ := $(INTERMEDIATE)$(SEP) ifneq ($(ROS_OUTPUT),) OUTPUT := $(ROS_OUTPUT) else - ifneq ($(ROS_CDOUTPUT),) - OUTPUT := output-$(ROS_CDOUTPUT) - else - OUTPUT := output-$(ARCH) - endif + OUTPUT := output-$(ARCH) endif OUTPUT_ := $(OUTPUT)$(SEP) @@ -372,11 +364,7 @@ ifneq ($(ROS_INSTALL),) INSTALL := $(ROS_INSTALL) else - ifneq ($(ROS_CDOUTPUT),) - INSTALL := reactos.$(ROS_CDOUTPUT) - else - INSTALL := reactos - endif + INSTALL := $(CDOUTPUT) endif INSTALL_ := $(INSTALL)$(SEP) @@ -414,10 +402,9 @@ $(ERRCODES_H) \ $(ERRCODES_RC) \ $(GENDIB_DIB_FILES) \ - $(NCI_SERVICE_FILES) \ - $(OFW_INTERFACE_SERVICE_FILES) + $(NCI_SERVICE_FILES) ifeq ($(ARCH),powerpc) -PREAUTO += $(PPCMMU_TARGETS) +PREAUTO += $(OFW_INTERFACE_SERVICE_FILES) $(PPCMMU_TARGETS) endif $(ROS_AUTOMAKE): $(RBUILD_TARGET) $(PREAUTO) $(XMLBUILDFILES)

1 0

[hpoussin] 28813: Check a Windows host by _WIN32 define, not WINDOWS_HOST
by hpoussin＠svn.reactos.org 03 Sep '07

03 Sep '07

Author: hpoussin Date: Mon Sep 3 17:43:39 2007 New Revision: 28813 URL: http://svn.reactos.org/svn/reactos?rev=28813&view=rev Log: Check a Windows host by _WIN32 define, not WINDOWS_HOST Modified: trunk/reactos/tools/mkhive/mkhive.c Modified: trunk/reactos/tools/mkhive/mkhive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/mkhive.c?rev=… ============================================================================== --- trunk/reactos/tools/mkhive/mkhive.c (original) +++ trunk/reactos/tools/mkhive/mkhive.c Mon Sep 3 17:43:39 2007 @@ -35,7 +35,7 @@ #define PATH_MAX _MAX_PATH #endif//_MSC_VER -#ifndef WINDOWS_HOST +#ifndef _WIN32 #ifndef PATH_MAX #define PATH_MAX 260 #endif @@ -62,7 +62,7 @@ i = 0; while (src[i] != 0) { -#ifdef WINDOWS_HOST +#ifdef _WIN32 if (src[i] == '/') { dst[i] = '\\';

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs