diff --git a/Build/Changes.txt b/Build/Changes.txt
index 34a85a0bd..5673d6bf3 100644
--- a/Build/Changes.txt
+++ b/Build/Changes.txt
@@ -42,9 +42,9 @@ NEW:
- In About Resources: Data Sharing Service from https://workupload.com/.
- Automatic scrolling when dragging selected text near window edge (SCI).
- break rectangular selection into multiple selection on end-of-lines (move caret).
-- Infos of sreen/display/dpi for "Copy Version Info" button.
+- Infos of screen/display/dpi for "Copy Version Info" button.
- Preserve stream selection in file history (w/ text position remembering).
-- Language dependent status bar abreviations.
+- Language dependent status bar abbreviations.
- Copy directory to clipboard and Open path in explorer.
- Toggle menu bar option.
- Add Lexicographical Line Sort Order.
@@ -57,7 +57,7 @@ CHANGES:
-----------------------------------------------------
- Update "KeyboardShortcuts.txt".
- Split undo typing sequence by line-breaks default -> true.
-- Add file history to to recent docs (taskbar) jumplist.
+- Add file history to recent docs (taskbar) jumplist.
- NP3 INI file read/write using file locking (shared read / exclusive write) for multiple instances.
- Reset build-of-the-day number in AppVeyor on new day.
- Change version numbering of build_# (the build number is now daily based).
@@ -74,13 +74,13 @@ CHANGES:
- Replace std messagebox "save modified file warning" by (silent) custom messagebox if message beeps are muted.
- Don't Auto-Close blank untitled document, only empty untitled document.
- Encoding detection fallback: if "Load ASCII as UTF-8" is checked use UTF-8 (if valid) else current ANSI code-page.
-- Use Ctrl+Shift+L for toggle "Menu: Reuse Window" option.
+- Use Ctrl+Shift+L for toggle "Menu: Reuse Window" option.
- Inversion of Accelerator key Ctrl+Alt+L with Ctrl+Shift+L.
- Change wording "Administrator" to "Elevated".
- Hidden "ExitOnESCSkipLevel" feature (Exit on ESC can ignore a selection).
- ESC Key clears active selection (not exiting Notepad3 if configured) (Config: ExitOnESCSkipLevel=2).
- Set large file size limit to 2GB (INT32_MAX).
-- Set big file size limit warning to 64MB (syntax highlighting is switched off) (Config: FileLoadWarningMB=64).
+- Set big file size limit warning to 64MB (syntax highlighting is switched off) (Config: FileLoadWarningMB=64).
- New Notepad3 Icon (Notepad3 icon by Vexels.com designed by smanashova@gmail.com).
- Initial default big toolbar only for monitors > Full-HD.
- Copy to clipboard instead of insert (filename, path, GUID).
@@ -88,9 +88,9 @@ CHANGES:
- Option [Settings2] LineCommentPortfixStrg= e.g. add a space to comment chars.
- Option [Settings2] NoCopyLineOnEmptySelection and NoCutLineOnEmptySelection.
- Appearance of INFOBOX4 (MB_YESNOCANCEL).
-- Thin rectangular (multi) selection after toggeling line-comment block for multi insertion.
+- Thin rectangular (multi) selection after toggling line-comment block for multi insertion.
- Full Work Area Mode (F11) -> Full Screen Mode (Maximize window if "full work area" is requested).
-- Ctrl+Alt+Enter AutoCompletion behaviour.
+- Ctrl+Alt+Enter AutoCompletion behavior.
- Menu and behavior for copy/paste and copy/paste line.
- Allow each modification step to split undo typing sequence (set timeout 0 < to < 20ms).
- Split undo typing sequence (by line-breaks and/or timeout) (UndoTransactionTimeout=0, LnBrk via Menu).
@@ -116,12 +116,12 @@ ENHANCEMENT:
FIXES:
-----------------------------------------------------
- Don't use analysis hint UTF-8, if file is invalid UTF-8.
-- Configurable default ANSI code-page (locale) detection bonus.
+- Configurable default ANSI code-page (locale) detection bonus.
- No AutoCompletion on empty words (busy loop bug).
- DPI Scaling Toolbar and DPI scaling selection mode.
-- Common controls will use preffered/available MUI language.
+- Common controls will use preferred/available MUI language.
- Sticky window position handling.
-- Initial, default and current window position handling.
+- Initial, default and current window position handling.
- Debug assertion (isspace() called on non ASCII char).
- Correct return result of Styles export.
- Scintilla method declaration.
@@ -167,13 +167,13 @@ FIXES:
- Batch lexer: handle comment after ampersand(&) command sequence.
- Bug in replace on single step find/replace.
- Convert to Hex and vice versa: work on (stream-)selection (original source by ZuFuLiu).
-- Comparison warning: signed/unsignd mismatch.
+- Comparison warning: signed/unsigned mismatch.
- Canonical ini-file style section order for settings from scratch.
- Prevent concurrent settings-file-access (re-launch elevated).
- Small fixes on "Relaunch Elevated" functionality.
- Minor fixes for window positioning by cmdline parameter.
- Minor correction of HotKey.
-- Ctrl+Shift-C/X and Paste behaviour.
+- Ctrl+Shift-C/X and Paste behavior.
- Markdown highlight overflow.
- Redo initial selection after replace (ins/del).
- Hyperlink Regex detection and Update visible indicator issue.
diff --git a/Build/Notepad3.ini b/Build/Notepad3.ini
index 069e1cbb4..533f17726 100644
--- a/Build/Notepad3.ini
+++ b/Build/Notepad3.ini
@@ -15,7 +15,7 @@ SettingsVersion=4
;DefaultWindowPosition=
;DenyVirtualSpaceAccess=0
;filebrowser.exe=minipath.exe
-;grepWin.exe=grepWinNP3_portable.exe
+;grepWin.exe=grepWinNP3.exe
;FileCheckInverval=2000
;FileDlgFilters=
;FileLoadWarningMB=64
diff --git a/Build/grepWin/grepWinNP3.exe b/Build/grepWin/grepWinNP3.exe
new file mode 100644
index 000000000..0335d6c55
Binary files /dev/null and b/Build/grepWin/grepWinNP3.exe differ
diff --git a/Build/grepWin/grepWinNP3_portable.exe b/Build/grepWin/grepWinNP3_portable.exe
deleted file mode 100644
index 6733eb5c5..000000000
Binary files a/Build/grepWin/grepWinNP3_portable.exe and /dev/null differ
diff --git a/Build/grepWin/grepWinNP3_x64.exe b/Build/grepWin/grepWinNP3_x64.exe
new file mode 100644
index 000000000..56cff2fd1
Binary files /dev/null and b/Build/grepWin/grepWinNP3_x64.exe differ
diff --git a/Build/grepWin/grepWinNP3_x64_portable.exe b/Build/grepWin/grepWinNP3_x64_portable.exe
deleted file mode 100644
index 043db7039..000000000
Binary files a/Build/grepWin/grepWinNP3_x64_portable.exe and /dev/null differ
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 d3824c297..6ac793b42 100644
--- a/Versions/day.txt
+++ b/Versions/day.txt
@@ -1 +1 @@
-324
+325
diff --git a/language/common_res.h b/language/common_res.h
index 9342f53d7..0ea3b0c35 100644
--- a/language/common_res.h
+++ b/language/common_res.h
@@ -65,25 +65,26 @@
#define IDS_MUI_ERR_LOADFILE 13000
#define IDS_MUI_ERR_SAVEFILE 13001
#define IDS_MUI_ERR_BROWSE 13002
-#define IDS_MUI_ERR_MRUDLG 13003
-#define IDS_MUI_ERR_CREATELINK 13004
-#define IDS_MUI_ERR_PREVWINDISABLED 13005
-#define IDS_MUI_ERR_ENCODINGNA 13006
-#define IDS_MUI_ERR_UNICODE 13007
-#define IDS_MUI_ERR_UNICODE2 13008
-#define IDS_MUI_ERR_DROP 13009
-#define IDS_MUI_ERR_ACCESSDENIED 13010
-#define IDS_MUI_ERR_ADMINEXE 13011
-#define IDS_MUI_ERR_BITMAP 13012
-#define IDS_MUI_ERR_ELEVATED_RIGHTS 13013
-#define IDS_MUI_WARN_LOAD_BIG_FILE 13014
-#define IDS_MUI_ERR_FILE_TOO_LARGE 13015
-#define IDS_MUI_WARN_UNKNOWN_EXT 13016
+#define IDS_MUI_ERR_GREPWIN 13003
+#define IDS_MUI_ERR_MRUDLG 13004
+#define IDS_MUI_ERR_CREATELINK 13005
+#define IDS_MUI_ERR_PREVWINDISABLED 13006
+#define IDS_MUI_ERR_ENCODINGNA 13007
+#define IDS_MUI_ERR_UNICODE 13008
+#define IDS_MUI_ERR_UNICODE2 13009
+#define IDS_MUI_ERR_DROP 13010
+#define IDS_MUI_ERR_ACCESSDENIED 13011
+#define IDS_MUI_ERR_ADMINEXE 13012
+#define IDS_MUI_ERR_BITMAP 13013
+#define IDS_MUI_ERR_ELEVATED_RIGHTS 13014
+#define IDS_MUI_WARN_LOAD_BIG_FILE 13015
+#define IDS_MUI_ERR_FILE_TOO_LARGE 13016
+#define IDS_MUI_WARN_UNKNOWN_EXT 13017
// keep order (CRLF(0), CR(1), LF(2))
-#define IDS_MUI_EOLMODENAME_CRLF 13018
-#define IDS_MUI_EOLMODENAME_CR 13019
-#define IDS_MUI_EOLMODENAME_LF 13020
-#define IDS_MUI_INF_PRSVFILEMODTM 13021
+#define IDS_MUI_EOLMODENAME_CRLF 13020
+#define IDS_MUI_EOLMODENAME_CR 13021
+#define IDS_MUI_EOLMODENAME_LF 13022
+#define IDS_MUI_INF_PRSVFILEMODTM 13023
#define IDS_MUI_SELRECT 14000
#define IDS_MUI_BUFFERTOOSMALL 14001
diff --git a/language/np3_af_za/menu_af_za.rc b/language/np3_af_za/menu_af_za.rc
index 39f02a6e5..5a3161690 100644
--- a/language/np3_af_za/menu_af_za.rc
+++ b/language/np3_af_za/menu_af_za.rc
@@ -308,6 +308,8 @@ BEGIN
MENUITEM "Verv&ang...\tCtrl+H", IDM_EDIT_REPLACE
MENUITEM "Vervang Volge&nde\tF4", IDM_EDIT_REPLACENEXT
MENUITEM "&Gaan na...\tCtrl+G", IDM_EDIT_GOTOLINE
+ MENUITEM SEPARATOR
+ MENUITEM "&Search in Files\tCtrl+Alt+F", IDM_GREP_WIN_SEARCH
END
END
POPUP "&Aansig"
diff --git a/language/np3_af_za/strings_af_za.rc b/language/np3_af_za/strings_af_za.rc
index f952b27b2..5d9efe7b6 100644
--- a/language/np3_af_za/strings_af_za.rc
+++ b/language/np3_af_za/strings_af_za.rc
@@ -127,6 +127,7 @@ BEGIN
IDS_MUI_ERR_LOADFILE "Kon nie ""%s"" laai nie."
IDS_MUI_ERR_SAVEFILE "Kon nie ""%s"" stoor nie."
IDS_MUI_ERR_BROWSE "Geen lêerblaaier plugin is gevind nie.\nDie MiniPath-lêerblaaier plugin kan afgelaai word vanaf https://www.rizonesoft.com."
+ IDS_MUI_ERR_GREPWIN "No file search plugin was found.\nThe grepWinNP3 file search plugin can be downloaded from https://rizonesoft.com."
IDS_MUI_ERR_MRUDLG "Geen toegang tot die gekose lêer nie!\nWil jy dit uit die lys verwyder?"
IDS_MUI_ERR_CREATELINK "Kon nie die Desktop skakel skep nie."
IDS_MUI_ERR_PREVWINDISABLED
diff --git a/language/np3_be_by/menu_be_by.rc b/language/np3_be_by/menu_be_by.rc
index bd2862225..eb5f4b17d 100644
--- a/language/np3_be_by/menu_be_by.rc
+++ b/language/np3_be_by/menu_be_by.rc
@@ -308,6 +308,8 @@ BEGIN
MENUITEM "&Замяніць...\tCtrl+H", IDM_EDIT_REPLACE
MENUITEM "За&мяніць далей\tF4", IDM_EDIT_REPLACENEXT
MENUITEM "Пе&райсці...\tCtrl+G", IDM_EDIT_GOTOLINE
+ MENUITEM SEPARATOR
+ MENUITEM "&Search in Files\tCtrl+Alt+F", IDM_GREP_WIN_SEARCH
END
END
POPUP "&Выгляд"
diff --git a/language/np3_be_by/strings_be_by.rc b/language/np3_be_by/strings_be_by.rc
index 0b4f9b9bd..f152c30e1 100644
--- a/language/np3_be_by/strings_be_by.rc
+++ b/language/np3_be_by/strings_be_by.rc
@@ -127,6 +127,7 @@ BEGIN
IDS_MUI_ERR_LOADFILE "Памылка чытання «%s»."
IDS_MUI_ERR_SAVEFILE "Памылка захоўвання «%s»."
IDS_MUI_ERR_BROWSE "Не знойдзены плагін аглядніка файлаў.\nПлагін MiniPath можна спампаваць з сайта https://rizonesoft.com."
+ IDS_MUI_ERR_GREPWIN "No file search plugin was found.\nThe grepWinNP3 file search plugin can be downloaded from https://rizonesoft.com."
IDS_MUI_ERR_MRUDLG "Няма доступа да выбранага файла!\nХочаце выдаліць яго са спіску?"
IDS_MUI_ERR_CREATELINK "Памылка стварэння цэтліка на Працоўным стале."
IDS_MUI_ERR_PREVWINDISABLED
diff --git a/language/np3_de_de/menu_de_de.rc b/language/np3_de_de/menu_de_de.rc
index 09c311ae0..d43c4fb70 100644
--- a/language/np3_de_de/menu_de_de.rc
+++ b/language/np3_de_de/menu_de_de.rc
@@ -308,6 +308,8 @@ BEGIN
MENUITEM "&Ersetze...\tCtrl+H", IDM_EDIT_REPLACE
MENUITEM "Ersetze Nächstes\tF4", IDM_EDIT_REPLACENEXT
MENUITEM "&Gehe zu...\tCtrl+G", IDM_EDIT_GOTOLINE
+ MENUITEM SEPARATOR
+ MENUITEM "Suche in &Dateien\tCtrl+Alt+F", IDM_GREP_WIN_SEARCH
END
END
POPUP "&Ansicht"
diff --git a/language/np3_de_de/strings_de_de.rc b/language/np3_de_de/strings_de_de.rc
index ebe506a32..60135d9fa 100644
--- a/language/np3_de_de/strings_de_de.rc
+++ b/language/np3_de_de/strings_de_de.rc
@@ -126,7 +126,8 @@ STRINGTABLE
BEGIN
IDS_MUI_ERR_LOADFILE "Fehler beim laden ""%s""."
IDS_MUI_ERR_SAVEFILE "Fehler beim speichern ""%s""."
- IDS_MUI_ERR_BROWSE "Kein Datei-Browser-Plugin gefunden.\nDer MiniPath Datei-Browser-Plugin kann hier https://rizonesoft.com herunter geladen werden."
+ IDS_MUI_ERR_BROWSE "Kein Datei-Browser-Plugin gefunden.\nDas MiniPath Datei-Browser-Plugin kann hier https://rizonesoft.com herunter geladen werden."
+ IDS_MUI_ERR_GREPWIN "Kein Datei-Suchen-Plugin gefunden.\nDas grepWinNP3 Datei-Suchen-Plugin kann hier https://rizonesoft.com herunter geladen werden."
IDS_MUI_ERR_MRUDLG "Es kann nicht auf die ausgewählte Datei zugegriffen werden!\nMöchtest Du den Eintrag aus der Liste entfernen?"
IDS_MUI_ERR_CREATELINK "Fehler beim erzeugen des Desktop-Links."
IDS_MUI_ERR_PREVWINDISABLED
diff --git a/language/np3_en_gb/menu_en_gb.rc b/language/np3_en_gb/menu_en_gb.rc
index e185a21c4..128e5441b 100644
--- a/language/np3_en_gb/menu_en_gb.rc
+++ b/language/np3_en_gb/menu_en_gb.rc
@@ -308,6 +308,8 @@ BEGIN
MENUITEM "&Replace...\tCtrl+H", IDM_EDIT_REPLACE
MENUITEM "Replace Ne&xt\tF4", IDM_EDIT_REPLACENEXT
MENUITEM "&Goto...\tCtrl+G", IDM_EDIT_GOTOLINE
+ MENUITEM SEPARATOR
+ MENUITEM "&Search in Files\tCtrl+Alt+F", IDM_GREP_WIN_SEARCH
END
END
POPUP "&View"
diff --git a/language/np3_en_gb/strings_en_gb.rc b/language/np3_en_gb/strings_en_gb.rc
index ebb633967..d8e5c8c9d 100644
--- a/language/np3_en_gb/strings_en_gb.rc
+++ b/language/np3_en_gb/strings_en_gb.rc
@@ -127,6 +127,7 @@ BEGIN
IDS_MUI_ERR_LOADFILE "Error loading ""%s""."
IDS_MUI_ERR_SAVEFILE "Error saving ""%s""."
IDS_MUI_ERR_BROWSE "No file browser plugin was found.\nThe MiniPath file browser plugin can be downloaded from https://rizonesoft.com."
+ IDS_MUI_ERR_GREPWIN "No file search plugin was found.\nThe grepWinNP3 file search plugin can be downloaded from https://rizonesoft.com."
IDS_MUI_ERR_MRUDLG "No access to the selected file!\nWould you like to remove it from the list?"
IDS_MUI_ERR_CREATELINK "Error creating the Desktop link."
IDS_MUI_ERR_PREVWINDISABLED
diff --git a/language/np3_en_us/menu_en_us.rc b/language/np3_en_us/menu_en_us.rc
index c006745f6..678e3f12c 100644
--- a/language/np3_en_us/menu_en_us.rc
+++ b/language/np3_en_us/menu_en_us.rc
@@ -308,6 +308,8 @@ BEGIN
MENUITEM "&Replace...\tCtrl+H", IDM_EDIT_REPLACE
MENUITEM "Replace Ne&xt\tF4", IDM_EDIT_REPLACENEXT
MENUITEM "&Goto...\tCtrl+G", IDM_EDIT_GOTOLINE
+ MENUITEM SEPARATOR
+ MENUITEM "&Search in Files\tCtrl+Alt+F", IDM_GREP_WIN_SEARCH
END
END
POPUP "&View"
diff --git a/language/np3_en_us/strings_en_us.rc b/language/np3_en_us/strings_en_us.rc
index 64a0a7968..54b58bf7b 100644
--- a/language/np3_en_us/strings_en_us.rc
+++ b/language/np3_en_us/strings_en_us.rc
@@ -127,6 +127,7 @@ BEGIN
IDS_MUI_ERR_LOADFILE "Error loading ""%s""."
IDS_MUI_ERR_SAVEFILE "Error saving ""%s""."
IDS_MUI_ERR_BROWSE "No file browser plugin was found.\nThe MiniPath file browser plugin can be downloaded from https://rizonesoft.com."
+ IDS_MUI_ERR_GREPWIN "No file search plugin was found.\nThe grepWinNP3 file search plugin can be downloaded from https://rizonesoft.com."
IDS_MUI_ERR_MRUDLG "No access to the selected file!\nWould you like to remove it from the list?"
IDS_MUI_ERR_CREATELINK "Error creating the Desktop link."
IDS_MUI_ERR_PREVWINDISABLED
diff --git a/language/np3_es_es/menu_es_es.rc b/language/np3_es_es/menu_es_es.rc
index 050845181..1719ff1d2 100644
--- a/language/np3_es_es/menu_es_es.rc
+++ b/language/np3_es_es/menu_es_es.rc
@@ -308,6 +308,8 @@ BEGIN
MENUITEM "&Reemplazar...\tCtrl+H", IDM_EDIT_REPLACE
MENUITEM "Ree&mplazar siguiente\tF4", IDM_EDIT_REPLACENEXT
MENUITEM "&Ir a...\tCtrl+G", IDM_EDIT_GOTOLINE
+ MENUITEM SEPARATOR
+ MENUITEM "&Search in Files\tCtrl+Alt+F", IDM_GREP_WIN_SEARCH
END
END
POPUP "&Vista"
diff --git a/language/np3_es_es/strings_es_es.rc b/language/np3_es_es/strings_es_es.rc
index c6eabb7c0..d0d553dfa 100644
--- a/language/np3_es_es/strings_es_es.rc
+++ b/language/np3_es_es/strings_es_es.rc
@@ -127,6 +127,7 @@ BEGIN
IDS_MUI_ERR_LOADFILE "Error cargando ""%s""."
IDS_MUI_ERR_SAVEFILE "Error guardando ""%s""."
IDS_MUI_ERR_BROWSE "No se encontró plug-in para el navegador de archivos.\nEl plug-in de navegador de archivos MiniPath se puede descargar desde https://rizonesoft.com."
+ IDS_MUI_ERR_GREPWIN "No file search plugin was found.\nThe grepWinNP3 file search plugin can be downloaded from https://rizonesoft.com."
IDS_MUI_ERR_MRUDLG "¡No hay acceso al archivo seleccionado!\n¿Desea eliminarlo de la lista?"
IDS_MUI_ERR_CREATELINK "Error al crear el enlace de escritorio."
IDS_MUI_ERR_PREVWINDISABLED
diff --git a/language/np3_fr_fr/menu_fr_fr.rc b/language/np3_fr_fr/menu_fr_fr.rc
index 2c320b704..8104e9807 100644
--- a/language/np3_fr_fr/menu_fr_fr.rc
+++ b/language/np3_fr_fr/menu_fr_fr.rc
@@ -308,6 +308,8 @@ BEGIN
MENUITEM "&Remplacer...\tCtrl+H", IDM_EDIT_REPLACE
MENUITEM "Remplacer suivan&t\tF4", IDM_EDIT_REPLACENEXT
MENUITEM "&Aller à...\tCtrl+G", IDM_EDIT_GOTOLINE
+ MENUITEM SEPARATOR
+ MENUITEM "&Search in Files\tCtrl+Alt+F", IDM_GREP_WIN_SEARCH
END
END
POPUP "&Affichage"
diff --git a/language/np3_fr_fr/strings_fr_fr.rc b/language/np3_fr_fr/strings_fr_fr.rc
index abb5b0138..94891cf6e 100644
--- a/language/np3_fr_fr/strings_fr_fr.rc
+++ b/language/np3_fr_fr/strings_fr_fr.rc
@@ -127,6 +127,7 @@ BEGIN
IDS_MUI_ERR_LOADFILE "Erreur de chargement ""%s""."
IDS_MUI_ERR_SAVEFILE "Erreur de sauvegarde ""%s""."
IDS_MUI_ERR_BROWSE "Aucun plugin de navigateur de fichiers n'a été trouvé.\nLe plugin du navigateur de fichiers MiniPath peut être téléchargé à partir de https://rizonesoft.com."
+ IDS_MUI_ERR_GREPWIN "No file search plugin was found.\nThe grepWinNP3 file search plugin can be downloaded from https://rizonesoft.com."
IDS_MUI_ERR_MRUDLG "Pas d'accès au fichier sélectionné!\nVoulez-vous le supprimer de la liste?"
IDS_MUI_ERR_CREATELINK "Erreur lors de la création du lien du bureau."
IDS_MUI_ERR_PREVWINDISABLED
diff --git a/language/np3_hu_hu/menu_hu_hu.rc b/language/np3_hu_hu/menu_hu_hu.rc
index 380df9480..2ebe20199 100644
--- a/language/np3_hu_hu/menu_hu_hu.rc
+++ b/language/np3_hu_hu/menu_hu_hu.rc
@@ -308,6 +308,8 @@ BEGIN
MENUITEM "&Csere...\tCtrl+H", IDM_EDIT_REPLACE
MENUITEM "Következő cse&réje\tF4", IDM_EDIT_REPLACENEXT
MENUITEM "&Ugrás...\tCtrl+G", IDM_EDIT_GOTOLINE
+ MENUITEM SEPARATOR
+ MENUITEM "&Search in Files\tCtrl+Alt+F", IDM_GREP_WIN_SEARCH
END
END
POPUP "&Nézet"
diff --git a/language/np3_hu_hu/strings_hu_hu.rc b/language/np3_hu_hu/strings_hu_hu.rc
index b809d86f3..2069b8b8a 100644
--- a/language/np3_hu_hu/strings_hu_hu.rc
+++ b/language/np3_hu_hu/strings_hu_hu.rc
@@ -127,6 +127,7 @@ BEGIN
IDS_MUI_ERR_LOADFILE "Hiba ""%s"" betöltésekor."
IDS_MUI_ERR_SAVEFILE "Hiba ""%s"" mentésekor."
IDS_MUI_ERR_BROWSE "Fájlböngésző plugin nem található.\nA MiniPath fájlböngésző plugin letölthető a https://rizonesoft.com címről."
+ IDS_MUI_ERR_GREPWIN "No file search plugin was found.\nThe grepWinNP3 file search plugin can be downloaded from https://rizonesoft.com."
IDS_MUI_ERR_MRUDLG "A kijelölt fájlhoz nincs hozzáférésünk!\nEl szeretné távolítani a listából?"
IDS_MUI_ERR_CREATELINK "Hiba az asztali parancsikon létrehozásakor."
IDS_MUI_ERR_PREVWINDISABLED
diff --git a/language/np3_it_it/menu_it_it.rc b/language/np3_it_it/menu_it_it.rc
index f7807c7c1..d7972f904 100644
--- a/language/np3_it_it/menu_it_it.rc
+++ b/language/np3_it_it/menu_it_it.rc
@@ -308,6 +308,8 @@ BEGIN
MENUITEM "&Sostituisci...\tCtrl+H", IDM_EDIT_REPLACE
MENUITEM "Sostituisci successivo\tF4", IDM_EDIT_REPLACENEXT
MENUITEM "&Vai a...\tCtrl+G", IDM_EDIT_GOTOLINE
+ MENUITEM SEPARATOR
+ MENUITEM "&Search in Files\tCtrl+Alt+F", IDM_GREP_WIN_SEARCH
END
END
POPUP "&Visualizza"
diff --git a/language/np3_it_it/strings_it_it.rc b/language/np3_it_it/strings_it_it.rc
index edbc7a2e5..00907890d 100644
--- a/language/np3_it_it/strings_it_it.rc
+++ b/language/np3_it_it/strings_it_it.rc
@@ -127,6 +127,7 @@ BEGIN
IDS_MUI_ERR_LOADFILE "Errore aprendo ""%s""."
IDS_MUI_ERR_SAVEFILE "Errore salvando ""%s""."
IDS_MUI_ERR_BROWSE "Nessun plugin file browser trovato.\nMiniPath può essere scaricato su https://rizonesoft.com."
+ IDS_MUI_ERR_GREPWIN "No file search plugin was found.\nThe grepWinNP3 file search plugin can be downloaded from https://rizonesoft.com."
IDS_MUI_ERR_MRUDLG "Nessun accesso al file selezionato!\nVuoi rimuoverlo dalla lista?"
IDS_MUI_ERR_CREATELINK "Errore nella creazione del collegamento su Desktop."
IDS_MUI_ERR_PREVWINDISABLED
diff --git a/language/np3_ja_jp/menu_ja_jp.rc b/language/np3_ja_jp/menu_ja_jp.rc
index 1b84f3922..834b0dfa3 100644
--- a/language/np3_ja_jp/menu_ja_jp.rc
+++ b/language/np3_ja_jp/menu_ja_jp.rc
@@ -299,15 +299,17 @@ BEGIN
MENUITEM SEPARATOR
POPUP "検索(&S)"
BEGIN
- MENUITEM "検索(&F)...\tCtrl+F", IDM_EDIT_FIND
- MENUITEM "検索文字列候補に追加\tAlt+F3", IDM_EDIT_SAVEFIND
+ MENUITEM "検索(&F)...\tCtrl+F", IDM_EDIT_FIND
+ MENUITEM "検索文字列候補に追加\tAlt+F3", IDM_EDIT_SAVEFIND
MENUITEM "次を検索(&X)\tF3", IDM_EDIT_FINDNEXT
MENUITEM "前へ検索(&V)\tShift+F3", IDM_EDIT_FINDPREV
MENUITEM "選択部分で次を検索\tCtrl+F3", CMD_FINDNEXTSEL
MENUITEM "選択部分で前へ検索\tCtrl+Shift+F3", CMD_FINDPREVSEL
MENUITEM "置換(&R)...\tCtrl+H", IDM_EDIT_REPLACE
MENUITEM "置換し次へ(&X)\tF4", IDM_EDIT_REPLACENEXT
- MENUITEM "指定行へジャンプ(&G)...\tCtrl+G", IDM_EDIT_GOTOLINE
+ MENUITEM "指定行へジャンプ(&G)...\tCtrl+G", IDM_EDIT_GOTOLINE
+ MENUITEM SEPARATOR
+ MENUITEM "&Search in Files\tCtrl+Alt+F", IDM_GREP_WIN_SEARCH
END
END
POPUP "表示(&V)"
diff --git a/language/np3_ja_jp/strings_ja_jp.rc b/language/np3_ja_jp/strings_ja_jp.rc
index ffb8539e8..5fc520e6f 100644
--- a/language/np3_ja_jp/strings_ja_jp.rc
+++ b/language/np3_ja_jp/strings_ja_jp.rc
@@ -127,6 +127,7 @@ BEGIN
IDS_MUI_ERR_LOADFILE "読み込み失敗 ""%s"""
IDS_MUI_ERR_SAVEFILE "保存失敗 ""%s"""
IDS_MUI_ERR_BROWSE "ファイルブラウザプラグインがありません。\nこのプラグイン MiniPath は https://rizonesoft.com からダウンロードできます。"
+ IDS_MUI_ERR_GREPWIN "No file search plugin was found.\nThe grepWinNP3 file search plugin can be downloaded from https://rizonesoft.com."
IDS_MUI_ERR_MRUDLG "選択したファイルにアクセスできません。\n一覧から除去しますか？"
IDS_MUI_ERR_CREATELINK "デスクトップへのショートカット作成時にエラーが発生しました。"
IDS_MUI_ERR_PREVWINDISABLED
diff --git a/language/np3_ko_kr/menu_ko_kr.rc b/language/np3_ko_kr/menu_ko_kr.rc
index 34b107262..e325f705c 100644
--- a/language/np3_ko_kr/menu_ko_kr.rc
+++ b/language/np3_ko_kr/menu_ko_kr.rc
@@ -300,14 +300,16 @@ BEGIN
POPUP "찾기(&S)"
BEGIN
MENUITEM "찾기(&F)...\tCtrl+F", IDM_EDIT_FIND
- MENUITEM "검색어로 지정\tAlt+F3", IDM_EDIT_SAVEFIND
+ MENUITEM "검색어로 지정\tAlt+F3", IDM_EDIT_SAVEFIND
MENUITEM "다음 찾기(&X)\tF3", IDM_EDIT_FINDNEXT
MENUITEM "이전 찾기(&V)\tShift+F3", IDM_EDIT_FINDPREV
- MENUITEM "다음 선택 찾기\tCtrl+F3", CMD_FINDNEXTSEL
- MENUITEM "이전 선택 찾기\tCtrl+Shift+F3", CMD_FINDPREVSEL
- MENUITEM "바꾸기(&R)...\tCtrl+H", IDM_EDIT_REPLACE
- MENUITEM "다음 바꾸기(&X)\tF4", IDM_EDIT_REPLACENEXT
+ MENUITEM "다음 선택 찾기\tCtrl+F3", CMD_FINDNEXTSEL
+ MENUITEM "이전 선택 찾기\tCtrl+Shift+F3", CMD_FINDPREVSEL
+ MENUITEM "바꾸기(&R)...\tCtrl+H", IDM_EDIT_REPLACE
+ MENUITEM "다음 바꾸기(&X)\tF4", IDM_EDIT_REPLACENEXT
MENUITEM "바로가기(&G)...\tCtrl+G", IDM_EDIT_GOTOLINE
+ MENUITEM SEPARATOR
+ MENUITEM "&Search in Files\tCtrl+Alt+F", IDM_GREP_WIN_SEARCH
END
END
POPUP "보기(&V)"
diff --git a/language/np3_ko_kr/strings_ko_kr.rc b/language/np3_ko_kr/strings_ko_kr.rc
index e97eb99e4..3cdf39e25 100644
--- a/language/np3_ko_kr/strings_ko_kr.rc
+++ b/language/np3_ko_kr/strings_ko_kr.rc
@@ -127,6 +127,7 @@ BEGIN
IDS_MUI_ERR_LOADFILE """%s"" 파일을 읽는 도중 오류가 발생하였습니다."
IDS_MUI_ERR_SAVEFILE """%s"" 파일을 저장하는 도중 오류가 발생하였습니다."
IDS_MUI_ERR_BROWSE "파일 브라우저 플러그인을 찾을 수 없습니다.\nMiniPath 파일 브라우저 플러그인은 https://rizonesoft.com에서 다운로드 할 수 있습니다."
+ IDS_MUI_ERR_GREPWIN "No file search plugin was found.\nThe grepWinNP3 file search plugin can be downloaded from https://rizonesoft.com."
IDS_MUI_ERR_MRUDLG "선택한 파일에 접근할 수 없습니다!\n목록에서 제거할까요?"
IDS_MUI_ERR_CREATELINK "데스크톱 링크를 만드는 중에 오류가 발생하였습니다."
IDS_MUI_ERR_PREVWINDISABLED
diff --git a/language/np3_nl_nl/menu_nl_nl.rc b/language/np3_nl_nl/menu_nl_nl.rc
index c67af59f2..56576baec 100644
--- a/language/np3_nl_nl/menu_nl_nl.rc
+++ b/language/np3_nl_nl/menu_nl_nl.rc
@@ -308,6 +308,8 @@ BEGIN
MENUITEM "&Vervangen...\tCtrl+H", IDM_EDIT_REPLACE
MENUITEM "Vervangen volgen&de\tF4", IDM_EDIT_REPLACENEXT
MENUITEM "&Ga naar...\tCtrl+G", IDM_EDIT_GOTOLINE
+ MENUITEM SEPARATOR
+ MENUITEM "&Search in Files\tCtrl+Alt+F", IDM_GREP_WIN_SEARCH
END
END
POPUP "Beel&d"
diff --git a/language/np3_nl_nl/strings_nl_nl.rc b/language/np3_nl_nl/strings_nl_nl.rc
index eab8516ac..b9d726990 100644
--- a/language/np3_nl_nl/strings_nl_nl.rc
+++ b/language/np3_nl_nl/strings_nl_nl.rc
@@ -127,6 +127,7 @@ BEGIN
IDS_MUI_ERR_LOADFILE "Fout bij laden ""%s""."
IDS_MUI_ERR_SAVEFILE "Fout bij bewaren ""%s""."
IDS_MUI_ERR_BROWSE "Geen plugin voor bestandsbrowser gevonden.\nDe plugin voor de MiniPath bestandsbrowser kan worden gedownload van https://rizonesoft.com."
+ IDS_MUI_ERR_GREPWIN "No file search plugin was found.\nThe grepWinNP3 file search plugin can be downloaded from https://rizonesoft.com."
IDS_MUI_ERR_MRUDLG "Geen toegang tot het geselecteerde bestand!\nWilt u het uit de lijst verwijderen?"
IDS_MUI_ERR_CREATELINK "Fout bij het maken van de bureaubladkoppeling."
IDS_MUI_ERR_PREVWINDISABLED
diff --git a/language/np3_pl_pl/menu_pl_pl.rc b/language/np3_pl_pl/menu_pl_pl.rc
index 0363b0b8c..9c9e2e963 100644
--- a/language/np3_pl_pl/menu_pl_pl.rc
+++ b/language/np3_pl_pl/menu_pl_pl.rc
@@ -308,6 +308,8 @@ BEGIN
MENUITEM "&Zamień...\tCtrl+H", IDM_EDIT_REPLACE
MENUITEM "Zamień następny\tF4", IDM_EDIT_REPLACENEXT
MENUITEM "&Przejdź do wiersza...\tCtrl+G", IDM_EDIT_GOTOLINE
+ MENUITEM SEPARATOR
+ MENUITEM "&Search in Files\tCtrl+Alt+F", IDM_GREP_WIN_SEARCH
END
END
POPUP "&Widok"
diff --git a/language/np3_pl_pl/strings_pl_pl.rc b/language/np3_pl_pl/strings_pl_pl.rc
index 8a4758f51..812e0d7cb 100644
--- a/language/np3_pl_pl/strings_pl_pl.rc
+++ b/language/np3_pl_pl/strings_pl_pl.rc
@@ -127,6 +127,7 @@ BEGIN
IDS_MUI_ERR_LOADFILE "Błąd podczas ładowania ""%s""."
IDS_MUI_ERR_SAVEFILE "Błąd podczas zapisu ""%s""."
IDS_MUI_ERR_BROWSE "Nie znaleziono wtyczki przeglądarki pliku.\nWtyczkę przeglądarki pliku do MiniPath można pobrać z https://rizonesoft.com."
+ IDS_MUI_ERR_GREPWIN "No file search plugin was found.\nThe grepWinNP3 file search plugin can be downloaded from https://rizonesoft.com."
IDS_MUI_ERR_MRUDLG "Brak dostępu do wybranego pliku!\nCzy chcesz usunąć go z listy?"
IDS_MUI_ERR_CREATELINK "Błąd podczas tworzenia skrótu na Pulpicie."
IDS_MUI_ERR_PREVWINDISABLED
diff --git a/language/np3_pt_br/menu_pt_br.rc b/language/np3_pt_br/menu_pt_br.rc
index 810e0c61e..470121d1a 100644
--- a/language/np3_pt_br/menu_pt_br.rc
+++ b/language/np3_pt_br/menu_pt_br.rc
@@ -308,6 +308,8 @@ BEGIN
MENUITEM "&Substituir...\tCtrl+H", IDM_EDIT_REPLACE
MENUITEM "Substituir Pró&ximo\tF4", IDM_EDIT_REPLACENEXT
MENUITEM "&Ir para...\tCtrl+G", IDM_EDIT_GOTOLINE
+ MENUITEM SEPARATOR
+ MENUITEM "&Search in Files\tCtrl+Alt+F", IDM_GREP_WIN_SEARCH
END
END
POPUP "&Vizualizar"
diff --git a/language/np3_pt_br/strings_pt_br.rc b/language/np3_pt_br/strings_pt_br.rc
index f720a4460..8e403fadc 100644
--- a/language/np3_pt_br/strings_pt_br.rc
+++ b/language/np3_pt_br/strings_pt_br.rc
@@ -127,6 +127,7 @@ BEGIN
IDS_MUI_ERR_LOADFILE "Error loading ""%s""."
IDS_MUI_ERR_SAVEFILE "Error saving ""%s""."
IDS_MUI_ERR_BROWSE "No file browser plugin was found.\nThe MiniPath file browser plugin can be downloaded from https://rizonesoft.com."
+ IDS_MUI_ERR_GREPWIN "No file search plugin was found.\nThe grepWinNP3 file search plugin can be downloaded from https://rizonesoft.com."
IDS_MUI_ERR_MRUDLG "No access to the selected file!\nWould you like to remove it from the list?"
IDS_MUI_ERR_CREATELINK "Error creating the Desktop link."
IDS_MUI_ERR_PREVWINDISABLED
diff --git a/language/np3_ru_ru/menu_ru_ru.rc b/language/np3_ru_ru/menu_ru_ru.rc
index 41ea510d3..4463bbf96 100644
--- a/language/np3_ru_ru/menu_ru_ru.rc
+++ b/language/np3_ru_ru/menu_ru_ru.rc
@@ -308,6 +308,8 @@ BEGIN
MENUITEM "&Заменить...\tCtrl+H", IDM_EDIT_REPLACE
MENUITEM "За&менить далее\tF4", IDM_EDIT_REPLACENEXT
MENUITEM "Пе&рейти...\tCtrl+G", IDM_EDIT_GOTOLINE
+ MENUITEM SEPARATOR
+ MENUITEM "&Search in Files\tCtrl+Alt+F", IDM_GREP_WIN_SEARCH
END
END
POPUP "&Вид"
diff --git a/language/np3_ru_ru/strings_ru_ru.rc b/language/np3_ru_ru/strings_ru_ru.rc
index 52a2cff58..f50ae4ad3 100644
--- a/language/np3_ru_ru/strings_ru_ru.rc
+++ b/language/np3_ru_ru/strings_ru_ru.rc
@@ -127,6 +127,7 @@ BEGIN
IDS_MUI_ERR_LOADFILE "Ошибка загрузки «%s»."
IDS_MUI_ERR_SAVEFILE "Ошибка сохранения «%s»."
IDS_MUI_ERR_BROWSE "Не найден плагин браузера файлов.\nПлагин MiniPath можно загрузить с сайта https://rizonesoft.com."
+ IDS_MUI_ERR_GREPWIN "No file search plugin was found.\nThe grepWinNP3 file search plugin can be downloaded from https://rizonesoft.com."
IDS_MUI_ERR_MRUDLG "Нет доступа к выбранному файлу!\nХотите удалить его из списка?"
IDS_MUI_ERR_CREATELINK "Ошибка создания ярлыка на Рабочем столе."
IDS_MUI_ERR_PREVWINDISABLED
diff --git a/language/np3_sk_sk/menu_sk_sk.rc b/language/np3_sk_sk/menu_sk_sk.rc
index b4d77ee64..fb1a43eef 100644
--- a/language/np3_sk_sk/menu_sk_sk.rc
+++ b/language/np3_sk_sk/menu_sk_sk.rc
@@ -308,6 +308,8 @@ BEGIN
MENUITEM "&Replace...\tCtrl+H", IDM_EDIT_REPLACE
MENUITEM "Replace Ne&xt\tF4", IDM_EDIT_REPLACENEXT
MENUITEM "&Goto...\tCtrl+G", IDM_EDIT_GOTOLINE
+ MENUITEM SEPARATOR
+ MENUITEM "&Search in Files\tCtrl+Alt+F", IDM_GREP_WIN_SEARCH
END
END
POPUP "&View"
diff --git a/language/np3_sk_sk/strings_sk_sk.rc b/language/np3_sk_sk/strings_sk_sk.rc
index a666f4f5c..ab495b3a5 100644
--- a/language/np3_sk_sk/strings_sk_sk.rc
+++ b/language/np3_sk_sk/strings_sk_sk.rc
@@ -127,6 +127,7 @@ BEGIN
IDS_MUI_ERR_LOADFILE "Error loading ""%s""."
IDS_MUI_ERR_SAVEFILE "Error saving ""%s""."
IDS_MUI_ERR_BROWSE "No file browser plugin was found.\nThe MiniPath file browser plugin can be downloaded from https://rizonesoft.com."
+ IDS_MUI_ERR_GREPWIN "No file search plugin was found.\nThe grepWinNP3 file search plugin can be downloaded from https://rizonesoft.com."
IDS_MUI_ERR_MRUDLG "No access to the selected file!\nWould you like to remove it from the list?"
IDS_MUI_ERR_CREATELINK "Error creating the Desktop link."
IDS_MUI_ERR_PREVWINDISABLED
diff --git a/language/np3_sv_se/menu_sv_se.rc b/language/np3_sv_se/menu_sv_se.rc
index 94e265341..a40157fe3 100644
--- a/language/np3_sv_se/menu_sv_se.rc
+++ b/language/np3_sv_se/menu_sv_se.rc
@@ -308,6 +308,8 @@ BEGIN
MENUITEM "Ersätt...\tCtrl+H", IDM_EDIT_REPLACE
MENUITEM "Ersätt nästa\tF4", IDM_EDIT_REPLACENEXT
MENUITEM "Gå till...\tCtrl+G", IDM_EDIT_GOTOLINE
+ MENUITEM SEPARATOR
+ MENUITEM "&Search in Files\tCtrl+Alt+F", IDM_GREP_WIN_SEARCH
END
END
POPUP "Visa"
diff --git a/language/np3_sv_se/strings_sv_se.rc b/language/np3_sv_se/strings_sv_se.rc
index f50827907..d23c14cba 100644
--- a/language/np3_sv_se/strings_sv_se.rc
+++ b/language/np3_sv_se/strings_sv_se.rc
@@ -127,6 +127,7 @@ BEGIN
IDS_MUI_ERR_LOADFILE "Fel vid laddning ""%s""."
IDS_MUI_ERR_SAVEFILE "Fel vid sparande ""%s""."
IDS_MUI_ERR_BROWSE "Inget plugin för filbläddring hittades.\nMinipath filbläddrare kan laddas ner från https://rizonesoft.com."
+ IDS_MUI_ERR_GREPWIN "No file search plugin was found.\nThe grepWinNP3 file search plugin can be downloaded from https://rizonesoft.com."
IDS_MUI_ERR_MRUDLG "Tillgång saknas för vald fil!\nVill du ta bort den från listan?"
IDS_MUI_ERR_CREATELINK "Fel vi skapande av skrivbordslänk."
IDS_MUI_ERR_PREVWINDISABLED
diff --git a/language/np3_tr_tr/menu_tr_tr.rc b/language/np3_tr_tr/menu_tr_tr.rc
index afb9696ca..6243bcf66 100644
--- a/language/np3_tr_tr/menu_tr_tr.rc
+++ b/language/np3_tr_tr/menu_tr_tr.rc
@@ -308,6 +308,8 @@ BEGIN
MENUITEM "&Replace...\tCtrl+H", IDM_EDIT_REPLACE
MENUITEM "Replace Ne&xt\tF4", IDM_EDIT_REPLACENEXT
MENUITEM "&Goto...\tCtrl+G", IDM_EDIT_GOTOLINE
+ MENUITEM SEPARATOR
+ MENUITEM "&Search in Files\tCtrl+Alt+F", IDM_GREP_WIN_SEARCH
END
END
POPUP "&View"
diff --git a/language/np3_tr_tr/strings_tr_tr.rc b/language/np3_tr_tr/strings_tr_tr.rc
index 777bd1beb..580a148fb 100644
--- a/language/np3_tr_tr/strings_tr_tr.rc
+++ b/language/np3_tr_tr/strings_tr_tr.rc
@@ -127,6 +127,7 @@ BEGIN
IDS_MUI_ERR_LOADFILE "Error loading ""%s""."
IDS_MUI_ERR_SAVEFILE "Error saving ""%s""."
IDS_MUI_ERR_BROWSE "No file browser plugin was found.\nThe MiniPath file browser plugin can be downloaded from https://rizonesoft.com."
+ IDS_MUI_ERR_GREPWIN "No file search plugin was found.\nThe grepWinNP3 file search plugin can be downloaded from https://rizonesoft.com."
IDS_MUI_ERR_MRUDLG "No access to the selected file!\nWould you like to remove it from the list?"
IDS_MUI_ERR_CREATELINK "Error creating the Desktop link."
IDS_MUI_ERR_PREVWINDISABLED
diff --git a/language/np3_zh_cn/menu_zh_cn.rc b/language/np3_zh_cn/menu_zh_cn.rc
index 15c6243ad..2ae092ea9 100644
--- a/language/np3_zh_cn/menu_zh_cn.rc
+++ b/language/np3_zh_cn/menu_zh_cn.rc
@@ -308,6 +308,8 @@ BEGIN
MENUITEM "替换(&R)...\tCtrl+H", IDM_EDIT_REPLACE
MENUITEM "替换下一个(&X)\tF4", IDM_EDIT_REPLACENEXT
MENUITEM "跳转到(&G)...\tCtrl+G", IDM_EDIT_GOTOLINE
+ MENUITEM SEPARATOR
+ MENUITEM "&Search in Files\tCtrl+Alt+F", IDM_GREP_WIN_SEARCH
END
END
POPUP "查看(&V)"
diff --git a/language/np3_zh_cn/strings_zh_cn.rc b/language/np3_zh_cn/strings_zh_cn.rc
index e95fcd9a5..d2c41aeab 100644
--- a/language/np3_zh_cn/strings_zh_cn.rc
+++ b/language/np3_zh_cn/strings_zh_cn.rc
@@ -127,6 +127,7 @@ BEGIN
IDS_MUI_ERR_LOADFILE "加载“%s”时遇到错误。"
IDS_MUI_ERR_SAVEFILE "保存“%s”时遇到错误。"
IDS_MUI_ERR_BROWSE "无可用文件浏览器插件。\n\nMiniPath 插件可以从 https://rizonesoft.com/ 下载。"
+ IDS_MUI_ERR_GREPWIN "No file search plugin was found.\nThe grepWinNP3 file search plugin can be downloaded from https://rizonesoft.com."
IDS_MUI_ERR_MRUDLG "指定的文件无法访问。它可能已被改名、删除或移动。\n\n从列表中删除它吗？"
IDS_MUI_ERR_CREATELINK "创建桌面快捷方式时遇到错误。"
IDS_MUI_ERR_PREVWINDISABLED
diff --git a/np3portableapp/build_np3portableapp.cmd b/np3portableapp/build_np3portableapp.cmd
index a7b861b22..e26f8fcf9 100644
--- a/np3portableapp/build_np3portableapp.cmd
+++ b/np3portableapp/build_np3portableapp.cmd
@@ -162,10 +162,10 @@ copy /B "%NP3_X64_DIR%\minipath.exe" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x64\" /Y
copy "%NP3_GREPWIN_DIR%\GPL_v3.0_LICENSE.txt" "%NP3_PORTAPP_DIR%\Other\Help\grepWin_GPL_v3.0_LICENSE.txt" /Y /V
mkdir "%NP3_PORTAPP_DIR%\App\Notepad3\x86\lng\gwLng"
-copy /B "%NP3_GREPWIN_DIR%\grepWinNP3_portable.exe" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x86\grepWinNP3_portable.exe" /Y /V
+copy /B "%NP3_GREPWIN_DIR%\grepWinNP3.exe" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x86\grepWinNP3.exe" /Y /V
copy /B "%NP3_GREPWIN_DIR%\*.lang" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x86\lng\gwLng\" /Y /V
mkdir "%NP3_PORTAPP_DIR%\App\Notepad3\x64\lng\gwLng"
-copy /B "%NP3_GREPWIN_DIR%\grepWinNP3_x64_portable.exe" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x64\grepWinNP3_portable.exe" /Y /V
+copy /B "%NP3_GREPWIN_DIR%\grepWinNP3_x64.exe" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x64\grepWinNP3.exe" /Y /V
copy /B "%NP3_GREPWIN_DIR%\*.lang" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x64\lng\gwLng\" /Y /V
:: --------------------------------------------------------------------------------------------------------------------
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index 626bb4329..f7e6bc804 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,7 +3,7 @@
Notepad3 NF
diff --git a/src/Dialogs.c b/src/Dialogs.c
index 7666b0b34..bcdccd5ae 100644
--- a/src/Dialogs.c
+++ b/src/Dialogs.c
@@ -3469,7 +3469,7 @@ static grepWin_t grepWinIniSettings[13] =
{ L"IncludeSubfolders", 1 },
{ L"IncludeSystem", 1 },
{ L"UseFileMatchRegex", 0 },
- { L"UseRegex", 1 },
+ { L"UseRegex", 0 },
{ L"UTF8", 1 }
};
@@ -3566,8 +3566,7 @@ void DialogGrepWin(HWND hwnd, LPCWSTR searchPattern)
}
}
- //~StringCchPrintf(tchTemp, COUNTOF(tchTemp), L"%s /g %%line%% /m %s - %%path%%", tchNotepad3Path, searchPattern);
- StringCchPrintf(tchTemp, COUNTOF(tchTemp), L"%s /g %%line%% - %%path%%", tchNotepad3Path);
+ StringCchPrintf(tchTemp, COUNTOF(tchTemp), L"%s /%%mode%% \"%%pattern%%\" /g %%line%% - %%path%%", tchNotepad3Path);
IniSectionSetString(L"global", L"editorcmd", tchTemp);
// [settings]
@@ -3576,29 +3575,33 @@ void DialogGrepWin(HWND hwnd, LPCWSTR searchPattern)
int const iBackupFolder = IniSectionSetInt(L"settings", L"backupinfolder", 1);
IniSectionSetInt(L"settings", L"backupinfolder", iBackupFolder);
+ // search pattern
+ IniSectionSetString(L"global", L"searchfor", searchPattern);
+
+ // search directory
+ WCHAR tchSearchDir[MAX_PATH] = { L'\0' };
+ if (StrIsNotEmpty(Globals.CurrentFile)) {
+ StringCchCopy(tchSearchDir, COUNTOF(tchSearchDir), Globals.CurrentFile);
+ PathCchRemoveFileSpec(tchSearchDir, COUNTOF(tchSearchDir));
+ }
+ else {
+ StringCchCopy(tchSearchDir, COUNTOF(tchSearchDir), Globals.WorkingDirectory);
+ }
+ IniSectionSetString(L"global", L"searchpath", tchSearchDir);
+
SaveIniFileCache(tchIniFilePath);
ResetIniFileCache();
}
}
- // search directory
- WCHAR tchSearchDir[MAX_PATH] = { L'\0' };
- if (StrIsNotEmpty(Globals.CurrentFile)) {
- StringCchCopy(tchSearchDir, COUNTOF(tchSearchDir), Globals.CurrentFile);
- PathCchRemoveFileSpec(tchSearchDir, COUNTOF(tchSearchDir));
- }
- else {
- StringCchCopy(tchSearchDir, COUNTOF(tchSearchDir), Globals.WorkingDirectory);
- }
-
// grepWin arguments
- const WCHAR* const tchParamFmt = L"/portable /content %s /inipath:\"%s\" /searchpath:\"%s\" /searchfor:\"%s\"";
- WCHAR tchParams[MAX_PATH * 2] = { L'\0' };
+ const WCHAR* const tchParamFmt = L"/portable /content %s /inipath:\"%s\"";
+ WCHAR tchParams[MAX_PATH + 80] = { L'\0' };
// relative grepwin.ini path (for shorter cmdline)
if (PathRelativePathTo(tchTemp, tchGrepWinDir, FILE_ATTRIBUTE_DIRECTORY, tchIniFilePath, FILE_ATTRIBUTE_NORMAL)) {
StringCchCopy(tchIniFilePath, COUNTOF(tchIniFilePath), tchTemp);
}
- StringCchPrintf(tchParams, COUNTOF(tchParams), tchParamFmt, tchOptions, tchIniFilePath, tchSearchDir, searchPattern);
+ StringCchPrintf(tchParams, COUNTOF(tchParams), tchParamFmt, tchOptions, tchIniFilePath);
//if (StrIsNotEmpty(searchPattern)) {
// SetClipboardTextW(hwnd, searchPattern, StringCchLen(searchPattern, 0));
//}
@@ -3616,7 +3619,7 @@ void DialogGrepWin(HWND hwnd, LPCWSTR searchPattern)
ShellExecuteEx(&sei);
if ((INT_PTR)sei.hInstApp < 32) {
- InfoBoxLng(MB_ICONWARNING, NULL, IDS_MUI_ERR_BROWSE);
+ InfoBoxLng(MB_ICONWARNING, NULL, IDS_MUI_ERR_GREPWIN);
}
}
diff --git a/src/Edit.c b/src/Edit.c
index 3d4142448..38ce6cb92 100644
--- a/src/Edit.c
+++ b/src/Edit.c
@@ -6625,6 +6625,12 @@ bool EditFindNext(HWND hwnd, LPCEDITFINDREPLACE lpefr, bool bExtendSelection, bo
if (!bSuppressNotFound) {
InfoBoxLng(MB_OK, L"MsgNotFound", IDS_MUI_NOTFOUND);
}
+ //@@@
+ WCHAR fnd[256];
+ WCHAR msg[256];
+ MultiByteToWideChar(CP_UTF8, 0, szFind, -1, fnd, (int)COUNTOF(fnd));
+ StringCchPrintf(msg, COUNTOF(msg), L"Suchbegriff:'%s'", fnd);
+ MsgBoxLastError(msg, 0);
return false;
}
diff --git a/src/Helpers.c b/src/Helpers.c
index 1d1a76494..19200b5f2 100644
--- a/src/Helpers.c
+++ b/src/Helpers.c
@@ -1221,6 +1221,8 @@ bool TrimStringW(LPWSTR lpString)
//
// ExtractFirstArgument()
//
+
+
bool ExtractFirstArgument(LPCWSTR lpArgs, LPWSTR lpArg1, LPWSTR lpArg2, int len)
{
StringCchCopy(lpArg1, len, lpArgs);
@@ -1240,6 +1242,10 @@ bool ExtractFirstArgument(LPCWSTR lpArgs, LPWSTR lpArg1, LPWSTR lpArg2, int len)
LPWSTR psz;
if (bQuoted) {
psz = StrChr(lpArg1, L'\"');
+ // skip esc'd quotes
+ while (psz && (psz[-1] == L'\\')) {
+ psz = StrChr(psz + 1, L'\"');
+ }
}
else {
psz = StrChr(lpArg1, L' ');
@@ -1251,6 +1257,7 @@ bool ExtractFirstArgument(LPCWSTR lpArgs, LPWSTR lpArg1, LPWSTR lpArg2, int len)
}
}
TrimSpcW(lpArg1);
+ UnSlashQuotes(lpArg1);
if (lpArg2) {
TrimSpcW(lpArg2);
@@ -1790,6 +1797,8 @@ size_t UnSlashA(LPSTR pchInOut, UINT cpEdit)
*o = '\t';
else if (*s == 'v')
*o = '\v';
+ else if (*s == '"')
+ *o = '"';
else if (*s == '\\')
*o = '\\';
else if (*s == 'x' || *s == 'u') {
@@ -1879,6 +1888,8 @@ size_t UnSlashW(LPWSTR pchInOut)
*o = L'\t';
else if (*s == L'v')
*o = L'\v';
+ else if (*s == L'"')
+ *o = L'"';
else if (*s == L'\\')
*o = L'\\';
else if (*s == L'x' || *s == L'u') {
@@ -1933,6 +1944,37 @@ size_t UnSlashW(LPWSTR pchInOut)
return (size_t)((ptrdiff_t)(o - sStart));
}
+
+size_t UnSlashQuotes(LPWSTR pchInOut)
+{
+ LPWSTR s = pchInOut;
+ LPWSTR o = pchInOut;
+ LPCWSTR const sStart = pchInOut;
+
+ while (*s) {
+ if (*s == '\\') {
+ ++s;
+ if (*s == L'"')
+ *o = L'"';
+ else if (*s == L'\\')
+ *o = L'\\';
+ else {
+ *o = *s; // swallow single '\'
+ }
+ }
+ else
+ *o = *s;
+
+ ++o;
+ if (*s) {
+ ++s;
+ }
+ }
+ *o = '\0';
+ return (size_t)((ptrdiff_t)(o - sStart));
+}
+
+
/**
* check, if we have regex sub-group referencing
*/
diff --git a/src/Helpers.h b/src/Helpers.h
index 97e232e68..6c1db7c1c 100644
--- a/src/Helpers.h
+++ b/src/Helpers.h
@@ -323,6 +323,7 @@ size_t SlashW(LPWSTR pchOutput, size_t cchOutLen, LPCWSTR pchInput);
size_t UnSlashA(LPSTR pchInOut, UINT cpEdit);
size_t UnSlashW(LPWSTR pchInOut);
+size_t UnSlashQuotes(LPWSTR pchInOut);
void TransformBackslashes(char* pszInput, bool, UINT cpEdit, int* iReplaceMsg);
void TransformMetaChars(char* pszInput, bool, int iEOLMode);
diff --git a/src/Notepad3.c b/src/Notepad3.c
index dcd201d73..e58687d7f 100644
--- a/src/Notepad3.c
+++ b/src/Notepad3.c
@@ -55,7 +55,7 @@
CONSTANTS_T const Constants = {
2 // StdDefaultLexerID
, L"minipath.exe" // FileBrowserMiniPath
- , L"grepWinNP3_portable.exe" // FileSearchGrepWin
+ , L"grepWinNP3.exe" // FileSearchGrepWin
, L"ThemeFileName" // StylingThemeName
, L"Settings" // Inifile Section "Settings"
, L"Settings2" // Inifile Section "Settings2"
diff --git a/src/VersionEx.h b/src/VersionEx.h
index b8991df38..76715730a 100644
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@@ -8,12 +8,12 @@
#define SAPPNAME "Notepad3"
#define VERSION_MAJOR 5
#define VERSION_MINOR 20
-#define VERSION_REV 324
-#define VERSION_BUILD 2
+#define VERSION_REV 325
+#define VERSION_BUILD 1
#define SCINTILLA_VER 432
#define ONIGURUMA_REGEX_VER 6.9.4
#define UCHARDET_VER 2018.09.27
#define TINYEXPR_VER 2018.05.11
#define UTHASH_VER 2.1.0
#define VERSION_PATCH NF
-#define VERSION_COMMIT_ID nebukadn
+#define VERSION_COMMIT_ID t7820-rk