Skip to content

gh-600: Shift+F7 and Alt+F7 now search in absolute directions#646

Merged
alabuzhev merged 1 commit into
FarGroup:masterfrom
MKadaner:mzk-searchdlg-up-down
Mar 8, 2023
Merged

gh-600: Shift+F7 and Alt+F7 now search in absolute directions#646
alabuzhev merged 1 commit into
FarGroup:masterfrom
MKadaner:mzk-searchdlg-up-down

Conversation

@MKadaner
Copy link
Copy Markdown
Contributor

@MKadaner MKadaner commented Mar 5, 2023

Summary

gh-600: Shift+F7 and Alt+F7 now search in absolute directions (down or up respectfully)
instead of reversing the direction defined by the last invocation of the Search / Replace dialog.
Also, on the dialog itself, replaced "Reverse" checkbox with "Search Down / Up" buttons.

Checklist

@MKadaner
Copy link
Copy Markdown
Contributor Author

MKadaner commented Mar 5, 2023

image

No, I won't fix it 😄 Not right now anyway.

@MKadaner MKadaner force-pushed the mzk-searchdlg-up-down branch from 908b4b2 to 3d8eadc Compare March 5, 2023 01:32
@MKadaner
Copy link
Copy Markdown
Contributor Author

MKadaner commented Mar 5, 2023

@rohitab, would you be so kind as to test this change? New Search / Replace dialog UX and changed behavior of ShiftF7 / AlrtF7 in Editor and Viewer. Thank you in advance.

Comment thread far/stddlg.cpp Outdated
Comment thread far/editor.cpp Outdated
@MKadaner MKadaner force-pushed the mzk-searchdlg-up-down branch 2 times, most recently from 9c5c1b4 to c0a153f Compare March 5, 2023 23:29
@rohitab
Copy link
Copy Markdown
Contributor

rohitab commented Mar 6, 2023

@MKadaner sure thing. Should be able to do it by tomorrow.

@rohitab
Copy link
Copy Markdown
Contributor

rohitab commented Mar 7, 2023

@MKadaner I just tested your changes. They look good. I did not find any issues with the search, but I do have a few suggestions for the Help files.

I think the description for the Alt+F7 hotkey in the Editor topic should be changed to Continue search/replace in reverse direction, since reverse mode is no longer present.

Here is the current description for the Editor:

#Alt+F7# Continue search/replace in "reverse" mode

The description for Viewer is correct:

#Alt+F7# Continue search in reverse direction

Also, the Reverse search section should be removed from Viewer: search and Editor: search replace topics, since it's no longer available:

Viewer: search

FarManager/far/FarEng.hlf.m4

Lines 3073 to 3074 in 0861584

#Reverse search#
Reverse the search direction - search from the end of file towards the beginning.

Editor: search replace

FarManager/far/FarEng.hlf.m4

Lines 3217 to 3218 in 0861584

#Reverse search#
Change the direction of search (from the end of file towards the beginning)

@MKadaner
Copy link
Copy Markdown
Contributor Author

MKadaner commented Mar 8, 2023

Thank you for the feedback, @rohitab. To the point, as usual. Yeah! I completely forgot to update Help. :( This only shows how shifting into developer's midframe completely displaces technical writer's one. Doing it right now.

@rohitab
Copy link
Copy Markdown
Contributor

rohitab commented Mar 8, 2023

Since you're updating the Help files, do you mind fixing another small typo in the Editor: All matching entries menu topic? I think it should be #Ctrl+Left mouse click#, since its a single operation.

FarManager/far/FarEng.hlf.m4

Lines 3400 to 3401 in 52b8370

#Ctrl+Enter#, #Ctrl+Left#, #mouse click#
Go to the position of the found text.

@MKadaner MKadaner force-pushed the mzk-searchdlg-up-down branch from c0a153f to 077d479 Compare March 8, 2023 05:59
@MKadaner
Copy link
Copy Markdown
Contributor Author

MKadaner commented Mar 8, 2023

Since you're updating the Help files, do you mind fixing another small typo in the Editor: All matching entries menu topic? I think it should be #Ctrl+Left mouse click#, since its a single operation.

FarManager/far/FarEng.hlf.m4

Lines 3400 to 3401 in 52b8370

#Ctrl+Enter#, #Ctrl+Left#, #mouse click#
Go to the position of the found text.

Sorry, neither #Ctrl+Enter# nor #Ctrl+Left# work for me. #Enter# and #mouse click# jump to the found text as expected (by me). #Left# scrolls the list up. All in all, it looks like this help article is very inconsistent.

I have (long-term) plans to add much more functionality to the list of all occurrences. Let me fix this article together with these changes.

Scratch that. I looked at the code, and sure enough, you are right. Applied the change.

@MKadaner
Copy link
Copy Markdown
Contributor Author

MKadaner commented Mar 8, 2023

@alabuzhev: rebased, updated help files, ready to merge. Thanks.

… (down or up respectfully)

instead of reversing the direction defined by the last invocation of the Search / Replace dialog.
Also, on the dialog itself, replaced "Reverse" checkbox with "Search Down / Up" buttons.
@MKadaner MKadaner force-pushed the mzk-searchdlg-up-down branch from 077d479 to b5ac955 Compare March 8, 2023 06:35
@alabuzhev alabuzhev merged commit 98d8770 into FarGroup:master Mar 8, 2023
@alabuzhev
Copy link
Copy Markdown
Contributor

Thank you

@MKadaner MKadaner deleted the mzk-searchdlg-up-down branch March 9, 2023 04:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants