CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-14 21:09:05 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #3 from rizonesoft/master

Browse Source 
Update local 27@20
This commit is contained in:
jczanfona 2019-02-27 20:00:40 +01:00 committed by GitHub
commit 2a57407c0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
26 changed files with 307 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Build/Changes.txt
View File

@ -29,12 +29,13 @@ SCI - (SCI)ntilla Library
==================================================
Current Version 5.19.226.build (2019-Feb-26)
Current Version 5.19.227.build (2019-Feb-27)
==================================================
--------------------------------------------------
NEW:
--------------------------------------------------
- Add a Languages Selection in UI Main Menu
- Command line option [/Y] to search env PATH for relative filename (NLS: strings)
- Customize Schemes: Caret style 'ovrbar' (default) to switch caret style
between BAR and BLOCK
@ -69,7 +70,6 @@ FIXES:
--------------------------------------------------
TRANSLATIONS (MUI):
--------------------------------------------------
- Add All Currently Available Languages in "*.ini" files
- Korean (UHC) Translation (partial).

9
crypto/crypto.c
View File

@ -123,10 +123,13 @@ INT_PTR CALLBACK SetKeysDlgProc(HWND hDlg, UINT umsg, WPARAM wParam, LPARAM lPar
// Don't use: SetFocus( GetDlgItem( hDlg, IDC_PWD_EDIT1 ) );
SetDialogFocus(hDlg, GetDlgItem(hDlg, IDC_PWD_EDIT1));
}
return true;
break;
case WM_DPICHANGED:
UpdateWindowLayoutForDPI(hDlg, 0, 0, 0, 0);
break;
case WM_COMMAND:
switch (LOWORD(wParam)) {
@ -251,6 +254,10 @@ INT_PTR CALLBACK GetKeysDlgProc(HWND hDlg, UINT umsg, WPARAM wParam, LPARAM lPar
return true;
break;
case WM_DPICHANGED:
UpdateWindowLayoutForDPI(hDlg, 0, 0, 0, 0);
break;
case WM_COMMAND:
switch (LOWORD(wParam))

4
language/np3_af_za/strings_af_za.rc
View File

@ -203,7 +203,7 @@ BEGIN
IDS_MUI_LANG_BE_BY "Belarusian (Belarus)\t\t\t[%s]"
IDS_MUI_LANG_DE_DE "German (Germany)\t\t\t[%s]"
IDS_MUI_LANG_EN_GB "English (United Kingdom)\t\t\t[%s]"
IDS_MUI_LANG_ES_ES "Spanish (Spain Modern)\t\t\t[%s]"
IDS_MUI_LANG_ES_ES "Spanish (Spain)\t\t\t[%s]"
IDS_MUI_LANG_FR_FR "French (France)\t\t\t[%s]"
IDS_MUI_LANG_HU_HU "Hungarian (Hungary)\t\t\t[%s]"
IDS_MUI_LANG_IT_IT "Italian (Italy)\t\t\t[%s]"
@ -212,7 +212,7 @@ BEGIN
IDS_MUI_LANG_NL_NL "Dutch (Netherlands)\t\t\t[%s]"
IDS_MUI_LANG_PT_BR "Portuguese (Brazil)\t\t\t[%s]"
IDS_MUI_LANG_RU_RU "Russian (Russia)\t\t\t[%s]"
IDS_MUI_LANG_ZH_CN "Chinese (Hans)\t\t\t[%s]"
IDS_MUI_LANG_ZH_CN "Chinese (Hans)\t\t\t[%s]"
END
STRINGTABLE

4
language/np3_be_by/strings_be_by.rc
View File

@ -203,7 +203,7 @@ BEGIN
IDS_MUI_LANG_BE_BY "Belarusian (Belarus)\t\t\t[%s]"
IDS_MUI_LANG_DE_DE "German (Germany)\t\t\t[%s]"
IDS_MUI_LANG_EN_GB "English (United Kingdom)\t\t\t[%s]"
IDS_MUI_LANG_ES_ES "Spanish (Spain Modern)\t\t\t[%s]"
IDS_MUI_LANG_ES_ES "Spanish (Spain)\t\t\t[%s]"
IDS_MUI_LANG_FR_FR "French (France)\t\t\t[%s]"
IDS_MUI_LANG_HU_HU "Hungarian (Hungary)\t\t\t[%s]"
IDS_MUI_LANG_IT_IT "Italian (Italy)\t\t\t[%s]"
@ -212,7 +212,7 @@ BEGIN
IDS_MUI_LANG_NL_NL "Dutch (Netherlands)\t\t\t[%s]"
IDS_MUI_LANG_PT_BR "Portuguese (Brazil)\t\t\t[%s]"
IDS_MUI_LANG_RU_RU "Russian (Russia)\t\t\t[%s]"
IDS_MUI_LANG_ZH_CN "Chinese (Hans)\t\t\t[%s]"
IDS_MUI_LANG_ZH_CN "Chinese (Hans)\t\t\t[%s]"
END
STRINGTABLE

4
language/np3_de_de/strings_de_de.rc
View File

@ -203,7 +203,7 @@ BEGIN
IDS_MUI_LANG_BE_BY "Belarusian (Belarus)\t\t\t[%s]"
IDS_MUI_LANG_DE_DE "German (Germany)\t\t\t[%s]"
IDS_MUI_LANG_EN_GB "English (United Kingdom)\t\t\t[%s]"
IDS_MUI_LANG_ES_ES "Spanish (Spain Modern)\t\t\t[%s]"
IDS_MUI_LANG_ES_ES "Spanish (Spain)\t\t\t[%s]"
IDS_MUI_LANG_FR_FR "French (France)\t\t\t[%s]"
IDS_MUI_LANG_HU_HU "Hungarian (Hungary)\t\t\t[%s]"
IDS_MUI_LANG_IT_IT "Italian (Italy)\t\t\t[%s]"
@ -212,7 +212,7 @@ BEGIN
IDS_MUI_LANG_NL_NL "Dutch (Netherlands)\t\t\t[%s]"
IDS_MUI_LANG_PT_BR "Portuguese (Brazil)\t\t\t[%s]"
IDS_MUI_LANG_RU_RU "Russian (Russia)\t\t\t[%s]"
IDS_MUI_LANG_ZH_CN "Chinese (Hans)\t\t\t[%s]"
IDS_MUI_LANG_ZH_CN "Chinese (Hans)\t\t\t[%s]"
END
STRINGTABLE

4
language/np3_en_gb/strings_en_gb.rc
View File

@ -231,7 +231,7 @@ BEGIN
IDS_MUI_LANG_BE_BY "Belarusian (Belarus)\t\t\t[%s]"
IDS_MUI_LANG_DE_DE "German (Germany)\t\t\t[%s]"
IDS_MUI_LANG_EN_GB "English (United Kingdom)\t\t\t[%s]"
IDS_MUI_LANG_ES_ES "Spanish (Spain Modern)\t\t\t[%s]"
IDS_MUI_LANG_ES_ES "Spanish (Spain)\t\t\t[%s]"
IDS_MUI_LANG_FR_FR "French (France)\t\t\t[%s]"
IDS_MUI_LANG_HU_HU "Hungarian (Hungary)\t\t\t[%s]"
IDS_MUI_LANG_IT_IT "Italian (Italy)\t\t\t[%s]"
@ -240,7 +240,7 @@ BEGIN
IDS_MUI_LANG_NL_NL "Dutch (Netherlands)\t\t\t[%s]"
IDS_MUI_LANG_PT_BR "Portuguese (Brazil)\t\t\t[%s]"
IDS_MUI_LANG_RU_RU "Russian (Russia)\t\t\t[%s]"
IDS_MUI_LANG_ZH_CN "Chinese (Hans)\t\t\t[%s]"
IDS_MUI_LANG_ZH_CN "Chinese (Hans)\t\t\t[%s]"
END
STRINGTABLE

4
language/np3_en_us/strings_en_us.rc
View File

@ -231,7 +231,7 @@ BEGIN
IDS_MUI_LANG_BE_BY "Belarusian (Belarus)\t\t\t[%s]"
IDS_MUI_LANG_DE_DE "German (Germany)\t\t\t[%s]"
IDS_MUI_LANG_EN_GB "English (United Kingdom)\t\t\t[%s]"
IDS_MUI_LANG_ES_ES "Spanish (Spain Modern)\t\t\t[%s]"
IDS_MUI_LANG_ES_ES "Spanish (Spain)\t\t\t[%s]"
IDS_MUI_LANG_FR_FR "French (France)\t\t\t[%s]"
IDS_MUI_LANG_HU_HU "Hungarian (Hungary)\t\t\t[%s]"
IDS_MUI_LANG_IT_IT "Italian (Italy)\t\t\t[%s]"
@ -240,7 +240,7 @@ BEGIN
IDS_MUI_LANG_NL_NL "Dutch (Netherlands)\t\t\t[%s]"
IDS_MUI_LANG_PT_BR "Portuguese (Brazil)\t\t\t[%s]"
IDS_MUI_LANG_RU_RU "Russian (Russia)\t\t\t[%s]"
IDS_MUI_LANG_ZH_CN "Chinese (Hans)\t\t\t[%s]"
IDS_MUI_LANG_ZH_CN "Chinese (Hans)\t\t\t[%s]"
END
STRINGTABLE

32
language/np3_es_es/strings_es_es.rc
View File

@ -197,22 +197,22 @@ END
STRINGTABLE
BEGIN
IDS_MUI_MENU_LANGUAGE "Language"
IDS_MUI_LANG_EN_US "English (United States)\t\t\t[%s]"
IDS_MUI_LANG_AF_ZA "Afrikaans (South Africa)\t\t\t[%s]"
IDS_MUI_LANG_BE_BY "Belarusian (Belarus)\t\t\t[%s]"
IDS_MUI_LANG_DE_DE "German (Germany)\t\t\t[%s]"
IDS_MUI_LANG_EN_GB "English (United Kingdom)\t\t\t[%s]"
IDS_MUI_LANG_ES_ES "Spanish (Spain Modern)\t\t\t[%s]"
IDS_MUI_LANG_FR_FR "French (France)\t\t\t[%s]"
IDS_MUI_LANG_HU_HU "Hungarian (Hungary)\t\t\t[%s]"
IDS_MUI_LANG_IT_IT "Italian (Italy)\t\t\t[%s]"
IDS_MUI_LANG_JP_JP "Japanese (Japan)\t\t\t[%s]"
IDS_MUI_LANG_KO_KR "Korean (Korea)\t\t\t[%s]"
IDS_MUI_LANG_NL_NL "Dutch (Netherlands)\t\t\t[%s]"
IDS_MUI_LANG_PT_BR "Portuguese (Brazil)\t\t\t[%s]"
IDS_MUI_LANG_RU_RU "Russian (Russia)\t\t\t[%s]"
IDS_MUI_LANG_ZH_CN "Chinese (Hans)\t\t\t[%s]"
IDS_MUI_MENU_LANGUAGE "Idioma"
IDS_MUI_LANG_EN_US "Inglés (Estados Unidos)\t\t\t[%s]"
IDS_MUI_LANG_AF_ZA "Afrikáans (Sudáfrica)\t\t\t[%s]"
IDS_MUI_LANG_BE_BY "Bielorruso (Belarús)\t\t\t[%s]"
IDS_MUI_LANG_DE_DE "Alemán (Alemania)\t\t\t[%s]"
IDS_MUI_LANG_EN_GB "Inglés (Reino Unido)\t\t\t[%s]"
IDS_MUI_LANG_ES_ES "Español (España)\t\t\t[%s]"
IDS_MUI_LANG_FR_FR "Francés (Francia)\t\t\t[%s]"
IDS_MUI_LANG_HU_HU "Húngaro (Hungría)\t\t\t[%s]"
IDS_MUI_LANG_IT_IT "Italiano (Italia)\t\t\t[%s]"
IDS_MUI_LANG_JP_JP "Japonés (Japón)\t\t\t[%s]"
IDS_MUI_LANG_KO_KR "Coreano (Corea)\t\t\t[%s]"
IDS_MUI_LANG_NL_NL "Neerlandés (Países Bajos)\t\t\t[%s]"
IDS_MUI_LANG_PT_BR "Portugués (Brasil)\t\t\t[%s]"
IDS_MUI_LANG_RU_RU "Ruso (Rusia)\t\t\t[%s]"
IDS_MUI_LANG_ZH_CN "Chino (Hans)\t\t\t[%s]"
END
STRINGTABLE

32
language/np3_fr_fr/strings_fr_fr.rc
View File

@ -195,22 +195,22 @@ END
STRINGTABLE
BEGIN
IDS_MUI_MENU_LANGUAGE "Language"
IDS_MUI_LANG_EN_US "English (United States)\t\t\t[%s]"
IDS_MUI_LANG_AF_ZA "Afrikaans (South Africa)\t\t\t[%s]"
IDS_MUI_LANG_BE_BY "Belarusian (Belarus)\t\t\t[%s]"
IDS_MUI_LANG_DE_DE "German (Germany)\t\t\t[%s]"
IDS_MUI_LANG_EN_GB "English (United Kingdom)\t\t\t[%s]"
IDS_MUI_LANG_ES_ES "Spanish (Spain Modern)\t\t\t[%s]"
IDS_MUI_LANG_FR_FR "French (France)\t\t\t[%s]"
IDS_MUI_LANG_HU_HU "Hungarian (Hungary)\t\t\t[%s]"
IDS_MUI_LANG_IT_IT "Italian (Italy)\t\t\t[%s]"
IDS_MUI_LANG_JP_JP "Japanese (Japan)\t\t\t[%s]"
IDS_MUI_LANG_KO_KR "Korean (Korea)\t\t\t[%s]"
IDS_MUI_LANG_NL_NL "Dutch (Netherlands)\t\t\t[%s]"
IDS_MUI_LANG_PT_BR "Portuguese (Brazil)\t\t\t[%s]"
IDS_MUI_LANG_RU_RU "Russian (Russia)\t\t\t[%s]"
IDS_MUI_LANG_ZH_CN "Chinese (Hans)\t\t\t[%s]"
IDS_MUI_MENU_LANGUAGE "Langue"
IDS_MUI_LANG_EN_US "Anglais (États-Unis)\t\t\t[%s]"
IDS_MUI_LANG_AF_ZA "Afrikaans (Afrique du Sud)\t\t\t[%s]"
IDS_MUI_LANG_BE_BY "Biélorusse (Biélorussie)\t\t\t[%s]"
IDS_MUI_LANG_DE_DE "Allemand (Allemagne)\t\t\t[%s]"
IDS_MUI_LANG_EN_GB "Anglais (Royaume Uni)\t\t\t[%s]"
IDS_MUI_LANG_ES_ES "Espagnol (Espagne)\t\t\t[%s]"
IDS_MUI_LANG_FR_FR "Français (France)\t\t\t[%s]"
IDS_MUI_LANG_HU_HU "Hongrois (Hongrie)\t\t\t[%s]"
IDS_MUI_LANG_IT_IT "Italien (Italie)\t\t\t[%s]"
IDS_MUI_LANG_JP_JP "Japonais (Japon)\t\t\t[%s]"
IDS_MUI_LANG_KO_KR "Coréen (Corée)\t\t\t[%s]"
IDS_MUI_LANG_NL_NL "Néerlandais (Pays-Bas)\t\t\t[%s]"
IDS_MUI_LANG_PT_BR "Portugais (Brésil)\t\t\t[%s]"
IDS_MUI_LANG_RU_RU "Russe (Russie)\t\t\t[%s]"
IDS_MUI_LANG_ZH_CN "Chinois (Hans)\t\t\t[%s]"
END
STRINGTABLE

4
language/np3_hu_hu/strings_hu_hu.rc
View File

@ -231,7 +231,7 @@ BEGIN
IDS_MUI_LANG_BE_BY "Belarusian (Belarus)\t\t\t[%s]"
IDS_MUI_LANG_DE_DE "German (Germany)\t\t\t[%s]"
IDS_MUI_LANG_EN_GB "English (United Kingdom)\t\t\t[%s]"
IDS_MUI_LANG_ES_ES "Spanish (Spain Modern)\t\t\t[%s]"
IDS_MUI_LANG_ES_ES "Spanish (Spain)\t\t\t[%s]"
IDS_MUI_LANG_FR_FR "French (France)\t\t\t[%s]"
IDS_MUI_LANG_HU_HU "Hungarian (Hungary)\t\t\t[%s]"
IDS_MUI_LANG_IT_IT "Italian (Italy)\t\t\t[%s]"
@ -240,7 +240,7 @@ BEGIN
IDS_MUI_LANG_NL_NL "Dutch (Netherlands)\t\t\t[%s]"
IDS_MUI_LANG_PT_BR "Portuguese (Brazil)\t\t\t[%s]"
IDS_MUI_LANG_RU_RU "Russian (Russia)\t\t\t[%s]"
IDS_MUI_LANG_ZH_CN "Chinese (Hans)\t\t\t[%s]"
IDS_MUI_LANG_ZH_CN "Chinese (Hans)\t\t\t[%s]"
END
STRINGTABLE

4
language/np3_it_it/strings_it_it.rc
View File

@ -231,7 +231,7 @@ BEGIN
IDS_MUI_LANG_BE_BY "Belarusian (Belarus)\t\t\t[%s]"
IDS_MUI_LANG_DE_DE "German (Germany)\t\t\t[%s]"
IDS_MUI_LANG_EN_GB "English (United Kingdom)\t\t\t[%s]"
IDS_MUI_LANG_ES_ES "Spanish (Spain Modern)\t\t\t[%s]"
IDS_MUI_LANG_ES_ES "Spanish (Spain)\t\t\t[%s]"
IDS_MUI_LANG_FR_FR "French (France)\t\t\t[%s]"
IDS_MUI_LANG_HU_HU "Hungarian (Hungary)\t\t\t[%s]"
IDS_MUI_LANG_IT_IT "Italian (Italy)\t\t\t[%s]"
@ -240,7 +240,7 @@ BEGIN
IDS_MUI_LANG_NL_NL "Dutch (Netherlands)\t\t\t[%s]"
IDS_MUI_LANG_PT_BR "Portuguese (Brazil)\t\t\t[%s]"
IDS_MUI_LANG_RU_RU "Russian (Russia)\t\t\t[%s]"
IDS_MUI_LANG_ZH_CN "Chinese (Hans)\t\t\t[%s]"
IDS_MUI_LANG_ZH_CN "Chinese (Hans)\t\t\t[%s]"
END
STRINGTABLE

4
language/np3_ja_jp/strings_ja_jp.rc
View File

@ -203,7 +203,7 @@ BEGIN
IDS_MUI_LANG_BE_BY "Belarusian (Belarus)\t\t\t[%s]"
IDS_MUI_LANG_DE_DE "German (Germany)\t\t\t[%s]"
IDS_MUI_LANG_EN_GB "English (United Kingdom)\t\t\t[%s]"
IDS_MUI_LANG_ES_ES "Spanish (Spain Modern)\t\t\t[%s]"
IDS_MUI_LANG_ES_ES "Spanish (Spain)\t\t\t[%s]"
IDS_MUI_LANG_FR_FR "French (France)\t\t\t[%s]"
IDS_MUI_LANG_HU_HU "Hungarian (Hungary)\t\t\t[%s]"
IDS_MUI_LANG_IT_IT "Italian (Italy)\t\t\t[%s]"
@ -212,7 +212,7 @@ BEGIN
IDS_MUI_LANG_NL_NL "Dutch (Netherlands)\t\t\t[%s]"
IDS_MUI_LANG_PT_BR "Portuguese (Brazil)\t\t\t[%s]"
IDS_MUI_LANG_RU_RU "Russian (Russia)\t\t\t[%s]"
IDS_MUI_LANG_ZH_CN "Chinese (Hans)\t\t\t[%s]"
IDS_MUI_LANG_ZH_CN "Chinese (Hans)\t\t\t[%s]"
END
STRINGTABLE

12
language/np3_ko_kr/lexer_ko_kr.rc
View File

@ -162,7 +162,7 @@ BEGIN
IDS_LEX_STR_63126 "기본값"
IDS_LEX_STR_63127 "주석"
IDS_LEX_STR_63128 "키워드"
IDS_LEX_STR_63129 "확인"
IDS_LEX_STR_63129 "식별문자"
IDS_LEX_STR_63130 "숫자"
IDS_LEX_STR_63131 "문자열"
IDS_LEX_STR_63132 "연산자"
@ -182,7 +182,7 @@ BEGIN
IDS_LEX_STR_63142 "HTML 기타 내부 태그"
IDS_LEX_STR_63143 "HTML 주석"
IDS_LEX_STR_63144 "HTML 개체"
IDS_LEX_STR_63145 "XML 식별자"
IDS_LEX_STR_63145 "XML 식별문자"
IDS_LEX_STR_63146 "ASP 시작 태그"
IDS_LEX_STR_63147 "CDATA"
IDS_LEX_STR_63148 "PHP 시작 태그"
@ -203,7 +203,7 @@ BEGIN
IDS_LEX_STR_63159 "JS 기본"
IDS_LEX_STR_63160 "JS 주석"
IDS_LEX_STR_63161 "JS 숫자"
IDS_LEX_STR_63162 "JS 식별자"
IDS_LEX_STR_63162 "JS 식별문자"
IDS_LEX_STR_63163 "JS 키워드"
IDS_LEX_STR_63164 "JS 문자열"
IDS_LEX_STR_63165 "JS 심볼"
@ -215,7 +215,7 @@ STRINGTABLE
BEGIN
IDS_LEX_STR_63168 "ASP JS 주석"
IDS_LEX_STR_63169 "ASP JS 숫자"
IDS_LEX_STR_63170 "ASP JS 식별자"
IDS_LEX_STR_63170 "ASP JS 식별문자"
IDS_LEX_STR_63171 "ASP JS 키워드"
IDS_LEX_STR_63172 "ASP JS 문자열"
IDS_LEX_STR_63173 "ASP JS 심볼"
@ -225,7 +225,7 @@ BEGIN
IDS_LEX_STR_63177 "VBS 숫자"
IDS_LEX_STR_63178 "VBS 키워드"
IDS_LEX_STR_63179 "VBS 문자열"
IDS_LEX_STR_63180 "VBS 식별자"
IDS_LEX_STR_63180 "VBS 식별문자"
IDS_LEX_STR_63181 "ASP VBS 기본"
IDS_LEX_STR_63182 "ASP VBS 주석"
IDS_LEX_STR_63183 "ASP VBS 숫자"
@ -235,7 +235,7 @@ STRINGTABLE
BEGIN
IDS_LEX_STR_63184 "ASP VBS 키워드"
IDS_LEX_STR_63185 "ASP VBS 문자열"
IDS_LEX_STR_63186 "ASP VBS 식별자"
IDS_LEX_STR_63186 "ASP VBS 식별문자"
IDS_LEX_STR_63187 "XML 태그"
IDS_LEX_STR_63188 "XML 속성"
IDS_LEX_STR_63189 "XML 값"

8
language/np3_ko_kr/strings_ko_kr.rc
View File

@ -209,7 +209,7 @@ BEGIN
IDS_MUI_TITLE_RELARB " +++ Style '%s' - (%s) +++"
IDS_MUI_TITLE_FIXARB " Style '%s' - (%s)"
IDS_MUI_ASSOCIATED_EXT "연결된 확장자:"
IDS_MUI_EXAMPLE_TEXT "The quick brown fox jumps over the lazy dog, 0123456789.\r\n빠른 갈색 여우가 느린 개를 뛰어 넘었다."
IDS_MUI_EXAMPLE_TEXT "The quick brown fox jumps over the lazy dog, 0123456789.\r\n빠른 갈색 여우가 느린 개를 뛰어 넘었다.\r\n\\ * & ^ % $ # @ ! ~"
IDS_MUI_ZERO_LEN_MATCH "^ Zero-Length Match"
IDS_MUI_GOTO_LINE "행 (1 - %lli):"
IDS_MUI_GOTO_COLUMN "열 (1 - %lli):"
@ -223,7 +223,7 @@ BEGIN
IDS_MUI_LANG_BE_BY "Belarusian (Belarus)\t\t\t[%s]"
IDS_MUI_LANG_DE_DE "German (Germany)\t\t\t[%s]"
IDS_MUI_LANG_EN_GB "English (United Kingdom)\t\t\t[%s]"
IDS_MUI_LANG_ES_ES "Spanish (Spain Modern)\t\t\t[%s]"
IDS_MUI_LANG_ES_ES "Spanish (Spain)\t\t\t[%s]"
IDS_MUI_LANG_FR_FR "French (France)\t\t\t[%s]"
IDS_MUI_LANG_HU_HU "Hungarian (Hungary)\t\t\t[%s]"
IDS_MUI_LANG_IT_IT "Italian (Italy)\t\t\t[%s]"
@ -232,7 +232,7 @@ BEGIN
IDS_MUI_LANG_NL_NL "Dutch (Netherlands)\t\t\t[%s]"
IDS_MUI_LANG_PT_BR "Portuguese (Brazil)\t\t\t[%s]"
IDS_MUI_LANG_RU_RU "Russian (Russia)\t\t\t[%s]"
IDS_MUI_LANG_ZH_CN "Chinese (Hans)\t\t\t[%s]"
IDS_MUI_LANG_ZH_CN "Chinese (Hans)\t\t\t[%s]"
END
STRINGTABLE
@ -270,7 +270,7 @@ Notepad3 \t[/?] [
/u\t높은 권한(관리자 권한)으로 실행.\r\n\
/v\t파일을 즉시 인쇄 한 후 종료.\r\n\
/vd\t파일 인쇄 (프린터 대화 상자 열기).\r\n\
/y\t상대 경로 파일 이름의 경우 환경 PATH 검색.\r\n\
/y\t상대 경로 파일 이름의 경우 PATH 환경 검색.\r\n\
/z\t다음 건너 뛰기 (레지스트리 기반 메모장 교체를 위해 사용 가능).\r\n\r\n\
예:\r\n\
Notepad3 /utf8sig /crlf d:\\temp\\Test.txt\r\n\

32
language/np3_nl_nl/strings_nl_nl.rc
View File

@ -197,22 +197,22 @@ END
STRINGTABLE
BEGIN
IDS_MUI_MENU_LANGUAGE "Language"
IDS_MUI_LANG_EN_US "English (United States)\t\t\t[%s]"
IDS_MUI_LANG_AF_ZA "Afrikaans (South Africa)\t\t\t[%s]"
IDS_MUI_LANG_BE_BY "Belarusian (Belarus)\t\t\t[%s]"
IDS_MUI_LANG_DE_DE "German (Germany)\t\t\t[%s]"
IDS_MUI_LANG_EN_GB "English (United Kingdom)\t\t\t[%s]"
IDS_MUI_LANG_ES_ES "Spanish (Spain Modern)\t\t\t[%s]"
IDS_MUI_LANG_FR_FR "French (France)\t\t\t[%s]"
IDS_MUI_LANG_HU_HU "Hungarian (Hungary)\t\t\t[%s]"
IDS_MUI_LANG_IT_IT "Italian (Italy)\t\t\t[%s]"
IDS_MUI_LANG_JP_JP "Japanese (Japan)\t\t\t[%s]"
IDS_MUI_LANG_KO_KR "Korean (Korea)\t\t\t[%s]"
IDS_MUI_LANG_NL_NL "Dutch (Netherlands)\t\t\t[%s]"
IDS_MUI_LANG_PT_BR "Portuguese (Brazil)\t\t\t[%s]"
IDS_MUI_LANG_RU_RU "Russian (Russia)\t\t\t[%s]"
IDS_MUI_LANG_ZH_CN "Chinese (Hans)\t\t\t[%s]"
IDS_MUI_MENU_LANGUAGE "Taal"
IDS_MUI_LANG_EN_US "Engels (Verenigde Staten)\t\t\t[%s]"
IDS_MUI_LANG_AF_ZA "Afrikaans (Zuid-Afrika)\t\t\t[%s]"
IDS_MUI_LANG_BE_BY "Wit-Russisch (Wit-Rusland)\t\t\t[%s]"
IDS_MUI_LANG_DE_DE "Duits (Duitsland)\t\t\t[%s]"
IDS_MUI_LANG_EN_GB "Engels (Verenigd Koninkrijk)\t\t\t[%s]"
IDS_MUI_LANG_ES_ES "Spaans (Spanje)\t\t\t[%s]"
IDS_MUI_LANG_FR_FR "Frans (Frankrijk)\t\t\t[%s]"
IDS_MUI_LANG_HU_HU "Hongaars (Hongarije)\t\t\t[%s]"
IDS_MUI_LANG_IT_IT "Italiaans (Italië)\t\t\t[%s]"
IDS_MUI_LANG_JP_JP "Japans (Japan)\t\t\t[%s]"
IDS_MUI_LANG_KO_KR "Koreaans (Korea)\t\t\t[%s]"
IDS_MUI_LANG_NL_NL "Nederlands (Nederland)\t\t\t[%s]"
IDS_MUI_LANG_PT_BR "Portugees (Brazilië)\t\t\t[%s]"
IDS_MUI_LANG_RU_RU "Russisch (Rusland)\t\t\t[%s]"
IDS_MUI_LANG_ZH_CN "Chinees (Hans)\t\t\t[%s]"
END
STRINGTABLE

4
language/np3_pt_br/strings_pt_br.rc
View File

@ -231,7 +231,7 @@ BEGIN
IDS_MUI_LANG_BE_BY "Belarusian (Belarus)\t\t\t[%s]"
IDS_MUI_LANG_DE_DE "German (Germany)\t\t\t[%s]"
IDS_MUI_LANG_EN_GB "English (United Kingdom)\t\t\t[%s]"
IDS_MUI_LANG_ES_ES "Spanish (Spain Modern)\t\t\t[%s]"
IDS_MUI_LANG_ES_ES "Spanish (Spain)\t\t\t[%s]"
IDS_MUI_LANG_FR_FR "French (France)\t\t\t[%s]"
IDS_MUI_LANG_HU_HU "Hungarian (Hungary)\t\t\t[%s]"
IDS_MUI_LANG_IT_IT "Italian (Italy)\t\t\t[%s]"
@ -240,7 +240,7 @@ BEGIN
IDS_MUI_LANG_NL_NL "Dutch (Netherlands)\t\t\t[%s]"
IDS_MUI_LANG_PT_BR "Portuguese (Brazil)\t\t\t[%s]"
IDS_MUI_LANG_RU_RU "Russian (Russia)\t\t\t[%s]"
IDS_MUI_LANG_ZH_CN "Chinese (Hans)\t\t\t[%s]"
IDS_MUI_LANG_ZH_CN "Chinese (Hans)\t\t\t[%s]"
END
STRINGTABLE

4
language/np3_ru_ru/strings_ru_ru.rc
View File

@ -203,7 +203,7 @@ BEGIN
IDS_MUI_LANG_BE_BY "Belarusian (Belarus)\t\t\t[%s]"
IDS_MUI_LANG_DE_DE "German (Germany)\t\t\t[%s]"
IDS_MUI_LANG_EN_GB "English (United Kingdom)\t\t\t[%s]"
IDS_MUI_LANG_ES_ES "Spanish (Spain Modern)\t\t\t[%s]"
IDS_MUI_LANG_ES_ES "Spanish (Spain)\t\t\t[%s]"
IDS_MUI_LANG_FR_FR "French (France)\t\t\t[%s]"
IDS_MUI_LANG_HU_HU "Hungarian (Hungary)\t\t\t[%s]"
IDS_MUI_LANG_IT_IT "Italian (Italy)\t\t\t[%s]"
@ -212,7 +212,7 @@ BEGIN
IDS_MUI_LANG_NL_NL "Dutch (Netherlands)\t\t\t[%s]"
IDS_MUI_LANG_PT_BR "Portuguese (Brazil)\t\t\t[%s]"
IDS_MUI_LANG_RU_RU "Russian (Russia)\t\t\t[%s]"
IDS_MUI_LANG_ZH_CN "Chinese (Hans)\t\t\t[%s]"
IDS_MUI_LANG_ZH_CN "Chinese (Hans)\t\t\t[%s]"
END
STRINGTABLE

4
language/np3_zh_cn/strings_zh_cn.rc
View File

@ -203,7 +203,7 @@ BEGIN
IDS_MUI_LANG_BE_BY "Belarusian (Belarus)\t\t\t[%s]"
IDS_MUI_LANG_DE_DE "German (Germany)\t\t\t[%s]"
IDS_MUI_LANG_EN_GB "English (United Kingdom)\t\t\t[%s]"
IDS_MUI_LANG_ES_ES "Spanish (Spain Modern)\t\t\t[%s]"
IDS_MUI_LANG_ES_ES "Spanish (Spain)\t\t\t[%s]"
IDS_MUI_LANG_FR_FR "French (France)\t\t\t[%s]"
IDS_MUI_LANG_HU_HU "Hungarian (Hungary)\t\t\t[%s]"
IDS_MUI_LANG_IT_IT "Italian (Italy)\t\t\t[%s]"
@ -212,7 +212,7 @@ BEGIN
IDS_MUI_LANG_NL_NL "Dutch (Netherlands)\t\t\t[%s]"
IDS_MUI_LANG_PT_BR "Portuguese (Brazil)\t\t\t[%s]"
IDS_MUI_LANG_RU_RU "Russian (Russia)\t\t\t[%s]"
IDS_MUI_LANG_ZH_CN "Chinese (Hans)\t\t\t[%s]"
IDS_MUI_LANG_ZH_CN "Chinese (Hans)\t\t\t[%s]"
END
STRINGTABLE

2
np3portableapp/_buildname.txt
View File

@ -1 +1 @@
"develop"
MUI_dev

78
src/Dialogs.c
View File

@ -170,6 +170,10 @@ INT_PTR CALLBACK InfoBoxDlgProc(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lPar
}
return true;
case WM_DPICHANGED:
UpdateWindowLayoutForDPI(hwnd, 0, 0, 0, 0);
break;
case WM_COMMAND:
switch (LOWORD(wParam))
{
@ -286,6 +290,10 @@ INT_PTR CALLBACK CmdLineHelpProc(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lPa
}
break;
case WM_DPICHANGED:
UpdateWindowLayoutForDPI(hwnd, 0, 0, 0, 0);
break;
case WM_COMMAND:
switch (LOWORD(wParam)) {
case IDOK:
@ -642,6 +650,11 @@ INT_PTR CALLBACK AboutDlgProc(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam
return true;
case WM_DPICHANGED:
UpdateWindowLayoutForDPI(hwnd, 0, 0, 0, 0);
break;
case WM_PAINT:
if (Globals.hIcon128) {
RECT rt;
@ -759,6 +772,11 @@ INT_PTR CALLBACK RunDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lParam)
return true;
case WM_DPICHANGED:
UpdateWindowLayoutForDPI(hwnd, 0, 0, 0, 0);
break;
case WM_DESTROY:
DeleteBitmapButton(hwnd,IDC_SEARCHEXE);
return false;
@ -937,6 +955,11 @@ INT_PTR CALLBACK OpenWithDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lParam
return true;
case WM_DPICHANGED:
UpdateWindowLayoutForDPI(hwnd, 0, 0, 0, 0);
break;
case WM_DESTROY:
DirList_Destroy(GetDlgItem(hwnd,IDC_OPENWITHDIR));
DeleteBitmapButton(hwnd,IDC_GETOPENWITHDIR);
@ -1132,6 +1155,11 @@ INT_PTR CALLBACK FavoritesDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lPara
return true;
case WM_DPICHANGED:
UpdateWindowLayoutForDPI(hwnd, 0, 0, 0, 0);
break;
case WM_DESTROY:
DirList_Destroy(GetDlgItem(hwnd,IDC_FAVORITESDIR));
DeleteBitmapButton(hwnd,IDC_GETFAVORITESDIR);
@ -1292,6 +1320,11 @@ INT_PTR CALLBACK AddToFavDlgProc(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lPa
return true;
case WM_DPICHANGED:
UpdateWindowLayoutForDPI(hwnd, 0, 0, 0, 0);
break;
case WM_COMMAND:
switch (LOWORD(wParam)) {
case 100:
@ -1501,6 +1534,11 @@ INT_PTR CALLBACK FileMRUDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lParam)
return true;
case WM_DPICHANGED:
UpdateWindowLayoutForDPI(hwnd, 0, 0, 0, 0);
break;
case WM_DESTROY:
{
LPICONTHREADINFO lpit = (LPVOID)GetProp(hwnd,L"it");
@ -1826,6 +1864,10 @@ INT_PTR CALLBACK ChangeNotifyDlgProc(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM
}
return true;
case WM_DPICHANGED:
UpdateWindowLayoutForDPI(hwnd, 0, 0, 0, 0);
break;
case WM_COMMAND:
switch (LOWORD(wParam)) {
case IDOK:
@ -1899,6 +1941,11 @@ INT_PTR CALLBACK ColumnWrapDlgProc(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM l
return true;
case WM_DPICHANGED:
UpdateWindowLayoutForDPI(hwnd, 0, 0, 0, 0);
break;
case WM_COMMAND:
switch (LOWORD(wParam)) {
@ -1995,6 +2042,11 @@ INT_PTR CALLBACK WordWrapSettingsDlgProc(HWND hwnd, UINT umsg, WPARAM wParam, LP
return true;
case WM_DPICHANGED:
UpdateWindowLayoutForDPI(hwnd, 0, 0, 0, 0);
break;
case WM_COMMAND:
switch (LOWORD(wParam)) {
@ -2085,6 +2137,11 @@ INT_PTR CALLBACK LongLineSettingsDlgProc(HWND hwnd, UINT umsg, WPARAM wParam, LP
return true;
case WM_DPICHANGED:
UpdateWindowLayoutForDPI(hwnd, 0, 0, 0, 0);
break;
case WM_COMMAND:
switch (LOWORD(wParam)) {
@ -2179,6 +2236,11 @@ INT_PTR CALLBACK TabSettingsDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lPa
return true;
case WM_DPICHANGED:
UpdateWindowLayoutForDPI(hwnd, 0, 0, 0, 0);
break;
case WM_COMMAND:
switch(LOWORD(wParam))
@ -2298,6 +2360,11 @@ INT_PTR CALLBACK SelectDefEncodingDlgProc(HWND hwnd, UINT umsg, WPARAM wParam, L
return true;
case WM_DPICHANGED:
UpdateWindowLayoutForDPI(hwnd, 0, 0, 0, 0);
break;
case WM_COMMAND:
switch (LOWORD(wParam))
{
@ -2464,6 +2531,11 @@ INT_PTR CALLBACK SelectEncodingDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM
return true;
case WM_DPICHANGED:
UpdateWindowLayoutForDPI(hwnd, 0, 0, 0, 0);
break;
case WM_DESTROY:
ResizeDlg_Destroy(hwnd,&pdd->cxDlg,&pdd->cyDlg);
return false;
@ -2653,6 +2725,11 @@ INT_PTR CALLBACK SelectDefLineEndingDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LP
return true;
case WM_DPICHANGED:
UpdateWindowLayoutForDPI(hwnd, 0, 0, 0, 0);
break;
case WM_COMMAND:
switch(LOWORD(wParam))
{
@ -3295,6 +3372,7 @@ void ResizeDlg_Init(HWND hwnd, int cxFrame, int cyFrame, int nIdGrip)
SetWindowLongPtr(GetDlgItem(hwnd, nIdGrip), GWL_STYLE,
GetWindowLongPtr(GetDlgItem(hwnd, nIdGrip), GWL_STYLE) | SBS_SIZEGRIP | WS_CLIPSIBLINGS);
int const cGrip = GetSystemMetricsEx(SM_CXHTHUMB);
SetWindowPos(GetDlgItem(hwnd, nIdGrip), NULL, pResizeDlg->cxClient - cGrip, pResizeDlg->cyClient - cGrip, cGrip, cGrip, SWP_NOZORDER);
}

36
src/Edit.c
View File

@ -5168,7 +5168,12 @@ INT_PTR CALLBACK EditFindReplaceDlgProcW(HWND hwnd,UINT umsg,WPARAM wParam,LPARA
return true;
case WM_DESTROY:
case WM_DPICHANGED:
UpdateWindowLayoutForDPI(hwnd, 0, 0, 0, 0);
break;
case WM_DESTROY:
{
if (!s_bSwitchedFindReplace)
{
@ -7048,6 +7053,11 @@ INT_PTR CALLBACK EditLinenumDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lPa
return true;
case WM_DPICHANGED:
UpdateWindowLayoutForDPI(hwnd, 0, 0, 0, 0);
break;
case WM_COMMAND:
{
switch (LOWORD(wParam))
@ -7188,6 +7198,10 @@ INT_PTR CALLBACK EditModifyLinesDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM
}
return true;
case WM_DPICHANGED:
UpdateWindowLayoutForDPI(hwnd, 0, 0, 0, 0);
break;
case WM_DESTROY:
DeleteObject(hFontHover);
return false;
@ -7365,6 +7379,11 @@ INT_PTR CALLBACK EditAlignDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lPara
CenterDlgInParent(hwnd);
}
return true;
case WM_DPICHANGED:
UpdateWindowLayoutForDPI(hwnd, 0, 0, 0, 0);
break;
case WM_COMMAND:
switch(LOWORD(wParam))
{
@ -7383,6 +7402,7 @@ INT_PTR CALLBACK EditAlignDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lPara
EndDialog(hwnd,IDOK);
}
break;
case IDCANCEL:
EndDialog(hwnd,IDCANCEL);
break;
@ -7443,6 +7463,11 @@ INT_PTR CALLBACK EditEncloseSelectionDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,L
CenterDlgInParent(hwnd);
}
return true;
case WM_DPICHANGED:
UpdateWindowLayoutForDPI(hwnd, 0, 0, 0, 0);
break;
case WM_COMMAND:
switch(LOWORD(wParam))
{
@ -7516,6 +7541,11 @@ INT_PTR CALLBACK EditInsertTagDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM l
CenterDlgInParent(hwnd);
}
return false;
case WM_DPICHANGED:
UpdateWindowLayoutForDPI(hwnd, 0, 0, 0, 0);
break;
case WM_COMMAND:
switch(LOWORD(wParam))
{
@ -7687,6 +7717,10 @@ INT_PTR CALLBACK EditSortDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lParam
}
return true;
case WM_DPICHANGED:
UpdateWindowLayoutForDPI(hwnd, 0, 0, 0, 0);
break;
case WM_COMMAND:
switch(LOWORD(wParam))
{

47
src/Helpers.c
View File

@ -315,19 +315,19 @@ DWORD GetLastErrorToMsgBox(LPWSTR lpszFunction, DWORD dwErrID)
//
DPI_T GetCurrentDPI(HWND hwnd) {
DPI_T CurDPI = { 0, 0 };
DPI_T curDPI = { 0, 0 };
if (IsWin10()) {
HMODULE const hModule = GetModuleHandle(L"user32.dll");
if (hModule) {
FARPROC const pfnGetDpiForWindow = GetProcAddress(hModule, "GetDpiForWindow");
if (pfnGetDpiForWindow) {
CurDPI.x = CurDPI.y = (UINT)pfnGetDpiForWindow(hwnd);
curDPI.x = curDPI.y = (UINT)pfnGetDpiForWindow(hwnd);
}
}
}
if ((CurDPI.x == 0) && IsWin81()) {
if ((curDPI.x == 0) && IsWin81()) {
HMODULE hShcore = LoadLibrary(L"shcore.dll");
if (hShcore) {
FARPROC const pfnGetDpiForMonitor = GetProcAddress(hShcore, "GetDpiForMonitor");
@ -335,24 +335,24 @@ DPI_T GetCurrentDPI(HWND hwnd) {
HMONITOR const hMonitor = MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST);
UINT dpiX = 0, dpiY = 0;
if (pfnGetDpiForMonitor(hMonitor, 0 /* MDT_EFFECTIVE_DPI */, &dpiX, &dpiY) == S_OK) {
CurDPI.x = dpiX;
CurDPI.y = dpiY;
curDPI.x = dpiX;
curDPI.y = dpiY;
}
}
FreeLibrary(hShcore);
}
}
if (CurDPI.x == 0) {
if (curDPI.x == 0) {
HDC hDC = GetDC(hwnd);
CurDPI.x = GetDeviceCaps(hDC, LOGPIXELSX);
CurDPI.y = GetDeviceCaps(hDC, LOGPIXELSY);
curDPI.x = GetDeviceCaps(hDC, LOGPIXELSX);
curDPI.y = GetDeviceCaps(hDC, LOGPIXELSY);
ReleaseDC(hwnd, hDC);
}
CurDPI.x = max_u(CurDPI.x, USER_DEFAULT_SCREEN_DPI);
CurDPI.y = max_u(CurDPI.y, USER_DEFAULT_SCREEN_DPI);
return CurDPI;
curDPI.x = max_u(curDPI.x, USER_DEFAULT_SCREEN_DPI);
curDPI.y = max_u(curDPI.y, USER_DEFAULT_SCREEN_DPI);
return curDPI;
}
@ -395,6 +395,31 @@ int GetSystemMetricsEx(int nValue) {
}
//=============================================================================
//
// UpdateWindowLayoutForDPI()
//
void UpdateWindowLayoutForDPI(HWND hWnd, int x_96dpi, int y_96dpi, int w_96dpi, int h_96dpi)
{
// only update yet
SetWindowPos(hWnd, hWnd, x_96dpi, y_96dpi, w_96dpi, h_96dpi,
SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE | SWP_NOREPOSITION );
// TODO: ...
#if 0
DPI_T const wndDPI = GetCurrentDPI(hWnd);
int dpiScaledX = MulDiv(x_96dpi, wndDPI.x, 96);
int dpiScaledY = MulDiv(y_96dpi, wndDPI.y, 96);
int dpiScaledWidth = MulDiv(w_96dpi, wndDPI.y, 96);
int dpiScaledHeight = MulDiv(h_96dpi, wndDPI.y, 96);
SetWindowPos(hWnd, hWnd, dpiScaledX, dpiScaledY, dpiScaledWidth, dpiScaledY, SWP_NOZORDER | SWP_NOACTIVATE);
#endif
}
//=============================================================================
//
// ResizeImageForCurrentDPI()

1
src/Helpers.h
View File

@ -213,6 +213,7 @@ bool SetClipboardTextW(HWND hwnd, LPCWSTR pszTextW, size_t cchTextW);
DPI_T GetCurrentDPI(HWND hwnd);
DPI_T GetCurrentPPI(HWND hwnd);
void UpdateWindowLayoutForDPI(HWND hWnd, int x_96dpi, int y_96dpi, int w_96dpi, int h_96dpi);
HBITMAP ResizeImageForCurrentDPI(HBITMAP hbmp);
#define ScaleIntToCurrentDPI(val) MulDiv((val), Globals.CurrentDPI.y, USER_DEFAULT_SCREEN_DPI)
inline int ScaleToCurrentDPI(float fVal) { return float2int((fVal * Globals.CurrentDPI.y) / (float)USER_DEFAULT_SCREEN_DPI); }

110
src/Notepad3.c
View File

@ -945,6 +945,7 @@ HWND InitInstance(HINSTANCE hInstance,LPCWSTR pszCmdLine,int nCmdShow)
if ((Settings.AlwaysOnTop || s_flagAlwaysOnTop == 2) && s_flagAlwaysOnTop != 1) {
SetWindowPos(Globals.hwndMain, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
}
//UpdateWindowLayoutForDPI(Globals.hwndMain, 0, 0, 0, 0);
if (Settings.TransparentMode) {
SetWindowTransparentMode(Globals.hwndMain, true, Settings2.OpacityLevel);
@ -2922,6 +2923,55 @@ LRESULT MsgInitMenu(HWND hwnd, WPARAM wParam, LPARAM lParam)
}
//=============================================================================
//
// _DynamicLanguageMenuCmd() - Handles IDS_MUI_LANG_XX_YY messages
//
//
static bool _DynamicLanguageMenuCmd(int cmd)
{
int iLngIdx = (cmd - IDS_MUI_LANG_EN_US); // consecutive IDs
if ((iLngIdx < 0) || (iLngIdx >= NUM_OF_MUI_LANGUAGES)) {
return false;
}
if (!MUI_LanguageDLLs[iLngIdx].bIsLoaded)
{
if (IsWindow(Globals.hwndDlgFindReplace)) {
SendMessage(Globals.hwndDlgFindReplace, WM_CLOSE, 0, 0);
}
if (IsWindow(Globals.hwndDlgCustomizeSchemes)) {
SendMessage(Globals.hwndDlgCustomizeSchemes, WM_CLOSE, 0, 0);
}
StringCchCopyW(Settings2.PreferredLanguageLocaleName, COUNTOF(Settings2.PreferredLanguageLocaleName), MUI_LanguageDLLs[iLngIdx].szLocaleName);
IniSetString(L"Settings2", L"PreferredLanguageLocaleName", Settings2.PreferredLanguageLocaleName);
DestroyMenu(Globals.hMainMenu);
FreeLanguageResources(Globals.hLngResContainer);
Globals.iPrefLANGID = MUI_LanguageDLLs[iLngIdx].LangId;
Globals.hLngResContainer = LoadLanguageResources(&Globals.iPrefLANGID);
Globals.hMainMenu = LoadMenu(Globals.hLngResContainer, MAKEINTRESOURCE(IDR_MUI_MAINMENU));
if (!Globals.hMainMenu) {
GetLastErrorToMsgBox(L"LoadMenu()", 0);
PostMessage(Globals.hwndMain, WM_CLOSE, 0, 0);
return true;
}
_InsertLanguageMenu(Globals.hMainMenu);
SetMenu(Globals.hwndMain, Globals.hMainMenu);
DrawMenuBar(Globals.hwndMain);
SendWMSize(Globals.hwndMain, NULL);
UpdateUI();
UpdateToolbar();
UpdateStatusbar(true);
}
return true;
}
//=============================================================================
//
// MsgCommand() - Handles WM_COMMAND
@ -2931,6 +2981,9 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
{
WCHAR tchMaxPathBuffer[MAX_PATH] = { L'\0' };
if (_DynamicLanguageMenuCmd(LOWORD(wParam))) {
return 0LL;
}
switch(LOWORD(wParam))
{
case SCEN_CHANGE:
@ -2953,62 +3006,6 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
EditUpdateVisibleUrlHotspot(Settings.HyperlinkHotspot);
break;
case IDS_MUI_LANG_EN_US:
case IDS_MUI_LANG_AF_ZA:
case IDS_MUI_LANG_BE_BY:
case IDS_MUI_LANG_DE_DE:
case IDS_MUI_LANG_EN_GB:
case IDS_MUI_LANG_ES_ES:
case IDS_MUI_LANG_FR_FR:
case IDS_MUI_LANG_HU_HU:
case IDS_MUI_LANG_IT_IT:
case IDS_MUI_LANG_JP_JP:
case IDS_MUI_LANG_KO_KR:
case IDS_MUI_LANG_NL_NL:
case IDS_MUI_LANG_PT_BR:
case IDS_MUI_LANG_RU_RU:
case IDS_MUI_LANG_ZH_CN:
{
int iLngIdx = (int)LOWORD(wParam) - IDS_MUI_LANG_EN_US;
if (!MUI_LanguageDLLs[iLngIdx].bIsLoaded)
{
if (IsWindow(Globals.hwndDlgFindReplace)) {
SendMessage(Globals.hwndDlgFindReplace, WM_CLOSE, 0, 0);
}
if (IsWindow(Globals.hwndDlgCustomizeSchemes)) {
SendMessage(Globals.hwndDlgCustomizeSchemes, WM_CLOSE, 0, 0);
}
StringCchCopyW(Settings2.PreferredLanguageLocaleName, COUNTOF(Settings2.PreferredLanguageLocaleName), MUI_LanguageDLLs[iLngIdx].szLocaleName);
if (s_bEnableSaveSettings) {
IniSetString(L"Settings2", L"PreferredLanguageLocaleName", Settings2.PreferredLanguageLocaleName);
}
DestroyMenu(Globals.hMainMenu);
FreeLanguageResources(Globals.hLngResContainer);
Globals.iPrefLANGID = MUI_LanguageDLLs[iLngIdx].LangId;
Globals.hLngResContainer = LoadLanguageResources(&Globals.iPrefLANGID);
Globals.hMainMenu = LoadMenu(Globals.hLngResContainer, MAKEINTRESOURCE(IDR_MUI_MAINMENU));
if (!Globals.hMainMenu) {
GetLastErrorToMsgBox(L"LoadMenu()", 0);
PostMessage(Globals.hwndMain, WM_CLOSE, 0, 0);
break;
}
_InsertLanguageMenu(Globals.hMainMenu);
SetMenu(Globals.hwndMain, Globals.hMainMenu);
DrawMenuBar(Globals.hwndMain);
SendWMSize(Globals.hwndMain, NULL);
UpdateUI();
UpdateToolbar();
UpdateStatusbar(true);
}
}
break;
case IDM_FILE_NEW:
FileLoad(false,true,false,Settings.SkipUnicodeDetection,Settings.SkipANSICodePageDetection,L"");
break;
@ -5810,7 +5807,6 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
default:
return DefWindowProc(hwnd, umsg, wParam, lParam);
}
return 0LL;
}

4
src/Print.cpp
View File

@ -500,6 +500,10 @@ extern "C" UINT_PTR CALLBACK PageSetupHook(HWND hwnd, UINT uiMsg, WPARAM wParam,
}
break;
case WM_DPICHANGED:
UpdateWindowLayoutForDPI(hwnd, 0, 0, 0, 0);
break;
case WM_COMMAND:
if (LOWORD(wParam) == IDOK)
{

9
src/Styles.c
View File

@ -3241,6 +3241,10 @@ INT_PTR CALLBACK Style_CustomizeSchemesDlgProc(HWND hwnd,UINT umsg,WPARAM wParam
DialogEnableWindow(hwnd, IDC_PREVIEW, ((pCurrentLexer == s_pLexCurrent) || (pCurrentLexer == GetCurrentStdLexer())));
break;
case WM_DPICHANGED:
UpdateWindowLayoutForDPI(hwnd, 0, 0, 0, 0);
break;
case WM_DESTROY:
{
DeleteBitmapButton(hwnd, IDC_STYLEFORE);
@ -3875,6 +3879,11 @@ INT_PTR CALLBACK Style_SelectLexerDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPAR
return true;
case WM_DPICHANGED:
UpdateWindowLayoutForDPI(hwnd, 0, 0, 0, 0);
break;
case WM_DESTROY:
{
RECT rc;