Author: dchapyshev Date: Thu May 15 07:38:12 2008 New Revision: 33525
URL: http://svn.reactos.org/svn/reactos?rev=33525&view=rev Log: - Start implement "Advanced Key Settings" and "Change Key Sequence" dialogs - Update all resources
Modified: trunk/reactos/dll/cpl/input/changekeyseq.c trunk/reactos/dll/cpl/input/input.h trunk/reactos/dll/cpl/input/keysettings.c trunk/reactos/dll/cpl/input/lang/bg-BG.rc trunk/reactos/dll/cpl/input/lang/de-DE.rc trunk/reactos/dll/cpl/input/lang/el-GR.rc trunk/reactos/dll/cpl/input/lang/en-US.rc trunk/reactos/dll/cpl/input/lang/es-ES.rc trunk/reactos/dll/cpl/input/lang/fr-FR.rc trunk/reactos/dll/cpl/input/lang/it-IT.rc trunk/reactos/dll/cpl/input/lang/pl-PL.rc trunk/reactos/dll/cpl/input/lang/ru-RU.rc trunk/reactos/dll/cpl/input/lang/sk-SK.rc trunk/reactos/dll/cpl/input/lang/uk-UA.rc trunk/reactos/dll/cpl/input/resource.h
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 [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/changekeyseq.c [iso-8859-1] Thu May 15 07:38:12 2008 @@ -1,33 +1,96 @@ -/* - * ReactOS - * Copyright (C) 2007 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: input.dll * FILE: dll/win32/input/changekeyseq.c * PURPOSE: input.dll - * PROGRAMMER: Dmitry Chapyshev (lentind@yandex.ru) + * PROGRAMMER: Dmitry Chapyshev (dmitry@reactos.org) * UPDATE HISTORY: * 06-09-2007 Created */
#include "resource.h" #include "input.h" + +BOOL +GetHotkeys(LPTSTR szHotkey, LPTSTR szLangHotkey, LPTSTR szLayoutHotkey) +{ + HKEY hKey; + DWORD dwSize; + + if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\Toggle"), + 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) + { + dwSize = sizeof(szHotkey); + if (RegQueryValueEx(hKey, _T("Hotkey"), NULL, NULL, + (LPBYTE)szHotkey, &dwSize) != ERROR_SUCCESS) + { + RegCloseKey(hKey); + return FALSE; + } + + dwSize = sizeof(szLangHotkey); + if (RegQueryValueEx(hKey, _T("Language Hotkey"), NULL, NULL, + (LPBYTE)szLangHotkey, &dwSize) != ERROR_SUCCESS) + { + RegCloseKey(hKey); + return FALSE; + } + + dwSize = sizeof(szLayoutHotkey); + if (RegQueryValueEx(hKey, _T("Layout Hotkey"), NULL, NULL, + (LPBYTE)szLayoutHotkey, &dwSize) != ERROR_SUCCESS) + { + RegCloseKey(hKey); + return FALSE; + } + + RegCloseKey(hKey); + } + else return FALSE; + + return TRUE; +} + +static VOID +InitChangeKeySeqDlg(HWND hDlg) +{ + TCHAR szHotkey[1 + 1], szLangHotkey[1 + 1], szLayoutHotkey[1 + 1]; + + if (!GetHotkeys(szHotkey, szLangHotkey, szLayoutHotkey)) + return; + + if (_tcscmp(szLangHotkey, _T("3")) == 0) + { + SendDlgItemMessage(hDlg, IDC_CTRL_LANG, BM_SETCHECK, 1, 1); + EnableWindow(GetDlgItem(hDlg, IDC_CTRL_LANG), FALSE); + EnableWindow(GetDlgItem(hDlg, IDC_LEFT_ALT_LANG), FALSE); + } + else + { + SendDlgItemMessage(hDlg, IDC_SWITCH_INPUT_LANG_CB, BM_SETCHECK, 1, 1); + + if (_tcscmp(szLangHotkey, _T("1")) == 0) + SendDlgItemMessage(hDlg, IDC_LEFT_ALT_LANG, BM_SETCHECK, 1, 1); + else + SendDlgItemMessage(hDlg, IDC_CTRL_LANG, BM_SETCHECK, 1, 1); + } + + if (_tcscmp(szLayoutHotkey, _T("3")) == 0) + { + SendDlgItemMessage(hDlg, IDC_LEFT_ALT_LAYOUT, BM_SETCHECK, 1, 1); + EnableWindow(GetDlgItem(hDlg, IDC_CTRL_LAYOUT), FALSE); + EnableWindow(GetDlgItem(hDlg, IDC_LEFT_ALT_LAYOUT), FALSE); + } + else + { + SendDlgItemMessage(hDlg, IDC_SWITCH_KBLAYOUTS_CB, BM_SETCHECK, 1, 1); + + if (_tcscmp(szLayoutHotkey, _T("1")) == 0) + SendDlgItemMessage(hDlg, IDC_LEFT_ALT_LAYOUT, BM_SETCHECK, 1, 1); + else + SendDlgItemMessage(hDlg, IDC_CTRL_LAYOUT, BM_SETCHECK, 1, 1); + } +}
INT_PTR CALLBACK ChangeKeySeqDlgProc(HWND hDlg, @@ -40,11 +103,76 @@ switch (message) { case WM_INITDIALOG: + InitChangeKeySeqDlg(hDlg); break;
case WM_COMMAND: switch (LOWORD(wParam)) { + case IDC_SWITCH_INPUT_LANG_CB: + if (HIWORD(wParam) == BN_CLICKED) + { + if (SendDlgItemMessage(hDlg, IDC_SWITCH_INPUT_LANG_CB, BM_GETCHECK, 0, 0) == BST_CHECKED) + { + EnableWindow(GetDlgItem(hDlg, IDC_CTRL_LANG), TRUE); + EnableWindow(GetDlgItem(hDlg, IDC_LEFT_ALT_LANG), TRUE); + } + else + { + EnableWindow(GetDlgItem(hDlg, IDC_CTRL_LANG), FALSE); + EnableWindow(GetDlgItem(hDlg, IDC_LEFT_ALT_LANG), FALSE); + } + } + break; + + case IDC_SWITCH_KBLAYOUTS_CB: + if (HIWORD(wParam) == BN_CLICKED) + { + if (SendDlgItemMessage(hDlg, IDC_SWITCH_KBLAYOUTS_CB, BM_GETCHECK, 0, 0) == BST_CHECKED) + { + EnableWindow(GetDlgItem(hDlg, IDC_CTRL_LAYOUT), TRUE); + EnableWindow(GetDlgItem(hDlg, IDC_LEFT_ALT_LAYOUT), TRUE); + } + else + { + EnableWindow(GetDlgItem(hDlg, IDC_CTRL_LAYOUT), FALSE); + EnableWindow(GetDlgItem(hDlg, IDC_LEFT_ALT_LAYOUT), FALSE); + } + } + break; + + case IDC_CTRL_LANG: + if (HIWORD(wParam) == BN_CLICKED) + { + SendDlgItemMessage(hDlg, IDC_LEFT_ALT_LAYOUT, BM_SETCHECK, 1, 1); + SendDlgItemMessage(hDlg, IDC_CTRL_LAYOUT, BM_SETCHECK, 0, 0); + } + break; + + case IDC_LEFT_ALT_LANG: + if (HIWORD(wParam) == BN_CLICKED) + { + SendDlgItemMessage(hDlg, IDC_CTRL_LAYOUT, BM_SETCHECK, 1, 1); + SendDlgItemMessage(hDlg, IDC_LEFT_ALT_LAYOUT, BM_SETCHECK, 0, 0); + } + break; + + case IDC_CTRL_LAYOUT: + if (HIWORD(wParam) == BN_CLICKED) + { + SendDlgItemMessage(hDlg, IDC_LEFT_ALT_LANG, BM_SETCHECK, 1, 1); + SendDlgItemMessage(hDlg, IDC_CTRL_LANG, BM_SETCHECK, 0, 0); + } + break; + + case IDC_LEFT_ALT_LAYOUT: + if (HIWORD(wParam) == BN_CLICKED) + { + SendDlgItemMessage(hDlg, IDC_CTRL_LANG, BM_SETCHECK, 1, 1); + SendDlgItemMessage(hDlg, IDC_LEFT_ALT_LANG, BM_SETCHECK, 0, 0); + } + break; + case IDOK: break;
Modified: trunk/reactos/dll/cpl/input/input.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.h?rev=3... ============================================================================== --- trunk/reactos/dll/cpl/input/input.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/input.h [iso-8859-1] Thu May 15 07:38:12 2008 @@ -59,6 +59,8 @@ /* changekeyseq.c */ INT_PTR CALLBACK ChangeKeySeqDlgProc(HWND hDlg,UINT message,WPARAM wParam,LPARAM lParam); +BOOL +GetHotkeys(LPTSTR szHotkey, LPTSTR szLangHotkey, LPTSTR szLayoutHotkey);
void ShowLastWin32Error(HWND hWndOwner);
Modified: trunk/reactos/dll/cpl/input/keysettings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/keysettings.c... ============================================================================== --- trunk/reactos/dll/cpl/input/keysettings.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/keysettings.c [iso-8859-1] Thu May 15 07:38:12 2008 @@ -3,7 +3,7 @@ * PROJECT: input.dll * FILE: dll/win32/input/keysettings.c * PURPOSE: input.dll - * PROGRAMMER: Dmitry Chapyshev (lentind@yandex.ru) + * PROGRAMMER: Dmitry Chapyshev (dmitry@reactos.org) * Colin Finck * UPDATE HISTORY: * 06-09-2007 Created @@ -11,6 +11,86 @@
#include "resource.h" #include "input.h" + +static VOID +AddListColumn(HWND hDlg) +{ + LV_COLUMN column; + HWND hList = GetDlgItem(hDlg, IDC_KEY_LISTVIEW); + + ZeroMemory(&column, sizeof(LV_COLUMN)); + column.mask = LVCF_FMT | LVCF_TEXT | LVCF_WIDTH | LVCF_SUBITEM; + + column.fmt = LVCFMT_LEFT; + column.iSubItem = 0; + column.pszText = _T(""); + column.cx = 210; + (VOID) ListView_InsertColumn(hList, 0, &column); + + column.fmt = LVCFMT_RIGHT; + column.cx = 145; + column.iSubItem = 1; + column.pszText = _T(""); + (VOID) ListView_InsertColumn(hList, 1, &column); +} + +static DWORD +GetAttributes() +{ + DWORD dwValue, dwType, dwSize; + HKEY hKey; + + if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout"), 0, KEY_QUERY_VALUE, &hKey) != ERROR_SUCCESS) + return 0x0; + + dwType = REG_DWORD; + dwSize = sizeof(DWORD); + + if (RegQueryValueEx(hKey, _T("Attributes"), NULL, &dwType, (LPBYTE)&dwValue, &dwSize) != ERROR_SUCCESS) + { + RegCloseKey(hKey); + return 0x0; + } + + RegCloseKey(hKey); + return dwValue; +} + +static VOID +InitKeySettingsDlg(HWND hDlg) +{ + TCHAR szHotkey[1 + 1], szLangHotkey[1 + 1], szLayoutHotkey[1 + 1], + szTitle[MAX_PATH], szText[MAX_PATH]; + LV_ITEM item = {0}; + HWND hHotkeyList = GetDlgItem(hDlg, IDC_KEY_LISTVIEW); + INT i; + + if (GetAttributes() != 0x0) + SendDlgItemMessage(hDlg, IDC_PRESS_SHIFT_KEY_RB, BM_SETCHECK, 1, 1); + else + SendDlgItemMessage(hDlg, IDC_PRESS_CL_KEY_RB, BM_SETCHECK, 1, 1); + + if (!GetHotkeys(szHotkey, szLangHotkey, szLayoutHotkey)) + return; + + if (!LoadString(hApplet, IDS_SWITCH_BET_INLANG, szTitle, sizeof(szTitle) / sizeof(TCHAR))) + return; + + if (_tcscmp(szLangHotkey, _T("2")) == 0) + LoadString(hApplet, IDS_CTRL_SHIFT, szText, sizeof(szText) / sizeof(TCHAR)); + else + LoadString(hApplet, IDS_LEFT_ALT_SHIFT, szText, sizeof(szText) / sizeof(TCHAR)); + + item.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE; + item.pszText = szTitle; + item.iItem = 0; + i = ListView_InsertItem(hHotkeyList, &item); + + ListView_SetItemText(hHotkeyList, i, 1, szText); + + (VOID) ListView_SetHotItem(hHotkeyList, i); + ListView_SetItemState(hHotkeyList, i, LVIS_SELECTED, LVIS_OVERLAYMASK); +}
INT_PTR CALLBACK KeySettingsDlgProc(HWND hDlg, @@ -23,6 +103,10 @@ switch (message) { case WM_INITDIALOG: + AddListColumn(hDlg); + (VOID) ListView_SetExtendedListViewStyle(GetDlgItem(hDlg, IDC_KEY_LISTVIEW), + LVS_EX_FULLROWSELECT); + InitKeySettingsDlg(hDlg); break;
case WM_COMMAND:
Modified: trunk/reactos/dll/cpl/input/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/bg-BG.rc... ============================================================================== --- trunk/reactos/dll/cpl/input/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/bg-BG.rc [iso-8859-1] Thu May 15 07:38:12 2008 @@ -26,7 +26,7 @@ GROUPBOX "Áúðçè êëàâèøè çà åçèöèòå íà âúâåæäàíå", -1, 7, 37, 258, 95 LTEXT "Äåéñòâèå", -1, 14, 47, 60, 9 RTEXT "Êëàâèøíè &ñú÷åòàíèÿ", -1, 177, 47, 79, 9 - LISTBOX IDC_KEY_LISTBOX, 14, 57, 244, 52, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + CONTROL "", IDC_KEY_LISTVIEW, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_AUTOARRANGE | LVS_SINGLESEL, 14, 57, 244, 52, WS_EX_CLIENTEDGE PUSHBUTTON "Ïðî&ìÿíà íà êëàâèøíîòî ñú÷åòàíèå", IDC_CHANGE_KEY_SEQ_BTN, 128, 113, 130, 14, WS_GROUP DEFPUSHBUTTON "Äîáðå", IDOK, 66, 140, 70, 14 PUSHBUTTON "Îòêàç", IDCANCEL, 146, 140, 70, 14 @@ -45,20 +45,24 @@ PUSHBUTTON "Îòêàç", IDCANCEL, 169, 68, 50, 14 END
-IDD_CHANGE_KEY_SEQ DIALOGEX 5, 100, 194, 89 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Ïðîìÿíà íà êëàâèøíàòà ïîñëåäîâàòåëíîñò" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "", 1240, 4, 5, 186, 10 - GROUPBOX "", -1, 7, 16, 179, 48 - AUTOCHECKBOX "Ïðåâ&êëþ÷âàíå íà êëàâèaòóðíèòå ïîäðåäáè", IDC_USE_SK, 12, 17, 165, 8 - CTEXT "SHIFT", -1, 68, 37, 27, 12 - CTEXT "+", -1, 57, 37, 8, 9 - AUTORADIOBUTTON "&CTRL", -1, 24, 31, 30, 11, WS_GROUP - AUTORADIOBUTTON "Ëÿâ A<", -1, 24, 45, 50, 12, NOT WS_TABSTOP - DEFPUSHBUTTON "Äîáðå", IDOK, 83, 70, 50, 14 - PUSHBUTTON "Îòêàç", IDCANCEL, 136, 70, 50, 14 +IDD_CHANGE_KEY_SEQ DIALOGEX 5, 100, 230, 125 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Change Key Sequence" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "", -1, 9, 5, 155, 110 + AUTOCHECKBOX "&Switch input languages", IDC_SWITCH_INPUT_LANG_CB, 15, 15, 105, 12 + LTEXT "Shift", -1, 73, 37, 27, 12 + CTEXT "+", -1, 62, 37, 8, 9 + AUTORADIOBUTTON "&Ctrl", IDC_CTRL_LANG, 29, 31, 30, 11 + AUTORADIOBUTTON "Left &ALT", IDC_LEFT_ALT_LANG, 29, 45, 46, 12 + AUTOCHECKBOX "S&witch keyboard layouts", IDC_SWITCH_KBLAYOUTS_CB, 16, 65, 141, 12 + LTEXT "Shift", -1, 74, 87, 27, 12 + CTEXT "+", -1, 63, 87, 8, 9 + AUTORADIOBUTTON "C&trl", IDC_CTRL_LAYOUT, 30, 81, 30, 11 + AUTORADIOBUTTON "Left A<", IDC_LEFT_ALT_LAYOUT, 30, 95, 44, 12 + DEFPUSHBUTTON "OK", IDOK, 172, 9, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 172, 27, 50, 14 END
IDD_INPUT_LANG_PROP DIALOGEX 20, 20, 227, 75 @@ -89,6 +93,9 @@ IDS_CONFIRMATION "Confirmation" IDS_LAYOUT_EXISTS "This layout already exists." IDS_LAYOUT_EXISTS2 "This layout already exists and can not be added." + IDS_CTRL_SHIFT "Ctrl+Shift" + IDS_LEFT_ALT_SHIFT "Left Alt+Shift" + IDS_SWITCH_BET_INLANG "Switch between input languages" END
STRINGTABLE
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.rc... ============================================================================== --- trunk/reactos/dll/cpl/input/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/de-DE.rc [iso-8859-1] Thu May 15 07:38:12 2008 @@ -26,7 +26,7 @@ GROUPBOX "Schnelltasten für Eingabesprachen", -1, 7, 37, 258, 95 LTEXT "Aktion", -1, 14, 47, 60, 9 RTEXT "Tasten&kombination", -1, 177, 47, 79, 9 - LISTBOX IDC_KEY_LISTBOX, 14, 57, 244, 52, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + CONTROL "", IDC_KEY_LISTVIEW, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_AUTOARRANGE | LVS_SINGLESEL, 14, 57, 244, 52, WS_EX_CLIENTEDGE PUSHBUTTON "Tastenkombination änder&n...", IDC_CHANGE_KEY_SEQ_BTN, 152, 113, 106, 14, WS_GROUP DEFPUSHBUTTON "OK", IDOK, 66, 140, 70, 14 PUSHBUTTON "Abbrechen", IDCANCEL, 146, 140, 70, 14 @@ -45,20 +45,24 @@ PUSHBUTTON "Abbrechen", IDCANCEL, 169, 68, 50, 14 END
-IDD_CHANGE_KEY_SEQ DIALOGEX 5, 100, 194, 89 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Tastenkombination ändern" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "", 1240, 4, 5, 186, 10 - GROUPBOX "", -1, 7, 16, 179, 48 - AUTOCHECKBOX "Tastaturlayout &wechseln", IDC_USE_SK, 12, 17, 135, 8 - CTEXT "SHIFT", -1, 68, 37, 27, 12 - CTEXT "+", -1, 57, 37, 8, 9 - AUTORADIOBUTTON "&STRG", -1, 24, 31, 30, 11, WS_GROUP - AUTORADIOBUTTON "A< links", -1, 24, 45, 50, 12, NOT WS_TABSTOP - DEFPUSHBUTTON "OK", IDOK, 83, 70, 50, 14 - PUSHBUTTON "Abbrechen", IDCANCEL, 136, 70, 50, 14 +IDD_CHANGE_KEY_SEQ DIALOGEX 5, 100, 230, 125 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Change Key Sequence" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "", -1, 9, 5, 155, 110 + AUTOCHECKBOX "&Switch input languages", IDC_SWITCH_INPUT_LANG_CB, 15, 15, 105, 12 + LTEXT "Shift", -1, 73, 37, 27, 12 + CTEXT "+", -1, 62, 37, 8, 9 + AUTORADIOBUTTON "&Ctrl", IDC_CTRL_LANG, 29, 31, 30, 11 + AUTORADIOBUTTON "Left &ALT", IDC_LEFT_ALT_LANG, 29, 45, 46, 12 + AUTOCHECKBOX "S&witch keyboard layouts", IDC_SWITCH_KBLAYOUTS_CB, 16, 65, 141, 12 + LTEXT "Shift", -1, 74, 87, 27, 12 + CTEXT "+", -1, 63, 87, 8, 9 + AUTORADIOBUTTON "C&trl", IDC_CTRL_LAYOUT, 30, 81, 30, 11 + AUTORADIOBUTTON "Left A<", IDC_LEFT_ALT_LAYOUT, 30, 95, 44, 12 + DEFPUSHBUTTON "OK", IDOK, 172, 9, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 172, 27, 50, 14 END
IDD_INPUT_LANG_PROP DIALOGEX 20, 20, 227, 75 @@ -90,6 +94,9 @@ IDS_CONFIRMATION "Confirmation" IDS_LAYOUT_EXISTS "This layout already exists." IDS_LAYOUT_EXISTS2 "This layout already exists and can not be added." + IDS_CTRL_SHIFT "Ctrl+Shift" + IDS_LEFT_ALT_SHIFT "Left Alt+Shift" + IDS_SWITCH_BET_INLANG "Switch between input languages" END
STRINGTABLE
Modified: trunk/reactos/dll/cpl/input/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/el-GR.rc... ============================================================================== --- trunk/reactos/dll/cpl/input/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/el-GR.rc [iso-8859-1] Thu May 15 07:38:12 2008 @@ -26,7 +26,7 @@ GROUPBOX "ÐëÞêôñá ðñüóâáóçò ãéá ãëþóóåò åéóáãùãÞò", -1, 7, 37, 258, 95 LTEXT "ÅíÝñãåéá", -1, 14, 47, 60, 9 RTEXT "&Áêïëïõèßá ðëÞêôñùí", -1, 177, 47, 79, 9 - LISTBOX IDC_KEY_LISTBOX, 14, 57, 244, 52, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + CONTROL "", IDC_KEY_LISTVIEW, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_AUTOARRANGE | LVS_SINGLESEL, 14, 57, 244, 52, WS_EX_CLIENTEDGE PUSHBUTTON "&ÁëëáãÞ áêïëïõèßáò ðëÞêôñùí...", IDC_CHANGE_KEY_SEQ_BTN, 152, 113, 106, 14, WS_GROUP DEFPUSHBUTTON "OK", IDOK, 66, 140, 70, 14 PUSHBUTTON "¢êõñï", IDCANCEL, 146, 140, 70, 14 @@ -45,20 +45,24 @@ PUSHBUTTON "¢êõñï", IDCANCEL, 169, 68, 50, 14 END
-IDD_CHANGE_KEY_SEQ DIALOGEX 5, 100, 194, 89 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "ÁëëáãÞ áêïëïõèßáò ðëÞêôñùí" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "", 1240, 4, 5, 186, 10 - GROUPBOX "", -1, 7, 16, 179, 48 - AUTOCHECKBOX "Å&íáëëáãÞ äéÜôáîçò ðëçêôñïëïãßïõ", IDC_USE_SK, 12, 17, 135, 8 - CTEXT "SHIFT", -1, 68, 37, 27, 12 - CTEXT "+", -1, 57, 37, 8, 9 - AUTORADIOBUTTON "&CTRL", -1, 24, 31, 30, 11, WS_GROUP - AUTORADIOBUTTON "Áñéóôåñü A<", -1, 24, 45, 50, 12, NOT WS_TABSTOP - DEFPUSHBUTTON "OK", IDOK, 83, 70, 50, 14 - PUSHBUTTON "¢êõñï", IDCANCEL, 136, 70, 50, 14 +IDD_CHANGE_KEY_SEQ DIALOGEX 5, 100, 230, 125 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Change Key Sequence" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "", -1, 9, 5, 155, 110 + AUTOCHECKBOX "&Switch input languages", IDC_SWITCH_INPUT_LANG_CB, 15, 15, 105, 12 + LTEXT "Shift", -1, 73, 37, 27, 12 + CTEXT "+", -1, 62, 37, 8, 9 + AUTORADIOBUTTON "&Ctrl", IDC_CTRL_LANG, 29, 31, 30, 11 + AUTORADIOBUTTON "Left &ALT", IDC_LEFT_ALT_LANG, 29, 45, 46, 12 + AUTOCHECKBOX "S&witch keyboard layouts", IDC_SWITCH_KBLAYOUTS_CB, 16, 65, 141, 12 + LTEXT "Shift", -1, 74, 87, 27, 12 + CTEXT "+", -1, 63, 87, 8, 9 + AUTORADIOBUTTON "C&trl", IDC_CTRL_LAYOUT, 30, 81, 30, 11 + AUTORADIOBUTTON "Left A<", IDC_LEFT_ALT_LAYOUT, 30, 95, 44, 12 + DEFPUSHBUTTON "OK", IDOK, 172, 9, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 172, 27, 50, 14 END
IDD_INPUT_LANG_PROP DIALOGEX 20, 20, 227, 75 @@ -89,6 +93,9 @@ IDS_CONFIRMATION "Confirmation" IDS_LAYOUT_EXISTS "This layout already exists." IDS_LAYOUT_EXISTS2 "This layout already exists and can not be added." + IDS_CTRL_SHIFT "Ctrl+Shift" + IDS_LEFT_ALT_SHIFT "Left Alt+Shift" + IDS_SWITCH_BET_INLANG "Switch between input languages" END
STRINGTABLE
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.rc... ============================================================================== --- trunk/reactos/dll/cpl/input/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/en-US.rc [iso-8859-1] Thu May 15 07:38:12 2008 @@ -26,7 +26,7 @@ GROUPBOX "Hot keys for input languages", -1, 7, 37, 258, 95 LTEXT "Action", -1, 14, 47, 60, 9 RTEXT "&Key sequence", -1, 177, 47, 79, 9 - LISTBOX IDC_KEY_LISTBOX, 14, 57, 244, 52, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + CONTROL "", IDC_KEY_LISTVIEW, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_AUTOARRANGE | LVS_SINGLESEL, 14, 57, 244, 52, WS_EX_CLIENTEDGE PUSHBUTTON "&Change Key Sequence...", IDC_CHANGE_KEY_SEQ_BTN, 152, 113, 106, 14, WS_GROUP DEFPUSHBUTTON "OK", IDOK, 66, 140, 70, 14 PUSHBUTTON "Cancel", IDCANCEL, 146, 140, 70, 14 @@ -45,20 +45,24 @@ PUSHBUTTON "Cancel", IDCANCEL, 169, 68, 50, 14 END
-IDD_CHANGE_KEY_SEQ DIALOGEX 5, 100, 194, 89 +IDD_CHANGE_KEY_SEQ DIALOGEX 5, 100, 230, 125 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Change Key Sequence" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "", 1240, 4, 5, 186, 10 - GROUPBOX "", -1, 7, 16, 179, 48 - AUTOCHECKBOX "S&witch keyboard layouts", IDC_USE_SK, 12, 17, 135, 8 - CTEXT "SHIFT", -1, 68, 37, 27, 12 - CTEXT "+", -1, 57, 37, 8, 9 - AUTORADIOBUTTON "&CTRL", -1, 24, 31, 30, 11, WS_GROUP - AUTORADIOBUTTON "Left A<", -1, 24, 45, 50, 12, NOT WS_TABSTOP - DEFPUSHBUTTON "OK", IDOK, 83, 70, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 136, 70, 50, 14 + GROUPBOX "", -1, 9, 5, 155, 110 + AUTOCHECKBOX "&Switch input languages", IDC_SWITCH_INPUT_LANG_CB, 15, 15, 105, 12 + LTEXT "Shift", -1, 73, 37, 27, 12 + CTEXT "+", -1, 62, 37, 8, 9 + AUTORADIOBUTTON "&Ctrl", IDC_CTRL_LANG, 29, 31, 30, 11 + AUTORADIOBUTTON "Left &ALT", IDC_LEFT_ALT_LANG, 29, 45, 46, 12 + AUTOCHECKBOX "S&witch keyboard layouts", IDC_SWITCH_KBLAYOUTS_CB, 16, 65, 141, 12 + LTEXT "Shift", -1, 74, 87, 27, 12 + CTEXT "+", -1, 63, 87, 8, 9 + AUTORADIOBUTTON "C&trl", IDC_CTRL_LAYOUT, 30, 81, 30, 11 + AUTORADIOBUTTON "Left A<", IDC_LEFT_ALT_LAYOUT, 30, 95, 44, 12 + DEFPUSHBUTTON "OK", IDOK, 172, 9, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 172, 27, 50, 14 END
IDD_INPUT_LANG_PROP DIALOGEX 20, 20, 227, 75 @@ -89,6 +93,9 @@ IDS_CONFIRMATION "Confirmation" IDS_LAYOUT_EXISTS "This layout already exists." IDS_LAYOUT_EXISTS2 "This layout already exists and can not be added." + IDS_CTRL_SHIFT "Ctrl+Shift" + IDS_LEFT_ALT_SHIFT "Left Alt+Shift" + IDS_SWITCH_BET_INLANG "Switch between input languages" END
STRINGTABLE
Modified: trunk/reactos/dll/cpl/input/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/es-ES.rc... ============================================================================== --- trunk/reactos/dll/cpl/input/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/es-ES.rc [iso-8859-1] Thu May 15 07:38:12 2008 @@ -31,7 +31,7 @@ GROUPBOX "Teclas de acceso rápido para idiomas de dispositivo de entrada ", -1, 7, 37, 258, 95 LTEXT "Acción", -1, 14, 47, 60, 9 RTEXT "&Secuencia de teclas", -1, 177, 47, 79, 9 - LISTBOX IDC_KEY_LISTBOX, 14, 57, 244, 52, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + CONTROL "", IDC_KEY_LISTVIEW, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_AUTOARRANGE | LVS_SINGLESEL, 14, 57, 244, 52, WS_EX_CLIENTEDGE PUSHBUTTON "&Cambiar secuencia de teclas...", IDC_CHANGE_KEY_SEQ_BTN, 152, 113, 106, 14, WS_GROUP DEFPUSHBUTTON "Aceptar", IDOK, 66, 140, 70, 14 PUSHBUTTON "Cancelar", IDCANCEL, 146, 140, 70, 14 @@ -50,20 +50,24 @@ PUSHBUTTON "Cancelar", IDCANCEL, 169, 68, 50, 14 END
-IDD_CHANGE_KEY_SEQ DIALOGEX 5, 100, 194, 89 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Cambiar secuencia de teclas" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "", 1240, 4, 5, 186, 10 - GROUPBOX "", -1, 7, 16, 179, 48 - AUTOCHECKBOX "Camb&iar la distribución del teclado", IDC_USE_SK, 12, 17, 131, 8 - CTEXT "Mayús", -1, 68, 37, 27, 12 - CTEXT "+", -1, 57, 37, 8, 9 - AUTORADIOBUTTON "&CTRL", -1, 24, 31, 30, 11, WS_GROUP - AUTORADIOBUTTON "A< Izq", -1, 24, 45, 50, 12, NOT WS_TABSTOP - DEFPUSHBUTTON "Aceptar", IDOK, 83, 70, 50, 14 - PUSHBUTTON "Cancelar", IDCANCEL, 136, 70, 50, 14 +IDD_CHANGE_KEY_SEQ DIALOGEX 5, 100, 230, 125 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Change Key Sequence" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "", -1, 9, 5, 155, 110 + AUTOCHECKBOX "&Switch input languages", IDC_SWITCH_INPUT_LANG_CB, 15, 15, 105, 12 + LTEXT "Shift", -1, 73, 37, 27, 12 + CTEXT "+", -1, 62, 37, 8, 9 + AUTORADIOBUTTON "&Ctrl", IDC_CTRL_LANG, 29, 31, 30, 11 + AUTORADIOBUTTON "Left &ALT", IDC_LEFT_ALT_LANG, 29, 45, 46, 12 + AUTOCHECKBOX "S&witch keyboard layouts", IDC_SWITCH_KBLAYOUTS_CB, 16, 65, 141, 12 + LTEXT "Shift", -1, 74, 87, 27, 12 + CTEXT "+", -1, 63, 87, 8, 9 + AUTORADIOBUTTON "C&trl", IDC_CTRL_LAYOUT, 30, 81, 30, 11 + AUTORADIOBUTTON "Left A<", IDC_LEFT_ALT_LAYOUT, 30, 95, 44, 12 + DEFPUSHBUTTON "OK", IDOK, 172, 9, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 172, 27, 50, 14 END
IDD_INPUT_LANG_PROP DIALOGEX 20, 20, 227, 75 @@ -94,6 +98,9 @@ IDS_CONFIRMATION "Confirmación" IDS_LAYOUT_EXISTS "This layout already exists." IDS_LAYOUT_EXISTS2 "This layout already exists and can not be added." + IDS_CTRL_SHIFT "Ctrl+Shift" + IDS_LEFT_ALT_SHIFT "Left Alt+Shift" + IDS_SWITCH_BET_INLANG "Switch between input languages" END
STRINGTABLE
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.rc... ============================================================================== --- trunk/reactos/dll/cpl/input/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/fr-FR.rc [iso-8859-1] Thu May 15 07:38:12 2008 @@ -26,7 +26,7 @@ GROUPBOX "Touches de raccourci pour la saisie des langues", -1, 7, 37, 258, 95 LTEXT "Action", -1, 14, 47, 60, 9 RTEXT "Séquence de touches", -1, 177, 47, 79, 9 - LISTBOX IDC_KEY_LISTBOX, 14, 57, 244, 52, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + CONTROL "", IDC_KEY_LISTVIEW, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_AUTOARRANGE | LVS_SINGLESEL, 14, 57, 244, 52, WS_EX_CLIENTEDGE PUSHBUTTON "&Changer la séquence de touches...", IDC_CHANGE_KEY_SEQ_BTN, 152, 113, 106, 14, WS_GROUP DEFPUSHBUTTON "OK", IDOK, 66, 140, 70, 14 PUSHBUTTON "Annuler", IDCANCEL, 146, 140, 70, 14 @@ -45,20 +45,24 @@ PUSHBUTTON "Annuler", IDCANCEL, 169, 68, 50, 14 END
-IDD_CHANGE_KEY_SEQ DIALOGEX 5, 100, 194, 89 +IDD_CHANGE_KEY_SEQ DIALOGEX 5, 100, 230, 125 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Change Key Sequence" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "", 1240, 4, 5, 186, 10 - GROUPBOX "", -1, 7, 16, 179, 48 - AUTOCHECKBOX "S&witch keyboard layouts", IDC_USE_SK, 12, 17, 135, 8 - CTEXT "SHIFT", -1, 68, 37, 27, 12 - CTEXT "+", -1, 57, 37, 8, 9 - AUTORADIOBUTTON "&CTRL", -1, 24, 31, 30, 11, WS_GROUP - AUTORADIOBUTTON "Left A<", -1, 24, 45, 50, 12, NOT WS_TABSTOP - DEFPUSHBUTTON "OK", IDOK, 83, 70, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 136, 70, 50, 14 + GROUPBOX "", -1, 9, 5, 155, 110 + AUTOCHECKBOX "&Switch input languages", IDC_SWITCH_INPUT_LANG_CB, 15, 15, 105, 12 + LTEXT "Shift", -1, 73, 37, 27, 12 + CTEXT "+", -1, 62, 37, 8, 9 + AUTORADIOBUTTON "&Ctrl", IDC_CTRL_LANG, 29, 31, 30, 11 + AUTORADIOBUTTON "Left &ALT", IDC_LEFT_ALT_LANG, 29, 45, 46, 12 + AUTOCHECKBOX "S&witch keyboard layouts", IDC_SWITCH_KBLAYOUTS_CB, 16, 65, 141, 12 + LTEXT "Shift", -1, 74, 87, 27, 12 + CTEXT "+", -1, 63, 87, 8, 9 + AUTORADIOBUTTON "C&trl", IDC_CTRL_LAYOUT, 30, 81, 30, 11 + AUTORADIOBUTTON "Left A<", IDC_LEFT_ALT_LAYOUT, 30, 95, 44, 12 + DEFPUSHBUTTON "OK", IDOK, 172, 9, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 172, 27, 50, 14 END
IDD_INPUT_LANG_PROP DIALOGEX 20, 20, 227, 75 @@ -89,6 +93,9 @@ IDS_CONFIRMATION "Confirmation" IDS_LAYOUT_EXISTS "This layout already exists." IDS_LAYOUT_EXISTS2 "This layout already exists and can not be added." + IDS_CTRL_SHIFT "Ctrl+Shift" + IDS_LEFT_ALT_SHIFT "Left Alt+Shift" + IDS_SWITCH_BET_INLANG "Switch between input languages" END
/* FIXME : To improve/complete */
Modified: trunk/reactos/dll/cpl/input/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/it-IT.rc... ============================================================================== --- trunk/reactos/dll/cpl/input/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/it-IT.rc [iso-8859-1] Thu May 15 07:38:12 2008 @@ -26,7 +26,7 @@ GROUPBOX "Tasti attivi per le lingue di digitazione", -1, 7, 37, 258, 95 LTEXT "Azione", -1, 14, 47, 60, 9 RTEXT "&Sequenza dei tasti", -1, 177, 47, 79, 9 - LISTBOX IDC_KEY_LISTBOX, 14, 57, 244, 52, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + CONTROL "", IDC_KEY_LISTVIEW, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_AUTOARRANGE | LVS_SINGLESEL, 14, 57, 244, 52, WS_EX_CLIENTEDGE PUSHBUTTON "&Modifica della sequenza dei tasti...", IDC_CHANGE_KEY_SEQ_BTN, 152, 113, 106, 14, WS_GROUP DEFPUSHBUTTON "OK", IDOK, 66, 140, 70, 14 PUSHBUTTON "Annulla", IDCANCEL, 146, 140, 70, 14 @@ -45,20 +45,24 @@ PUSHBUTTON "Annulla", IDCANCEL, 169, 68, 50, 14 END
-IDD_CHANGE_KEY_SEQ DIALOGEX 5, 100, 194, 89 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Modifica sequenza tasti" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "", 1240, 4, 5, 186, 10 - GROUPBOX "", -1, 7, 16, 179, 48 - AUTOCHECKBOX "&Commutazione tra disposizioni di tastiera", IDC_USE_SK, 12, 17, 135, 8 - CTEXT "SHIFT", -1, 68, 37, 27, 12 - CTEXT "+", -1, 57, 37, 8, 9 - AUTORADIOBUTTON "&CTRL", -1, 24, 31, 30, 11, WS_GROUP - AUTORADIOBUTTON "A< sinistro", -1, 24, 45, 50, 12, NOT WS_TABSTOP - DEFPUSHBUTTON "OK", IDOK, 83, 70, 50, 14 - PUSHBUTTON "Annulla", IDCANCEL, 136, 70, 50, 14 +IDD_CHANGE_KEY_SEQ DIALOGEX 5, 100, 230, 125 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Change Key Sequence" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "", -1, 9, 5, 155, 110 + AUTOCHECKBOX "&Switch input languages", IDC_SWITCH_INPUT_LANG_CB, 15, 15, 105, 12 + LTEXT "Shift", -1, 73, 37, 27, 12 + CTEXT "+", -1, 62, 37, 8, 9 + AUTORADIOBUTTON "&Ctrl", IDC_CTRL_LANG, 29, 31, 30, 11 + AUTORADIOBUTTON "Left &ALT", IDC_LEFT_ALT_LANG, 29, 45, 46, 12 + AUTOCHECKBOX "S&witch keyboard layouts", IDC_SWITCH_KBLAYOUTS_CB, 16, 65, 141, 12 + LTEXT "Shift", -1, 74, 87, 27, 12 + CTEXT "+", -1, 63, 87, 8, 9 + AUTORADIOBUTTON "C&trl", IDC_CTRL_LAYOUT, 30, 81, 30, 11 + AUTORADIOBUTTON "Left A<", IDC_LEFT_ALT_LAYOUT, 30, 95, 44, 12 + DEFPUSHBUTTON "OK", IDOK, 172, 9, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 172, 27, 50, 14 END
IDD_INPUT_LANG_PROP DIALOGEX 20, 20, 227, 75 @@ -89,6 +93,9 @@ IDS_CONFIRMATION "Conferma" IDS_LAYOUT_EXISTS "This layout already exists." IDS_LAYOUT_EXISTS2 "This layout already exists and can not be added." + IDS_CTRL_SHIFT "Ctrl+Shift" + IDS_LEFT_ALT_SHIFT "Left Alt+Shift" + IDS_SWITCH_BET_INLANG "Switch between input languages" END
STRINGTABLE
Modified: trunk/reactos/dll/cpl/input/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/pl-PL.rc... ============================================================================== --- trunk/reactos/dll/cpl/input/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/pl-PL.rc [iso-8859-1] Thu May 15 07:38:12 2008 @@ -33,7 +33,7 @@ GROUPBOX "Klawisze skrótu jêzyków", -1, 7, 37, 258, 95 LTEXT "Akcja", -1, 14, 47, 60, 9 RTEXT "&Sekwencja klawiszy", -1, 177, 47, 79, 9 - LISTBOX IDC_KEY_LISTBOX, 14, 57, 244, 52, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + CONTROL "", IDC_KEY_LISTVIEW, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_AUTOARRANGE | LVS_SINGLESEL, 14, 57, 244, 52, WS_EX_CLIENTEDGE PUSHBUTTON "Z&mieñ sekwencjê klawiszy...", IDC_CHANGE_KEY_SEQ_BTN, 152, 113, 106, 14, WS_GROUP DEFPUSHBUTTON "OK", IDOK, 66, 140, 70, 14 PUSHBUTTON "Anuluj", IDCANCEL, 146, 140, 70, 14 @@ -52,20 +52,24 @@ PUSHBUTTON "Anuluj", IDCANCEL, 169, 68, 50, 14 END
-IDD_CHANGE_KEY_SEQ DIALOGEX 5, 100, 194, 89 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Zmiana sekwencji klawiszy" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "", 1240, 4, 5, 186, 10 - GROUPBOX "", -1, 7, 16, 179, 48 - AUTOCHECKBOX "&Prze³¹cz uk³ad klawiatury", IDC_USE_SK, 12, 17, 135, 8 - CTEXT "SHIFT", -1, 68, 37, 27, 12 - CTEXT "+", -1, 57, 37, 8, 9 - AUTORADIOBUTTON "&CTRL", -1, 24, 31, 30, 11, WS_GROUP - AUTORADIOBUTTON "Lewy A<", -1, 24, 45, 50, 12, NOT WS_TABSTOP - DEFPUSHBUTTON "OK", IDOK, 83, 70, 50, 14 - PUSHBUTTON "Anuluj", IDCANCEL, 136, 70, 50, 14 +IDD_CHANGE_KEY_SEQ DIALOGEX 5, 100, 230, 125 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Change Key Sequence" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "", -1, 9, 5, 155, 110 + AUTOCHECKBOX "&Switch input languages", IDC_SWITCH_INPUT_LANG_CB, 15, 15, 105, 12 + LTEXT "Shift", -1, 73, 37, 27, 12 + CTEXT "+", -1, 62, 37, 8, 9 + AUTORADIOBUTTON "&Ctrl", IDC_CTRL_LANG, 29, 31, 30, 11 + AUTORADIOBUTTON "Left &ALT", IDC_LEFT_ALT_LANG, 29, 45, 46, 12 + AUTOCHECKBOX "S&witch keyboard layouts", IDC_SWITCH_KBLAYOUTS_CB, 16, 65, 141, 12 + LTEXT "Shift", -1, 74, 87, 27, 12 + CTEXT "+", -1, 63, 87, 8, 9 + AUTORADIOBUTTON "C&trl", IDC_CTRL_LAYOUT, 30, 81, 30, 11 + AUTORADIOBUTTON "Left A<", IDC_LEFT_ALT_LAYOUT, 30, 95, 44, 12 + DEFPUSHBUTTON "OK", IDOK, 172, 9, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 172, 27, 50, 14 END
IDD_INPUT_LANG_PROP DIALOGEX 20, 20, 227, 75 @@ -96,6 +100,9 @@ IDS_CONFIRMATION "Confirmation" IDS_LAYOUT_EXISTS "This layout already exists." IDS_LAYOUT_EXISTS2 "This layout already exists and can not be added." + IDS_CTRL_SHIFT "Ctrl+Shift" + IDS_LEFT_ALT_SHIFT "Left Alt+Shift" + IDS_SWITCH_BET_INLANG "Switch between input languages" END
STRINGTABLE
Modified: trunk/reactos/dll/cpl/input/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/ru-RU.rc... ============================================================================== --- trunk/reactos/dll/cpl/input/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/ru-RU.rc [iso-8859-1] Thu May 15 07:38:12 2008 @@ -26,7 +26,7 @@ GROUPBOX "Ñî÷åòàíèÿ êëàâèø äëÿ ÿçûêîâ ââîäà", -1, 7, 37, 258, 95 LTEXT "Äåéñòâèå", -1, 14, 47, 60, 9 RTEXT "&Ñî÷åòàíèå êëàâèø", -1, 177, 47, 79, 9 - LISTBOX IDC_KEY_LISTBOX, 14, 57, 244, 52, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + CONTROL "", IDC_KEY_LISTVIEW, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_AUTOARRANGE | LVS_SINGLESEL, 14, 57, 244, 52, WS_EX_CLIENTEDGE PUSHBUTTON "Ñì&åíà ñî÷åòàíèÿ êëàâèø...", IDC_CHANGE_KEY_SEQ_BTN, 152, 113, 106, 14, WS_GROUP DEFPUSHBUTTON "OK", IDOK, 66, 140, 70, 14 PUSHBUTTON "Îòìåíà", IDCANCEL, 146, 140, 70, 14 @@ -45,20 +45,24 @@ PUSHBUTTON "Îòìåíà", IDCANCEL, 169, 68, 50, 14 END
-IDD_CHANGE_KEY_SEQ DIALOGEX 5, 100, 194, 89 +IDD_CHANGE_KEY_SEQ DIALOGEX 5, 100, 230, 125 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Ñìåíà ñî÷åòàíèÿ êëàâèø" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "", 1240, 4, 5, 186, 10 - GROUPBOX "", -1, 7, 16, 179, 48 - AUTOCHECKBOX "&Èñïîëüçîâàòü ñî÷åòàíèå êëàâèø", IDC_USE_SK, 12, 17, 135, 8 - CTEXT "SHIFT", -1, 68, 37, 27, 12 - CTEXT "+", -1, 57, 37, 8, 9 - AUTORADIOBUTTON "&CTRL", -1, 24, 31, 30, 11, WS_GROUP - AUTORADIOBUTTON "Alt ñ&ëåâà", -1, 24, 45, 50, 12, NOT WS_TABSTOP - DEFPUSHBUTTON "OK", IDOK, 83, 70, 50, 14 - PUSHBUTTON "Îòìåíà", IDCANCEL, 136, 70, 50, 14 + GROUPBOX "", -1, 9, 5, 155, 110 + AUTOCHECKBOX "Ïåðåêëþ÷àòü &ÿçûêè ââîäà", IDC_SWITCH_INPUT_LANG_CB, 15, 15, 105, 12 + LTEXT "Shift", -1, 73, 37, 27, 12 + CTEXT "+", -1, 62, 37, 8, 9 + AUTORADIOBUTTON "&Ctrl", IDC_CTRL_LANG, 29, 31, 30, 11 + AUTORADIOBUTTON "Alt ñ&ëåâà", IDC_LEFT_ALT_LANG, 29, 45, 46, 12 + AUTOCHECKBOX "Ïåðåêëþ÷àòü ðàñêëàäêè &êëàâèàòóðû", IDC_SWITCH_KBLAYOUTS_CB, 16, 65, 141, 12 + LTEXT "Shift", -1, 74, 87, 27, 12 + CTEXT "+", -1, 63, 87, 8, 9 + AUTORADIOBUTTON "C&trl", IDC_CTRL_LAYOUT, 30, 81, 30, 11 + AUTORADIOBUTTON "Alt ñë&åâà", IDC_LEFT_ALT_LAYOUT, 30, 95, 44, 12 + DEFPUSHBUTTON "ÎÊ", IDOK, 172, 9, 50, 14 + PUSHBUTTON "Îòìåíà", IDCANCEL, 172, 27, 50, 14 END
IDD_INPUT_LANG_PROP DIALOGEX 20, 20, 227, 75 @@ -89,6 +93,9 @@ IDS_CONFIRMATION "Ïîäòâåðæäåíèå" IDS_LAYOUT_EXISTS "Òàêàÿ ðàñêëàäêà óæå ñóùåñòâóåò." IDS_LAYOUT_EXISTS2 "Òàêàÿ ðàñêëàäêà óæå ñóùåñòâóåò è íå ìîæåò áûòü äîáàâëåíà." + IDS_CTRL_SHIFT "Ctrl+Shift" + IDS_LEFT_ALT_SHIFT "Alt ñëåâà+Shift" + IDS_SWITCH_BET_INLANG "Ïåðåêëþ÷åíèå ìåæäó ÿçûêàìè ââîäà" END
STRINGTABLE
Modified: trunk/reactos/dll/cpl/input/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/sk-SK.rc... ============================================================================== --- trunk/reactos/dll/cpl/input/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/sk-SK.rc [iso-8859-1] Thu May 15 07:38:12 2008 @@ -30,7 +30,7 @@ GROUPBOX "Klávesové skratky pre vstupné jazyky", -1, 7, 37, 258, 95 LTEXT "Akcia", -1, 14, 47, 60, 9 RTEXT "&Postupnos klávesov", -1, 177, 47, 79, 9 - LISTBOX IDC_KEY_LISTBOX, 14, 57, 244, 52, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + CONTROL "", IDC_KEY_LISTVIEW, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_AUTOARRANGE | LVS_SINGLESEL, 14, 57, 244, 52, WS_EX_CLIENTEDGE PUSHBUTTON "&Zmeni postupnos klávesov...", IDC_CHANGE_KEY_SEQ_BTN, 152, 113, 106, 14, WS_GROUP DEFPUSHBUTTON "OK", IDOK, 66, 140, 70, 14 PUSHBUTTON "Zrui", IDCANCEL, 146, 140, 70, 14 @@ -49,20 +49,24 @@ PUSHBUTTON "Zrui", IDCANCEL, 169, 68, 50, 14 END
-IDD_CHANGE_KEY_SEQ DIALOGEX 5, 100, 194, 89 +IDD_CHANGE_KEY_SEQ DIALOGEX 5, 100, 230, 125 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Change Key Sequence" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "", 1240, 4, 5, 186, 10 - GROUPBOX "", -1, 7, 16, 179, 48 - AUTOCHECKBOX "S&witch keyboard layouts", IDC_USE_SK, 12, 17, 135, 8 - CTEXT "SHIFT", -1, 68, 37, 27, 12 - CTEXT "+", -1, 57, 37, 8, 9 - AUTORADIOBUTTON "&CTRL", -1, 24, 31, 30, 11, WS_GROUP - AUTORADIOBUTTON "Left A<", -1, 24, 45, 50, 12, NOT WS_TABSTOP - DEFPUSHBUTTON "OK", IDOK, 83, 70, 50, 14 - PUSHBUTTON "Zrui", IDCANCEL, 136, 70, 50, 14 + GROUPBOX "", -1, 9, 5, 155, 110 + AUTOCHECKBOX "&Switch input languages", IDC_SWITCH_INPUT_LANG_CB, 15, 15, 105, 12 + LTEXT "Shift", -1, 73, 37, 27, 12 + CTEXT "+", -1, 62, 37, 8, 9 + AUTORADIOBUTTON "&Ctrl", IDC_CTRL_LANG, 29, 31, 30, 11 + AUTORADIOBUTTON "Left &ALT", IDC_LEFT_ALT_LANG, 29, 45, 46, 12 + AUTOCHECKBOX "S&witch keyboard layouts", IDC_SWITCH_KBLAYOUTS_CB, 16, 65, 141, 12 + LTEXT "Shift", -1, 74, 87, 27, 12 + CTEXT "+", -1, 63, 87, 8, 9 + AUTORADIOBUTTON "C&trl", IDC_CTRL_LAYOUT, 30, 81, 30, 11 + AUTORADIOBUTTON "Left A<", IDC_LEFT_ALT_LAYOUT, 30, 95, 44, 12 + DEFPUSHBUTTON "OK", IDOK, 172, 9, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 172, 27, 50, 14 END
IDD_INPUT_LANG_PROP DIALOGEX 20, 20, 227, 75 @@ -93,6 +97,9 @@ IDS_CONFIRMATION "Confirmation" IDS_LAYOUT_EXISTS "This layout already exists." IDS_LAYOUT_EXISTS2 "This layout already exists and can not be added." + IDS_CTRL_SHIFT "Ctrl+Shift" + IDS_LEFT_ALT_SHIFT "Left Alt+Shift" + IDS_SWITCH_BET_INLANG "Switch between input languages" END
STRINGTABLE
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.rc... ============================================================================== --- trunk/reactos/dll/cpl/input/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/uk-UA.rc [iso-8859-1] Thu May 15 07:38:12 2008 @@ -34,7 +34,7 @@ GROUPBOX "Ñïîëó÷åííÿ êëàâ³ø äëÿ ìîâ ââîäó", -1, 7, 37, 258, 95 LTEXT "ijÿ", -1, 14, 47, 60, 9 RTEXT "&Ñïîëó÷åííÿ êëàâ³ø", -1, 177, 47, 79, 9 - LISTBOX IDC_KEY_LISTBOX, 14, 57, 244, 52, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + CONTROL "", IDC_KEY_LISTVIEW, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_AUTOARRANGE | LVS_SINGLESEL, 14, 57, 244, 52, WS_EX_CLIENTEDGE PUSHBUTTON "Ç&ì³íà ñïîëó÷åííÿ êëàâ³ø...", IDC_CHANGE_KEY_SEQ_BTN, 152, 113, 106, 14, WS_GROUP DEFPUSHBUTTON "OK", IDOK, 66, 140, 70, 14 PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 146, 140, 70, 14 @@ -53,20 +53,24 @@ PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 169, 68, 50, 14 END
-IDD_CHANGE_KEY_SEQ DIALOGEX 5, 100, 194, 89 +IDD_CHANGE_KEY_SEQ DIALOGEX 5, 100, 230, 125 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Change Key Sequence" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "", 1240, 4, 5, 186, 10 - GROUPBOX "", -1, 7, 16, 179, 48 - AUTOCHECKBOX "S&witch keyboard layouts", IDC_USE_SK, 12, 17, 135, 8 - CTEXT "SHIFT", -1, 68, 37, 27, 12 - CTEXT "+", -1, 57, 37, 8, 9 - AUTORADIOBUTTON "&CTRL", -1, 24, 31, 30, 11, WS_GROUP - AUTORADIOBUTTON "Left A<", -1, 24, 45, 50, 12, NOT WS_TABSTOP - DEFPUSHBUTTON "OK", IDOK, 83, 70, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 136, 70, 50, 14 + GROUPBOX "", -1, 9, 5, 155, 110 + AUTOCHECKBOX "&Switch input languages", IDC_SWITCH_INPUT_LANG_CB, 15, 15, 105, 12 + LTEXT "Shift", -1, 73, 37, 27, 12 + CTEXT "+", -1, 62, 37, 8, 9 + AUTORADIOBUTTON "&Ctrl", IDC_CTRL_LANG, 29, 31, 30, 11 + AUTORADIOBUTTON "Left &ALT", IDC_LEFT_ALT_LANG, 29, 45, 46, 12 + AUTOCHECKBOX "S&witch keyboard layouts", IDC_SWITCH_KBLAYOUTS_CB, 16, 65, 141, 12 + LTEXT "Shift", -1, 74, 87, 27, 12 + CTEXT "+", -1, 63, 87, 8, 9 + AUTORADIOBUTTON "C&trl", IDC_CTRL_LAYOUT, 30, 81, 30, 11 + AUTORADIOBUTTON "Left A<", IDC_LEFT_ALT_LAYOUT, 30, 95, 44, 12 + DEFPUSHBUTTON "OK", IDOK, 172, 9, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 172, 27, 50, 14 END
IDD_INPUT_LANG_PROP DIALOGEX 20, 20, 227, 75 @@ -98,6 +102,9 @@ IDS_CONFIRMATION "Confirmation" IDS_LAYOUT_EXISTS "This layout already exists." IDS_LAYOUT_EXISTS2 "This layout already exists and can not be added." + IDS_CTRL_SHIFT "Ctrl+Shift" + IDS_LEFT_ALT_SHIFT "Left Alt+Shift" + IDS_SWITCH_BET_INLANG "Switch between input languages" END
STRINGTABLE
Modified: trunk/reactos/dll/cpl/input/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/resource.h?re... ============================================================================== --- trunk/reactos/dll/cpl/input/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/resource.h [iso-8859-1] Thu May 15 07:38:12 2008 @@ -32,13 +32,19 @@ #define IDC_KEY_SET_BTN 1005 #define IDC_PRESS_CL_KEY_RB 1006 #define IDC_PRESS_SHIFT_KEY_RB 1007 -#define IDC_KEY_LISTBOX 1008 +#define IDC_KEY_LISTVIEW 1008 #define IDC_CHANGE_KEY_SEQ_BTN 1009 #define IDC_INPUT_LANG_COMBO 1010 #define IDC_KEYBOARD_LO_COMBO 1011 #define IDC_USE_SK 1012 #define IDC_KB_LAYOUT_IME_COMBO 1013 #define IDC_INPUT_LANG_STR 1014 +#define IDC_SWITCH_INPUT_LANG_CB 1015 +#define IDC_SWITCH_KBLAYOUTS_CB 1016 +#define IDC_CTRL_LANG 1017 +#define IDC_CTRL_LAYOUT 1018 +#define IDC_LEFT_ALT_LANG 1019 +#define IDC_LEFT_ALT_LAYOUT 1020
/* IDS */ #define IDS_CPLSYSTEMNAME 1 @@ -54,6 +60,9 @@ #define IDS_CONFIRMATION 11 #define IDS_LAYOUT_EXISTS 12 #define IDS_LAYOUT_EXISTS2 13 +#define IDS_CTRL_SHIFT 14 +#define IDS_LEFT_ALT_SHIFT 15 +#define IDS_SWITCH_BET_INLANG 16
/* Layouts */ #define IDS_US_LAYOUT 5000