[hbelusca] 58032: [INPUT] Add a new property sheet which aim is to manage text services (and the language bar).
Author: hbelusca Date: Fri Dec 28 19:31:17 2012 New Revision: 58032
URL: http://svn.reactos.org/svn/reactos?rev=58032&view=rev Log: [INPUT] Add a new property sheet which aim is to manage text services (and the language bar).
Added: trunk/reactos/dll/cpl/input/advsettings.c (with props) Modified: trunk/reactos/dll/cpl/input/CMakeLists.txt trunk/reactos/dll/cpl/input/add.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/keysettings.c trunk/reactos/dll/cpl/input/lang/bg-BG.rc trunk/reactos/dll/cpl/input/lang/cs-CZ.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/no-NO.rc trunk/reactos/dll/cpl/input/lang/pl-PL.rc trunk/reactos/dll/cpl/input/lang/ro-RO.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/lang/zh-CN.rc trunk/reactos/dll/cpl/input/resource.h trunk/reactos/dll/cpl/input/settings.c
Modified: trunk/reactos/dll/cpl/input/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/CMakeLists.tx... ============================================================================== --- trunk/reactos/dll/cpl/input/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/CMakeLists.txt [iso-8859-1] Fri Dec 28 19:31:17 2012 @@ -4,6 +4,7 @@ add_library(input SHARED input.c settings.c + advsettings.c keysettings.c add.c changekeyseq.c
Modified: trunk/reactos/dll/cpl/input/add.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/add.c?rev=580... ============================================================================== --- trunk/reactos/dll/cpl/input/add.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/add.c [iso-8859-1] Fri Dec 28 19:31:17 2012 @@ -1,5 +1,4 @@ /* - * * PROJECT: input.dll * FILE: dll/win32/input/add.c * PURPOSE: input.dll
Added: trunk/reactos/dll/cpl/input/advsettings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/advsettings.c... ============================================================================== --- trunk/reactos/dll/cpl/input/advsettings.c (added) +++ trunk/reactos/dll/cpl/input/advsettings.c [iso-8859-1] Fri Dec 28 19:31:17 2012 @@ -1,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 */
Propchange: trunk/reactos/dll/cpl/input/advsettings.c ------------------------------------------------------------------------------ svn:eol-style = native
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] Fri Dec 28 19:31:17 2012 @@ -1,5 +1,4 @@ /* - * * PROJECT: input.dll * FILE: dll/win32/input/changekeyseq.c * PURPOSE: input.dll
Modified: trunk/reactos/dll/cpl/input/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.c?rev=5... ============================================================================== --- trunk/reactos/dll/cpl/input/input.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/input.c [iso-8859-1] Fri Dec 28 19:31:17 2012 @@ -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 @@ LONG CALLBACK SystemApplet(VOID) { - PROPSHEETPAGE psp[1]; + PROPSHEETPAGE psp[2]; PROPSHEETHEADER psh; TCHAR Caption[1024];
@@ -60,7 +59,11 @@ 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); }
Modified: trunk/reactos/dll/cpl/input/input.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.h?rev=5... ============================================================================== --- trunk/reactos/dll/cpl/input/input.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/input.h [iso-8859-1] Fri Dec 28 19:31:17 2012 @@ -35,13 +35,17 @@
/* 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 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
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] Fri Dec 28 19:31:17 2012 @@ -1,5 +1,4 @@ /* - * * PROJECT: input.dll * FILE: dll/win32/input/keysettings.c * PURPOSE: input.dll
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] Fri Dec 28 19:31:17 2012 @@ -17,6 +17,16 @@ PUSHBUTTON "&СвойÑÑва...", IDC_PROP_BUTTON, 175, 142, 70, 14 GROUPBOX "ÐÑедпоÑиÑаниÑ", -1, 7, 185, 240, 36 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
Modified: trunk/reactos/dll/cpl/input/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/cs-CZ.rc... ============================================================================== --- trunk/reactos/dll/cpl/input/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/cs-CZ.rc [iso-8859-1] Fri Dec 28 19:31:17 2012 @@ -18,6 +18,16 @@ PUSHBUTTON "&Vlastnosti...", IDC_PROP_BUTTON, 175, 142, 70, 14 GROUPBOX "PÅedvolby", -1, 7, 185, 240, 36 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
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] Fri Dec 28 19:31:17 2012 @@ -13,6 +13,16 @@ PUSHBUTTON "&Eigenschaften...", IDC_PROP_BUTTON, 175, 142, 70, 14 GROUPBOX "Einstellungen", -1, 7, 185, 240, 36 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
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] Fri Dec 28 19:31:17 2012 @@ -13,6 +13,16 @@ PUSHBUTTON "&ÎδιÏÏηÏεÏ...", IDC_PROP_BUTTON, 175, 142, 70, 14 GROUPBOX "Î ÏοÏιμήÏειÏ", -1, 7, 185, 240, 36 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
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] Fri Dec 28 19:31:17 2012 @@ -13,6 +13,16 @@ PUSHBUTTON "&Properties...", IDC_PROP_BUTTON, 175, 142, 70, 14 GROUPBOX "Preferences", -1, 7, 185, 240, 36 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
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] Fri Dec 28 19:31:17 2012 @@ -18,6 +18,16 @@ PUSHBUTTON "&Propiedades...", IDC_PROP_BUTTON, 175, 142, 70, 14 GROUPBOX "Preferencias ", -1, 7, 185, 240, 36 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
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] Fri Dec 28 19:31:17 2012 @@ -5,14 +5,24 @@ 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
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] Fri Dec 28 19:31:17 2012 @@ -13,6 +13,16 @@ PUSHBUTTON "&Proprietà ...", IDC_PROP_BUTTON, 175, 142, 70, 14 GROUPBOX "Preferenze", -1, 7, 185, 240, 36 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
Modified: trunk/reactos/dll/cpl/input/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/no-NO.rc... ============================================================================== --- trunk/reactos/dll/cpl/input/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/no-NO.rc [iso-8859-1] Fri Dec 28 19:31:17 2012 @@ -13,6 +13,16 @@ PUSHBUTTON "&Egenskaper...", IDC_PROP_BUTTON, 175, 142, 70, 14 GROUPBOX "Innstillinger", -1, 7, 185, 240, 36 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
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] Fri Dec 28 19:31:17 2012 @@ -21,6 +21,16 @@ PUSHBUTTON "&WÅaÅciwoÅci...", IDC_PROP_BUTTON, 175, 142, 70, 14 GROUPBOX "Preferencje", -1, 7, 185, 240, 36 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
Modified: trunk/reactos/dll/cpl/input/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/ro-RO.rc... ============================================================================== --- trunk/reactos/dll/cpl/input/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/ro-RO.rc [iso-8859-1] Fri Dec 28 19:31:17 2012 @@ -14,6 +14,16 @@ PUSHBUTTON "&ProprietÄÈiâ¦", IDC_PROP_BUTTON, 175, 142, 70, 14 GROUPBOX "PreferinÈe", -1, 7, 185, 240, 36 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
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] Fri Dec 28 19:31:17 2012 @@ -13,6 +13,16 @@ PUSHBUTTON "&СвойÑÑва...", IDC_PROP_BUTTON, 175, 142, 70, 14 GROUPBOX "ÐаÑамеÑÑÑ", -1, 7, 185, 240, 36 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
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] Fri Dec 28 19:31:17 2012 @@ -18,6 +18,16 @@ PUSHBUTTON "Vl&astnosti...", IDC_PROP_BUTTON, 175, 142, 70, 14 GROUPBOX "Preferencie", -1, 7, 185, 240, 36 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
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] Fri Dec 28 19:31:17 2012 @@ -21,6 +21,16 @@ PUSHBUTTON "Ð&лаÑÑивоÑÑÑ...", IDC_PROP_BUTTON, 175, 142, 70, 14 GROUPBOX "ÐалаÑÑÑваннÑ", -1, 7, 185, 240, 36 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
Modified: trunk/reactos/dll/cpl/input/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/zh-CN.rc... ============================================================================== --- trunk/reactos/dll/cpl/input/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/zh-CN.rc [iso-8859-1] Fri Dec 28 19:31:17 2012 @@ -20,6 +20,16 @@ PUSHBUTTON "å±æ§(&P)...", IDC_PROP_BUTTON, 175, 142, 70, 14 GROUPBOX "é¦é项", -1, 7, 185, 240, 36 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
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] Fri Dec 28 19:31:17 2012 @@ -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
Modified: trunk/reactos/dll/cpl/input/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/settings.c?re... ============================================================================== --- trunk/reactos/dll/cpl/input/settings.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/settings.c [iso-8859-1] Fri Dec 28 19:31:17 2012 @@ -1,5 +1,4 @@ /* - * * PROJECT: input.dll * FILE: dll/win32/input/settings.c * PURPOSE: input.dll @@ -725,7 +724,7 @@
/* 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 @@ { case WM_INITDIALOG: { - HIMAGELIST hImgList; + HIMAGELIST hImgList;
MainDlgWnd = hwndDlg; AddListColumn(hwndDlg);
-
hbelusca＠svn.reactos.org