Merge pull request FarGroup#625 from MKadaner/mzk-viewer-search-first…

…-key FarGroupgh-614: Restored Viewer type-to-search feature.
MKadaner · Feb 18, 2023 · 18132c7 · 18132c7
2 parents aebc4be + 1e017a1
commit 18132c7
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 0 deletions.
diff --git a/extra/Addons/Macros/Descript.ion b/extra/Addons/Macros/Descript.ion
@@ -43,4 +43,5 @@ View.NextPrevFile.lua Viewer: update panel position when navigating through file
 View.PgDn.lua Viewer: PgDn: never scroll beyond EOF (like in FAR 1.70 beta 4 and earlier)
 View.ShiftInsSearch.lua Viewer: Use Shift+Ins to search text from clipboard in internal viewer
 View.Space.lua Viewer: Use Space for listing in the viewer (like in Outlook Express or The Bat!)
+View.TypeToSearch.lua Viewer: Bring up the Search dialog with the typed character or pasted text
 WheelScreenSwitch.lua Use Shift+MsWheel to switch between screens
diff --git a/extra/Addons/Macros/View.TypeToSearch.lua b/extra/Addons/Macros/View.TypeToSearch.lua
@@ -0,0 +1,6 @@
+-- Based on https://forum.farmanager.com/viewtopic.php?p=173468#p173468
+Macro {
+  description = "Bring up the Search dialog with the typed character or pasted text";
+  area = 'Viewer'; key = '/\\S|[LR]CtrlV|ShiftIns/';
+  action = function() Keys'F7 AKey' end
+}
diff --git a/far/changelog b/far/changelog
@@ -1,3 +1,16 @@
+--------------------------------------------------------------------------------
+MZK 2023-02-18 12:03:13-08:00
+
+1. gh-614: Restored Viewer type-to-search feature which was removed in 6099.
+   Now it is implemented as a macro, see View.TypeToSearch.lua.
+   Thanks to all for the discussion and prototyping.
+
+· · · · · · · · · · · · · · · · · · · · · · · · ·
+
+1. gh-614: Восстановил функциональность Просмотрщика печатать-чтобы-искать,
+   которая была удалена в 6099. Теперь это делается при помощи макроса,
+   см. View.TypeToSearch.lua. Спасибо всем за обсуждение и прототипирование.
+
 --------------------------------------------------------------------------------
 drkns 2023-02-14 21:56:31+00:00 - build 6103
 

diff --git a/misc/msi-installer/features.wxs b/misc/msi-installer/features.wxs
@@ -105,6 +105,7 @@
           <ComponentRef Id="View.PgDn.lua" />
           <ComponentRef Id="View.ShiftInsSearch.lua" />
           <ComponentRef Id="View.Space.lua" />
+          <ComponentRef Id="View.TypeToSearch.lua" />
           <ComponentRef Id="WheelScreenSwitch.lua" />
           <ComponentRef Id="Editor.ColorWord.moon" />
         </Feature>

diff --git a/misc/msi-installer/files.wxs b/misc/msi-installer/files.wxs
@@ -377,6 +377,9 @@
           <Component Id="View.Space.lua" Guid="$(var.Guid.View.Space.lua)" Win64="$(var.Win64)">
             <File Id="View.Space.lua" KeyPath="yes" Source="$(var.SourceDir)\Addons\Macros\View.Space.lua" />
           </Component>
+          <Component Id="View.TypeToSearch.lua" Guid="$(var.Guid.View.TypeToSearch.lua)" Win64="$(var.Win64)">
+            <File Id="View.TypeToSearch.lua" KeyPath="yes" Source="$(var.SourceDir)\Addons\Macros\View.TypeToSearch.lua" />
+          </Component>
           <Component Id="WheelScreenSwitch.lua" Guid="$(var.Guid.WheelScreenSwitch.lua)" Win64="$(var.Win64)">
             <File Id="WheelScreenSwitch.lua" KeyPath="yes" Source="$(var.SourceDir)\Addons\Macros\WheelScreenSwitch.lua" />
           </Component>

diff --git a/misc/msi-installer/guids_arm64.wxi b/misc/msi-installer/guids_arm64.wxi
@@ -133,6 +133,7 @@
 <?define Guid.View.PgDn.lua = "FB10928A-15AA-43A5-A4D0-8492F6376B72" ?>
 <?define Guid.View.ShiftInsSearch.lua = "5C4AD9EF-1080-4159-892F-8D0EB90AA48A" ?>
 <?define Guid.View.Space.lua = "BD6A2D3D-D42C-42AE-9A47-7B94AD82F5BC" ?>
+<?define Guid.View.TypeToSearch.lua = "D551A72D-1429-4055-B89A-AE6258F63E1B" ?>
 <?define Guid.WheelScreenSwitch.lua = "AEE8AF3C-B032-480D-94BC-D0C1AF851EF7" ?>
 <?define Guid.Editor.ColorWord.moon = "7910F123-8FB0-46FF-B79F-D49A58924984" ?>
 <?define Guid.Default165.farconfig = "1B08A0A2-7B66-4313-9731-1EFA4DA76E96" ?>

diff --git a/misc/msi-installer/guids_x64.wxi b/misc/msi-installer/guids_x64.wxi
@@ -133,6 +133,7 @@
 <?define Guid.View.PgDn.lua = "4E1B24FE-F049-461E-9004-98EB61E07CD9" ?>
 <?define Guid.View.ShiftInsSearch.lua = "01983101-C659-4C59-BF9C-74CA33CD66BE" ?>
 <?define Guid.View.Space.lua = "7E2375BD-D0A0-4819-ABFD-BAFD6EABC96C" ?>
+<?define Guid.View.TypeToSearch.lua = "355A698D-E244-4A8F-99A3-911D05FD7391" ?>
 <?define Guid.WheelScreenSwitch.lua = "F74CB9B4-21BA-447C-B7BD-A10023C7407D" ?>
 <?define Guid.Editor.ColorWord.moon = "BB737C45-5895-4BDA-9758-2324BBD1EDA2" ?>
 <?define Guid.Default165.farconfig = "8B0AA61C-AFB8-4195-B2A6-540FB4A67D68" ?>

diff --git a/misc/msi-installer/guids_x86.wxi b/misc/msi-installer/guids_x86.wxi
@@ -133,6 +133,7 @@
 <?define Guid.View.PgDn.lua = "E4CA6AAA-2D5F-4A8F-9B4D-39443C5ECB38" ?>
 <?define Guid.View.ShiftInsSearch.lua = "EA20B433-D76C-4EC6-8675-167FED64A2CD" ?>
 <?define Guid.View.Space.lua = "2CB0ED75-7E68-47F8-B069-EC31B209AF71" ?>
+<?define Guid.View.TypeToSearch.lua = "590020E7-A902-41F5-99C5-FA87468A3953" ?>
 <?define Guid.WheelScreenSwitch.lua = "3723CD53-1846-4C77-993B-9FD634AD74AC" ?>
 <?define Guid.Editor.ColorWord.moon = "5D62E549-E310-4302-B04E-E57801B25FD8" ?>
 <?define Guid.Default165.farconfig = "4120318A-A58C-423C-BE28-3997F7440A4A" ?>