[ros-diffs] [gschneider] 51537: [charmap] - Carlo Bramini: implement a skeleton for the charmap advanced view, Italian translation included - German translation added by myself See issue #6065 for more details.

Author: gschneider
Date: Sun May  1 19:16:58 2011
New Revision: 51537

URL: http://svn.reactos.org/svn/reactos?rev=51537&view=rev
Log:
[charmap]
- Carlo Bramini: implement a skeleton for the charmap advanced view, Italian translation
included
- German translation added by myself
See issue #6065 for more details.

Modified:
    trunk/reactos/base/applications/charmap/charmap.c
    trunk/reactos/base/applications/charmap/charmap.rbuild
    trunk/reactos/base/applications/charmap/lang/bg-BG.rc
    trunk/reactos/base/applications/charmap/lang/ca-ES.rc
    trunk/reactos/base/applications/charmap/lang/cs-CZ.rc
    trunk/reactos/base/applications/charmap/lang/de-DE.rc
    trunk/reactos/base/applications/charmap/lang/el-GR.rc
    trunk/reactos/base/applications/charmap/lang/en-US.rc
    trunk/reactos/base/applications/charmap/lang/es-ES.rc
    trunk/reactos/base/applications/charmap/lang/fr-FR.rc
    trunk/reactos/base/applications/charmap/lang/id-ID.rc
    trunk/reactos/base/applications/charmap/lang/it-IT.rc
    trunk/reactos/base/applications/charmap/lang/ja-JP.rc
    trunk/reactos/base/applications/charmap/lang/ko-KR.rc
    trunk/reactos/base/applications/charmap/lang/lt-LT.rc
    trunk/reactos/base/applications/charmap/lang/nl-NL.rc
    trunk/reactos/base/applications/charmap/lang/no-NO.rc
    trunk/reactos/base/applications/charmap/lang/pl-PL.rc
    trunk/reactos/base/applications/charmap/lang/pt-BR.rc
    trunk/reactos/base/applications/charmap/lang/ru-RU.rc
    trunk/reactos/base/applications/charmap/lang/sk-SK.rc
    trunk/reactos/base/applications/charmap/lang/uk-UA.rc
    trunk/reactos/base/applications/charmap/lang/zh-CN.rc
    trunk/reactos/base/applications/charmap/lang/zh-TW.rc
    trunk/reactos/base/applications/charmap/precomp.h
    trunk/reactos/base/applications/charmap/resource.h

Modified: trunk/reactos/base/applications/charmap/charmap.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/…
==============================================================================
--- trunk/reactos/base/applications/charmap/charmap.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/charmap/charmap.c [iso-8859-1] Sun May  1 19:16:58
2011
@@ -11,7 +11,17 @@
 
 #define ID_ABOUT    0x1
 
+typedef struct {
+    BOOL    IsAdvancedView;
+} SETTINGS;
+
 HINSTANCE hInstance;
+HWND      hCharmapDlg;
+HWND      hAdvancedDlg;
+HWND      hStatusWnd;
+HICON     hSmIcon;
+HICON     hBgIcon;
+SETTINGS  Settings;
 
 /* Font-enumeration callback */
 static
@@ -227,75 +237,90 @@
 
 
 static
+void
+UpdateSettings(HWND hDlg)
+{
+    if (hDlg == hCharmapDlg)
+    {
+        Settings.IsAdvancedView =
+        SendDlgItemMessage(hDlg, IDC_CHECK_ADVANCED, BM_GETCHECK, 0, 0);
+    }
+
+    if (hDlg == hAdvancedDlg)
+    {
+    }
+}
+
+static
+void
+ChangeView(HWND hWnd)
+{
+    RECT rcCharmap;
+    RECT rcAdvanced;
+    RECT rcPanelExt;
+    RECT rcPanelInt;
+    RECT rcStatus;
+    UINT DeX, DeY;
+    UINT xPos, yPos;
+    UINT Width, Height;
+    UINT DeskTopWidth, DeskTopHeight;
+
+    GetClientRect(hCharmapDlg, &rcCharmap);
+    GetClientRect(hAdvancedDlg, &rcAdvanced);
+    GetWindowRect(hWnd, &rcPanelExt);
+    GetClientRect(hWnd, &rcPanelInt);
+    GetClientRect(hStatusWnd, &rcStatus);
+
+    DeskTopWidth = GetSystemMetrics(SM_CXFULLSCREEN);
+    DeskTopHeight = GetSystemMetrics(SM_CYFULLSCREEN);
+
+    DeX = (rcPanelExt.right - rcPanelExt.left) - rcPanelInt.right;
+    DeY = (rcPanelExt.bottom - rcPanelExt.top) - rcPanelInt.bottom;
+
+    MoveWindow(hCharmapDlg, 0, 0, rcCharmap.right, rcCharmap.bottom, FALSE);
+    MoveWindow(hAdvancedDlg, 0, rcCharmap.bottom, rcAdvanced.right, rcAdvanced.bottom,
FALSE);
+
+    ShowWindow(hAdvancedDlg, (Settings.IsAdvancedView) ? SW_SHOW : SW_HIDE);
+
+    xPos = rcPanelExt.left;
+    yPos = rcPanelExt.top;
+
+    Width = DeX + rcCharmap.right;
+    Height = DeY + rcCharmap.bottom + rcStatus.bottom;
+
+    if (Settings.IsAdvancedView)
+        Height += rcAdvanced.bottom;
+
+    if ((xPos + Width) > DeskTopWidth)
+        xPos += DeskTopWidth - (xPos + Width);
+
+    if ((yPos + Height) > DeskTopHeight)
+        yPos += DeskTopHeight - (yPos + Height);
+
+    MoveWindow(hWnd,
+               xPos, yPos,
+               Width, Height,
+               TRUE);
+}
+
+static
 INT_PTR
 CALLBACK
-DlgProc(HWND hDlg,
-        UINT Message,
-        WPARAM wParam,
-        LPARAM lParam)
-{
-    static HICON hSmIcon;
-    static HICON hBgIcon;
-    LPWSTR lpAboutText = NULL;
-
+CharMapDlgProc(HWND hDlg,
+               UINT Message,
+               WPARAM wParam,
+               LPARAM lParam)
+{
     switch(Message)
     {
         case WM_INITDIALOG:
         {
-            HMENU hSysMenu;
             DWORD evMask;
-
-            hSmIcon = LoadImageW(hInstance,
-                                 MAKEINTRESOURCEW(IDI_ICON),
-                                 IMAGE_ICON,
-                                 16,
-                                 16,
-                                 0);
-            if (hSmIcon)
-            {
-                 SendMessageW(hDlg,
-                              WM_SETICON,
-                              ICON_SMALL,
-                              (LPARAM)hSmIcon);
-            }
-
-            hBgIcon = LoadImageW(hInstance,
-                                 MAKEINTRESOURCEW(IDI_ICON),
-                                 IMAGE_ICON,
-                                 32,
-                                 32,
-                                 0);
-            if (hBgIcon)
-            {
-                SendMessageW(hDlg,
-                             WM_SETICON,
-                             ICON_BIG,
-                             (LPARAM)hBgIcon);
-            }
 
             FillFontStyleComboList(GetDlgItem(hDlg,
                                               IDC_FONTCOMBO));
 
             ChangeMapFont(hDlg);
-            hSysMenu = GetSystemMenu(hDlg,
-                                     FALSE);
-            if (hSysMenu != NULL)
-            {
-                if (LoadStringW(hInstance,
-                                IDS_ABOUT,
-                                lpAboutText,
-                                0))
-                {
-                    AppendMenuW(hSysMenu,
-                                MF_SEPARATOR,
-                                0,
-                                NULL);
-                    AppendMenuW(hSysMenu,
-                                MF_STRING,
-                                ID_ABOUT,
-                                lpAboutText);
-                }
-            }
 
             // Configure Richedi control for sending notification changes.
             evMask = SendDlgItemMessage(hDlg, IDC_TEXTBOX, EM_GETEVENTMASK, 0, 0);
@@ -344,43 +369,177 @@
                     CopyCharacters(hDlg);
                     break;
 
-                case IDOK:
-                    if (hSmIcon)
-                        DestroyIcon(hSmIcon);
-                    if (hBgIcon)
-                        DestroyIcon(hBgIcon);
-                    EndDialog(hDlg, 0);
+                case IDC_CHECK_ADVANCED:
+                    UpdateSettings(hDlg);
+                    ChangeView(GetParent(hDlg));
                     break;
             }
         }
         break;
 
-        case WM_SYSCOMMAND:
+        default:
+            break;
+    }
+
+    return FALSE;
+}
+
+static
+INT_PTR
+CALLBACK
+AdvancedDlgProc(HWND hDlg,
+               UINT Message,
+               WPARAM wParam,
+               LPARAM lParam)
+{
+    switch(Message)
+    {
+        case WM_INITDIALOG:
+            return TRUE;
+
+        default:
+            return FALSE;
+    }
+
+    return FALSE;
+}
+
+static int
+OnCreate(HWND hWnd, WPARAM wParam, LPARAM lParam)
+{
+    HMENU hSysMenu;
+    WCHAR lpAboutText[256];
+
+    hCharmapDlg = CreateDialog(hInstance,
+                               MAKEINTRESOURCE(IDD_CHARMAP),
+                               hWnd,
+                               CharMapDlgProc);
+
+    hAdvancedDlg = CreateDialog(hInstance,
+                               MAKEINTRESOURCE(IDD_ADVANCED),
+                               hWnd,
+                               AdvancedDlgProc);
+
+    hStatusWnd = CreateWindow(STATUSCLASSNAME,
+                              NULL,
+                              WS_CHILD | WS_VISIBLE,
+                              0, 0, 0, 0,
+                              hWnd,
+                              (HMENU)IDD_STATUSBAR,
+                              hInstance,
+                              NULL);
+
+    // Set the status bar for multiple parts output
+    SendMessage(hStatusWnd, SB_SIMPLE, (WPARAM)FALSE, (LPARAM)0);
+
+    ChangeView(hWnd);
+
+    hSysMenu = GetSystemMenu(hWnd, FALSE);
+
+    if (hSysMenu != NULL)
+    {
+        if (LoadStringW(hInstance, IDS_ABOUT, lpAboutText, SIZEOF(lpAboutText)))
         {
-            switch(wParam)
-            {
-                case ID_ABOUT:
-                    ShowAboutDlg(hDlg);
-                break;
-            }
+            AppendMenuW(hSysMenu, MF_SEPARATOR, 0, NULL);
+            AppendMenuW(hSysMenu, MF_STRING, ID_ABOUT, lpAboutText);
+        }
+    }
+
+    return 0;
+}
+
+static LRESULT CALLBACK
+PanelWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
+{
+    switch (msg) {
+    case WM_CREATE:
+        return OnCreate(hWnd, wParam, lParam);
+
+    case WM_CLOSE:
+        DestroyWindow(hWnd);
+        return 0;
+
+    case WM_SIZE:
+        SendMessage(hStatusWnd, msg, wParam, lParam);
+        break;
+
+    case WM_DESTROY:
+        PostQuitMessage(0);
+        return 0;
+
+    case WM_SYSCOMMAND:
+        switch(wParam) {
+        case ID_ABOUT:
+            ShowAboutDlg(hWnd);
+            break;
         }
         break;
 
-        case WM_CLOSE:
-            if (hSmIcon)
-                DestroyIcon(hSmIcon);
-            if (hBgIcon)
-                DestroyIcon(hBgIcon);
-            EndDialog(hDlg, 0);
-            break;
-
-        default:
-            return FALSE;
-    }
-
-    return FALSE;
-}
-
+    }
+
+    return DefWindowProc(hWnd, msg, wParam, lParam);
+}
+
+static HWND
+InitInstance(HINSTANCE hInst)
+{
+    WCHAR       szClass[] = L"CharMap";
+    WCHAR       szTitle[256];
+    WNDCLASSEXW wc;
+    HWND        hWnd;
+
+    LoadStringW(hInst, IDS_TITLE, szTitle, SIZEOF(szTitle));
+
+    hSmIcon = LoadImage(hInstance,
+                        MAKEINTRESOURCE(IDI_ICON),
+                        IMAGE_ICON,
+                        16,
+                        16,
+                        0);
+
+    hBgIcon = LoadImage(hInstance,
+                        MAKEINTRESOURCE(IDI_ICON),
+                        IMAGE_ICON,
+                        32,
+                        32,
+                        0);
+
+    // Create workspace
+    ZeroMemory(&wc, sizeof(wc));
+
+    wc.cbSize        = sizeof(wc);
+    wc.lpfnWndProc   = PanelWndProc;
+    wc.hInstance     = hInst;
+    wc.hIcon         = hBgIcon;
+    wc.hCursor       = LoadCursor(NULL, IDC_ARROW);
+    wc.hbrBackground = (HBRUSH)GetStockObject(NULL_BRUSH);
+    wc.lpszMenuName  = NULL;
+    wc.lpszClassName = szClass;
+    wc.hIconSm       = hSmIcon;
+
+    RegisterClassExW(&wc);
+
+    hWnd = CreateWindowW(
+            szClass,
+            szTitle,
+            WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX,
+            CW_USEDEFAULT,
+            CW_USEDEFAULT,
+            CW_USEDEFAULT,
+            CW_USEDEFAULT,
+            NULL,
+            NULL,
+            hInst,
+            NULL);
+
+    if (hWnd != NULL)
+    {
+        ShowWindow(hWnd, SW_SHOW);
+        UpdateWindow(hWnd);
+    }
+
+    return hWnd;
+}
 
 INT
 WINAPI
@@ -392,6 +551,7 @@
     INITCOMMONCONTROLSEX iccx;
     INT Ret = 1;
     HMODULE hRichEd20;
+    MSG Msg;
 
     hInstance = hInst;
 
@@ -405,10 +565,19 @@
 
         if (hRichEd20 != NULL)
         {
-            Ret = DialogBoxW(hInstance,
-                             MAKEINTRESOURCEW(IDD_CHARMAP),
-                             NULL,
-                             DlgProc) >= 0;
+            InitInstance(hInst);
+
+            for (;;)
+            {
+                if (GetMessage(&Msg, NULL, 0, 0) <= 0)
+                {
+                    Ret = Msg.wParam;
+                    break;
+                }
+
+                TranslateMessage(&Msg);
+                DispatchMessage(&Msg);
+            }
 
             FreeLibrary(hRichEd20);
         }

Modified: trunk/reactos/base/applications/charmap/charmap.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/…
==============================================================================
--- trunk/reactos/base/applications/charmap/charmap.rbuild [iso-8859-1] (original)
+++ trunk/reactos/base/applications/charmap/charmap.rbuild [iso-8859-1] Sun May  1
19:16:58 2011
@@ -5,12 +5,10 @@
 	<library>gdi32</library>
 	<library>user32</library>
 	<library>comctl32</library>
-	<compilationunit name="unit.c">
-		<file>about.c</file>
-		<file>charmap.c</file>
-		<file>lrgcell.c</file>
-		<file>map.c</file>
-	</compilationunit>
+	<file>about.c</file>
+	<file>charmap.c</file>
+	<file>lrgcell.c</file>
+	<file>map.c</file>
 	<file>charmap.rc</file>
 	<pch>precomp.h</pch>
 </module>

Modified: trunk/reactos/base/applications/charmap/lang/bg-BG.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/…
==============================================================================
--- trunk/reactos/base/applications/charmap/lang/bg-BG.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/charmap/lang/bg-BG.rc [iso-8859-1] Sun May  1 19:16:58
2011
@@ -1,9 +1,8 @@
 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
 
-IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233
-CAPTION "Çíàêîâ èçáîðíèê"
+IDD_CHARMAP DIALOGEX 6, 6, 292, 224
 FONT 8,"MS Shell Dlg",0,0
-STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX
+STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
   LTEXT         "Øðèôò :", IDC_STATIC, 6, 7, 24, 9
   COMBOBOX      IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL |
CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
@@ -13,8 +12,22 @@
   CONTROL       "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER |
WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13
   DEFPUSHBUTTON "Èçáîð", IDC_SELECT, 194, 186, 44, 13
   PUSHBUTTON    "Çàïîìíÿíå", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
-  //AUTOCHECKBOX  "Ðaçøèðåí èçãëåä", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD |
WS_VISIBLE | WS_TABSTOP
-  //EDITTEXT      IDC_DISPLAY,  8, 217, 278, 13, WS_VISIBLE | WS_TABSTOP | ES_READONLY
+  CONTROL       "Advanced view",IDC_CHECK_ADVANCED,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP, 8, 208, 95, 10
+END
+
+IDD_ADVANCED DIALOGEX  0, 0, 292, 64
+STYLE DS_SHELLFONT | WS_CHILD
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT         "Charset:",IDC_STATIC,8,8,48,8
+  COMBOBOX      IDC_COMBO_CHARSET,72,4,116,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+  LTEXT         "Group by:",IDC_STATIC,8,28,50,8
+  COMBOBOX      IDC_COMBO_GROUPBY,72,24,116,80,CBS_DROPDOWNLIST | WS_VSCROLL |
WS_TABSTOP
+  PUSHBUTTON    "Search",IDC_BUTTON_SEARCH,200,44,50,14
+  EDITTEXT      IDC_EDIT_SEARCH,72,44,116,14,ES_AUTOHSCROLL
+  LTEXT         "Search for:",IDC_STATIC,8,48,42,8
+  LTEXT         "Unicode:",IDC_STATIC,200,8,30,8
+  EDITTEXT      IDC_EDIT_UNICODE,236,4,28,12,ES_AUTOHSCROLL
 END
 
 IDD_ABOUTBOX DIALOGEX 22,16,210,182
@@ -32,4 +45,5 @@
 BEGIN
   IDS_LICENSE   "This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as published by the Free
Software Foundation; either version 2 of the License, or (at your option) any later
version.\r\n\r\nThis program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou
should have received a copy of the GNU General Public License along with this program; if
not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301 USA."
   IDS_ABOUT     "&Çà..."
+  IDS_TITLE     "Character Map"
 END

Modified: trunk/reactos/base/applications/charmap/lang/ca-ES.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/…
==============================================================================
--- trunk/reactos/base/applications/charmap/lang/ca-ES.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/charmap/lang/ca-ES.rc [iso-8859-1] Sun May  1 19:16:58
2011
@@ -1,9 +1,8 @@
 LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT
 
-IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233
-CAPTION "Mapa de caràcters"
+IDD_CHARMAP DIALOGEX 6, 6, 292, 224
 FONT 8,"MS Shell Dlg",0,0
-STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX
+STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
   LTEXT         "Font :", IDC_STATIC, 6, 7, 24, 9
   COMBOBOX      IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL |
CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
@@ -13,8 +12,22 @@
   CONTROL       "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER |
WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13
   DEFPUSHBUTTON "Selecciona", IDC_SELECT, 194, 186, 44, 13
   PUSHBUTTON    "Copia", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
-  //AUTOCHECKBOX  "Vista avançada", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD |
WS_VISIBLE | WS_TABSTOP
-  //EDITTEXT      IDC_DISPLAY,  8, 217, 278, 13, WS_VISIBLE | WS_TABSTOP | ES_READONLY
+  CONTROL       "Advanced view",IDC_CHECK_ADVANCED,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP, 8, 208, 95, 10
+END
+
+IDD_ADVANCED DIALOGEX  0, 0, 292, 64
+STYLE DS_SHELLFONT | WS_CHILD
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT         "Charset:",IDC_STATIC,8,8,48,8
+  COMBOBOX      IDC_COMBO_CHARSET,72,4,116,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+  LTEXT         "Group by:",IDC_STATIC,8,28,50,8
+  COMBOBOX      IDC_COMBO_GROUPBY,72,24,116,80,CBS_DROPDOWNLIST | WS_VSCROLL |
WS_TABSTOP
+  PUSHBUTTON    "Search",IDC_BUTTON_SEARCH,200,44,50,14
+  EDITTEXT      IDC_EDIT_SEARCH,72,44,116,14,ES_AUTOHSCROLL
+  LTEXT         "Search for:",IDC_STATIC,8,48,42,8
+  LTEXT         "Unicode:",IDC_STATIC,200,8,30,8
+  EDITTEXT      IDC_EDIT_UNICODE,236,4,28,12,ES_AUTOHSCROLL
 END
 
 IDD_ABOUTBOX DIALOGEX 22,16,210,182
@@ -32,4 +45,5 @@
 BEGIN
   IDS_LICENSE   "This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as published by the Free
Software Foundation; either version 2 of the License, or (at your option) any later
version.\r\n\r\nThis program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou
should have received a copy of the GNU General Public License along with this program; if
not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301 USA."
   IDS_ABOUT     "&En quant a..."
+  IDS_TITLE     "Character Map"
 END

Modified: trunk/reactos/base/applications/charmap/lang/cs-CZ.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/…
==============================================================================
--- trunk/reactos/base/applications/charmap/lang/cs-CZ.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/charmap/lang/cs-CZ.rc [iso-8859-1] Sun May  1 19:16:58
2011
@@ -5,10 +5,9 @@
 
 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
 
-IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233
-CAPTION "Mapa znakù"
+IDD_CHARMAP DIALOGEX 6, 6, 292, 224
 FONT 8,"MS Shell Dlg",0,0
-STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX
+STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
   LTEXT         "Písmo:", IDC_STATIC, 6, 7, 24, 9
   COMBOBOX      IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL |
CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
@@ -18,8 +17,22 @@
   CONTROL       "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER |
WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13
   DEFPUSHBUTTON "Oznaèit", IDC_SELECT, 194, 186, 44, 13
   PUSHBUTTON    "Kopírovat", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
-  //AUTOCHECKBOX  "Pokroèilé zobrazení", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD
| WS_VISIBLE | WS_TABSTOP
-  //EDITTEXT      IDC_DISPLAY,  8, 217, 278, 13, WS_VISIBLE | WS_TABSTOP | ES_READONLY
+  CONTROL       "Advanced view",IDC_CHECK_ADVANCED,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP, 8, 208, 95, 10
+END
+
+IDD_ADVANCED DIALOGEX  0, 0, 292, 64
+STYLE DS_SHELLFONT | WS_CHILD
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT         "Charset:",IDC_STATIC,8,8,48,8
+  COMBOBOX      IDC_COMBO_CHARSET,72,4,116,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+  LTEXT         "Group by:",IDC_STATIC,8,28,50,8
+  COMBOBOX      IDC_COMBO_GROUPBY,72,24,116,80,CBS_DROPDOWNLIST | WS_VSCROLL |
WS_TABSTOP
+  PUSHBUTTON    "Search",IDC_BUTTON_SEARCH,200,44,50,14
+  EDITTEXT      IDC_EDIT_SEARCH,72,44,116,14,ES_AUTOHSCROLL
+  LTEXT         "Search for:",IDC_STATIC,8,48,42,8
+  LTEXT         "Unicode:",IDC_STATIC,200,8,30,8
+  EDITTEXT      IDC_EDIT_UNICODE,236,4,28,12,ES_AUTOHSCROLL
 END
 
 IDD_ABOUTBOX DIALOGEX 22,16,210,182
@@ -37,4 +50,5 @@
 BEGIN
   IDS_LICENSE   "This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as published by the Free
Software Foundation; either version 2 of the License, or (at your option) any later
version.\r\n\r\nThis program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou
should have received a copy of the GNU General Public License along with this program; if
not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301 USA."
   IDS_ABOUT     "&O programu..."
+  IDS_TITLE     "Character Map"
 END

Modified: trunk/reactos/base/applications/charmap/lang/de-DE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/…
==============================================================================
--- trunk/reactos/base/applications/charmap/lang/de-DE.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/charmap/lang/de-DE.rc [iso-8859-1] Sun May  1 19:16:58
2011
@@ -1,20 +1,33 @@
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
-IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233
-CAPTION "Zeichentabelle"
+IDD_CHARMAP DIALOGEX 6, 6, 292, 224
 FONT 8,"MS Shell Dlg",0,0
-STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX
+STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
   LTEXT         "Schrift:", IDC_STATIC, 6, 7, 24, 9
   COMBOBOX      IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL |
CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
-  PUSHBUTTON    "Hilfe", IDC_CMHELP, 249, 5, 35, 13
+  PUSHBUTTON    "&Hilfe", IDC_CMHELP, 249, 5, 35, 13
   CONTROL       "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE
| WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156
-  LTEXT         "Zeichenauswahl:", IDC_STATIC, 6, 188, 66, 9
+  LTEXT         "Zeichenaus&wahl:", IDC_STATIC, 6, 188, 66, 9
   CONTROL       "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER |
WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13
-  DEFPUSHBUTTON "Auswählen", IDC_SELECT, 194, 186, 44, 13
-  PUSHBUTTON    "Kopieren", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
-  //AUTOCHECKBOX  "Erweiterte Ansicht", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD |
WS_VISIBLE | WS_TABSTOP
-  //EDITTEXT      IDC_DISPLAY,  8, 217, 278, 13, WS_VISIBLE | WS_TABSTOP | ES_READONLY
+  DEFPUSHBUTTON "&Auswählen", IDC_SELECT, 194, 186, 44, 13
+  PUSHBUTTON    "&Kopieren", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
+  CONTROL       "&Erweiterte
Ansicht",IDC_CHECK_ADVANCED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 208,
95, 10
+END
+
+IDD_ADVANCED DIALOGEX  0, 0, 292, 64
+STYLE DS_SHELLFONT | WS_CHILD
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT         "&Zeichensatz:",IDC_STATIC,8,8,48,8
+  COMBOBOX      IDC_COMBO_CHARSET,72,4,116,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+  LTEXT         "&Gruppieren nach:",IDC_STATIC,8,28,58,8
+  COMBOBOX      IDC_COMBO_GROUPBY,72,24,116,80,CBS_DROPDOWNLIST | WS_VSCROLL |
WS_TABSTOP
+  PUSHBUTTON    "&Suchen",IDC_BUTTON_SEARCH,200,44,50,14
+  EDITTEXT      IDC_EDIT_SEARCH,72,44,116,14,ES_AUTOHSCROLL
+  LTEXT         "Su&chen nach:",IDC_STATIC,8,48,46,8
+  LTEXT         "&Unicode:",IDC_STATIC,200,8,30,8
+  EDITTEXT      IDC_EDIT_UNICODE,236,4,28,12,ES_AUTOHSCROLL
 END
 
 IDD_ABOUTBOX DIALOGEX 22,16,210,182
@@ -32,4 +45,5 @@
 BEGIN
   IDS_LICENSE   "Dieses Programm ist kostenlos; Sie können es frei verteilen mit od.
ohne Änderungen unter der GNU Lesser General Public License wie es von der Free Software
Foundation veröffentlicht wurde; entweder Version 2.1 der Lizenz, oder eine spätere
Version (ihrer Wahl).\r\n\r\nThis program is distributed in the hope that it will be
useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
details.\r\n\r\nYou should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
Street, Fifth Floor, Boston, MA 02110-1301 USA."
   IDS_ABOUT     "Ü&ber..."
+  IDS_TITLE     "Zeichentabelle"
 END

Modified: trunk/reactos/base/applications/charmap/lang/el-GR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/…
==============================================================================
--- trunk/reactos/base/applications/charmap/lang/el-GR.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/charmap/lang/el-GR.rc [iso-8859-1] Sun May  1 19:16:58
2011
@@ -1,9 +1,8 @@
 LANGUAGE LANG_GREEK, SUBLANG_DEFAULT
 
-IDD_CHARMAP DIALOGEX 6, 6, 293, 205
-STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Ðßíáêáò ÷áñáêôÞñùí"
-FONT 8, "MS Shell Dlg"
+IDD_CHARMAP DIALOGEX 6, 6, 292, 224
+FONT 8,"MS Shell Dlg",0,0
+STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
     LTEXT           "ÃñáììáôïóåéñÜ :",IDC_STATIC,6,7,60,9
     COMBOBOX        IDC_FONTCOMBO,65,5,181,210,CBS_DROPDOWNLIST | CBS_SORT |
@@ -15,6 +14,22 @@
     CONTROL         "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER |
WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13
     DEFPUSHBUTTON   "ÅðéëïãÞ",IDC_SELECT,194,186,44,13
     PUSHBUTTON      "ÁíôéãñáöÞ",IDC_COPY,242,186,44,13,WS_DISABLED
+    CONTROL         "Advanced view",IDC_CHECK_ADVANCED,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP, 8, 208, 95, 10
+END
+
+IDD_ADVANCED DIALOGEX  0, 0, 292, 64
+STYLE DS_SHELLFONT | WS_CHILD
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT         "Charset:",IDC_STATIC,8,8,48,8
+  COMBOBOX      IDC_COMBO_CHARSET,72,4,116,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+  LTEXT         "Group by:",IDC_STATIC,8,28,50,8
+  COMBOBOX      IDC_COMBO_GROUPBY,72,24,116,80,CBS_DROPDOWNLIST | WS_VSCROLL |
WS_TABSTOP
+  PUSHBUTTON    "Search",IDC_BUTTON_SEARCH,200,44,50,14
+  EDITTEXT      IDC_EDIT_SEARCH,72,44,116,14,ES_AUTOHSCROLL
+  LTEXT         "Search for:",IDC_STATIC,8,48,42,8
+  LTEXT         "Unicode:",IDC_STATIC,200,8,30,8
+  EDITTEXT      IDC_EDIT_UNICODE,236,4,28,12,ES_AUTOHSCROLL
 END
 
 IDD_ABOUTBOX DIALOGEX 22, 16, 210, 182
@@ -34,4 +49,5 @@
 BEGIN
   IDS_LICENSE   "This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as published by the Free
Software Foundation; either version 2 of the License, or (at your option) any later
version.\r\n\r\nThis program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou
should have received a copy of the GNU General Public License along with this program; if
not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301 USA."
   IDS_ABOUT     "&Ðëçñïöïñßåò..."
+  IDS_TITLE     "Character Map"
 END

Modified: trunk/reactos/base/applications/charmap/lang/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/…
==============================================================================
--- trunk/reactos/base/applications/charmap/lang/en-US.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/charmap/lang/en-US.rc [iso-8859-1] Sun May  1 19:16:58
2011
@@ -1,9 +1,8 @@
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
-IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233
-CAPTION "Character Map"
+IDD_CHARMAP DIALOGEX 6, 6, 292, 224
 FONT 8,"MS Shell Dlg",0,0
-STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX
+STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
   LTEXT         "Font:", IDC_STATIC, 6, 7, 24, 9
   COMBOBOX      IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL |
CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
@@ -13,8 +12,22 @@
   CONTROL       "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER |
WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13
   DEFPUSHBUTTON "Select", IDC_SELECT, 194, 186, 44, 13
   PUSHBUTTON    "Copy", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
-  //AUTOCHECKBOX  "Advanced view", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD |
WS_VISIBLE | WS_TABSTOP
-  //EDITTEXT      IDC_DISPLAY,  8, 217, 278, 13, WS_VISIBLE | WS_TABSTOP | ES_READONLY
+  CONTROL       "Advanced view",IDC_CHECK_ADVANCED,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP, 8, 208, 95, 10
+END
+
+IDD_ADVANCED DIALOGEX  0, 0, 292, 64
+STYLE DS_SHELLFONT | WS_CHILD
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT         "Charset:",IDC_STATIC,8,8,48,8
+  COMBOBOX      IDC_COMBO_CHARSET,72,4,116,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+  LTEXT         "Group by:",IDC_STATIC,8,28,50,8
+  COMBOBOX      IDC_COMBO_GROUPBY,72,24,116,80,CBS_DROPDOWNLIST | WS_VSCROLL |
WS_TABSTOP
+  PUSHBUTTON    "Search",IDC_BUTTON_SEARCH,200,44,50,14
+  EDITTEXT      IDC_EDIT_SEARCH,72,44,116,14,ES_AUTOHSCROLL
+  LTEXT         "Search for:",IDC_STATIC,8,48,42,8
+  LTEXT         "Unicode:",IDC_STATIC,200,8,30,8
+  EDITTEXT      IDC_EDIT_UNICODE,236,4,28,12,ES_AUTOHSCROLL
 END
 
 IDD_ABOUTBOX DIALOGEX 22,16,210,182
@@ -32,4 +45,5 @@
 BEGIN
   IDS_LICENSE   "This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as published by the Free
Software Foundation; either version 2 of the License, or (at your option) any later
version.\r\n\r\nThis program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou
should have received a copy of the GNU General Public License along with this program; if
not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301 USA."
   IDS_ABOUT     "A&bout..."
+  IDS_TITLE     "Character Map"
 END

Modified: trunk/reactos/base/applications/charmap/lang/es-ES.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/…
==============================================================================
--- trunk/reactos/base/applications/charmap/lang/es-ES.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/charmap/lang/es-ES.rc [iso-8859-1] Sun May  1 19:16:58
2011
@@ -1,9 +1,8 @@
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
-IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233
-CAPTION "Mapa de Caracteres"
+IDD_CHARMAP DIALOGEX 6, 6, 292, 224
 FONT 8,"MS Shell Dlg",0,0
-STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX
+STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
   LTEXT         "Fuente :", IDC_STATIC, 6, 7, 24, 9
   COMBOBOX      IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL |
CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
@@ -13,8 +12,22 @@
   CONTROL       "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER |
WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13
   DEFPUSHBUTTON "Seleccionar", IDC_SELECT, 194, 186, 44, 13
   PUSHBUTTON    "Copiar", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
-  //AUTOCHECKBOX  "Vista Avanzada", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD |
WS_VISIBLE | WS_TABSTOP
-  //EDITTEXT      IDC_DISPLAY,  8, 217, 278, 13, WS_VISIBLE | WS_TABSTOP | ES_READONLY
+  CONTROL       "Advanced view",IDC_CHECK_ADVANCED,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP, 8, 208, 95, 10
+END
+
+IDD_ADVANCED DIALOGEX  0, 0, 292, 64
+STYLE DS_SHELLFONT | WS_CHILD
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT         "Charset:",IDC_STATIC,8,8,48,8
+  COMBOBOX      IDC_COMBO_CHARSET,72,4,116,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+  LTEXT         "Group by:",IDC_STATIC,8,28,50,8
+  COMBOBOX      IDC_COMBO_GROUPBY,72,24,116,80,CBS_DROPDOWNLIST | WS_VSCROLL |
WS_TABSTOP
+  PUSHBUTTON    "Search",IDC_BUTTON_SEARCH,200,44,50,14
+  EDITTEXT      IDC_EDIT_SEARCH,72,44,116,14,ES_AUTOHSCROLL
+  LTEXT         "Search for:",IDC_STATIC,8,48,42,8
+  LTEXT         "Unicode:",IDC_STATIC,200,8,30,8
+  EDITTEXT      IDC_EDIT_UNICODE,236,4,28,12,ES_AUTOHSCROLL
 END
 
 IDD_ABOUTBOX DIALOGEX 22,16,210,182
@@ -32,4 +45,5 @@
 BEGIN
   IDS_LICENSE   "This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as published by the Free
Software Foundation; either version 2 of the License, or (at your option) any later
version.\r\n\r\nThis program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou
should have received a copy of the GNU General Public License along with this program; if
not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301 USA."
   IDS_ABOUT     "&Acerca de ..."
+  IDS_TITLE     "Character Map"
 END

Modified: trunk/reactos/base/applications/charmap/lang/fr-FR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/…
==============================================================================
--- trunk/reactos/base/applications/charmap/lang/fr-FR.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/charmap/lang/fr-FR.rc [iso-8859-1] Sun May  1 19:16:58
2011
@@ -1,9 +1,8 @@
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
-IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233
-CAPTION "Table des Caractères"
+IDD_CHARMAP DIALOGEX 6, 6, 292, 224
 FONT 8,"MS Shell Dlg",0,0
-STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX
+STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
   LTEXT         "Police :", IDC_STATIC, 6, 7, 24, 9
   COMBOBOX      IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL |
CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
@@ -13,8 +12,22 @@
   CONTROL       "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER |
WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13
   DEFPUSHBUTTON "Sélectionner", IDC_SELECT, 194, 186, 44, 13
   PUSHBUTTON    "Copier", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
-  //AUTOCHECKBOX  "Vue avancée", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD |
WS_VISIBLE | WS_TABSTOP
-  //EDITTEXT      IDC_DISPLAY,  8, 217, 278, 13, WS_VISIBLE | WS_TABSTOP | ES_READONLY
+  CONTROL       "Advanced view",IDC_CHECK_ADVANCED,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP, 8, 208, 95, 10
+END
+
+IDD_ADVANCED DIALOGEX  0, 0, 292, 64
+STYLE DS_SHELLFONT | WS_CHILD
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT         "Charset:",IDC_STATIC,8,8,48,8
+  COMBOBOX      IDC_COMBO_CHARSET,72,4,116,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+  LTEXT         "Group by:",IDC_STATIC,8,28,50,8
+  COMBOBOX      IDC_COMBO_GROUPBY,72,24,116,80,CBS_DROPDOWNLIST | WS_VSCROLL |
WS_TABSTOP
+  PUSHBUTTON    "Search",IDC_BUTTON_SEARCH,200,44,50,14
+  EDITTEXT      IDC_EDIT_SEARCH,72,44,116,14,ES_AUTOHSCROLL
+  LTEXT         "Search for:",IDC_STATIC,8,48,42,8
+  LTEXT         "Unicode:",IDC_STATIC,200,8,30,8
+  EDITTEXT      IDC_EDIT_UNICODE,236,4,28,12,ES_AUTOHSCROLL
 END
 
 IDD_ABOUTBOX DIALOGEX 22,16,210,182
@@ -32,4 +45,5 @@
 BEGIN
   IDS_LICENSE   "Ce programme est un logiciel libre ; vous pouvez le redistribuer
et/ou le modifier tout en respectant les termes de la ""GNU General Public
License"" publiée par la Free Software Foundation; dans sa version 2  (ou selon
votre préférence) toute version ultérieure.\r\n\r\nCe programme est distribué dans
l'espoir qu'il sera utile, cependant SANS GARANTIE D'AUCUNE SORTE ; sans même
une garantie implicite de COMMERCIABILITÉ ou DE CONFORMITÉ À UNE UTILISATION PARTICULIÈRE.
\r\n\r\nVoir la Licence Publique Générale GNU pour plus de détails. Vous devriez avoir
reçu un exemplaire de la Licence Publique Générale GNU avec ce programme ; si ce n'est
pas le cas, écrivez à la Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301 USA."
   IDS_ABOUT     "À propos..."
+  IDS_TITLE     "Character Map"
 END

Modified: trunk/reactos/base/applications/charmap/lang/id-ID.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/…
==============================================================================
--- trunk/reactos/base/applications/charmap/lang/id-ID.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/charmap/lang/id-ID.rc [iso-8859-1] Sun May  1 19:16:58
2011
@@ -1,9 +1,8 @@
 LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT
 
-IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233
-CAPTION "Peta Karakter"
+IDD_CHARMAP DIALOGEX 6, 6, 292, 224
 FONT 8,"MS Shell Dlg",0,0
-STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX
+STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
   LTEXT         "Font :", IDC_STATIC, 6, 7, 24, 9
   COMBOBOX      IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL |
CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
@@ -13,8 +12,22 @@
   CONTROL       "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER |
WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13
   DEFPUSHBUTTON "Pilih", IDC_SELECT, 194, 186, 44, 13
   PUSHBUTTON    "Copy", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
-  //AUTOCHECKBOX  "Advanced view", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD |
WS_VISIBLE | WS_TABSTOP
-  //EDITTEXT      IDC_DISPLAY,  8, 217, 278, 13, WS_VISIBLE | WS_TABSTOP | ES_READONLY
+  CONTROL       "Advanced view",IDC_CHECK_ADVANCED,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP, 8, 208, 95, 10
+END
+
+IDD_ADVANCED DIALOGEX  0, 0, 292, 64
+STYLE DS_SHELLFONT | WS_CHILD
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT         "Charset:",IDC_STATIC,8,8,48,8
+  COMBOBOX      IDC_COMBO_CHARSET,72,4,116,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+  LTEXT         "Group by:",IDC_STATIC,8,28,50,8
+  COMBOBOX      IDC_COMBO_GROUPBY,72,24,116,80,CBS_DROPDOWNLIST | WS_VSCROLL |
WS_TABSTOP
+  PUSHBUTTON    "Search",IDC_BUTTON_SEARCH,200,44,50,14
+  EDITTEXT      IDC_EDIT_SEARCH,72,44,116,14,ES_AUTOHSCROLL
+  LTEXT         "Search for:",IDC_STATIC,8,48,42,8
+  LTEXT         "Unicode:",IDC_STATIC,200,8,30,8
+  EDITTEXT      IDC_EDIT_UNICODE,236,4,28,12,ES_AUTOHSCROLL
 END
 
 IDD_ABOUTBOX DIALOGEX 22,16,210,182
@@ -32,4 +45,5 @@
 BEGIN
   IDS_LICENSE   "Program ini adalah software bebas; anda dapat mendistribusikan
dan/atau mengubahnya di bawah term GNU General Public License seperti dipublikasikan oleh
Free Software Foundation; baik Lisensi versi 2, atau (menurut opini anda) setiap versi
berikutnya.\r\n\r\nProgram ini didistribusikan dengan harapan ia akan berguna, tetapi
TANPA JAMINAN APAPUN; bahkan tanpa jaminan berarti dari MERCANTABILITAS atau KECUKUPAN
UNTUK KEPERLUAN TERTENTU.  Lihat GNU General Public License untuk lebih
jelasnya.\r\n\r\nAnda seharusnya menerima duplikat GNU General Public License bersamaan
dengan program ini; jika tidak, tulis ke Free Software Foundation, Inc., 51 Franklin
Street, Fifth Floor, Boston, MA 02110-1301 USA."
   IDS_ABOUT     "Te&ntang..."
+  IDS_TITLE     "Character Map"
 END

Modified: trunk/reactos/base/applications/charmap/lang/it-IT.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/…
==============================================================================
--- trunk/reactos/base/applications/charmap/lang/it-IT.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/charmap/lang/it-IT.rc [iso-8859-1] Sun May  1 19:16:58
2011
@@ -1,11 +1,10 @@
 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 
-IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233
-CAPTION "Character Map"
+IDD_CHARMAP DIALOGEX 6, 6, 292, 224
 FONT 8,"MS Shell Dlg",0,0
-STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX
+STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
-  LTEXT         "Font :", IDC_STATIC, 6, 7, 24, 9
+  LTEXT         "Font:", IDC_STATIC, 6, 7, 24, 9
   COMBOBOX      IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL |
CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
   PUSHBUTTON    "Aiuto", IDC_CMHELP, 249, 5, 35, 13
   CONTROL       "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE
| WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156
@@ -13,8 +12,22 @@
   CONTROL       "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER |
WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13
   DEFPUSHBUTTON "Selezionare", IDC_SELECT, 194, 186, 44, 13
   PUSHBUTTON    "Copiare", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
-  //AUTOCHECKBOX  "Visualizzazione avanzata", IDC_ADVVIEW, 10, 204, 64, 9,
WS_CHILD | WS_VISIBLE | WS_TABSTOP
-  //EDITTEXT      IDC_DISPLAY,  8, 217, 278, 13, WS_VISIBLE | WS_TABSTOP | ES_READONLY
+  CONTROL       "Visualizzazione
avanzata",IDC_CHECK_ADVANCED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8,
208, 95, 10
+END
+
+IDD_ADVANCED DIALOGEX  0, 0, 292, 64
+STYLE DS_SHELLFONT | WS_CHILD
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT         "Set di caratteri:",IDC_STATIC,8,8,48,8
+  COMBOBOX      IDC_COMBO_CHARSET,72,4,116,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+  LTEXT         "Raggruppa per:",IDC_STATIC,8,28,50,8
+  COMBOBOX      IDC_COMBO_GROUPBY,72,24,116,80,CBS_DROPDOWNLIST | WS_VSCROLL |
WS_TABSTOP
+  PUSHBUTTON    "Ce&rca",IDC_BUTTON_SEARCH,200,44,50,14
+  EDITTEXT      IDC_EDIT_SEARCH,72,44,116,14,ES_AUTOHSCROLL
+  LTEXT         "C&erca:",IDC_STATIC,8,48,22,8
+  LTEXT         "Unicode:",IDC_STATIC,200,8,30,8
+  EDITTEXT      IDC_EDIT_UNICODE,236,4,28,12,ES_AUTOHSCROLL
 END
 
 IDD_ABOUTBOX DIALOGEX 22,16,210,182
@@ -22,7 +35,7 @@
 FONT 8,"MS Shell Dlg",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 BEGIN
-  LTEXT         "Character Map v0.1\nCopyright (C) 2007 Ged Murphy
(gedmurphy(a)reactos.org)&quot;quot;, IDC_STATIC, 48, 7, 150, 36
+  LTEXT         "Mappa caratteri v0.1\nCopyright (C) 2007 Ged Murphy
(gedmurphy(a)reactos.org)&quot;quot;, IDC_STATIC, 48, 7, 150, 36
   PUSHBUTTON    "Chiudi", IDOK, 75, 162, 44, 15
   ICON          IDI_ICON, IDC_STATIC, 10, 10, 7, 30
   EDITTEXT      IDC_LICENSE_EDIT, 8, 44, 194, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP |
ES_READONLY | ES_MULTILINE
@@ -32,4 +45,5 @@
 BEGIN
   IDS_LICENSE,  "Questo programma è software libero; può redistribuirlo e/o
modificarlo sotto\ni termini della licenza pubblica GNU come pubblicata dalla Free
Software Foundation; sia la versione 2 sia una versione successiva (a sua
scelta).\r\n\r\nQuesto programma è distribuito\nnella speranza che sia utile, ma SENZA
ALCUNA GARANZIA; senza neanche la garanzia implicita\ndi NEGOZIABILITA' o
APPLICABILITA' per un particolare scopo.  Si veda la licenza generale pubblica GNU per
maggiori dettagli.\r\n\r\nDovrebbe aver ricevuto una copia assieme a questo programma; se
così non fosse, scriva alla Free Software Foundation, Inc., 51 Franklin Street, Fifth
Floor, Boston, MA 02110-1301 USA."
   IDS_ABOUT     "&Informazioni su..."
+  IDS_TITLE     "Mappa caratteri"
 END

Modified: trunk/reactos/base/applications/charmap/lang/ja-JP.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/…
==============================================================================
--- trunk/reactos/base/applications/charmap/lang/ja-JP.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/charmap/lang/ja-JP.rc [iso-8859-1] Sun May  1 19:16:58
2011
@@ -1,9 +1,8 @@
 LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
 
-IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233
-CAPTION "•¶ŽšƒR[ƒh•\\"
+IDD_CHARMAP DIALOGEX 6, 6, 292, 224
 FONT 9,"MS UI Gothic",0,0
-STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX
+STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
   LTEXT         "ƒtƒHƒ“ƒg:", IDC_STATIC, 6, 7, 24, 9
   COMBOBOX      IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL |
CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
@@ -13,8 +12,22 @@
   CONTROL       "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER |
WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13
   DEFPUSHBUTTON "‘I‘ð", IDC_SELECT, 194, 186, 44, 13
   PUSHBUTTON    "ƒRƒs[", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
-  //AUTOCHECKBOX  "Ú×•\\Ž¦", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD |
WS_VISIBLE | WS_TABSTOP
-  //EDITTEXT      IDC_DISPLAY,  8, 217, 278, 13, WS_VISIBLE | WS_TABSTOP | ES_READONLY
+  CONTROL       "Advanced view",IDC_CHECK_ADVANCED,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP, 8, 208, 95, 10
+END
+
+IDD_ADVANCED DIALOGEX  0, 0, 292, 64
+STYLE DS_SHELLFONT | WS_CHILD
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT         "Charset:",IDC_STATIC,8,8,48,8
+  COMBOBOX      IDC_COMBO_CHARSET,72,4,116,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+  LTEXT         "Group by:",IDC_STATIC,8,28,50,8
+  COMBOBOX      IDC_COMBO_GROUPBY,72,24,116,80,CBS_DROPDOWNLIST | WS_VSCROLL |
WS_TABSTOP
+  PUSHBUTTON    "Search",IDC_BUTTON_SEARCH,200,44,50,14
+  EDITTEXT      IDC_EDIT_SEARCH,72,44,116,14,ES_AUTOHSCROLL
+  LTEXT         "Search for:",IDC_STATIC,8,48,42,8
+  LTEXT         "Unicode:",IDC_STATIC,200,8,30,8
+  EDITTEXT      IDC_EDIT_UNICODE,236,4,28,12,ES_AUTOHSCROLL
 END
 
 IDD_ABOUTBOX DIALOGEX 22,16,210,182
@@ -32,4 +45,5 @@
 BEGIN
   IDS_LICENSE   "This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as published by the Free
Software Foundation; either version 2 of the License, or (at your option) any later
version.\r\n\r\nThis program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou
should have received a copy of the GNU General Public License along with this program; if
not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301 USA."
   IDS_ABOUT     "ƒo[ƒWƒ‡ƒ“î•ñ(&B)..."
+  IDS_TITLE     "Character Map"
 END

Modified: trunk/reactos/base/applications/charmap/lang/ko-KR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/…
==============================================================================
--- trunk/reactos/base/applications/charmap/lang/ko-KR.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/charmap/lang/ko-KR.rc [iso-8859-1] Sun May  1 19:16:58
2011
@@ -3,10 +3,9 @@
  */
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 
-IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233
-CAPTION "¹®ÀÚÇ¥"
+IDD_CHARMAP DIALOGEX 6, 6, 292, 224
 FONT 8,"MS Shell Dlg",0,0
-STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX
+STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
   LTEXT         "±Û²Ã:", IDC_STATIC, 6, 7, 24, 9
   COMBOBOX      IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL |
CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
@@ -16,8 +15,22 @@
   CONTROL       "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER |
WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13
   DEFPUSHBUTTON "¼±ÅÃ", IDC_SELECT, 194, 186, 44, 13
   PUSHBUTTON    "º¹»ç", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
-  //AUTOCHECKBOX  "È®Àå ¸ðµå", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD |
WS_VISIBLE | WS_TABSTOP
-  //EDITTEXT      IDC_DISPLAY,  8, 217, 278, 13, WS_VISIBLE | WS_TABSTOP | ES_READONLY
+  CONTROL       "Advanced view",IDC_CHECK_ADVANCED,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP, 8, 208, 95, 10
+END
+
+IDD_ADVANCED DIALOGEX  0, 0, 292, 64
+STYLE DS_SHELLFONT | WS_CHILD
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT         "Charset:",IDC_STATIC,8,8,48,8
+  COMBOBOX      IDC_COMBO_CHARSET,72,4,116,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+  LTEXT         "Group by:",IDC_STATIC,8,28,50,8
+  COMBOBOX      IDC_COMBO_GROUPBY,72,24,116,80,CBS_DROPDOWNLIST | WS_VSCROLL |
WS_TABSTOP
+  PUSHBUTTON    "Search",IDC_BUTTON_SEARCH,200,44,50,14
+  EDITTEXT      IDC_EDIT_SEARCH,72,44,116,14,ES_AUTOHSCROLL
+  LTEXT         "Search for:",IDC_STATIC,8,48,42,8
+  LTEXT         "Unicode:",IDC_STATIC,200,8,30,8
+  EDITTEXT      IDC_EDIT_UNICODE,236,4,28,12,ES_AUTOHSCROLL
 END
 
 IDD_ABOUTBOX DIALOGEX 22,16,210,182
@@ -35,4 +48,5 @@
 BEGIN
   IDS_LICENSE   "This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as published by the Free
Software Foundation; either version 2 of the License, or (at your option) any later
version.\r\n\r\nThis program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou
should have received a copy of the GNU General Public License along with this program; if
not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301 USA."
   IDS_ABOUT     "Á¤º¸(&A)"
+  IDS_TITLE     "Character Map"
 END

Modified: trunk/reactos/base/applications/charmap/lang/lt-LT.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/…
==============================================================================
--- trunk/reactos/base/applications/charmap/lang/lt-LT.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/charmap/lang/lt-LT.rc [iso-8859-1] Sun May  1 19:16:58
2011
@@ -9,10 +9,9 @@
 
 LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT
 
-IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233
-CAPTION "Simboliø lentelë"
+IDD_CHARMAP DIALOGEX 6, 6, 292, 224
 FONT 8,"MS Shell Dlg",0,0
-STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX
+STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
   LTEXT         "Ðriftas:", IDC_STATIC, 6, 7, 24, 9
   COMBOBOX      IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL |
CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
@@ -22,8 +21,22 @@
   CONTROL       "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER |
WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13
   DEFPUSHBUTTON "Parinkti", IDC_SELECT, 194, 186, 44, 13
   PUSHBUTTON    "Kopijuoti", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
-  //AUTOCHECKBOX  "Advanced view", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD |
WS_VISIBLE | WS_TABSTOP
-  //EDITTEXT      IDC_DISPLAY,  8, 217, 278, 13, WS_VISIBLE | WS_TABSTOP | ES_READONLY
+  CONTROL       "Advanced view",IDC_CHECK_ADVANCED,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP, 8, 208, 95, 10
+END
+
+IDD_ADVANCED DIALOGEX  0, 0, 292, 64
+STYLE DS_SHELLFONT | WS_CHILD
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT         "Charset:",IDC_STATIC,8,8,48,8
+  COMBOBOX      IDC_COMBO_CHARSET,72,4,116,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+  LTEXT         "Group by:",IDC_STATIC,8,28,50,8
+  COMBOBOX      IDC_COMBO_GROUPBY,72,24,116,80,CBS_DROPDOWNLIST | WS_VSCROLL |
WS_TABSTOP
+  PUSHBUTTON    "Search",IDC_BUTTON_SEARCH,200,44,50,14
+  EDITTEXT      IDC_EDIT_SEARCH,72,44,116,14,ES_AUTOHSCROLL
+  LTEXT         "Search for:",IDC_STATIC,8,48,42,8
+  LTEXT         "Unicode:",IDC_STATIC,200,8,30,8
+  EDITTEXT      IDC_EDIT_UNICODE,236,4,28,12,ES_AUTOHSCROLL
 END
 
 IDD_ABOUTBOX DIALOGEX 22,16,210,182
@@ -41,4 +54,5 @@
 BEGIN
   IDS_LICENSE   "This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as published by the Free
Software Foundation; either version 2 of the License, or (at your option) any later
version.\r\n\r\nThis program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou
should have received a copy of the GNU General Public License along with this program; if
not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301 USA."
   IDS_ABOUT     "&Apie..."
+  IDS_TITLE     "Character Map"
 END

Modified: trunk/reactos/base/applications/charmap/lang/nl-NL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/…
==============================================================================
--- trunk/reactos/base/applications/charmap/lang/nl-NL.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/charmap/lang/nl-NL.rc [iso-8859-1] Sun May  1 19:16:58
2011
@@ -1,9 +1,8 @@
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
-IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233
-CAPTION "Speciale tekens"
+IDD_CHARMAP DIALOGEX 6, 6, 292, 224
 FONT 8,"MS Shell Dlg",0,0
-STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX
+STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
   LTEXT         "Lettertype:", IDC_STATIC, 6, 7, 24, 9
   COMBOBOX      IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL |
CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
@@ -13,8 +12,22 @@
   CONTROL       "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER |
WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13
   DEFPUSHBUTTON "Selecteren", IDC_SELECT, 194, 186, 44, 13
   PUSHBUTTON    "Kopiëren", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
-  //AUTOCHECKBOX  "Geavanceerde weergave", IDC_ADVVIEW, 10, 204, 64, 9,
WS_CHILD | WS_VISIBLE | WS_TABSTOP
-  //EDITTEXT      IDC_DISPLAY,  8, 217, 278, 13, WS_VISIBLE | WS_TABSTOP | ES_READONLY
+  CONTROL       "Advanced view",IDC_CHECK_ADVANCED,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP, 8, 208, 95, 10
+END
+
+IDD_ADVANCED DIALOGEX  0, 0, 292, 64
+STYLE DS_SHELLFONT | WS_CHILD
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT         "Charset:",IDC_STATIC,8,8,48,8
+  COMBOBOX      IDC_COMBO_CHARSET,72,4,116,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+  LTEXT         "Group by:",IDC_STATIC,8,28,50,8
+  COMBOBOX      IDC_COMBO_GROUPBY,72,24,116,80,CBS_DROPDOWNLIST | WS_VSCROLL |
WS_TABSTOP
+  PUSHBUTTON    "Search",IDC_BUTTON_SEARCH,200,44,50,14
+  EDITTEXT      IDC_EDIT_SEARCH,72,44,116,14,ES_AUTOHSCROLL
+  LTEXT         "Search for:",IDC_STATIC,8,48,42,8
+  LTEXT         "Unicode:",IDC_STATIC,200,8,30,8
+  EDITTEXT      IDC_EDIT_UNICODE,236,4,28,12,ES_AUTOHSCROLL
 END
 
 IDD_ABOUTBOX DIALOGEX 22,16,210,182
@@ -32,4 +45,5 @@
 BEGIN
   IDS_LICENSE   "This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as published by the Free
Software Foundation; either version 2 of the License, or (at your option) any later
version.\r\n\r\nThis program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou
should have received a copy of the GNU General Public License along with this program; if
not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301 USA."
   IDS_ABOUT     "Over..."
+  IDS_TITLE     "Character Map"
 END

Modified: trunk/reactos/base/applications/charmap/lang/no-NO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/…
==============================================================================
--- trunk/reactos/base/applications/charmap/lang/no-NO.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/charmap/lang/no-NO.rc [iso-8859-1] Sun May  1 19:16:58
2011
@@ -1,9 +1,8 @@
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
 
-IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233
-CAPTION "Tegnkart"
+IDD_CHARMAP DIALOGEX 6, 6, 292, 224
 FONT 8,"MS Shell Dlg",0,0
-STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX
+STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
   LTEXT         "Skrift:", IDC_STATIC, 6, 7, 24, 9
   COMBOBOX      IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL |
CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
@@ -13,8 +12,22 @@
   CONTROL       "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER |
WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13
   DEFPUSHBUTTON "Velg", IDC_SELECT, 194, 186, 44, 13
   PUSHBUTTON    "Kopier", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
-  //AUTOCHECKBOX  "Avansert visning", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD |
WS_VISIBLE | WS_TABSTOP
-  //EDITTEXT      IDC_DISPLAY,  8, 217, 278, 13, WS_VISIBLE | WS_TABSTOP | ES_READONLY
+  CONTROL       "Advanced view",IDC_CHECK_ADVANCED,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP, 8, 208, 95, 10
+END
+
+IDD_ADVANCED DIALOGEX  0, 0, 292, 64
+STYLE DS_SHELLFONT | WS_CHILD
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT         "Charset:",IDC_STATIC,8,8,48,8
+  COMBOBOX      IDC_COMBO_CHARSET,72,4,116,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+  LTEXT         "Group by:",IDC_STATIC,8,28,50,8
+  COMBOBOX      IDC_COMBO_GROUPBY,72,24,116,80,CBS_DROPDOWNLIST | WS_VSCROLL |
WS_TABSTOP
+  PUSHBUTTON    "Search",IDC_BUTTON_SEARCH,200,44,50,14
+  EDITTEXT      IDC_EDIT_SEARCH,72,44,116,14,ES_AUTOHSCROLL
+  LTEXT         "Search for:",IDC_STATIC,8,48,42,8
+  LTEXT         "Unicode:",IDC_STATIC,200,8,30,8
+  EDITTEXT      IDC_EDIT_UNICODE,236,4,28,12,ES_AUTOHSCROLL
 END
 
 IDD_ABOUTBOX DIALOGEX 22,16,210,182
@@ -32,4 +45,5 @@
 BEGIN
   IDS_LICENSE   "Dette programmet er gratis programvare; du kan distribuere det
og/eller endre det under betingelsene av GNU General Public License som er utgitt av Free
Software Foundation;  version 2 av lisensen, eller (etter din mening) alle senere
versjoner.\r\n\r\nDette programmet er utgitt i håp for at det skal kunne brukes, men DET
ER INGEN GARANTIER; uten heller forutsatt garantier av SALGBARHET eller SIKKETHET FOR EN
ENKELTHET FORMÅL.  Se på GNU General Public Lisensen for mere detaljer.\r\n\r\nDu skal ha
motatt en kopi av GNU General Public Lisensen sammen med denne programmet; hvis du ikke
har motatt det, skriv til Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301 USA."
   IDS_ABOUT     "O&m..."
+  IDS_TITLE     "Character Map"
 END

Modified: trunk/reactos/base/applications/charmap/lang/pl-PL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/…
==============================================================================
--- trunk/reactos/base/applications/charmap/lang/pl-PL.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/charmap/lang/pl-PL.rc [iso-8859-1] Sun May  1 19:16:58
2011
@@ -6,10 +6,9 @@
 
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
-IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233
-CAPTION "Tablica znaków"
+IDD_CHARMAP DIALOGEX 6, 6, 292, 224
 FONT 8,"MS Shell Dlg",0,0
-STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX
+STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
   LTEXT         "Czci&onka:", IDC_STATIC, 6, 7, 24, 9
   COMBOBOX      IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL |
CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
@@ -19,8 +18,22 @@
   CONTROL       "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER |
WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13
   DEFPUSHBUTTON "Wy&bierz", IDC_SELECT, 194, 186, 44, 13
   PUSHBUTTON    "&Kopiuj", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
-  //AUTOCHECKBOX  "Widok z&aawansowany", IDC_ADVVIEW, 10, 204, 64, 9,
WS_CHILD | WS_VISIBLE | WS_TABSTOP
-  //EDITTEXT      IDC_DISPLAY,  8, 217, 278, 13, WS_VISIBLE | WS_TABSTOP | ES_READONLY
+  CONTROL       "Advanced view",IDC_CHECK_ADVANCED,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP, 8, 208, 95, 10
+END
+
+IDD_ADVANCED DIALOGEX  0, 0, 292, 64
+STYLE DS_SHELLFONT | WS_CHILD
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT         "Charset:",IDC_STATIC,8,8,48,8
+  COMBOBOX      IDC_COMBO_CHARSET,72,4,116,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+  LTEXT         "Group by:",IDC_STATIC,8,28,50,8
+  COMBOBOX      IDC_COMBO_GROUPBY,72,24,116,80,CBS_DROPDOWNLIST | WS_VSCROLL |
WS_TABSTOP
+  PUSHBUTTON    "Search",IDC_BUTTON_SEARCH,200,44,50,14
+  EDITTEXT      IDC_EDIT_SEARCH,72,44,116,14,ES_AUTOHSCROLL
+  LTEXT         "Search for:",IDC_STATIC,8,48,42,8
+  LTEXT         "Unicode:",IDC_STATIC,200,8,30,8
+  EDITTEXT      IDC_EDIT_UNICODE,236,4,28,12,ES_AUTOHSCROLL
 END
 
 IDD_ABOUTBOX DIALOGEX 22,16,210,182
@@ -38,4 +51,5 @@
 BEGIN
   IDS_LICENSE   "Niniejszy program jest wolnym oprogramowaniem; mo¿esz go
rozprowadzaæ dalej i/lub modyfikowaæ na warunkach Powszechnej Licencji Publicznej GNU,
wydanej przez Fundacjê Wolnego Oprogramowania - wed³ug wersji 2 tej Licencji lub (wed³ug
twojego wyboru) którejœ z póŸniejszych wersji.\r\n\r\nNiniejszy program rozpowszechniany
jest z nadziej¹, i¿ bêdzie on u¿yteczny - jednak BEZ JAKIEJKOLWIEK GWARANCJI, nawet
domyœlnej gwarancji PRZYDATNOŒCI HANDLOWEJ albo PRZYDATNOŒCI DO OKREŒLONYCH ZASTOSOWAÑ. W
celu uzyskania bli¿szych informacji siêgnij do Powszechnej Licencji Publicznej
GNU.\r\n\r\nZ pewnoœci¹ wraz z niniejszym programem otrzyma³eœ te¿ egzemplarz Powszechnej
Licencji Publicznej GNU (GNU General Public License); jeœli nie - napisz do Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
   IDS_ABOUT     "&O programie..."
+  IDS_TITLE     "Character Map"
 END

Modified: trunk/reactos/base/applications/charmap/lang/pt-BR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/…
==============================================================================
--- trunk/reactos/base/applications/charmap/lang/pt-BR.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/charmap/lang/pt-BR.rc [iso-8859-1] Sun May  1 19:16:58
2011
@@ -1,9 +1,8 @@
 LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
 
-IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233
-CAPTION "Mapa de caracteres"
+IDD_CHARMAP DIALOGEX 6, 6, 292, 224
 FONT 8,"MS Shell Dlg",0,0
-STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX
+STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
   LTEXT         "Fonte :", IDC_STATIC, 6, 7, 24, 9
   COMBOBOX      IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL |
CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
@@ -13,8 +12,22 @@
   CONTROL       "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER |
WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13
   DEFPUSHBUTTON "Selecionar", IDC_SELECT, 194, 186, 46, 13
   PUSHBUTTON    "Copiar", IDC_COPY, 244, 186, 46, 13, WS_DISABLED
-  //AUTOCHECKBOX  "Modo de exibição avançado", IDC_ADVVIEW, 10, 204, 64, 9,
WS_CHILD | WS_VISIBLE | WS_TABSTOP
-  //EDITTEXT      IDC_DISPLAY,  8, 217, 278, 13, WS_VISIBLE | WS_TABSTOP | ES_READONLY
+  CONTROL       "Advanced view",IDC_CHECK_ADVANCED,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP, 8, 208, 95, 10
+END
+
+IDD_ADVANCED DIALOGEX  0, 0, 292, 64
+STYLE DS_SHELLFONT | WS_CHILD
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT         "Charset:",IDC_STATIC,8,8,48,8
+  COMBOBOX      IDC_COMBO_CHARSET,72,4,116,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+  LTEXT         "Group by:",IDC_STATIC,8,28,50,8
+  COMBOBOX      IDC_COMBO_GROUPBY,72,24,116,80,CBS_DROPDOWNLIST | WS_VSCROLL |
WS_TABSTOP
+  PUSHBUTTON    "Search",IDC_BUTTON_SEARCH,200,44,50,14
+  EDITTEXT      IDC_EDIT_SEARCH,72,44,116,14,ES_AUTOHSCROLL
+  LTEXT         "Search for:",IDC_STATIC,8,48,42,8
+  LTEXT         "Unicode:",IDC_STATIC,200,8,30,8
+  EDITTEXT      IDC_EDIT_UNICODE,236,4,28,12,ES_AUTOHSCROLL
 END
 
 IDD_ABOUTBOX DIALOGEX 22,16,210,182
@@ -32,4 +45,5 @@
 BEGIN
   IDS_LICENSE   "Este programa é software livre; você pode redistribuí-lo e/ou
modificá-lo sob os termos da  GNU General Public License conforme publicada pela Free
Software Foundation; quer a versão 2  da licença, ou (conforme você escolha) qualquer
versão posterior.\r\n\r\nEste programa é  distribuído com a esperança de que seja útil,
mas SEM QUALQUER GARANTIA; mesmo sem a garantia  implícita de MERCANTIBILIDADE OU
ADEQUAÇÃO A UM DETERMINADO PROPÓSITO. Para mais detalhes,  veja a GNU General Public
License.\r\n\r\nVocê deve ter recebido uma cópia da GNU General  Public License juntamente
com este programa; caso contrário, escreva para a Free Software  Foundation, Inc., 51
Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
   IDS_ABOUT     "So&bre..."
+  IDS_TITLE     "Character Map"
 END

Modified: trunk/reactos/base/applications/charmap/lang/ru-RU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/…
==============================================================================
--- trunk/reactos/base/applications/charmap/lang/ru-RU.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/charmap/lang/ru-RU.rc [iso-8859-1] Sun May  1 19:16:58
2011
@@ -2,10 +2,9 @@
 
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
-IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233
-CAPTION "Òàáëèöà ñèìâîëîâ"
+IDD_CHARMAP DIALOGEX 6, 6, 292, 224
 FONT 8,"MS Shell Dlg",0,0
-STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX
+STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
   LTEXT         "Øðèôò:", IDC_STATIC, 6, 7, 27, 9
   COMBOBOX      IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL |
CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
@@ -15,8 +14,22 @@
   CONTROL       "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER |
WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13
   DEFPUSHBUTTON "Âûáðàòü", IDC_SELECT, 194, 186, 44, 13
   PUSHBUTTON    "Êîïèðîâàòü", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
-  //AUTOCHECKBOX  "Advanced view", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD |
WS_VISIBLE | WS_TABSTOP
-  //EDITTEXT      IDC_DISPLAY,  8, 217, 278, 13, WS_VISIBLE | WS_TABSTOP | ES_READONLY
+  CONTROL       "Advanced view",IDC_CHECK_ADVANCED,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP, 8, 208, 95, 10
+END
+
+IDD_ADVANCED DIALOGEX  0, 0, 292, 64
+STYLE DS_SHELLFONT | WS_CHILD
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT         "Charset:",IDC_STATIC,8,8,48,8
+  COMBOBOX      IDC_COMBO_CHARSET,72,4,116,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+  LTEXT         "Group by:",IDC_STATIC,8,28,50,8
+  COMBOBOX      IDC_COMBO_GROUPBY,72,24,116,80,CBS_DROPDOWNLIST | WS_VSCROLL |
WS_TABSTOP
+  PUSHBUTTON    "Search",IDC_BUTTON_SEARCH,200,44,50,14
+  EDITTEXT      IDC_EDIT_SEARCH,72,44,116,14,ES_AUTOHSCROLL
+  LTEXT         "Search for:",IDC_STATIC,8,48,42,8
+  LTEXT         "Unicode:",IDC_STATIC,200,8,30,8
+  EDITTEXT      IDC_EDIT_UNICODE,236,4,28,12,ES_AUTOHSCROLL
 END
 
 IDD_ABOUTBOX DIALOGEX 22,16,210,182
@@ -34,4 +47,5 @@
 BEGIN
   IDS_LICENSE   "Ýòà ïðîãðàììà ÿâëÿåòñÿ ñâîáîäíî ðàñïðîñòðàíÿåìîé; Âû ìîæåòå
ðàñïðîñòðàíÿòü åå ïîâòîðíî è (èëè) èçìåíÿòü, ñîáëþäàÿ óñëîâèÿ Îòêðûòîãî ëèöåíçèîííîãî
ñîãëàøåíèÿ GNU, îïóáëèêîâàííîãî Ôîíäîì ñâîáîäíî ðàñïðîñòðàíÿåìîãî ïðîãðàììíîãî
îáåñïå÷åíèÿ; ëèáî ðåäàêöèè 2 Ñîãëàøåíèÿ, ëèáî (íà âàøå óñìîòðåíèå) ëþáîé ðåäàêöèè,
âûïóùåííîé ïîçæå.\r\n\r\nÝòà ïðîãðàììà ðàñïðîñòðàíÿåòñÿ â íàäåæäå íà òî, ÷òî îíà îêàæåòñÿ
ïîëåçíîé, íî ÁÅÇ ÊÀÊÈÕ-ËÈÁÎ ÃÀÐÀÍÒÈÉ, âêëþ÷àÿ ïîäðàçóìåâàåìóþ ãàðàíòèþ ÊÀ×ÅÑÒÂÀ ëèáî
ÏÐÈÃÎÄÍÎÑÒÈ ÄËß ÎÏÐÅÄÅËÅÍÍÛÕ ÖÅËÅÉ. Ïîäðîáíîñòè ñîäåðæàòñÿ â Îòêðûòîì ëèöåíçèîííîì
ñîãëàøåíèè GNU.\r\n\r\nÂìåñòå ñ ýòîé ïðîãðàììîé äîëæåí ðàñïðîñòðàíÿòüñÿ ýêçåìïëÿð
Îòêðûòîãî ëèöåíçèîííîãî ñîãëàøåíèÿ GNU, åñëè îí îòñóòñòâóåò, ñîîáùèòå îá ýòîì â Ôîíä
ñâîáîäíî ðàñïðîñòðàíÿåìîãî ïðîãðàììíîãî îáåñïå÷åíèÿ (Free Software Foundation, Inc.), 51
Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
   IDS_ABOUT     "&Î ïðîãðàììå..."
+  IDS_TITLE     "Character Map"
 END

Modified: trunk/reactos/base/applications/charmap/lang/sk-SK.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/…
==============================================================================
--- trunk/reactos/base/applications/charmap/lang/sk-SK.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/charmap/lang/sk-SK.rc [iso-8859-1] Sun May  1 19:16:58
2011
@@ -9,10 +9,9 @@
 
 LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
 
-IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233
-CAPTION "Mapa znakov"
+IDD_CHARMAP DIALOGEX 6, 6, 292, 224
 FONT 8,"MS Shell Dlg",0,0
-STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX
+STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
   LTEXT         "Pís&mo:", IDC_STATIC, 6, 7, 24, 9
   COMBOBOX      IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL |
CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
@@ -22,8 +21,22 @@
   CONTROL       "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER |
WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13
   DEFPUSHBUTTON "&Vybra", IDC_SELECT, 194, 186, 44, 13
   PUSHBUTTON    "&Kopírova", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
-  //AUTOCHECKBOX  "R&ozšírené zobrazenie", IDC_ADVVIEW, 10, 204, 75, 9,
WS_CHILD | WS_VISIBLE | WS_TABSTOP
-  //EDITTEXT      IDC_DISPLAY,  8, 217, 278, 13, WS_VISIBLE | WS_TABSTOP | ES_READONLY
+  CONTROL       "Advanced view",IDC_CHECK_ADVANCED,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP, 8, 208, 95, 10
+END
+
+IDD_ADVANCED DIALOGEX  0, 0, 292, 64
+STYLE DS_SHELLFONT | WS_CHILD
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT         "Charset:",IDC_STATIC,8,8,48,8
+  COMBOBOX      IDC_COMBO_CHARSET,72,4,116,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+  LTEXT         "Group by:",IDC_STATIC,8,28,50,8
+  COMBOBOX      IDC_COMBO_GROUPBY,72,24,116,80,CBS_DROPDOWNLIST | WS_VSCROLL |
WS_TABSTOP
+  PUSHBUTTON    "Search",IDC_BUTTON_SEARCH,200,44,50,14
+  EDITTEXT      IDC_EDIT_SEARCH,72,44,116,14,ES_AUTOHSCROLL
+  LTEXT         "Search for:",IDC_STATIC,8,48,42,8
+  LTEXT         "Unicode:",IDC_STATIC,200,8,30,8
+  EDITTEXT      IDC_EDIT_UNICODE,236,4,28,12,ES_AUTOHSCROLL
 END
 
 IDD_ABOUTBOX DIALOGEX 22,16,210,182
@@ -41,4 +54,5 @@
 BEGIN
   IDS_LICENSE,  "Tento program je vo¾ný softvér; môžete ho šíri a/alebo modifikova
pod¾a podmienok GNU Všeobecnej verejnej licencie (GNU General Public License) ako bola
zverejnená nadáciou Free Software Foundation; buï verzie 2 tejto licencie, alebo (pod¾a
Vášho uváženia) niektorej neskoršej verzie.\r\n\r\nTento program je distribuovaný v
nádeji, že bude užitoèný, avšak BEZ AKEJKO¼VEK ZÁRUKY; rovnako bez záruky PREDAJNOSTI
alebo VHODNOSTI PRE URÈITÝ ÚÈEL. Pre viac detailov si pozrite GNU Všeobecnú verejnú
licenciu (GNU General Public License).\r\n\r\nKópiu Všeobecnej verejnej licencie GNU ste
mali dosta spolu s týmto programom; ak nie, napíšte si o òu na Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
   IDS_ABOUT     "È&o je Mapa znakov"
+  IDS_TITLE     "Character Map"
 END

Modified: trunk/reactos/base/applications/charmap/lang/uk-UA.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/…
==============================================================================
--- trunk/reactos/base/applications/charmap/lang/uk-UA.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/charmap/lang/uk-UA.rc [iso-8859-1] Sun May  1 19:16:58
2011
@@ -8,10 +8,9 @@
 
 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
 
-IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233
-CAPTION "Òàáëèöÿ ñèìâîë³â"
+IDD_CHARMAP DIALOGEX 6, 6, 292, 224
 FONT 8,"MS Shell Dlg",0,0
-STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX
+STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
   LTEXT         "Øðèôò :", IDC_STATIC, 6, 7, 24, 9
   COMBOBOX      IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL |
CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
@@ -21,8 +20,22 @@
   CONTROL       "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER |
WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13
   DEFPUSHBUTTON "Âèáðàòè", IDC_SELECT, 194, 186, 44, 13
   PUSHBUTTON    "Êîï³þâàòè", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
-  //AUTOCHECKBOX  "Ðîçøèðåíèé âèãëÿä", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD |
WS_VISIBLE | WS_TABSTOP
-  //EDITTEXT      IDC_DISPLAY,  8, 217, 278, 13, WS_VISIBLE | WS_TABSTOP | ES_READONLY
+  CONTROL       "Advanced view",IDC_CHECK_ADVANCED,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP, 8, 208, 95, 10
+END
+
+IDD_ADVANCED DIALOGEX  0, 0, 292, 64
+STYLE DS_SHELLFONT | WS_CHILD
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT         "Charset:",IDC_STATIC,8,8,48,8
+  COMBOBOX      IDC_COMBO_CHARSET,72,4,116,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+  LTEXT         "Group by:",IDC_STATIC,8,28,50,8
+  COMBOBOX      IDC_COMBO_GROUPBY,72,24,116,80,CBS_DROPDOWNLIST | WS_VSCROLL |
WS_TABSTOP
+  PUSHBUTTON    "Search",IDC_BUTTON_SEARCH,200,44,50,14
+  EDITTEXT      IDC_EDIT_SEARCH,72,44,116,14,ES_AUTOHSCROLL
+  LTEXT         "Search for:",IDC_STATIC,8,48,42,8
+  LTEXT         "Unicode:",IDC_STATIC,200,8,30,8
+  EDITTEXT      IDC_EDIT_UNICODE,236,4,28,12,ES_AUTOHSCROLL
 END
 
 IDD_ABOUTBOX DIALOGEX 22,16,210,182
@@ -40,4 +53,5 @@
 BEGIN
   IDS_LICENSE   "Òàáëèöÿ ñèìâîë³â - â³ëüíå ïðîãðàìíå çàáåçïå÷åííÿ; Âè ìîæåòå
ðîçïîâñþäæóâàòè ¿¿ òà çì³íþâàòè, äîòðèìóþ÷èñü óìîâè ³äêðèòî¿ ë³öåíç³éíî¿ óãîäè GNU,
îïóáë³êîâàíî¿ Ôîíäîì â³ëüíîãî ïðîãðàìíîãî çàáåçïå÷åííÿ; àáî ðåäàêö³¿ 2 Óãîäè, àáî
áóäü-ÿêî¿ ðåäàêö³¿, âèïóùåíî¿ ï³çí³øå.\r\n\r\nÖÿ ïðîãðàìà ðîçïîâñþäæóºòüñÿ â íà䳿 íà òå,
ùî âîíà âèÿâèòüñÿ êîðèñíîþ, àëå ÁÅÇ ÁÓÄÜ-ßÊÈÕ ÃÀÐÀÍÒ²É, âêëþ÷àþ÷è ÓßÂÍÎÞ ÃÀÐÀÍÒ²ªÞ ßÊÎÑÒ²
àáî ÏÐÈÄÀÒÍÎÑÒ² äëÿ ïåâíèõ ö³ëåé. Ïîäðîáèö³ ì³ñòÿòüñÿ ó ³äêðèò³é ë³öåíç³éí³é óãîä³
GNU.\r\n\r\nÐàçîì ç ö³ºþ ïðîãðàìîþ ïîâèíåí ïîøèðþâàòèñÿ ïðèì³ðíèê ³äêðèòî¿ ë³öåíç³éíî¿
óãîäè GNU. ßêùî â³í â³äñóòí³é, ïîâ³äîìòå ïðî öå â Ôîíä â³ëüíîãî ïðîãðàìíîãî çàáåçïå÷åííÿ
(Free Software Foundation, Inc.), 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA."
   IDS_ABOUT     "&Ïðî ïðîãðàìó..."
+  IDS_TITLE     "Character Map"
 END

Modified: trunk/reactos/base/applications/charmap/lang/zh-CN.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/…
==============================================================================
--- trunk/reactos/base/applications/charmap/lang/zh-CN.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/charmap/lang/zh-CN.rc [iso-8859-1] Sun May  1 19:16:58
2011
@@ -2,10 +2,9 @@
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
 
-IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233
-CAPTION "×Ö·û±í"
+IDD_CHARMAP DIALOGEX 6, 6, 292, 224
 FONT 8,"MS Shell Dlg",0,0
-STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX
+STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
   LTEXT         "×ÖÌå:", IDC_STATIC, 6, 7, 24, 9
   COMBOBOX      IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL |
CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
@@ -15,8 +14,22 @@
   CONTROL       "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER |
WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13
   DEFPUSHBUTTON "Ñ¡Ôñ", IDC_SELECT, 194, 186, 44, 13
   PUSHBUTTON    "¸´ÖÆ", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
-  //AUTOCHECKBOX  "Advanced view", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD |
WS_VISIBLE | WS_TABSTOP
-  //EDITTEXT      IDC_DISPLAY,  8, 217, 278, 13, WS_VISIBLE | WS_TABSTOP | ES_READONLY
+  CONTROL       "Advanced view",IDC_CHECK_ADVANCED,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP, 8, 208, 95, 10
+END
+
+IDD_ADVANCED DIALOGEX  0, 0, 292, 64
+STYLE DS_SHELLFONT | WS_CHILD
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT         "Charset:",IDC_STATIC,8,8,48,8
+  COMBOBOX      IDC_COMBO_CHARSET,72,4,116,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+  LTEXT         "Group by:",IDC_STATIC,8,28,50,8
+  COMBOBOX      IDC_COMBO_GROUPBY,72,24,116,80,CBS_DROPDOWNLIST | WS_VSCROLL |
WS_TABSTOP
+  PUSHBUTTON    "Search",IDC_BUTTON_SEARCH,200,44,50,14
+  EDITTEXT      IDC_EDIT_SEARCH,72,44,116,14,ES_AUTOHSCROLL
+  LTEXT         "Search for:",IDC_STATIC,8,48,42,8
+  LTEXT         "Unicode:",IDC_STATIC,200,8,30,8
+  EDITTEXT      IDC_EDIT_UNICODE,236,4,28,12,ES_AUTOHSCROLL
 END
 
 IDD_ABOUTBOX DIALOGEX 22,16,210,182
@@ -34,4 +47,5 @@
 BEGIN
   IDS_LICENSE   "This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as published by the Free
Software Foundation; either version 2 of the License, or (at your option) any later
version.\r\n\r\nThis program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou
should have received a copy of the GNU General Public License along with this program; if
not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,
USA."
   IDS_ABOUT     "¹ØÓÚ(&A)..."
+  IDS_TITLE     "Character Map"
 END

Modified: trunk/reactos/base/applications/charmap/lang/zh-TW.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/…
==============================================================================
--- trunk/reactos/base/applications/charmap/lang/zh-TW.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/charmap/lang/zh-TW.rc [iso-8859-1] Sun May  1 19:16:58
2011
@@ -2,10 +2,9 @@
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
 
-IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233
-CAPTION "¦r²Åªí"
+IDD_CHARMAP DIALOGEX 6, 6, 292, 224
 FONT 8,"MS Shell Dlg",0,0
-STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX
+STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
   LTEXT         "¦rÅé¡G", IDC_STATIC, 6, 7, 24, 9
   COMBOBOX      IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL |
CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
@@ -15,8 +14,22 @@
   CONTROL       "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER |
WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13
   DEFPUSHBUTTON "¿ï¾Ü", IDC_SELECT, 194, 186, 44, 13
   PUSHBUTTON    "½Æ»s", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
-  //AUTOCHECKBOX  "Advanced view", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD |
WS_VISIBLE | WS_TABSTOP
-  //EDITTEXT      IDC_DISPLAY,  8, 217, 278, 13, WS_VISIBLE | WS_TABSTOP | ES_READONLY
+  CONTROL       "Advanced view",IDC_CHECK_ADVANCED,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP, 8, 208, 95, 10
+END
+
+IDD_ADVANCED DIALOGEX  0, 0, 292, 64
+STYLE DS_SHELLFONT | WS_CHILD
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT         "Charset:",IDC_STATIC,8,8,48,8
+  COMBOBOX      IDC_COMBO_CHARSET,72,4,116,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+  LTEXT         "Group by:",IDC_STATIC,8,28,50,8
+  COMBOBOX      IDC_COMBO_GROUPBY,72,24,116,80,CBS_DROPDOWNLIST | WS_VSCROLL |
WS_TABSTOP
+  PUSHBUTTON    "Search",IDC_BUTTON_SEARCH,200,44,50,14
+  EDITTEXT      IDC_EDIT_SEARCH,72,44,116,14,ES_AUTOHSCROLL
+  LTEXT         "Search for:",IDC_STATIC,8,48,42,8
+  LTEXT         "Unicode:",IDC_STATIC,200,8,30,8
+  EDITTEXT      IDC_EDIT_UNICODE,236,4,28,12,ES_AUTOHSCROLL
 END
 
 IDD_ABOUTBOX DIALOGEX 22,16,210,182
@@ -34,4 +47,5 @@
 BEGIN
   IDS_LICENSE   "This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as published by the Free
Software Foundation; either version 2 of the License, or (at your option) any later
version.\r\n\r\nThis program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou
should have received a copy of the GNU General Public License along with this program; if
not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,
USA."
   IDS_ABOUT     "Ãö©ó(&A)..."
+  IDS_TITLE     "Character Map"
 END

Modified: trunk/reactos/base/applications/charmap/precomp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/…
==============================================================================
--- trunk/reactos/base/applications/charmap/precomp.h [iso-8859-1] (original)
+++ trunk/reactos/base/applications/charmap/precomp.h [iso-8859-1] Sun May  1 19:16:58
2011
@@ -1,12 +1,15 @@
 #ifndef __CHARMAP_PRECOMP_H
 #define __CHARMAP_PRECOMP_H
 
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <windows.h>
 #include <commctrl.h>
 #include <richedit.h>
 #include "resource.h"
+
+#define SIZEOF(_v)  (sizeof(_v) / sizeof(*_v))
 
 #define XCELLS 20
 #define YCELLS 10

Modified: trunk/reactos/base/applications/charmap/resource.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/…
==============================================================================
--- trunk/reactos/base/applications/charmap/resource.h [iso-8859-1] (original)
+++ trunk/reactos/base/applications/charmap/resource.h [iso-8859-1] Sun May  1 19:16:58
2011
@@ -1,19 +1,28 @@
-#define IDC_STATIC       -1
+#define IDC_STATIC          -1
 
-#define IDI_ICON         100
+#define IDI_ICON            100
 
-#define IDD_CHARMAP      200
-#define IDD_ABOUTBOX     201
+#define IDD_CHARMAP         200
+#define IDD_ABOUTBOX        201
+#define IDD_STATUSBAR       202
+#define IDD_ADVANCED        203
 
-#define IDC_FONTCOMBO    1001
-#define IDC_CMHELP       1002
-#define IDC_FONTMAP      1003
-#define IDC_TEXTBOX      1004
-#define IDC_SELECT       1005
-#define IDC_COPY         1006
-#define IDC_ADVVIEW      1007
-#define IDC_DISPLAY      1008
-#define IDC_LICENSE_EDIT 1009
+#define IDC_FONTCOMBO       1001
+#define IDC_CMHELP          1002
+#define IDC_FONTMAP         1003
+#define IDC_TEXTBOX         1004
+#define IDC_SELECT          1005
+#define IDC_COPY            1006
+#define IDC_ADVVIEW         1007
+#define IDC_DISPLAY         1008
+#define IDC_LICENSE_EDIT    1009
+#define IDC_COMBO_CHARSET   1000
+#define IDC_COMBO_GROUPBY   1001
+#define IDC_BUTTON_SEARCH   1002
+#define IDC_EDIT_SEARCH     1003
+#define IDC_EDIT_UNICODE    1004
+#define IDC_CHECK_ADVANCED  1007
 
-#define IDS_LICENSE      1010
-#define IDS_ABOUT        1011
+#define IDS_LICENSE         1010
+#define IDS_ABOUT           1011
+#define IDS_TITLE           1012