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 #1938 from RaiKoHoff/DevNewFeatures

Browse Source 
Accelerator key remapping: move line up/down vs. jump folds
This commit is contained in:
Rainer Kottenhoff 2020-02-03 16:08:37 +01:00 committed by GitHub
commit e4d4914452
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
24 changed files with 53 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
language/common_res.h
View File

@ -352,8 +352,8 @@
#define CMD_ESCAPE 20000
#define CMD_SHIFTESC 20001
#define CMD_SHIFTCTRLENTER 20002
#define CMD_CTRLUP 20003
#define CMD_CTRLDOWN 20004
#define CMD_SCROLLUP 20003
#define CMD_SCROLLDOWN 20004
#define CMD_CTRLLEFT 20005
#define CMD_CTRLRIGHT 20006
//#define CMD_DELETEBACK 20007
@ -393,12 +393,12 @@
#define CMD_COPYWINPOS 20041
#define CMD_INITIALWINPOS 20042
#define CMD_OPENINIFILE 20043
#define CMD_CTRLENTER 20044
#define CMD_INSERTNEWLINE 20044
#define CMD_OPEN_HYPERLINK 20045
#define CMD_ALTUP 20046
#define CMD_ALTDOWN 20047
#define CMD_ALTLEFT 20048
#define CMD_ALTRIGHT 20049
#define CMD_FOLDJUMPUP 20046
#define CMD_FOLDJUMPDOWN 20047
#define CMD_FOLDCOLLAPSE 20048
#define CMD_FOLDEXPAND 20049
#define CMD_TAB 20050
#define CMD_BACKTAB 20051
#define CMD_VK_INSERT 20052

2
language/np3_af_za/menu_af_za.rc
View File

@ -247,7 +247,7 @@ BEGIN
END
POPUP "&Insetsel"
BEGIN
MENUITEM "&Nuwe Lyn Hierbo\tCtrl+Enter", CMD_CTRLENTER
MENUITEM "&Nuwe Lyn Hierbo\tCtrl+Enter", CMD_INSERTNEWLINE
MENUITEM SEPARATOR
MENUITEM "&HTML/XML Tag...\tAlt+X", IDM_EDIT_INSERT_TAG
MENUITEM SEPARATOR

2
language/np3_be_by/menu_be_by.rc
View File

@ -247,7 +247,7 @@ BEGIN
END
POPUP "Устаўка"
BEGIN
MENUITEM "&Новы радок вышэй\tCtrl+Enter", CMD_CTRLENTER
MENUITEM "&Новы радок вышэй\tCtrl+Enter", CMD_INSERTNEWLINE
MENUITEM SEPARATOR
MENUITEM "Тэг &HTML/XML...\tAlt+X", IDM_EDIT_INSERT_TAG
MENUITEM SEPARATOR

2
language/np3_de_de/menu_de_de.rc
View File

@ -247,7 +247,7 @@ BEGIN
END
POPUP "&Einfügen"
BEGIN
MENUITEM "&Neue Zeile (vor aktueller)\tCtrl+Enter", CMD_CTRLENTER
MENUITEM "&Neue Zeile (vor aktueller)\tCtrl+Enter", CMD_INSERTNEWLINE
MENUITEM SEPARATOR
MENUITEM "&HTML/XML Tag...\tAlt+X", IDM_EDIT_INSERT_TAG
MENUITEM SEPARATOR

2
language/np3_en_gb/menu_en_gb.rc
View File

@ -247,7 +247,7 @@ BEGIN
END
POPUP "&Insert"
BEGIN
MENUITEM "&New Line Above\tCtrl+Enter", CMD_CTRLENTER
MENUITEM "&New Line Above\tCtrl+Enter", CMD_INSERTNEWLINE
MENUITEM SEPARATOR
MENUITEM "&HTML/XML Tag...\tAlt+X", IDM_EDIT_INSERT_TAG
MENUITEM SEPARATOR

2
language/np3_en_us/menu_en_us.rc
View File

@ -247,7 +247,7 @@ BEGIN
END
POPUP "&Insert"
BEGIN
MENUITEM "&New Line Above\tCtrl+Enter", CMD_CTRLENTER
MENUITEM "&New Line Above\tCtrl+Enter", CMD_INSERTNEWLINE
MENUITEM SEPARATOR
MENUITEM "&HTML/XML Tag...\tAlt+X", IDM_EDIT_INSERT_TAG
MENUITEM SEPARATOR

2
language/np3_es_es/menu_es_es.rc
View File

@ -247,7 +247,7 @@ BEGIN
END
POPUP "&Insertar"
BEGIN
MENUITEM "&Nueva línea arriba\tCtrl+Enter", CMD_CTRLENTER
MENUITEM "&Nueva línea arriba\tCtrl+Enter", CMD_INSERTNEWLINE
MENUITEM SEPARATOR
MENUITEM "Etiqueta HTML/&XML...\tAlt+X", IDM_EDIT_INSERT_TAG
MENUITEM SEPARATOR

2
language/np3_fr_fr/menu_fr_fr.rc
View File

@ -247,7 +247,7 @@ BEGIN
END
POPUP "&Insérer"
BEGIN
MENUITEM "&Nouvelle ligne au-dessus\tCtrl+Enter", CMD_CTRLENTER
MENUITEM "&Nouvelle ligne au-dessus\tCtrl+Enter", CMD_INSERTNEWLINE
MENUITEM SEPARATOR
MENUITEM "Balise &HTML/XML...\tAlt+X", IDM_EDIT_INSERT_TAG
MENUITEM SEPARATOR

2
language/np3_hu_hu/menu_hu_hu.rc
View File

@ -247,7 +247,7 @@ BEGIN
END
POPUP "&Beillesztés"
BEGIN
MENUITEM "&Fölé egy új sor\tCtrl+Enter", CMD_CTRLENTER
MENUITEM "&Fölé egy új sor\tCtrl+Enter", CMD_INSERTNEWLINE
MENUITEM SEPARATOR
MENUITEM "&HTML/XML elem...\tAlt+X", IDM_EDIT_INSERT_TAG
MENUITEM SEPARATOR

2
language/np3_it_it/menu_it_it.rc
View File

@ -247,7 +247,7 @@ BEGIN
END
POPUP "&Inserisci"
BEGIN
MENUITEM "&Nuova riga sopra\tCtrl+Enter", CMD_CTRLENTER
MENUITEM "&Nuova riga sopra\tCtrl+Enter", CMD_INSERTNEWLINE
MENUITEM SEPARATOR
MENUITEM "Tag &HTML/XML...\tAlt+X", IDM_EDIT_INSERT_TAG
MENUITEM SEPARATOR

2
language/np3_ja_jp/menu_ja_jp.rc
View File

@ -247,7 +247,7 @@ BEGIN
END
POPUP "挿入(&I)"
BEGIN
MENUITEM "上に改行(&N)\tCtrl+Enter", CMD_CTRLENTER
MENUITEM "上に改行(&N)\tCtrl+Enter", CMD_INSERTNEWLINE
MENUITEM SEPARATOR
MENUITEM "HTML/XMLタグ(&H)...\tAlt+X", IDM_EDIT_INSERT_TAG
MENUITEM SEPARATOR

2
language/np3_ko_kr/menu_ko_kr.rc
View File

@ -247,7 +247,7 @@ BEGIN
END
POPUP "삽입(&N)"
BEGIN
MENUITEM "새 줄(&N)\tCtrl+Enter", CMD_CTRLENTER
MENUITEM "새 줄(&N)\tCtrl+Enter", CMD_INSERTNEWLINE
MENUITEM SEPARATOR
MENUITEM "HTML/XML 태그(&H)...\tAlt+X", IDM_EDIT_INSERT_TAG
MENUITEM SEPARATOR

2
language/np3_nl_nl/menu_nl_nl.rc
View File

@ -247,7 +247,7 @@ BEGIN
END
POPUP "&Invoegen"
BEGIN
MENUITEM "&Nieuwe lijn boven\tCtrl+Enter", CMD_CTRLENTER
MENUITEM "&Nieuwe lijn boven\tCtrl+Enter", CMD_INSERTNEWLINE
MENUITEM SEPARATOR
MENUITEM "&HTML/XML Tag...\tAlt+X", IDM_EDIT_INSERT_TAG
MENUITEM SEPARATOR

2
language/np3_pl_pl/menu_pl_pl.rc
View File

@ -247,7 +247,7 @@ BEGIN
END
POPUP "&Wstaw"
BEGIN
MENUITEM "&Nowy wiersz u góry\tCtrl+Enter", CMD_CTRLENTER
MENUITEM "&Nowy wiersz u góry\tCtrl+Enter", CMD_INSERTNEWLINE
MENUITEM SEPARATOR
MENUITEM "&Znacznik HTML/XML...\tAlt+X", IDM_EDIT_INSERT_TAG
MENUITEM SEPARATOR

2
language/np3_pt_br/menu_pt_br.rc
View File

@ -247,7 +247,7 @@ BEGIN
END
POPUP "&Inserir"
BEGIN
MENUITEM "&Nova Linha Acima\tCtrl+Enter", CMD_CTRLENTER
MENUITEM "&Nova Linha Acima\tCtrl+Enter", CMD_INSERTNEWLINE
MENUITEM SEPARATOR
MENUITEM "Tag &HTML/XML...\tAlt+X", IDM_EDIT_INSERT_TAG
MENUITEM SEPARATOR

2
language/np3_ru_ru/menu_ru_ru.rc
View File

@ -247,7 +247,7 @@ BEGIN
END
POPUP "Вставка"
BEGIN
MENUITEM "&Новая строка выше\tCtrl+Enter", CMD_CTRLENTER
MENUITEM "&Новая строка выше\tCtrl+Enter", CMD_INSERTNEWLINE
MENUITEM SEPARATOR
MENUITEM "Тег &HTML/XML...\tAlt+X", IDM_EDIT_INSERT_TAG
MENUITEM SEPARATOR

2
language/np3_sk_sk/menu_sk_sk.rc
View File

@ -247,7 +247,7 @@ BEGIN
END
POPUP "&Insert"
BEGIN
MENUITEM "&New Line Above\tCtrl+Enter", CMD_CTRLENTER
MENUITEM "&New Line Above\tCtrl+Enter", CMD_INSERTNEWLINE
MENUITEM SEPARATOR
MENUITEM "&HTML/XML Tag...\tAlt+X", IDM_EDIT_INSERT_TAG
MENUITEM SEPARATOR

2
language/np3_sv_se/menu_sv_se.rc
View File

@ -247,7 +247,7 @@ BEGIN
END
POPUP "Infoga"
BEGIN
MENUITEM "Ny rad över\tCtrl+Enter", CMD_CTRLENTER
MENUITEM "Ny rad över\tCtrl+Enter", CMD_INSERTNEWLINE
MENUITEM SEPARATOR
MENUITEM "HTML/XML Tag...\tAlt+X", IDM_EDIT_INSERT_TAG
MENUITEM SEPARATOR

2
language/np3_tr_tr/menu_tr_tr.rc
View File

@ -247,7 +247,7 @@ BEGIN
END
POPUP "&Insert"
BEGIN
MENUITEM "&New Line Above\tCtrl+Enter", CMD_CTRLENTER
MENUITEM "&New Line Above\tCtrl+Enter", CMD_INSERTNEWLINE
MENUITEM SEPARATOR
MENUITEM "&HTML/XML Tag...\tAlt+X", IDM_EDIT_INSERT_TAG
MENUITEM SEPARATOR

2
language/np3_zh_cn/menu_zh_cn.rc
View File

@ -247,7 +247,7 @@ BEGIN
END
POPUP "插入(&I)"
BEGIN
MENUITEM "在光标前插入新行(&N)\tCtrl+Enter", CMD_CTRLENTER
MENUITEM "在光标前插入新行(&N)\tCtrl+Enter", CMD_INSERTNEWLINE
MENUITEM SEPARATOR
MENUITEM "HTML/XML 标记(&H)...\tAlt+X", IDM_EDIT_INSERT_TAG
MENUITEM SEPARATOR

2
src/Edit.c
View File

@ -8589,7 +8589,7 @@ void EditFoldClick(DocLn ln, int mode)
}
void EditFoldAltArrow(FOLD_MOVE move, FOLD_ACTION action)
void EditFoldCmdKey(FOLD_MOVE move, FOLD_ACTION action)
{
if (FocusedView.CodeFoldingAvailable && FocusedView.ShowCodeFolding)
{

2
src/Edit.h
View File

@ -141,7 +141,7 @@ typedef enum {
void EditToggleFolds(FOLD_ACTION action,bool);
void EditFoldClick(DocLn ln, int mode);
void EditFoldAltArrow(FOLD_MOVE move, FOLD_ACTION action);
void EditFoldCmdKey(FOLD_MOVE move, FOLD_ACTION action);
#define NP3_BRACES_TO_MATCH "()[]{}"

24
src/Notepad3.c
View File

@ -3281,7 +3281,7 @@ LRESULT MsgInitMenu(HWND hwnd, WPARAM wParam, LPARAM lParam)
i == SCLEX_AU3 || i == SCLEX_LATEX || i == SCLEX_AHKL || i == SCLEX_RUBY || i == SCLEX_CMAKE || i == SCLEX_MARKDOWN ||
i == SCLEX_YAML || i == SCLEX_REGISTRY || i == SCLEX_NIMROD || i == SCLEX_TOML) && !ro);
EnableCmd(hmenu, CMD_CTRLENTER, !ro);
EnableCmd(hmenu, CMD_INSERTNEWLINE, !ro);
EnableCmd(hmenu, IDM_EDIT_INSERT_TAG, !ro);
EnableCmd(hmenu, IDM_EDIT_INSERT_ENCODING, (Encoding_GetParseNames(Encoding_Current(CPI_GET)) != NULL) && !ro);
@ -5730,7 +5730,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
break;
case CMD_CTRLENTER:
case CMD_INSERTNEWLINE:
{
_BEGIN_UNDO_ACTION_
const DocPos iPos = SciCall_GetCurrentPos();
@ -5765,7 +5765,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
break;
case CMD_CTRLUP:
case CMD_SCROLLUP:
if (Sci_IsMultiSelection())
{
SciCall_LineUpExtend();
@ -5776,7 +5776,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
break;
case CMD_CTRLDOWN:
case CMD_SCROLLDOWN:
if (Sci_IsMultiSelection())
{
SciCall_LineDownExtend();
@ -6228,20 +6228,20 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
HandleHotSpotURLClicked(SciCall_GetCurrentPos(), (OPEN_WITH_BROWSER | OPEN_WITH_NOTEPAD3));
break;
case CMD_ALTDOWN:
EditFoldAltArrow(DOWN, SNIFF);
case CMD_FOLDJUMPDOWN:
EditFoldCmdKey(DOWN, SNIFF);
break;
case CMD_ALTUP:
EditFoldAltArrow(UP, SNIFF);
case CMD_FOLDJUMPUP:
EditFoldCmdKey(UP, SNIFF);
break;
case CMD_ALTLEFT:
EditFoldAltArrow(NONE, FOLD);
case CMD_FOLDCOLLAPSE:
EditFoldCmdKey(NONE, FOLD);
break;
case CMD_ALTRIGHT:
EditFoldAltArrow(NONE, EXPAND);
case CMD_FOLDEXPAND:
EditFoldCmdKey(NONE, EXPAND);
break;

22
src/Notepad3.rc
View File

@ -275,10 +275,12 @@ BEGIN
//VK_NEXT, CMD_VKEND, VIRTKEY, NOINVERT /// PAGE NEXT Key
//~VK_LEFT, CMD_LEFT, VIRTKEY, NOINVERT
VK_LEFT, CMD_CTRLLEFT, VIRTKEY, CONTROL, NOINVERT
VK_LEFT, CMD_ALTLEFT, VIRTKEY, ALT, NOINVERT
VK_LEFT, CMD_FOLDCOLLAPSE, VIRTKEY, ALT, NOINVERT
//~VK_LEFT, XXXXXXXXXXX, VIRTKEY, SHIFT, CONTROL, NOINVERT /// extend selection by word jump
//~VK_RIGHT, CMD_RIGHT, VIRTKEY, NOINVERT
VK_RIGHT, CMD_CTRLRIGHT, VIRTKEY, CONTROL, NOINVERT
VK_RIGHT, CMD_ALTRIGHT, VIRTKEY, ALT, NOINVERT
VK_RIGHT, CMD_FOLDEXPAND, VIRTKEY, ALT, NOINVERT
//~VK_RIGHT, XXXXXXXXXXX, VIRTKEY, SHIFT, CONTROL, NOINVERT /// extend selection by word jump
VK_ADD, IDM_VIEW_ZOOMIN, VIRTKEY, CONTROL, NOINVERT
//~VK_ADD, CMD_INCLINELIMIT, VIRTKEY, ALT, NOINVERT /// ALT+[+] is used for universal Unicode input
VK_ADD, CMD_INCREASENUM, VIRTKEY, CONTROL, ALT, NOINVERT
@ -290,12 +292,12 @@ BEGIN
VK_DELETE, CMD_CTRLDEL, VIRTKEY, CONTROL, NOINVERT
VK_DELETE, IDM_EDIT_CUT, VIRTKEY, SHIFT, NOINVERT
VK_DELETE, IDM_EDIT_DELETELINERIGHT, VIRTKEY, SHIFT, CONTROL, NOINVERT
VK_UP, CMD_ALTUP, VIRTKEY, ALT, NOINVERT
VK_UP, CMD_CTRLUP, VIRTKEY, CONTROL, NOINVERT
VK_UP, IDM_EDIT_MOVELINEUP, VIRTKEY, SHIFT, CONTROL, NOINVERT
VK_DOWN, CMD_ALTDOWN, VIRTKEY, ALT, NOINVERT
VK_DOWN, CMD_CTRLDOWN, VIRTKEY, CONTROL, NOINVERT
VK_DOWN, IDM_EDIT_MOVELINEDOWN, VIRTKEY, SHIFT, CONTROL, NOINVERT
VK_UP, IDM_EDIT_MOVELINEUP, VIRTKEY, ALT, NOINVERT
VK_UP, CMD_SCROLLUP, VIRTKEY, CONTROL, NOINVERT
//VK_UP, <free>, VIRTKEY, SHIFT, CONTROL, NOINVERT
VK_DOWN, IDM_EDIT_MOVELINEDOWN, VIRTKEY, ALT, NOINVERT
VK_DOWN, CMD_SCROLLDOWN, VIRTKEY, CONTROL, NOINVERT
//VK_DOWN, <free>, VIRTKEY, SHIFT, CONTROL, NOINVERT
VK_ESCAPE, CMD_ESCAPE, VIRTKEY, NOINVERT
VK_ESCAPE, CMD_SHIFTESC, VIRTKEY, SHIFT, NOINVERT
VK_F1, IDM_HELP_ONLINEDOCUMENTATION, VIRTKEY, NOINVERT
@ -351,13 +353,15 @@ BEGIN
//VK_MULTIPLY, CMD_VK_MULTIPLY, VIRTKEY, NOINVERT
VK_NUMPAD0, IDM_VIEW_RESETZOOM, VIRTKEY, CONTROL, NOINVERT
VK_OEM_COMMA, CMD_JUMP2SELSTART, VIRTKEY, CONTROL, NOINVERT
VK_OEM_MINUS, CMD_FOLDJUMPUP, VIRTKEY, ALT, NOINVERT
VK_OEM_MINUS, IDM_VIEW_ZOOMOUT, VIRTKEY, CONTROL, NOINVERT
VK_OEM_MINUS, CMD_DECREASENUM, VIRTKEY, CONTROL, ALT, NOINVERT
VK_OEM_PERIOD, CMD_JUMP2SELEND, VIRTKEY, CONTROL, NOINVERT
VK_OEM_PERIOD, IDM_EDIT_INSERT_GUID, VIRTKEY, SHIFT, CONTROL, NOINVERT
VK_OEM_PLUS, CMD_FOLDJUMPDOWN, VIRTKEY, ALT, NOINVERT
VK_OEM_PLUS, IDM_VIEW_ZOOMIN, VIRTKEY, CONTROL, NOINVERT
VK_OEM_PLUS, CMD_INCREASENUM, VIRTKEY, CONTROL, ALT, NOINVERT
VK_RETURN, CMD_CTRLENTER, VIRTKEY, CONTROL, NOINVERT
VK_RETURN, CMD_INSERTNEWLINE, VIRTKEY, CONTROL, NOINVERT
VK_RETURN, CMD_SHIFTCTRLENTER, VIRTKEY, SHIFT, CONTROL, NOINVERT
VK_RETURN, IDM_EDIT_COMPLETEWORD, VIRTKEY, CONTROL, ALT, NOINVERT
VK_SPACE, IDM_EDIT_SELECTWORD, VIRTKEY, CONTROL, NOINVERT