[ekohl] 25406: - Add currency page controls. - Display currency format information. - Ros-diffs

9 Jan 2007

Author: ekohl
Date: Wed Jan 10 02:00:21 2007
New Revision: 25406

URL: http://svn.reactos.org/svn/reactos?rev=25406&view=rev
Log:
- Add currency page controls.
- Display currency format information.

Modified:
    trunk/reactos/dll/cpl/intl/Fr.rc
    trunk/reactos/dll/cpl/intl/Ja.rc
    trunk/reactos/dll/cpl/intl/currency.c
    trunk/reactos/dll/cpl/intl/cz.rc
    trunk/reactos/dll/cpl/intl/de.rc
    trunk/reactos/dll/cpl/intl/en.rc
    trunk/reactos/dll/cpl/intl/es.rc
    trunk/reactos/dll/cpl/intl/hu.rc
    trunk/reactos/dll/cpl/intl/nl.rc
    trunk/reactos/dll/cpl/intl/resource.h
    trunk/reactos/dll/cpl/intl/ru.rc
    trunk/reactos/dll/cpl/intl/sv.rc
    trunk/reactos/dll/cpl/intl/uk.rc

Modified: trunk/reactos/dll/cpl/intl/Fr.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/Fr.rc?rev=254…
==============================================================================

--- trunk/reactos/dll/cpl/intl/Fr.rc (original)
+++ trunk/reactos/dll/cpl/intl/Fr.rc Wed Jan 10 02:00:21 2007
@@ -1,82 +1,100 @@
 /* French translation by Benoit Plante 2005 (cmoibenlepro AT hotmail DOT com) */
 
-LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
-
-IDD_GENERALPAGE DIALOGEX 0, 0, 246, 188
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Général"
-FONT 8, "MS Shell Dlg"
-BEGIN
-  LTEXT "Page de propriétés 1",-1,73,74,90,8
-END
-
-
-IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 188
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Nombres"
-FONT 8, "MS Shell Dlg"
-BEGIN
-  LTEXT "Page de propriétés 2",-1,73,74,90,8
-END
-
-
-IDD_CURRENCYPAGE DIALOGEX 0, 0, 246, 188
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Devise"
-FONT 8, "MS Shell Dlg"
-BEGIN
-  LTEXT "Page de propriétés 3",-1,73,74,90,8
-END
-
-
-IDD_TIMEPAGE DIALOGEX 0, 0, 246, 188
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Heure"
-FONT 8, "MS Shell Dlg"
-BEGIN
-  GROUPBOX "Apparence de l'heure", -1, 7, 7, 228, 33, WS_CHILD |
WS_VISIBLE
-  LTEXT "Échantillon d'heure:", -1, 13, 21, 54, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
-  EDITTEXT IDC_TIMESAMPLE, 68, 19, 84, 14, ES_READONLY | WS_CHILD | WS_VISIBLE |
WS_GROUP
-  LTEXT "Format d'heure:", -1, 13, 52, 54, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
-  COMBOBOX IDC_TIMEFORMAT, 68, 50, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE |
WS_TABSTOP
-  LTEXT "&Séparateur des heures:", -1, 13, 70, 54, 10, WS_VISIBLE |
WS_GROUP
-  COMBOBOX IDC_TIMESEPARATOR, 68, 68, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE |
WS_TABSTOP
-  LTEXT "Symbole de l'avant-midi(A&M):", -1, 13, 88, 54, 10, WS_VISIBLE
| WS_GROUP
-  COMBOBOX IDC_TIMEAMSYMBOL, 68, 86, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE |
WS_TABSTOP
-  LTEXT "Symbole de l'après-midi(&PM):", -1, 13, 106, 54, 10,
WS_VISIBLE | WS_GROUP
-  COMBOBOX IDC_TIMEPMSYMBOL, 68, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE |
WS_TABSTOP
-  GROUPBOX "", -1, 7, 124, 228, 60, WS_VISIBLE
-  LTEXT "Notation de l'heure\n\n\
-h = heure    m = minute    s = seconde    t = AM ou PM\n\n\
-h = 12 heures   H =24 heures \n\
-hh, mm, ss = Zéro de départ   h, m, s = Pas de zéro de départ",
-        -1, 13, 133, 214, 47, WS_CHILD |WS_VISIBLE | WS_GROUP
-END
-
-
-IDD_DATEPAGE DIALOGEX 0, 0, 246, 188
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Date"
-FONT 8, "MS Shell Dlg"
-BEGIN
-  LTEXT "Page de propriétés 5",-1,73,74,90,8
-END
-
-
-IDD_LOCALEPAGE DIALOGEX 0, 0, 246, 188
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Langues"
-FONT 8, "MS Shell Dlg"
-BEGIN
-  GROUPBOX "Langue principale", -1, 8, 11, 228, 74
-  ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON
-  LTEXT "Sélectionnez la langue principale que vous voulez utiliser:", -1, 38,
25, 193, 22
-  COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
-END
-
-
-STRINGTABLE
-BEGIN
-  IDS_CPLNAME "Options régionales"
-  IDS_CPLDESCRIPTION "Selectionner les langues, les formats de nombres, les devises,
l'heure et la date."
-END
+LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
+
+IDD_GENERALPAGE DIALOGEX 0, 0, 246, 188
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Général"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT "Page de propriétés 1",-1,73,74,90,8
+END
+
+
+IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 188
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Nombres"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT "Page de propriétés 2",-1,73,74,90,8
+END
+
+
+IDD_CURRENCYPAGE DIALOGEX 0, 0, 246, 188
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Devise"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  GROUPBOX "Appearance sample", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE
+  LTEXT "Positive:", -1, 13, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  EDITTEXT IDC_CURRENCYPOSSAMPLE, 42, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE |
WS_GROUP
+  LTEXT "Negative:", -1, 120, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  EDITTEXT IDC_CURRENCYNEGSAMPLE, 154, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE |
WS_GROUP
+  LTEXT "&Currency symbol:", -1, 20, 51, 96, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_CURRENCYSYMBOL, 124, 49, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Positive Amount:", -1, 20, 68, 96, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_CURRENCYPOSVALUE, 124, 66, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Negative Amount:", -1, 20, 85, 96, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_CURRENCYNEGVALUE, 124, 83, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Decimal separator:", -1, 20, 111, 96, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_CURRENCYDECSEP, 124, 109, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Number of fractional digits:", -1, 20, 128, 96, 10, WS_CHILD
|WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYDECNUM, 124, 126, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Grouping symbol:", -1, 20, 156, 100, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_CURRENCYGRPSEP, 124, 154, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Digit grouping:", -1, 20, 173, 96, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_CURRENCYGRPNUM, 124, 171, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+END
+
+
+IDD_TIMEPAGE DIALOGEX 0, 0, 246, 188
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Heure"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  GROUPBOX "Apparence de l'heure", -1, 7, 7, 228, 33, WS_CHILD |
WS_VISIBLE
+  LTEXT "Échantillon d'heure:", -1, 13, 21, 54, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  EDITTEXT IDC_TIMESAMPLE, 68, 19, 84, 14, ES_READONLY | WS_CHILD | WS_VISIBLE |
WS_GROUP
+  LTEXT "Format d'heure:", -1, 13, 52, 54, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_TIMEFORMAT, 68, 50, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE |
WS_TABSTOP
+  LTEXT "&Séparateur des heures:", -1, 13, 70, 54, 10, WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_TIMESEPARATOR, 68, 68, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE |
WS_TABSTOP
+  LTEXT "Symbole de l'avant-midi(A&M):", -1, 13, 88, 54, 10, WS_VISIBLE
| WS_GROUP
+  COMBOBOX IDC_TIMEAMSYMBOL, 68, 86, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE |
WS_TABSTOP
+  LTEXT "Symbole de l'après-midi(&PM):", -1, 13, 106, 54, 10,
WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_TIMEPMSYMBOL, 68, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE |
WS_TABSTOP
+  GROUPBOX "", -1, 7, 124, 228, 60, WS_VISIBLE
+  LTEXT "Notation de l'heure\n\n\
+h = heure    m = minute    s = seconde    t = AM ou PM\n\n\
+h = 12 heures   H =24 heures \n\
+hh, mm, ss = Zéro de départ   h, m, s = Pas de zéro de départ",
+        -1, 13, 133, 214, 47, WS_CHILD |WS_VISIBLE | WS_GROUP
+END
+
+
+IDD_DATEPAGE DIALOGEX 0, 0, 246, 188
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Date"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT "Page de propriétés 5",-1,73,74,90,8
+END
+
+
+IDD_LOCALEPAGE DIALOGEX 0, 0, 246, 188
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Langues"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  GROUPBOX "Langue principale", -1, 8, 11, 228, 74
+  ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON
+  LTEXT "Sélectionnez la langue principale que vous voulez utiliser:", -1, 38,
25, 193, 22
+  COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+END
+
+
+STRINGTABLE
+BEGIN
+  IDS_CPLNAME "Options régionales"
+  IDS_CPLDESCRIPTION "Selectionner les langues, les formats de nombres, les devises,
l'heure et la date."
+END

Modified: trunk/reactos/dll/cpl/intl/Ja.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/Ja.rc?rev=254…
==============================================================================
--- trunk/reactos/dll/cpl/intl/Ja.rc (original)
+++ trunk/reactos/dll/cpl/intl/Ja.rc Wed Jan 10 02:00:21 2007
@@ -23,7 +23,25 @@
 CAPTION "ÊÝ"
 FONT 9, "MS UI Gothic"
 BEGIN
-  LTEXT "Property Page 3",-1,73,74,90,8
+  GROUPBOX "Appearance sample", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE
+  LTEXT "Positive:", -1, 13, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  EDITTEXT IDC_CURRENCYPOSSAMPLE, 42, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE |
WS_GROUP
+  LTEXT "Negative:", -1, 120, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  EDITTEXT IDC_CURRENCYNEGSAMPLE, 154, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE |
WS_GROUP
+  LTEXT "&Currency symbol:", -1, 20, 51, 96, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_CURRENCYSYMBOL, 124, 49, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Positive Amount:", -1, 20, 68, 96, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_CURRENCYPOSVALUE, 124, 66, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Negative Amount:", -1, 20, 85, 96, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_CURRENCYNEGVALUE, 124, 83, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Decimal separator:", -1, 20, 111, 96, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_CURRENCYDECSEP, 124, 109, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Number of fractional digits:", -1, 20, 128, 96, 10, WS_CHILD
|WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYDECNUM, 124, 126, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Grouping symbol:", -1, 20, 156, 100, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_CURRENCYGRPSEP, 124, 154, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Digit grouping:", -1, 20, 173, 96, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_CURRENCYGRPNUM, 124, 171, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
 END
 
 

Modified: trunk/reactos/dll/cpl/intl/currency.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/currency.c?re…
==============================================================================
--- trunk/reactos/dll/cpl/intl/currency.c (original)
+++ trunk/reactos/dll/cpl/intl/currency.c Wed Jan 10 02:00:21 2007
@@ -27,24 +27,305 @@
 #include <windows.h>
 #include <commctrl.h>
 #include <cpl.h>
+#include <tchar.h>
 
 #include "intl.h"
 #include "resource.h"
+
+
+typedef struct _GLOBAL_DATA
+{
+    TCHAR szCurrencySymbol[6];
+    TCHAR szDecimalSep[4];
+    TCHAR szThousandSep[4];
+    TCHAR szGrouping[10];
+
+    int PositiveOrder;
+    int NegativeOrder;
+    int NumDigits;
+
+} GLOBAL_DATA, *PGLOBAL_DATA;
+
+
+static VOID
+GetInitialCurrencyValues(PGLOBAL_DATA pGlobalData)
+{
+    TCHAR szBuffer[256];
+    int ret;
+
+    /* Get currency symbol */
+    ret = GetLocaleInfo(LOCALE_USER_DEFAULT,
+                        LOCALE_SCURRENCY,
+                        pGlobalData->szCurrencySymbol, 6);
+
+    /* Get positive format */
+    ret = GetLocaleInfo(LOCALE_USER_DEFAULT,
+                        LOCALE_ICURRENCY,
+                        szBuffer, 256);
+    if (ret != 0)
+    {
+        pGlobalData->PositiveOrder = _ttoi(szBuffer);
+    }
+
+    /* Get negative format */
+    ret = GetLocaleInfo(LOCALE_USER_DEFAULT,
+                        LOCALE_INEGCURR,
+                        szBuffer, 256);
+    if (ret != 0)
+    {
+        pGlobalData->NegativeOrder = _ttoi(szBuffer);
+    }
+
+    /* Get number of fractional digits */
+    ret = GetLocaleInfo(LOCALE_USER_DEFAULT,
+                        LOCALE_ICURRDIGITS,
+                        szBuffer, 256);
+    if (ret != 0)
+    {
+        pGlobalData->NumDigits = _ttoi(szBuffer);
+    }
+
+    /* Get decimal separator */
+    ret = GetLocaleInfoW(LOCALE_USER_DEFAULT,
+                         LOCALE_SMONDECIMALSEP,
+                         pGlobalData->szDecimalSep, 4);
+
+    /* Get group separator */
+    ret = GetLocaleInfo(LOCALE_USER_DEFAULT,
+                        LOCALE_SMONTHOUSANDSEP,
+                        pGlobalData->szThousandSep, 4);
+
+    /* Get grouping */
+    ret = GetLocaleInfo(LOCALE_USER_DEFAULT,
+                        LOCALE_SMONGROUPING,
+                        pGlobalData->szGrouping, 10);
+
+}
+
+
+static VOID
+UpdateExamples(HWND hwndDlg, PGLOBAL_DATA pGlobalData)
+{
+    TCHAR szBuffer[256];
+    CURRENCYFMT cyFmt;
+
+    cyFmt.NumDigits = pGlobalData->NumDigits;
+    cyFmt.LeadingZero = 0;
+    cyFmt.Grouping = 3;
+    cyFmt.lpDecimalSep = pGlobalData->szDecimalSep;
+    cyFmt.lpThousandSep = pGlobalData->szThousandSep;
+    cyFmt.PositiveOrder = pGlobalData->PositiveOrder;
+    cyFmt.NegativeOrder = pGlobalData->NegativeOrder;
+    cyFmt.lpCurrencySymbol = pGlobalData->szCurrencySymbol;
+
+    /* positive example */
+    GetCurrencyFormat(LOCALE_USER_DEFAULT, 0,
+                      _T("123456789.00"),
+                      &cyFmt, szBuffer, 256);
+
+    SetDlgItemText(hwndDlg,
+                   IDC_CURRENCYPOSSAMPLE,
+                   szBuffer);
+
+    /* negative example */
+    GetCurrencyFormat(LOCALE_USER_DEFAULT, 0,
+                      _T("-123456789.00"),
+                      &cyFmt, szBuffer, 256);
+
+    SetDlgItemText(hwndDlg,
+                   IDC_CURRENCYNEGSAMPLE,
+                   szBuffer);
+}
+
+
+static VOID
+OnInitDialog(HWND hwndDlg, PGLOBAL_DATA pGlobalData)
+{
+    TCHAR szBuffer[256];
+    CURRENCYFMT cyFmt;
+    int i;
+
+    GetInitialCurrencyValues(pGlobalData);
+
+    /* Set currency symbol */
+    SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYSYMBOL),
+                CB_ADDSTRING,
+                0,
+                (LPARAM)pGlobalData->szCurrencySymbol);
+
+    SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYSYMBOL),
+                CB_SETCURSEL,
+                0, /* index */
+                0);
+
+
+    /* positive currency values */
+    cyFmt.NumDigits = pGlobalData->NumDigits;
+    cyFmt.LeadingZero = 0;
+    cyFmt.Grouping = 3;
+    cyFmt.lpDecimalSep = pGlobalData->szDecimalSep;
+    cyFmt.lpThousandSep = pGlobalData->szThousandSep;
+    cyFmt.NegativeOrder = 0;
+    cyFmt.lpCurrencySymbol = pGlobalData->szCurrencySymbol;
+
+    for (i = 0; i < 4; i++)
+    {
+        cyFmt.PositiveOrder = i;
+        GetCurrencyFormat(LOCALE_USER_DEFAULT, 0,
+                          _T("1.1"),
+                          &cyFmt, szBuffer, 256);
+
+        SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYPOSVALUE),
+                    CB_INSERTSTRING,
+                    -1,
+                    (LPARAM)szBuffer);
+    }
+
+    SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYPOSVALUE),
+                CB_SETCURSEL,
+                pGlobalData->PositiveOrder,
+                0);
+
+    /* negative currency values */
+    cyFmt.PositiveOrder = 0;
+    for (i = 0; i < 16; i++)
+    {
+        cyFmt.NegativeOrder = i;
+        GetCurrencyFormat(LOCALE_USER_DEFAULT, 0,
+                          _T("-1.1"),
+                          &cyFmt, szBuffer, 256);
+
+        SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYNEGVALUE),
+                    CB_INSERTSTRING,
+                    -1,
+                    (LPARAM)szBuffer);
+    }
+
+    SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYNEGVALUE),
+                CB_SETCURSEL,
+                pGlobalData->NegativeOrder, /* index */
+                0);
+
+    /* decimal separator */
+    SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYDECSEP),
+                CB_ADDSTRING,
+                0,
+                (LPARAM)pGlobalData->szDecimalSep);
+
+    SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYDECSEP),
+                CB_SETCURSEL,
+                0, /* index */
+                0);
+
+
+    /* */
+    for (i = 0; i < 10; i++)
+    {
+        szBuffer[0] = _T('0') + i;
+        szBuffer[1] = 0;
+        SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYDECNUM),
+                    CB_ADDSTRING,
+                    0,
+                    (LPARAM)szBuffer);
+    }
+
+    SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYDECNUM),
+                CB_SETCURSEL,
+                pGlobalData->NumDigits, /* index */
+                0);
+
+
+    /* digit group separator */
+    SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYGRPSEP),
+                CB_ADDSTRING,
+                0,
+                (LPARAM)pGlobalData->szThousandSep);
+
+    SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYGRPSEP),
+                CB_SETCURSEL,
+                0, /* index */
+                0);
+
+    /* digit grouping */
+    cyFmt.NumDigits = 0;
+    cyFmt.LeadingZero = 0;
+    cyFmt.lpDecimalSep = _T("");
+    cyFmt.lpThousandSep = pGlobalData->szThousandSep;
+    cyFmt.NegativeOrder = 0;
+    cyFmt.lpCurrencySymbol = _T("");
+    cyFmt.Grouping = 0;
+    GetCurrencyFormat(LOCALE_USER_DEFAULT, 0,
+                      _T("123456789"),
+                      &cyFmt, szBuffer, 256);
+    SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYGRPNUM),
+                CB_INSERTSTRING,
+                -1,
+                (LPARAM)szBuffer);
+
+    cyFmt.Grouping = 3;
+    GetCurrencyFormat(LOCALE_USER_DEFAULT, 0,
+                      _T("123456789"),
+                      &cyFmt, szBuffer, 256);
+    SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYGRPNUM),
+                CB_INSERTSTRING,
+                -1,
+                (LPARAM)szBuffer);
+
+    cyFmt.Grouping = 32;
+    GetCurrencyFormat(LOCALE_USER_DEFAULT, 0,
+                      _T("123456789"),
+                      &cyFmt, szBuffer, 256);
+    SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYGRPNUM),
+                CB_INSERTSTRING,
+                -1,
+                (LPARAM)szBuffer);
+
+    i = 0;
+    if (pGlobalData->szGrouping[0] == _T('3'))
+    {
+        if ((pGlobalData->szGrouping[1] == _T(';')) &&
+            (pGlobalData->szGrouping[2] == _T('2')))
+            i = 2;
+        else
+            i = 1;
+    }
+
+    SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYGRPNUM),
+                CB_SETCURSEL,
+                i, /* index */
+                0);
+
+    /* Show the examples */
+    UpdateExamples(hwndDlg, pGlobalData);
+}
 
 
 /* Property page dialog callback */
 INT_PTR CALLBACK
 CurrencyPageProc(HWND hwndDlg,
-		 UINT uMsg,
-		 WPARAM wParam,
-		 LPARAM lParam)
-{
-  switch(uMsg)
-  {
-    case WM_INITDIALOG:
-      break;
-  }
-  return FALSE;
+                 UINT uMsg,
+                 WPARAM wParam,
+                 LPARAM lParam)
+{
+    PGLOBAL_DATA pGlobalData;
+
+    pGlobalData = (PGLOBAL_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER);
+
+    switch (uMsg)
+    {
+        case WM_INITDIALOG:
+            pGlobalData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
sizeof(GLOBAL_DATA));
+            SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGlobalData);
+            OnInitDialog(hwndDlg, pGlobalData);
+            break;
+
+
+        case WM_DESTROY:
+            HeapFree(GetProcessHeap(), 0, pGlobalData);
+            break;
+    }
+
+    return FALSE;
 }
 
 /* EOF */

Modified: trunk/reactos/dll/cpl/intl/cz.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/cz.rc?rev=254…
==============================================================================
--- trunk/reactos/dll/cpl/intl/cz.rc (original)
+++ trunk/reactos/dll/cpl/intl/cz.rc Wed Jan 10 02:00:21 2007
@@ -25,7 +25,25 @@
 CAPTION "Mìna"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Property Page 3",-1,73,74,90,8
+  GROUPBOX "Appearance sample", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE
+  LTEXT "Positive:", -1, 13, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  EDITTEXT IDC_CURRENCYPOSSAMPLE, 42, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE |
WS_GROUP
+  LTEXT "Negative:", -1, 120, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  EDITTEXT IDC_CURRENCYNEGSAMPLE, 154, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE |
WS_GROUP
+  LTEXT "&Currency symbol:", -1, 20, 51, 96, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_CURRENCYSYMBOL, 124, 49, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Positive Amount:", -1, 20, 68, 96, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_CURRENCYPOSVALUE, 124, 66, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Negative Amount:", -1, 20, 85, 96, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_CURRENCYNEGVALUE, 124, 83, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Decimal separator:", -1, 20, 111, 96, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_CURRENCYDECSEP, 124, 109, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Number of fractional digits:", -1, 20, 128, 96, 10, WS_CHILD
|WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYDECNUM, 124, 126, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Grouping symbol:", -1, 20, 156, 100, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_CURRENCYGRPSEP, 124, 154, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Digit grouping:", -1, 20, 173, 96, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_CURRENCYGRPNUM, 124, 171, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
 END
 
 

Modified: trunk/reactos/dll/cpl/intl/de.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/de.rc?rev=254…
==============================================================================
--- trunk/reactos/dll/cpl/intl/de.rc (original)
+++ trunk/reactos/dll/cpl/intl/de.rc Wed Jan 10 02:00:21 2007
@@ -25,7 +25,25 @@
 CAPTION "Währung"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Property Page 3",-1,73,74,90,8
+  GROUPBOX "Darstellung", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE
+  LTEXT "Positiv:", -1, 13, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  EDITTEXT IDC_CURRENCYPOSSAMPLE, 42, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE |
WS_GROUP
+  LTEXT "Negativ:", -1, 120, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  EDITTEXT IDC_CURRENCYNEGSAMPLE, 154, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE |
WS_GROUP
+  LTEXT "&Währungssymbol:", -1, 20, 51, 96, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_CURRENCYSYMBOL, 124, 49, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "Format für &positive Beträge:", -1, 20, 68, 96, 10, WS_CHILD
|WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYPOSVALUE, 124, 66, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "Format für &negative Beträge:", -1, 20, 85, 96, 10, WS_CHILD
|WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYNEGVALUE, 124, 83, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Dezimaltrennzeichen:", -1, 20, 111, 96, 10, WS_CHILD |WS_VISIBLE
| WS_GROUP
+  COMBOBOX IDC_CURRENCYDECSEP, 124, 109, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Anzahl der Dezimalstellen:", -1, 20, 128, 96, 10, WS_CHILD
|WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYDECNUM, 124, 126, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Symbol für Zifferngruppierung:", -1, 20, 156, 100, 10, WS_CHILD
|WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYGRPSEP, 124, 154, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Zifferngruppierung:", -1, 20, 173, 96, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_CURRENCYGRPNUM, 124, 171, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
 END
 
 

Modified: trunk/reactos/dll/cpl/intl/en.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/en.rc?rev=254…
==============================================================================
--- trunk/reactos/dll/cpl/intl/en.rc (original)
+++ trunk/reactos/dll/cpl/intl/en.rc Wed Jan 10 02:00:21 2007
@@ -25,7 +25,25 @@
 CAPTION "Currency"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Property Page 3",-1,73,74,90,8
+  GROUPBOX "Appearance sample", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE
+  LTEXT "Positive:", -1, 13, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  EDITTEXT IDC_CURRENCYPOSSAMPLE, 42, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE |
WS_GROUP
+  LTEXT "Negative:", -1, 120, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  EDITTEXT IDC_CURRENCYNEGSAMPLE, 154, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE |
WS_GROUP
+  LTEXT "&Currency symbol:", -1, 20, 51, 96, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_CURRENCYSYMBOL, 124, 49, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Positive Amount:", -1, 20, 68, 96, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_CURRENCYPOSVALUE, 124, 66, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Negative Amount:", -1, 20, 85, 96, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_CURRENCYNEGVALUE, 124, 83, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Decimal separator:", -1, 20, 111, 96, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_CURRENCYDECSEP, 124, 109, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Number of fractional digits:", -1, 20, 128, 96, 10, WS_CHILD
|WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYDECNUM, 124, 126, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Grouping symbol:", -1, 20, 156, 100, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_CURRENCYGRPSEP, 124, 154, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Digit grouping:", -1, 20, 173, 96, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_CURRENCYGRPNUM, 124, 171, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
 END
 
 

Modified: trunk/reactos/dll/cpl/intl/es.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/es.rc?rev=254…
==============================================================================
--- trunk/reactos/dll/cpl/intl/es.rc (original)
+++ trunk/reactos/dll/cpl/intl/es.rc Wed Jan 10 02:00:21 2007
@@ -29,7 +29,25 @@
 CAPTION "Moneda"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Property Page 3",-1,73,74,90,8
+  GROUPBOX "Appearance sample", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE
+  LTEXT "Positive:", -1, 13, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  EDITTEXT IDC_CURRENCYPOSSAMPLE, 42, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE |
WS_GROUP
+  LTEXT "Negative:", -1, 120, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  EDITTEXT IDC_CURRENCYNEGSAMPLE, 154, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE |
WS_GROUP
+  LTEXT "&Currency symbol:", -1, 20, 51, 96, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_CURRENCYSYMBOL, 124, 49, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Positive Amount:", -1, 20, 68, 96, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_CURRENCYPOSVALUE, 124, 66, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Negative Amount:", -1, 20, 85, 96, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_CURRENCYNEGVALUE, 124, 83, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Decimal separator:", -1, 20, 111, 96, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_CURRENCYDECSEP, 124, 109, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Number of fractional digits:", -1, 20, 128, 96, 10, WS_CHILD
|WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYDECNUM, 124, 126, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Grouping symbol:", -1, 20, 156, 100, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_CURRENCYGRPSEP, 124, 154, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Digit grouping:", -1, 20, 173, 96, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_CURRENCYGRPNUM, 124, 171, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
 END
 
 

Modified: trunk/reactos/dll/cpl/intl/hu.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/hu.rc?rev=254…
==============================================================================
--- trunk/reactos/dll/cpl/intl/hu.rc (original)
+++ trunk/reactos/dll/cpl/intl/hu.rc Wed Jan 10 02:00:21 2007
@@ -24,7 +24,25 @@
 CAPTION "Pénznem"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "3.tulajdonságlap",-1,73,74,90,8
+  GROUPBOX "Appearance sample", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE
+  LTEXT "Positive:", -1, 13, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  EDITTEXT IDC_CURRENCYPOSSAMPLE, 42, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE |
WS_GROUP
+  LTEXT "Negative:", -1, 120, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  EDITTEXT IDC_CURRENCYNEGSAMPLE, 154, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE |
WS_GROUP
+  LTEXT "&Currency symbol:", -1, 20, 51, 96, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_CURRENCYSYMBOL, 124, 49, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Positive Amount:", -1, 20, 68, 96, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_CURRENCYPOSVALUE, 124, 66, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Negative Amount:", -1, 20, 85, 96, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_CURRENCYNEGVALUE, 124, 83, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Decimal separator:", -1, 20, 111, 96, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_CURRENCYDECSEP, 124, 109, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Number of fractional digits:", -1, 20, 128, 96, 10, WS_CHILD
|WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYDECNUM, 124, 126, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Grouping symbol:", -1, 20, 156, 100, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_CURRENCYGRPSEP, 124, 154, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Digit grouping:", -1, 20, 173, 96, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_CURRENCYGRPNUM, 124, 171, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
 END
 
 

Modified: trunk/reactos/dll/cpl/intl/nl.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/nl.rc?rev=254…
==============================================================================
--- trunk/reactos/dll/cpl/intl/nl.rc (original)
+++ trunk/reactos/dll/cpl/intl/nl.rc Wed Jan 10 02:00:21 2007
@@ -25,7 +25,25 @@
 CAPTION "Valuta"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Property Page 3",-1,73,74,90,8
+  GROUPBOX "Appearance sample", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE
+  LTEXT "Positive:", -1, 13, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  EDITTEXT IDC_CURRENCYPOSSAMPLE, 42, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE |
WS_GROUP
+  LTEXT "Negative:", -1, 120, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  EDITTEXT IDC_CURRENCYNEGSAMPLE, 154, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE |
WS_GROUP
+  LTEXT "&Currency symbol:", -1, 20, 51, 96, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_CURRENCYSYMBOL, 124, 49, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Positive Amount:", -1, 20, 68, 96, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_CURRENCYPOSVALUE, 124, 66, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Negative Amount:", -1, 20, 85, 96, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_CURRENCYNEGVALUE, 124, 83, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Decimal separator:", -1, 20, 111, 96, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_CURRENCYDECSEP, 124, 109, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Number of fractional digits:", -1, 20, 128, 96, 10, WS_CHILD
|WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYDECNUM, 124, 126, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Grouping symbol:", -1, 20, 156, 100, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_CURRENCYGRPSEP, 124, 154, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Digit grouping:", -1, 20, 173, 96, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_CURRENCYGRPNUM, 124, 171, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
 END
 
 

Modified: trunk/reactos/dll/cpl/intl/resource.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/resource.h?re…
==============================================================================
--- trunk/reactos/dll/cpl/intl/resource.h (original)
+++ trunk/reactos/dll/cpl/intl/resource.h Wed Jan 10 02:00:21 2007
@@ -8,7 +8,17 @@
 
 #define IDD_GENERALPAGE		100
 #define IDD_NUMBERSPAGE		101
-#define IDD_CURRENCYPAGE	102
+
+#define IDD_CURRENCYPAGE	140
+#define IDC_CURRENCYPOSSAMPLE	141
+#define IDC_CURRENCYNEGSAMPLE	142
+#define IDC_CURRENCYSYMBOL	143
+#define IDC_CURRENCYPOSVALUE	144
+#define IDC_CURRENCYNEGVALUE	145
+#define IDC_CURRENCYDECSEP	146
+#define IDC_CURRENCYDECNUM	148
+#define IDC_CURRENCYGRPSEP	149
+#define IDC_CURRENCYGRPNUM	150
 
 #define IDD_TIMEPAGE		103
 #define IDC_TIMESAMPLE		107

Modified: trunk/reactos/dll/cpl/intl/ru.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/ru.rc?rev=254…
==============================================================================
--- trunk/reactos/dll/cpl/intl/ru.rc (original)
+++ trunk/reactos/dll/cpl/intl/ru.rc Wed Jan 10 02:00:21 2007
@@ -25,7 +25,25 @@
 CAPTION "Äåíåæíàÿ åäèíèöà"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Âêëàäêà 3",-1,73,74,90,8
+  GROUPBOX "Appearance sample", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE
+  LTEXT "Positive:", -1, 13, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  EDITTEXT IDC_CURRENCYPOSSAMPLE, 42, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE |
WS_GROUP
+  LTEXT "Negative:", -1, 120, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  EDITTEXT IDC_CURRENCYNEGSAMPLE, 154, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE |
WS_GROUP
+  LTEXT "&Currency symbol:", -1, 20, 51, 96, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_CURRENCYSYMBOL, 124, 49, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Positive Amount:", -1, 20, 68, 96, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_CURRENCYPOSVALUE, 124, 66, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Negative Amount:", -1, 20, 85, 96, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_CURRENCYNEGVALUE, 124, 83, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Decimal separator:", -1, 20, 111, 96, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_CURRENCYDECSEP, 124, 109, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Number of fractional digits:", -1, 20, 128, 96, 10, WS_CHILD
|WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYDECNUM, 124, 126, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Grouping symbol:", -1, 20, 156, 100, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_CURRENCYGRPSEP, 124, 154, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Digit grouping:", -1, 20, 173, 96, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_CURRENCYGRPNUM, 124, 171, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
 END
 
 

Modified: trunk/reactos/dll/cpl/intl/sv.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/sv.rc?rev=254…
==============================================================================
--- trunk/reactos/dll/cpl/intl/sv.rc (original)
+++ trunk/reactos/dll/cpl/intl/sv.rc Wed Jan 10 02:00:21 2007
@@ -26,7 +26,25 @@
 CAPTION "Valuta"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Property Page 3",-1,73,74,90,8
+  GROUPBOX "Appearance sample", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE
+  LTEXT "Positive:", -1, 13, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  EDITTEXT IDC_CURRENCYPOSSAMPLE, 42, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE |
WS_GROUP
+  LTEXT "Negative:", -1, 120, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  EDITTEXT IDC_CURRENCYNEGSAMPLE, 154, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE |
WS_GROUP
+  LTEXT "&Currency symbol:", -1, 20, 51, 96, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_CURRENCYSYMBOL, 124, 49, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Positive Amount:", -1, 20, 68, 96, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_CURRENCYPOSVALUE, 124, 66, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Negative Amount:", -1, 20, 85, 96, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_CURRENCYNEGVALUE, 124, 83, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Decimal separator:", -1, 20, 111, 96, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_CURRENCYDECSEP, 124, 109, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Number of fractional digits:", -1, 20, 128, 96, 10, WS_CHILD
|WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYDECNUM, 124, 126, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Grouping symbol:", -1, 20, 156, 100, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_CURRENCYGRPSEP, 124, 154, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Digit grouping:", -1, 20, 173, 96, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_CURRENCYGRPNUM, 124, 171, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
 END
 
 
@@ -35,7 +53,23 @@
 CAPTION "Tid"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Property Page 4",-1,73,74,90,8
+  GROUPBOX "Appearance sample", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE
+  LTEXT "Time sample:", -1, 13, 21, 54, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  EDITTEXT IDC_TIMESAMPLE, 68, 19, 84, 14, ES_READONLY | WS_CHILD | WS_VISIBLE |
WS_GROUP
+  LTEXT "&Time format:", -1, 13, 52, 54, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_TIMEFORMAT, 68, 50, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE |
WS_TABSTOP
+  LTEXT "Time &separator:", -1, 13, 70, 54, 10, WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_TIMESEPARATOR, 68, 68, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE |
WS_TABSTOP
+  LTEXT "A&M symbol:", -1, 13, 88, 54, 10, WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_TIMEAMSYMBOL, 68, 86, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE |
WS_TABSTOP
+  LTEXT "&PM symbol:", -1, 13, 106, 54, 10, WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_TIMEPMSYMBOL, 68, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE |
WS_TABSTOP
+  GROUPBOX "", -1, 7, 124, 228, 60, WS_VISIBLE
+  LTEXT "Time format notation\n\n\
+h = hour    m = minute    s = second    t = am or pm\n\n\
+h = 12 hour   H = 24 hour\n\
+hh, mm, ss = leading zero   h, m, s = no leading zero",
+        -1, 13, 133, 214, 47, WS_CHILD |WS_VISIBLE | WS_GROUP
 END
 
 

Modified: trunk/reactos/dll/cpl/intl/uk.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/uk.rc?rev=254…
==============================================================================
--- trunk/reactos/dll/cpl/intl/uk.rc (original)
+++ trunk/reactos/dll/cpl/intl/uk.rc Wed Jan 10 02:00:21 2007
@@ -32,7 +32,25 @@
 CAPTION "Ãðîøîâà îäèíèöÿ"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Âêëàäêà âëàñòèâîñòåé 3",-1,73,74,90,8
+  GROUPBOX "Appearance sample", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE
+  LTEXT "Positive:", -1, 13, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  EDITTEXT IDC_CURRENCYPOSSAMPLE, 42, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE |
WS_GROUP
+  LTEXT "Negative:", -1, 120, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP
+  EDITTEXT IDC_CURRENCYNEGSAMPLE, 154, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE |
WS_GROUP
+  LTEXT "&Currency symbol:", -1, 20, 51, 96, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_CURRENCYSYMBOL, 124, 49, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Positive Amount:", -1, 20, 68, 96, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_CURRENCYPOSVALUE, 124, 66, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Negative Amount:", -1, 20, 85, 96, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_CURRENCYNEGVALUE, 124, 83, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Decimal separator:", -1, 20, 111, 96, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_CURRENCYDECSEP, 124, 109, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Number of fractional digits:", -1, 20, 128, 96, 10, WS_CHILD
|WS_VISIBLE | WS_GROUP
+  COMBOBOX IDC_CURRENCYDECNUM, 124, 126, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Grouping symbol:", -1, 20, 156, 100, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_CURRENCYGRPSEP, 124, 154, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "&Digit grouping:", -1, 20, 173, 96, 10, WS_CHILD |WS_VISIBLE |
WS_GROUP
+  COMBOBOX IDC_CURRENCYGRPNUM, 124, 171, 100, 83, CBS_DROPDOWN | CBS_SORT | WS_CHILD |
WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
 END
 
 



    