[ros-diffs] [ekohl] 26580: - Remove "Properties for" from title. - Fix page order. - Disable first year edittext control on the "Date" page. - Add missing (english) dialogs to the polish resource file. - Fix coding style.

29 Apr 2007

Author: ekohl
Date: Sun Apr 29 17:45:10 2007
New Revision: 26580

URL: http://svn.reactos.org/svn/reactos?rev=26580&view=rev
Log:
- Remove "Properties for" from title.
- Fix page order.
- Disable first year edittext control on the "Date" page.
- Add missing (english) dialogs to the polish resource file.
- Fix coding style.

Modified:
    trunk/reactos/dll/cpl/intl_new/intl.c
    trunk/reactos/dll/cpl/intl_new/lang/en-US.rc
    trunk/reactos/dll/cpl/intl_new/lang/fr-FR.rc
    trunk/reactos/dll/cpl/intl_new/lang/id-ID.rc
    trunk/reactos/dll/cpl/intl_new/lang/it-IT.rc
    trunk/reactos/dll/cpl/intl_new/lang/pl-PL.rc
    trunk/reactos/dll/cpl/intl_new/locale.c

Modified: trunk/reactos/dll/cpl/intl_new/intl.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl_new/intl.c?re…
==============================================================================

--- trunk/reactos/dll/cpl/intl_new/intl.c (original)
+++ trunk/reactos/dll/cpl/intl_new/intl.c Sun Apr 29 17:45:10 2007
@@ -49,7 +49,6 @@
 APIENTRY
 Applet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam)
 {
-
     PROPSHEETPAGE PsPage[NUM_SHEETS];
     PROPSHEETHEADER psh;
     TCHAR Caption[MAX_STR_SIZE];
@@ -63,7 +62,7 @@
 
     ZeroMemory(&psh, sizeof(PROPSHEETHEADER));
     psh.dwSize = sizeof(PROPSHEETHEADER);
-    psh.dwFlags =  PSH_PROPSHEETPAGE | PSH_USECALLBACK | PSH_PROPTITLE;
+    psh.dwFlags =  PSH_PROPSHEETPAGE;
     psh.hwndParent = NULL;
     psh.hInstance = hApplet;
     psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDC_CPLICON));
@@ -73,8 +72,8 @@
     psh.ppsp = PsPage;
 
     InitPropSheetPage(&PsPage[0], IDD_REGOPTSPAGE, RegOptsProc);
-    InitPropSheetPage(&PsPage[1], IDD_EXTRAOPTSPAGE, ExtraOptsProc);
-    InitPropSheetPage(&PsPage[2], IDD_LANGSOPTSPAGE, LangsOptsProc);
+    InitPropSheetPage(&PsPage[1], IDD_LANGSOPTSPAGE, LangsOptsProc);
+    InitPropSheetPage(&PsPage[2], IDD_EXTRAOPTSPAGE, ExtraOptsProc);
 
     return (LONG)(PropertySheet(&psh) != -1);
 }

Modified: trunk/reactos/dll/cpl/intl_new/lang/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl_new/lang/en-U…
==============================================================================
--- trunk/reactos/dll/cpl/intl_new/lang/en-US.rc (original)
+++ trunk/reactos/dll/cpl/intl_new/lang/en-US.rc Sun Apr 29 17:45:10 2007
@@ -136,7 +136,7 @@
     LTEXT "Time afternoon notation (PM):", -1, 10, 104, 147, 10
     COMBOBOX IDC_TIMEPM_COMBO, 161, 102, 84, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL |
WS_VSCROLL | WS_TABSTOP | WS_VISIBLE 
     GROUPBOX "", IDC_GROUPBOX, 7, 132, 238, 80
-    LTEXT "The designation of the time format\nh = hour     m = minute     s =
second    t =  or \n\nh = 12-hour day format\nH = 24-hour day format\n\nhh, mm, ss =
with zeroes in beginning\nh, m, s = without zeroes", -1, 13, 141, 226, 65
+    LTEXT "The designation of the time format\nh = hour     m = minute     s =
second    t = AM or PM\n\nh = 12-hour day format\nH = 24-hour day format\n\nhh, mm, ss =
with zeroes in beginning\nh, m, s = without zeroes", -1, 13, 141, 226, 65
 END
 
 IDD_DATEOPTSSETUP DIALOGEX 0, 0, 252, 236
@@ -146,7 +146,7 @@
 BEGIN
     GROUPBOX "Calendar", IDC_GROUPBOX, 5, 7, 242, 74
     LTEXT "If year typed as two digits, then show it as year between:", -1, 13,
18, 225, 8
-    EDITTEXT IDC_FIRSTYEAR_EDIT, 13, 30, 36, 12, ES_READONLY | WS_CHILD | WS_VISIBLE |
WS_GROUP
+    EDITTEXT IDC_FIRSTYEAR_EDIT, 13, 30, 36, 12, ES_READONLY | WS_CHILD | WS_VISIBLE |
WS_GROUP | WS_DISABLED
     LTEXT "and", -1, 55, 32, 17, 8
     EDITTEXT IDC_SECONDYEAR_EDIT, 77, 30, 36, 12, ES_LEFT | ES_NUMBER | WS_GROUP
     CONTROL "",IDC_SCR_MAX_YEAR, "msctls_updown32", UDS_NOTHOUSANDS |
UDS_WRAP | UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 113,
30, 10, 12

Modified: trunk/reactos/dll/cpl/intl_new/lang/fr-FR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl_new/lang/fr-F…
==============================================================================
--- trunk/reactos/dll/cpl/intl_new/lang/fr-FR.rc (original)
+++ trunk/reactos/dll/cpl/intl_new/lang/fr-FR.rc Sun Apr 29 17:45:10 2007
@@ -146,7 +146,7 @@
 BEGIN
     GROUPBOX "Calendrier", IDC_GROUPBOX, 5, 7, 242, 74
     LTEXT "Si l'année est saisie sur 2 chiffres, l'afficher en tant
qu'année entre:", -1, 13, 18, 225, 8
-    EDITTEXT IDC_FIRSTYEAR_EDIT, 13, 30, 36, 12, ES_READONLY | WS_CHILD | WS_VISIBLE |
WS_GROUP
+    EDITTEXT IDC_FIRSTYEAR_EDIT, 13, 30, 36, 12, ES_READONLY | WS_CHILD | WS_VISIBLE |
WS_GROUP | WS_DISABLED
     LTEXT "et", -1, 55, 32, 17, 8
     EDITTEXT IDC_SECONDYEAR_EDIT, 77, 30, 36, 12, ES_LEFT | ES_NUMBER | WS_GROUP
     CONTROL "",IDC_SCR_MAX_YEAR, "msctls_updown32", UDS_NOTHOUSANDS |
UDS_WRAP | UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 113,
30, 10, 12

Modified: trunk/reactos/dll/cpl/intl_new/lang/id-ID.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl_new/lang/id-I…
==============================================================================
--- trunk/reactos/dll/cpl/intl_new/lang/id-ID.rc (original)
+++ trunk/reactos/dll/cpl/intl_new/lang/id-ID.rc Sun Apr 29 17:45:10 2007
@@ -146,7 +146,7 @@
 BEGIN
     GROUPBOX "Kalender", IDC_GROUPBOX, 5, 7, 242, 74
     LTEXT "Jika tahun diketik sebagai dua digit, maka tampilkan sebagai tahun
antara:", -1, 13, 18, 225, 8
-    EDITTEXT IDC_FIRSTYEAR_EDIT, 13, 30, 36, 12, ES_READONLY | WS_CHILD | WS_VISIBLE |
WS_GROUP
+    EDITTEXT IDC_FIRSTYEAR_EDIT, 13, 30, 36, 12, ES_READONLY | WS_CHILD | WS_VISIBLE |
WS_GROUP | WS_DISABLED
     LTEXT "dan", -1, 55, 32, 17, 8
     EDITTEXT IDC_SECONDYEAR_EDIT, 77, 30, 36, 12, ES_LEFT | ES_NUMBER | WS_GROUP
     CONTROL "",IDC_SCR_MAX_YEAR, "msctls_updown32", UDS_NOTHOUSANDS |
UDS_WRAP | UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 113,
30, 10, 12

Modified: trunk/reactos/dll/cpl/intl_new/lang/it-IT.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl_new/lang/it-I…
==============================================================================
--- trunk/reactos/dll/cpl/intl_new/lang/it-IT.rc (original)
+++ trunk/reactos/dll/cpl/intl_new/lang/it-IT.rc Sun Apr 29 17:45:10 2007
@@ -146,7 +146,7 @@
 BEGIN
     GROUPBOX "Calendario", IDC_GROUPBOX, 5, 7, 242, 74
     LTEXT "Se l'anno è scritto su due cifre, visualizzare come anni compresi tra
:", -1, 13, 18, 225, 8
-    EDITTEXT IDC_FIRSTYEAR_EDIT, 13, 30, 36, 12, ES_READONLY | WS_CHILD | WS_VISIBLE |
WS_GROUP
+    EDITTEXT IDC_FIRSTYEAR_EDIT, 13, 30, 36, 12, ES_READONLY | WS_CHILD | WS_VISIBLE |
WS_GROUP | WS_DISABLED
     LTEXT "e", -1, 55, 32, 17, 8
     EDITTEXT IDC_SECONDYEAR_EDIT, 77, 30, 36, 12, ES_LEFT | ES_NUMBER | WS_GROUP
     CONTROL "",IDC_SCR_MAX_YEAR, "msctls_updown32", UDS_NOTHOUSANDS |
UDS_WRAP | UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 113,
30, 10, 12

Modified: trunk/reactos/dll/cpl/intl_new/lang/pl-PL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl_new/lang/pl-P…
==============================================================================
--- trunk/reactos/dll/cpl/intl_new/lang/pl-PL.rc (original)
+++ trunk/reactos/dll/cpl/intl_new/lang/pl-PL.rc Sun Apr 29 17:45:10 2007
@@ -1,8 +1,8 @@
-/*  
+/*
 * translated by xrogers
-* xxrogers(a)users.sourceforge.net  
-* https://sourceforge.net/projects/reactospl  
-*/ 
+* xxrogers(a)users.sourceforge.net
+* https://sourceforge.net/projects/reactospl
+*/
 LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL
 
 IDD_REGOPTSPAGE DIALOGEX 0, 0, 252, 236
@@ -46,6 +46,138 @@
     GROUPBOX "&Tabele konwersji stron kodowych", -1, 5, 101, 242, 88
 END
 
+IDD_LANGSOPTSPAGE DIALOGEX 0, 0, 252, 236
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Languages"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "Text input languages and services", IDC_GROUPBOX, 5, 3, 242, 52
+    LTEXT "To view or change language or text input methods press
""Detail...""", -1, 12, 13, 230, 18
+    PUSHBUTTON "De&tail...", IDC_DETAIL_BUTTON, 186, 34, 54, 14
+    GROUPBOX "Additional language support", IDC_GROUPBOX, 5, 60, 242, 82
+    /* TODO: add other components*/
+END
+
+IDD_NUMSOPTSSETUP DIALOGEX 0, 0, 252, 236
+STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
+CAPTION "Numbers"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "Samples", IDC_GROUPBOX, 5, 7, 242, 48
+    LTEXT "Positive:", -1, 11, 20, 28, 10
+    EDITTEXT IDC_NUM_EDIT, 42, 18, 80, 14, ES_READONLY | WS_CHILD | WS_VISIBLE |
WS_GROUP
+    LTEXT "Negative:", -1, 128, 20, 31, 10
+    EDITTEXT IDC_NEGNUM_EDIT, 162, 18, 80, 14, ES_READONLY | WS_CHILD | WS_VISIBLE |
WS_GROUP
+    LTEXT "Positive:", -1, 11, 38, 28, 10
+    EDITTEXT IDC_NUM1_EDIT, 42, 36, 80, 14, ES_READONLY | WS_CHILD | WS_VISIBLE |
WS_GROUP
+    LTEXT "Negative:", -1, 128, 38, 31, 10
+    EDITTEXT IDC_NEGNUM1_EDIT, 162, 36, 80, 14, ES_READONLY | WS_CHILD | WS_VISIBLE |
WS_GROUP
+    LTEXT "Whole and fractional part separator:", -1, 18, 61, 126, 9
+    COMBOBOX IDC_NUMDECIMALSEP_COMBO, 147, 59, 100, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL |
WS_VSCROLL | WS_TABSTOP | WS_VISIBLE
+    LTEXT "Number of fractional symbols:", -1, 18, 77, 126, 9
+    COMBOBOX IDC_NUMFRACSYBMS_COMBO, 147, 75, 100, 100, CBS_DROPDOWNLIST |
CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE
+    LTEXT "Field separator:", -1, 18, 93, 126, 9
+    COMBOBOX IDC_NUMFIELDSEP_COMBO, 147, 91, 100, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL |
WS_VSCROLL | WS_TABSTOP | WS_VISIBLE
+    LTEXT "Number of digits in field:", -1, 18, 109, 126, 9
+    COMBOBOX IDC_NUMDIGFIELD_COMBO, 147, 107, 100, 100, CBS_DROPDOWNLIST |
CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE
+    LTEXT "Negative number sign:", -1, 18, 125, 126, 9
+    COMBOBOX IDC_NUMNEGSIGN_COMBO, 147, 123, 100, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL |
WS_VSCROLL | WS_TABSTOP | WS_VISIBLE
+    LTEXT "Negative numbers format:", -1, 18, 141, 126, 9
+    COMBOBOX IDC_NUMNEGFMT_COMBO, 147, 139, 100, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL
| WS_VSCROLL | WS_TABSTOP | WS_VISIBLE
+    LTEXT "Leading zeroes:", -1, 18, 157, 126, 9
+    COMBOBOX IDC_NUMLEADZERO_COMBO, 147, 155, 100, 100, CBS_DROPDOWNLIST |
CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE
+    LTEXT "Elements list separator:", -1, 18, 173, 126, 9
+    COMBOBOX IDC_NUMELEMLISTSEP_COMBO, 147, 171, 100, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL
| WS_VSCROLL | WS_TABSTOP | WS_VISIBLE
+    LTEXT "System of units:", -1, 18, 189, 126, 9
+    COMBOBOX IDC_NUMUNITSSYS_COMBO, 147, 187, 100, 100, CBS_DROPDOWNLIST |
CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE
+    LTEXT "Region corresponding digits:", -1, 18, 205, 126, 9
+    COMBOBOX IDC_NUMREGDIG_COMBO, 147, 203, 100, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL
| WS_VSCROLL | WS_TABSTOP | WS_VISIBLE
+    LTEXT "Digit replacement:", -1, 18, 221, 126, 9
+    COMBOBOX IDC_NUMDIGREPL_COMBO, 147, 219, 100, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL
| WS_VSCROLL | WS_TABSTOP | WS_VISIBLE
+END
+
+IDD_CURRENCYOPTSSETUP DIALOGEX 0, 0, 252, 236
+STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
+CAPTION "Currency"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "Samples", IDC_GROUPBOX, 5, 7, 242, 40
+    LTEXT "Positive:", -1, 10, 25, 30, 10
+    EDITTEXT IDC_CURRENCY_EDIT, 42, 23, 80, 14, ES_READONLY | WS_CHILD | WS_VISIBLE |
WS_GROUP
+    LTEXT "Negative:", -1, 128, 25, 31, 10
+    EDITTEXT IDC_NEGCURRENCY_EDIT, 162, 23, 80, 14, ES_READONLY | WS_CHILD | WS_VISIBLE |
WS_GROUP
+    LTEXT "Monetary unit:", -1, 20, 61, 126, 9
+    COMBOBOX IDC_CURRENCYUNIT_COMBO, 148, 59, 90, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL |
WS_VSCROLL | WS_TABSTOP | WS_VISIBLE | CBS_SORT
+    LTEXT "Positive sum of money format:", -1, 20, 78, 126, 9
+    COMBOBOX IDC_POSCURRENCYSUM_COMBO, 148, 76, 90, 100, CBS_DROPDOWNLIST |
CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE
+    LTEXT "Negative sum of money format:", -1, 20, 95, 126, 9
+    COMBOBOX IDC_NEGCURRENCYSUM_COMBO, 148, 93, 90, 100, CBS_DROPDOWNLIST |
CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE
+    LTEXT "Whole and fractional part separator:", -1, 20, 121, 126, 9
+    COMBOBOX IDC_WHOLEFRACTSEP_COMBO, 148, 119, 90, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL |
WS_VSCROLL | WS_TABSTOP | WS_VISIBLE | CBS_SORT
+    LTEXT "Number of fractional symbols:", -1, 20, 137, 126, 9
+    COMBOBOX IDC_FRACSYMBSNUM_COMBO, 148, 136, 90, 100, CBS_DROPDOWNLIST |
CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE | CBS_SORT
+    LTEXT "Field separator:", -1, 20, 166, 126, 9
+    COMBOBOX IDC_FIELDSEP_COMBO, 148, 164, 90, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL |
WS_VSCROLL | WS_TABSTOP | WS_VISIBLE | CBS_SORT
+    LTEXT "Number of digits in field:", -1, 20, 183, 126, 9
+    COMBOBOX IDC_DIGINFIELDNUM_COMBO, 148, 181, 90, 100, CBS_DROPDOWNLIST |
CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE
+END
+
+IDD_TIMEOPTSSETUP DIALOGEX 0, 0, 252, 236
+STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
+CAPTION "Time"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "Samples", IDC_GROUPBOX, 5, 7, 242, 33
+    LTEXT "Sample:", -1, 13, 21, 52, 10
+    EDITTEXT IDC_TIME_EDIT, 68, 19, 84, 14, ES_READONLY | WS_CHILD | WS_VISIBLE |
WS_GROUP
+    EDITTEXT IDC_UNKNOWN_EDIT, 156, 19, 84, 14, ES_READONLY | WS_CHILD | WS_VISIBLE |
WS_GROUP
+    LTEXT "Time format:", -1, 10, 52, 147, 10
+    COMBOBOX IDC_TIMEFMT_COMBO, 161, 50, 84, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL |
WS_VSCROLL | WS_TABSTOP | WS_VISIBLE 
+    LTEXT "Time components separator:", -1, 10, 69, 147, 10
+    COMBOBOX IDC_TIMESEP_COMBO, 161, 67, 84, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL |
WS_VSCROLL | WS_TABSTOP | WS_VISIBLE 
+    LTEXT "Time about midday notation (AM):", -1, 10, 86, 147, 10
+    COMBOBOX IDC_TIMEAM_COMBO, 161, 84, 84, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL |
WS_VSCROLL | WS_TABSTOP | WS_VISIBLE 
+    LTEXT "Time afternoon notation (PM):", -1, 10, 104, 147, 10
+    COMBOBOX IDC_TIMEPM_COMBO, 161, 102, 84, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL |
WS_VSCROLL | WS_TABSTOP | WS_VISIBLE 
+    GROUPBOX "", IDC_GROUPBOX, 7, 132, 238, 80
+    LTEXT "The designation of the time format\nh = hour     m = minute     s =
second    t = AM or PM\n\nh = 12-hour day format\nH = 24-hour day format\n\nhh, mm, ss =
with zeroes in beginning\nh, m, s = without zeroes", -1, 13, 141, 226, 65
+END
+
+IDD_DATEOPTSSETUP DIALOGEX 0, 0, 252, 236
+STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
+CAPTION "Date"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "Calendar", IDC_GROUPBOX, 5, 7, 242, 74
+    LTEXT "If year typed as two digits, then show it as year between:", -1, 13,
18, 225, 8
+    EDITTEXT IDC_FIRSTYEAR_EDIT, 13, 30, 36, 12, ES_READONLY | WS_CHILD | WS_VISIBLE |
WS_GROUP | WS_DISABLED
+    LTEXT "and", -1, 55, 32, 17, 8
+    EDITTEXT IDC_SECONDYEAR_EDIT, 77, 30, 36, 12, ES_LEFT | ES_NUMBER | WS_GROUP
+    CONTROL "",IDC_SCR_MAX_YEAR, "msctls_updown32", UDS_NOTHOUSANDS |
UDS_WRAP | UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 113,
30, 10, 12
+    LTEXT "Calendar type:", -1, 13, 48, 56, 10
+    COMBOBOX IDC_CALTYPE_COMBO, 77, 46, 161, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | 
+             WS_VSCROLL | WS_TABSTOP | CBS_SORT | WS_DISABLED
+    LTEXT "Muslim Calendar:", -1, 13, 59, 60, 16
+    COMBOBOX IDC_HIJCHRON_COMBO, 77, 64, 161, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | 
+             WS_VSCROLL | WS_TABSTOP | CBS_SORT | WS_DISABLED
+    GROUPBOX "Short date format", IDC_GROUPBOX, 7, 83, 238, 81
+    LTEXT "Sample:", -1, 13, 95, 63, 10
+    EDITTEXT IDC_SHRTDATESAMPLE_EDIT, 77, 93, 161, 14, ES_READONLY | WS_CHILD |
WS_VISIBLE | WS_GROUP
+    LTEXT "Sample - right to left read:", -1, 13, 109, 60, 16
+    EDITTEXT IDC_SHRTDATERTOL_EDIT, 77, 111, 161, 14, ES_READONLY | WS_CHILD | WS_VISIBLE
| WS_GROUP | WS_DISABLED
+    LTEXT "Short format:", -1, 13, 131, 60, 10
+    COMBOBOX IDC_SHRTDATEFMT_COMBO, 77, 129, 161, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL |
WS_VSCROLL | WS_TABSTOP | WS_VISIBLE 
+    LTEXT "Date components separator:", -1, 13, 148, 113, 10
+    COMBOBOX IDC_SHRTDATESEP_COMBO, 187, 146, 51, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL |
WS_VSCROLL | WS_TABSTOP | WS_VISIBLE 
+    GROUPBOX "Long date format", IDC_GROUPBOX, 7, 167, 238, 64
+    LTEXT "Sample:", -1, 13, 179, 61, 10
+    EDITTEXT IDC_LONGDATESAMPLE_EDIT, 77, 177, 161, 14, ES_READONLY | WS_CHILD |
WS_VISIBLE | WS_GROUP
+    LTEXT "Sample - right to left read:", -1, 13, 193, 61, 16
+    EDITTEXT IDC_LONGDATERTOL_EDIT, 77, 195, 161, 14, ES_READONLY | WS_CHILD | WS_VISIBLE
| WS_GROUP | WS_DISABLED
+    LTEXT "Long format:", -1, 13, 215, 60, 10
+    COMBOBOX IDC_LONGDATEFMT_COMBO, 77, 213, 161, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL |
WS_VSCROLL | WS_TABSTOP | WS_VISIBLE 
+END
+
 STRINGTABLE
 BEGIN
     IDS_CPLNAME "Opcje regionalne i jêzykowe"

Modified: trunk/reactos/dll/cpl/intl_new/locale.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl_new/locale.c?…
==============================================================================
--- trunk/reactos/dll/cpl/intl_new/locale.c (original)
+++ trunk/reactos/dll/cpl/intl_new/locale.c Sun Apr 29 17:45:10 2007
@@ -59,7 +59,7 @@
 
     EnumSystemGeoID(GEOCLASS_NATION, 0, LocationsEnumProc);
 
-    // Select current location
+    /* Select current location */
     userGeoID = GetUserGeoID(GEOCLASS_NATION);
     GetGeoInfo(userGeoID,
                GEO_FRIENDLYNAME,
@@ -109,7 +109,7 @@
 
     EnumSystemLocalesW(LocalesEnumProc, LCID_INSTALLED);
 
-    // Select current locale
+    /* Select current locale */
     GetLocaleInfo(GetUserDefaultLCID(),
                   LOCALE_SLANGUAGE,
                   langSel,
@@ -175,7 +175,7 @@
 
     //SetUserDefaultLCID(LcidLocale); // Not implemented in MS :(
 
-    if(!IsValidLocale(LcidLocale, LCID_INSTALLED)) 
+    if(!IsValidLocale(LcidLocale, LCID_INSTALLED))
     {
         MessageBoxW(NULL, L"Invalid locale.", L"Critical error",
             MB_OK | MB_ICONERROR);
@@ -230,7 +230,7 @@
             CreateLanguagesList(GetDlgItem(hwndDlg, IDC_SETREG_COMBO));
             /* Update locale samples */
             UpdateLocaleSample(hwndDlg, LOCALE_USER_DEFAULT);
-        break;
+            break;
 
         case WM_COMMAND:
             switch (LOWORD(wParam))



    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

[ros-diffs] [ekohl] 26580: - Remove "Properties for" from title. - Fix page order. - Disable first year edittext control on the "Date" page. - Add missing (english) dialogs to the polish resource file. - Fix coding style.