From bcbcd223e5fbef38b6f502fe340b5f2d1d76d2a1 Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Tue, 29 Sep 2020 14:03:38 +0200 Subject: [PATCH 1/3] chg: Add Keyboard Shortcuts for Minipath --- Build/Docs/KeyboardShortcuts.txt | 71 ++++++++++++++++++++++++++++++-- 1 file changed, 67 insertions(+), 4 deletions(-) diff --git a/Build/Docs/KeyboardShortcuts.txt b/Build/Docs/KeyboardShortcuts.txt index d693c83f5..8b3bc6f17 100644 --- a/Build/Docs/KeyboardShortcuts.txt +++ b/Build/Docs/KeyboardShortcuts.txt @@ -8,8 +8,8 @@ ================================================================================ -*** Keyboard Shortcuts *** date: 2020/08/26 ---------------------------------------------------------- +*** Keyboard Shortcuts for Notepad3 *** date: 2020/09/29 +--------------------------------------------------------------------- FILE @@ -287,11 +287,73 @@ +================================================================================ + +*** Keyboard Shortcuts for Minipath *** date: 2020/09/29 +--------------------------------------------------------------------- + + + Enter Open selected file in an existing target window. + Shift+Enter Open selected file in a new window. + Alt+Enter Properties of selected object. + Backspace Move to upper directory. + Ctrl+Backspace Move to root directory. + Alt+Left Go to previous directory. + Alt+Right Go to next directory. + Tab Move to next control. + Shift+Tab Move to previous control. + Esc Exit or minimize metapath (optional). + Ctrl+D Change to another directory. + Ctrl+E Toggle "Activate target window" option. + Ctrl+F Launch target application without any file. + Ctrl+H Save settings. + Ctrl+K Create link. + Ctrl+L Launch selected file. + Ctrl+M Specify file filter. + Ctrl+N Create new file. + Ctrl+Q Open file with specified quickviewer. + Ctrl+P Snap to target window. + Ctrl+Shift+P Move window to default position. + Ctrl+R Open run dialog box. + Ctrl+S Save file to new location. + Ctrl+T Toggle "Keep on top" option. + Ctrl+U Toggle transparency mode. + Ctrl+1 Sort files by name. + Ctrl+2 Sort files by size. + Ctrl+3 Sort files by type. + Ctrl+4 Sort files by date. + Ctrl+5 Sort files in reverse order. + Ctrl+* Set file filter to *.* + Alt+D Create new directory. + Alt+G Goto link target. + Alt+L Open selected file with another application. + Alt+N Open new window. + Alt+S Toggle statusbar. + Alt+T Toggle toolbar. + Del Delete selected object. + Shift+Del Delete selected object (no recycling). + Ctrl+Shift+Del Delete file without confirmation. + Alt+Up Goto next file. + Alt+Down Goto previous file. + F1 Display version info. + F2 Rename seletced object. + F5 Update view of directory. + F6 Copy/move selected object to another location. + F7 Save settings now. + Ctrl+F7 Jump to ini-file. + F9 Edit "Favorites" folder. + F11 Jump to "Favorites" folder. + F12 View program settings. + Ctrl+F12 Setup metapath target application. + + + ================================================================================ *** Regular Expression Matching Syntax (Multi Lines) *** (Advanced features: see .\Oniguruma_RE.txt) ---------------------------------------------------------- +--------------------------------------------------------------------- + . This matches any character. @@ -358,7 +420,8 @@ ================================================================================ *** Command Line Help *** ---------------------------------------------------------- +--------------------------------------------------------------------- + Usage: Notepad3 [/?] […[Encoding]] […[Line ending mode]] [/e] [/g] [/m] [/l] From ebf197acaaf69836490f185dc6a03377f28bcd12 Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Tue, 29 Sep 2020 14:05:39 +0200 Subject: [PATCH 2/3] chg: Minor correction to have same alignment as other Lexers --- src/StyleLexers/styleLexLaTex.c | 2 +- src/StyleLexers/styleLexTOML.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/StyleLexers/styleLexLaTex.c b/src/StyleLexers/styleLexLaTex.c index 5113f0e68..a3cbbff2e 100644 --- a/src/StyleLexers/styleLexLaTex.c +++ b/src/StyleLexers/styleLexLaTex.c @@ -5,7 +5,7 @@ KEYWORDLIST KeyWords_LaTex = EMPTY_KEYWORDLIST; EDITLEXER lexLATEX = { - SCLEX_LATEX, "latex", IDS_LEX_LATEX, L"LaTeX Files", L"tex; latex; sty; texi; texinfo; txi", L"", +SCLEX_LATEX, "latex", IDS_LEX_LATEX, L"LaTeX Files", L"tex; latex; sty; texi; texinfo; txi", L"", &KeyWords_LaTex, { { {STYLE_DEFAULT}, IDS_LEX_STR_63126, L"Default", L"", L"" }, //{ {SCE_L_DEFAULT}, IDS_LEX_STR_63126, L"Default", L"", L"" }, diff --git a/src/StyleLexers/styleLexTOML.c b/src/StyleLexers/styleLexTOML.c index f43f0ef1e..c20dd4d98 100644 --- a/src/StyleLexers/styleLexTOML.c +++ b/src/StyleLexers/styleLexTOML.c @@ -10,7 +10,7 @@ NULL, EDITLEXER lexTOML = { - SCLEX_TOML, "toml", IDS_LEX_TOML_CFG, L"TOML Config", L"toml", L"", +SCLEX_TOML, "toml", IDS_LEX_TOML_CFG, L"TOML Config", L"toml", L"", &KeyWords_TOML,{ { {STYLE_DEFAULT}, IDS_LEX_STR_63126, L"Default", L"", L"" }, //{ {SCE_TOML_DEFAULT}, IDS_LEX_STR_63126, L"Default", L"", L"" }, From 8e1f722b28a08d0966b4d6e2096d878b8b9f5e27 Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Tue, 29 Sep 2020 14:07:59 +0200 Subject: [PATCH 3/3] + upd: Version files and Changes.txt - And change in "Acknowledgments" list --- Build/Changes.txt | 6 ++++-- Readme.txt | 1 + Versions/build.txt | 2 +- Versions/day.txt | 2 +- language/common_res.rc | 1 + res/Notepad3.exe.manifest.conf | 2 +- src/VersionEx.h | 4 ++-- 7 files changed, 11 insertions(+), 7 deletions(-) diff --git a/Build/Changes.txt b/Build/Changes.txt index a93e7f72b..ed1fb9205 100644 --- a/Build/Changes.txt +++ b/Build/Changes.txt @@ -34,13 +34,14 @@ SUP - (S)et(UP) / Installer Package ======================================================== -Current BETA/RC Version 5.20.928.(build_#) (2020-09-28) +Current BETA/RC Version 5.20.929.(build_#) (2020-09-29) ======================================================== -------------------------------------------------------- NEW: -------------------------------------------------------- [.xxx.x]- +[.929.1]- Minipath.ini: [Settings2] FocusLostOpacity=100 (opycity level on losing focus). [.923.1]- Hotkey 'F3': use MRU latest item before clipboard content as search pattern if prior search pattern is empty. [.922.1]- Support Lexer switching while Customize Schemes dialog is open. [.921.1]- Expand current lexers style tree on customize schemes dialog startup. @@ -59,6 +60,7 @@ NEW: CHANGES: -------------------------------------------------------- [.xxx.x]- +[.929.1]- Migration from CreateLexer() by ID to CreateLexer() by Name (Lexilla IFace5 conform) (GRE). [.928.1]- grepWinNP3: code clean-up (GRE). [.928.1]- TinyExpr format floating.point with non zero fractional part. [.927.1]- TinyExpr floating point format. @@ -84,7 +86,7 @@ CHANGES: FIXES: -------------------------------------------------------- [.xxx.x]- -[.928.2]- Freezing of main wnd caused by mixed usage of Lexer Interfaces. +[.928.2]- Freezing of main window caused by mixed usage of Lexer Interfaces. [.928.1]- Setting new IFace5 Lexer (should fix line/stream comment toggle issue #2912). [.927.1]- Lexer file extensions maintained in standard config. [.927.1]- grepWin language switching (github.com/stefankueng/grepWin/issues/199) (GRE). diff --git a/Readme.txt b/Readme.txt index bfca524eb..a3940460f 100644 --- a/Readme.txt +++ b/Readme.txt @@ -96,6 +96,7 @@ Acknowledgments: ---------------- alexantr https://github.com/alexantr AlexIljin https://github.com/AlexIljin +bravo-hero https://github.com/bravo-hero craigo- https://github.com/craigo-/ Crane70 https://github.com/Crane70 engelhro https://github.com/engelhro diff --git a/Versions/build.txt b/Versions/build.txt index 0cfbf0888..d00491fd7 100644 --- a/Versions/build.txt +++ b/Versions/build.txt @@ -1 +1 @@ -2 +1 diff --git a/Versions/day.txt b/Versions/day.txt index 616005867..63881d8a1 100644 --- a/Versions/day.txt +++ b/Versions/day.txt @@ -1 +1 @@ -928 +929 diff --git a/language/common_res.rc b/language/common_res.rc index acdaa65e1..92d9eccf7 100644 --- a/language/common_res.rc +++ b/language/common_res.rc @@ -117,6 +117,7 @@ IDS_MUI_ABOUT_LIBS "\ IDS_MUI_ABOUT_ACKNOWLEDGES "\ \\cf0 alexantr\\tab https://github.com/alexantr\\par\ \\cf0 AlexIljin\\tab https://github.com/AlexIljin\\par\ +\\cf0 bravo-hero\\tab https://github.com/bravo-hero\\par\ \\cf0 craigo-\\tab https://github.com/craigo-/\\par\ \\cf0 Crane70\\tab https://github.com/Crane70\\par\ \\cf0 engelhro\\tab https://github.com/engelhro\\par\ diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index 617e7ec57..04fb17f97 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,7 +3,7 @@ Notepad3 beta diff --git a/src/VersionEx.h b/src/VersionEx.h index d10d3ae32..9fcde1c9d 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -8,8 +8,8 @@ #define SAPPNAME "Notepad3" #define VERSION_MAJOR 5 #define VERSION_MINOR 20 -#define VERSION_REV 928 -#define VERSION_BUILD 2 +#define VERSION_REV 929 +#define VERSION_BUILD 1 #define SCINTILLA_VER 445 #define ONIGURUMA_REGEX_VER 6.9.5 #define UCHARDET_VER 2018.09.27