tyler.durden
/
notepad-plus-plus
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[UPDATE] Update to the modern terminology for Unicode

This commit is contained in:
Don Ho 2015-07-29 13:45:35 +02:00
parent a958b019ff
commit 21b5d6d27c
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
PowerEditor/src/Notepad_plus.cpp
View File

@ -2130,17 +2130,17 @@ void Notepad_plus::setUniModeText()
switch (um) switch (um)
{ {
case uniUTF8: case uniUTF8:
uniModeTextString = TEXT("UTF-8"); break; uniModeTextString = TEXT("UTF-8-BOM"); break;
case uni16BE: case uni16BE:
uniModeTextString = TEXT("UCS-2 Big Endian"); break; uniModeTextString = TEXT("UCS-2 BE BOM"); break;
case uni16LE: case uni16LE:
uniModeTextString = TEXT("UCS-2 Little Endian"); break; uniModeTextString = TEXT("UCS-2 LE BOM"); break;
case uni16BE_NoBOM: case uni16BE_NoBOM:
uniModeTextString = TEXT("UCS-2 BE w/o BOM"); break; uniModeTextString = TEXT("UCS-2 Big Endian"); break;
case uni16LE_NoBOM: case uni16LE_NoBOM:
uniModeTextString = TEXT("UCS-2 LE w/o BOM"); break; uniModeTextString = TEXT("UCS-2 Little Endian"); break;
case uniCookie: case uniCookie:
uniModeTextString = TEXT("UTF-8 w/o BOM"); break; uniModeTextString = TEXT("UTF-8"); break;
default : default :
uniModeTextString = TEXT("ANSI"); uniModeTextString = TEXT("ANSI");
} }

18
PowerEditor/src/Notepad_plus.rc
View File

@ -518,10 +518,10 @@ BEGIN
POPUP "E&ncoding" POPUP "E&ncoding"
BEGIN BEGIN
MENUITEM "Encode in ANSI", IDM_FORMAT_ANSI MENUITEM "Encode in ANSI", IDM_FORMAT_ANSI
MENUITEM "Encode in UTF-8 without BOM", IDM_FORMAT_AS_UTF_8 MENUITEM "Encode in UTF-8", IDM_FORMAT_AS_UTF_8
MENUITEM "Encode in UTF-8", IDM_FORMAT_UTF_8 MENUITEM "Encode in UTF-8-BOM", IDM_FORMAT_UTF_8
MENUITEM "Encode in UCS-2 Big Endian", IDM_FORMAT_UCS_2BE MENUITEM "Encode in UCS-2 BE BOM", IDM_FORMAT_UCS_2BE
MENUITEM "Encode in UCS-2 Little Endian", IDM_FORMAT_UCS_2LE MENUITEM "Encode in UCS-2 LE BOM", IDM_FORMAT_UCS_2LE
POPUP "Character sets" POPUP "Character sets"
BEGIN BEGIN
POPUP "Arabic" POPUP "Arabic"
@ -636,11 +636,11 @@ BEGIN
END END
END END
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "Convert to ANSI", IDM_FORMAT_CONV2_ANSI MENUITEM "Convert to ANSI", IDM_FORMAT_CONV2_ANSI
MENUITEM "Convert to UTF-8 without BOM", IDM_FORMAT_CONV2_AS_UTF_8 MENUITEM "Convert to UTF-8", IDM_FORMAT_CONV2_AS_UTF_8
MENUITEM "Convert to UTF-8", IDM_FORMAT_CONV2_UTF_8 MENUITEM "Convert to UTF-8-BOM", IDM_FORMAT_CONV2_UTF_8
MENUITEM "Convert to UCS-2 Big Endian", IDM_FORMAT_CONV2_UCS_2BE MENUITEM "Convert to UCS-2 BE BOM", IDM_FORMAT_CONV2_UCS_2BE
MENUITEM "Convert to UCS-2 Little Endian", IDM_FORMAT_CONV2_UCS_2LE MENUITEM "Convert to UCS-2 LE BOM", IDM_FORMAT_CONV2_UCS_2LE
END END
POPUP "&Language" POPUP "&Language"

8
PowerEditor/src/WinControls/Preference/preference.rc
View File

@ -162,12 +162,12 @@ BEGIN
CONTROL "Unix/OSX",IDC_RADIO_F_UNIX,"Button",BS_AUTORADIOBUTTON,75,81,50,10 CONTROL "Unix/OSX",IDC_RADIO_F_UNIX,"Button",BS_AUTORADIOBUTTON,75,81,50,10
GROUPBOX "Encoding",IDC_ENCODING_STATIC,212,28,175,122,BS_CENTER GROUPBOX "Encoding",IDC_ENCODING_STATIC,212,28,175,122,BS_CENTER
CONTROL "ANSI",IDC_RADIO_ANSI,"Button",BS_AUTORADIOBUTTON | WS_GROUP,222,39,80,10 CONTROL "ANSI",IDC_RADIO_ANSI,"Button",BS_AUTORADIOBUTTON | WS_GROUP,222,39,80,10
CONTROL "UTF-8 without BOM",IDC_RADIO_UTF8SANSBOM,"Button",BS_AUTORADIOBUTTON,222,53,128,10 CONTROL "UTF-8",IDC_RADIO_UTF8SANSBOM,"Button",BS_AUTORADIOBUTTON,222,53,128,10
CONTROL "Apply to opened ANSI files",IDC_CHECK_OPENANSIASUTF8, CONTROL "Apply to opened ANSI files",IDC_CHECK_OPENANSIASUTF8,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,232,65,124,10 "Button",BS_AUTOCHECKBOX | WS_TABSTOP,232,65,124,10
CONTROL "UTF-8",IDC_RADIO_UTF8,"Button",BS_AUTORADIOBUTTON,222,79,62,10 CONTROL "UTF-8 with BOM",IDC_RADIO_UTF8,"Button",BS_AUTORADIOBUTTON,222,79,62,10
CONTROL "UCS-2 Big Endian",IDC_RADIO_UCS2BIG,"Button",BS_AUTORADIOBUTTON,222,95,103,10 CONTROL "UCS-2 Big Endian with BOM",IDC_RADIO_UCS2BIG,"Button",BS_AUTORADIOBUTTON,222,95,110,10
CONTROL "UCS-2 Little Endian",IDC_RADIO_UCS2SMALL,"Button",BS_AUTORADIOBUTTON,222,111,102,10 CONTROL "UCS-2 Little Endian with BOM",IDC_RADIO_UCS2SMALL,"Button",BS_AUTORADIOBUTTON,222,111,110,10
CONTROL "",IDC_RADIO_OTHERCP,"Button",BS_AUTORADIOBUTTON,222,126,10,10 CONTROL "",IDC_RADIO_OTHERCP,"Button",BS_AUTORADIOBUTTON,222,126,10,10
COMBOBOX IDC_COMBO_OTHERCP,236,126,100,140,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_COMBO_OTHERCP,236,126,100,140,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
RTEXT "Default language :",IDC_DEFAULTLANG_STATIC,57,130,77,8 RTEXT "Default language :",IDC_DEFAULTLANG_STATIC,57,130,77,8