mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Check in changes for Thai WinFE UI changes. Approved by Garrett Blythe 

submitted by samphan@email.ksc.net (with slight changes)
This commit is contained in:
ftang%netscape.com 1998-08-01 07:49:21 +00:00
Родитель 811e97ed82
Коммит 619876f624
7 изменённых файлов: 37 добавлений и 8 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

3
cmd/winfe/genfram2.cpp
Просмотреть файл

@ -469,7 +469,8 @@ int16 nIDToCsid(UINT nID)
CS_UTF8, // ID_OPTIONS_ENCODING_18
CS_UCS2, // ID_OPTIONS_ENCODING_19
CS_UTF7, // ID_OPTIONS_ENCODING_20
CS_ARMSCII8 // ID_OPTIONS_ENCODING_21
CS_ARMSCII8, // ID_OPTIONS_ENCODING_21
CS_TIS620 // ID_OPTIONS_ENCODING_22
};
if( nID >= ID_OPTIONS_ENCODING_1 && nID <= ID_OPTIONS_ENCODING_70)

16
cmd/winfe/intlwin.cpp
Просмотреть файл

@ -144,6 +144,7 @@ struct FontCharTable fontchar_tbl[] =
CS_ARMSCII8, "ArmNet Helvetica", 12, "ArmNet Courier", 10, 160, 160,
CS_CP_1253, "Times New Roman", 12, "Courier New", 10, 161,161,
CS_8859_9, "Times New Roman", 12, "Courier New", 10, 162,162,
CS_TIS620, "AngsanaUPC", 16, "CordiaUPC", 14, THAI_CHARSET, THAI_CHARSET,
CS_UTF8, DEF_PROPORTIONAL_FONT, 12, DEF_FIXED_FONT, 10, DEFAULT_CHARSET, DEFAULT_CHARSET,
CS_USER_DEFINED_ENCODING, DEF_PROPORTIONAL_FONT, 12, DEF_FIXED_FONT, 10, ANSI_CHARSET, ANSI_CHARSET,
0, "", 0, "", 0, 0, 0
@ -160,15 +161,16 @@ unsigned int lang_table[] =
IDS_LANGUAGE_LATIN2, CS_CP_1250, CS_CP_1250, CS_LATIN2, 0,
IDS_LANGUAGE_JAPANESE, CS_SJIS, CS_AUTO | CS_SJIS, CS_SJIS, CS_JIS, CS_EUCJP, 0,
IDS_LANGUAGE_TAIWANESE, CS_BIG5, CS_BIG5, CS_CNS_8BIT,
CS_X_BIG5, CS_CNS11643_1110, CS_CNS11643_1, CS_CNS11643_2, 0,
CS_X_BIG5, 0,
IDS_LANGUAGE_CHINESE, CS_GB_8BIT, CS_GB_8BIT,
CS_GB2312, CS_GB2312_11, CS_HZ, 0,
IDS_LANGUAGE_KOREAN, CS_KSC_8BIT, CS_KSC_8BIT | CS_AUTO, CS_KSC_8BIT, CS_2022_KR,
CS_KSC5601, CS_KSC5601_11, 0,
CS_KSC5601, 0,
IDS_LANGUAGE_WIN1251, CS_CP_1251, CS_CP_1251, CS_8859_5, CS_KOI8_R, 0,
IDS_LANGUAGE_ARMENIAN, CS_ARMSCII8, CS_ARMSCII8, 0,
IDS_LANGUAGE_GREEK, CS_CP_1253, CS_CP_1253, CS_8859_7, 0,
IDS_LANGUAGE_TURKISH, CS_8859_9, CS_8859_9, 0,
IDS_LANGUAGE_THAI, CS_TIS620, CS_TIS620, 0,
IDS_LANGUAGE_UTF8, CS_UTF8, CS_UTF8, CS_UTF7, CS_UCS2, CS_UCS2_SWAP, 0,
IDS_LANGUAGE_USERDEFINED, CS_USER_DEFINED_ENCODING, CS_USER_DEFINED_ENCODING, 0,
UINT_MAX
@ -644,7 +646,9 @@ LPWSTR CIntlWin::m_wConvBuf = NULL;
BOOL CIntlWin::FontSelectIgnorePitch(int16 wincsid)
{
return ( (wincsid & MULTIBYTE)
return ( (wincsid & MULTIBYTE) ||
(CS_TIS620 == wincsid ) ||
(CS_ARMSCII8 == wincsid )
);
}
BOOL CIntlWin::FontSelectIgnoreCharset(int16 wincsid)
@ -744,6 +748,9 @@ int16 CIntlWin::CodePageToCsid(UINT cp)
case 950:
return CS_BIG5;
case 874:
return CS_TIS620;
default:
return CS_UNKNOWN;
}
@ -803,6 +810,9 @@ static BOOL intlUnicodeFlag(int16 wincsid)
}
else // Other SingleByte csid
{
if(CS_TIS620 == wincsid)
return FALSE;
if(sysInfo.m_bWinNT)
return TRUE;
else

4
cmd/winfe/intlwin.h
Просмотреть файл

@ -21,7 +21,7 @@
#define DEFAULT_WINCSID 0
#define MAXLANGNUM 11
#define MAXLANGNUM 13
class CyaFont;
@ -36,7 +36,7 @@ typedef struct EncodingInfo
int iFixSize; // Fix font size
int iFixCharset; // Fix font's charset-id defined by MS
int nCodeset;
int csid[5]; // Supported charset list per language
int csid[8]; // Supported charset list per language
} EncodingInfo;

2
cmd/winfe/mozilla.rc
Просмотреть файл

@ -3113,7 +3113,7 @@ END
STRINGTABLE DISCARDABLE
BEGIN
IDS_LANGUAGE_USRDEF2 "User Defined 2"
IDS_LANGUAGE_THAI "Thai"
IDS_LANGUAGE_USRDEF3 "User Defined 3"
IDS_LANGUAGE_USRDEF4 "User Defined 4"
IDS_LANGUAGE_USRDEF5 "User Defined 5"

4
cmd/winfe/res/editor.rc2
Просмотреть файл

@ -140,6 +140,8 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "Armenian (ArmSCII-8)", ID_OPTIONS_ENCODING_21
MENUITEM SEPARATOR
MENUITEM "Thai (TIS-620)", ID_OPTIONS_ENCODING_22
MENUITEM SEPARATOR
MENUITEM "Greek (Windows-1253)", ID_OPTIONS_ENCODING_16
MENUITEM "Greek (ISO-8859-7)", ID_OPTIONS_ENCODING_15
MENUITEM SEPARATOR
@ -411,6 +413,8 @@ BEGIN
MENUITEM "Cyrillic (Windows-1251)", ID_OPTIONS_ENCODING_12
MENUITEM SEPARATOR
MENUITEM "Armenian (ArmSCII-8)", ID_OPTIONS_ENCODING_21
MENUITEM SEPARATOR
MENUITEM "Thai (TIS-620)", ID_OPTIONS_ENCODING_22
MENUITEM SEPARATOR
MENUITEM "Greek (Windows-1253)", ID_OPTIONS_ENCODING_16
MENUITEM "Greek (ISO-8859-7)", ID_OPTIONS_ENCODING_15

14
cmd/winfe/res/mozilla.rc2
Просмотреть файл

@ -415,6 +415,8 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "Armenian (ArmSCII-8)", ID_OPTIONS_ENCODING_21
MENUITEM SEPARATOR
MENUITEM "Thai (TIS-620)", ID_OPTIONS_ENCODING_22
MENUITEM SEPARATOR
MENUITEM "Greek (ISO-8859-7)", ID_OPTIONS_ENCODING_15
MENUITEM "Greek (Windows-1253)", ID_OPTIONS_ENCODING_16
MENUITEM SEPARATOR
@ -822,6 +824,8 @@ BEGIN
MENUITEM "Cyrillic (Windows-1251)", ID_OPTIONS_ENCODING_12
MENUITEM SEPARATOR
MENUITEM "Armenian (ArmSCII-8)", ID_OPTIONS_ENCODING_21
MENUITEM SEPARATOR
MENUITEM "Thai (TIS-620)", ID_OPTIONS_ENCODING_22
MENUITEM SEPARATOR
MENUITEM "Greek (ISO-8859-7)", ID_OPTIONS_ENCODING_15
MENUITEM "Greek (Windows-1253)", ID_OPTIONS_ENCODING_16
@ -953,6 +957,8 @@ BEGIN
MENUITEM "Cyrillic (Windows-1251)", ID_OPTIONS_ENCODING_12
MENUITEM SEPARATOR
MENUITEM "Armenian (ArmSCII-8)", ID_OPTIONS_ENCODING_21
MENUITEM SEPARATOR
MENUITEM "Thai (TIS-620)", ID_OPTIONS_ENCODING_22
MENUITEM SEPARATOR
MENUITEM "Greek (ISO-8859-7)", ID_OPTIONS_ENCODING_15
MENUITEM "Greek (Windows-1253)", ID_OPTIONS_ENCODING_16
@ -2255,6 +2261,8 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "Armenian (ArmSCII-8)", ID_OPTIONS_ENCODING_21
MENUITEM SEPARATOR
MENUITEM "Thai (TIS-620)", ID_OPTIONS_ENCODING_22
MENUITEM SEPARATOR
MENUITEM "Greek (ISO-8859-7)", ID_OPTIONS_ENCODING_15
MENUITEM "Greek (Windows-1253)", ID_OPTIONS_ENCODING_16
MENUITEM SEPARATOR
@ -2553,6 +2561,8 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "Armenian (ArmSCII-8)", ID_OPTIONS_ENCODING_21
MENUITEM SEPARATOR
MENUITEM "Thai (TIS-620)", ID_OPTIONS_ENCODING_22
MENUITEM SEPARATOR
MENUITEM "Greek (ISO-8859-7)", ID_OPTIONS_ENCODING_15
MENUITEM "Greek (Windows-1253)", ID_OPTIONS_ENCODING_16
MENUITEM SEPARATOR
@ -2850,6 +2860,8 @@ BEGIN
MENUITEM "Cyrillic (Windows-1251)", ID_OPTIONS_ENCODING_12
MENUITEM SEPARATOR
MENUITEM "Armenian (ArmSCII-8)", ID_OPTIONS_ENCODING_21
MENUITEM SEPARATOR
MENUITEM "Thai (TIS-620)", ID_OPTIONS_ENCODING_22
MENUITEM SEPARATOR
MENUITEM "Greek (ISO-8859-7)", ID_OPTIONS_ENCODING_15
MENUITEM "Greek (Windows-1253)", ID_OPTIONS_ENCODING_16
@ -3042,6 +3054,8 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "Armenian (ArmSCII-8)", ID_OPTIONS_ENCODING_21
MENUITEM SEPARATOR
MENUITEM "Thai (TIS-620)", ID_OPTIONS_ENCODING_22
MENUITEM SEPARATOR
MENUITEM "Greek (ISO-8859-7)", ID_OPTIONS_ENCODING_15
MENUITEM "Greek (Windows-1253)", ID_OPTIONS_ENCODING_16
MENUITEM SEPARATOR

2
cmd/winfe/resource.h
Просмотреть файл

@ -3468,7 +3468,7 @@
#define IDS_OLE_CANTUSE_VIEWER 62095
#define IDS_OLE_CANTUSE_HANDLER 62096
#define IDS_OLE_CANTUSE_VIEWER2 62110
#define IDS_LANGUAGE_USRDEF2 62120
#define IDS_LANGUAGE_THAI 62120
#define IDS_LANGUAGE_USRDEF3 62121
#define IDS_LANGUAGE_USRDEF4 62122
#define IDS_LANGUAGE_USRDEF5 62123