From 03fbdb6f69f6517826bd3d2ce6e1de900306b2f0 Mon Sep 17 00:00:00 2001 From: RaiKoHoff Date: Mon, 3 Feb 2020 15:59:05 +0100 Subject: [PATCH] + chg: Accelerator key remapping: move line up/down vs. jump folds --- language/common_res.h | 14 +++++++------- language/np3_af_za/menu_af_za.rc | 2 +- language/np3_be_by/menu_be_by.rc | 2 +- language/np3_de_de/menu_de_de.rc | 2 +- language/np3_en_gb/menu_en_gb.rc | 2 +- language/np3_en_us/menu_en_us.rc | 2 +- language/np3_es_es/menu_es_es.rc | 2 +- language/np3_fr_fr/menu_fr_fr.rc | 2 +- language/np3_hu_hu/menu_hu_hu.rc | 2 +- language/np3_it_it/menu_it_it.rc | 2 +- language/np3_ja_jp/menu_ja_jp.rc | 2 +- language/np3_ko_kr/menu_ko_kr.rc | 2 +- language/np3_nl_nl/menu_nl_nl.rc | 2 +- language/np3_pl_pl/menu_pl_pl.rc | 2 +- language/np3_pt_br/menu_pt_br.rc | 2 +- language/np3_ru_ru/menu_ru_ru.rc | 2 +- language/np3_sk_sk/menu_sk_sk.rc | 2 +- language/np3_sv_se/menu_sv_se.rc | 2 +- language/np3_tr_tr/menu_tr_tr.rc | 2 +- language/np3_zh_cn/menu_zh_cn.rc | 2 +- src/Edit.c | 2 +- src/Edit.h | 2 +- src/Notepad3.c | 24 ++++++++++++------------ src/Notepad3.rc | 22 +++++++++++++--------- 24 files changed, 53 insertions(+), 49 deletions(-) diff --git a/language/common_res.h b/language/common_res.h index ead89e786..e6a2187ad 100644 --- a/language/common_res.h +++ b/language/common_res.h @@ -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 diff --git a/language/np3_af_za/menu_af_za.rc b/language/np3_af_za/menu_af_za.rc index 4e6ee2959..ef23c20bf 100644 --- a/language/np3_af_za/menu_af_za.rc +++ b/language/np3_af_za/menu_af_za.rc @@ -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 diff --git a/language/np3_be_by/menu_be_by.rc b/language/np3_be_by/menu_be_by.rc index 69b9a1f50..fdad7eed9 100644 --- a/language/np3_be_by/menu_be_by.rc +++ b/language/np3_be_by/menu_be_by.rc @@ -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 diff --git a/language/np3_de_de/menu_de_de.rc b/language/np3_de_de/menu_de_de.rc index 2e270f0d7..a8a20eb69 100644 --- a/language/np3_de_de/menu_de_de.rc +++ b/language/np3_de_de/menu_de_de.rc @@ -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 diff --git a/language/np3_en_gb/menu_en_gb.rc b/language/np3_en_gb/menu_en_gb.rc index d2f874406..7d04dd1a3 100644 --- a/language/np3_en_gb/menu_en_gb.rc +++ b/language/np3_en_gb/menu_en_gb.rc @@ -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 diff --git a/language/np3_en_us/menu_en_us.rc b/language/np3_en_us/menu_en_us.rc index 0b36be5f8..bee1a0063 100644 --- a/language/np3_en_us/menu_en_us.rc +++ b/language/np3_en_us/menu_en_us.rc @@ -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 diff --git a/language/np3_es_es/menu_es_es.rc b/language/np3_es_es/menu_es_es.rc index b2d10f8c8..a76a3dff3 100644 --- a/language/np3_es_es/menu_es_es.rc +++ b/language/np3_es_es/menu_es_es.rc @@ -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 diff --git a/language/np3_fr_fr/menu_fr_fr.rc b/language/np3_fr_fr/menu_fr_fr.rc index 7e406ea5d..dd3f86755 100644 --- a/language/np3_fr_fr/menu_fr_fr.rc +++ b/language/np3_fr_fr/menu_fr_fr.rc @@ -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 diff --git a/language/np3_hu_hu/menu_hu_hu.rc b/language/np3_hu_hu/menu_hu_hu.rc index 6cf81814d..f8fd83724 100644 --- a/language/np3_hu_hu/menu_hu_hu.rc +++ b/language/np3_hu_hu/menu_hu_hu.rc @@ -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 diff --git a/language/np3_it_it/menu_it_it.rc b/language/np3_it_it/menu_it_it.rc index 69551d82d..195c30f79 100644 --- a/language/np3_it_it/menu_it_it.rc +++ b/language/np3_it_it/menu_it_it.rc @@ -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 diff --git a/language/np3_ja_jp/menu_ja_jp.rc b/language/np3_ja_jp/menu_ja_jp.rc index 4f9b1e5d7..0ba8692b3 100644 --- a/language/np3_ja_jp/menu_ja_jp.rc +++ b/language/np3_ja_jp/menu_ja_jp.rc @@ -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 diff --git a/language/np3_ko_kr/menu_ko_kr.rc b/language/np3_ko_kr/menu_ko_kr.rc index 249f219de..a4e399c4d 100644 --- a/language/np3_ko_kr/menu_ko_kr.rc +++ b/language/np3_ko_kr/menu_ko_kr.rc @@ -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 diff --git a/language/np3_nl_nl/menu_nl_nl.rc b/language/np3_nl_nl/menu_nl_nl.rc index deab891cc..189a7c196 100644 --- a/language/np3_nl_nl/menu_nl_nl.rc +++ b/language/np3_nl_nl/menu_nl_nl.rc @@ -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 diff --git a/language/np3_pl_pl/menu_pl_pl.rc b/language/np3_pl_pl/menu_pl_pl.rc index 0b2a4b083..d691b9f64 100644 --- a/language/np3_pl_pl/menu_pl_pl.rc +++ b/language/np3_pl_pl/menu_pl_pl.rc @@ -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 diff --git a/language/np3_pt_br/menu_pt_br.rc b/language/np3_pt_br/menu_pt_br.rc index 4ab80080f..0910cc5dd 100644 --- a/language/np3_pt_br/menu_pt_br.rc +++ b/language/np3_pt_br/menu_pt_br.rc @@ -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 diff --git a/language/np3_ru_ru/menu_ru_ru.rc b/language/np3_ru_ru/menu_ru_ru.rc index 9269f8d4c..6589dfdfd 100644 --- a/language/np3_ru_ru/menu_ru_ru.rc +++ b/language/np3_ru_ru/menu_ru_ru.rc @@ -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 diff --git a/language/np3_sk_sk/menu_sk_sk.rc b/language/np3_sk_sk/menu_sk_sk.rc index 0fb901cd7..f1edefeb2 100644 --- a/language/np3_sk_sk/menu_sk_sk.rc +++ b/language/np3_sk_sk/menu_sk_sk.rc @@ -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 diff --git a/language/np3_sv_se/menu_sv_se.rc b/language/np3_sv_se/menu_sv_se.rc index 3292bb156..4caceeeeb 100644 --- a/language/np3_sv_se/menu_sv_se.rc +++ b/language/np3_sv_se/menu_sv_se.rc @@ -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 diff --git a/language/np3_tr_tr/menu_tr_tr.rc b/language/np3_tr_tr/menu_tr_tr.rc index 29aab9fc0..8a5e8df3c 100644 --- a/language/np3_tr_tr/menu_tr_tr.rc +++ b/language/np3_tr_tr/menu_tr_tr.rc @@ -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 diff --git a/language/np3_zh_cn/menu_zh_cn.rc b/language/np3_zh_cn/menu_zh_cn.rc index e5dd36c11..57bdad367 100644 --- a/language/np3_zh_cn/menu_zh_cn.rc +++ b/language/np3_zh_cn/menu_zh_cn.rc @@ -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 diff --git a/src/Edit.c b/src/Edit.c index c4e39e9e5..ca464d042 100644 --- a/src/Edit.c +++ b/src/Edit.c @@ -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) { diff --git a/src/Edit.h b/src/Edit.h index b00c382e7..a880d53e5 100644 --- a/src/Edit.h +++ b/src/Edit.h @@ -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 "()[]{}" diff --git a/src/Notepad3.c b/src/Notepad3.c index bed72628d..aadb8313a 100644 --- a/src/Notepad3.c +++ b/src/Notepad3.c @@ -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; diff --git a/src/Notepad3.rc b/src/Notepad3.rc index fefef06d6..b16866069 100644 --- a/src/Notepad3.rc +++ b/src/Notepad3.rc @@ -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, , VIRTKEY, SHIFT, CONTROL, NOINVERT + VK_DOWN, IDM_EDIT_MOVELINEDOWN, VIRTKEY, ALT, NOINVERT + VK_DOWN, CMD_SCROLLDOWN, VIRTKEY, CONTROL, NOINVERT + //VK_DOWN, , 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