From e2dfab00f433736fca662fb6cd6bfff915c0bb48 Mon Sep 17 00:00:00 2001 From: Gregor Schneider Date: Sun, 1 May 2011 19:16:58 +0000 Subject: [PATCH] [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. svn path=/trunk/; revision=51537 --- reactos/base/applications/charmap/charmap.c | 335 +++++++++++++----- .../base/applications/charmap/charmap.rbuild | 10 +- .../base/applications/charmap/lang/bg-BG.rc | 24 +- .../base/applications/charmap/lang/ca-ES.rc | 24 +- .../base/applications/charmap/lang/cs-CZ.rc | 24 +- .../base/applications/charmap/lang/de-DE.rc | 32 +- .../base/applications/charmap/lang/el-GR.rc | 24 +- .../base/applications/charmap/lang/en-US.rc | 24 +- .../base/applications/charmap/lang/es-ES.rc | 24 +- .../base/applications/charmap/lang/fr-FR.rc | 24 +- .../base/applications/charmap/lang/id-ID.rc | 24 +- .../base/applications/charmap/lang/it-IT.rc | 28 +- .../base/applications/charmap/lang/ja-JP.rc | 24 +- .../base/applications/charmap/lang/ko-KR.rc | 24 +- .../base/applications/charmap/lang/lt-LT.rc | 24 +- .../base/applications/charmap/lang/nl-NL.rc | 24 +- .../base/applications/charmap/lang/no-NO.rc | 24 +- .../base/applications/charmap/lang/pl-PL.rc | 24 +- .../base/applications/charmap/lang/pt-BR.rc | 24 +- .../base/applications/charmap/lang/ru-RU.rc | 24 +- .../base/applications/charmap/lang/sk-SK.rc | 24 +- .../base/applications/charmap/lang/uk-UA.rc | 24 +- .../base/applications/charmap/lang/zh-CN.rc | 24 +- .../base/applications/charmap/lang/zh-TW.rc | 24 +- reactos/base/applications/charmap/precomp.h | 5 +- reactos/base/applications/charmap/resource.h | 39 +- 26 files changed, 709 insertions(+), 220 deletions(-) diff --git a/reactos/base/applications/charmap/charmap.c b/reactos/base/applications/charmap/charmap.c index 6f91d5b4ef9..5b4b4026dc5 100644 --- a/reactos/base/applications/charmap/charmap.c +++ b/reactos/base/applications/charmap/charmap.c @@ -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 @@ -226,76 +236,91 @@ AddCharToSelection(HWND hDlg, WCHAR ch) } +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) +CharMapDlgProc(HWND hDlg, + UINT Message, + WPARAM wParam, + LPARAM lParam) { - static HICON hSmIcon; - static HICON hBgIcon; - LPWSTR lpAboutText = NULL; - 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,35 +369,33 @@ DlgProc(HWND hDlg, 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: - { - switch(wParam) - { - case ID_ABOUT: - ShowAboutDlg(hDlg); - break; - } - } - break; - - case WM_CLOSE: - if (hSmIcon) - DestroyIcon(hSmIcon); - if (hBgIcon) - DestroyIcon(hBgIcon); - EndDialog(hDlg, 0); + 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; @@ -381,6 +404,142 @@ DlgProc(HWND hDlg, 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))) + { + 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; + + } + + 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 @@ wWinMain(HINSTANCE hInst, INITCOMMONCONTROLSEX iccx; INT Ret = 1; HMODULE hRichEd20; + MSG Msg; hInstance = hInst; @@ -405,10 +565,19 @@ wWinMain(HINSTANCE hInst, 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); } diff --git a/reactos/base/applications/charmap/charmap.rbuild b/reactos/base/applications/charmap/charmap.rbuild index 76a1d64155b..bdea2fd7f1f 100644 --- a/reactos/base/applications/charmap/charmap.rbuild +++ b/reactos/base/applications/charmap/charmap.rbuild @@ -5,12 +5,10 @@ gdi32 user32 comctl32 - - about.c - charmap.c - lrgcell.c - map.c - + about.c + charmap.c + lrgcell.c + map.c charmap.rc precomp.h diff --git a/reactos/base/applications/charmap/lang/bg-BG.rc b/reactos/base/applications/charmap/lang/bg-BG.rc index a4c203b4e9f..860ca4bd464 100644 --- a/reactos/base/applications/charmap/lang/bg-BG.rc +++ b/reactos/base/applications/charmap/lang/bg-BG.rc @@ -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 @@ BEGIN 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 @@ STRINGTABLE DISCARDABLE 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 diff --git a/reactos/base/applications/charmap/lang/ca-ES.rc b/reactos/base/applications/charmap/lang/ca-ES.rc index 102e1ceb4f7..19a4157dc0c 100644 --- a/reactos/base/applications/charmap/lang/ca-ES.rc +++ b/reactos/base/applications/charmap/lang/ca-ES.rc @@ -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 @@ BEGIN 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 @@ STRINGTABLE DISCARDABLE 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 diff --git a/reactos/base/applications/charmap/lang/cs-CZ.rc b/reactos/base/applications/charmap/lang/cs-CZ.rc index d31df8eb885..ff50115013d 100644 --- a/reactos/base/applications/charmap/lang/cs-CZ.rc +++ b/reactos/base/applications/charmap/lang/cs-CZ.rc @@ -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 @@ BEGIN 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 @@ STRINGTABLE DISCARDABLE 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 diff --git a/reactos/base/applications/charmap/lang/de-DE.rc b/reactos/base/applications/charmap/lang/de-DE.rc index cecf8fe2621..d1feda73713 100644 --- a/reactos/base/applications/charmap/lang/de-DE.rc +++ b/reactos/base/applications/charmap/lang/de-DE.rc @@ -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 @@ STRINGTABLE DISCARDABLE 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 diff --git a/reactos/base/applications/charmap/lang/el-GR.rc b/reactos/base/applications/charmap/lang/el-GR.rc index 4ad6c2764cb..46fa157868a 100644 --- a/reactos/base/applications/charmap/lang/el-GR.rc +++ b/reactos/base/applications/charmap/lang/el-GR.rc @@ -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 @@ BEGIN 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 @@ STRINGTABLE DISCARDABLE 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 diff --git a/reactos/base/applications/charmap/lang/en-US.rc b/reactos/base/applications/charmap/lang/en-US.rc index 9cf7dfc5347..6e9e5f51d5f 100644 --- a/reactos/base/applications/charmap/lang/en-US.rc +++ b/reactos/base/applications/charmap/lang/en-US.rc @@ -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 @@ BEGIN 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 @@ STRINGTABLE DISCARDABLE 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 diff --git a/reactos/base/applications/charmap/lang/es-ES.rc b/reactos/base/applications/charmap/lang/es-ES.rc index ada78f80c69..a15d8b3fe70 100644 --- a/reactos/base/applications/charmap/lang/es-ES.rc +++ b/reactos/base/applications/charmap/lang/es-ES.rc @@ -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 @@ BEGIN 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 @@ STRINGTABLE DISCARDABLE 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 diff --git a/reactos/base/applications/charmap/lang/fr-FR.rc b/reactos/base/applications/charmap/lang/fr-FR.rc index 9a2a206726e..910b6df3746 100644 --- a/reactos/base/applications/charmap/lang/fr-FR.rc +++ b/reactos/base/applications/charmap/lang/fr-FR.rc @@ -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 @@ BEGIN 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 @@ STRINGTABLE DISCARDABLE 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 diff --git a/reactos/base/applications/charmap/lang/id-ID.rc b/reactos/base/applications/charmap/lang/id-ID.rc index 790bf651bef..a2c2cae4b96 100644 --- a/reactos/base/applications/charmap/lang/id-ID.rc +++ b/reactos/base/applications/charmap/lang/id-ID.rc @@ -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 @@ BEGIN 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 @@ STRINGTABLE DISCARDABLE 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 diff --git a/reactos/base/applications/charmap/lang/it-IT.rc b/reactos/base/applications/charmap/lang/it-IT.rc index f7f44bb2453..e4a66dea8f1 100644 --- a/reactos/base/applications/charmap/lang/it-IT.rc +++ b/reactos/base/applications/charmap/lang/it-IT.rc @@ -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 @@ BEGIN 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 @@ CAPTION "Informazioni su Character Map" 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@reactos.org)", IDC_STATIC, 48, 7, 150, 36 + LTEXT "Mappa caratteri v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy@reactos.org)", 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 @@ STRINGTABLE DISCARDABLE 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 diff --git a/reactos/base/applications/charmap/lang/ja-JP.rc b/reactos/base/applications/charmap/lang/ja-JP.rc index e5e426d2674..b97f0a48f5c 100644 --- a/reactos/base/applications/charmap/lang/ja-JP.rc +++ b/reactos/base/applications/charmap/lang/ja-JP.rc @@ -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 @@ BEGIN 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 @@ STRINGTABLE DISCARDABLE 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 diff --git a/reactos/base/applications/charmap/lang/ko-KR.rc b/reactos/base/applications/charmap/lang/ko-KR.rc index b700764d09a..a99a7f7ebc3 100644 --- a/reactos/base/applications/charmap/lang/ko-KR.rc +++ b/reactos/base/applications/charmap/lang/ko-KR.rc @@ -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 @@ BEGIN 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 @@ STRINGTABLE DISCARDABLE 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 diff --git a/reactos/base/applications/charmap/lang/lt-LT.rc b/reactos/base/applications/charmap/lang/lt-LT.rc index 9fec37413ed..67ba5fb1132 100644 --- a/reactos/base/applications/charmap/lang/lt-LT.rc +++ b/reactos/base/applications/charmap/lang/lt-LT.rc @@ -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 @@ BEGIN 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 @@ STRINGTABLE DISCARDABLE 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 diff --git a/reactos/base/applications/charmap/lang/nl-NL.rc b/reactos/base/applications/charmap/lang/nl-NL.rc index 6389f34f2d0..3e8673c1be6 100644 --- a/reactos/base/applications/charmap/lang/nl-NL.rc +++ b/reactos/base/applications/charmap/lang/nl-NL.rc @@ -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 @@ BEGIN 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 @@ STRINGTABLE DISCARDABLE 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 diff --git a/reactos/base/applications/charmap/lang/no-NO.rc b/reactos/base/applications/charmap/lang/no-NO.rc index 8fd7c204e0b..67ff7c9c102 100644 --- a/reactos/base/applications/charmap/lang/no-NO.rc +++ b/reactos/base/applications/charmap/lang/no-NO.rc @@ -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 @@ BEGIN 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 @@ STRINGTABLE DISCARDABLE 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 diff --git a/reactos/base/applications/charmap/lang/pl-PL.rc b/reactos/base/applications/charmap/lang/pl-PL.rc index 75dce3c7064..96e0092e5b2 100644 --- a/reactos/base/applications/charmap/lang/pl-PL.rc +++ b/reactos/base/applications/charmap/lang/pl-PL.rc @@ -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 @@ BEGIN 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 @@ STRINGTABLE DISCARDABLE 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 diff --git a/reactos/base/applications/charmap/lang/pt-BR.rc b/reactos/base/applications/charmap/lang/pt-BR.rc index 6a86e180307..c3046153c3f 100644 --- a/reactos/base/applications/charmap/lang/pt-BR.rc +++ b/reactos/base/applications/charmap/lang/pt-BR.rc @@ -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 @@ BEGIN 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 @@ STRINGTABLE DISCARDABLE 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 diff --git a/reactos/base/applications/charmap/lang/ru-RU.rc b/reactos/base/applications/charmap/lang/ru-RU.rc index 1a6bc939526..c52593abcb1 100644 --- a/reactos/base/applications/charmap/lang/ru-RU.rc +++ b/reactos/base/applications/charmap/lang/ru-RU.rc @@ -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 @@ BEGIN 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 @@ STRINGTABLE DISCARDABLE 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 diff --git a/reactos/base/applications/charmap/lang/sk-SK.rc b/reactos/base/applications/charmap/lang/sk-SK.rc index 7ab74b1715e..868f97e72ba 100644 --- a/reactos/base/applications/charmap/lang/sk-SK.rc +++ b/reactos/base/applications/charmap/lang/sk-SK.rc @@ -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 @@ BEGIN 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 @@ STRINGTABLE DISCARDABLE 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 diff --git a/reactos/base/applications/charmap/lang/uk-UA.rc b/reactos/base/applications/charmap/lang/uk-UA.rc index cabd820e41d..a76da186bec 100644 --- a/reactos/base/applications/charmap/lang/uk-UA.rc +++ b/reactos/base/applications/charmap/lang/uk-UA.rc @@ -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 @@ BEGIN 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 @@ STRINGTABLE DISCARDABLE 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 diff --git a/reactos/base/applications/charmap/lang/zh-CN.rc b/reactos/base/applications/charmap/lang/zh-CN.rc index 7fdfffd1a1f..7385d597667 100644 --- a/reactos/base/applications/charmap/lang/zh-CN.rc +++ b/reactos/base/applications/charmap/lang/zh-CN.rc @@ -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 @@ BEGIN 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 @@ STRINGTABLE DISCARDABLE 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 diff --git a/reactos/base/applications/charmap/lang/zh-TW.rc b/reactos/base/applications/charmap/lang/zh-TW.rc index ba36b67fb70..5bb325887ba 100644 --- a/reactos/base/applications/charmap/lang/zh-TW.rc +++ b/reactos/base/applications/charmap/lang/zh-TW.rc @@ -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 @@ BEGIN 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 @@ STRINGTABLE DISCARDABLE 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 diff --git a/reactos/base/applications/charmap/precomp.h b/reactos/base/applications/charmap/precomp.h index 597d9f20967..9825aa47560 100644 --- a/reactos/base/applications/charmap/precomp.h +++ b/reactos/base/applications/charmap/precomp.h @@ -1,13 +1,16 @@ #ifndef __CHARMAP_PRECOMP_H #define __CHARMAP_PRECOMP_H +#define WIN32_LEAN_AND_MEAN +#include #include #include -#include #include #include #include "resource.h" +#define SIZEOF(_v) (sizeof(_v) / sizeof(*_v)) + #define XCELLS 20 #define YCELLS 10 #define XLARGE 45 diff --git a/reactos/base/applications/charmap/resource.h b/reactos/base/applications/charmap/resource.h index b174903ab8a..07828054f69 100644 --- a/reactos/base/applications/charmap/resource.h +++ b/reactos/base/applications/charmap/resource.h @@ -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