Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-28 00:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

[NOTEPAD] Follow-up of 'CJK font workaround'

Browse source 
- Revert some code.
- Add font name comments.
CORE-11700
This commit is contained in:
Katayama Hirofumi MZ 2022-09-07 00:54:31 +09:00
parent 5ecf017ce2
commit a5fa4891e5
5 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
base/applications/notepad/lang/ja-JP.rc
View file

@ -167,7 +167,7 @@ BEGIN
STRING_CR "Mac (CR)" STRING_CR "Mac (CR)"
STRING_LINE_COLUMN "%d 行、%d 列" STRING_LINE_COLUMN "%d 行、%d 列"
STRING_PRINTERROR "ファイル '%s'を印刷できません。\n\nプリンタがオンになっていて、正しく設定されているか確認して下さい。" STRING_PRINTERROR "ファイル '%s'を印刷できません。\n\nプリンタがオンになっていて、正しく設定されているか確認して下さい。"
STRING_DEFAULTFONT "ＭＳ ゴシック" STRING_DEFAULTFONT "ＭＳ ゴシック" /* MS Gothic */
STRING_TEXT_DOCUMENT "テキスト文書" STRING_TEXT_DOCUMENT "テキスト文書"
STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n"

2
base/applications/notepad/lang/zh-CN.rc
View file

@ -174,7 +174,7 @@ BEGIN
STRING_CR "Mac（CR）" STRING_CR "Mac（CR）"
STRING_LINE_COLUMN "行 %d，列 %d" STRING_LINE_COLUMN "行 %d，列 %d"
STRING_PRINTERROR "无法打印文件“%s”。\n\n请确保打印机已打开，并且已正确配置。" STRING_PRINTERROR "无法打印文件“%s”。\n\n请确保打印机已打开，并且已正确配置。"
STRING_DEFAULTFONT "宋体" STRING_DEFAULTFONT "宋体" /* SimSun */
STRING_TEXT_DOCUMENT "文本文档" STRING_TEXT_DOCUMENT "文本文档"
STRING_NOTEPAD_AUTHORS "版权所有 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" STRING_NOTEPAD_AUTHORS "版权所有 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n"

2
base/applications/notepad/lang/zh-HK.rc
View file

@ -175,7 +175,7 @@ BEGIN
STRING_LINE_COLUMN "第 %d 行，第 %d 字元" STRING_LINE_COLUMN "第 %d 行，第 %d 字元"
STRING_PRINTERROR "檔案「%s」列印失敗。\n\ STRING_PRINTERROR "檔案「%s」列印失敗。\n\
請檢查印表機是否已經開機及正確設定。" 請檢查印表機是否已經開機及正確設定。"
STRING_DEFAULTFONT "新細明體" STRING_DEFAULTFONT "新細明體" /* PMingLiU */
STRING_TEXT_DOCUMENT "純文字檔案" STRING_TEXT_DOCUMENT "純文字檔案"
STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n"

2
base/applications/notepad/lang/zh-TW.rc
View file

@ -174,7 +174,7 @@ BEGIN
STRING_CR "Mac (CR)" STRING_CR "Mac (CR)"
STRING_LINE_COLUMN "第 %d 行，第 %d 字元" STRING_LINE_COLUMN "第 %d 行，第 %d 字元"
STRING_PRINTERROR "檔案「%s」列印失敗。\n\n請檢查印表機是否已經開機和正確設定。" STRING_PRINTERROR "檔案「%s」列印失敗。\n\n請檢查印表機是否已經開機和正確設定。"
STRING_DEFAULTFONT "新細明體" STRING_DEFAULTFONT "新細明體" /* PMingLiU */
STRING_TEXT_DOCUMENT "純文字檔案" STRING_TEXT_DOCUMENT "純文字檔案"
STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n"

17
base/applications/notepad/settings.c
View file

@ -184,11 +184,13 @@ void NOTEPAD_LoadSettingsFromRegistry(void)
ZeroMemory(&Globals.lfFont, sizeof(Globals.lfFont)); ZeroMemory(&Globals.lfFont, sizeof(Globals.lfFont));
Globals.lfFont.lfCharSet = DEFAULT_CHARSET; Globals.lfFont.lfCharSet = DEFAULT_CHARSET;
Globals.lfFont.lfClipPrecision = CLIP_STROKE_PRECIS;
Globals.lfFont.lfEscapement = 0;
LoadString(Globals.hInstance, STRING_DEFAULTFONT, Globals.lfFont.lfFaceName, LoadString(Globals.hInstance, STRING_DEFAULTFONT, Globals.lfFont.lfFaceName,
ARRAY_SIZE(Globals.lfFont.lfFaceName)); ARRAY_SIZE(Globals.lfFont.lfFaceName));
Globals.lfFont.lfPitchAndFamily = FIXED_PITCH | FF_MODERN; Globals.lfFont.lfItalic = FALSE;
Globals.lfFont.lfWeight = FW_NORMAL; Globals.lfFont.lfOrientation = 0;
Globals.lfFont.lfHeight = HeightFromPointSize(100); Globals.lfFont.lfOutPrecision = OUT_STRING_PRECIS;
/* WORKAROUND: Far East Asian users may not have suitable fixed-pitch fonts. */ /* WORKAROUND: Far East Asian users may not have suitable fixed-pitch fonts. */
switch (PRIMARYLANGID(GetUserDefaultLangID())) switch (PRIMARYLANGID(GetUserDefaultLangID()))
@ -198,7 +200,16 @@ void NOTEPAD_LoadSettingsFromRegistry(void)
case LANG_KOREAN: case LANG_KOREAN:
Globals.lfFont.lfPitchAndFamily = DEFAULT_PITCH | FF_DONTCARE; Globals.lfFont.lfPitchAndFamily = DEFAULT_PITCH | FF_DONTCARE;
break; break;
default:
Globals.lfFont.lfPitchAndFamily = FIXED_PITCH | FF_MODERN;
break;
} }
Globals.lfFont.lfQuality = PROOF_QUALITY;
Globals.lfFont.lfStrikeOut = FALSE;
Globals.lfFont.lfUnderline = FALSE;
Globals.lfFont.lfWeight = FW_NORMAL;
Globals.lfFont.lfHeight = HeightFromPointSize(100);
} }
hFont = CreateFontIndirect(&Globals.lfFont); hFont = CreateFontIndirect(&Globals.lfFont);