Skip to content

Commit 5f4bb73

Browse files
katahiromzkatahiromz
authored
[CPL][INPUT] Make the ListView a TreeView (reactos#4726)
- Make the list a TreeView. - Modify IDD_PROPPAGESETTINGS resource dialog for UI compatibility.
1 parent f0e1315 commit 5f4bb73

31 files changed

+815
-387
lines changed

‎dll/cpl/input/input.rc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
1313
#include <reactos/version.rc>
1414

1515
IDI_CPLSYSTEM ICON "resources/keyboard-shortcuts.ico"
16+
IDI_KEYBOARD ICON "resources/keyboard.ico"
17+
IDI_DOT ICON "resources/dot.ico"
1618

1719
#include <reactos/manifest_hosted.rc>
1820

‎dll/cpl/input/input_list.c

Lines changed: 113 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
*/
88

99
#include "input_list.h"
10+
#define NOTHING
1011

1112
typedef struct
1213
{
@@ -154,7 +155,7 @@ InputList_AppendNode(VOID)
154155
/* Find last node */
155156
for (pCurrent = _InputList; pCurrent->pNext; pCurrent = pCurrent->pNext)
156157
{
157-
;
158+
NOTHING;
158159
}
159160

160161
/* Add to the end */
@@ -568,13 +569,14 @@ InputList_FindNextDefault(INPUT_LIST_NODE *pNode)
568569
* It marks the input method for deletion, but does not delete it directly.
569570
* To apply the changes using InputList_Process()
570571
*/
571-
VOID
572+
BOOL
572573
InputList_Remove(INPUT_LIST_NODE *pNode)
573574
{
575+
BOOL ret = FALSE;
574576
BOOL bRemoveNode = FALSE;
575577

576578
if (pNode == NULL)
577-
return;
579+
return FALSE;
578580

579581
if (pNode->wFlags & INPUT_LIST_NODE_FLAG_ADDED)
580582
{
@@ -596,14 +598,39 @@ InputList_Remove(INPUT_LIST_NODE *pNode)
596598
pCurrent->wFlags |= INPUT_LIST_NODE_FLAG_DEFAULT;
597599

598600
pNode->wFlags &= ~INPUT_LIST_NODE_FLAG_DEFAULT;
601+
ret = TRUE; /* default input is changed */
599602
}
600603

601604
if (bRemoveNode)
602605
{
603606
InputList_RemoveNode(pNode);
604607
}
608+
609+
return ret;
605610
}
606611

612+
BOOL
613+
InputList_RemoveByLang(LANGID wLangId)
614+
{
615+
BOOL ret = FALSE;
616+
INPUT_LIST_NODE *pCurrent;
617+
618+
Retry:
619+
for (pCurrent = _InputList; pCurrent; pCurrent = pCurrent->pNext)
620+
{
621+
if (pCurrent->wFlags & INPUT_LIST_NODE_FLAG_DELETED)
622+
continue;
623+
624+
if (LOWORD(pCurrent->pLocale->dwId) == wLangId)
625+
{
626+
if (InputList_Remove(pCurrent))
627+
ret = TRUE; /* default input is changed */
628+
goto Retry;
629+
}
630+
}
631+
632+
return ret;
633+
}
607634

608635
VOID
609636
InputList_Create(VOID)
@@ -662,6 +689,89 @@ InputList_Create(VOID)
662689
free(pLayoutList);
663690
}
664691

692+
static INT InputList_Compare(INPUT_LIST_NODE *pNode1, INPUT_LIST_NODE *pNode2)
693+
{
694+
INT nCompare = _wcsicmp(pNode1->pszIndicator, pNode2->pszIndicator);
695+
if (nCompare != 0)
696+
return nCompare;
697+
698+
return _wcsicmp(pNode1->pLayout->pszName, pNode2->pLayout->pszName);
699+
}
700+
701+
VOID InputList_Sort(VOID)
702+
{
703+
INPUT_LIST_NODE *pList = _InputList;
704+
INPUT_LIST_NODE *pNext, *pPrev;
705+
INPUT_LIST_NODE *pMinimum, *pNode;
706+
707+
_InputList = NULL;
708+
709+
while (pList)
710+
{
711+
/* Find the minimum node */
712+
pMinimum = NULL;
713+
for (pNode = pList; pNode; pNode = pNext)
714+
{
715+
pNext = pNode->pNext;
716+
717+
if (pMinimum == NULL)
718+
{
719+
pMinimum = pNode;
720+
}
721+
else if (InputList_Compare(pNode, pMinimum) < 0)
722+
{
723+
pMinimum = pNode;
724+
}
725+
}
726+
727+
// Remove pMinimum from pList
728+
pNext = pMinimum->pNext;
729+
pPrev = pMinimum->pPrev;
730+
if (pNext)
731+
pNext->pPrev = pPrev;
732+
if (pPrev)
733+
pPrev->pNext = pNext;
734+
else
735+
pList = pNext;
736+
737+
// Append pMinimum to _InputList
738+
if (!_InputList)
739+
{
740+
pMinimum->pPrev = pMinimum->pNext = NULL;
741+
_InputList = pMinimum;
742+
}
743+
else
744+
{
745+
/* Find last node */
746+
for (pNode = _InputList; pNode->pNext; pNode = pNode->pNext)
747+
{
748+
NOTHING;
749+
}
750+
751+
/* Add to the end */
752+
pNode->pNext = pMinimum;
753+
pMinimum->pPrev = pNode;
754+
pMinimum->pNext = NULL;
755+
}
756+
}
757+
}
758+
759+
INT
760+
InputList_GetAliveCount(VOID)
761+
{
762+
INPUT_LIST_NODE *pNode;
763+
INT nCount = 0;
764+
765+
for (pNode = _InputList; pNode; pNode = pNode->pNext)
766+
{
767+
if (pNode->wFlags & INPUT_LIST_NODE_FLAG_DELETED)
768+
continue;
769+
770+
++nCount;
771+
}
772+
773+
return nCount;
774+
}
665775

666776
INPUT_LIST_NODE*
667777
InputList_GetFirst(VOID)

‎dll/cpl/input/input_list.h

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,18 @@ InputList_Add(LOCALE_LIST_NODE *pLocale, LAYOUT_LIST_NODE *pLayout);
5757
VOID
5858
InputList_SetDefault(INPUT_LIST_NODE *pNode);
5959

60-
VOID
60+
INT
61+
InputList_GetAliveCount(VOID);
62+
63+
BOOL
6164
InputList_Remove(INPUT_LIST_NODE *pNode);
6265

66+
BOOL
67+
InputList_RemoveByLang(LANGID wLangId);
68+
69+
VOID
70+
InputList_Sort(VOID);
71+
6372
VOID
6473
InputList_Destroy(VOID);
6574

‎dll/cpl/input/lang/bg-BG.rc

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,18 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
55
CAPTION "Настройки"
66
FONT 8, "MS Shell Dlg"
77
BEGIN
8-
LTEXT "Посочете избраните от вас услуги за всеки посочен в списъка език.\nПромяната на списъка става с „Премахване“ и „Добавяне“.", -1, 9, 6, 238, 25
9-
CONTROL "TEXT", IDC_KEYLAYOUT_LIST, "SYSLISTVIEW32", WS_BORDER | WS_VSCROLL | WS_TABSTOP | LVS_SINGLESEL | LVS_NOSORTHEADER | LVS_SHOWSELALWAYS | LVS_REPORT, 8, 36, 237, 101
10-
PUSHBUTTON "&Прилагане на подразбираните", IDC_SET_DEFAULT, 101, 159, 144, 14
11-
PUSHBUTTON "&Добавяне...", IDC_ADD_BUTTON, 27, 142, 70, 14
12-
PUSHBUTTON "Пре&махване", IDC_REMOVE_BUTTON, 101, 142, 70, 14
13-
PUSHBUTTON "&Свойства...", IDC_PROP_BUTTON, 175, 142, 70, 14
14-
GROUPBOX "Предпочитания", -1, 7, 185, 240, 36
15-
PUSHBUTTON "Настройка на &клавишите...", IDC_KEY_SET_BTN, 14, 198, 110, 14
8+
GROUPBOX "Default input &language", -1, 5, 5, 246, 55
9+
LTEXT "Select one of the installed input languages to use when your computer starts.", -1, 15, 15, 230, 23
10+
COMBOBOX IDC_DEFAULT_LANGUAGE, 15, 40, 230, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
11+
GROUPBOX "&Installed services", -1, 5, 65, 246, 125
12+
LTEXT "Посочете избраните от вас услуги за всеки посочен в списъка език. Промяната на списъка става с „Премахване“ и „Добавяне“.", -1, 15, 78, 230, 25
13+
CONTROL "", IDC_KEYLAYOUT_LIST, "SysTreeView32", TVS_SHOWSELALWAYS | TVS_DISABLEDRAGDROP | WS_BORDER | WS_VSCROLL | WS_TABSTOP, 15, 105, 155, 80
14+
PUSHBUTTON "&Добавяне...", IDC_ADD_BUTTON, 175, 105, 70, 14
15+
PUSHBUTTON "Пре&махване", IDC_REMOVE_BUTTON, 175, 125, 70, 14
16+
PUSHBUTTON "&Свойства...", IDC_PROP_BUTTON, 175, 145, 70, 14
17+
GROUPBOX "Предпочитания", -1, 5, 195, 245, 30
18+
PUSHBUTTON "Language &Bar...", IDC_LANGUAGE_BAR, 15, 205, 110, 14
19+
PUSHBUTTON "Настройка на &клавишите...", IDC_KEY_SET_BTN, 133, 205, 110, 14
1620
END
1721

1822
IDD_PROPPAGEADVANCEDSETTINGS DIALOGEX 0, 0, 254, 228

‎dll/cpl/input/lang/cs-CZ.rc

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,18 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
1010
CAPTION "Nastavení"
1111
FONT 8, "MS Shell Dlg"
1212
BEGIN
13-
LTEXT "Zvolte služby pro každý vstupní jazyk v seznamu.\nSeznam lze měnit pomocí tlačítek Přidat a Odebrat.", -1, 9, 6, 238, 25
14-
CONTROL "TEXT", IDC_KEYLAYOUT_LIST, "SYSLISTVIEW32", WS_BORDER | WS_VSCROLL | WS_TABSTOP | LVS_SINGLESEL | LVS_NOSORTHEADER | LVS_SHOWSELALWAYS | LVS_REPORT, 8, 36, 237, 101
15-
PUSHBUTTON "Nas&tavit výchozí", IDC_SET_DEFAULT, 101, 159, 144, 14
16-
PUSHBUTTON "&Přidat...", IDC_ADD_BUTTON, 27, 142, 70, 14
17-
PUSHBUTTON "&Odebrat", IDC_REMOVE_BUTTON, 101, 142, 70, 14
18-
PUSHBUTTON "&Vlastnosti...", IDC_PROP_BUTTON, 175, 142, 70, 14
19-
GROUPBOX "Předvolby", -1, 7, 185, 240, 36
20-
PUSHBUTTON "&Nastavení kláves...", IDC_KEY_SET_BTN, 14, 198, 110, 14
13+
GROUPBOX "Default input &language", -1, 5, 5, 246, 55
14+
LTEXT "Select one of the installed input languages to use when your computer starts.", -1, 15, 15, 230, 23
15+
COMBOBOX IDC_DEFAULT_LANGUAGE, 15, 40, 230, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
16+
GROUPBOX "&Installed services", -1, 5, 65, 246, 125
17+
LTEXT "Zvolte služby pro každý vstupní jazyk v seznamu. Seznam lze měnit pomocí tlačítek Přidat a Odebrat.", -1, 15, 78, 230, 25
18+
CONTROL "", IDC_KEYLAYOUT_LIST, "SysTreeView32", TVS_SHOWSELALWAYS | TVS_DISABLEDRAGDROP | WS_BORDER | WS_VSCROLL | WS_TABSTOP, 15, 105, 155, 80
19+
PUSHBUTTON "&Přidat...", IDC_ADD_BUTTON, 175, 105, 70, 14
20+
PUSHBUTTON "&Odebrat", IDC_REMOVE_BUTTON, 175, 125, 70, 14
21+
PUSHBUTTON "&Vlastnosti...", IDC_PROP_BUTTON, 175, 145, 70, 14
22+
GROUPBOX "Předvolby", -1, 5, 195, 245, 30
23+
PUSHBUTTON "Language &Bar...", IDC_LANGUAGE_BAR, 15, 205, 110, 14
24+
PUSHBUTTON "&Nastavení kláves...", IDC_KEY_SET_BTN, 133, 205, 110, 14
2125
END
2226

2327
IDD_PROPPAGEADVANCEDSETTINGS DIALOGEX 0, 0, 254, 228

‎dll/cpl/input/lang/de-DE.rc

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,18 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
55
CAPTION "Einstellungen"
66
FONT 8, "MS Shell Dlg"
77
BEGIN
8-
LTEXT "Wählen Sie die Dienste aus, die Sie für die Eingabesprachen in der Liste verwenden wollen.\nVerwenden Sie ""Hinzufügen"" und ""Entfernen"", um die Liste zu bearbeiten.", -1, 9, 6, 238, 25
9-
CONTROL "TEXT", IDC_KEYLAYOUT_LIST, "SYSLISTVIEW32", WS_BORDER | WS_VSCROLL | WS_TABSTOP | LVS_SINGLESEL | LVS_NOSORTHEADER | LVS_SHOWSELALWAYS | LVS_REPORT, 8, 36, 237, 101
10-
PUSHBUTTON "&Als Standard", IDC_SET_DEFAULT, 101, 159, 144, 14
11-
PUSHBUTTON "&Hinzufügen...", IDC_ADD_BUTTON, 27, 142, 70, 14
12-
PUSHBUTTON "Ent&fernen", IDC_REMOVE_BUTTON, 101, 142, 70, 14
13-
PUSHBUTTON "&Eigenschaften...", IDC_PROP_BUTTON, 175, 142, 70, 14
14-
GROUPBOX "Einstellungen", -1, 7, 185, 240, 36
15-
PUSHBUTTON "&Tasteneinstellungen...", IDC_KEY_SET_BTN, 14, 198, 110, 14
8+
GROUPBOX "Default input &language", -1, 5, 5, 246, 55
9+
LTEXT "Select one of the installed input languages to use when your computer starts.", -1, 15, 15, 230, 23
10+
COMBOBOX IDC_DEFAULT_LANGUAGE, 15, 40, 230, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
11+
GROUPBOX "&Installed services", -1, 5, 65, 246, 125
12+
LTEXT "Wählen Sie die Dienste aus, die Sie für die Eingabesprachen in der Liste verwenden wollen. Verwenden Sie ""Hinzufügen"" und ""Entfernen"", um die Liste zu bearbeiten.", -1, 15, 78, 230, 25
13+
CONTROL "", IDC_KEYLAYOUT_LIST, "SysTreeView32", TVS_SHOWSELALWAYS | TVS_DISABLEDRAGDROP | WS_BORDER | WS_VSCROLL | WS_TABSTOP, 15, 105, 155, 80
14+
PUSHBUTTON "&Hinzufügen...", IDC_ADD_BUTTON, 175, 105, 70, 14
15+
PUSHBUTTON "Ent&fernen", IDC_REMOVE_BUTTON, 175, 125, 70, 14
16+
PUSHBUTTON "&Eigenschaften...", IDC_PROP_BUTTON, 175, 145, 70, 14
17+
GROUPBOX "Einstellungen", -1, 5, 195, 245, 30
18+
PUSHBUTTON "Language &Bar...", IDC_LANGUAGE_BAR, 15, 205, 110, 14
19+
PUSHBUTTON "&Tasteneinstellungen...", IDC_KEY_SET_BTN, 133, 205, 110, 14
1620
END
1721

1822
IDD_PROPPAGEADVANCEDSETTINGS DIALOGEX 0, 0, 254, 228

‎dll/cpl/input/lang/el-GR.rc

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,18 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
55
CAPTION "Ρυθμίσεις"
66
FONT 8, "MS Shell Dlg"
77
BEGIN
8-
LTEXT "Επιλέξτε τις υπηρεσίες που θέλετε για κάθε γλώσσα εισαγωγής που εμφανίζεται στη λίστα.\nΧρησιμοποιήστε τα κουμπιά Προσθήκη και Κατάργηση για την τροποποίηση αυτής της λίστας.", -1, 9, 6, 238, 33
9-
CONTROL "TEXT", IDC_KEYLAYOUT_LIST, "SYSLISTVIEW32", WS_BORDER | WS_VSCROLL | WS_TABSTOP | LVS_SINGLESEL | LVS_NOSORTHEADER | LVS_SHOWSELALWAYS | LVS_REPORT, 8, 42, 237, 95
10-
PUSHBUTTON "&Set Default", IDC_SET_DEFAULT, 101, 159, 144, 14
11-
PUSHBUTTON "Π&ροσθήκη...", IDC_ADD_BUTTON, 27, 142, 70, 14
12-
PUSHBUTTON "&Κατάργηση", IDC_REMOVE_BUTTON, 101, 142, 70, 14
13-
PUSHBUTTON "&Ιδιότητες...", IDC_PROP_BUTTON, 175, 142, 70, 14
14-
GROUPBOX "Προτιμήσεις", -1, 7, 185, 240, 36
15-
PUSHBUTTON "&Ρυθμίσεις πλήκτρων...", IDC_KEY_SET_BTN, 14, 198, 110, 14
8+
GROUPBOX "Default input &language", -1, 5, 5, 246, 55
9+
LTEXT "Select one of the installed input languages to use when your computer starts.", -1, 15, 15, 230, 23
10+
COMBOBOX IDC_DEFAULT_LANGUAGE, 15, 40, 230, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
11+
GROUPBOX "&Installed services", -1, 5, 65, 246, 125
12+
LTEXT "Επιλέξτε τις υπηρεσίες που θέλετε για κάθε γλώσσα εισαγωγής που εμφανίζεται στη λίστα. Χρησιμοποιήστε τα κουμπιά Προσθήκη και Κατάργηση για την τροποποίηση αυτής της λίστας.", -1, 15, 78, 230, 25
13+
CONTROL "", IDC_KEYLAYOUT_LIST, "SysTreeView32", TVS_SHOWSELALWAYS | TVS_DISABLEDRAGDROP | WS_BORDER | WS_VSCROLL | WS_TABSTOP, 15, 105, 155, 80
14+
PUSHBUTTON "Π&ροσθήκη...", IDC_ADD_BUTTON, 175, 105, 70, 14
15+
PUSHBUTTON "&Κατάργηση", IDC_REMOVE_BUTTON, 175, 125, 70, 14
16+
PUSHBUTTON "&Ιδιότητες...", IDC_PROP_BUTTON, 175, 145, 70, 14
17+
GROUPBOX "Προτιμήσεις", -1, 5, 195, 245, 30
18+
PUSHBUTTON "Language &Bar...", IDC_LANGUAGE_BAR, 15, 205, 110, 14
19+
PUSHBUTTON "&Ρυθμίσεις πλήκτρων...", IDC_KEY_SET_BTN, 133, 205, 110, 14
1620
END
1721

1822
IDD_PROPPAGEADVANCEDSETTINGS DIALOGEX 0, 0, 254, 228

‎dll/cpl/input/lang/en-US.rc

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,18 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
55
CAPTION "Settings"
66
FONT 8, "MS Shell Dlg"
77
BEGIN
8-
LTEXT "Select the services that you want for each input language shown in the list.\nUse the Add and Remove buttons to modify this list.", -1, 9, 6, 238, 25
9-
CONTROL "TEXT", IDC_KEYLAYOUT_LIST, "SYSLISTVIEW32", WS_BORDER | WS_VSCROLL | WS_TABSTOP | LVS_SINGLESEL | LVS_NOSORTHEADER | LVS_SHOWSELALWAYS | LVS_REPORT, 8, 36, 237, 101
10-
PUSHBUTTON "&Set Default", IDC_SET_DEFAULT, 101, 159, 144, 14
11-
PUSHBUTTON "A&dd...", IDC_ADD_BUTTON, 27, 142, 70, 14
12-
PUSHBUTTON "&Remove", IDC_REMOVE_BUTTON, 101, 142, 70, 14
13-
PUSHBUTTON "&Properties...", IDC_PROP_BUTTON, 175, 142, 70, 14
14-
GROUPBOX "Preferences", -1, 7, 185, 240, 36
15-
PUSHBUTTON "&Key Settings...", IDC_KEY_SET_BTN, 14, 198, 110, 14
8+
GROUPBOX "Default input &language", -1, 5, 5, 246, 55
9+
LTEXT "Select one of the installed input languages to use when your computer starts.", -1, 15, 15, 230, 23
10+
COMBOBOX IDC_DEFAULT_LANGUAGE, 15, 40, 230, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
11+
GROUPBOX "&Installed services", -1, 5, 65, 246, 125
12+
LTEXT "Select the services that you want for each input language shown in the list. Use the Add and Remove buttons to modify this list.", -1, 15, 78, 230, 25
13+
CONTROL "", IDC_KEYLAYOUT_LIST, "SysTreeView32", TVS_SHOWSELALWAYS | TVS_DISABLEDRAGDROP | WS_BORDER | WS_VSCROLL | WS_TABSTOP, 15, 105, 155, 80
14+
PUSHBUTTON "A&dd...", IDC_ADD_BUTTON, 175, 105, 70, 14
15+
PUSHBUTTON "&Remove", IDC_REMOVE_BUTTON, 175, 125, 70, 14
16+
PUSHBUTTON "&Properties...", IDC_PROP_BUTTON, 175, 145, 70, 14
17+
GROUPBOX "Preferences", -1, 5, 195, 245, 30
18+
PUSHBUTTON "Language &Bar...", IDC_LANGUAGE_BAR, 15, 205, 110, 14
19+
PUSHBUTTON "&Key Settings...", IDC_KEY_SET_BTN, 133, 205, 110, 14
1620
END
1721

1822
IDD_PROPPAGEADVANCEDSETTINGS DIALOGEX 0, 0, 254, 228

‎dll/cpl/input/lang/es-ES.rc

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,18 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
1414
CAPTION "Configuración"
1515
FONT 8, "MS Shell Dlg"
1616
BEGIN
17-
LTEXT "Seleccione los servicios que desea para cada idioma mostrado en la lista. Use los botones de Agregar y Quitar para modificar esta lista.", -1, 9, 6, 238, 17
18-
CONTROL "TEXT", IDC_KEYLAYOUT_LIST, "SYSLISTVIEW32", WS_BORDER | WS_VSCROLL | WS_TABSTOP | LVS_SINGLESEL | LVS_NOSORTHEADER | LVS_SHOWSELALWAYS | LVS_REPORT, 8, 28, 237, 109
19-
PUSHBUTTON "Pr&edeterminado", IDC_SET_DEFAULT, 101, 159, 144, 14
20-
PUSHBUTTON "Ag&regar...", IDC_ADD_BUTTON, 27, 142, 70, 14
21-
PUSHBUTTON "&Quitar", IDC_REMOVE_BUTTON, 101, 142, 70, 14
22-
PUSHBUTTON "&Propiedades...", IDC_PROP_BUTTON, 175, 142, 70, 14
23-
GROUPBOX "Pre&ferencias ", -1, 7, 185, 240, 36
24-
PUSHBUTTON "C&onfiguración de teclas...", IDC_KEY_SET_BTN, 14, 198, 110, 14
17+
GROUPBOX "Default input &language", -1, 5, 5, 246, 55
18+
LTEXT "Select one of the installed input languages to use when your computer starts.", -1, 15, 15, 230, 23
19+
COMBOBOX IDC_DEFAULT_LANGUAGE, 15, 40, 230, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
20+
GROUPBOX "&Installed services", -1, 5, 65, 246, 125
21+
LTEXT "Seleccione los servicios que desea para cada idioma mostrado en la lista. Use los botones de Agregar y Quitar para modificar esta lista.", -1, 15, 78, 230, 25
22+
CONTROL "", IDC_KEYLAYOUT_LIST, "SysTreeView32", TVS_SHOWSELALWAYS | TVS_DISABLEDRAGDROP | WS_BORDER | WS_VSCROLL | WS_TABSTOP, 15, 105, 155, 80
23+
PUSHBUTTON "Ag&regar...", IDC_ADD_BUTTON, 175, 105, 70, 14
24+
PUSHBUTTON "&Quitar", IDC_REMOVE_BUTTON, 175, 125, 70, 14
25+
PUSHBUTTON "&Propiedades...", IDC_PROP_BUTTON, 175, 145, 70, 14
26+
GROUPBOX "Pre&ferencias", -1, 5, 195, 245, 30
27+
PUSHBUTTON "Language &Bar...", IDC_LANGUAGE_BAR, 15, 205, 110, 14
28+
PUSHBUTTON "C&onfiguración de teclas...", IDC_KEY_SET_BTN, 133, 205, 110, 14
2529
END
2630

2731
IDD_PROPPAGEADVANCEDSETTINGS DIALOGEX 0, 0, 254, 228

‎dll/cpl/input/lang/fr-FR.rc

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,18 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
55
CAPTION "Paramètres"
66
FONT 8, "MS Shell Dlg"
77
BEGIN
8-
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
9-
CONTROL "TEXT", IDC_KEYLAYOUT_LIST, "SYSLISTVIEW32", WS_BORDER | WS_VSCROLL | WS_TABSTOP | LVS_SINGLESEL | LVS_NOSORTHEADER | LVS_SHOWSELALWAYS | LVS_REPORT, 8, 36, 237, 101
10-
PUSHBUTTON "Par &défaut", IDC_SET_DEFAULT, 101, 159, 144, 14
11-
PUSHBUTTON "A&jouter...", IDC_ADD_BUTTON, 27, 142, 70, 14
12-
PUSHBUTTON "Supp&rimer", IDC_REMOVE_BUTTON, 101, 142, 70, 14
13-
PUSHBUTTON "&Propriétés...", IDC_PROP_BUTTON, 175, 142, 70, 14
14-
GROUPBOX "Pré&férences", -1, 7, 185, 240, 36
15-
PUSHBUTTON "Para&mètres des touches...", IDC_KEY_SET_BTN, 14, 198, 110, 14
8+
GROUPBOX "Default input &language", -1, 5, 5, 246, 55
9+
LTEXT "Select one of the installed input languages to use when your computer starts.", -1, 15, 15, 230, 23
10+
COMBOBOX IDC_DEFAULT_LANGUAGE, 15, 40, 230, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
11+
GROUPBOX "&Installed services", -1, 5, 65, 246, 125
12+
LTEXT "Sélectionnez les services que vous désirez pour chaque langue de saisie affichée dans la liste. Utilisez les boutons Ajouter et Supprimer pour modifier la liste.", -1, 15, 78, 230, 25
13+
CONTROL "", IDC_KEYLAYOUT_LIST, "SysTreeView32", TVS_SHOWSELALWAYS | TVS_DISABLEDRAGDROP | WS_BORDER | WS_VSCROLL | WS_TABSTOP, 15, 105, 155, 80
14+
PUSHBUTTON "A&jouter...", IDC_ADD_BUTTON, 175, 105, 70, 14
15+
PUSHBUTTON "Supp&rimer", IDC_REMOVE_BUTTON, 175, 125, 70, 14
16+
PUSHBUTTON "&Propriétés...", IDC_PROP_BUTTON, 175, 145, 70, 14
17+
GROUPBOX "Pré&férences", -1, 5, 195, 245, 30
18+
PUSHBUTTON "Language &Bar...", IDC_LANGUAGE_BAR, 15, 205, 110, 14
19+
PUSHBUTTON "Para&mètres des touches...", IDC_KEY_SET_BTN, 133, 205, 110, 14
1620
END
1721

1822
IDD_PROPPAGEADVANCEDSETTINGS DIALOGEX 0, 0, 254, 228

0 commit comments

Comments
 (0)