diff --git a/PowerEditor/installer/nativeLang/chinese.xml b/PowerEditor/installer/nativeLang/chinese.xml index cb5612176..3cb223d53 100644 --- a/PowerEditor/installer/nativeLang/chinese.xml +++ b/PowerEditor/installer/nativeLang/chinese.xml @@ -836,6 +836,7 @@ + diff --git a/PowerEditor/installer/nativeLang/english.xml b/PowerEditor/installer/nativeLang/english.xml index ecce23b91..1baf4bb58 100644 --- a/PowerEditor/installer/nativeLang/english.xml +++ b/PowerEditor/installer/nativeLang/english.xml @@ -834,6 +834,7 @@ + diff --git a/PowerEditor/installer/nativeLang/english_customizable.xml b/PowerEditor/installer/nativeLang/english_customizable.xml index 58c326251..35d917e06 100644 --- a/PowerEditor/installer/nativeLang/english_customizable.xml +++ b/PowerEditor/installer/nativeLang/english_customizable.xml @@ -834,6 +834,7 @@ + diff --git a/PowerEditor/installer/nativeLang/french.xml b/PowerEditor/installer/nativeLang/french.xml index 1de9aed0c..38fd20c71 100644 --- a/PowerEditor/installer/nativeLang/french.xml +++ b/PowerEditor/installer/nativeLang/french.xml @@ -858,6 +858,7 @@ + diff --git a/PowerEditor/src/WinControls/AnsiCharPanel/ListView.cpp b/PowerEditor/src/WinControls/AnsiCharPanel/ListView.cpp index b6fcb5aed..e5f15c1fd 100644 --- a/PowerEditor/src/WinControls/AnsiCharPanel/ListView.cpp +++ b/PowerEditor/src/WinControls/AnsiCharPanel/ListView.cpp @@ -74,15 +74,20 @@ void ListView::init(HINSTANCE hInst, HWND parent) NativeLangSpeaker *pNativeSpeaker = (NppParameters::getInstance())->getNativeLangSpeaker(); generic_string valStr = pNativeSpeaker->getAttrNameStr(TEXT("Value"), "AsciiInsertion", "ColumnVal"); + generic_string hexStr = pNativeSpeaker->getAttrNameStr(TEXT("Hex"), "AsciiInsertion", "ColumnHex"); generic_string charStr = pNativeSpeaker->getAttrNameStr(TEXT("Character"), "AsciiInsertion", "ColumnChar"); lvColumn.cx = 45; lvColumn.pszText = (TCHAR *)valStr.c_str(); ListView_InsertColumn(_hSelf, 0, &lvColumn); + + lvColumn.cx = 45; + lvColumn.pszText = (TCHAR *)hexStr.c_str(); + ListView_InsertColumn(_hSelf, 1, &lvColumn); lvColumn.cx = 70; lvColumn.pszText = (TCHAR *)charStr.c_str(); - ListView_InsertColumn(_hSelf, 1, &lvColumn); + ListView_InsertColumn(_hSelf, 2, &lvColumn); } void ListView::resetValues(int codepage) @@ -172,20 +177,14 @@ generic_string ListView::getAscii(unsigned char value) default: { TCHAR charStr[10]; -#ifdef UNICODE char ascii[2]; ascii[0] = value; ascii[1] = '\0'; MultiByteToWideChar(_codepage, 0, ascii, -1, charStr, sizeof(charStr)); -#else - charStr[0] = (unsigned char)value; - charStr[1] = '\0'; -#endif return charStr; } } - //return TEXT(""); } void ListView::setValues(int codepage) @@ -196,15 +195,19 @@ void ListView::setValues(int codepage) { LVITEM item; item.mask = LVIF_TEXT; - TCHAR num[8]; - generic_sprintf(num, TEXT("%d"), i); - item.pszText = num; + TCHAR dec[8]; + TCHAR hex[8]; + generic_sprintf(dec, TEXT("%d"), i); + generic_sprintf(hex, TEXT("%02X"), i); + item.pszText = dec; item.iItem = i; item.iSubItem = 0; ListView_InsertItem(_hSelf, &item); + ListView_SetItemText(_hSelf, i, 1, (LPTSTR)hex); + generic_string s = getAscii((unsigned char)i); - ListView_SetItemText(_hSelf, i, 1, (LPTSTR)s.c_str()); + ListView_SetItemText(_hSelf, i, 2, (LPTSTR)s.c_str()); } }