[ros-diffs] [ekohl] 30522: Sort the default input languages alphabetically.

Author: ekohl
Date: Sat Nov 17 19:16:22 2007
New Revision: 30522

URL: http://svn.reactos.org/svn/reactos?rev=30522&view=rev
Log:
Sort the default input languages alphabetically.

Modified:
    trunk/reactos/dll/cpl/input/lang/de-DE.rc
    trunk/reactos/dll/cpl/input/lang/en-US.rc
    trunk/reactos/dll/cpl/input/lang/fr-FR.rc
    trunk/reactos/dll/cpl/input/lang/uk-UA.rc
    trunk/reactos/dll/cpl/input/settings.c

Modified: trunk/reactos/dll/cpl/input/lang/de-DE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/de-DE.r…
==============================================================================
--- trunk/reactos/dll/cpl/input/lang/de-DE.rc (original)
+++ trunk/reactos/dll/cpl/input/lang/de-DE.rc Sat Nov 17 19:16:22 2007
@@ -7,7 +7,7 @@
 BEGIN
     GROUPBOX "&Standard Eingabesprache", -1, 7,7,231,53
     LTEXT "Wählen Sie eine der installieren Sprachen aus, die Sie beim Einschalten
des PCs nutzen wollen ",-1,14,18,220,17
-    COMBOBOX IDC_DEFAULT_INPUT_LANG, 14, 40, 218, 46, CBS_DROPDOWNLIST
+    COMBOBOX IDC_DEFAULT_INPUT_LANG, 14, 40, 218, 46, CBS_DROPDOWNLIST | CBS_SORT
     GROUPBOX "Installierte &Dienste", -1, 7,65,231,115
     LTEXT "Wählen Sie die Dienste, die Sie für jede Eingabesprache in der Liste
sehen wollen. Nutzen Sie die ""Hinzufügen"" und
""Entfernen"" Schaltflächen um diese Liste zu
bearbeiten.",-1,14,75,220,17
     CONTROL "TEXT", IDC_KEYLAYOUT_TREE, "SysTreeView32", WS_BORDER |
WS_VSCROLL | WS_TABSTOP | 0x00000034, 14, 96, 160, 78

Modified: trunk/reactos/dll/cpl/input/lang/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/en-US.r…
==============================================================================
--- trunk/reactos/dll/cpl/input/lang/en-US.rc (original)
+++ trunk/reactos/dll/cpl/input/lang/en-US.rc Sat Nov 17 19:16:22 2007
@@ -7,7 +7,7 @@
 BEGIN
     GROUPBOX "Default input language", -1, 7,7,231,53
     LTEXT "Select one of the installed input languages to use when you start your
computer.",-1,14,18,220,17
-    COMBOBOX IDC_DEFAULT_INPUT_LANG, 14, 40, 218, 46, CBS_DROPDOWNLIST
+    COMBOBOX IDC_DEFAULT_INPUT_LANG, 14, 40, 218, 46, CBS_DROPDOWNLIST | CBS_SORT
     GROUPBOX "&Installed services", -1, 7,65,231,115
     LTEXT "Select the services that you want for each input language shown in the
list. Use the Add and Remove buttons to modify this list.",-1,14,75,220,17
     CONTROL "TEXT", IDC_KEYLAYOUT_TREE, "SysTreeView32", WS_BORDER |
WS_VSCROLL | WS_TABSTOP | 0x00000034, 14, 96, 160, 78

Modified: trunk/reactos/dll/cpl/input/lang/fr-FR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/fr-FR.r…
==============================================================================
--- trunk/reactos/dll/cpl/input/lang/fr-FR.rc (original)
+++ trunk/reactos/dll/cpl/input/lang/fr-FR.rc Sat Nov 17 19:16:22 2007
@@ -7,7 +7,7 @@
 BEGIN
     GROUPBOX "Langue de saisie par défaut", -1, 7,7,231,53
     LTEXT "Sélectionnez une des langues de saisie installées pour l'utiliser
quand vous allumez votre ordinateur.",-1,14,18,220,17
-    COMBOBOX IDC_DEFAULT_INPUT_LANG, 14, 40, 218, 46, CBS_DROPDOWNLIST
+    COMBOBOX IDC_DEFAULT_INPUT_LANG, 14, 40, 218, 46, CBS_DROPDOWNLIST | CBS_SORT
     GROUPBOX "Services &installés", -1, 7,65,231,115
     LTEXT "Sélectionnez les services que vous voulez pour chaque langue de saisie
affichée dans la liste. Utilisez les boutons Ajouter et Supprimer pour modifier cette
liste.",-1,14,75,220,17
     CONTROL "TEXT", IDC_KEYLAYOUT_TREE, "SysTreeView32", WS_BORDER |
WS_VSCROLL | WS_TABSTOP | 0x00000034, 14, 96, 160, 78

Modified: trunk/reactos/dll/cpl/input/lang/uk-UA.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/uk-UA.r…
==============================================================================
--- trunk/reactos/dll/cpl/input/lang/uk-UA.rc (original)
+++ trunk/reactos/dll/cpl/input/lang/uk-UA.rc Sat Nov 17 19:16:22 2007
@@ -15,7 +15,7 @@
 BEGIN
     GROUPBOX "Ìîâà ââîäó çà çàìîâ÷óâàííÿì", -1, 7,7,231,53
     LTEXT "Âèáåð³òü îäíó ç óñòàíîâëåíèõ ìîâ ââîäó, ÿêà âèêîðèñòîâóâàòèìåòüñÿ ïðè
çàïóñêó êîìï'þòåðà.",-1,14,18,220,17
-    COMBOBOX IDC_DEFAULT_INPUT_LANG, 14, 40, 218, 46, CBS_DROPDOWNLIST
+    COMBOBOX IDC_DEFAULT_INPUT_LANG, 14, 40, 218, 46, CBS_DROPDOWNLIST | CBS_SORT
     GROUPBOX "Óñòàíîâëåí³ ñëóæáè", -1, 7,65,231,115
     LTEXT "Âèáåð³òü ïîòð³áí³ ñëóæáè äëÿ êîæíî¿ ìîâè ââîäó ç³ ñïèñêó. Çì³íèòè ñïèñîê
ìîæíà çà äîïîìîãîþ êíîïîê ""Äîäàòè"" òà
""Âèäàëèòè"".",-1,14,75,220,17
     CONTROL "Òåêñò", IDC_KEYLAYOUT_TREE, "SysTreeView32", WS_BORDER |
WS_VSCROLL | WS_TABSTOP | 0x00000034, 14, 96, 160, 78

Modified: trunk/reactos/dll/cpl/input/settings.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/settings.c?r…
==============================================================================
--- trunk/reactos/dll/cpl/input/settings.c (original)
+++ trunk/reactos/dll/cpl/input/settings.c Sat Nov 17 19:16:22 2007
@@ -56,7 +56,7 @@
     INT Count;
     LCID Lcid;
 
-    if(RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Keyboard Layout\\Preload"), 0,
KEY_QUERY_VALUE, &hKey) != ERROR_SUCCESS)
+    if (RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Keyboard Layout\\Preload"), 0,
KEY_QUERY_VALUE, &hKey) != ERROR_SUCCESS)
     {
         return FALSE;
     }
@@ -81,14 +81,14 @@
             GetLocaleInfo(Lcid, LOCALE_SLANGUAGE, (LPTSTR)Lang, sizeof(Lang));
 
             SendMessage(hWnd,
-                        CB_INSERTSTRING,
+                        CB_ADDSTRING,
                         0,
                         (LPARAM)Lang);
             if (Count == 0)
             {
                 SendMessage(hWnd,
                             CB_SELECTSTRING,
-                            (WPARAM) -1,
+                            (WPARAM)-1,
                             (LPARAM)Lang);
             }
         }