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 #1622 from hpwamr/mui

Browse Source 
MUI - suppress "Ctrl+Shift+Alt+F" (Code Folding)
This commit is contained in:
Pairi Daiza 2019-09-10 12:14:43 +02:00 committed by GitHub
commit 5429d1062c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
24 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Build/Changes.txt
View File

@ -31,7 +31,7 @@ UCD - (UCD)ARDET is an Encoding Detector Library
==================================================
Current BETA Version 5.19.909.#(build) (2019-09-09)
Current BETA Version 5.19.910.#(build) (2019-09-10)
==================================================
--------------------------------------------------
@ -78,7 +78,7 @@ FIXES:
--------------------------------------------------
REMOVED:
--------------------------------------------------
-
- "Ctrl+Shift+Alt+F" (Code Folding) no longer works from Windows 10 v1903.
--------------------------------------------------
TRANSLATIONS (MUI):

2
Versions/build.txt
View File

@ -1 +1 @@
2622
2623

2
language/np3_af_za/menu_af_za.rc
View File

@ -338,7 +338,7 @@ BEGIN
MENUITEM SEPARATOR
POPUP "Ver&toning"
BEGIN
MENUITEM "Kode &Vou\tCtrl+Shift+Alt+F", IDM_VIEW_FOLDING
MENUITEM "Kode &Vou", IDM_VIEW_FOLDING
MENUITEM "&Wissel Voue\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS
MENUITEM "Gefokusde Aansig\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "&Monitoring Log", IDM_VIEW_CHASING_DOCTAIL

2
language/np3_be_by/menu_be_by.rc
View File

@ -338,7 +338,7 @@ BEGIN
MENUITEM SEPARATOR
POPUP "Ïðà&öî¢íàÿ ïðàñòîðà"
BEGIN
MENUITEM "Çãîðò&âàííå áëîêࢠêîäó\tCtrl+Shift+Alt+F", IDM_VIEW_FOLDING
MENUITEM "Çãîðò&âàííå áëîêࢠêîäó", IDM_VIEW_FOLDING
MENUITEM "Çãàðíóöü/ðà&çãàðíóöü áëîê\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS
MENUITEM "Ôàêóñàâàíû ïðàãëÿä\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "Íàç³ðàííå çà ôà&éëàì", IDM_VIEW_CHASING_DOCTAIL

2
language/np3_de_de/menu_de_de.rc
View File

@ -338,7 +338,7 @@ BEGIN
MENUITEM SEPARATOR
POPUP "&Anzeigen"
BEGIN
MENUITEM "&Code Faltung\tCtrl+Shift+Alt+F", IDM_VIEW_FOLDING
MENUITEM "&Code Faltung", IDM_VIEW_FOLDING
MENUITEM "Code Faltung &Umschalten\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS
MENUITEM "Fokussierte Ansicht\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "Logfile &Monitoring", IDM_VIEW_CHASING_DOCTAIL

2
language/np3_en_gb/menu_en_gb.rc
View File

@ -338,7 +338,7 @@ BEGIN
MENUITEM SEPARATOR
POPUP "&Display"
BEGIN
MENUITEM "Code &Folding\tCtrl+Shift+Alt+F", IDM_VIEW_FOLDING
MENUITEM "Code &Folding", IDM_VIEW_FOLDING
MENUITEM "&Toggle Folds\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS
MENUITEM "Focused View\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "&Monitoring Log", IDM_VIEW_CHASING_DOCTAIL

2
language/np3_en_us/menu_en_us.rc
View File

@ -338,7 +338,7 @@ BEGIN
MENUITEM SEPARATOR
POPUP "&Display"
BEGIN
MENUITEM "Code &Folding\tCtrl+Shift+Alt+F", IDM_VIEW_FOLDING
MENUITEM "Code &Folding", IDM_VIEW_FOLDING
MENUITEM "&Toggle Folds\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS
MENUITEM "Focused View\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "&Monitoring Log", IDM_VIEW_CHASING_DOCTAIL

2
language/np3_es_es/menu_es_es.rc
View File

@ -338,7 +338,7 @@ BEGIN
MENUITEM SEPARATOR
POPUP "Mos&trar"
BEGIN
MENUITEM "&Código plegable\tCtrl+Shift+Alt+F", IDM_VIEW_FOLDING
MENUITEM "&Código plegable", IDM_VIEW_FOLDING
MENUITEM "&Alternar pliegues\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS
MENUITEM "Vista enfocada\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "&Monitoreo de Log", IDM_VIEW_CHASING_DOCTAIL

2
language/np3_fr_fr/menu_fr_fr.rc
View File

@ -338,7 +338,7 @@ BEGIN
MENUITEM SEPARATOR
POPUP "&Afficher"
BEGIN
MENUITEM "&Code Pliages\tCtrl+Shift+Alt+F", IDM_VIEW_FOLDING
MENUITEM "&Code Pliages", IDM_VIEW_FOLDING
MENUITEM "&Alterner Pliages\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS
MENUITEM "Vue Focalisée\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "&Surveillance de Log", IDM_VIEW_CHASING_DOCTAIL

2
language/np3_hu_hu/menu_hu_hu.rc
View File

@ -338,7 +338,7 @@ BEGIN
MENUITEM SEPARATOR
POPUP "&Megjelenítés"
BEGIN
MENUITEM "&Kódblokk összecsukás\tCtrl+Shift+Alt+F", IDM_VIEW_FOLDING
MENUITEM "&Kódblokk összecsukás", IDM_VIEW_FOLDING
MENUITEM "Kódblokk &váltás\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS
MENUITEM "Fókuszált nézet\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "&Naplófájl követése", IDM_VIEW_CHASING_DOCTAIL

2
language/np3_it_it/menu_it_it.rc
View File

@ -338,7 +338,7 @@ BEGIN
MENUITEM SEPARATOR
POPUP "&Mostra"
BEGIN
MENUITEM "Code &Folding\tCtrl+Shift+Alt+F", IDM_VIEW_FOLDING
MENUITEM "Code &Folding", IDM_VIEW_FOLDING
MENUITEM "&Attiva/Disattiva Folds\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS
MENUITEM "Visualizzazione focalizzata\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "&Monitoraggio log", IDM_VIEW_CHASING_DOCTAIL

2
language/np3_ja_jp/menu_ja_jp.rc
View File

@ -338,7 +338,7 @@ BEGIN
MENUITEM SEPARATOR
POPUP "折りたたみや表示(&D)"
BEGIN
MENUITEM "コード折りたたみを表示(&F)\tCtrl+Shift+Alt+F", IDM_VIEW_FOLDING
MENUITEM "コード折りたたみを表示(&F)", IDM_VIEW_FOLDING
MENUITEM "すべて折りたたみ(&T)\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS
MENUITEM "単語一望モード\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "編集制限モード(&M)", IDM_VIEW_CHASING_DOCTAIL

2
language/np3_ko_kr/menu_ko_kr.rc
View File

@ -338,7 +338,7 @@ BEGIN
MENUITEM SEPARATOR
POPUP "전시(&D)"
BEGIN
MENUITEM "코드 접기(&F)\tCtrl+Shift+Alt+F", IDM_VIEW_FOLDING
MENUITEM "코드 접기(&F)", IDM_VIEW_FOLDING
MENUITEM "모든 접기 전환(&T)\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS
MENUITEM "집중\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "열람(&M)", IDM_VIEW_CHASING_DOCTAIL

2
language/np3_nl_nl/menu_nl_nl.rc
View File

@ -338,7 +338,7 @@ BEGIN
MENUITEM SEPARATOR
POPUP "&Tonen"
BEGIN
MENUITEM "Sectie &samenvouwen\tCtrl+Shift+Alt+F", IDM_VIEW_FOLDING
MENUITEM "Sectie &samenvouwen", IDM_VIEW_FOLDING
MENUITEM "&Toggle vouwen\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS
MENUITEM "Gefocust zicht\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "Log &Monitoren", IDM_VIEW_CHASING_DOCTAIL

2
language/np3_pl_pl/menu_pl_pl.rc
View File

@ -338,7 +338,7 @@ BEGIN
MENUITEM SEPARATOR
POPUP "&Pokaż"
BEGIN
MENUITEM "Sk³adanie kodu\tCtrl+Shift+Alt+F", IDM_VIEW_FOLDING
MENUITEM "Sk³adanie kodu", IDM_VIEW_FOLDING
MENUITEM "&Przełšcz składanie kodu\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS
MENUITEM "Widok skupiony\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "Dziennik &monitorowania", IDM_VIEW_CHASING_DOCTAIL

2
language/np3_pt_br/menu_pt_br.rc
View File

@ -338,7 +338,7 @@ BEGIN
MENUITEM SEPARATOR
POPUP "&Display"
BEGIN
MENUITEM "Code &Folding\tCtrl+Shift+Alt+F", IDM_VIEW_FOLDING
MENUITEM "Code &Folding", IDM_VIEW_FOLDING
MENUITEM "&Toggle Folds\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS
MENUITEM "Focused View\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "&Monitoring Log", IDM_VIEW_CHASING_DOCTAIL

2
language/np3_ru_ru/menu_ru_ru.rc
View File

@ -338,7 +338,7 @@ BEGIN
MENUITEM SEPARATOR
POPUP "Ðàáî&÷àÿ îáëàñòü"
BEGIN
MENUITEM "Ñâîðà&÷èâàíèå áëîêîâ êîäà\tCtrl+Shift+Alt+F", IDM_VIEW_FOLDING
MENUITEM "Ñâîðà&÷èâàíèå áëîêîâ êîäà", IDM_VIEW_FOLDING
MENUITEM "Ñâåðíóòü/ðà&çâåðíóòü áëîê\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS
MENUITEM "Ôîêóñèðîâêà ïðîñìîòðà\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "Ñëåæåíèå çà ôà&éëîì", IDM_VIEW_CHASING_DOCTAIL

2
language/np3_sk_sk/menu_sk_sk.rc
View File

@ -338,7 +338,7 @@ BEGIN
MENUITEM SEPARATOR
POPUP "&Display"
BEGIN
MENUITEM "Code &Folding\tCtrl+Shift+Alt+F", IDM_VIEW_FOLDING
MENUITEM "Code &Folding", IDM_VIEW_FOLDING
MENUITEM "&Toggle Folds\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS
MENUITEM "Focused View\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "&Monitoring Log", IDM_VIEW_CHASING_DOCTAIL

2
language/np3_sv_se/menu_sv_se.rc
View File

@ -338,7 +338,7 @@ BEGIN
MENUITEM SEPARATOR
POPUP "&Display"
BEGIN
MENUITEM "Code &Folding\tCtrl+Shift+Alt+F", IDM_VIEW_FOLDING
MENUITEM "Code &Folding", IDM_VIEW_FOLDING
MENUITEM "&Toggle Folds\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS
MENUITEM "Focused View\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "&Monitoring Log", IDM_VIEW_CHASING_DOCTAIL

2
language/np3_tr_tr/menu_tr_tr.rc
View File

@ -338,7 +338,7 @@ BEGIN
MENUITEM SEPARATOR
POPUP "&Display"
BEGIN
MENUITEM "Code &Folding\tCtrl+Shift+Alt+F", IDM_VIEW_FOLDING
MENUITEM "Code &Folding", IDM_VIEW_FOLDING
MENUITEM "&Toggle Folds\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS
MENUITEM "Focused View\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "&Monitoring Log", IDM_VIEW_CHASING_DOCTAIL

2
language/np3_zh_cn/menu_zh_cn.rc
View File

@ -338,7 +338,7 @@ BEGIN
MENUITEM SEPARATOR
POPUP "显示(&D)"
BEGIN
MENUITEM "´úÂëÕÛµþ(&F)\tCtrl+Shift+Alt+F", IDM_VIEW_FOLDING
MENUITEM "´úÂëÕÛµþ(&F)", IDM_VIEW_FOLDING
MENUITEM "切换折叠(&T)\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS
MENUITEM "切换聚焦\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "日志监控(&M)", IDM_VIEW_CHASING_DOCTAIL

2
res/Notepad3.exe.manifest.conf
View File

@ -3,7 +3,7 @@
<assemblyIdentity
name="Notepad3"
processorArchitecture="*"
version="5.19.909.2622"
version="5.19.910.2623"
type="win32"
/>
<description>Notepad3 BETA</description>

2
src/Notepad3.rc
View File

@ -119,7 +119,7 @@ BEGIN
//~"E", MMMMMMMMMMMMMMMMMM, VIRTKEY, ALT, NOINVERT /// Menu(Edit)
"F", IDM_EDIT_FIND, VIRTKEY, CONTROL, NOINVERT
"F", CMD_RECODEDEFAULT, VIRTKEY, CONTROL, ALT, NOINVERT
"F", IDM_VIEW_FOLDING, VIRTKEY, SHIFT, CONTROL, ALT, NOINVERT
//"F", IDM_VIEW_FOLDING, (issue #1609) VIRTKEY, SHIFT, CONTROL, ALT, NOINVERT
"F", IDM_VIEW_TOGGLEFOLDS, VIRTKEY, SHIFT, CONTROL, NOINVERT
//~"F", MMMMMMMMMMMMMMMMMM, VIRTKEY, ALT, NOINVERT /// Menu(File)
"G", IDM_EDIT_GOTOLINE, VIRTKEY, CONTROL, NOINVERT

4
src/VersionEx.h
View File

@ -7,8 +7,8 @@
#define SAPPNAME "Notepad3"
#define VERSION_MAJOR 5
#define VERSION_MINOR 19
#define VERSION_REV 909
#define VERSION_BUILD 2622
#define VERSION_REV 910
#define VERSION_BUILD 2623
#define SCINTILLA_VER 420
#define ONIGURUMA_REGEX_VER 6.9.3
#define UCHARDET_VER 2018.09.27