From 426a79eba3821cfe75994bb4598ca5c1249ea49f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Fri, 28 Dec 2012 19:31:17 +0000 Subject: [PATCH] [INPUT] Add a new property sheet which aim is to manage text services (and the language bar). svn path=/trunk/; revision=58032 --- reactos/dll/cpl/input/CMakeLists.txt | 1 + reactos/dll/cpl/input/add.c | 1 - reactos/dll/cpl/input/advsettings.c | 49 ++++++++++++++++++++++++++++ reactos/dll/cpl/input/changekeyseq.c | 1 - reactos/dll/cpl/input/input.c | 11 ++++--- reactos/dll/cpl/input/input.h | 6 +++- reactos/dll/cpl/input/keysettings.c | 1 - reactos/dll/cpl/input/lang/bg-BG.rc | 10 ++++++ reactos/dll/cpl/input/lang/cs-CZ.rc | 10 ++++++ reactos/dll/cpl/input/lang/de-DE.rc | 10 ++++++ reactos/dll/cpl/input/lang/el-GR.rc | 10 ++++++ reactos/dll/cpl/input/lang/en-US.rc | 10 ++++++ reactos/dll/cpl/input/lang/es-ES.rc | 10 ++++++ reactos/dll/cpl/input/lang/fr-FR.rc | 20 +++++++++--- reactos/dll/cpl/input/lang/it-IT.rc | 10 ++++++ reactos/dll/cpl/input/lang/no-NO.rc | 10 ++++++ reactos/dll/cpl/input/lang/pl-PL.rc | 10 ++++++ reactos/dll/cpl/input/lang/ro-RO.rc | 10 ++++++ reactos/dll/cpl/input/lang/ru-RU.rc | 10 ++++++ reactos/dll/cpl/input/lang/sk-SK.rc | 10 ++++++ reactos/dll/cpl/input/lang/uk-UA.rc | 10 ++++++ reactos/dll/cpl/input/lang/zh-CN.rc | 10 ++++++ reactos/dll/cpl/input/resource.h | 10 +++--- reactos/dll/cpl/input/settings.c | 5 ++- 24 files changed, 225 insertions(+), 20 deletions(-) create mode 100644 reactos/dll/cpl/input/advsettings.c diff --git a/reactos/dll/cpl/input/CMakeLists.txt b/reactos/dll/cpl/input/CMakeLists.txt index a4aa664cc88..19d0de7937d 100644 --- a/reactos/dll/cpl/input/CMakeLists.txt +++ b/reactos/dll/cpl/input/CMakeLists.txt @@ -4,6 +4,7 @@ spec2def(input.dll input.spec) add_library(input SHARED input.c settings.c + advsettings.c keysettings.c add.c changekeyseq.c diff --git a/reactos/dll/cpl/input/add.c b/reactos/dll/cpl/input/add.c index 20849f16ca8..5caa53d1e8a 100644 --- a/reactos/dll/cpl/input/add.c +++ b/reactos/dll/cpl/input/add.c @@ -1,5 +1,4 @@ /* - * * PROJECT: input.dll * FILE: dll/win32/input/add.c * PURPOSE: input.dll diff --git a/reactos/dll/cpl/input/advsettings.c b/reactos/dll/cpl/input/advsettings.c new file mode 100644 index 00000000000..fc996282664 --- /dev/null +++ b/reactos/dll/cpl/input/advsettings.c @@ -0,0 +1,49 @@ +/* + * PROJECT: input.dll + * FILE: dll/win32/input/advsettings.c + * PURPOSE: input.dll + * PROGRAMMER: Hermes Belusca-Maito (hermes.belusca@sfr.fr) + * + */ + +#include "input.h" + +/* Property page dialog callback */ +INT_PTR CALLBACK +AdvancedSettingsPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + UNREFERENCED_PARAMETER(lParam); + + switch (uMsg) + { + case WM_INITDIALOG: + { + break; + } + + case WM_NOTIFY: + { + switch (LOWORD(wParam)) + { + } + + break; + } + + case WM_COMMAND: + { + switch (LOWORD(wParam)) + { + } + + break; + } + + case WM_DESTROY: + break; + } + + return FALSE; +} + +/* EOF */ diff --git a/reactos/dll/cpl/input/changekeyseq.c b/reactos/dll/cpl/input/changekeyseq.c index eb6fd3da845..225d89e7faf 100644 --- a/reactos/dll/cpl/input/changekeyseq.c +++ b/reactos/dll/cpl/input/changekeyseq.c @@ -1,5 +1,4 @@ /* - * * PROJECT: input.dll * FILE: dll/win32/input/changekeyseq.c * PURPOSE: input.dll diff --git a/reactos/dll/cpl/input/input.c b/reactos/dll/cpl/input/input.c index d3548ce8103..9432ca47473 100644 --- a/reactos/dll/cpl/input/input.c +++ b/reactos/dll/cpl/input/input.c @@ -1,5 +1,4 @@ /* - * * PROJECT: input.dll * FILE: dll/win32/input/input.c * PURPOSE: input.dll @@ -11,7 +10,7 @@ #include "input.h" -#define NUM_APPLETS (1) +#define NUM_APPLETS (1) LONG CALLBACK SystemApplet(VOID); HINSTANCE hApplet = 0; @@ -42,7 +41,7 @@ InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc) LONG CALLBACK SystemApplet(VOID) { - PROPSHEETPAGE psp[1]; + PROPSHEETPAGE psp[2]; PROPSHEETHEADER psh; TCHAR Caption[1024]; @@ -60,7 +59,11 @@ SystemApplet(VOID) psh.ppsp = psp; psh.pfnCallback = NULL; - InitPropSheetPage(&psp[0], IDD_PROPPAGESETTINGS, (DLGPROC) SettingPageProc); + /* Settings */ + InitPropSheetPage(&psp[0], IDD_PROPPAGESETTINGS, (DLGPROC)SettingsPageProc); + + /* Advanced Settings */ + InitPropSheetPage(&psp[1], IDD_PROPPAGEADVANCEDSETTINGS, (DLGPROC)AdvancedSettingsPageProc); return (LONG)(PropertySheet(&psh) != -1); } diff --git a/reactos/dll/cpl/input/input.h b/reactos/dll/cpl/input/input.h index 84655831819..f51e26a93a6 100644 --- a/reactos/dll/cpl/input/input.h +++ b/reactos/dll/cpl/input/input.h @@ -35,7 +35,7 @@ InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc); /* settings.c */ INT_PTR CALLBACK -SettingPageProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam); +SettingsPageProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam); BOOL GetLayoutName(LPCTSTR szLCID, LPTSTR szName); VOID @@ -43,6 +43,10 @@ UpdateLayoutsList(VOID); BOOL IsLayoutExists(LPTSTR szLayoutID, LPTSTR szLangID); +/* advsettings.c */ +INT_PTR CALLBACK +AdvancedSettingsPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); + /* keysettings.c */ INT_PTR CALLBACK KeySettingsDlgProc(HWND hDlg,UINT message,WPARAM wParam,LPARAM lParam); diff --git a/reactos/dll/cpl/input/keysettings.c b/reactos/dll/cpl/input/keysettings.c index 56a5254d283..b934a1a5ad7 100644 --- a/reactos/dll/cpl/input/keysettings.c +++ b/reactos/dll/cpl/input/keysettings.c @@ -1,5 +1,4 @@ /* - * * PROJECT: input.dll * FILE: dll/win32/input/keysettings.c * PURPOSE: input.dll diff --git a/reactos/dll/cpl/input/lang/bg-BG.rc b/reactos/dll/cpl/input/lang/bg-BG.rc index c58c7eea8f2..fd212a40963 100644 --- a/reactos/dll/cpl/input/lang/bg-BG.rc +++ b/reactos/dll/cpl/input/lang/bg-BG.rc @@ -19,6 +19,16 @@ BEGIN PUSHBUTTON "Настройка на &клавишите...", IDC_KEY_SET_BTN, 14, 198, 110, 14 END +IDD_PROPPAGEADVANCEDSETTINGS DIALOGEX 0, 0, 254, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced Settings" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "System Configuration", -1, 7, 7, 240, 70 + AUTOCHECKBOX "&Turn off advanced text services", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 130, 12 + LTEXT "Select this check box to turn off advanced text services in all programs.\nThis is not recommended for East Asian users because this closes the language bar.", -1, 14, 40, 230, 35 +END + IDD_KEYSETTINGS DIALOGEX 0, 0, 272, 163 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Разширените словесни услуги" diff --git a/reactos/dll/cpl/input/lang/cs-CZ.rc b/reactos/dll/cpl/input/lang/cs-CZ.rc index f612e222277..be74f2f10b4 100644 --- a/reactos/dll/cpl/input/lang/cs-CZ.rc +++ b/reactos/dll/cpl/input/lang/cs-CZ.rc @@ -20,6 +20,16 @@ BEGIN PUSHBUTTON "&Nastavení kláves...", IDC_KEY_SET_BTN, 14, 198, 110, 14 END +IDD_PROPPAGEADVANCEDSETTINGS DIALOGEX 0, 0, 254, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced Settings" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "System Configuration", -1, 7, 7, 240, 70 + AUTOCHECKBOX "&Turn off advanced text services", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 130, 12 + LTEXT "Select this check box to turn off advanced text services in all programs.\nThis is not recommended for East Asian users because this closes the language bar.", -1, 14, 40, 230, 35 +END + IDD_KEYSETTINGS DIALOGEX 0, 0, 272, 163 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Pokročilé nastavení kláves" diff --git a/reactos/dll/cpl/input/lang/de-DE.rc b/reactos/dll/cpl/input/lang/de-DE.rc index 03cb660d6f7..b6fccb3c677 100644 --- a/reactos/dll/cpl/input/lang/de-DE.rc +++ b/reactos/dll/cpl/input/lang/de-DE.rc @@ -15,6 +15,16 @@ BEGIN PUSHBUTTON "&Tasteneinstellungen...", IDC_KEY_SET_BTN, 14, 198, 110, 14 END +IDD_PROPPAGEADVANCEDSETTINGS DIALOGEX 0, 0, 254, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced Settings" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "System Configuration", -1, 7, 7, 240, 70 + AUTOCHECKBOX "&Turn off advanced text services", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 130, 12 + LTEXT "Select this check box to turn off advanced text services in all programs.\nThis is not recommended for East Asian users because this closes the language bar.", -1, 14, 40, 230, 35 +END + IDD_KEYSETTINGS DIALOGEX 0, 0, 272, 163 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Erweiterte Tasteneinstellungen" diff --git a/reactos/dll/cpl/input/lang/el-GR.rc b/reactos/dll/cpl/input/lang/el-GR.rc index 0e4b5d12d26..54d1b63381d 100644 --- a/reactos/dll/cpl/input/lang/el-GR.rc +++ b/reactos/dll/cpl/input/lang/el-GR.rc @@ -15,6 +15,16 @@ BEGIN PUSHBUTTON "&Ρυθμίσεις πλήκτρων...", IDC_KEY_SET_BTN, 14, 198, 110, 14 END +IDD_PROPPAGEADVANCEDSETTINGS DIALOGEX 0, 0, 254, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced Settings" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "System Configuration", -1, 7, 7, 240, 70 + AUTOCHECKBOX "&Turn off advanced text services", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 130, 12 + LTEXT "Select this check box to turn off advanced text services in all programs.\nThis is not recommended for East Asian users because this closes the language bar.", -1, 14, 40, 230, 35 +END + IDD_KEYSETTINGS DIALOGEX 0, 0, 272, 163 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Πρόσθετες ρυθμίσεις κλειδιού" diff --git a/reactos/dll/cpl/input/lang/en-US.rc b/reactos/dll/cpl/input/lang/en-US.rc index 59892b01471..4cec26a7078 100644 --- a/reactos/dll/cpl/input/lang/en-US.rc +++ b/reactos/dll/cpl/input/lang/en-US.rc @@ -15,6 +15,16 @@ BEGIN PUSHBUTTON "&Key Settings...", IDC_KEY_SET_BTN, 14, 198, 110, 14 END +IDD_PROPPAGEADVANCEDSETTINGS DIALOGEX 0, 0, 254, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced Settings" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "System Configuration", -1, 7, 7, 240, 70 + AUTOCHECKBOX "&Turn off advanced text services", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 130, 12 + LTEXT "Select this check box to turn off advanced text services in all programs.\nThis is not recommended for East Asian users because this closes the language bar.", -1, 14, 40, 230, 35 +END + IDD_KEYSETTINGS DIALOGEX 0, 0, 272, 163 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Advanced Key Settings" diff --git a/reactos/dll/cpl/input/lang/es-ES.rc b/reactos/dll/cpl/input/lang/es-ES.rc index 3fdfe1f63ba..7952369dd44 100644 --- a/reactos/dll/cpl/input/lang/es-ES.rc +++ b/reactos/dll/cpl/input/lang/es-ES.rc @@ -20,6 +20,16 @@ BEGIN PUSHBUTTON "C&onfiguración de teclas...", IDC_KEY_SET_BTN, 14, 198, 110, 14 END +IDD_PROPPAGEADVANCEDSETTINGS DIALOGEX 0, 0, 254, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced Settings" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "System Configuration", -1, 7, 7, 240, 70 + AUTOCHECKBOX "&Turn off advanced text services", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 130, 12 + LTEXT "Select this check box to turn off advanced text services in all programs.\nThis is not recommended for East Asian users because this closes the language bar.", -1, 14, 40, 230, 35 +END + IDD_KEYSETTINGS DIALOGEX 0, 0, 272, 163 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Configuración avanzada de teclas" diff --git a/reactos/dll/cpl/input/lang/fr-FR.rc b/reactos/dll/cpl/input/lang/fr-FR.rc index 9c58d90de16..75119fcfed7 100644 --- a/reactos/dll/cpl/input/lang/fr-FR.rc +++ b/reactos/dll/cpl/input/lang/fr-FR.rc @@ -5,14 +5,24 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Paramètres" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Sélectionnez les service que vous désirez pour chaque langue de saisie affichée dans la liste.\nUtiliser les boutons Ajouter et Supprimer pour modifier la liste.", -1, 9, 6, 238, 25 + LTEXT "Sélectionnez les services que vous désirez pour chaque langue de saisie affichée dans la liste.\nUtilisez les boutons Ajouter et Supprimer pour modifier la liste.", -1, 9, 6, 238, 25 CONTROL "TEXT", IDC_KEYLAYOUT_LIST, "SYSLISTVIEW32", WS_BORDER | WS_VSCROLL | WS_TABSTOP | LVS_SORTASCENDING | LVS_REPORT | 0x0000808D, 8, 36, 237, 101 - PUSHBUTTON "&Set Default", IDC_SET_DEFAULT, 101, 159, 144, 14 - PUSHBUTTON "Ajouter...", IDC_ADD_BUTTON, 27, 142, 70, 14 + PUSHBUTTON "Par &défaut", IDC_SET_DEFAULT, 101, 159, 144, 14 + PUSHBUTTON "A&jouter...", IDC_ADD_BUTTON, 27, 142, 70, 14 PUSHBUTTON "Supp&rimer...", IDC_REMOVE_BUTTON, 101, 142, 70, 14 PUSHBUTTON "&Propriétés...", IDC_PROP_BUTTON, 175, 142, 70, 14 - GROUPBOX "Préférences", -1, 7, 185, 240, 36 - PUSHBUTTON "Paramètres des touches...", IDC_KEY_SET_BTN, 14, 198, 110, 14 + GROUPBOX "Pré&férences", -1, 7, 185, 240, 36 + PUSHBUTTON "Para&mètres des touches...", IDC_KEY_SET_BTN, 14, 198, 110, 14 +END + +IDD_PROPPAGEADVANCEDSETTINGS DIALOGEX 0, 0, 254, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Paramètres avancés" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Configuration du système", -1, 7, 7, 240, 70 + AUTOCHECKBOX "Arrêter les services de texte a&vancés", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 130, 12 + LTEXT "Sélectionnez cette case à cocher pour désactiver les services de texte avancés dans tous les programmes.\nCeci n'est pas recommandé aux utilisateurs d'Asie de l'Est, car cette opération ferme la Barre de langue.", -1, 14, 40, 230, 35 END IDD_KEYSETTINGS DIALOGEX 0, 0, 272, 163 diff --git a/reactos/dll/cpl/input/lang/it-IT.rc b/reactos/dll/cpl/input/lang/it-IT.rc index ded314461c1..08a412348ca 100644 --- a/reactos/dll/cpl/input/lang/it-IT.rc +++ b/reactos/dll/cpl/input/lang/it-IT.rc @@ -15,6 +15,16 @@ BEGIN PUSHBUTTON "&Impostazioni tasti...", IDC_KEY_SET_BTN, 14, 198, 110, 14 END +IDD_PROPPAGEADVANCEDSETTINGS DIALOGEX 0, 0, 254, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced Settings" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "System Configuration", -1, 7, 7, 240, 70 + AUTOCHECKBOX "&Turn off advanced text services", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 130, 12 + LTEXT "Select this check box to turn off advanced text services in all programs.\nThis is not recommended for East Asian users because this closes the language bar.", -1, 14, 40, 230, 35 +END + IDD_KEYSETTINGS DIALOGEX 0, 0, 272, 163 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Impostazioni avanzate" diff --git a/reactos/dll/cpl/input/lang/no-NO.rc b/reactos/dll/cpl/input/lang/no-NO.rc index 488b486ccd2..6dd23f2ba02 100644 --- a/reactos/dll/cpl/input/lang/no-NO.rc +++ b/reactos/dll/cpl/input/lang/no-NO.rc @@ -15,6 +15,16 @@ BEGIN PUSHBUTTON "&Tasteinnstillinger...", IDC_KEY_SET_BTN, 14, 198, 110, 14 END +IDD_PROPPAGEADVANCEDSETTINGS DIALOGEX 0, 0, 254, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced Settings" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "System Configuration", -1, 7, 7, 240, 70 + AUTOCHECKBOX "&Turn off advanced text services", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 130, 12 + LTEXT "Select this check box to turn off advanced text services in all programs.\nThis is not recommended for East Asian users because this closes the language bar.", -1, 14, 40, 230, 35 +END + IDD_KEYSETTINGS DIALOGEX 0, 0, 272, 163 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Avanserte tasteinnstillinger" diff --git a/reactos/dll/cpl/input/lang/pl-PL.rc b/reactos/dll/cpl/input/lang/pl-PL.rc index fb9889cf3d1..afcce085ae6 100644 --- a/reactos/dll/cpl/input/lang/pl-PL.rc +++ b/reactos/dll/cpl/input/lang/pl-PL.rc @@ -23,6 +23,16 @@ BEGIN PUSHBUTTON "Us&tawienia klawiszy...", IDC_KEY_SET_BTN, 14, 198, 110, 14 END +IDD_PROPPAGEADVANCEDSETTINGS DIALOGEX 0, 0, 254, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced Settings" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "System Configuration", -1, 7, 7, 240, 70 + AUTOCHECKBOX "&Turn off advanced text services", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 130, 12 + LTEXT "Select this check box to turn off advanced text services in all programs.\nThis is not recommended for East Asian users because this closes the language bar.", -1, 14, 40, 230, 35 +END + IDD_KEYSETTINGS DIALOGEX 0, 0, 272, 163 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Zaawansowane ustawienia klawiszy" diff --git a/reactos/dll/cpl/input/lang/ro-RO.rc b/reactos/dll/cpl/input/lang/ro-RO.rc index 1d9b056fe92..b84aa46a1d7 100644 --- a/reactos/dll/cpl/input/lang/ro-RO.rc +++ b/reactos/dll/cpl/input/lang/ro-RO.rc @@ -16,6 +16,16 @@ BEGIN PUSHBUTTON "&Combinații de taste…", IDC_KEY_SET_BTN, 14, 198, 110, 14 END +IDD_PROPPAGEADVANCEDSETTINGS DIALOGEX 0, 0, 254, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced Settings" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "System Configuration", -1, 7, 7, 240, 70 + AUTOCHECKBOX "&Turn off advanced text services", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 130, 12 + LTEXT "Select this check box to turn off advanced text services in all programs.\nThis is not recommended for East Asian users because this closes the language bar.", -1, 14, 40, 230, 35 +END + IDD_KEYSETTINGS DIALOGEX 0, 0, 272, 163 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Preferințe pentru combinații de taste" diff --git a/reactos/dll/cpl/input/lang/ru-RU.rc b/reactos/dll/cpl/input/lang/ru-RU.rc index 7bd149dfe0a..b73c92307b4 100644 --- a/reactos/dll/cpl/input/lang/ru-RU.rc +++ b/reactos/dll/cpl/input/lang/ru-RU.rc @@ -15,6 +15,16 @@ BEGIN PUSHBUTTON "&Параметры клавиатуры...", IDC_KEY_SET_BTN, 14, 198, 110, 14 END +IDD_PROPPAGEADVANCEDSETTINGS DIALOGEX 0, 0, 254, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced Settings" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "System Configuration", -1, 7, 7, 240, 70 + AUTOCHECKBOX "&Turn off advanced text services", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 130, 12 + LTEXT "Select this check box to turn off advanced text services in all programs.\nThis is not recommended for East Asian users because this closes the language bar.", -1, 14, 40, 230, 35 +END + IDD_KEYSETTINGS DIALOGEX 0, 0, 272, 163 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Дополнительные параметры клавиатуры" diff --git a/reactos/dll/cpl/input/lang/sk-SK.rc b/reactos/dll/cpl/input/lang/sk-SK.rc index 09b3a9501ee..1eafb43f4ce 100644 --- a/reactos/dll/cpl/input/lang/sk-SK.rc +++ b/reactos/dll/cpl/input/lang/sk-SK.rc @@ -20,6 +20,16 @@ BEGIN PUSHBUTTON "Nastavenie &klávesov...", IDC_KEY_SET_BTN, 14, 198, 110, 14 END +IDD_PROPPAGEADVANCEDSETTINGS DIALOGEX 0, 0, 254, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced Settings" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "System Configuration", -1, 7, 7, 240, 70 + AUTOCHECKBOX "&Turn off advanced text services", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 130, 12 + LTEXT "Select this check box to turn off advanced text services in all programs.\nThis is not recommended for East Asian users because this closes the language bar.", -1, 14, 40, 230, 35 +END + IDD_KEYSETTINGS DIALOGEX 0, 0, 272, 163 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Rozšírené nastavenia klávesov" diff --git a/reactos/dll/cpl/input/lang/uk-UA.rc b/reactos/dll/cpl/input/lang/uk-UA.rc index 1bf535d99bf..6514a62abab 100644 --- a/reactos/dll/cpl/input/lang/uk-UA.rc +++ b/reactos/dll/cpl/input/lang/uk-UA.rc @@ -23,6 +23,16 @@ BEGIN PUSHBUTTON "&Параметри клавіатури...", IDC_KEY_SET_BTN, 14, 198, 110, 14 END +IDD_PROPPAGEADVANCEDSETTINGS DIALOGEX 0, 0, 254, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced Settings" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "System Configuration", -1, 7, 7, 240, 70 + AUTOCHECKBOX "&Turn off advanced text services", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 130, 12 + LTEXT "Select this check box to turn off advanced text services in all programs.\nThis is not recommended for East Asian users because this closes the language bar.", -1, 14, 40, 230, 35 +END + IDD_KEYSETTINGS DIALOGEX 0, 0, 272, 163 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Додаткові параметри клавіатури" diff --git a/reactos/dll/cpl/input/lang/zh-CN.rc b/reactos/dll/cpl/input/lang/zh-CN.rc index 7fe1a3861ce..4312faf50a8 100644 --- a/reactos/dll/cpl/input/lang/zh-CN.rc +++ b/reactos/dll/cpl/input/lang/zh-CN.rc @@ -22,6 +22,16 @@ BEGIN PUSHBUTTON "键设置(&K)...", IDC_KEY_SET_BTN, 14, 198, 110, 14 END +IDD_PROPPAGEADVANCEDSETTINGS DIALOGEX 0, 0, 254, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced Settings" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "System Configuration", -1, 7, 7, 240, 70 + AUTOCHECKBOX "&Turn off advanced text services", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 130, 12 + LTEXT "Select this check box to turn off advanced text services in all programs.\nThis is not recommended for East Asian users because this closes the language bar.", -1, 14, 40, 230, 35 +END + IDD_KEYSETTINGS DIALOGEX 0, 0, 272, 163 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "高级键设置" diff --git a/reactos/dll/cpl/input/resource.h b/reactos/dll/cpl/input/resource.h index 2a897d197c2..6e38ef46acf 100644 --- a/reactos/dll/cpl/input/resource.h +++ b/reactos/dll/cpl/input/resource.h @@ -17,10 +17,11 @@ /* IDD */ #define IDD_PROPPAGESETTINGS 500 -#define IDD_INPUT_LANG_PROP 501 -#define IDD_CHANGE_KEY_SEQ 502 -#define IDD_ADD 503 -#define IDD_KEYSETTINGS 504 +#define IDD_PROPPAGEADVANCEDSETTINGS 501 +#define IDD_INPUT_LANG_PROP 502 +#define IDD_CHANGE_KEY_SEQ 503 +#define IDD_ADD 504 +#define IDD_KEYSETTINGS 505 /* IDC */ #define IDC_KEYLAYOUT_LIST 1000 @@ -62,6 +63,7 @@ #define IDS_CTRL_SHIFT 14 #define IDS_LEFT_ALT_SHIFT 15 #define IDS_SWITCH_BET_INLANG 16 +#define IDC_TURNOFFTEXTSVCS_CB 17 /* Layouts */ #define IDS_US_LAYOUT 5000 diff --git a/reactos/dll/cpl/input/settings.c b/reactos/dll/cpl/input/settings.c index 3da6187805c..131de5af87d 100644 --- a/reactos/dll/cpl/input/settings.c +++ b/reactos/dll/cpl/input/settings.c @@ -1,5 +1,4 @@ /* - * * PROJECT: input.dll * FILE: dll/win32/input/settings.c * PURPOSE: input.dll @@ -725,7 +724,7 @@ InputLangPropDlgProc(HWND hDlg, /* Property page dialog callback */ INT_PTR CALLBACK -SettingPageProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam) +SettingsPageProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam) { UNREFERENCED_PARAMETER(lParam); @@ -733,7 +732,7 @@ SettingPageProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam) { case WM_INITDIALOG: { - HIMAGELIST hImgList; + HIMAGELIST hImgList; MainDlgWnd = hwndDlg; AddListColumn(hwndDlg);