[hbelusca] 62730: [CONSOLE.CPL] Start to implement the terminal fonts selector: add a basic font enumerator. The criteria for eligible console fonts are given in http://support.microsoft.com/kb/247...
13 Apr
2014
13 Apr
'14
1:03 a.m.
Author: hbelusca
Date: Sun Apr 13 01:03:08 2014
New Revision: 62730
URL: http://svn.reactos.org/svn/reactos?rev=62730&view=rev
Log:
[CONSOLE.CPL]
Start to implement the terminal fonts selector: add a basic font enumerator.
The criteria for eligible console fonts are given in
http://support.microsoft.com/kb/247815 .
I relax some of them to allow e.g. Courier (New) as potential console fonts, for example.
See the code for more details.
Modified:
trunk/reactos/dll/cpl/console/colors.c
trunk/reactos/dll/cpl/console/console.c
trunk/reactos/dll/cpl/console/font.c
trunk/reactos/dll/cpl/console/lang/bg-BG.rc
trunk/reactos/dll/cpl/console/lang/cs-CZ.rc
trunk/reactos/dll/cpl/console/lang/de-DE.rc
trunk/reactos/dll/cpl/console/lang/en-US.rc
trunk/reactos/dll/cpl/console/lang/es-ES.rc
trunk/reactos/dll/cpl/console/lang/fr-FR.rc
trunk/reactos/dll/cpl/console/lang/he-IL.rc
trunk/reactos/dll/cpl/console/lang/id-ID.rc
trunk/reactos/dll/cpl/console/lang/it-IT.rc
trunk/reactos/dll/cpl/console/lang/no-NO.rc
trunk/reactos/dll/cpl/console/lang/pl-PL.rc
trunk/reactos/dll/cpl/console/lang/ro-RO.rc
trunk/reactos/dll/cpl/console/lang/ru-RU.rc
trunk/reactos/dll/cpl/console/lang/sk-SK.rc
trunk/reactos/dll/cpl/console/lang/sq-AL.rc
trunk/reactos/dll/cpl/console/lang/tr-TR.rc
trunk/reactos/dll/cpl/console/lang/uk-UA.rc
trunk/reactos/dll/cpl/console/lang/zh-CN.rc
trunk/reactos/dll/cpl/console/layout.c
trunk/reactos/dll/cpl/console/options.c
trunk/reactos/dll/cpl/console/resource.h
Modified: trunk/reactos/dll/cpl/console/colors.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/colors.c?r…
==============================================================================
--- trunk/reactos/dll/cpl/console/colors.c [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/console/colors.c [iso-8859-1] Sun Apr 13 01:03:08 2014
@@ -2,7 +2,7 @@
* PROJECT: ReactOS Console Configuration DLL
* LICENSE: GPL - See COPYING in the top level directory
* FILE: dll/win32/console/colors.c
- * PURPOSE: displays colors dialog
+ * PURPOSE: Colors dialog
* PROGRAMMERS: Johannes Anderwald (johannes.anderwald(a)reactos.org)
*/
Modified: trunk/reactos/dll/cpl/console/console.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/console.c?…
==============================================================================
--- trunk/reactos/dll/cpl/console/console.c [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/console/console.c [iso-8859-1] Sun Apr 13 01:03:08 2014
@@ -2,8 +2,9 @@
* PROJECT: ReactOS Console Configuration DLL
* LICENSE: GPL - See COPYING in the top level directory
* FILE: dll/win32/console/console.c
- * PURPOSE: initialization of DLL
+ * PURPOSE: Initialization
* PROGRAMMERS: Johannes Anderwald (johannes.anderwald(a)reactos.org)
+ * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr)
*/
#include "console.h"
Modified: trunk/reactos/dll/cpl/console/font.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/font.c?rev…
==============================================================================
--- trunk/reactos/dll/cpl/console/font.c [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/console/font.c [iso-8859-1] Sun Apr 13 01:03:08 2014
@@ -2,14 +2,200 @@
* PROJECT: ReactOS Console Configuration DLL
* LICENSE: GPL - See COPYING in the top level directory
* FILE: dll/win32/console/font.c
- * PURPOSE: displays font dialog
+ * PURPOSE: Font dialog
* PROGRAMMERS: Johannes Anderwald (johannes.anderwald(a)reactos.org)
+ * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr)
*/
#include "console.h"
#define NDEBUG
#include <debug.h>
+
+
+//
+// Some temporary code for future reference...
+//
+#if 0
+/*
+ * This code comes from PuTTY
+ */
+{
+ CHOOSEFONT cf;
+ LOGFONT lf;
+ HDC hdc;
+ FontSpec *fs = (FontSpec *)c->data;
+
+ hdc = GetDC(0);
+ lf.lfHeight = -MulDiv(fs->height,
+ GetDeviceCaps(hdc, LOGPIXELSY), 72);
+ ReleaseDC(0, hdc);
+ lf.lfWidth = lf.lfEscapement = lf.lfOrientation = 0;
+ lf.lfItalic = lf.lfUnderline = lf.lfStrikeOut = 0;
+ lf.lfWeight = (fs->isbold ? FW_BOLD : 0);
+ lf.lfCharSet = fs->charset;
+ lf.lfOutPrecision = OUT_DEFAULT_PRECIS;
+ lf.lfClipPrecision = CLIP_DEFAULT_PRECIS;
+ lf.lfQuality = DEFAULT_QUALITY;
+ lf.lfPitchAndFamily = FIXED_PITCH | FF_DONTCARE;
+ strncpy(lf.lfFaceName, fs->name,
+ sizeof(lf.lfFaceName) - 1);
+ lf.lfFaceName[sizeof(lf.lfFaceName) - 1] = '\0';
+
+ cf.lStructSize = sizeof(cf);
+ cf.hwndOwner = dp->hwnd;
+ cf.lpLogFont = &lf;
+ cf.Flags = (dp->fixed_pitch_fonts ? CF_FIXEDPITCHONLY : 0) |
+ CF_FORCEFONTEXIST | CF_INITTOLOGFONTSTRUCT | CF_SCREENFONTS;
+
+ if (ChooseFont(&cf)) {
+ fs = fontspec_new(lf.lfFaceName, (lf.lfWeight == FW_BOLD),
+ cf.iPointSize / 10, lf.lfCharSet);
+ dlg_fontsel_set(ctrl, dp, fs);
+ fontspec_free(fs);
+
+ ctrl->generic.handler(ctrl, dp, dp->data, EVENT_VALCHANGE);
+ }
+}
+
+/*
+ * This code is from consrv.
+ */
+{
+ if (!GetTextMetricsW(drawItem->hDC, &Metrics))
+ {
+ DPRINT1("PaintText: GetTextMetrics failed\n");
+ SelectObject(drawItem->hDC, OldFont);
+ DeleteObject(Font);
+ return;
+ }
+ GuiData->CharWidth = Metrics.tmMaxCharWidth;
+ GuiData->CharHeight = Metrics.tmHeight + Metrics.tmExternalLeading;
+
+ /* Measure real char width more precisely if possible. */
+ if (GetTextExtentPoint32W(drawItem->hDC, L"R", 1, &CharSize))
+ GuiData->CharWidth = CharSize.cx;
+}
+#endif
+
+
+BOOL CALLBACK
+EnumFontFamExProc(PLOGFONTW lplf,
+ PNEWTEXTMETRICW lpntm,
+ DWORD FontType,
+ LPARAM lParam)
+{
+ HWND hwndCombo = (HWND)lParam;
+ LPWSTR pszName = lplf->lfFaceName;
+
+ BOOL fFixed;
+ BOOL fTrueType;
+
+ /* Record the font's attributes (Fixedwidth and Truetype) */
+ fFixed = ((lplf->lfPitchAndFamily & 0x03) == FIXED_PITCH);
+ fTrueType = (lplf->lfOutPrecision == OUT_STROKE_PRECIS) ? TRUE : FALSE;
+
+ /*
+ * According to: http://support.microsoft.com/kb/247815
+ * the criteria for console-eligible fonts are:
+ * - The font must be a fixed-pitch font.
+ * - The font cannot be an italic font.
+ * - The font cannot have a negative A or C space.
+ * - If it is a TrueType font, it must be FF_MODERN.
+ * - If it is not a TrueType font, it must be OEM_CHARSET.
+ *
+ * Non documented: vertical fonts are forbidden (their name start with a
'@').
+ *
+ * Additional criteria for Asian installations:
+ * - If it is not a TrueType font, the face name must be "Terminal".
+ * - If it is an Asian TrueType font, it must also be an Asian character set.
+ *
+ * To install additional TrueType fonts to be available for the console,
+ * add entries of type REG_SZ named "0", "00" etc... in:
+ * HKEY_LOCAL_MACHINE\Software\Microsoft\Windows
NT\CurrentVersion\Console\TrueTypeFont
+ * The names of the fonts listed there should match those in:
+ * HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion\Fonts
+ */
+
+ /*
+ * In ReactOS, we relax some criteria:
+ * - We allow fixed-pitch FF_MODERN (Monospace) TrueType fonts
+ * that can be italic and have negative A or C space.
+ * - If it is not a TrueType font, it can be from another character set
+ * than OEM_CHARSET.
+ * - We do not support Asian criteria at the moment.
+ * - We do not look into the magic registry key mentioned above.
+ */
+
+ /* Reject variable width fonts */
+ if (((lplf->lfPitchAndFamily & 0x03) != FIXED_PITCH)
+#if 0 /* Reject italic and TrueType fonts with negative A or C space */
+ || (lplf->lfItalic)
+ || !(lpntm->ntmFlags & NTM_NONNEGATIVE_AC)
+#endif
+ )
+ {
+ DPRINT1("Font '%S' rejected because it%s (lfPitchAndFamily =
%d).\n",
+ pszName, !(lplf->lfPitchAndFamily & FIXED_PITCH) ? "'s
not FIXED_PITCH" : (!(lpntm->ntmFlags & NTM_NONNEGATIVE_AC) ? " has
negative A or C space" : " is broken"),
+ lplf->lfPitchAndFamily);
+ return TRUE;
+ }
+
+ /* Reject TrueType fonts that are not FF_MODERN */
+ if ((FontType == TRUETYPE_FONTTYPE) && ((lplf->lfPitchAndFamily &
0xF0) != FF_MODERN))
+ {
+ DPRINT1("TrueType font '%S' rejected because it's not FF_MODERN
(lfPitchAndFamily = %d)\n", pszName, lplf->lfPitchAndFamily);
+ return TRUE;
+ }
+
+ /* Reject non-TrueType fonts that are not OEM */
+#if 0
+ if ((FontType != TRUETYPE_FONTTYPE) && (lplf->lfCharSet != OEM_CHARSET))
+ {
+ DPRINT1("Non-TrueType font '%S' rejected because it's not
OEM_CHARSET %d\n", pszName, lplf->lfCharSet);
+ return TRUE;
+ }
+#else // Improved criterium
+ if ((FontType != TRUETYPE_FONTTYPE) &&
+ ((lplf->lfCharSet != ANSI_CHARSET) && (lplf->lfCharSet !=
DEFAULT_CHARSET) && (lplf->lfCharSet != OEM_CHARSET)))
+ {
+ DPRINT1("Non-TrueType font '%S' rejected because it's not
ANSI_CHARSET or DEFAULT_CHARSET or OEM_CHARSET (lfCharSet = %d)\n", pszName,
lplf->lfCharSet);
+ return TRUE;
+ }
+#endif
+
+ /* Reject fonts that are vertical (tategaki) */
+ if (pszName[0] == L'@')
+ {
+ DPRINT1("Font '%S' rejected because it's vertical\n",
pszName);
+ return TRUE;
+ }
+
+#if 0 // For Asian installations only
+ /* Reject non-TrueType fonts that are not Terminal */
+ if ((FontType != TRUETYPE_FONTTYPE) && (wcscmp(pszName,
L"Terminal") != 0))
+ {
+ DPRINT1("Non-TrueType font '%S' rejected because it's not
Terminal\n", pszName);
+ return TRUE;
+ }
+
+ // TODO: Asian TrueType font must also be an Asian character set.
+#endif
+
+ /* Make sure the font doesn't already exist in the list */
+ if (SendMessageW(hwndCombo, LB_FINDSTRINGEXACT, 0, (LPARAM)pszName) == LB_ERR)
+ {
+ /* Add the font */
+ INT idx = (INT)SendMessageW(hwndCombo, LB_ADDSTRING, 0, (LPARAM)pszName);
+
+ DPRINT1("Add font '%S' (lfPitchAndFamily = %d)\n", pszName,
lplf->lfPitchAndFamily);
+
+ /* Store this information in the list-item's userdata area */
+ SendMessageW(hwndCombo, LB_SETITEMDATA, idx, MAKEWPARAM(fFixed, fTrueType));
+ }
+
+ return TRUE;
+}
INT_PTR
CALLBACK
@@ -18,23 +204,48 @@
WPARAM wParam,
LPARAM lParam)
{
- LPDRAWITEMSTRUCT drawItem;
PCONSOLE_PROPS pConInfo = (PCONSOLE_PROPS)GetWindowLongPtr(hwndDlg, DWLP_USER);
-
- UNREFERENCED_PARAMETER(hwndDlg);
+ PGUI_CONSOLE_INFO GuiInfo = (pConInfo ? pConInfo->TerminalInfo.TermInfo : NULL);
+
UNREFERENCED_PARAMETER(wParam);
switch (uMsg)
{
case WM_INITDIALOG:
{
+ HDC hDC;
+ HWND hwndCombo;
+ LOGFONTW lf;
+ INT idx;
+
pConInfo = (PCONSOLE_PROPS)((LPPROPSHEETPAGE)lParam)->lParam;
+ GuiInfo = pConInfo->TerminalInfo.TermInfo;
SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pConInfo);
+
+ ZeroMemory(&lf, sizeof(lf));
+ lf.lfCharSet = DEFAULT_CHARSET; // OEM_CHARSET;
+ // lf.lfPitchAndFamily = FIXED_PITCH | FF_DONTCARE;
+ // lf.lfFaceName = L"";
+
+ hDC = GetDC(NULL);
+ hwndCombo = GetDlgItem(hwndDlg, IDC_LBOX_FONTTYPE);
+ EnumFontFamiliesExW(hDC, &lf, (FONTENUMPROCW)EnumFontFamExProc,
(LPARAM)hwndCombo, 0);
+ ReleaseDC(NULL, hDC);
+
+ DPRINT1("GuiInfo->FaceName = '%S'\n",
GuiInfo->FaceName);
+ idx = (INT)SendMessageW(hwndCombo, LB_FINDSTRINGEXACT, 0,
(LPARAM)GuiInfo->FaceName);
+ if (idx != LB_ERR)
+ {
+ SendMessageW(hwndCombo, LB_SETCURSEL, (WPARAM)idx, 0);
+ }
+
return TRUE;
}
+
case WM_DRAWITEM:
{
- drawItem = (LPDRAWITEMSTRUCT)lParam;
+ LPDRAWITEMSTRUCT drawItem = (LPDRAWITEMSTRUCT)lParam;
+
if (drawItem->CtlID == IDC_STATIC_FONT_WINDOW_PREVIEW)
{
PaintConsole(drawItem, pConInfo);
@@ -45,10 +256,9 @@
}
return TRUE;
}
+
default:
- {
break;
- }
}
return FALSE;
Modified: trunk/reactos/dll/cpl/console/lang/bg-BG.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/bg-BG…
==============================================================================
--- trunk/reactos/dll/cpl/console/lang/bg-BG.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/console/lang/bg-BG.rc [iso-8859-1] Sun Apr 13 01:03:08 2014
@@ -35,10 +35,10 @@
LTEXT "ÐÑозоÑеÑен пÑеглед:", -1, 10, 10, 94, 10
LTEXT "РазмеÑ:", -1, 180, 10, 36, 10
CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static",
SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74
- LISTBOX IDC_LBOX_FONTS, 181, 20, 55, 80, LBS_DISABLENOSCROLL | WS_VSCROLL
+ LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_DISABLENOSCROLL |
WS_VSCROLL
LTEXT "&ШÑиÑÑ:", -1, 10, 105, 33, 10
CHECKBOX "&ÐолÑÑеÑи ÑÑиÑÑове", IDC_CHECK_BOLD_FONTS,
38, 105, 85, 10
- LISTBOX IDC_LBOX_TYPE, 10, 120, 110, 40, LBS_DISABLENOSCROLL | WS_VSCROLL
+ LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS |
LBS_DISABLENOSCROLL | WS_VSCROLL
GROUPBOX "", IDC_GROUPBOX_FONT_NAME, 6, 156, 241, 50
CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static",
SS_OWNERDRAW | SS_SUNKEN, 16, 165, 95, 35
LTEXT "ÐÑеки знак е:", -1, 124, 166, 75, 10
Modified: trunk/reactos/dll/cpl/console/lang/cs-CZ.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/cs-CZ…
==============================================================================
--- trunk/reactos/dll/cpl/console/lang/cs-CZ.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/console/lang/cs-CZ.rc [iso-8859-1] Sun Apr 13 01:03:08 2014
@@ -41,10 +41,10 @@
LTEXT "Náhled okna:", -1, 10, 10, 94, 10
LTEXT "Velikost:", -1, 180, 10, 36, 10
CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static",
SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74
- LISTBOX IDC_LBOX_FONTS, 181, 20, 55, 80, LBS_DISABLENOSCROLL | WS_VSCROLL
+ LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_DISABLENOSCROLL |
WS_VSCROLL
LTEXT "&PÃsmo:", -1, 10, 105, 33, 10
CHECKBOX "&TuÄná pÃsma", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10
- LISTBOX IDC_LBOX_TYPE, 10, 120, 110, 40, LBS_DISABLENOSCROLL | WS_VSCROLL
+ LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS |
LBS_DISABLENOSCROLL | WS_VSCROLL
GROUPBOX "", IDC_GROUPBOX_FONT_NAME, 6, 156, 241, 50
CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static",
SS_OWNERDRAW | SS_SUNKEN, 16, 165, 95, 35
LTEXT "Každý znak je:", -1, 124, 166, 75, 10
Modified: trunk/reactos/dll/cpl/console/lang/de-DE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/de-DE…
==============================================================================
--- trunk/reactos/dll/cpl/console/lang/de-DE.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/console/lang/de-DE.rc [iso-8859-1] Sun Apr 13 01:03:08 2014
@@ -37,10 +37,10 @@
LTEXT "Fenstervorschau", -1, 10, 7, 65, 10
LTEXT "GröÃe", -1, 130, 10, 30, 10
CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static",
SS_OWNERDRAW | SS_SUNKEN, 10, 20, 115, 70
- LISTBOX IDC_LBOX_FONTS, 130, 20, 55, 80, LBS_DISABLENOSCROLL | WS_VSCROLL
+ LISTBOX IDC_LBOX_FONTSIZE, 130, 20, 55, 80, LBS_SORT | LBS_DISABLENOSCROLL |
WS_VSCROLL
LTEXT "&Schrift", -1, 10, 105, 35, 10
CHECKBOX "&Fette Schriften", IDC_CHECK_BOLD_FONTS, 45, 105, 60, 10
- LISTBOX IDC_LBOX_TYPE, 10, 120, 110, 50, LBS_DISABLENOSCROLL | WS_VSCROLL
+ LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 50, LBS_SORT | LBS_HASSTRINGS |
LBS_DISABLENOSCROLL | WS_VSCROLL
GROUPBOX "", IDC_GROUPBOX_FONT_NAME, 10, 155, 200, 50
CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static",
SS_OWNERDRAW | SS_SUNKEN, 15, 165, 95, 35
LTEXT "Jedes Zeichen ist:", -1, 130, 165, 75, 10
Modified: trunk/reactos/dll/cpl/console/lang/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/en-US…
==============================================================================
--- trunk/reactos/dll/cpl/console/lang/en-US.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/console/lang/en-US.rc [iso-8859-1] Sun Apr 13 01:03:08 2014
@@ -35,10 +35,10 @@
LTEXT "Window Preview:", -1, 10, 10, 94, 10
LTEXT "Size:", -1, 180, 10, 36, 10
CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static",
SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74
- LISTBOX IDC_LBOX_FONTS, 181, 20, 55, 80, LBS_DISABLENOSCROLL | WS_VSCROLL
+ LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_DISABLENOSCROLL |
WS_VSCROLL
LTEXT "&Font:", -1, 10, 105, 33, 10
CHECKBOX "&Bold fonts", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10
- LISTBOX IDC_LBOX_TYPE, 10, 120, 110, 40, LBS_DISABLENOSCROLL | WS_VSCROLL
+ LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS |
LBS_DISABLENOSCROLL | WS_VSCROLL
GROUPBOX "", IDC_GROUPBOX_FONT_NAME, 6, 156, 241, 50
CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static",
SS_OWNERDRAW | SS_SUNKEN, 16, 165, 95, 35
LTEXT "Each character is:", -1, 124, 166, 75, 10
Modified: trunk/reactos/dll/cpl/console/lang/es-ES.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/es-ES…
==============================================================================
--- trunk/reactos/dll/cpl/console/lang/es-ES.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/console/lang/es-ES.rc [iso-8859-1] Sun Apr 13 01:03:08 2014
@@ -37,10 +37,10 @@
LTEXT "Ventana de Previsualización", -1, 10, 7, 65, 10
LTEXT "Tamaño", -1, 130, 10, 30, 10
CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static",
SS_OWNERDRAW | SS_SUNKEN, 10, 20, 115, 70
- LISTBOX IDC_LBOX_FONTS, 130, 20, 55, 80, LBS_DISABLENOSCROLL | WS_VSCROLL
+ LISTBOX IDC_LBOX_FONTSIZE, 130, 20, 55, 80, LBS_SORT | LBS_DISABLENOSCROLL |
WS_VSCROLL
LTEXT "&Fuente", -1, 10, 105, 35, 10
CHECKBOX "&Negrita", IDC_CHECK_BOLD_FONTS, 45, 105, 60, 10
- LISTBOX IDC_LBOX_TYPE, 10, 120, 110, 50, LBS_DISABLENOSCROLL | WS_VSCROLL
+ LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 50, LBS_SORT | LBS_HASSTRINGS |
LBS_DISABLENOSCROLL | WS_VSCROLL
GROUPBOX "", IDC_GROUPBOX_FONT_NAME, 10, 155, 200, 50
CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static",
SS_OWNERDRAW | SS_SUNKEN, 15, 165, 95, 35
LTEXT "Cada caracter es:", -1, 130, 165, 75, 10
Modified: trunk/reactos/dll/cpl/console/lang/fr-FR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/fr-FR…
==============================================================================
--- trunk/reactos/dll/cpl/console/lang/fr-FR.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/console/lang/fr-FR.rc [iso-8859-1] Sun Apr 13 01:03:08 2014
@@ -37,10 +37,10 @@
LTEXT "Fenêtre de Prévisualisation :", -1, 10, 10, 94, 10
LTEXT "Taille :", -1, 180, 10, 36, 10
CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static",
SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74
- LISTBOX IDC_LBOX_FONTS, 181, 20, 55, 80, LBS_DISABLENOSCROLL | WS_VSCROLL
+ LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_DISABLENOSCROLL |
WS_VSCROLL
LTEXT "&Police :", -1, 10, 105, 33, 10
CHECKBOX "&Gras", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10
- LISTBOX IDC_LBOX_TYPE, 10, 120, 110, 40, LBS_DISABLENOSCROLL | WS_VSCROLL
+ LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS |
LBS_DISABLENOSCROLL | WS_VSCROLL
GROUPBOX "", IDC_GROUPBOX_FONT_NAME, 6, 156, 241, 50
CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static",
SS_OWNERDRAW | SS_SUNKEN, 16, 165, 95, 35
LTEXT "Chaque caractère est :", -1, 124, 166, 75, 10
Modified: trunk/reactos/dll/cpl/console/lang/he-IL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/he-IL…
==============================================================================
--- trunk/reactos/dll/cpl/console/lang/he-IL.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/console/lang/he-IL.rc [iso-8859-1] Sun Apr 13 01:03:08 2014
@@ -37,10 +37,10 @@
LTEXT "תצ××× ×ק××××:", -1, 10, 10, 94, 10
LTEXT "××××:", -1, 180, 10, 36, 10
CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static",
SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74
- LISTBOX IDC_LBOX_FONTS, 181, 20, 55, 80, LBS_DISABLENOSCROLL | WS_VSCROLL
+ LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_DISABLENOSCROLL |
WS_VSCROLL
LTEXT "××פ×:", -1, 10, 105, 33, 10
CHECKBOX "×××¤× ×× ××××ש××", IDC_CHECK_BOLD_FONTS, 41, 105, 33,
10
- LISTBOX IDC_LBOX_TYPE, 10, 120, 110, 40, LBS_DISABLENOSCROLL | WS_VSCROLL
+ LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS |
LBS_DISABLENOSCROLL | WS_VSCROLL
GROUPBOX "", IDC_GROUPBOX_FONT_NAME, 6, 156, 241, 50
CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static",
SS_OWNERDRAW | SS_SUNKEN, 16, 165, 95, 35
LTEXT "Each character is:", -1, 124, 166, 75, 10
Modified: trunk/reactos/dll/cpl/console/lang/id-ID.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/id-ID…
==============================================================================
--- trunk/reactos/dll/cpl/console/lang/id-ID.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/console/lang/id-ID.rc [iso-8859-1] Sun Apr 13 01:03:08 2014
@@ -37,10 +37,10 @@
LTEXT "Tinjauan Jendela", -1, 10, 7, 65, 10
LTEXT "Ukuran", -1, 130, 10, 30, 10
CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static",
SS_OWNERDRAW | SS_SUNKEN, 10, 20, 115, 70
- LISTBOX IDC_LBOX_FONTS, 130, 20, 55, 80, LBS_DISABLENOSCROLL | WS_VSCROLL
+ LISTBOX IDC_LBOX_FONTSIZE, 130, 20, 55, 80, LBS_SORT | LBS_DISABLENOSCROLL |
WS_VSCROLL
LTEXT "&Font", -1, 10, 105, 35, 10
CHECKBOX "Font &tebal", IDC_CHECK_BOLD_FONTS, 45, 105, 60, 10
- LISTBOX IDC_LBOX_TYPE, 10, 120, 110, 50, LBS_DISABLENOSCROLL | WS_VSCROLL
+ LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 50, LBS_SORT | LBS_HASSTRINGS |
LBS_DISABLENOSCROLL | WS_VSCROLL
GROUPBOX "", IDC_GROUPBOX_FONT_NAME, 10, 155, 200, 50
CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static",
SS_OWNERDRAW | SS_SUNKEN, 15, 165, 95, 35
LTEXT "Setiap karakter adalah:", -1, 130, 165, 75, 10
Modified: trunk/reactos/dll/cpl/console/lang/it-IT.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/it-IT…
==============================================================================
--- trunk/reactos/dll/cpl/console/lang/it-IT.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/console/lang/it-IT.rc [iso-8859-1] Sun Apr 13 01:03:08 2014
@@ -37,10 +37,10 @@
LTEXT "Anteprima", -1, 10, 7, 65, 10
LTEXT "Dimansione", -1, 130, 10, 30, 10
CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static",
SS_OWNERDRAW | SS_SUNKEN, 10, 20, 115, 70
- LISTBOX IDC_LBOX_FONTS, 130, 20, 55, 80, LBS_DISABLENOSCROLL | WS_VSCROLL
+ LISTBOX IDC_LBOX_FONTSIZE, 130, 20, 55, 80, LBS_SORT | LBS_DISABLENOSCROLL |
WS_VSCROLL
LTEXT "&Font", -1, 10, 105, 35, 10
CHECKBOX "&Grassetto fonts", IDC_CHECK_BOLD_FONTS, 45, 105, 60, 10
- LISTBOX IDC_LBOX_TYPE, 10, 120, 110, 50, LBS_DISABLENOSCROLL | WS_VSCROLL
+ LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 50, LBS_SORT | LBS_HASSTRINGS |
LBS_DISABLENOSCROLL | WS_VSCROLL
GROUPBOX "", IDC_GROUPBOX_FONT_NAME, 10, 155, 200, 50
CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static",
SS_OWNERDRAW | SS_SUNKEN, 15, 165, 95, 35
LTEXT "Ogni carattere è:", -1, 130, 165, 75, 10
Modified: trunk/reactos/dll/cpl/console/lang/no-NO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/no-NO…
==============================================================================
--- trunk/reactos/dll/cpl/console/lang/no-NO.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/console/lang/no-NO.rc [iso-8859-1] Sun Apr 13 01:03:08 2014
@@ -35,10 +35,10 @@
LTEXT "Vindu forhåndsvisning:", -1, 10, 10, 94, 10
LTEXT "Størrelse:", -1, 180, 10, 36, 10
CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static",
SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74
- LISTBOX IDC_LBOX_FONTS, 181, 20, 55, 80, LBS_DISABLENOSCROLL | WS_VSCROLL
+ LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_DISABLENOSCROLL |
WS_VSCROLL
LTEXT "&Skrift:", -1, 10, 105, 33, 10
CHECKBOX "&Fet skrift", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10
- LISTBOX IDC_LBOX_TYPE, 10, 120, 110, 40, LBS_DISABLENOSCROLL | WS_VSCROLL
+ LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS |
LBS_DISABLENOSCROLL | WS_VSCROLL
GROUPBOX "", IDC_GROUPBOX_FONT_NAME, 6, 156, 241, 50
CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static",
SS_OWNERDRAW | SS_SUNKEN, 16, 165, 95, 35
LTEXT "Hver tegn er:", -1, 124, 166, 75, 10
Modified: trunk/reactos/dll/cpl/console/lang/pl-PL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/pl-PL…
==============================================================================
--- trunk/reactos/dll/cpl/console/lang/pl-PL.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/console/lang/pl-PL.rc [iso-8859-1] Sun Apr 13 01:03:08 2014
@@ -42,10 +42,10 @@
LTEXT "Okno podglÄ
du", -1, 10, 7, 65, 10
LTEXT "Rozmiar", -1, 130, 10, 30, 10
CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static",
SS_OWNERDRAW | SS_SUNKEN, 10, 20, 115, 70
- LISTBOX IDC_LBOX_FONTS, 130, 20, 55, 80, LBS_DISABLENOSCROLL | WS_VSCROLL
+ LISTBOX IDC_LBOX_FONTSIZE, 130, 20, 55, 80, LBS_SORT | LBS_DISABLENOSCROLL |
WS_VSCROLL
LTEXT "&Czcionka", -1, 10, 105, 35, 10
CHECKBOX "&Pogrubiona czcionka", IDC_CHECK_BOLD_FONTS, 45, 105, 60, 10
- LISTBOX IDC_LBOX_TYPE, 10, 120, 110, 50, LBS_DISABLENOSCROLL | WS_VSCROLL
+ LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 50, LBS_SORT | LBS_HASSTRINGS |
LBS_DISABLENOSCROLL | WS_VSCROLL
GROUPBOX "", IDC_GROUPBOX_FONT_NAME, 10, 155, 200, 50
CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static",
SS_OWNERDRAW | SS_SUNKEN, 15, 165, 95, 35
LTEXT "Pogrubiona czcionka:", -1, 130, 165, 75, 10
Modified: trunk/reactos/dll/cpl/console/lang/ro-RO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/ro-RO…
==============================================================================
--- trunk/reactos/dll/cpl/console/lang/ro-RO.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/console/lang/ro-RO.rc [iso-8859-1] Sun Apr 13 01:03:08 2014
@@ -44,10 +44,10 @@
LTEXT "Previzionare:", -1, 10, 10, 94, 10
LTEXT "&MÄrime:", -1, 180, 10, 36, 10
CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static",
SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74
- LISTBOX IDC_LBOX_FONTS, 181, 20, 55, 80, LBS_DISABLENOSCROLL | WS_VSCROLL
+ LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_DISABLENOSCROLL |
WS_VSCROLL
LTEXT "F&ont:", -1, 10, 105, 33, 10
CHECKBOX "&Aldin", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10
- LISTBOX IDC_LBOX_TYPE, 10, 120, 110, 40, LBS_DISABLENOSCROLL | WS_VSCROLL
+ LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS |
LBS_DISABLENOSCROLL | WS_VSCROLL
GROUPBOX "", IDC_GROUPBOX_FONT_NAME, 6, 156, 241, 50
CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static",
SS_OWNERDRAW | SS_SUNKEN, 16, 165, 95, 35
LTEXT "Fiecare caracter are:", -1, 124, 166, 75, 10
Modified: trunk/reactos/dll/cpl/console/lang/ru-RU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/ru-RU…
==============================================================================
--- trunk/reactos/dll/cpl/console/lang/ru-RU.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/console/lang/ru-RU.rc [iso-8859-1] Sun Apr 13 01:03:08 2014
@@ -37,10 +37,10 @@
LTEXT "Ðкно пÑедпÑоÑмоÑÑа:", -1, 10, 10, 94, 10
LTEXT "РазмеÑ:", -1, 180, 10, 36, 10
CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static",
SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74
- LISTBOX IDC_LBOX_FONTS, 181, 20, 55, 80, LBS_DISABLENOSCROLL | WS_VSCROLL
+ LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_DISABLENOSCROLL |
WS_VSCROLL
LTEXT "&ШÑиÑÑ:", -1, 10, 105, 33, 10
CHECKBOX "&ÐиÑнÑй", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10
- LISTBOX IDC_LBOX_TYPE, 10, 120, 110, 40, LBS_DISABLENOSCROLL | WS_VSCROLL
+ LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS |
LBS_DISABLENOSCROLL | WS_VSCROLL
GROUPBOX "", IDC_GROUPBOX_FONT_NAME, 6, 156, 241, 50
CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static",
SS_OWNERDRAW | SS_SUNKEN, 16, 165, 95, 35
LTEXT "ÐаждÑй Ñимвол:", -1, 124, 166, 75, 10
Modified: trunk/reactos/dll/cpl/console/lang/sk-SK.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/sk-SK…
==============================================================================
--- trunk/reactos/dll/cpl/console/lang/sk-SK.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/console/lang/sk-SK.rc [iso-8859-1] Sun Apr 13 01:03:08 2014
@@ -39,10 +39,10 @@
LTEXT "Ukážka okna:", -1, 10, 10, 94, 10
LTEXT "Veľkosť:", -1, 180, 10, 36, 10
CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static",
SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74
- LISTBOX IDC_LBOX_FONTS, 181, 20, 55, 80, LBS_DISABLENOSCROLL | WS_VSCROLL
+ LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_DISABLENOSCROLL |
WS_VSCROLL
LTEXT "&PÃsmo:", -1, 10, 105, 33, 10
CHECKBOX "&TuÄné pÃsma", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10
- LISTBOX IDC_LBOX_TYPE, 10, 120, 110, 40, LBS_DISABLENOSCROLL | WS_VSCROLL
+ LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS |
LBS_DISABLENOSCROLL | WS_VSCROLL
GROUPBOX "", IDC_GROUPBOX_FONT_NAME, 6, 156, 241, 50
CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static",
SS_OWNERDRAW | SS_SUNKEN, 16, 165, 95, 35
LTEXT "Každý znak je:", -1, 124, 166, 75, 10
Modified: trunk/reactos/dll/cpl/console/lang/sq-AL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/sq-AL…
==============================================================================
--- trunk/reactos/dll/cpl/console/lang/sq-AL.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/console/lang/sq-AL.rc [iso-8859-1] Sun Apr 13 01:03:08 2014
@@ -39,10 +39,10 @@
LTEXT "Dritare Preview:", -1, 10, 10, 94, 10
LTEXT "Masë:", -1, 180, 10, 36, 10
CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Statik",
SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74
- LISTBOX IDC_LBOX_FONTS, 181, 20, 55, 80, LBS_DISABLENOSCROLL | WS_VSCROLL
+ LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_DISABLENOSCROLL |
WS_VSCROLL
LTEXT "&Font:", -1, 10, 105, 33, 10
CHECKBOX "&Bold fonts", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10
- LISTBOX IDC_LBOX_TYPE, 10, 120, 110, 40, LBS_DISABLENOSCROLL | WS_VSCROLL
+ LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS |
LBS_DISABLENOSCROLL | WS_VSCROLL
GROUPBOX "", IDC_GROUPBOX_FONT_NAME, 6, 156, 241, 50
CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Statik",
SS_OWNERDRAW | SS_SUNKEN, 16, 165, 95, 35
LTEXT "Ãdo krarakter është:", -1, 124, 166, 75, 10
Modified: trunk/reactos/dll/cpl/console/lang/tr-TR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/tr-TR…
==============================================================================
--- trunk/reactos/dll/cpl/console/lang/tr-TR.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/console/lang/tr-TR.rc [iso-8859-1] Sun Apr 13 01:03:08 2014
@@ -37,10 +37,10 @@
LTEXT "Pencere Ãn Ä°zlemesi:", -1, 10, 10, 94, 10
LTEXT "Boyutlar:", -1, 180, 10, 36, 10
CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static",
SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74
- LISTBOX IDC_LBOX_FONTS, 181, 20, 55, 80, LBS_DISABLENOSCROLL | WS_VSCROLL
+ LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_DISABLENOSCROLL |
WS_VSCROLL
LTEXT "&Yazı Tipi:", -1, 10, 105, 33, 10
CHECKBOX "&Kalın Yazı Tipleri", IDC_CHECK_BOLD_FONTS, 56, 105, 60,
10
- LISTBOX IDC_LBOX_TYPE, 10, 120, 110, 40, LBS_DISABLENOSCROLL | WS_VSCROLL
+ LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS |
LBS_DISABLENOSCROLL | WS_VSCROLL
GROUPBOX "", IDC_GROUPBOX_FONT_NAME, 6, 156, 241, 50
CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static",
SS_OWNERDRAW | SS_SUNKEN, 16, 165, 95, 35
LTEXT "Her bir damga:", -1, 124, 166, 75, 10
Modified: trunk/reactos/dll/cpl/console/lang/uk-UA.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/uk-UA…
==============================================================================
--- trunk/reactos/dll/cpl/console/lang/uk-UA.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/console/lang/uk-UA.rc [iso-8859-1] Sun Apr 13 01:03:08 2014
@@ -37,10 +37,10 @@
LTEXT "ÐÑазок вÑкна", -1, 10, 10, 94, 10
LTEXT "Size:", -1, 180, 10, 36, 10
CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static",
SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74
- LISTBOX IDC_LBOX_FONTS, 181, 20, 55, 80, LBS_DISABLENOSCROLL | WS_VSCROLL
+ LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_DISABLENOSCROLL |
WS_VSCROLL
LTEXT "&ШÑиÑÑ:", -1, 10, 105, 33, 10
CHECKBOX "&ÐиÑнÑ", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10
- LISTBOX IDC_LBOX_TYPE, 10, 120, 110, 40, LBS_DISABLENOSCROLL | WS_VSCROLL
+ LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS |
LBS_DISABLENOSCROLL | WS_VSCROLL
GROUPBOX "", IDC_GROUPBOX_FONT_NAME, 6, 156, 241, 50
CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static",
SS_OWNERDRAW | SS_SUNKEN, 16, 165, 95, 35
LTEXT "Ðожен Ñимвол:", -1, 124, 166, 75, 10
Modified: trunk/reactos/dll/cpl/console/lang/zh-CN.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/zh-CN…
==============================================================================
--- trunk/reactos/dll/cpl/console/lang/zh-CN.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/console/lang/zh-CN.rc [iso-8859-1] Sun Apr 13 01:03:08 2014
@@ -37,10 +37,10 @@
LTEXT "çªå£é¢è§ï¼", -1, 10, 10, 94, 10
LTEXT "大å°ï¼", -1, 180, 10, 36, 10
CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static",
SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74
- LISTBOX IDC_LBOX_FONTS, 181, 20, 55, 80, LBS_DISABLENOSCROLL | WS_VSCROLL
+ LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_DISABLENOSCROLL |
WS_VSCROLL
LTEXT "&åä½(&F)ï¼", -1, 10, 105, 33, 10
CHECKBOX "ç²ä½(&B)", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10
- LISTBOX IDC_LBOX_TYPE, 10, 120, 110, 40, LBS_DISABLENOSCROLL | WS_VSCROLL
+ LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS |
LBS_DISABLENOSCROLL | WS_VSCROLL
GROUPBOX "", IDC_GROUPBOX_FONT_NAME, 6, 156, 241, 50
CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static",
SS_OWNERDRAW | SS_SUNKEN, 16, 165, 95, 35
LTEXT "æ¯ä¸ªå符为ï¼", -1, 124, 166, 75, 10
Modified: trunk/reactos/dll/cpl/console/layout.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/layout.c?r…
==============================================================================
--- trunk/reactos/dll/cpl/console/layout.c [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/console/layout.c [iso-8859-1] Sun Apr 13 01:03:08 2014
@@ -2,8 +2,9 @@
* PROJECT: ReactOS Console Configuration DLL
* LICENSE: GPL - See COPYING in the top level directory
* FILE: dll/win32/console/layout.c
- * PURPOSE: displays layout dialog
+ * PURPOSE: Layout dialog
* PROGRAMMERS: Johannes Anderwald (johannes.anderwald(a)reactos.org)
+ * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr)
*/
#include "console.h"
Modified: trunk/reactos/dll/cpl/console/options.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/options.c?…
==============================================================================
--- trunk/reactos/dll/cpl/console/options.c [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/console/options.c [iso-8859-1] Sun Apr 13 01:03:08 2014
@@ -2,7 +2,7 @@
* PROJECT: ReactOS Console Configuration DLL
* LICENSE: GPL - See COPYING in the top level directory
* FILE: dll/win32/console/options.c
- * PURPOSE: displays options dialog
+ * PURPOSE: Options dialog
* PROGRAMMERS: Johannes Anderwald (johannes.anderwald(a)reactos.org)
*/
Modified: trunk/reactos/dll/cpl/console/resource.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/resource.h…
==============================================================================
--- trunk/reactos/dll/cpl/console/resource.h [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/console/resource.h [iso-8859-1] Sun Apr 13 01:03:08 2014
@@ -34,9 +34,9 @@
#define IDC_STATIC_SELECT_FONT_PREVIEW 401
#define IDC_FONT_SIZE_X 402
#define IDC_FONT_SIZE_Y 403
-#define IDC_LBOX_FONTS 404
+#define IDC_LBOX_FONTSIZE 404
#define IDC_STATIC_FONT_WINDOW_PREVIEW 405
-#define IDC_LBOX_TYPE 406
+#define IDC_LBOX_FONTTYPE 406
#define IDC_GROUPBOX_FONT_NAME 407
/* Layout dialog */
3813
days inactive
3813
days old
0 comments
1 participants
participants (1)
-
hbelusca＠svn.reactos.org