Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 29706: Fix indentation (TABs --> Spaces). Use BEGIN and END instead of { and } in resource scripts.
by ekohl＠svn.reactos.org 20 Oct '07

20 Oct '07

Author: ekohl Date: Sat Oct 20 15:08:23 2007 New Revision: 29706 URL: http://svn.reactos.org/svn/reactos?rev=29706&view=rev Log: Fix indentation (TABs --> Spaces). Use BEGIN and END instead of { and } in resource scripts. Modified: trunk/reactos/dll/cpl/input/add.c trunk/reactos/dll/cpl/input/advanced.c trunk/reactos/dll/cpl/input/changekeyseq.c trunk/reactos/dll/cpl/input/input.c trunk/reactos/dll/cpl/input/input.h trunk/reactos/dll/cpl/input/inputlangprop.c trunk/reactos/dll/cpl/input/keysettings.c trunk/reactos/dll/cpl/input/lang/de-DE.rc trunk/reactos/dll/cpl/input/lang/en-US.rc trunk/reactos/dll/cpl/input/lang/fr-FR.rc trunk/reactos/dll/cpl/input/lang/uk-UA.rc trunk/reactos/dll/cpl/input/langbar.c trunk/reactos/dll/cpl/input/misc.c trunk/reactos/dll/cpl/input/settings.c Modified: trunk/reactos/dll/cpl/input/add.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/add.c?rev=29… ============================================================================== --- trunk/reactos/dll/cpl/input/add.c (original) +++ trunk/reactos/dll/cpl/input/add.c Sat Oct 20 15:08:23 2007 @@ -18,10 +18,10 @@ */ /* * - * PROJECT: input.dll - * FILE: dll/win32/input/add.c - * PURPOSE: input.dll - * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) + * PROJECT: input.dll + * FILE: dll/win32/input/add.c + * PURPOSE: input.dll + * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) * UPDATE HISTORY: * 06-09-2007 Created */ @@ -99,10 +99,10 @@ hLanguageList = hWnd; EnumSystemLocales(LanguagesEnumProc, LCID_INSTALLED); - LoadString(hApplet, - IDS_SELECTED_LANGUAGE, - LangSel, - sizeof(LangSel) / sizeof(TCHAR)); + LoadString(hApplet, + IDS_SELECTED_LANGUAGE, + LangSel, + sizeof(LangSel) / sizeof(TCHAR)); SendMessage(hLanguageList, CB_SELECTSTRING, @@ -114,54 +114,52 @@ VOID SelectCurrentLayout(HWND hWnd) { - TCHAR Layout[256]; + TCHAR Layout[256]; - LoadString(hApplet, - IDS_SELECTED_LAYOUT, - Layout, - sizeof(Layout) / sizeof(TCHAR)); - SendMessage(hWnd, - CB_SELECTSTRING, - (WPARAM) -1, - (LPARAM)Layout); + LoadString(hApplet, + IDS_SELECTED_LAYOUT, + Layout, + sizeof(Layout) / sizeof(TCHAR)); + SendMessage(hWnd, + CB_SELECTSTRING, + (WPARAM) -1, + (LPARAM)Layout); } INT_PTR CALLBACK AddDlgProc(HWND hDlg, - UINT message, - WPARAM wParam, - LPARAM lParam) + UINT message, + WPARAM wParam, + LPARAM lParam) { UNREFERENCED_PARAMETER(lParam); switch (message) { case WM_INITDIALOG: - { - CreateLanguagesList(GetDlgItem(hDlg, IDC_INPUT_LANGUAGE_COMBO)); - CreateKeyboardLayoutList(GetDlgItem(hDlg, IDC_KEYBOARD_LAYOUT_COMBO)); - SelectCurrentLayout(GetDlgItem(hDlg, IDC_KEYBOARD_LAYOUT_COMBO)); - } + CreateLanguagesList(GetDlgItem(hDlg, IDC_INPUT_LANGUAGE_COMBO)); + CreateKeyboardLayoutList(GetDlgItem(hDlg, IDC_KEYBOARD_LAYOUT_COMBO)); + SelectCurrentLayout(GetDlgItem(hDlg, IDC_KEYBOARD_LAYOUT_COMBO)); + break; + case WM_COMMAND: - { - switch (LOWORD(wParam)) - { - case IDC_INPUT_LANGUAGE_COMBO: - if (HIWORD(wParam) == CBN_SELCHANGE) - { - SelectCurrentLayout(GetDlgItem(hDlg, IDC_KEYBOARD_LAYOUT_COMBO)); - } - break; - case IDOK: + switch (LOWORD(wParam)) + { + case IDC_INPUT_LANGUAGE_COMBO: + if (HIWORD(wParam) == CBN_SELCHANGE) + { + SelectCurrentLayout(GetDlgItem(hDlg, IDC_KEYBOARD_LAYOUT_COMBO)); + } + break; - break; - case IDCANCEL: - EndDialog(hDlg,LOWORD(wParam)); - return TRUE; - break; - } - } - break; + case IDOK: + break; + + case IDCANCEL: + EndDialog(hDlg, LOWORD(wParam)); + return TRUE; + } + break; } return FALSE; Modified: trunk/reactos/dll/cpl/input/advanced.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/advanced.c?r… ============================================================================== --- trunk/reactos/dll/cpl/input/advanced.c (original) +++ trunk/reactos/dll/cpl/input/advanced.c Sat Oct 20 15:08:23 2007 @@ -18,10 +18,10 @@ */ /* * - * PROJECT: input.dll - * FILE: dll/win32/input/advanced.c - * PURPOSE: input.dll - * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) + * PROJECT: input.dll + * FILE: dll/win32/input/advanced.c + * PURPOSE: input.dll + * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) * UPDATE HISTORY: * 06-09-2007 Created */ @@ -41,28 +41,29 @@ /* Property page dialog callback */ INT_PTR CALLBACK -AdvancedPageProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam) +AdvancedPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { - UNREFERENCED_PARAMETER(lParam); - UNREFERENCED_PARAMETER(wParam); - UNREFERENCED_PARAMETER(hwndDlg); - switch(uMsg) - { - case WM_INITDIALOG: + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); + UNREFERENCED_PARAMETER(hwndDlg); - break; - case WM_COMMAND: - switch (LOWORD(wParam)) - { - case IDC_SUPPORT_ADV_SERV_CHECKBOX: - case IDC_TURNOFF_ADV_TXTSERV_CHECKBOX: - PropSheet_Changed(GetParent(hwndDlg), hwndDlg); - break; - } - break; - } + switch (uMsg) + { + case WM_INITDIALOG: + break; - return FALSE; + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDC_SUPPORT_ADV_SERV_CHECKBOX: + case IDC_TURNOFF_ADV_TXTSERV_CHECKBOX: + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + break; + } + break; + } + + return FALSE; } /* EOF */ Modified: trunk/reactos/dll/cpl/input/changekeyseq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/changekeyseq… ============================================================================== --- trunk/reactos/dll/cpl/input/changekeyseq.c (original) +++ trunk/reactos/dll/cpl/input/changekeyseq.c Sat Oct 20 15:08:23 2007 @@ -18,10 +18,10 @@ */ /* * - * PROJECT: input.dll - * FILE: dll/win32/input/changekeyseq.c - * PURPOSE: input.dll - * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) + * PROJECT: input.dll + * FILE: dll/win32/input/changekeyseq.c + * PURPOSE: input.dll + * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) * UPDATE HISTORY: * 06-09-2007 Created */ @@ -41,31 +41,28 @@ INT_PTR CALLBACK ChangeKeySeqDlgProc(HWND hDlg, - UINT message, - WPARAM wParam, - LPARAM lParam) + UINT message, + WPARAM wParam, + LPARAM lParam) { UNREFERENCED_PARAMETER(lParam); switch (message) { case WM_INITDIALOG: - { + break; - } case WM_COMMAND: - { - switch (LOWORD(wParam)) - { - case IDOK: + switch (LOWORD(wParam)) + { + case IDOK: + break; - break; - case IDCANCEL: - EndDialog(hDlg,LOWORD(wParam)); - break; - } - } - break; + case IDCANCEL: + EndDialog(hDlg, LOWORD(wParam)); + break; + } + break; } return FALSE; Modified: trunk/reactos/dll/cpl/input/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/input/input.c (original) +++ trunk/reactos/dll/cpl/input/input.c Sat Oct 20 15:08:23 2007 @@ -18,10 +18,10 @@ */ /* * - * PROJECT: input.dll - * FILE: dll/win32/input/input.c - * PURPOSE: input.dll - * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) + * PROJECT: input.dll + * FILE: dll/win32/input/input.c + * PURPOSE: input.dll + * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) * UPDATE HISTORY: * 06-09-2007 Created */ @@ -50,15 +50,16 @@ {IDI_CPLSYSTEM, IDS_CPLSYSTEMNAME, IDS_CPLSYSTEMDESCRIPTION, SystemApplet} }; + VOID InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc) { - ZeroMemory(psp, sizeof(PROPSHEETPAGE)); - psp->dwSize = sizeof(PROPSHEETPAGE); - psp->dwFlags = PSP_DEFAULT; - psp->hInstance = hApplet; - psp->pszTemplate = MAKEINTRESOURCE(idDlg); - psp->pfnDlgProc = DlgProc; + ZeroMemory(psp, sizeof(PROPSHEETPAGE)); + psp->dwSize = sizeof(PROPSHEETPAGE); + psp->dwFlags = PSP_DEFAULT; + psp->hInstance = hApplet; + psp->pszTemplate = MAKEINTRESOURCE(idDlg); + psp->pfnDlgProc = DlgProc; } @@ -67,28 +68,28 @@ LONG CALLBACK SystemApplet(VOID) { - PROPSHEETPAGE psp[2]; - PROPSHEETHEADER psh; - TCHAR Caption[1024]; + PROPSHEETPAGE psp[2]; + PROPSHEETHEADER psh; + TCHAR Caption[1024]; - LoadString(hApplet, IDS_CPLSYSTEMNAME, Caption, sizeof(Caption) / sizeof(TCHAR)); + LoadString(hApplet, IDS_CPLSYSTEMNAME, Caption, sizeof(Caption) / sizeof(TCHAR)); - ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); - psh.dwSize = sizeof(PROPSHEETHEADER); - psh.dwFlags = PSH_PROPSHEETPAGE; - psh.hwndParent = NULL; - psh.hInstance = hApplet; - psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDI_CPLSYSTEM)); - psh.pszCaption = Caption; - psh.nPages = sizeof(psp) / sizeof(PROPSHEETPAGE); - psh.nStartPage = 0; - psh.ppsp = psp; - psh.pfnCallback = NULL; + ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); + psh.dwSize = sizeof(PROPSHEETHEADER); + psh.dwFlags = PSH_PROPSHEETPAGE; + psh.hwndParent = NULL; + psh.hInstance = hApplet; + psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDI_CPLSYSTEM)); + psh.pszCaption = Caption; + psh.nPages = sizeof(psp) / sizeof(PROPSHEETPAGE); + psh.nStartPage = 0; + psh.ppsp = psp; + psh.pfnCallback = NULL; - InitPropSheetPage(&psp[0], IDD_PROPPAGESETTINGS, (DLGPROC) SettingPageProc); - InitPropSheetPage(&psp[1], IDD_PROPPAGEADVANCED, (DLGPROC) AdvancedPageProc); + InitPropSheetPage(&psp[0], IDD_PROPPAGESETTINGS, (DLGPROC) SettingPageProc); + InitPropSheetPage(&psp[1], IDD_PROPPAGEADVANCED, (DLGPROC) AdvancedPageProc); - return (LONG)(PropertySheet(&psh) != -1); + return (LONG)(PropertySheet(&psh) != -1); } @@ -96,49 +97,51 @@ LONG CALLBACK CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) { - CPLINFO *CPlInfo; - DWORD i; + CPLINFO *CPlInfo; + DWORD i; - UNREFERENCED_PARAMETER(hwndCPl); + UNREFERENCED_PARAMETER(hwndCPl); - i = (DWORD)lParam1; - switch(uMsg) - { - case CPL_INIT: - return TRUE; + i = (DWORD)lParam1; + switch (uMsg) + { + case CPL_INIT: + return TRUE; - case CPL_GETCOUNT: - return NUM_APPLETS; + case CPL_GETCOUNT: + return NUM_APPLETS; - case CPL_INQUIRE: - CPlInfo = (CPLINFO*)lParam2; - CPlInfo->lData = 0; - CPlInfo->idIcon = Applets[i].idIcon; - CPlInfo->idName = Applets[i].idName; - CPlInfo->idInfo = Applets[i].idDescription; - break; + case CPL_INQUIRE: + CPlInfo = (CPLINFO*)lParam2; + CPlInfo->lData = 0; + CPlInfo->idIcon = Applets[i].idIcon; + CPlInfo->idName = Applets[i].idName; + CPlInfo->idInfo = Applets[i].idDescription; + break; - case CPL_DBLCLK: - Applets[i].AppletProc(); - break; - } + case CPL_DBLCLK: + Applets[i].AppletProc(); + break; + } - return FALSE; + return FALSE; } BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID lpvReserved) { - UNREFERENCED_PARAMETER(lpvReserved); - switch(dwReason) - { - case DLL_PROCESS_ATTACH: - case DLL_THREAD_ATTACH: - hApplet = hinstDLL; - break; - } - return TRUE; + UNREFERENCED_PARAMETER(lpvReserved); + + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + case DLL_THREAD_ATTACH: + hApplet = hinstDLL; + break; + } + + return TRUE; } /* EOF */ Modified: trunk/reactos/dll/cpl/input/input.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.h?rev=… ============================================================================== --- trunk/reactos/dll/cpl/input/input.h (original) +++ trunk/reactos/dll/cpl/input/input.h Sat Oct 20 15:08:23 2007 @@ -5,10 +5,10 @@ typedef struct { - int idIcon; - int idName; - int idDescription; - CPLAPPLET_PROC AppletProc; + int idIcon; + int idName; + int idDescription; + CPLAPPLET_PROC AppletProc; } APPLET, *PAPPLET; extern HINSTANCE hApplet; Modified: trunk/reactos/dll/cpl/input/inputlangprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/inputlangpro… ============================================================================== --- trunk/reactos/dll/cpl/input/inputlangprop.c (original) +++ trunk/reactos/dll/cpl/input/inputlangprop.c Sat Oct 20 15:08:23 2007 @@ -18,10 +18,10 @@ */ /* * - * PROJECT: input.dll - * FILE: dll/win32/input/inputlangprop.c - * PURPOSE: input.dll - * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) + * PROJECT: input.dll + * FILE: dll/win32/input/inputlangprop.c + * PURPOSE: input.dll + * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) * UPDATE HISTORY: * 06-09-2007 Created */ @@ -43,12 +43,12 @@ VOID SelectKeyboardLayout(HWND hWnd) { - TCHAR Layout[256]; + TCHAR Layout[256]; - SendMessage(hWnd, - CB_SELECTSTRING, - (WPARAM) -1, - (LPARAM)Layout); + SendMessage(hWnd, + CB_SELECTSTRING, + (WPARAM) -1, + (LPARAM)Layout); } INT_PTR CALLBACK @@ -62,23 +62,21 @@ switch (message) { case WM_INITDIALOG: - { - CreateKeyboardLayoutList(GetDlgItem(hDlg, IDC_KEYBOARD_LAYOUT_IME_COMBO)); - SelectKeyboardLayout(GetDlgItem(hDlg, IDC_KEYBOARD_LAYOUT_IME_COMBO)); - } + CreateKeyboardLayoutList(GetDlgItem(hDlg, IDC_KEYBOARD_LAYOUT_IME_COMBO)); + SelectKeyboardLayout(GetDlgItem(hDlg, IDC_KEYBOARD_LAYOUT_IME_COMBO)); + break; + case WM_COMMAND: - { - switch (LOWORD(wParam)) - { - case IDOK: + switch (LOWORD(wParam)) + { + case IDOK: + break; - break; - case IDCANCEL: - EndDialog(hDlg,LOWORD(wParam)); - break; - } - } - break; + case IDCANCEL: + EndDialog(hDlg,LOWORD(wParam)); + break; + } + break; } return FALSE; Modified: trunk/reactos/dll/cpl/input/keysettings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/keysettings.… ============================================================================== --- trunk/reactos/dll/cpl/input/keysettings.c (original) +++ trunk/reactos/dll/cpl/input/keysettings.c Sat Oct 20 15:08:23 2007 @@ -18,10 +18,10 @@ */ /* * - * PROJECT: input.dll - * FILE: dll/win32/input/keysettings.c - * PURPOSE: input.dll - * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) + * PROJECT: input.dll + * FILE: dll/win32/input/keysettings.c + * PURPOSE: input.dll + * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) * UPDATE HISTORY: * 06-09-2007 Created */ @@ -41,37 +41,35 @@ INT_PTR CALLBACK KeySettingsDlgProc(HWND hDlg, - UINT message, - WPARAM wParam, - LPARAM lParam) + UINT message, + WPARAM wParam, + LPARAM lParam) { UNREFERENCED_PARAMETER(lParam); switch (message) { case WM_INITDIALOG: - { + break; - } case WM_COMMAND: - { - switch (LOWORD(wParam)) - { - case IDC_CHANGE_KEY_SEQ_BUTTON: - DialogBox(hApplet, - MAKEINTRESOURCE(IDD_CHANGE_KEY_SEQ), - hDlg, - ChangeKeySeqDlgProc); - break; - case IDOK: + switch (LOWORD(wParam)) + { + case IDC_CHANGE_KEY_SEQ_BUTTON: + DialogBox(hApplet, + MAKEINTRESOURCE(IDD_CHANGE_KEY_SEQ), + hDlg, + ChangeKeySeqDlgProc); + break; - break; - case IDCANCEL: - EndDialog(hDlg,LOWORD(wParam)); - break; - } - } - break; + case IDOK: + break; + + case IDCANCEL: + EndDialog(hDlg, LOWORD(wParam)); + break; + } + break; } return FALSE; Modified: trunk/reactos/dll/cpl/input/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/de-DE.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/input/lang/de-DE.rc Sat Oct 20 15:08:23 2007 @@ -5,19 +5,19 @@ CAPTION "Einstellungen" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "&Standard Eingabesprache", -1, 7,7,231,53 - LTEXT "Wählen Sie eine der installieren Sprachen aus, die Sie beim Einschalten des PCs nutzen wollen ",-1,14,18,220,17 - COMBOBOX IDC_DEFAULT_INPUT_LANG, 14, 40, 218, 46, CBS_DROPDOWNLIST - GROUPBOX "Installierte &Dienste", -1, 7,65,231,115 - LTEXT "Wählen Sie die Dienste, die Sie für jede Eingabesprache in der Liste sehen wollen. Nutzen Sie die ""Hinzufügen"" und ""Entfernen"" Schaltflächen um diese Liste zu bearbeiten.",-1,14,75,220,17 - CONTROL "TEXT", IDC_KEYLAYOUT_TREE, "SysTreeView32", WS_BORDER | WS_VSCROLL | WS_TABSTOP | 0x00000034, 14, 96, 160, 78 - PUSHBUTTON "&Als Standard setzen", IDC_SET_DEFAULT, 179, 106, 53, 14 - PUSHBUTTON "&Hinzufügen...", IDC_ADD_BUTTON, 179, 124, 53, 14 - PUSHBUTTON "Ent&fernen...", IDC_REMOVE_BUTTON, 179, 142, 53, 14 - PUSHBUTTON "&Eigenschaften...", IDC_PROP_BUTTON, 179, 160, 53, 14 - GROUPBOX "&Einstellungen", -1, 7,185,231,36 - PUSHBUTTON "Sprach&leiste...", IDC_LANG_BAR_BUTTON, 14, 198, 70, 14 - PUSHBUTTON "&Tasteneinstellungen...", IDC_KEY_SETTINGS_BUTTON, 90, 198, 70, 14 + GROUPBOX "&Standard Eingabesprache", -1, 7,7,231,53 + LTEXT "Wählen Sie eine der installieren Sprachen aus, die Sie beim Einschalten des PCs nutzen wollen ",-1,14,18,220,17 + COMBOBOX IDC_DEFAULT_INPUT_LANG, 14, 40, 218, 46, CBS_DROPDOWNLIST + GROUPBOX "Installierte &Dienste", -1, 7,65,231,115 + LTEXT "Wählen Sie die Dienste, die Sie für jede Eingabesprache in der Liste sehen wollen. Nutzen Sie die ""Hinzufügen"" und ""Entfernen"" Schaltflächen um diese Liste zu bearbeiten.",-1,14,75,220,17 + CONTROL "TEXT", IDC_KEYLAYOUT_TREE, "SysTreeView32", WS_BORDER | WS_VSCROLL | WS_TABSTOP | 0x00000034, 14, 96, 160, 78 + PUSHBUTTON "&Als Standard setzen", IDC_SET_DEFAULT, 179, 106, 53, 14 + PUSHBUTTON "&Hinzufügen...", IDC_ADD_BUTTON, 179, 124, 53, 14 + PUSHBUTTON "Ent&fernen...", IDC_REMOVE_BUTTON, 179, 142, 53, 14 + PUSHBUTTON "&Eigenschaften...", IDC_PROP_BUTTON, 179, 160, 53, 14 + GROUPBOX "&Einstellungen", -1, 7,185,231,36 + PUSHBUTTON "Sprach&leiste...", IDC_LANG_BAR_BUTTON, 14, 198, 70, 14 + PUSHBUTTON "&Tasteneinstellungen...", IDC_KEY_SETTINGS_BUTTON, 90, 198, 70, 14 END IDD_PROPPAGEADVANCED DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT @@ -25,12 +25,12 @@ CAPTION "Erweitert" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Kompatibilitäts-Konfiguration", -1, 7,7,231,60 - AUTOCHECKBOX "&Erweiterte Textdienste in allen Programmen verwenden.", IDC_SUPPORT_ADV_SERV_CHECKBOX, 14, 19, 210, 10, WS_GROUP - LTEXT "Aktivieren Sie diese Funktion, um alle Erweiterten Textdienste in Notepad und anderen Programmen zu aktivieren, die normalerweise keine Sprach- und Handschrifterkennung oder andere Erweiterte Textdienste unterstützen.",-1,14,33,220,25 - GROUPBOX "Systemkonfiguration", -1, 7,74,231,60 - AUTOCHECKBOX "Erweiterte Textdienste d&eaktivieren", IDC_TURNOFF_ADV_TXTSERV_CHECKBOX, 14, 86, 210, 10, WS_GROUP - LTEXT "Wählen Sie diese Option, um alle Erweiterten Textdienste in allen Programmen zu deaktivieren. Dies ist für Ostasiatische Sprachen nicht empfohlen, da somit die Sprachleiste geschlossen wird.",-1,14,100,220,25 + GROUPBOX "Kompatibilitäts-Konfiguration", -1, 7,7,231,60 + AUTOCHECKBOX "&Erweiterte Textdienste in allen Programmen verwenden.", IDC_SUPPORT_ADV_SERV_CHECKBOX, 14, 19, 210, 10, WS_GROUP + LTEXT "Aktivieren Sie diese Funktion, um alle Erweiterten Textdienste in Notepad und anderen Programmen zu aktivieren, die normalerweise keine Sprach- und Handschrifterkennung oder andere Erweiterte Textdienste unterstützen.",-1,14,33,220,25 + GROUPBOX "Systemkonfiguration", -1, 7,74,231,60 + AUTOCHECKBOX "Erweiterte Textdienste d&eaktivieren", IDC_TURNOFF_ADV_TXTSERV_CHECKBOX, 14, 86, 210, 10, WS_GROUP + LTEXT "Wählen Sie diese Option, um alle Erweiterten Textdienste in allen Programmen zu deaktivieren. Dies ist für Ostasiatische Sprachen nicht empfohlen, da somit die Sprachleiste geschlossen wird.",-1,14,100,220,25 END IDD_LANGBAR DIALOG 20, 20, 240, 120 @@ -114,120 +114,126 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Add Input Language" FONT 8, "MS Shell Dlg" -{ - LTEXT "&Input language:", -1, 7, 7, 61, 10 - COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 105, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - AUTOCHECKBOX "&Keyboard layout/IME:", IDC_KEYBOARD_LO_CHECKBOX, 37, 36, 110, 10 - COMBOBOX IDC_KEYBOARD_LO_COMBO, 49, 47, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - AUTOCHECKBOX "&Handwriting recognition:", IDC_HANDWRITING_REC_CHECKBOX, 37, 65, 110, 10 - COMBOBOX IDC_HANDWRITING_REC_COMBO, 49, 76, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - AUTOCHECKBOX "&Speech:", IDC_SPEECH_CHECKBOX, 37, 94, 110, 10 - COMBOBOX IDC_SPEECH_COMBO, 49, 105, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - AUTOCHECKBOX "&More Text Services:", IDC_MORE_TEXT_SERV_CHECKBOX, 37, 123, 110, 10 - COMBOBOX IDC_MORE_TEXT_SERV_COMBO, 49, 134, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - DEFPUSHBUTTON "OK", IDOK, 146, 155, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 199, 155, 50, 14 -} +BEGIN + LTEXT "&Input language:", -1, 7, 7, 61, 10 + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 105, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&Keyboard layout/IME:", IDC_KEYBOARD_LO_CHECKBOX, 37, 36, 110, 10 + COMBOBOX IDC_KEYBOARD_LO_COMBO, 49, 47, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&Handwriting recognition:", IDC_HANDWRITING_REC_CHECKBOX, 37, 65, 110, 10 + COMBOBOX IDC_HANDWRITING_REC_COMBO, 49, 76, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&Speech:", IDC_SPEECH_CHECKBOX, 37, 94, 110, 10 + COMBOBOX IDC_SPEECH_COMBO, 49, 105, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&More Text Services:", IDC_MORE_TEXT_SERV_CHECKBOX, 37, 123, 110, 10 + COMBOBOX IDC_MORE_TEXT_SERV_COMBO, 49, 134, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + DEFPUSHBUTTON "OK", IDOK, 146, 155, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 199, 155, 50, 14 +END IDD_ADD3 DIALOG 20, 20, 257, 147 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Add Input Language" FONT 8, "MS Shell Dlg" -{ - LTEXT "&Input language:", -1, 7, 7, 61, 10 - COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 105, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - AUTOCHECKBOX "&Keyboard layout/IME:", IDC_KEYBOARD_LO_CHECKBOX, 37, 36, 110, 10 - COMBOBOX IDC_KEYBOARD_LO_COMBO, 49, 47, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - AUTOCHECKBOX "&Handwriting recognition:", IDC_HANDWRITING_REC_CHECKBOX, 37, 65, 110, 10 - COMBOBOX IDC_HANDWRITING_REC_COMBO, 49, 76, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - AUTOCHECKBOX "&Speech:", IDC_SPEECH_CHECKBOX, 37, 94, 110, 10 - COMBOBOX IDC_SPEECH_COMBO, 49, 105, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - DEFPUSHBUTTON "OK", IDOK, 146, 126, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 199, 126, 50, 14 -} +BEGIN + LTEXT "&Input language:", -1, 7, 7, 61, 10 + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 105, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&Keyboard layout/IME:", IDC_KEYBOARD_LO_CHECKBOX, 37, 36, 110, 10 + COMBOBOX IDC_KEYBOARD_LO_COMBO, 49, 47, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&Handwriting recognition:", IDC_HANDWRITING_REC_CHECKBOX, 37, 65, 110, 10 + COMBOBOX IDC_HANDWRITING_REC_COMBO, 49, 76, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&Speech:", IDC_SPEECH_CHECKBOX, 37, 94, 110, 10 + COMBOBOX IDC_SPEECH_COMBO, 49, 105, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + DEFPUSHBUTTON "OK", IDOK, 146, 126, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 199, 126, 50, 14 +END IDD_CHANGE_KEY_SEQ DIALOG 5, 100, 285, 74 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Change Key Sequence" FONT 8, "MS Shell Dlg" -{ - GROUPBOX "", -1, 9, 5, 209, 60 - AUTOCHECKBOX "&Switch input languages", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12 - LTEXT "SHIFT", -1, 73, 37, 27, 12 - CTEXT "+", -1, 62, 37, 8, 9 - AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11, WS_GROUP - AUTORADIOBUTTON "Left &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP - AUTOCHECKBOX "S&witch keyboard layouts", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 121, 15, 90, 12 - LTEXT "SHIFT", -1, 179, 37, 27, 12 - CTEXT "+", -1, 168, 37, 8, 9 - AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 135, 31, 30, 11, WS_GROUP - AUTORADIOBUTTON "Left A&LT", IDC_LAYOUT_LEFTALT_RADIOBTN, 135, 45, 40, 12, NOT WS_TABSTOP - DEFPUSHBUTTON "OK", IDOK, 227, 18, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 227, 44, 50, 14 -} +BEGIN + GROUPBOX "", -1, 9, 5, 209, 60 + AUTOCHECKBOX "&Switch input languages", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12 + LTEXT "SHIFT", -1, 73, 37, 27, 12 + CTEXT "+", -1, 62, 37, 8, 9 + AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11, WS_GROUP + AUTORADIOBUTTON "Left &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP + AUTOCHECKBOX "S&witch keyboard layouts", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 121, 15, 90, 12 + LTEXT "SHIFT", -1, 179, 37, 27, 12 + CTEXT "+", -1, 168, 37, 8, 9 + AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 135, 31, 30, 11, WS_GROUP + AUTORADIOBUTTON "Left A&LT", IDC_LAYOUT_LEFTALT_RADIOBTN, 135, 45, 40, 12, NOT WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 227, 18, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 227, 44, 50, 14 +END IDD_CHANGE_KEY_SEQ3 DIALOG 5, 100, 249, 125 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Change Key Sequence" FONT 8, "MS Shell Dlg" -{ - GROUPBOX "", -1, 9, 5, 174, 110 - AUTOCHECKBOX "&Switch input languages", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12 - LTEXT "SHIFT", -1, 73, 37, 27, 12 - CTEXT "+", -1, 62, 37, 8, 9 - AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11, WS_GROUP - AUTORADIOBUTTON "Left &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP - AUTOCHECKBOX "S&witch keyboard layouts", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 15, 65, 90, 12 - LTEXT "SHIFT", -1, 73, 87, 27, 12 - CTEXT "+", -1, 62, 87, 8, 9 - CONTROL "", IDC_CKS_BUTTON, "BUTTON", BS_OWNERDRAW, 96, 77, 13, 33 - AUTORADIOBUTTON "&Grave Accent ( ` )", IDC_GRAVE_ACCENT_RADIOBTN, 110, 87, 69, 10, WS_GROUP - AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 29, 81, 30, 11, NOT WS_TABSTOP - AUTORADIOBUTTON "Left A&LT", IDC_LAYOUT_LEFTALT_RADIOBTN, 29, 95, 40, 12, NOT WS_TABSTOP - DEFPUSHBUTTON "OK", IDOK, 192, 25, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 192, 47, 50, 14 -} +BEGIN + GROUPBOX "", -1, 9, 5, 174, 110 + AUTOCHECKBOX "&Switch input languages", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12 + LTEXT "SHIFT", -1, 73, 37, 27, 12 + CTEXT "+", -1, 62, 37, 8, 9 + AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11, WS_GROUP + AUTORADIOBUTTON "Left &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP + AUTOCHECKBOX "S&witch keyboard layouts", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 15, 65, 90, 12 + LTEXT "SHIFT", -1, 73, 87, 27, 12 + CTEXT "+", -1, 62, 87, 8, 9 + CONTROL "", IDC_CKS_BUTTON, "BUTTON", BS_OWNERDRAW, 96, 77, 13, 33 + AUTORADIOBUTTON "&Grave Accent ( ` )", IDC_GRAVE_ACCENT_RADIOBTN, 110, 87, 69, 10, WS_GROUP + AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 29, 81, 30, 11, NOT WS_TABSTOP + AUTORADIOBUTTON "Left A&LT", IDC_LAYOUT_LEFTALT_RADIOBTN, 29, 95, 40, 12, NOT WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 192, 25, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 192, 47, 50, 14 +END IDD_CHANGE_KEY_SEQ4 DIALOG 5, 100, 249, 125 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Change Key Sequence" FONT 8, "MS Shell Dlg" -{ - GROUPBOX "", -1, 9, 5, 174, 110 - AUTOCHECKBOX "&Switch input languages", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12 - LTEXT "SHIFT", -1, 73, 37, 27, 12 - CTEXT "+", -1, 62, 37, 8, 9 - CONTROL "", IDC_CKS_BUTTON, "BUTTON", BS_OWNERDRAW, 96, 27, 13, 33 - AUTORADIOBUTTON "&Grave Accent ( ` )", IDC_GRAVE_ACCENT_RADIOBTN, 110, 37, 69, 10, WS_GROUP - AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11, NOT WS_TABSTOP - AUTORADIOBUTTON "Left &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP - AUTOCHECKBOX "S&witch keyboard layouts", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 15, 65, 90, 12 - LTEXT "SHIFT", -1, 73, 87, 27, 12 - CTEXT "+", -1, 62, 87, 8, 9 - AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 29, 81, 30, 11, WS_GROUP - AUTORADIOBUTTON "Left A&LT", IDC_LAYOUT_LEFTALT_RADIOBTN, 29, 95, 40, 12, NOT WS_TABSTOP - DEFPUSHBUTTON "OK", IDOK, 192, 25, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 192, 47, 50, 14 -} +BEGIN + GROUPBOX "", -1, 9, 5, 174, 110 + AUTOCHECKBOX "&Switch input languages", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12 + LTEXT "SHIFT", -1, 73, 37, 27, 12 + CTEXT "+", -1, 62, 37, 8, 9 + CONTROL "", IDC_CKS_BUTTON, "BUTTON", BS_OWNERDRAW, 96, 27, 13, 33 + AUTORADIOBUTTON "&Grave Accent ( ` )", IDC_GRAVE_ACCENT_RADIOBTN, 110, 37, 69, 10, WS_GROUP + AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11, NOT WS_TABSTOP + AUTORADIOBUTTON "Left &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP + AUTOCHECKBOX "S&witch keyboard layouts", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 15, 65, 90, 12 + LTEXT "SHIFT", -1, 73, 87, 27, 12 + CTEXT "+", -1, 62, 87, 8, 9 + AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 29, 81, 30, 11, WS_GROUP + AUTORADIOBUTTON "Left A&LT", IDC_LAYOUT_LEFTALT_RADIOBTN, 29, 95, 40, 12, NOT WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 192, 25, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 192, 47, 50, 14 +END IDD_CHANGE_KEY_SEQ5 DIALOG 5, 100, 269, 78 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Change Key Sequence" FONT 8, "MS Shell Dlg" -{ - LTEXT "", 1240, 16, 5, 250, 10 - GROUPBOX "", -1, 12, 17, 184, 48 - AUTOCHECKBOX "&Enable Key Sequence", 1249, 17, 17, 85, 8 - CTEXT "SHIFT", -1, 68, 37, 27, 12 - CTEXT "+", -1, 57, 37, 8, 9 - CTEXT "+", -1, 98, 37, 8, 10 - AUTORADIOBUTTON "&CTRL", -1, 24, 31, 30, 11, WS_GROUP - AUTORADIOBUTTON "Left &ALT", -1, 24, 45, 40, 12, NOT WS_TABSTOP - LTEXT "&Key:", -1, 110, 37, 14, 10 - COMBOBOX 1236, 127, 34, 46, 48, CBS_DROPDOWNLIST | WS_VSCROLL - DEFPUSHBUTTON "OK", IDOK, 212, 25, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 212, 47, 50, 14 -} +BEGIN + LTEXT "", 1240, 16, 5, 250, 10 + GROUPBOX "", -1, 12, 17, 184, 48 + AUTOCHECKBOX "&Enable Key Sequence", 1249, 17, 17, 85, 8 + CTEXT "SHIFT", -1, 68, 37, 27, 12 + CTEXT "+", -1, 57, 37, 8, 9 + CTEXT "+", -1, 98, 37, 8, 10 + AUTORADIOBUTTON "&CTRL", -1, 24, 31, 30, 11, WS_GROUP + AUTORADIOBUTTON "Left &ALT", -1, 24, 45, 40, 12, NOT WS_TABSTOP + LTEXT "&Key:", -1, 110, 37, 14, 10 + COMBOBOX 1236, 127, 34, 46, 48, CBS_DROPDOWNLIST | WS_VSCROLL + DEFPUSHBUTTON "OK", IDOK, 212, 25, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 212, 47, 50, 14 +END + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Textdienste und Eingabesprachen" + IDS_CPLSYSTEMDESCRIPTION "Ändert die Einstellungen der Texteingabe einer Sprache." +END STRINGTABLE BEGIN @@ -235,8 +241,6 @@ IDS_SELECTED_LANGUAGE "English (United States)" //Selected keyboard layout on "Add Input language" IDS_SELECTED_LAYOUT, "United States-Dvorak" - IDS_CPLSYSTEMNAME "Textdienste und Eingabesprachen" - IDS_CPLSYSTEMDESCRIPTION "Ändert die Einstellungen der Texteingabe einer Sprache." IDS_US_LAYOUT, "US" IDS_BELGIAN_LAYOUT, "Belgisch (Punkt)" IDS_BELGIAN_FRENCH_LAYOUT, "Belgisch (Wallonisch)" @@ -359,7 +363,7 @@ IDS_USENG_TABLE_IBM_ARABIC238L_LAYOUT, "US-Englische Tabelle für IBM Arabisch 238_L" IDS_FARSI_LAYOUT, "Farsi" IDS_GAELIC_LAYOUT, "Gälisch" - IDS_PORTUGUESE_BRAZIL_ABNT2_LAYOUT, "Portugiesisch (Brasilianisch, ABNT2)" + IDS_PORTUGUESE_BRAZIL_ABNT2_LAYOUT, "Portugiesisch (Brasilianisch, ABNT2)" IDS_MONGOLIAN_CYRILLIC_LAYOUT, "Mongolisches Kyrillisch" IDS_KYRGYZ_CYRILLIC_LAYOUT, "Kirgisisches Kyrillisch" IDS_URDU_LAYOUT, "Urdu" Modified: trunk/reactos/dll/cpl/input/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/en-US.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/en-US.rc (original) +++ trunk/reactos/dll/cpl/input/lang/en-US.rc Sat Oct 20 15:08:23 2007 @@ -6,18 +6,18 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Default input language", -1, 7,7,231,53 - LTEXT "Select one of the installed input languages to use when you start your computer.",-1,14,18,220,17 - COMBOBOX IDC_DEFAULT_INPUT_LANG, 14, 40, 218, 46, CBS_DROPDOWNLIST - GROUPBOX "&Installed services", -1, 7,65,231,115 - LTEXT "Select the services that you want for each input language shown in the list. Use the Add and Remove buttons to modify this list.",-1,14,75,220,17 - CONTROL "TEXT", IDC_KEYLAYOUT_TREE, "SysTreeView32", WS_BORDER | WS_VSCROLL | WS_TABSTOP | 0x00000034, 14, 96, 160, 78 - PUSHBUTTON "&Set Default", IDC_SET_DEFAULT, 179, 106, 53, 14 - PUSHBUTTON "A&dd...", IDC_ADD_BUTTON, 179, 124, 53, 14 - PUSHBUTTON "&Remove...", IDC_REMOVE_BUTTON, 179, 142, 53, 14 - PUSHBUTTON "&Properties...", IDC_PROP_BUTTON, 179, 160, 53, 14 - GROUPBOX "Preferences", -1, 7,185,231,36 - PUSHBUTTON "Language &Bar...", IDC_LANG_BAR_BUTTON, 14, 198, 70, 14 - PUSHBUTTON "&Key Settings...", IDC_KEY_SETTINGS_BUTTON, 90, 198, 70, 14 + LTEXT "Select one of the installed input languages to use when you start your computer.",-1,14,18,220,17 + COMBOBOX IDC_DEFAULT_INPUT_LANG, 14, 40, 218, 46, CBS_DROPDOWNLIST + GROUPBOX "&Installed services", -1, 7,65,231,115 + LTEXT "Select the services that you want for each input language shown in the list. Use the Add and Remove buttons to modify this list.",-1,14,75,220,17 + CONTROL "TEXT", IDC_KEYLAYOUT_TREE, "SysTreeView32", WS_BORDER | WS_VSCROLL | WS_TABSTOP | 0x00000034, 14, 96, 160, 78 + PUSHBUTTON "&Set Default", IDC_SET_DEFAULT, 179, 106, 53, 14 + PUSHBUTTON "A&dd...", IDC_ADD_BUTTON, 179, 124, 53, 14 + PUSHBUTTON "&Remove...", IDC_REMOVE_BUTTON, 179, 142, 53, 14 + PUSHBUTTON "&Properties...", IDC_PROP_BUTTON, 179, 160, 53, 14 + GROUPBOX "Preferences", -1, 7,185,231,36 + PUSHBUTTON "Language &Bar...", IDC_LANG_BAR_BUTTON, 14, 198, 70, 14 + PUSHBUTTON "&Key Settings...", IDC_KEY_SETTINGS_BUTTON, 90, 198, 70, 14 END IDD_PROPPAGEADVANCED DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT @@ -25,12 +25,12 @@ CAPTION "Advanced" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Compatibility Configuration", -1, 7,7,231,60 - AUTOCHECKBOX "&Extend support of advanced text services to all programs", IDC_SUPPORT_ADV_SERV_CHECKBOX, 14, 19, 210, 10, WS_GROUP - LTEXT "Select this check box to on for active advanced text services in Notepad and other programs that do not normally support speech and handwriting recognition or other advanced input services.",-1,14,33,220,25 - GROUPBOX "System Configuration", -1, 7,74,231,60 - AUTOCHECKBOX "&Turn off advanced text services", IDC_TURNOFF_ADV_TXTSERV_CHECKBOX, 14, 86, 210, 10, WS_GROUP - LTEXT "Select this check box to turn off advanced text services in all programs. Not recommended for East Asian users because this closes the language bar.",-1,14,100,220,25 + GROUPBOX "Compatibility Configuration", -1, 7,7,231,60 + AUTOCHECKBOX "&Extend support of advanced text services to all programs", IDC_SUPPORT_ADV_SERV_CHECKBOX, 14, 19, 210, 10, WS_GROUP + LTEXT "Select this check box to on for active advanced text services in Notepad and other programs that do not normally support speech and handwriting recognition or other advanced input services.",-1,14,33,220,25 + GROUPBOX "System Configuration", -1, 7,74,231,60 + AUTOCHECKBOX "&Turn off advanced text services", IDC_TURNOFF_ADV_TXTSERV_CHECKBOX, 14, 86, 210, 10, WS_GROUP + LTEXT "Select this check box to turn off advanced text services in all programs. Not recommended for East Asian users because this closes the language bar.",-1,14,100,220,25 END IDD_LANGBAR DIALOG 20, 20, 240, 120 @@ -82,37 +82,37 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Add Input Language" FONT 8, "MS Shell Dlg" -{ - LTEXT "&Input language:", -1, 7, 7, 61, 10 - COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 105, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - AUTOCHECKBOX "&Keyboard layout/IME:", IDC_KEYBOARD_LO_CHECKBOX, 37, 36, 110, 10 - COMBOBOX IDC_KEYBOARD_LO_COMBO, 49, 47, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - AUTOCHECKBOX "&Handwriting recognition:", IDC_HANDWRITING_REC_CHECKBOX, 37, 65, 110, 10 - COMBOBOX IDC_HANDWRITING_REC_COMBO, 49, 76, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - AUTOCHECKBOX "&Speech:", IDC_SPEECH_CHECKBOX, 37, 94, 110, 10 - COMBOBOX IDC_SPEECH_COMBO, 49, 105, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - AUTOCHECKBOX "&More Text Services:", IDC_MORE_TEXT_SERV_CHECKBOX, 37, 123, 110, 10 - COMBOBOX IDC_MORE_TEXT_SERV_COMBO, 49, 134, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - DEFPUSHBUTTON "OK", IDOK, 146, 155, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 199, 155, 50, 14 -} +BEGIN + LTEXT "&Input language:", -1, 7, 7, 61, 10 + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 105, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&Keyboard layout/IME:", IDC_KEYBOARD_LO_CHECKBOX, 37, 36, 110, 10 + COMBOBOX IDC_KEYBOARD_LO_COMBO, 49, 47, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&Handwriting recognition:", IDC_HANDWRITING_REC_CHECKBOX, 37, 65, 110, 10 + COMBOBOX IDC_HANDWRITING_REC_COMBO, 49, 76, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&Speech:", IDC_SPEECH_CHECKBOX, 37, 94, 110, 10 + COMBOBOX IDC_SPEECH_COMBO, 49, 105, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&More Text Services:", IDC_MORE_TEXT_SERV_CHECKBOX, 37, 123, 110, 10 + COMBOBOX IDC_MORE_TEXT_SERV_COMBO, 49, 134, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + DEFPUSHBUTTON "OK", IDOK, 146, 155, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 199, 155, 50, 14 +END IDD_ADD3 DIALOG 20, 20, 257, 147 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Add Input Language" FONT 8, "MS Shell Dlg" -{ - LTEXT "&Input language:", -1, 7, 7, 61, 10 - COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 105, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - AUTOCHECKBOX "&Keyboard layout/IME:", IDC_KEYBOARD_LO_CHECKBOX, 37, 36, 110, 10 - COMBOBOX IDC_KEYBOARD_LO_COMBO, 49, 47, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - AUTOCHECKBOX "&Handwriting recognition:", IDC_HANDWRITING_REC_CHECKBOX, 37, 65, 110, 10 - COMBOBOX IDC_HANDWRITING_REC_COMBO, 49, 76, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - AUTOCHECKBOX "&Speech:", IDC_SPEECH_CHECKBOX, 37, 94, 110, 10 - COMBOBOX IDC_SPEECH_COMBO, 49, 105, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - DEFPUSHBUTTON "OK", IDOK, 146, 126, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 199, 126, 50, 14 -} +BEGIN + LTEXT "&Input language:", -1, 7, 7, 61, 10 + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 105, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&Keyboard layout/IME:", IDC_KEYBOARD_LO_CHECKBOX, 37, 36, 110, 10 + COMBOBOX IDC_KEYBOARD_LO_COMBO, 49, 47, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&Handwriting recognition:", IDC_HANDWRITING_REC_CHECKBOX, 37, 65, 110, 10 + COMBOBOX IDC_HANDWRITING_REC_COMBO, 49, 76, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&Speech:", IDC_SPEECH_CHECKBOX, 37, 94, 110, 10 + COMBOBOX IDC_SPEECH_COMBO, 49, 105, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + DEFPUSHBUTTON "OK", IDOK, 146, 126, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 199, 126, 50, 14 +END IDD_CHANGE_KEY_SEQ2 DIALOG 5, 100, 269, 78 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION @@ -137,84 +137,84 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Change Key Sequence" FONT 8, "MS Shell Dlg" -{ - GROUPBOX "", -1, 9, 5, 209, 60 - AUTOCHECKBOX "&Switch input languages", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12 - LTEXT "SHIFT", -1, 73, 37, 27, 12 - CTEXT "+", -1, 62, 37, 8, 9 - AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11, WS_GROUP - AUTORADIOBUTTON "Left &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP - AUTOCHECKBOX "S&witch keyboard layouts", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 121, 15, 90, 12 - LTEXT "SHIFT", -1, 179, 37, 27, 12 - CTEXT "+", -1, 168, 37, 8, 9 - AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 135, 31, 30, 11, WS_GROUP - AUTORADIOBUTTON "Left A&LT", IDC_LAYOUT_LEFTALT_RADIOBTN, 135, 45, 40, 12, NOT WS_TABSTOP - DEFPUSHBUTTON "OK", IDOK, 227, 18, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 227, 44, 50, 14 -} +BEGIN + GROUPBOX "", -1, 9, 5, 209, 60 + AUTOCHECKBOX "&Switch input languages", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12 + LTEXT "SHIFT", -1, 73, 37, 27, 12 + CTEXT "+", -1, 62, 37, 8, 9 + AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11, WS_GROUP + AUTORADIOBUTTON "Left &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP + AUTOCHECKBOX "S&witch keyboard layouts", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 121, 15, 90, 12 + LTEXT "SHIFT", -1, 179, 37, 27, 12 + CTEXT "+", -1, 168, 37, 8, 9 + AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 135, 31, 30, 11, WS_GROUP + AUTORADIOBUTTON "Left A&LT", IDC_LAYOUT_LEFTALT_RADIOBTN, 135, 45, 40, 12, NOT WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 227, 18, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 227, 44, 50, 14 +END IDD_CHANGE_KEY_SEQ3 DIALOG 5, 100, 249, 125 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Change Key Sequence" FONT 8, "MS Shell Dlg" -{ - GROUPBOX "", -1, 9, 5, 174, 110 - AUTOCHECKBOX "&Switch input languages", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12 - LTEXT "SHIFT", -1, 73, 37, 27, 12 - CTEXT "+", -1, 62, 37, 8, 9 - AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11, WS_GROUP - AUTORADIOBUTTON "Left &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP - AUTOCHECKBOX "S&witch keyboard layouts", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 15, 65, 90, 12 - LTEXT "SHIFT", -1, 73, 87, 27, 12 - CTEXT "+", -1, 62, 87, 8, 9 - CONTROL "", IDC_CKS_BUTTON, "BUTTON", BS_OWNERDRAW, 96, 77, 13, 33 - AUTORADIOBUTTON "&Grave Accent ( ` )", IDC_GRAVE_ACCENT_RADIOBTN, 110, 87, 69, 10, WS_GROUP - AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 29, 81, 30, 11, NOT WS_TABSTOP - AUTORADIOBUTTON "Left A&LT", IDC_LAYOUT_LEFTALT_RADIOBTN, 29, 95, 40, 12, NOT WS_TABSTOP - DEFPUSHBUTTON "OK", IDOK, 192, 25, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 192, 47, 50, 14 -} +BEGIN + GROUPBOX "", -1, 9, 5, 174, 110 + AUTOCHECKBOX "&Switch input languages", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12 + LTEXT "SHIFT", -1, 73, 37, 27, 12 + CTEXT "+", -1, 62, 37, 8, 9 + AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11, WS_GROUP + AUTORADIOBUTTON "Left &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP + AUTOCHECKBOX "S&witch keyboard layouts", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 15, 65, 90, 12 + LTEXT "SHIFT", -1, 73, 87, 27, 12 + CTEXT "+", -1, 62, 87, 8, 9 + CONTROL "", IDC_CKS_BUTTON, "BUTTON", BS_OWNERDRAW, 96, 77, 13, 33 + AUTORADIOBUTTON "&Grave Accent ( ` )", IDC_GRAVE_ACCENT_RADIOBTN, 110, 87, 69, 10, WS_GROUP + AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 29, 81, 30, 11, NOT WS_TABSTOP + AUTORADIOBUTTON "Left A&LT", IDC_LAYOUT_LEFTALT_RADIOBTN, 29, 95, 40, 12, NOT WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 192, 25, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 192, 47, 50, 14 +END IDD_CHANGE_KEY_SEQ4 DIALOG 5, 100, 249, 125 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Change Key Sequence" FONT 8, "MS Shell Dlg" -{ - GROUPBOX "", -1, 9, 5, 174, 110 - AUTOCHECKBOX "&Switch input languages", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12 - LTEXT "SHIFT", -1, 73, 37, 27, 12 - CTEXT "+", -1, 62, 37, 8, 9 - CONTROL "", IDC_CKS_BUTTON, "BUTTON", BS_OWNERDRAW, 96, 27, 13, 33 - AUTORADIOBUTTON "&Grave Accent ( ` )", IDC_GRAVE_ACCENT_RADIOBTN, 110, 37, 69, 10, WS_GROUP - AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11, NOT WS_TABSTOP - AUTORADIOBUTTON "Left &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP - AUTOCHECKBOX "S&witch keyboard layouts", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 15, 65, 90, 12 - LTEXT "SHIFT", -1, 73, 87, 27, 12 - CTEXT "+", -1, 62, 87, 8, 9 - AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 29, 81, 30, 11, WS_GROUP - AUTORADIOBUTTON "Left A&LT", IDC_LAYOUT_LEFTALT_RADIOBTN, 29, 95, 40, 12, NOT WS_TABSTOP - DEFPUSHBUTTON "OK", IDOK, 192, 25, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 192, 47, 50, 14 -} +BEGIN + GROUPBOX "", -1, 9, 5, 174, 110 + AUTOCHECKBOX "&Switch input languages", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12 + LTEXT "SHIFT", -1, 73, 37, 27, 12 + CTEXT "+", -1, 62, 37, 8, 9 + CONTROL "", IDC_CKS_BUTTON, "BUTTON", BS_OWNERDRAW, 96, 27, 13, 33 + AUTORADIOBUTTON "&Grave Accent ( ` )", IDC_GRAVE_ACCENT_RADIOBTN, 110, 37, 69, 10, WS_GROUP + AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11, NOT WS_TABSTOP + AUTORADIOBUTTON "Left &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP + AUTOCHECKBOX "S&witch keyboard layouts", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 15, 65, 90, 12 + LTEXT "SHIFT", -1, 73, 87, 27, 12 + CTEXT "+", -1, 62, 87, 8, 9 + AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 29, 81, 30, 11, WS_GROUP + AUTORADIOBUTTON "Left A&LT", IDC_LAYOUT_LEFTALT_RADIOBTN, 29, 95, 40, 12, NOT WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 192, 25, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 192, 47, 50, 14 +END IDD_CHANGE_KEY_SEQ5 DIALOG 5, 100, 269, 78 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Change Key Sequence" FONT 8, "MS Shell Dlg" -{ - LTEXT "", 1240, 16, 5, 250, 10 - GROUPBOX "", -1, 12, 17, 184, 48 - AUTOCHECKBOX "&Enable Key Sequence", 1249, 17, 17, 85, 8 - CTEXT "SHIFT", -1, 68, 37, 27, 12 - CTEXT "+", -1, 57, 37, 8, 9 - CTEXT "+", -1, 98, 37, 8, 10 - AUTORADIOBUTTON "&CTRL", -1, 24, 31, 30, 11, WS_GROUP - AUTORADIOBUTTON "Left &ALT", -1, 24, 45, 40, 12, NOT WS_TABSTOP - LTEXT "&Key:", -1, 110, 37, 14, 10 - COMBOBOX 1236, 127, 34, 46, 48, CBS_DROPDOWNLIST | WS_VSCROLL - DEFPUSHBUTTON "OK", IDOK, 212, 25, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 212, 47, 50, 14 -} +BEGIN + LTEXT "", 1240, 16, 5, 250, 10 + GROUPBOX "", -1, 12, 17, 184, 48 + AUTOCHECKBOX "&Enable Key Sequence", 1249, 17, 17, 85, 8 + CTEXT "SHIFT", -1, 68, 37, 27, 12 + CTEXT "+", -1, 57, 37, 8, 9 + CTEXT "+", -1, 98, 37, 8, 10 + AUTORADIOBUTTON "&CTRL", -1, 24, 31, 30, 11, WS_GROUP + AUTORADIOBUTTON "Left &ALT", -1, 24, 45, 40, 12, NOT WS_TABSTOP + LTEXT "&Key:", -1, 110, 37, 14, 10 + COMBOBOX 1236, 127, 34, 46, 48, CBS_DROPDOWNLIST | WS_VSCROLL + DEFPUSHBUTTON "OK", IDOK, 212, 25, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 212, 47, 50, 14 +END IDD_INPUT_LANG_PROP DIALOG 20, 20, 227, 75 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION @@ -231,13 +231,16 @@ STRINGTABLE BEGIN + IDS_CPLSYSTEMNAME "Text Services and Input Languages" + IDS_CPLSYSTEMDESCRIPTION "Customizes settings for text input of languages." +END + +STRINGTABLE +BEGIN //Selected language on "Add Input language" IDS_SELECTED_LANGUAGE "English (United States)" //Selected keyboard layout on "Add Input language" IDS_SELECTED_LAYOUT, "United States-Dvorak" - - IDS_CPLSYSTEMNAME "Text Services and Input Languages" - IDS_CPLSYSTEMDESCRIPTION "Customizes settings for text input of languages." IDS_US_LAYOUT, "US" IDS_BELGIAN_LAYOUT, "Belgian (Period)" IDS_BELGIAN_FRENCH_LAYOUT, "Belgian French" Modified: trunk/reactos/dll/cpl/input/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/fr-FR.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/fr-FR.rc (original) +++ trunk/reactos/dll/cpl/input/lang/fr-FR.rc Sat Oct 20 15:08:23 2007 @@ -6,18 +6,18 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Langue de saisie par défaut", -1, 7,7,231,53 - LTEXT "Sélectionnez une des langues de saisie installées pour l'utiliser quand vous allumez votre ordinateur.",-1,14,18,220,17 - COMBOBOX IDC_DEFAULT_INPUT_LANG, 14, 40, 218, 46, CBS_DROPDOWNLIST - GROUPBOX "Services &installés", -1, 7,65,231,115 - LTEXT "Sélectionnez les services que vous voulez pour chaque langue de saisie affichée dans la liste. Utilisez les boutons Ajouter et Supprimer pour modifier cette liste.",-1,14,75,220,17 - CONTROL "TEXT", IDC_KEYLAYOUT_TREE, "SysTreeView32", WS_BORDER | WS_VSCROLL | WS_TABSTOP | 0x00000034, 14, 96, 160, 78 - PUSHBUTTON "Définir par défaut", IDC_SET_DEFAULT, 179, 106, 53, 14 - PUSHBUTTON "Ajouter...", IDC_ADD_BUTTON, 179, 124, 53, 14 - PUSHBUTTON "Supp&rimer...", IDC_REMOVE_BUTTON, 179, 142, 53, 14 - PUSHBUTTON "&Propriétés...", IDC_PROP_BUTTON, 179, 160, 53, 14 - GROUPBOX "Préférences", -1, 7,185,231,36 - PUSHBUTTON "&Barre de langue...", IDC_LANG_BAR_BUTTON, 14, 198, 70, 14 - PUSHBUTTON "Paramètres des touches...", IDC_KEY_SETTINGS_BUTTON, 90, 198, 70, 14 + LTEXT "Sélectionnez une des langues de saisie installées pour l'utiliser quand vous allumez votre ordinateur.",-1,14,18,220,17 + COMBOBOX IDC_DEFAULT_INPUT_LANG, 14, 40, 218, 46, CBS_DROPDOWNLIST + GROUPBOX "Services &installés", -1, 7,65,231,115 + LTEXT "Sélectionnez les services que vous voulez pour chaque langue de saisie affichée dans la liste. Utilisez les boutons Ajouter et Supprimer pour modifier cette liste.",-1,14,75,220,17 + CONTROL "TEXT", IDC_KEYLAYOUT_TREE, "SysTreeView32", WS_BORDER | WS_VSCROLL | WS_TABSTOP | 0x00000034, 14, 96, 160, 78 + PUSHBUTTON "Définir par défaut", IDC_SET_DEFAULT, 179, 106, 53, 14 + PUSHBUTTON "Ajouter...", IDC_ADD_BUTTON, 179, 124, 53, 14 + PUSHBUTTON "Supp&rimer...", IDC_REMOVE_BUTTON, 179, 142, 53, 14 + PUSHBUTTON "&Propriétés...", IDC_PROP_BUTTON, 179, 160, 53, 14 + GROUPBOX "Préférences", -1, 7,185,231,36 + PUSHBUTTON "&Barre de langue...", IDC_LANG_BAR_BUTTON, 14, 198, 70, 14 + PUSHBUTTON "Paramètres des touches...", IDC_KEY_SETTINGS_BUTTON, 90, 198, 70, 14 END IDD_PROPPAGEADVANCED DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT @@ -25,12 +25,12 @@ CAPTION "Avancé" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Configuration de la compatibilité", -1, 7,7,231,60 - AUTOCHECKBOX "&Étendre le support des services avancés de à tous les programmes", IDC_SUPPORT_ADV_SERV_CHECKBOX, 14, 19, 210, 10, WS_GROUP - LTEXT "Sélectionnez cette case à cocher pour activer les services avancés de texte dans le bloc-note et d'autres programmes qui ne supporte normalement pas la reconnaissance vocale et l'écriture manuscrite ou tout autre service avancé de saisie.",-1,14,33,220,25 - GROUPBOX "Configuration du système", -1, 7,74,231,60 - AUTOCHECKBOX "Désac&tiver les services avancés de texte", IDC_TURNOFF_ADV_TXTSERV_CHECKBOX, 14, 86, 210, 10, WS_GROUP - LTEXT "Déselectionnez cette case à cocher pour désactiver les services avancés de texte dans tous les programmes. Non recommandé pour les utilisateurs de l'Est de l'Asie car cela ferme la barre de langue.",-1,14,100,220,25 + GROUPBOX "Configuration de la compatibilité", -1, 7,7,231,60 + AUTOCHECKBOX "&Étendre le support des services avancés de à tous les programmes", IDC_SUPPORT_ADV_SERV_CHECKBOX, 14, 19, 210, 10, WS_GROUP + LTEXT "Sélectionnez cette case à cocher pour activer les services avancés de texte dans le bloc-note et d'autres programmes qui ne supporte normalement pas la reconnaissance vocale et l'écriture manuscrite ou tout autre service avancé de saisie.",-1,14,33,220,25 + GROUPBOX "Configuration du système", -1, 7,74,231,60 + AUTOCHECKBOX "Désac&tiver les services avancés de texte", IDC_TURNOFF_ADV_TXTSERV_CHECKBOX, 14, 86, 210, 10, WS_GROUP + LTEXT "Déselectionnez cette case à cocher pour désactiver les services avancés de texte dans tous les programmes. Non recommandé pour les utilisateurs de l'Est de l'Asie car cela ferme la barre de langue.",-1,14,100,220,25 END IDD_LANGBAR DIALOG 20, 20, 240, 120 @@ -114,120 +114,126 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Ajouter une langue de saisie" FONT 8, "MS Shell Dlg" -{ - LTEXT "Langue de sa&isie:", -1, 7, 7, 61, 10 - COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 105, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - AUTOCHECKBOX "Configuration clavier/IME:", IDC_KEYBOARD_LO_CHECKBOX, 37, 36, 110, 10 - COMBOBOX IDC_KEYBOARD_LO_COMBO, 49, 47, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - AUTOCHECKBOX "Reconnaissance de l'écriture manuelle:", IDC_HANDWRITING_REC_CHECKBOX, 37, 65, 110, 10 - COMBOBOX IDC_HANDWRITING_REC_COMBO, 49, 76, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - AUTOCHECKBOX "Vocale:", IDC_SPEECH_CHECKBOX, 37, 94, 110, 10 - COMBOBOX IDC_SPEECH_COMBO, 49, 105, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - AUTOCHECKBOX "Plus de services de texte:", IDC_MORE_TEXT_SERV_CHECKBOX, 37, 123, 110, 10 - COMBOBOX IDC_MORE_TEXT_SERV_COMBO, 49, 134, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - DEFPUSHBUTTON "OK", IDOK, 146, 155, 50, 14 - PUSHBUTTON "Annuler", IDCANCEL, 199, 155, 50, 14 -} +BEGIN + LTEXT "Langue de sa&isie:", -1, 7, 7, 61, 10 + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 105, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "Configuration clavier/IME:", IDC_KEYBOARD_LO_CHECKBOX, 37, 36, 110, 10 + COMBOBOX IDC_KEYBOARD_LO_COMBO, 49, 47, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "Reconnaissance de l'écriture manuelle:", IDC_HANDWRITING_REC_CHECKBOX, 37, 65, 110, 10 + COMBOBOX IDC_HANDWRITING_REC_COMBO, 49, 76, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "Vocale:", IDC_SPEECH_CHECKBOX, 37, 94, 110, 10 + COMBOBOX IDC_SPEECH_COMBO, 49, 105, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "Plus de services de texte:", IDC_MORE_TEXT_SERV_CHECKBOX, 37, 123, 110, 10 + COMBOBOX IDC_MORE_TEXT_SERV_COMBO, 49, 134, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + DEFPUSHBUTTON "OK", IDOK, 146, 155, 50, 14 + PUSHBUTTON "Annuler", IDCANCEL, 199, 155, 50, 14 +END IDD_ADD3 DIALOG 20, 20, 257, 147 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Ajouter une langue de saisie" FONT 8, "MS Shell Dlg" -{ - LTEXT "Langue de sa&isie:", -1, 7, 7, 61, 10 - COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 105, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - AUTOCHECKBOX "Configuration clavier/IME:", IDC_KEYBOARD_LO_CHECKBOX, 37, 36, 110, 10 - COMBOBOX IDC_KEYBOARD_LO_COMBO, 49, 47, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - AUTOCHECKBOX "Reconnaissance de l'écriture manuelle:", IDC_HANDWRITING_REC_CHECKBOX, 37, 65, 110, 10 - COMBOBOX IDC_HANDWRITING_REC_COMBO, 49, 76, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - AUTOCHECKBOX "Vocale:", IDC_SPEECH_CHECKBOX, 37, 94, 110, 10 - COMBOBOX IDC_SPEECH_COMBO, 49, 105, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - DEFPUSHBUTTON "OK", IDOK, 146, 126, 50, 14 - PUSHBUTTON "Annuler", IDCANCEL, 199, 126, 50, 14 -} +BEGIN + LTEXT "Langue de sa&isie:", -1, 7, 7, 61, 10 + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 105, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "Configuration clavier/IME:", IDC_KEYBOARD_LO_CHECKBOX, 37, 36, 110, 10 + COMBOBOX IDC_KEYBOARD_LO_COMBO, 49, 47, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "Reconnaissance de l'écriture manuelle:", IDC_HANDWRITING_REC_CHECKBOX, 37, 65, 110, 10 + COMBOBOX IDC_HANDWRITING_REC_COMBO, 49, 76, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "Vocale:", IDC_SPEECH_CHECKBOX, 37, 94, 110, 10 + COMBOBOX IDC_SPEECH_COMBO, 49, 105, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + DEFPUSHBUTTON "OK", IDOK, 146, 126, 50, 14 + PUSHBUTTON "Annuler", IDCANCEL, 199, 126, 50, 14 +END IDD_CHANGE_KEY_SEQ DIALOG 5, 100, 285, 74 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Changer la séquence de touche" FONT 8, "MS Shell Dlg" -{ - GROUPBOX "", -1, 9, 5, 209, 60 - AUTOCHECKBOX "Échanger le&s langues de saisie", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12 - LTEXT "SHIFT", -1, 73, 37, 27, 12 - CTEXT "+", -1, 62, 37, 8, 9 - AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11, WS_GROUP - AUTORADIOBUTTON "&ALT gauche", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP - AUTOCHECKBOX "Échanger le&s configurations clavier", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 121, 15, 90, 12 - LTEXT "SHIFT", -1, 179, 37, 27, 12 - CTEXT "+", -1, 168, 37, 8, 9 - AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 135, 31, 30, 11, WS_GROUP - AUTORADIOBUTTON "A&LT gauche", IDC_LAYOUT_LEFTALT_RADIOBTN, 135, 45, 40, 12, NOT WS_TABSTOP - DEFPUSHBUTTON "OK", IDOK, 227, 18, 50, 14 - PUSHBUTTON "Annuler", IDCANCEL, 227, 44, 50, 14 -} +BEGIN + GROUPBOX "", -1, 9, 5, 209, 60 + AUTOCHECKBOX "Échanger le&s langues de saisie", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12 + LTEXT "SHIFT", -1, 73, 37, 27, 12 + CTEXT "+", -1, 62, 37, 8, 9 + AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11, WS_GROUP + AUTORADIOBUTTON "&ALT gauche", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP + AUTOCHECKBOX "Échanger le&s configurations clavier", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 121, 15, 90, 12 + LTEXT "SHIFT", -1, 179, 37, 27, 12 + CTEXT "+", -1, 168, 37, 8, 9 + AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 135, 31, 30, 11, WS_GROUP + AUTORADIOBUTTON "A&LT gauche", IDC_LAYOUT_LEFTALT_RADIOBTN, 135, 45, 40, 12, NOT WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 227, 18, 50, 14 + PUSHBUTTON "Annuler", IDCANCEL, 227, 44, 50, 14 +END IDD_CHANGE_KEY_SEQ3 DIALOG 5, 100, 249, 125 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Changer la séquence de touche" FONT 8, "MS Shell Dlg" -{ - GROUPBOX "", -1, 9, 5, 174, 110 - AUTOCHECKBOX "Échanger le&s langues de saisie", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12 - LTEXT "SHIFT", -1, 73, 37, 27, 12 - CTEXT "+", -1, 62, 37, 8, 9 - AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11, WS_GROUP - AUTORADIOBUTTON "&ALT gauche", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP - AUTOCHECKBOX "Échanger le&s configurations clavier", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 15, 65, 90, 12 - LTEXT "SHIFT", -1, 73, 87, 27, 12 - CTEXT "+", -1, 62, 87, 8, 9 - CONTROL "", IDC_CKS_BUTTON, "BUTTON", BS_OWNERDRAW, 96, 77, 13, 33 - AUTORADIOBUTTON "Accent &grave ( ` )", IDC_GRAVE_ACCENT_RADIOBTN, 110, 87, 69, 10, WS_GROUP - AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 29, 81, 30, 11, NOT WS_TABSTOP - AUTORADIOBUTTON "A&LT gauche", IDC_LAYOUT_LEFTALT_RADIOBTN, 29, 95, 40, 12, NOT WS_TABSTOP - DEFPUSHBUTTON "OK", IDOK, 192, 25, 50, 14 - PUSHBUTTON "Annuler", IDCANCEL, 192, 47, 50, 14 -} +BEGIN + GROUPBOX "", -1, 9, 5, 174, 110 + AUTOCHECKBOX "Échanger le&s langues de saisie", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12 + LTEXT "SHIFT", -1, 73, 37, 27, 12 + CTEXT "+", -1, 62, 37, 8, 9 + AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11, WS_GROUP + AUTORADIOBUTTON "&ALT gauche", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP + AUTOCHECKBOX "Échanger le&s configurations clavier", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 15, 65, 90, 12 + LTEXT "SHIFT", -1, 73, 87, 27, 12 + CTEXT "+", -1, 62, 87, 8, 9 + CONTROL "", IDC_CKS_BUTTON, "BUTTON", BS_OWNERDRAW, 96, 77, 13, 33 + AUTORADIOBUTTON "Accent &grave ( ` )", IDC_GRAVE_ACCENT_RADIOBTN, 110, 87, 69, 10, WS_GROUP + AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 29, 81, 30, 11, NOT WS_TABSTOP + AUTORADIOBUTTON "A&LT gauche", IDC_LAYOUT_LEFTALT_RADIOBTN, 29, 95, 40, 12, NOT WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 192, 25, 50, 14 + PUSHBUTTON "Annuler", IDCANCEL, 192, 47, 50, 14 +END IDD_CHANGE_KEY_SEQ4 DIALOG 5, 100, 249, 125 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Changer la séquence de touche" FONT 8, "MS Shell Dlg" -{ - GROUPBOX "", -1, 9, 5, 174, 110 - AUTOCHECKBOX "Échanger le&s langues de saisie", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12 - LTEXT "SHIFT", -1, 73, 37, 27, 12 - CTEXT "+", -1, 62, 37, 8, 9 - CONTROL "", IDC_CKS_BUTTON, "BUTTON", BS_OWNERDRAW, 96, 27, 13, 33 - AUTORADIOBUTTON "Accent &grave ( ` )", IDC_GRAVE_ACCENT_RADIOBTN, 110, 37, 69, 10, WS_GROUP - AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11, NOT WS_TABSTOP - AUTORADIOBUTTON "&ALT gauche", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP - AUTOCHECKBOX "Échanger le&s configurations clavier", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 15, 65, 90, 12 - LTEXT "SHIFT", -1, 73, 87, 27, 12 - CTEXT "+", -1, 62, 87, 8, 9 - AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 29, 81, 30, 11, WS_GROUP - AUTORADIOBUTTON "A&LT gauche", IDC_LAYOUT_LEFTALT_RADIOBTN, 29, 95, 40, 12, NOT WS_TABSTOP - DEFPUSHBUTTON "OK", IDOK, 192, 25, 50, 14 - PUSHBUTTON "Annuler", IDCANCEL, 192, 47, 50, 14 -} +BEGIN + GROUPBOX "", -1, 9, 5, 174, 110 + AUTOCHECKBOX "Échanger le&s langues de saisie", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12 + LTEXT "SHIFT", -1, 73, 37, 27, 12 + CTEXT "+", -1, 62, 37, 8, 9 + CONTROL "", IDC_CKS_BUTTON, "BUTTON", BS_OWNERDRAW, 96, 27, 13, 33 + AUTORADIOBUTTON "Accent &grave ( ` )", IDC_GRAVE_ACCENT_RADIOBTN, 110, 37, 69, 10, WS_GROUP + AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11, NOT WS_TABSTOP + AUTORADIOBUTTON "&ALT gauche", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP + AUTOCHECKBOX "Échanger le&s configurations clavier", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 15, 65, 90, 12 + LTEXT "SHIFT", -1, 73, 87, 27, 12 + CTEXT "+", -1, 62, 87, 8, 9 + AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 29, 81, 30, 11, WS_GROUP + AUTORADIOBUTTON "A&LT gauche", IDC_LAYOUT_LEFTALT_RADIOBTN, 29, 95, 40, 12, NOT WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 192, 25, 50, 14 + PUSHBUTTON "Annuler", IDCANCEL, 192, 47, 50, 14 +END IDD_CHANGE_KEY_SEQ5 DIALOG 5, 100, 269, 78 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Changer la séquence de touche" FONT 8, "MS Shell Dlg" -{ - LTEXT "", 1240, 16, 5, 250, 10 - GROUPBOX "", -1, 12, 17, 184, 48 - AUTOCHECKBOX "Activ&er la séquence de touche", 1249, 17, 17, 85, 8 - CTEXT "SHIFT", -1, 68, 37, 27, 12 - CTEXT "+", -1, 57, 37, 8, 9 - CTEXT "+", -1, 98, 37, 8, 10 - AUTORADIOBUTTON "&CTRL", -1, 24, 31, 30, 11, WS_GROUP - AUTORADIOBUTTON "&ALT gauche", -1, 24, 45, 40, 12, NOT WS_TABSTOP - LTEXT "Touche:", -1, 110, 37, 14, 10 - COMBOBOX 1236, 127, 34, 46, 48, CBS_DROPDOWNLIST | WS_VSCROLL - DEFPUSHBUTTON "OK", IDOK, 212, 25, 50, 14 - PUSHBUTTON "Annuler", IDCANCEL, 212, 47, 50, 14 -} +BEGIN + LTEXT "", 1240, 16, 5, 250, 10 + GROUPBOX "", -1, 12, 17, 184, 48 + AUTOCHECKBOX "Activ&er la séquence de touche", 1249, 17, 17, 85, 8 + CTEXT "SHIFT", -1, 68, 37, 27, 12 + CTEXT "+", -1, 57, 37, 8, 9 + CTEXT "+", -1, 98, 37, 8, 10 + AUTORADIOBUTTON "&CTRL", -1, 24, 31, 30, 11, WS_GROUP + AUTORADIOBUTTON "&ALT gauche", -1, 24, 45, 40, 12, NOT WS_TABSTOP + LTEXT "Touche:", -1, 110, 37, 14, 10 + COMBOBOX 1236, 127, 34, 46, 48, CBS_DROPDOWNLIST | WS_VSCROLL + DEFPUSHBUTTON "OK", IDOK, 212, 25, 50, 14 + PUSHBUTTON "Annuler", IDCANCEL, 212, 47, 50, 14 +END + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Services texte et langue de saisie" + IDS_CPLSYSTEMDESCRIPTION "Personnalise les paramètres pour la langue de saisie de texte." +END /* FIXME : To improve/complete */ /* FIXME : À améliorer/compléter */ @@ -237,8 +243,6 @@ IDS_SELECTED_LANGUAGE "Anglais (États-Unis)" //Selected keyboard layout on "Add Input language" IDS_SELECTED_LAYOUT, "États-Unis-Dvorak" - IDS_CPLSYSTEMNAME "Services texte et langue de saisie" - IDS_CPLSYSTEMDESCRIPTION "Personnalise les paramètres pour la langue de saisie de texte." IDS_US_LAYOUT, "US" IDS_BELGIAN_LAYOUT, "Belge (Period)" IDS_BELGIAN_FRENCH_LAYOUT, "Belge Français" Modified: trunk/reactos/dll/cpl/input/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/uk-UA.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/uk-UA.rc (original) +++ trunk/reactos/dll/cpl/input/lang/uk-UA.rc Sat Oct 20 15:08:23 2007 @@ -14,18 +14,18 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Ìîâà ââîäó çà çàìîâ÷óâàííÿì", -1, 7,7,231,53 - LTEXT "Âèáåð³òü îäíó ç óñòàíîâëåíèõ ìîâ ââîäó, ÿêà âèêîðèñòîâóâàòèìåòüñÿ ïðè çàïóñêó êîìï'þòåðà.",-1,14,18,220,17 - COMBOBOX IDC_DEFAULT_INPUT_LANG, 14, 40, 218, 46, CBS_DROPDOWNLIST - GROUPBOX "Óñòàíîâëåí³ ñëóæáè", -1, 7,65,231,115 - LTEXT "Âèáåð³òü ïîòð³áí³ ñëóæáè äëÿ êîæíî¿ ìîâè ââîäó ç³ ñïèñêó. Çì³íèòè ñïèñîê ìîæíà çà äîïîìîãîþ êíîïîê ""Äîäàòè"" òà ""Âèäàëèòè"".",-1,14,75,220,17 - CONTROL "Òåêñò", IDC_KEYLAYOUT_TREE, "SysTreeView32", WS_BORDER | WS_VSCROLL | WS_TABSTOP | 0x00000034, 14, 96, 160, 78 - PUSHBUTTON "Çàìîâ&÷óâàííÿ", IDC_SET_DEFAULT, 179, 106, 53, 14 - PUSHBUTTON "&Äîäàòè...", IDC_ADD_BUTTON, 179, 124, 53, 14 - PUSHBUTTON "Â&èäàëèòè...", IDC_REMOVE_BUTTON, 179, 142, 53, 14 - PUSHBUTTON "Â&ëàñòèâîñò³...", IDC_PROP_BUTTON, 179, 160, 53, 14 - GROUPBOX "Íàñòðîéêà", -1, 7,185,231,36 - PUSHBUTTON "&Ìîâíà ïàíåëü...", IDC_LANG_BAR_BUTTON, 14, 198, 70, 14 - PUSHBUTTON "&Ïàðàìåòðè êëàâ³àòóðè...", IDC_KEY_SETTINGS_BUTTON, 90, 198, 70, 14 + LTEXT "Âèáåð³òü îäíó ç óñòàíîâëåíèõ ìîâ ââîäó, ÿêà âèêîðèñòîâóâàòèìåòüñÿ ïðè çàïóñêó êîìï'þòåðà.",-1,14,18,220,17 + COMBOBOX IDC_DEFAULT_INPUT_LANG, 14, 40, 218, 46, CBS_DROPDOWNLIST + GROUPBOX "Óñòàíîâëåí³ ñëóæáè", -1, 7,65,231,115 + LTEXT "Âèáåð³òü ïîòð³áí³ ñëóæáè äëÿ êîæíî¿ ìîâè ââîäó ç³ ñïèñêó. Çì³íèòè ñïèñîê ìîæíà çà äîïîìîãîþ êíîïîê ""Äîäàòè"" òà ""Âèäàëèòè"".",-1,14,75,220,17 + CONTROL "Òåêñò", IDC_KEYLAYOUT_TREE, "SysTreeView32", WS_BORDER | WS_VSCROLL | WS_TABSTOP | 0x00000034, 14, 96, 160, 78 + PUSHBUTTON "Çàìîâ&÷óâàííÿ", IDC_SET_DEFAULT, 179, 106, 53, 14 + PUSHBUTTON "&Äîäàòè...", IDC_ADD_BUTTON, 179, 124, 53, 14 + PUSHBUTTON "Â&èäàëèòè...", IDC_REMOVE_BUTTON, 179, 142, 53, 14 + PUSHBUTTON "Â&ëàñòèâîñò³...", IDC_PROP_BUTTON, 179, 160, 53, 14 + GROUPBOX "Íàñòðîéêà", -1, 7,185,231,36 + PUSHBUTTON "&Ìîâíà ïàíåëü...", IDC_LANG_BAR_BUTTON, 14, 198, 70, 14 + PUSHBUTTON "&Ïàðàìåòðè êëàâ³àòóðè...", IDC_KEY_SETTINGS_BUTTON, 90, 198, 70, 14 END IDD_PROPPAGEADVANCED DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT @@ -33,12 +33,12 @@ CAPTION "Äîäàòêîâî" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Íàñòðîéêà ñóì³ñíîñò³", -1, 7,7,231,60 - AUTOCHECKBOX "&Ðîçïîâñþäèòè ï³äòðèìêó äîäàòêîâèõ òåêñòîâèõ ñëóæá íà âñ³ ïðîãðàìè", IDC_SUPPORT_ADV_SERV_CHECKBOX, 14, 19, 210, 10, WS_GROUP - LTEXT "Âñòàíîâ³òü öåé ïðàïîðåöü ùîá ââ³ìêíóòè ï³äòðèìêó äîäàòêîâèõ òåêñòîâèõ ñëóæá â ïðîãðàì³ ""Áëîêíîò"" ³ ³íøèõ ïðîãðàìàõ, ÿê³ íå ï³äòðèìóþòü ðîçï³çíàâàííÿ ìîâè, ðóêîïèñíîãî òåêñòó àáî ³íøèõ äîäàòêîâèõ ñëóæá ââîäó.",-1,14,33,220,25 - GROUPBOX "Íàñòðîéêà ñèñòåìè", -1, 7,74,231,60 - AUTOCHECKBOX "&Âèìêíóòè äîäàòêîâ³ òåêñòîâ³ ñëóæáè", IDC_TURNOFF_ADV_TXTSERV_CHECKBOX, 14, 86, 210, 10, WS_GROUP - LTEXT "Âñòàíîâ³òü öåé ïðàïîðåöü ùîá âèìêíóòè äîäàòêîâ³ òåêñòîâ³ ñëóæáè äëÿ âñ³õ ïðîãðàì. Íå ðåêîìåíäîâàíî äëÿ ìîâ ñõ³äíî¿ Àç³¿, îñê³ëüêè ìîâíà ïàíåëü áóäå çàêðèòà.",-1,14,100,220,25 + GROUPBOX "Íàñòðîéêà ñóì³ñíîñò³", -1, 7,7,231,60 + AUTOCHECKBOX "&Ðîçïîâñþäèòè ï³äòðèìêó äîäàòêîâèõ òåêñòîâèõ ñëóæá íà âñ³ ïðîãðàìè", IDC_SUPPORT_ADV_SERV_CHECKBOX, 14, 19, 210, 10, WS_GROUP + LTEXT "Âñòàíîâ³òü öåé ïðàïîðåöü ùîá ââ³ìêíóòè ï³äòðèìêó äîäàòêîâèõ òåêñòîâèõ ñëóæá â ïðîãðàì³ ""Áëîêíîò"" ³ ³íøèõ ïðîãðàìàõ, ÿê³ íå ï³äòðèìóþòü ðîçï³çíàâàííÿ ìîâè, ðóêîïèñíîãî òåêñòó àáî ³íøèõ äîäàòêîâèõ ñëóæá ââîäó.",-1,14,33,220,25 + GROUPBOX "Íàñòðîéêà ñèñòåìè", -1, 7,74,231,60 + AUTOCHECKBOX "&Âèìêíóòè äîäàòêîâ³ òåêñòîâ³ ñëóæáè", IDC_TURNOFF_ADV_TXTSERV_CHECKBOX, 14, 86, 210, 10, WS_GROUP + LTEXT "Âñòàíîâ³òü öåé ïðàïîðåöü ùîá âèìêíóòè äîäàòêîâ³ òåêñòîâ³ ñëóæáè äëÿ âñ³õ ïðîãðàì. Íå ðåêîìåíäîâàíî äëÿ ìîâ ñõ³äíî¿ Àç³¿, îñê³ëüêè ìîâíà ïàíåëü áóäå çàêðèòà.",-1,14,100,220,25 END IDD_LANGBAR DIALOG 20, 20, 240, 120 @@ -122,120 +122,127 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Äîäàâàííÿ ìîâè ââîäó" FONT 8, "MS Shell Dlg" -{ - LTEXT "&Ìîâà ââîäó:", -1, 7, 7, 61, 10 - COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 105, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - AUTOCHECKBOX "&Ðîçêëàäêà êëàâ³àòóðè àáî çàñ³á ââîäó (IME):", IDC_KEYBOARD_LO_CHECKBOX, 37, 36, 110, 10 - COMBOBOX IDC_KEYBOARD_LO_COMBO, 49, 47, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - AUTOCHECKBOX "Ðîçï³çí&àâàííÿ ðóêîïèñíîãî òåêñòó:", IDC_HANDWRITING_REC_CHECKBOX, 37, 65, 110, 10 - COMBOBOX IDC_HANDWRITING_REC_COMBO, 49, 76, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - AUTOCHECKBOX "Ìîâë&åííÿ:", IDC_SPEECH_CHECKBOX, 37, 94, 110, 10 - COMBOBOX IDC_SPEECH_COMBO, 49, 105, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - AUTOCHECKBOX "&²íø³ òåêñòîâ³ ñëóæáè:", IDC_MORE_TEXT_SERV_CHECKBOX, 37, 123, 110, 10 - COMBOBOX IDC_MORE_TEXT_SERV_COMBO, 49, 134, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - DEFPUSHBUTTON "OK", IDOK, 146, 155, 50, 14 - PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 199, 155, 50, 14 -} +BEGIN + LTEXT "&Ìîâà ââîäó:", -1, 7, 7, 61, 10 + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 105, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&Ðîçêëàäêà êëàâ³àòóðè àáî çàñ³á ââîäó (IME):", IDC_KEYBOARD_LO_CHECKBOX, 37, 36, 110, 10 + COMBOBOX IDC_KEYBOARD_LO_COMBO, 49, 47, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "Ðîçï³çí&àâàííÿ ðóêîïèñíîãî òåêñòó:", IDC_HANDWRITING_REC_CHECKBOX, 37, 65, 110, 10 + COMBOBOX IDC_HANDWRITING_REC_COMBO, 49, 76, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "Ìîâë&åííÿ:", IDC_SPEECH_CHECKBOX, 37, 94, 110, 10 + COMBOBOX IDC_SPEECH_COMBO, 49, 105, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&²íø³ òåêñòîâ³ ñëóæáè:", IDC_MORE_TEXT_SERV_CHECKBOX, 37, 123, 110, 10 + COMBOBOX IDC_MORE_TEXT_SERV_COMBO, 49, 134, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + DEFPUSHBUTTON "OK", IDOK, 146, 155, 50, 14 + PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 199, 155, 50, 14 +END IDD_ADD3 DIALOG 20, 20, 257, 147 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Äîäàâàííÿ ìîâè ââîäó" FONT 8, "MS Shell Dlg" -{ - LTEXT "&Ìîâà ââîäó:", -1, 7, 7, 61, 10 - COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 105, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - AUTOCHECKBOX "&Ðîçêëàäêà êëàâ³àòóðè àáî çàñ³á ââîäó (IME):", IDC_KEYBOARD_LO_CHECKBOX, 37, 36, 110, 10 - COMBOBOX IDC_KEYBOARD_LO_COMBO, 49, 47, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - AUTOCHECKBOX "Ðîçï³çí&àâàííÿ ðóêîïèñíîãî òåêñòó:", IDC_HANDWRITING_REC_CHECKBOX, 37, 65, 110, 10 - COMBOBOX IDC_HANDWRITING_REC_COMBO, 49, 76, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - AUTOCHECKBOX "Ìîâë&åííÿ:", IDC_SPEECH_CHECKBOX, 37, 94, 110, 10 - COMBOBOX IDC_SPEECH_COMBO, 49, 105, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - DEFPUSHBUTTON "OK", IDOK, 146, 126, 50, 14 - PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 199, 126, 50, 14 -} +BEGIN + LTEXT "&Ìîâà ââîäó:", -1, 7, 7, 61, 10 + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 105, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&Ðîçêëàäêà êëàâ³àòóðè àáî çàñ³á ââîäó (IME):", IDC_KEYBOARD_LO_CHECKBOX, 37, 36, 110, 10 + COMBOBOX IDC_KEYBOARD_LO_COMBO, 49, 47, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "Ðîçï³çí&àâàííÿ ðóêîïèñíîãî òåêñòó:", IDC_HANDWRITING_REC_CHECKBOX, 37, 65, 110, 10 + COMBOBOX IDC_HANDWRITING_REC_COMBO, 49, 76, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "Ìîâë&åííÿ:", IDC_SPEECH_CHECKBOX, 37, 94, 110, 10 + COMBOBOX IDC_SPEECH_COMBO, 49, 105, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + DEFPUSHBUTTON "OK", IDOK, 146, 126, 50, 14 + PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 199, 126, 50, 14 +END IDD_CHANGE_KEY_SEQ DIALOG 5, 100, 285, 74 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Çì³íà ñïîëó÷åííÿ êëàâ³ø" FONT 8, "MS Shell Dlg" -{ - GROUPBOX "", -1, 9, 5, 209, 60 - AUTOCHECKBOX "&Ïåðåêëþ÷àòè ìîâè ââîäó", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12 - LTEXT "SHIFT", -1, 73, 37, 27, 12 - CTEXT "+", -1, 62, 37, 8, 9 - AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11, WS_GROUP - AUTORADIOBUTTON "ALT ç&ë³âà", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP - AUTOCHECKBOX "Ïåðå&êëþ÷àòè ðîçêëàäêè êëàâ³àòóðè", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 121, 15, 90, 12 - LTEXT "SHIFT", -1, 179, 37, 27, 12 - CTEXT "+", -1, 168, 37, 8, 9 - AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 135, 31, 30, 11, WS_GROUP - AUTORADIOBUTTON "ALT &çë³âà", IDC_LAYOUT_LEFTALT_RADIOBTN, 135, 45, 40, 12, NOT WS_TABSTOP - DEFPUSHBUTTON "OK", IDOK, 227, 18, 50, 14 - PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 227, 44, 50, 14 -} +BEGIN + GROUPBOX "", -1, 9, 5, 209, 60 + AUTOCHECKBOX "&Ïåðåêëþ÷àòè ìîâè ââîäó", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12 + LTEXT "SHIFT", -1, 73, 37, 27, 12 + CTEXT "+", -1, 62, 37, 8, 9 + AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11, WS_GROUP + AUTORADIOBUTTON "ALT ç&ë³âà", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP + AUTOCHECKBOX "Ïåðå&êëþ÷àòè ðîçêëàäêè êëàâ³àòóðè", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 121, 15, 90, 12 + LTEXT "SHIFT", -1, 179, 37, 27, 12 + CTEXT "+", -1, 168, 37, 8, 9 + AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 135, 31, 30, 11, WS_GROUP + AUTORADIOBUTTON "ALT &çë³âà", IDC_LAYOUT_LEFTALT_RADIOBTN, 135, 45, 40, 12, NOT WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 227, 18, 50, 14 + PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 227, 44, 50, 14 +END IDD_CHANGE_KEY_SEQ3 DIALOG 5, 100, 249, 125 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Çì³íà ñïîëó÷åííÿ êëàâ³ø" FONT 8, "MS Shell Dlg" -{ - GROUPBOX "", -1, 9, 5, 174, 110 - AUTOCHECKBOX "&Ïåðåêëþ÷àòè ìîâè ââîäó", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12 - LTEXT "SHIFT", -1, 73, 37, 27, 12 - CTEXT "+", -1, 62, 37, 8, 9 - AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11, WS_GROUP - AUTORADIOBUTTON "ALT ç&ë³âà", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP - AUTOCHECKBOX "Ïåðå&êëþ÷àòè ðîçêëàäêè êëàâ³àòóðè", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 15, 65, 90, 12 - LTEXT "SHIFT", -1, 73, 87, 27, 12 - CTEXT "+", -1, 62, 87, 8, 9 - CONTROL "", IDC_CKS_BUTTON, "BUTTON", BS_OWNERDRAW, 96, 77, 13, 33 - AUTORADIOBUTTON "&Òóïèé íàãîëîñ ( ` )", IDC_GRAVE_ACCENT_RADIOBTN, 110, 87, 69, 10, WS_GROUP - AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 29, 81, 30, 11, NOT WS_TABSTOP - AUTORADIOBUTTON "ALT &çë³âà", IDC_LAYOUT_LEFTALT_RADIOBTN, 29, 95, 40, 12, NOT WS_TABSTOP - DEFPUSHBUTTON "OK", IDOK, 192, 25, 50, 14 - PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 192, 47, 50, 14 -} +BEGIN + GROUPBOX "", -1, 9, 5, 174, 110 + AUTOCHECKBOX "&Ïåðåêëþ÷àòè ìîâè ââîäó", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12 + LTEXT "SHIFT", -1, 73, 37, 27, 12 + CTEXT "+", -1, 62, 37, 8, 9 + AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11, WS_GROUP + AUTORADIOBUTTON "ALT ç&ë³âà", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP + AUTOCHECKBOX "Ïåðå&êëþ÷àòè ðîçêëàäêè êëàâ³àòóðè", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 15, 65, 90, 12 + LTEXT "SHIFT", -1, 73, 87, 27, 12 + CTEXT "+", -1, 62, 87, 8, 9 + CONTROL "", IDC_CKS_BUTTON, "BUTTON", BS_OWNERDRAW, 96, 77, 13, 33 + AUTORADIOBUTTON "&Òóïèé íàãîëîñ ( ` )", IDC_GRAVE_ACCENT_RADIOBTN, 110, 87, 69, 10, WS_GROUP + AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 29, 81, 30, 11, NOT WS_TABSTOP + AUTORADIOBUTTON "ALT &çë³âà", IDC_LAYOUT_LEFTALT_RADIOBTN, 29, 95, 40, 12, NOT WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 192, 25, 50, 14 + PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 192, 47, 50, 14 +END IDD_CHANGE_KEY_SEQ4 DIALOG 5, 100, 249, 125 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Çì³íà ñïîëó÷åííÿ êëàâ³ø" FONT 8, "MS Shell Dlg" -{ - GROUPBOX "", -1, 9, 5, 174, 110 - AUTOCHECKBOX "&Ïåðåêëþ÷àòè ìîâè ââîäó", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12 - LTEXT "SHIFT", -1, 73, 37, 27, 12 - CTEXT "+", -1, 62, 37, 8, 9 - CONTROL "", IDC_CKS_BUTTON, "BUTTON", BS_OWNERDRAW, 96, 27, 13, 33 - AUTORADIOBUTTON "&Òóïèé íàãîëîñ ( ` )", IDC_GRAVE_ACCENT_RADIOBTN, 110, 37, 69, 10, WS_GROUP - AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11, NOT WS_TABSTOP - AUTORADIOBUTTON "ALT ç&ë³âà", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP - AUTOCHECKBOX "Ïåðå&êëþ÷àòè ðîçêëàäêè êëàâ³àòóðè", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 15, 65, 90, 12 - LTEXT "SHIFT", -1, 73, 87, 27, 12 - CTEXT "+", -1, 62, 87, 8, 9 - AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 29, 81, 30, 11, WS_GROUP - AUTORADIOBUTTON "ALT &çë³âà", IDC_LAYOUT_LEFTALT_RADIOBTN, 29, 95, 40, 12, NOT WS_TABSTOP - DEFPUSHBUTTON "OK", IDOK, 192, 25, 50, 14 - PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 192, 47, 50, 14 -} +BEGIN + GROUPBOX "", -1, 9, 5, 174, 110 + AUTOCHECKBOX "&Ïåðåêëþ÷àòè ìîâè ââîäó", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12 + LTEXT "SHIFT", -1, 73, 37, 27, 12 + CTEXT "+", -1, 62, 37, 8, 9 + CONTROL "", IDC_CKS_BUTTON, "BUTTON", BS_OWNERDRAW, 96, 27, 13, 33 + AUTORADIOBUTTON "&Òóïèé íàãîëîñ ( ` )", IDC_GRAVE_ACCENT_RADIOBTN, 110, 37, 69, 10, WS_GROUP + AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11, NOT WS_TABSTOP + AUTORADIOBUTTON "ALT ç&ë³âà", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP + AUTOCHECKBOX "Ïåðå&êëþ÷àòè ðîçêëàäêè êëàâ³àòóðè", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 15, 65, 90, 12 + LTEXT "SHIFT", -1, 73, 87, 27, 12 + CTEXT "+", -1, 62, 87, 8, 9 + AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 29, 81, 30, 11, WS_GROUP + AUTORADIOBUTTON "ALT &çë³âà", IDC_LAYOUT_LEFTALT_RADIOBTN, 29, 95, 40, 12, NOT WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 192, 25, 50, 14 + PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 192, 47, 50, 14 +END IDD_CHANGE_KEY_SEQ5 DIALOG 5, 100, 269, 78 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Çì³íà ñïîëó÷åííÿ êëàâ³ø" FONT 8, "MS Shell Dlg" -{ - LTEXT "", 1240, 16, 5, 250, 10 - GROUPBOX "", -1, 12, 17, 184, 48 - AUTOCHECKBOX "&Âèêîðèñòîâóâàòè ñïîëó÷åííÿ êëàâ³ø", 1249, 17, 17, 85, 8 - CTEXT "SHIFT", -1, 68, 37, 27, 12 - CTEXT "+", -1, 57, 37, 8, 9 - CTEXT "+", -1, 98, 37, 8, 10 - AUTORADIOBUTTON "&CTRL", -1, 24, 31, 30, 11, WS_GROUP - AUTORADIOBUTTON "ALT ç&ë³âà", -1, 24, 45, 40, 12, NOT WS_TABSTOP - LTEXT "&Êëàâ³øà:", -1, 110, 37, 14, 10 - COMBOBOX 1236, 127, 34, 46, 48, CBS_DROPDOWNLIST | WS_VSCROLL - DEFPUSHBUTTON "OK", IDOK, 212, 25, 50, 14 - PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 212, 47, 50, 14 -} +BEGIN + LTEXT "", 1240, 16, 5, 250, 10 + GROUPBOX "", -1, 12, 17, 184, 48 + AUTOCHECKBOX "&Âèêîðèñòîâóâàòè ñïîëó÷åííÿ êëàâ³ø", 1249, 17, 17, 85, 8 + CTEXT "SHIFT", -1, 68, 37, 27, 12 + CTEXT "+", -1, 57, 37, 8, 9 + CTEXT "+", -1, 98, 37, 8, 10 + AUTORADIOBUTTON "&CTRL", -1, 24, 31, 30, 11, WS_GROUP + AUTORADIOBUTTON "ALT ç&ë³âà", -1, 24, 45, 40, 12, NOT WS_TABSTOP + LTEXT "&Êëàâ³øà:", -1, 110, 37, 14, 10 + COMBOBOX 1236, 127, 34, 46, 48, CBS_DROPDOWNLIST | WS_VSCROLL + DEFPUSHBUTTON "OK", IDOK, 212, 25, 50, 14 + PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 212, 47, 50, 14 +END + + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Ìîâè òà ñëóæáè òåêñòîâîãî ââîäó" + IDS_CPLSYSTEMDESCRIPTION "Íàëàøòîâóº ïàðàìåòðè äëÿ òåêñòîâîãî ââîäó." +END STRINGTABLE BEGIN @@ -243,8 +250,6 @@ IDS_SELECTED_LANGUAGE "English (United States)" //Selected keyboard layout on "Add Input language" ("Äîäàâàííÿ ìîâè ââîäó") IDS_SELECTED_LAYOUT, "United States-Dvorak" - IDS_CPLSYSTEMNAME "Ìîâè òà ñëóæáè òåêñòîâîãî ââîäó" - IDS_CPLSYSTEMDESCRIPTION "Íàëàøòîâóº ïàðàìåòðè äëÿ òåêñòîâîãî ââîäó." IDS_US_LAYOUT, "ÑØÀ" IDS_BELGIAN_LAYOUT, "Áåëüã³éñüêà (³ç êðàïêîþ)" IDS_BELGIAN_FRENCH_LAYOUT, "Ôðàíöóçüêà (Áåëüã³ÿ)" Modified: trunk/reactos/dll/cpl/input/langbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/langbar.c?re… ============================================================================== --- trunk/reactos/dll/cpl/input/langbar.c (original) +++ trunk/reactos/dll/cpl/input/langbar.c Sat Oct 20 15:08:23 2007 @@ -18,10 +18,10 @@ */ /* * - * PROJECT: input.dll - * FILE: dll/win32/input/langbar.c - * PURPOSE: input.dll - * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) + * PROJECT: input.dll + * FILE: dll/win32/input/langbar.c + * PURPOSE: input.dll + * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) * UPDATE HISTORY: * 06-09-2007 Created */ @@ -50,22 +50,19 @@ switch (message) { case WM_INITDIALOG: - { + break; - } case WM_COMMAND: - { - switch (LOWORD(wParam)) - { - case IDOK: + switch (LOWORD(wParam)) + { + case IDOK: + break; - break; - case IDCANCEL: - EndDialog(hDlg,LOWORD(wParam)); - break; - } - } - break; + case IDCANCEL: + EndDialog(hDlg, LOWORD(wParam)); + break; + } + break; } return FALSE; Modified: trunk/reactos/dll/cpl/input/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/misc.c?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/input/misc.c (original) +++ trunk/reactos/dll/cpl/input/misc.c Sat Oct 20 15:08:23 2007 @@ -18,10 +18,10 @@ */ /* * - * PROJECT: input.dll - * FILE: dll/win32/input/misc.c - * PURPOSE: input.dll - * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) + * PROJECT: input.dll + * FILE: dll/win32/input/misc.c + * PURPOSE: input.dll + * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) * UPDATE HISTORY: * 06-09-2007 Created */ @@ -44,26 +44,28 @@ { TCHAR Layout[256]; int Index; - UINT loIndex; + UINT loIndex; - for ( loIndex = BEGIN_LAYOUT; loIndex <= END_LAYOUT; loIndex++ ) - { - LoadString(hApplet, - loIndex, - Layout, - sizeof(Layout) / sizeof(TCHAR)); - if (strlen((char*)Layout) > 0) - { - Index = (int) SendMessage(hWnd, - CB_INSERTSTRING, - 0, - (LPARAM)Layout); - SendMessage(hWnd, - CB_SETITEMDATA, - Index, - (LPARAM)loIndex); - } - } + for (loIndex = BEGIN_LAYOUT; loIndex <= END_LAYOUT; loIndex++) + { + LoadString(hApplet, + loIndex, + Layout, + sizeof(Layout) / sizeof(TCHAR)); + + if (strlen((char*)Layout) > 0) + { + Index = (int) SendMessage(hWnd, + CB_INSERTSTRING, + 0, + (LPARAM)Layout); + + SendMessage(hWnd, + CB_SETITEMDATA, + Index, + (LPARAM)loIndex); + } + } } /* EOF */ Modified: trunk/reactos/dll/cpl/input/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/settings.c?r… ============================================================================== --- trunk/reactos/dll/cpl/input/settings.c (original) +++ trunk/reactos/dll/cpl/input/settings.c Sat Oct 20 15:08:23 2007 @@ -18,10 +18,10 @@ */ /* * - * PROJECT: input.dll - * FILE: dll/win32/input/settings.c - * PURPOSE: input.dll - * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) + * PROJECT: input.dll + * FILE: dll/win32/input/settings.c + * PURPOSE: input.dll + * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) * UPDATE HISTORY: * 06-09-2007 Created */ @@ -48,98 +48,104 @@ HKEY hKey; char szPreload[BUFSIZE],szCount[BUFSIZE],Lang[BUFSIZE]; DWORD dwBufLen = BUFSIZE, dwBufCLen = BUFSIZE, cValues; - LONG lRet; - int Count; - LCID Lcid; + LONG lRet; + int Count; + LCID Lcid; if(RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Keyboard Layout\\Preload"), 0, KEY_QUERY_VALUE, &hKey) != ERROR_SUCCESS) - { - return FALSE; - } + { + return FALSE; + } + RegQueryInfoKey(hKey,NULL,NULL,NULL,NULL,NULL,NULL,&cValues,NULL,NULL,NULL,NULL); - if (cValues) - { - for (Count = 0; Count < cValues; Count++) + if (cValues) + { + for (Count = 0; Count < cValues; Count++) { szCount[0] = '\0'; lRet = RegEnumValue(hKey,Count,(LPTSTR)szCount,&dwBufCLen,NULL,NULL,NULL,NULL); - sprintf(szCount,"%d",Count + 1); - RegQueryValueEx(hKey,(LPTSTR)szCount,NULL,NULL,(LPBYTE)szPreload,&dwBufLen); + sprintf(szCount,"%d",Count + 1); + RegQueryValueEx(hKey,(LPTSTR)szCount,NULL,NULL,(LPBYTE)szPreload,&dwBufLen); - Lcid = wcstoul((LPTSTR)szPreload, NULL, 16); - GetLocaleInfo(Lcid, LOCALE_SLANGUAGE, (LPTSTR)Lang, sizeof(Lang)); + Lcid = wcstoul((LPTSTR)szPreload, NULL, 16); + GetLocaleInfo(Lcid, LOCALE_SLANGUAGE, (LPTSTR)Lang, sizeof(Lang)); - SendMessage(hWnd, - CB_INSERTSTRING, - 0, - (LPARAM)Lang); - if (Count == 0) - { - SendMessage(hWnd, - CB_SELECTSTRING, - (WPARAM) -1, - (LPARAM)Lang); - } + SendMessage(hWnd, + CB_INSERTSTRING, + 0, + (LPARAM)Lang); + if (Count == 0) + { + SendMessage(hWnd, + CB_SELECTSTRING, + (WPARAM) -1, + (LPARAM)Lang); + } } - } + } - RegCloseKey(hKey); + RegCloseKey(hKey); - return TRUE; + return TRUE; } /* Property page dialog callback */ INT_PTR CALLBACK SettingPageProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam) { - UNREFERENCED_PARAMETER(lParam); - switch (uMsg) - { - case WM_INITDIALOG: - CreateDefaultLangList(GetDlgItem(hwndDlg, IDC_DEFAULT_INPUT_LANG)); - break; + UNREFERENCED_PARAMETER(lParam); - case WM_COMMAND: - switch (LOWORD(wParam)) - { - case IDC_LANG_BAR_BUTTON: - DialogBox(hApplet, - MAKEINTRESOURCE(IDD_LANGBAR), - hwndDlg, - LangBarDlgProc); + switch (uMsg) + { + case WM_INITDIALOG: + CreateDefaultLangList(GetDlgItem(hwndDlg, IDC_DEFAULT_INPUT_LANG)); break; - case IDC_KEY_SETTINGS_BUTTON: - DialogBox(hApplet, - MAKEINTRESOURCE(IDD_KEYSETTINGS), - hwndDlg, - KeySettingsDlgProc); + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDC_LANG_BAR_BUTTON: + DialogBox(hApplet, + MAKEINTRESOURCE(IDD_LANGBAR), + hwndDlg, + LangBarDlgProc); + break; + + case IDC_KEY_SETTINGS_BUTTON: + DialogBox(hApplet, + MAKEINTRESOURCE(IDD_KEYSETTINGS), + hwndDlg, + KeySettingsDlgProc); + break; + + case IDC_ADD_BUTTON: + DialogBox(hApplet, + MAKEINTRESOURCE(IDD_ADD), + hwndDlg, + AddDlgProc); + break; + + case IDC_PROP_BUTTON: + DialogBox(hApplet, + MAKEINTRESOURCE(IDD_INPUT_LANG_PROP), + hwndDlg, + InputLangPropDlgProc); + break; + + case IDC_DEFAULT_INPUT_LANG: + if (HIWORD(wParam) == CBN_SELCHANGE) + { + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + break; + } break; - case IDC_ADD_BUTTON: - DialogBox(hApplet, - MAKEINTRESOURCE(IDD_ADD), - hwndDlg, - AddDlgProc); - break; - case IDC_PROP_BUTTON: - DialogBox(hApplet, - MAKEINTRESOURCE(IDD_INPUT_LANG_PROP), - hwndDlg, - InputLangPropDlgProc); - break; - case IDC_DEFAULT_INPUT_LANG: - if (HIWORD(wParam) == CBN_SELCHANGE) - { - PropSheet_Changed(GetParent(hwndDlg), hwndDlg); - } - break; - } - break; - } + } - return FALSE; + return FALSE; } /* EOF */

1 0

[fireball] 29705: Dmitry Chapyshev <lentind@yandex.ru> - Implement a joy.cpl applet. Works good on Windows XP.
by fireball＠svn.reactos.org 20 Oct '07

20 Oct '07

Author: fireball Date: Sat Oct 20 14:20:05 2007 New Revision: 29705 URL: http://svn.reactos.org/svn/reactos?rev=29705&view=rev Log: Dmitry Chapyshev <lentind(a)yandex.ru> - Implement a joy.cpl applet. Works good on Windows XP. Added: trunk/reactos/dll/cpl/joy/ trunk/reactos/dll/cpl/joy/joy.c (with props) trunk/reactos/dll/cpl/joy/joy.def (with props) trunk/reactos/dll/cpl/joy/joy.h (with props) trunk/reactos/dll/cpl/joy/joy.rbuild (with props) trunk/reactos/dll/cpl/joy/joy.rc (with props) trunk/reactos/dll/cpl/joy/lang/ trunk/reactos/dll/cpl/joy/lang/en-US.rc (with props) trunk/reactos/dll/cpl/joy/lang/ru-RU.rc (with props) trunk/reactos/dll/cpl/joy/manifest.xml (with props) trunk/reactos/dll/cpl/joy/resource.h (with props) trunk/reactos/dll/cpl/joy/resources/ trunk/reactos/dll/cpl/joy/resources/applet.ico (with props) trunk/reactos/dll/cpl/joy/rsrc.rc (with props) Modified: trunk/reactos/baseaddress.rbuild trunk/reactos/dll/cpl/cpl.rbuild Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=297… ============================================================================== --- trunk/reactos/baseaddress.rbuild (original) +++ trunk/reactos/baseaddress.rbuild Sat Oct 20 14:20:05 2007 @@ -7,6 +7,7 @@ <property name="BASEADDRESS_DEVENUM" value="0x35680000" /> <property name="BASEADDRESS_PWRCFG" value="0x587e0000" /> <property name="BASEADDRESS_MMSYS" value="0x588a0000" /> + <property name="BASEADDRESS_JOY" value="0x589b0000" /> <property name="BASEADDRESS_UXTHEME" value="0x5ad70000" /> <property name="BASEADDRESS_VDMDBG" value="0x5b0d0000" /> <property name="BASEADDRESS_OBJSEL" value="0x5b400000" /> Modified: trunk/reactos/dll/cpl/cpl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/cpl.rbuild?rev=297… ============================================================================== --- trunk/reactos/dll/cpl/cpl.rbuild (original) +++ trunk/reactos/dll/cpl/cpl.rbuild Sat Oct 20 14:20:05 2007 @@ -18,6 +18,9 @@ </directory> <directory name="intl"> <xi:include href="intl/intl.rbuild" /> +</directory> +<directory name="joy"> + <xi:include href="joy/joy.rbuild" /> </directory> <directory name="main"> <xi:include href="main/main.rbuild" /> Added: trunk/reactos/dll/cpl/joy/joy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/joy.c?rev=2970… ============================================================================== --- trunk/reactos/dll/cpl/joy/joy.c (added) +++ trunk/reactos/dll/cpl/joy/joy.c Sat Oct 20 14:20:05 2007 @@ -1,0 +1,302 @@ +/* + * ReactOS + * Copyright (C) 2004 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +/* + * + * PROJECT: ReactOS Software Control Panel + * FILE: dll/cpl/joy/joy.c + * PURPOSE: ReactOS Software Control Panel + * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) + * UPDATE HISTORY: + * 10-18-2007 Created + */ + +#include "joy.h" + +#define NUM_APPLETS (1) + +LONG CALLBACK SystemApplet(VOID); +HINSTANCE hApplet = 0; +HWND MainDlg; + +/* Applets */ + +APPLET Applets[NUM_APPLETS] = +{ + {IDI_CPLSYSTEM, IDS_CPLSYSTEMNAME, IDS_CPLSYSTEMDESCRIPTION, SystemApplet} +}; + +VOID AddColumns(HWND hList) +{ + LV_COLUMN dummy; + RECT rect; + int Size; + TCHAR szBuf[256]; + + GetClientRect(hList, &rect); + ZeroMemory(&dummy, sizeof(LV_COLUMN)); + dummy.mask = LVCF_TEXT | LVCF_WIDTH | LVCF_SUBITEM; + dummy.iSubItem = 0; + LoadString(hApplet, IDS_STATUS, szBuf, sizeof(szBuf) / sizeof(TCHAR)); + dummy.pszText = (LPTSTR)szBuf; + Size = rect.right - rect.left - 250; + dummy.cx = Size; + (void)ListView_InsertColumn(hList, 0, &dummy); + + GetClientRect(hList, &rect); + ZeroMemory(&dummy, sizeof(LV_COLUMN)); + dummy.mask = LVCF_TEXT | LVCF_WIDTH | LVCF_SUBITEM; + dummy.iSubItem = 0; + LoadString(hApplet, IDS_CONTROLLER, szBuf, sizeof(szBuf) / sizeof(TCHAR)); + dummy.pszText = (LPTSTR)szBuf; + dummy.cx = rect.right - rect.left - Size; + (void)ListView_InsertColumn(hList, 0, &dummy); +} + +INT_PTR CALLBACK +AdvancedPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + UNREFERENCED_PARAMETER(lParam); + + switch (uMsg) + { + case WM_INITDIALOG: + + break; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDOK: + EndDialog(hwndDlg,LOWORD(wParam)); + break; + case IDCANCEL: + EndDialog(hwndDlg,LOWORD(wParam)); + break; + } + break; + case WM_NOTIFY: + + break; + case WM_SYSCOMMAND: + switch (LOWORD(wParam)) + { + case SC_CONTEXTHELP: + // not implemented + break; + } + break; + } + return 0; +} + +INT_PTR CALLBACK +CustomPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + UNREFERENCED_PARAMETER(lParam); + + switch (uMsg) + { + case WM_INITDIALOG: + + break; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDOK: + EndDialog(hwndDlg,LOWORD(wParam)); + break; + case IDCANCEL: + EndDialog(hwndDlg,LOWORD(wParam)); + break; + } + break; + case WM_NOTIFY: + + break; + case WM_SYSCOMMAND: + switch (LOWORD(wParam)) + { + case SC_CONTEXTHELP: + // not implemented + break; + } + break; + } + return 0; +} + +INT_PTR CALLBACK +AddPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + UNREFERENCED_PARAMETER(lParam); + + switch (uMsg) + { + case WM_INITDIALOG: + + break; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDC_CUSTOM_BUTTON: + DialogBox(hApplet, + MAKEINTRESOURCE(IDD_CUSTOM), + hwndDlg, + CustomPageProc); + break; + case IDOK: + EndDialog(hwndDlg,LOWORD(wParam)); + break; + case IDCANCEL: + EndDialog(hwndDlg,LOWORD(wParam)); + break; + } + break; + case WM_NOTIFY: + + break; + case WM_SYSCOMMAND: + switch (LOWORD(wParam)) + { + case SC_CONTEXTHELP: + // not implemented + break; + } + break; + } + return 0; +} + +/* Property page dialog callback */ +INT_PTR CALLBACK +MainPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + UNREFERENCED_PARAMETER(lParam); + + switch (uMsg) + { + case WM_INITDIALOG: + AddColumns(GetDlgItem(hwndDlg,IDC_CONTROLLER_LIST)); + break; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDC_ADD_BUTTON: + DialogBox(hApplet, + MAKEINTRESOURCE(IDD_ADD), + hwndDlg, + AddPageProc); + break; + case IDC_ADVANCED_BUTTON: + DialogBox(hApplet, + MAKEINTRESOURCE(IDD_ADVANCED), + hwndDlg, + AdvancedPageProc); + break; + case IDOK: + EndDialog(hwndDlg,LOWORD(wParam)); + break; + } + break; + case WM_NOTIFY: + + break; + case WM_SYSCOMMAND: + switch (LOWORD(wParam)) + { + case SC_CLOSE: + EndDialog(hwndDlg,LOWORD(wParam)); + break; + case SC_CONTEXTHELP: + // not implemented + break; + } + break; + } + return 0; +} + +/* First Applet */ +LONG CALLBACK +SystemApplet(VOID) +{ + DialogBox(hApplet, + MAKEINTRESOURCE(IDD_PROPPAGEMAIN), + MainDlg, + MainPageProc); + + return (LONG)TRUE; +} + +/* Control Panel Callback */ +LONG CALLBACK +CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) +{ + CPLINFO *CPlInfo; + DWORD i; + + UNREFERENCED_PARAMETER(hwndCPl); + + i = (DWORD)lParam1; + switch (uMsg) + { + case CPL_INIT: + return TRUE; + + case CPL_GETCOUNT: + return NUM_APPLETS; + + case CPL_INQUIRE: + CPlInfo = (CPLINFO*)lParam2; + CPlInfo->lData = 0; + CPlInfo->idIcon = Applets[i].idIcon; + CPlInfo->idName = Applets[i].idName; + CPlInfo->idInfo = Applets[i].idDescription; + break; + + case CPL_DBLCLK: + { + MainDlg = hwndCPl; + Applets[i].AppletProc(); + } + break; + } + + return FALSE; +} + +BOOL WINAPI +DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID lpvReserved) +{ + UNREFERENCED_PARAMETER(lpvReserved); + + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + case DLL_THREAD_ATTACH: + CoInitialize(NULL); + hApplet = hinstDLL; + break; + } + + return TRUE; +} Propchange: trunk/reactos/dll/cpl/joy/joy.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/joy/joy.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/joy.def?rev=29… ============================================================================== --- trunk/reactos/dll/cpl/joy/joy.def (added) +++ trunk/reactos/dll/cpl/joy/joy.def Sat Oct 20 14:20:05 2007 @@ -1,0 +1,6 @@ +LIBRARY joy.cpl + +EXPORTS +CPlApplet + +; EOF Propchange: trunk/reactos/dll/cpl/joy/joy.def ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/joy/joy.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/joy.h?rev=2970… ============================================================================== --- trunk/reactos/dll/cpl/joy/joy.h (added) +++ trunk/reactos/dll/cpl/joy/joy.h Sat Oct 20 14:20:05 2007 @@ -1,0 +1,40 @@ +#ifndef __CPL_JOY_H +#define __CPL_JOY_H + +#include <windows.h> +#include <commctrl.h> +#include <cpl.h> +#include <stdlib.h> +#include <stdio.h> +#include <stdarg.h> +#include <tchar.h> +#include <process.h> + +#include "resource.h" + +typedef LONG (CALLBACK *CPLAPPLET_PROC)(VOID); + +typedef struct +{ + int idIcon; + int idName; + int idDescription; + CPLAPPLET_PROC AppletProc; +} APPLET, *PAPPLET; + +typedef struct +{ + WCHAR szTarget[MAX_PATH]; + WCHAR szWorkingDirectory[MAX_PATH]; + WCHAR szDescription[MAX_PATH]; + WCHAR szLinkName[MAX_PATH]; +}CREATE_LINK_CONTEXT, *PCREATE_LINK_CONTEXT; + + +extern HINSTANCE hApplet; + +void ShowLastWin32Error(HWND hWndOwner); + +#endif /* __CPL_JOY_H */ + +/* EOF */ Propchange: trunk/reactos/dll/cpl/joy/joy.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/joy/joy.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/joy.rbuild?rev… ============================================================================== --- trunk/reactos/dll/cpl/joy/joy.rbuild (added) +++ trunk/reactos/dll/cpl/joy/joy.rbuild Sat Oct 20 14:20:05 2007 @@ -1,0 +1,19 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="joy" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_JOY}" installbase="system32" installname="joy.cpl" unicode="yes"> + <importlibrary definition="joy.def" /> + <include base="joy">.</include> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <library>kernel32</library> + <library>advapi32</library> + <library>user32</library> + <library>comctl32</library> + <library>msvcrt</library> + <library>ole32</library> + <library>uuid</library> + <library>shell32</library> + <file>joy.c</file> + <file>joy.rc</file> +</module> Propchange: trunk/reactos/dll/cpl/joy/joy.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/joy/joy.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/joy.rc?rev=297… ============================================================================== --- trunk/reactos/dll/cpl/joy/joy.rc (added) +++ trunk/reactos/dll/cpl/joy/joy.rc Sat Oct 20 14:20:05 2007 @@ -1,0 +1,20 @@ +#include "resource.h" +#include <windows.h> + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Software Control Panel\0" +#define REACTOS_STR_INTERNAL_NAME "joy\0" +#define REACTOS_STR_ORIGINAL_FILENAME "joy.cpl\0" +#ifdef _MSC_VER +#include <../../../reactos/version.rc> +#else +#include <reactos/version.rc> +#endif + +123 24 DISCARDABLE "manifest.xml" + +IDI_CPLSYSTEM ICON "resources/applet.ico" + +#include "rsrc.rc" Propchange: trunk/reactos/dll/cpl/joy/joy.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/joy/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/lang/en-US.rc?… ============================================================================== --- trunk/reactos/dll/cpl/joy/lang/en-US.rc (added) +++ trunk/reactos/dll/cpl/joy/lang/en-US.rc Sat Oct 20 14:20:05 2007 @@ -1,0 +1,84 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +IDD_PROPPAGEMAIN DIALOGEX 0, 0, 252, 205 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Game Controllers" +FONT 8, "MS Shell Dlg" +{ + ICON IDI_CPLSYSTEM, -1, 7, 7, 20, 20 + LTEXT "These settings help you configure the game controllers installed on your computer.", -1, 33, 7, 214, 20, NOT WS_GROUP + GROUPBOX "I&nstalled game controllers", -1, 7, 34, 238, 117 + CONTROL "List1", IDC_CONTROLLER_LIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | 0x0000808D, 14, 44, 224, 80 + PUSHBUTTON "&Add...", IDC_ADD_BUTTON, 35, 129, 65, 14 + PUSHBUTTON "&Remove", IDC_REMOVE_BUTTON, 104, 129, 65, 14, WS_DISABLED + PUSHBUTTON "&Properties", IDC_PROPERTIES_BUTTON, 173, 129, 65, 14, WS_DISABLED + PUSHBUTTON "A&dvanced...", IDC_ADVANCED_BUTTON, 111, 157, 65, 14 + PUSHBUTTON "&Troubleshoot...", IDC_TROUBLESHOOT_BUTTON, 180, 157, 65, 14 + PUSHBUTTON "OK", IDOK, 195, 185, 50, 14 +} + +IDD_ADD DIALOGEX 0, 0, 265, 200 +STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Add Game Controller" +FONT 8, "MS Shell Dlg" +{ + ICON IDI_CPLSYSTEM, -1, 8, 7, 20, 20 + LTEXT "Select a game controller from the list below, and then click OK. If your game controller does not appear in the list, click Custom.", -1, 35, 7, 210, 33 + LTEXT "&Game controllers:", -1, 8, 45, 126, 8 + LISTBOX IDC_GAME_CONTROLLERS_LIST, 7, 55, 251, 57, LBS_STANDARD | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_HSCROLL | WS_TABSTOP + AUTOCHECKBOX "&Enable rudders and pedals", IDC_ENABLE_RUDDERS_CHECKBOX, 7, 114, 100, 10, WS_GROUP + LTEXT "&Game Port:", -1, 7, 134, 38, 8, NOT WS_VISIBLE + COMBOBOX IDC_GAME_PORT_COMBO, 7, 147, 140, 50, CBS_DROPDOWNLIST | CBS_SORT | NOT WS_VISIBLE | WS_VSCROLL + PUSHBUTTON "&Custom...", IDC_CUSTOM_BUTTON, 208, 147, 50, 14 + CONTROL "", -25525, "STATIC", SS_ETCHEDHORZ, 7, 170, 251, 1 + DEFPUSHBUTTON "OK", IDOK, 155, 179, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 208, 179, 50, 14 +} + +IDD_CUSTOM DIALOGEX 0, 0, 265, 183, 0 +STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Custom Game Controller" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "Special characteristics", -1, 7, 7, 245, 52 + AUTORADIOBUTTON "&Joystick", IDC_JOYSTICK_RADIO, 17, 23, 55, 10 + AUTORADIOBUTTON "&Flight yoke or flight stick", IDC_FLIGHT_YOKE_RADIO, 147, 23, 89, 10 + AUTORADIOBUTTON "&Game pad", IDC_GAME_PAD_RADIO, 17, 40, 65, 10 + AUTORADIOBUTTON "&Race car controller", IDC_RACE_CAR_RADIO, 147, 40, 93, 10 + GROUPBOX "&Axes", -1, 7, 67, 116, 44, WS_GROUP + COMBOBOX IDC_AXES_COMBO, 37, 79, 48, 50, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTORADIOBUTTON "Rudder/Pedals", IDC_RUDDER_PEDALS_RADIO, 14, 97, 63, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Z Axis", IDC_Z_AXIS_RADIO, 81, 97, 35, 10, NOT WS_VISIBLE + GROUPBOX "&Buttons", -1, 137, 67, 116, 44 + COMBOBOX IDC_BUTTONS_COMBO, 178, 79, 48, 50, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL, WS_EX_CLIENTEDGE + AUTOCHECKBOX "Includes a &point of view control", IDC_INC_POINT_CHECKBOX, 7, 123, 115, 10 + LTEXT "C&ontroller name:", -1, 7, 139, 200, 9 + EDITTEXT IDC_CONTROLLER_NAME_EDIT, 7, 150, 116, 15, ES_AUTOHSCROLL, WS_EX_CLIENTEDGE | WS_EX_STATICEDGE + DEFPUSHBUTTON "OK", IDOK, 137, 150, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 203, 150, 50, 14 +} + +IDD_ADVANCED DIALOGEX 0, 0, 220, 86 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Advanced Settings" +FONT 8, "MS Shell Dlg" +{ + ICON IDI_CPLSYSTEM, -1, 7, 24, 20, 20 + DEFPUSHBUTTON "OK", IDOK, 106, 65, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 163, 65, 50, 14 + LTEXT "Select the device you want to use with older programs.", -1, 7, 7, 208, 10 + LTEXT "&Preferred device:", -1, 34, 24, 70, 10 + COMBOBOX IDC_PREFERRED_DEV_COMBO, 34, 38, 179, 75, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL +} + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Game Controllers" + IDS_CPLSYSTEMDESCRIPTION "Add, remove, and configure game controller hardware such as joysticks and gamepads." + IDS_CONTROLLER "Controller" + IDS_STATUS "Status" +END Propchange: trunk/reactos/dll/cpl/joy/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/joy/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/lang/ru-RU.rc?… ============================================================================== --- trunk/reactos/dll/cpl/joy/lang/ru-RU.rc (added) +++ trunk/reactos/dll/cpl/joy/lang/ru-RU.rc Sat Oct 20 14:20:05 2007 @@ -1,0 +1,84 @@ +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +IDD_PROPPAGEMAIN DIALOGEX 0, 0, 252, 205 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Èãðîâûå óñòðîéñòâà" +FONT 8, "MS Shell Dlg" +{ + ICON IDI_CPLSYSTEM, -1, 7, 7, 20, 20 + LTEXT "Ýòè ïàðàìåòðû ïîçâîëÿþò íàñòðîèòü èãðîâûå óñòðîéñòâà, óñòàíîâëåííûå íà êîìïüþòåðå.", -1, 33, 7, 214, 20, NOT WS_GROUP + GROUPBOX "Óñòàíîâëåííûå &èãðîâûå óñòðîéñòâà", -1, 7, 34, 238, 117 + CONTROL "List1", IDC_CONTROLLER_LIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | 0x0000808D, 14, 44, 224, 80 + PUSHBUTTON "Äî&áàâèòü...", IDC_ADD_BUTTON, 35, 129, 65, 14 + PUSHBUTTON "&Óäàëèòü", IDC_REMOVE_BUTTON, 104, 129, 65, 14, WS_DISABLED + PUSHBUTTON "Ñâî&éñòâà", IDC_PROPERTIES_BUTTON, 173, 129, 65, 14, WS_DISABLED + PUSHBUTTON "Ä&îïîëíèòåëüíî...", IDC_ADVANCED_BUTTON, 101, 157, 70, 14 + PUSHBUTTON "Äèà&ãíîñòèêà...", IDC_TROUBLESHOOT_BUTTON, 175, 157, 70, 14 + PUSHBUTTON "OK", IDOK, 195, 185, 50, 14 +} + +IDD_ADD DIALOGEX 0, 0, 265, 200 +STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Äîáàâëåíèå èãðîâîãî óñòðîéñòâà" +FONT 8, "MS Shell Dlg" +{ + ICON IDI_CPLSYSTEM, -1, 8, 7, 20, 20 + LTEXT "Âûáåðèòå èãðîâîé êîíòðîëëåð â ðàñïîëîæåííîì íèæå ñïèñêå è íàæìèòå êíîïêó ÎÊ. Åñëè âàø èãðîâîé êîíòðîëëåð îòñóòñòâóåò â ñïèñêå, íàæìèòå êíîïêó ""Äðóãîé"".", -1, 35, 7, 210, 33 + LTEXT "&Èãðîâûå óñòðîéñòâà:", -1, 8, 45, 126, 8 + LISTBOX IDC_GAME_CONTROLLERS_LIST, 7, 55, 251, 57, LBS_STANDARD | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_HSCROLL | WS_TABSTOP + AUTOCHECKBOX "&Ïîäêëþ÷èòü ðóëü èëè ïåäàëè", IDC_ENABLE_RUDDERS_CHECKBOX, 7, 114, 120, 10, WS_GROUP + LTEXT "&Èãðîâîé ïîðò:", -1, 7, 134, 38, 8, NOT WS_VISIBLE + COMBOBOX IDC_GAME_PORT_COMBO, 7, 147, 140, 50, CBS_DROPDOWNLIST | CBS_SORT | NOT WS_VISIBLE | WS_VSCROLL + PUSHBUTTON "&Äðóãîé...", IDC_CUSTOM_BUTTON, 208, 147, 50, 14 + CONTROL "", -25525, "STATIC", SS_ETCHEDHORZ, 7, 170, 251, 1 + DEFPUSHBUTTON "OK", IDOK, 155, 179, 50, 14 + PUSHBUTTON "Îòìåíà", IDCANCEL, 208, 179, 50, 14 +} + +IDD_CUSTOM DIALOGEX 0, 0, 265, 183, 0 +STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Îñîáîå èãðîâîå óñòðîéñòâî" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "Îñîáåííîñòè", -1, 7, 7, 245, 52 + AUTORADIOBUTTON "&Äæîéñòèê", IDC_JOYSTICK_RADIO, 17, 23, 55, 10 + AUTORADIOBUTTON "&Øòóðâàë èëè ðóêîÿòêà óïðàâëåíèÿ", IDC_FLIGHT_YOKE_RADIO, 100, 23, 143, 10 + AUTORADIOBUTTON "&Èãðîâîé ïëàíøåò", IDC_GAME_PAD_RADIO, 17, 40, 75, 10 + AUTORADIOBUTTON "Óïðàâëåíèå ãîíî÷íîé &àâòîìàøèíîé", IDC_RACE_CAR_RADIO, 100, 40, 143, 10 + GROUPBOX "&Ñòåïåíü ñâîáîäû", -1, 7, 67, 116, 44, WS_GROUP + COMBOBOX IDC_AXES_COMBO, 37, 79, 48, 50, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTORADIOBUTTON "Ðóëü óïðàâëåíèÿ èëè ïåäàëè", IDC_RUDDER_PEDALS_RADIO, 14, 97, 63, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Îñü Z", IDC_Z_AXIS_RADIO, 81, 97, 35, 10, NOT WS_VISIBLE + GROUPBOX "Ê&íîïêè", -1, 137, 67, 116, 44 + COMBOBOX IDC_BUTTONS_COMBO, 178, 79, 48, 50, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL, WS_EX_CLIENTEDGE + AUTOCHECKBOX "Èìååòñÿ &ïåðåêëþ÷àòåëü POV", IDC_INC_POINT_CHECKBOX, 7, 123, 115, 10 + LTEXT "&Êîíòðîëåð:", -1, 7, 139, 200, 9 + EDITTEXT IDC_CONTROLLER_NAME_EDIT, 7, 150, 116, 15, ES_AUTOHSCROLL, WS_EX_CLIENTEDGE | WS_EX_STATICEDGE + DEFPUSHBUTTON "OK", IDOK, 137, 150, 50, 14 + PUSHBUTTON "Îòìåíà", IDCANCEL, 203, 150, 50, 14 +} + +IDD_ADVANCED DIALOGEX 0, 0, 220, 86 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Äîïîëíèòåëüíûå ïàðàìåòðû" +FONT 8, "MS Shell Dlg" +{ + ICON IDI_CPLSYSTEM, -1, 7, 24, 20, 20 + LTEXT "Âûáåðèòå óñòðîéñòâî, êîòîðîå ñëåäóåò èñïîëüçîâàòü ñî ñòàðûìè ïðîãðàììàìè.", -1, 7, 5, 208, 17 + LTEXT "&Ïðåäïî÷èòàåìîå óñòðîéñòâî:", -1, 34, 24, 180, 10 + COMBOBOX IDC_PREFERRED_DEV_COMBO, 34, 38, 179, 75, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + DEFPUSHBUTTON "OK", IDOK, 106, 65, 50, 14 + PUSHBUTTON "Îòìåíà", IDCANCEL, 163, 65, 50, 14 +} + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Èãðîâûå óñòðîéñòâà" + IDS_CPLSYSTEMDESCRIPTION "Äîáàâëåíèå, óäàëåíèå è íàñòðîéêà ïàðàìåòðîâ èãðîâûõ óñòðîéñòâ, íàïðèìåð, äæîéñòèêîâ èëè èãðîâûõ ïëàíøåòîâ." + IDS_CONTROLLER "Óñòðîéñòâî" + IDS_STATUS "Ñîñòîÿíèå" +END Propchange: trunk/reactos/dll/cpl/joy/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/joy/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/manifest.xml?r… ============================================================================== --- trunk/reactos/dll/cpl/joy/manifest.xml (added) +++ trunk/reactos/dll/cpl/joy/manifest.xml Sat Oct 20 14:20:05 2007 @@ -1,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity + version="1.0.0.0" + processorArchitecture="X86" + name="ReactOS.System.ControlPanel.System" + type="win32" + /> + <description>ReactOS System Control Panel</description> + <dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="X86" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> + </dependency> +</assembly> + + Propchange: trunk/reactos/dll/cpl/joy/manifest.xml ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/joy/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/resource.h?rev… ============================================================================== --- trunk/reactos/dll/cpl/joy/resource.h (added) +++ trunk/reactos/dll/cpl/joy/resource.h Sat Oct 20 14:20:05 2007 @@ -1,0 +1,44 @@ +#ifndef __CPL_RESOURCE_H +#define __CPL_RESOURCE_H + +/* icons */ +#define IDI_CPLSYSTEM 102 + +/* dialogs */ +#define IDD_PROPPAGEMAIN 101 +#define IDD_ADD 119 +#define IDD_CUSTOM 4099 +#define IDD_ADVANCED 8188 + +/* strings */ +#define IDS_CPLSYSTEMNAME 1076 +#define IDS_CPLSYSTEMDESCRIPTION 1099 +#define IDS_CONTROLLER 1151 +#define IDS_STATUS 1152 + +/* controls */ +#define IDC_CONTROLLER_LIST 1020 +#define IDC_ADD_BUTTON 1011 +#define IDC_REMOVE_BUTTON 1028 +#define IDC_PROPERTIES_BUTTON 1002 +#define IDC_ADVANCED_BUTTON 1311 +#define IDC_TROUBLESHOOT_BUTTON 1007 +#define IDC_CUSTOM_BUTTON 1169 +#define IDC_GAME_PORT_COMBO 1168 +#define IDC_GAME_CONTROLLERS_LIST 1057 +#define IDC_ENABLE_RUDDERS_CHECKBOX 1000 +#define IDC_JOYSTICK_RADIO 1054 +#define IDC_FLIGHT_YOKE_RADIO 1051 +#define IDC_GAME_PAD_RADIO 1052 +#define IDC_RACE_CAR_RADIO 1053 +#define IDC_AXES_COMBO 1030 +#define IDC_RUDDER_PEDALS_RADIO 1172 +#define IDC_Z_AXIS_RADIO 1174 +#define IDC_BUTTONS_COMBO 1048 +#define IDC_INC_POINT_CHECKBOX 1072 +#define IDC_CONTROLLER_NAME_EDIT 1056 +#define IDC_PREFERRED_DEV_COMBO 8195 + +#endif /* __CPL_RESOURCE_H */ + +/* EOF */ Propchange: trunk/reactos/dll/cpl/joy/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/joy/resources/applet.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/resources/appl… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/cpl/joy/resources/applet.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/cpl/joy/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/rsrc.rc?rev=29… ============================================================================== --- trunk/reactos/dll/cpl/joy/rsrc.rc (added) +++ trunk/reactos/dll/cpl/joy/rsrc.rc Sat Oct 20 14:20:05 2007 @@ -1,0 +1,5 @@ +#include "resource.h" +#include <windows.h> + +#include "lang/en-US.rc" +#include "lang/ru-RU.rc" Propchange: trunk/reactos/dll/cpl/joy/rsrc.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[janderwald] 29704: - fix param spotted by James Tabor - see http://www.reactos.org/archives/public/ros-dev/2007-October/009952.html for more details
by janderwald＠svn.reactos.org 20 Oct '07

20 Oct '07

Author: janderwald Date: Sat Oct 20 14:14:03 2007 New Revision: 29704 URL: http://svn.reactos.org/svn/reactos?rev=29704&view=rev Log: - fix param spotted by James Tabor - see http://www.reactos.org/archives/public/ros-dev/2007-October/009952.html for more details Added: trunk/reactos/dll/win32/shell32/shv_item_ecmenu.c (with props) Modified: trunk/reactos/dll/win32/shell32/shell32_main.c Modified: trunk/reactos/dll/win32/shell32/shell32_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_main.c (original) +++ trunk/reactos/dll/win32/shell32/shell32_main.c Sat Oct 20 14:14:03 2007 @@ -97,7 +97,7 @@ /* Return the path to the executable */ DWORD len, size=16; - hargv=GlobalAlloc(0, size); + hargv=GlobalAlloc(GMEM_FIXED, size); argv=GlobalLock(hargv); for (;;) { Added: trunk/reactos/dll/win32/shell32/shv_item_ecmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_item… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_item_ecmenu.c (added) +++ trunk/reactos/dll/win32/shell32/shv_item_ecmenu.c Sat Oct 20 14:14:03 2007 @@ -1,0 +1,287 @@ +/* + * IContextMenu for items in the shellview + * + * Copyright 1998, 2000 Juergen Schmied <juergen.schmied(a)debitel.net> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <string.h> + +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include "winerror.h" +#include "wine/debug.h" + +#include "windef.h" +#include "wingdi.h" +#include "pidl.h" +#include "undocshell.h" +#include "shlobj.h" + +#include "shell32_main.h" +#include "shellfolder.h" +#include "debughlp.h" +WINE_DEFAULT_DEBUG_CHANNEL(shell); + +/************************************************************************** +* IContextMenu Implementation +*/ +typedef struct +{ const IContextMenu2Vtbl *lpVtbl; + LONG ref; + IShellFolder* pSFParent; + LPITEMIDLIST pidl; /* root pidl */ + LPITEMIDLIST *apidl; /* array of child pidls */ + UINT cidl; + LPWSTR szCommand; + LPWSTR szVerb; + INT iCommand; + +} StaticItemCmImpl; + +static const IContextMenu2Vtbl cmvt; + +/************************************************************************** +* ISvItemCm_Constructor() +*/ +IContextMenu2 *ISvStaticItemCm_Constructor(LPSHELLFOLDER pSFParent, LPCITEMIDLIST pidl, LPCITEMIDLIST *apidl, UINT cidl, HKEY hKey) +{ + StaticItemCmImpl* cm; + UINT u; + + cm = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(StaticItemCmImpl)); + cm->lpVtbl = &cmvt; + cm->ref = 1; + cm->iCommand = -1; + cm->pidl = ILClone(pidl); + cm->pSFParent = pSFParent; + + if(pSFParent) IShellFolder_AddRef(pSFParent); + + cm->apidl = _ILCopyaPidl(apidl, cidl); + cm->cidl = cidl; + + cm->bAllValues = 1; + for(u = 0; u < cidl; u++) + { + cm->bAllValues &= (_ILIsValue(apidl[u]) ? 1 : 0); + } + + TRACE("(%p)->()\n",cm); + + return (IContextMenu2*)cm; +} + +/************************************************************************** +* ISvItemCm_fnQueryInterface +*/ +static HRESULT WINAPI ISvStaticItemCm_fnQueryInterface(IContextMenu2 *iface, REFIID riid, LPVOID *ppvObj) +{ + StaticItemCmImpl *This = (StaticItemCmImpl *)iface; + + TRACE("(%p)->(\n\tIID:\t%s,%p)\n",This,debugstr_guid(riid),ppvObj); + + *ppvObj = NULL; + + if(IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IContextMenu) || + IsEqualIID(riid, &IID_IContextMenu2)) + { + *ppvObj = This; + } + + if(*ppvObj) + { + IUnknown_AddRef((IUnknown*)*ppvObj); + TRACE("-- Interface: (%p)->(%p)\n",ppvObj,*ppvObj); + return S_OK; + } + TRACE("-- Interface: E_NOINTERFACE\n"); + return E_NOINTERFACE; +} + +/************************************************************************** +* ISvItemCm_fnAddRef +*/ +static ULONG WINAPI ISvStaticItemCm_fnAddRef(IContextMenu2 *iface) +{ + StaticItemCmImpl *This = (StaticItemCmImpl *)iface; + ULONG refCount = InterlockedIncrement(&This->ref); + + TRACE("(%p)->(count=%u)\n", This, refCount - 1); + + return refCount; +} + +/************************************************************************** +* ISvItemCm_fnRelease +*/ +static ULONG WINAPI ISvStaticItemCm_fnRelease(IContextMenu2 *iface) +{ + StaticItemCmImpl *This = (StaticItemCmImpl *)iface; + ULONG refCount = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(count=%i)\n", This, refCount + 1); + + if (!refCount) + { + TRACE(" destroying IContextMenu(%p)\n",This); + + if(This->pSFParent) + IShellFolder_Release(This->pSFParent); + + SHFree(This->pidl); + + /*make sure the pidl is freed*/ + _ILFreeaPidl(This->apidl, This->cidl); + + HeapFree(GetProcessHeap(),0,This); + } + return refCount; +} + +/************************************************************************** +* ICM_InsertItem() +*/ +void WINAPI _InsertMenuItem ( + HMENU hmenu, + UINT indexMenu, + BOOL fByPosition, + UINT wID, + UINT fType, + LPCSTR dwTypeData, + UINT fState) +{ + MENUITEMINFOA mii; + + +} + +/************************************************************************** +* ISvItemCm_fnQueryContextMenu() +* FIXME: load menu MENU_SHV_FILE out of resources instead if creating +* each menu item by calling _InsertMenuItem() +*/ +static HRESULT WINAPI ISvStaticItemCm_fnQueryContextMenu( + IContextMenu2 *iface, + HMENU hmenu, + UINT indexMenu, + UINT idCmdFirst, + UINT idCmdLast, + UINT uFlags) +{ + IDataObject * pDataObj; + MENUITEMINFOW mii; + + StaticItemCmImpl *This = (StaticItemCmImpl *)iface; + + if (!This->szVerb || This->szCommand) + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, 0); + + + ZeroMemory(&mii, sizeof(mii)); + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE; + mii.dwTypeData = (LPWSTR) This->szVerb; + mii.cch = strlenW( mii.dwTypeData ); + mii.fState = fState; + mii.wID = idCmdFirst + 1; + mii.fType = fType; + InsertMenuItemW( hmenu, indexMenu, fByPosition, &mii); + + + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, 1); +} + +/************************************************************************** +* ISvItemCm_fnInvokeCommand() +*/ +static HRESULT WINAPI ISvStaticItemCm_fnInvokeCommand( + IContextMenu2 *iface, + LPCMINVOKECOMMANDINFO lpcmi) +{ + StaticItemCmImpl *This = (StaticItemCmImpl *)iface; + + if (lpcmi->cbSize != sizeof(CMINVOKECOMMANDINFO)) + FIXME("Is an EX structure\n"); + + TRACE("(%p)->(invcom=%p verb=%p wnd=%p)\n",This,lpcmi,lpcmi->lpVerb, lpcmi->hwnd); + + if( HIWORD(lpcmi->lpVerb)==0 && LOWORD(lpcmi->lpVerb) > FCIDM_SHVIEWLAST) + { + TRACE("Invalid Verb %x\n",LOWORD(lpcmi->lpVerb)); + return E_INVALIDARG; + } + + + + + return NOERROR; +} + +/************************************************************************** +* ISvItemCm_fnGetCommandString() +*/ +static HRESULT WINAPI ISvStaticItemCm_fnGetCommandString( + IContextMenu2 *iface, + UINT_PTR idCommand, + UINT uFlags, + UINT* lpReserved, + LPSTR lpszName, + UINT uMaxNameLen) +{ + StaticItemCmImpl *This = (StaticItemCmImpl *)iface; + + HRESULT hr = E_INVALIDARG; + + TRACE("(%p)->(idcom=%lx flags=%x %p name=%p len=%x)\n",This, idCommand, uFlags, lpReserved, lpszName, uMaxNameLen); + + TRACE("-- (%p)->(name=%s)\n",This, lpszName); + return hr; +} + +/************************************************************************** +* ISvItemCm_fnHandleMenuMsg() +* NOTES +* should be only in IContextMenu2 and IContextMenu3 +* is nevertheless called from word95 +*/ +static HRESULT WINAPI ISvStaticItemCm_fnHandleMenuMsg( + IContextMenu2 *iface, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + StaticItemCmImpl *This = (StaticItemCmImpl *)iface; + + TRACE("(%p)->(msg=%x wp=%lx lp=%lx)\n",This, uMsg, wParam, lParam); + + return E_NOTIMPL; +} + +static const IContextMenu2Vtbl cmvt = +{ + ISvStaticItemCm_fnQueryInterface, + ISvStaticItemCm_fnAddRef, + ISvStaticItemCm_fnRelease, + ISvStaticItemCm_fnQueryContextMenu, + ISvStaticItemCm_fnInvokeCommand, + ISvStaticItemCm_fnGetCommandString, + ISvStaticItemCm_fnHandleMenuMsg +}; + Propchange: trunk/reactos/dll/win32/shell32/shv_item_ecmenu.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[peterw] 29703: - Update the variable names in the RosBE.mac file.
by peterw＠svn.reactos.org 20 Oct '07

20 Oct '07

Author: peterw Date: Sat Oct 20 12:55:41 2007 New Revision: 29703 URL: http://svn.reactos.org/svn/reactos?rev=29703&view=rev Log: - Update the variable names in the RosBE.mac file. Modified: trunk/tools/RosBE-Windows/Root/RosBE.mac Modified: trunk/tools/RosBE-Windows/Root/RosBE.mac URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.mac… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RosBE.mac (original) +++ trunk/tools/RosBE-Windows/Root/RosBE.mac Sat Oct 20 12:55:41 2007 @@ -1,9 +1,9 @@ -BASEDIR = cd /d "%_ROSSOURCEDIR%" -CLEAN = "%ROSBEBASEDIR%Clean.cmd" $* -CONFIG = "%ROSBEBASEDIR%Config.cmd" $* -HELP = "%ROSBEBASEDIR%Help.cmd" $* -MAKE = "%ROSBEBASEDIR%Build.cmd" $* -MAKEX = "%ROSBEBASEDIR%Build.cmd" multi $* -RADDR2LINE = "%ROSBEBASEDIR%reladdr2line.cmd" $* -SCUT = "%ROSBEBASEDIR%scut.cmd" $* -SSVN = "%ROSBEBASEDIR%sSVN.cmd" $* +BASEDIR = cd /d "%_ROSBE_ROSSOURCEDIR%" +CLEAN = "%_ROSBE_BASEDIR%\Clean.cmd" $* +CONFIG = "%_ROSBE_BASEDIR%\Config.cmd" $* +HELP = "%_ROSBE_BASEDIR%\Help.cmd" $* +MAKE = "%_ROSBE_BASEDIR%\Build.cmd" $* +MAKEX = "%_ROSBE_BASEDIR%\Build.cmd" multi $* +RADDR2LINE = "%_ROSBE_BASEDIR%\reladdr2line.cmd" $* +SCUT = "%_ROSBE_BASEDIR%\scut.cmd" $* +SSVN = "%_ROSBE_BASEDIR%\sSVN.cmd" $*

1 0

[mnordell] 29702: Don't try to open a harddisk for reading when checking for it to create the PhysicalDriveN links. Instead, request FILE_READ_ATTRIBUTES. This silences a hack-warning in IopParseDevice, that now possibly can be removed.
by mnordell＠svn.reactos.org 20 Oct '07

20 Oct '07

Author: mnordell Date: Sat Oct 20 11:36:17 2007 New Revision: 29702 URL: http://svn.reactos.org/svn/reactos?rev=29702&view=rev Log: Don't try to open a harddisk for reading when checking for it to create the PhysicalDriveN links. Instead, request FILE_READ_ATTRIBUTES. This silences a hack-warning in IopParseDevice, that now possibly can be removed. Modified: trunk/reactos/ntoskrnl/fstub/disksup.c trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/ntoskrnl/fstub/disksup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fstub/disksup.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/fstub/disksup.c (original) +++ trunk/reactos/ntoskrnl/fstub/disksup.c Sat Oct 20 11:36:17 2007 @@ -481,7 +481,7 @@ NULL); Status = ZwOpenFile(&FileHandle, - FILE_READ_DATA | SYNCHRONIZE, + FILE_READ_ATTRIBUTES | SYNCHRONIZE, &ObjectAttributes, &StatusBlock, FILE_SHARE_READ, Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c Sat Oct 20 11:36:17 2007 @@ -404,6 +404,9 @@ /* FIXME: Small hack still exists, have to check why... * This is triggered multiple times by usetup and then once per boot. + * TMN: NOTE: It might have been fixed now, by changing the requested + * openmode in xHalIoAssignDriveLetters from FILE_READ_DATA to + * FILE_READ_ATTRIBUTES. If verified, this hack should be removed. */ if (!(DirectOpen) && !(RemainingName->Length) &&

1 0

[peterw] 29701: - Fix some typos, bit more cleanup.
by peterw＠svn.reactos.org 20 Oct '07

20 Oct '07

Author: peterw Date: Sat Oct 20 10:37:14 2007 New Revision: 29701 URL: http://svn.reactos.org/svn/reactos?rev=29701&view=rev Log: - Fix some typos, bit more cleanup. Modified: trunk/tools/RosBE-Windows/Root/Help.cmd trunk/tools/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE-Windows/Tools/config/options.c Modified: trunk/tools/RosBE-Windows/Root/Help.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Help.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Help.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Help.cmd Sat Oct 20 10:37:14 2007 @@ -18,7 +18,7 @@ echo. echo Available Commands: echo make [OPTIONS] - Without options it does a standard build of - echo ReactOS. OPTIONS1 are the standard ReactOS build + echo ReactOS. OPTIONS are the standard ReactOS build echo options ie. "bootcd" echo makex [OPTIONS] - Same as 'make' but automatically determines the echo number of CPU Cores in the system and uses -j @@ -43,16 +43,16 @@ goto :EOF ) if "%1" == "make" ( - echo Usage: make [OPTIONS1] [OPTIONS2] - echo Without options it does a standard build of ReactOS. OPTIONS1 are the + echo Usage: make [OPTIONS] + echo Without options it does a standard build of ReactOS. OPTIONS are the echo standard ReactOS build options ie. "bootcd", "livecd", etc. goto :EOF ) if "%1" == "makex" ( - echo Usage: makex [OPTIONS1] [OPTIONS2] + echo Usage: makex [OPTIONS] echo Same as 'make' but automatically determines the number of CPU Cores in echo the system and uses "make -j x" with the appropriate number. - echo NOTE: The number makex uses can be modified by editing Build-Multi.cmd + echo NOTE: The number makex uses can be modified by editing Build.cmd echo located in the RosBE directory, instructions for doing so are echo contained within the file. goto :EOF Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RosBE.cmd (original) +++ trunk/tools/RosBE-Windows/Root/RosBE.cmd Sat Oct 20 10:37:14 2007 @@ -41,7 +41,7 @@ :: if "%1" == "oldmode" ( cls - set _ROSBE_OLDMODE= + set _ROSBE_OLDMODE="" call :RosBE4 goto :EndCommandParse ) Modified: trunk/tools/RosBE-Windows/Tools/config/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/o… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/options.c (original) +++ trunk/tools/RosBE-Windows/Tools/config/options.c Sat Oct 20 10:37:14 2007 @@ -48,7 +48,7 @@ { int foreground, background; BOOL showtime, writelog, useccache, strip; - WCHAR logpath[MAX_PATH], mingwpath[MAX_PATH], checkmgw[MAX_PATH], checklog[MAX_PATH]; + WCHAR logdir[MAX_PATH], mingwpath[MAX_PATH], checkmgw[MAX_PATH], checklog[MAX_PATH]; WCHAR msgerror[256]; HANDLE hFile; FILE *pFile; @@ -59,19 +59,19 @@ strip = SendMessage(GetDlgItem(hwnd, ID_STRIP), BM_GETCHECK, 0, 0); foreground = SendMessage(GetDlgItem(hwnd, IDC_FONT), CB_GETCURSEL, 0, 0); background = SendMessage(GetDlgItem(hwnd, IDC_BACK), CB_GETCURSEL, 0, 0); - GetDlgItemText(hwnd, ID_LOGDIR, logpath, MAX_PATH); + GetDlgItemText(hwnd, ID_LOGDIR, logdir, MAX_PATH); GetDlgItemText(hwnd, ID_MGWDIR, mingwpath, MAX_PATH); if (writelog) { GetCurrentDirectory(MAX_PATH, checklog); - if (SetCurrentDirectory(logpath)) + if (SetCurrentDirectory(logdir)) { SetCurrentDirectory(checklog); } else { - if (!CreateDirectory(logpath, NULL)) + if (!CreateDirectory(logdir, NULL)) { LoadString(hInstance, MSG_DIREFAILED, msgerror, 256); MessageBox(NULL, msgerror, NULL, MB_ICONERROR); @@ -106,7 +106,7 @@ fprintf(pFile, "set _ROSBE_USECCACHE=%d\n", useccache); fprintf(pFile, "set _ROSBE_STRIP=%d\n", strip); fprintf(pFile, "set _ROSBE_WRITELOG=%d\n", writelog); - fprintf(pFile, "set _ROSBE_LOGPATH=%S\n", logpath); + fprintf(pFile, "set _ROSBE_LOGDIR=%S\n", logdir); fprintf(pFile, "set _ROSBE_MINGWPATH=%S\n", mingwpath); fclose(pFile); return TRUE;

1 0

[mnordell] 29700: [COMMENT] Added comment explaining how this code, which at first glance simply couldn't work, indeed can work. Much code (55 lines to be precise) is hidden inside a macro.
by mnordell＠svn.reactos.org 20 Oct '07

20 Oct '07

Author: mnordell Date: Sat Oct 20 09:48:25 2007 New Revision: 29700 URL: http://svn.reactos.org/svn/reactos?rev=29700&view=rev Log: [COMMENT] Added comment explaining how this code, which at first glance simply couldn't work, indeed can work. Much code (55 lines to be precise) is hidden inside a macro. Modified: trunk/reactos/ntoskrnl/ke/wait.c Modified: trunk/reactos/ntoskrnl/ke/wait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/wait.c?rev=297… ============================================================================== --- trunk/reactos/ntoskrnl/ke/wait.c (original) +++ trunk/reactos/ntoskrnl/ke/wait.c Sat Oct 20 09:48:25 2007 @@ -544,6 +544,12 @@ /* Otherwise, we already have the lock, so initialize the wait */ Thread->WaitNext = FALSE; + /* Note that KxMultiThreadWait is a macro, defined in ke_x.h, that */ + /* uses (and modifies some of) the following local */ + /* variables: */ + /* Thread, Index, WaitBlock, Timer, Timeout, Hand and Swappable. */ + /* If it looks like this code doesn't actually wait for any objects */ + /* at all, it's because the setup is done by that macro. */ KxMultiThreadWait(); /* Start wait loop */

1 0

[arty] 29699: Protect access to the physical map.
by arty＠svn.reactos.org 20 Oct '07

20 Oct '07

Author: arty Date: Sat Oct 20 08:30:01 2007 New Revision: 29699 URL: http://svn.reactos.org/svn/reactos?rev=29699&view=rev Log: Protect access to the physical map. Modified: trunk/reactos/lib/ppcmmu/gdblib.c Modified: trunk/reactos/lib/ppcmmu/gdblib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/ppcmmu/gdblib.c?rev=29… ============================================================================== --- trunk/reactos/lib/ppcmmu/gdblib.c (original) +++ trunk/reactos/lib/ppcmmu/gdblib.c Sat Oct 20 08:30:01 2007 @@ -135,22 +135,22 @@ inline void send(char *serport, char c) { /* Wait for Clear to Send */ - while( !(serport[LSR] & 0x20) ) sync(); - - serport[THR] = c; + while( !(GetPhysByte((paddr_t)serport+LSR) & 0x20) ) sync(); + + SetPhysByte(serport+THR, c); sync(); } inline int rdy(char *serport) { sync(); - return (serport[LSR] & 0x20); + return (GetPhysByte((paddr_t)serport+LSR) & 0x20); } inline int chr(char *serport) { sync(); - return serport[LSR] & 1; + return GetPhysByte((paddr_t)serport+LSR) & 1; } inline char recv(char *serport) { @@ -158,7 +158,7 @@ while( !chr(serport) ) sync(); - c = serport[RCV]; + c = GetPhysByte((paddr_t)serport+RCV); sync(); return c; @@ -166,13 +166,13 @@ void setup(char *serport, int baud) { int x = 115200 / baud; - serport[LCR] = 128; + SetPhysByte((paddr_t)serport+LCR, 128); sync(); - serport[BAUDLOW] = x & 255; + SetPhysByte((paddr_t)serport+BAUDLOW, x & 255); sync(); - serport[BAUDHIGH] = x >> 8; + SetPhysByte((paddr_t)serport+BAUDHIGH, x >> 8); sync(); - serport[LCR] = 3; + SetPhysByte((paddr_t)serport+LCR, 3); sync(); } @@ -187,7 +187,7 @@ void IntEnable() { - serport[IER] |= 1; + SetPhysByte((paddr_t)serport+IER, GetPhysByte((paddr_t)serport+IER) | 1); } void SerialWrite(int ch)

1 0

[peterw] 29698: - Renamed options.cmd -> rosbe-options.cmd.
by peterw＠svn.reactos.org 20 Oct '07

20 Oct '07

Author: peterw Date: Sat Oct 20 08:28:55 2007 New Revision: 29698 URL: http://svn.reactos.org/svn/reactos?rev=29698&view=rev Log: - Renamed options.cmd -> rosbe-options.cmd. Modified: trunk/tools/RosBE-Windows/Root/Build.cmd trunk/tools/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE-Windows/Tools/config/options.c Modified: trunk/tools/RosBE-Windows/Root/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Build.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Build.cmd Sat Oct 20 08:28:55 2007 @@ -16,8 +16,8 @@ :: Check if the user has used the options utility and :: if so, load their options. :: -if exist %_ROSBE_BASEDIR%\options.cmd ( - call %_ROSBE_BASEDIR%\options.cmd +if exist %_ROSBE_BASEDIR%\rosbe-options.cmd ( + call %_ROSBE_BASEDIR%\rosbe-options.cmd ) :: Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RosBE.cmd (original) +++ trunk/tools/RosBE-Windows/Root/RosBE.cmd Sat Oct 20 08:28:55 2007 @@ -30,8 +30,8 @@ :: Check if the user has used the options utility and :: if so, load their options. :: -if exist %_ROSBE_BASEDIR%\options.cmd ( - call %_ROSBE_BASEDIR%\options.cmd +if exist %_ROSBE_BASEDIR%\rosbe-options.cmd ( + call %_ROSBE_BASEDIR%\rosbe-options.cmd ) title ReactOS Build Environment %_ROSBE_VERSION% Modified: trunk/tools/RosBE-Windows/Tools/config/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/o… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/options.c (original) +++ trunk/tools/RosBE-Windows/Tools/config/options.c Sat Oct 20 08:28:55 2007 @@ -94,10 +94,13 @@ CloseHandle(hFile); } - pFile = fopen("options.cmd", "w"); + pFile = fopen("rosbe-options.cmd", "w"); if (pFile) { - fprintf(pFile, "REM This file has been automatically created by RosBE Options Dialog\n\n"); + fprintf(pFile, "::\n"); + fprintf(pFile, ":: This file has been automatically generated by the ReactOS\n"); + fprintf(pFile, ":: Build Environment options utility.\n"); + fprintf(pFile, "::\n\n"); fprintf(pFile, "color %X%X\n", background, foreground); fprintf(pFile, "set _ROSBE_SHOWTIME=%d\n", showtime); fprintf(pFile, "set _ROSBE_USECCACHE=%d\n", useccache);

1 0

[peterw] 29697: - Merged the NSIS files back together.
by peterw＠svn.reactos.org 20 Oct '07

20 Oct '07

Author: peterw Date: Sat Oct 20 08:03:39 2007 New Revision: 29697 URL: http://svn.reactos.org/svn/reactos?rev=29697&view=rev Log: - Merged the NSIS files back together. Removed: trunk/tools/RosBE-Windows/RosBE.Files-4.1.3.nsh trunk/tools/RosBE-Windows/RosBE.Files-Miscellaneous.nsh Modified: trunk/tools/RosBE-Windows/RosBE.nsi Removed: trunk/tools/RosBE-Windows/RosBE.Files-4.1.3.nsh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/RosBE.Files-4.… ============================================================================== --- trunk/tools/RosBE-Windows/RosBE.Files-4.1.3.nsh (original) +++ trunk/tools/RosBE-Windows/RosBE.Files-4.1.3.nsh (removed) @@ -1,5 +1,0 @@ -Section "-MinGW, GCC v4.1.3 and NASM 0.99.04" SEC01 - SetOutPath "$INSTDIR\4.1.3\" - SetOverwrite try - File /r Components\4.1.3\*.* -SectionEnd Removed: trunk/tools/RosBE-Windows/RosBE.Files-Miscellaneous.nsh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/RosBE.Files-Mi… ============================================================================== --- trunk/tools/RosBE-Windows/RosBE.Files-Miscellaneous.nsh (original) +++ trunk/tools/RosBE-Windows/RosBE.Files-Miscellaneous.nsh (removed) @@ -1,6 +1,0 @@ -Section "-Other miscellaneous files." SEC02 - SetOutPath "$INSTDIR" - SetOverwrite try - File /r Root\*.* - File /r Icons\*.* -SectionEnd Modified: trunk/tools/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/RosBE.nsi?rev=… ============================================================================== --- trunk/tools/RosBE-Windows/RosBE.nsi (original) +++ trunk/tools/RosBE-Windows/RosBE.nsi Sat Oct 20 08:03:39 2007 @@ -97,11 +97,18 @@ ;; MUI end. -;; -;; Add sections 1, 2 and 3 which contain the file lists for GCC4 and Miscellaneous. -;; -!include "RosBE.Files-4.1.3.nsh" -!include "RosBE.Files-Miscellaneous.nsh" +Section "-MinGW, GCC v4.1.3 and NASM 0.99.04" SEC01 + SetOutPath "$INSTDIR\4.1.3\" + SetOverwrite try + File /r Components\4.1.3\*.* +SectionEnd + +Section "-Other miscellaneous files." SEC02 + SetOutPath "$INSTDIR" + SetOverwrite try + File /r Root\*.* + File /r Icons\*.* +SectionEnd Section -StartMenuShortcuts SEC03 SetShellVarContext current

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