Re: Make "wrap" the default in find for 2.4.0?
On Sat, Jul 17, 2021 at 12:51:58PM +0200, Kornel Benko wrote: > Am Fri, 16 Jul 2021 20:34:47 -0400 > schrieb Scott Kostyshak : > > > > > Do you > > > > think the checkbox should go in the "Search" tab or in the "Settings" > > > > tab? My first thought is that it should got in "Settings" since from > > > > what I understand most users do not often toggle "wrap", as opposed to > > > > the other three check boxes; that is, I think that users either prefer > > > > to always wrap or to always not wrap. > > > > > > Some people don't even look into the settings tab, so to make it more > > > prominent > > > I'd prefer the button in the search tab. > > > Of course, it is OK in the settings tab too, that is I would not oppose. > > > > Search tab is fine with me. Thanks for the feedback. > > > > Scott > > What about a tri-state variable? > Wrap / Nowrap / Ask Sure, I can try it with radio buttons. Scott signature.asc Description: PGP signature -- lyx-devel mailing list lyx-devel@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-devel
Re: Make "wrap" the default in find for 2.4.0?
Am Fri, 16 Jul 2021 20:34:47 -0400 schrieb Scott Kostyshak : > > > Do you > > > think the checkbox should go in the "Search" tab or in the "Settings" > > > tab? My first thought is that it should got in "Settings" since from > > > what I understand most users do not often toggle "wrap", as opposed to > > > the other three check boxes; that is, I think that users either prefer > > > to always wrap or to always not wrap. > > > > Some people don't even look into the settings tab, so to make it more > > prominent > > I'd prefer the button in the search tab. > > Of course, it is OK in the settings tab too, that is I would not oppose. > > Search tab is fine with me. Thanks for the feedback. > > Scott What about a tri-state variable? Wrap / Nowrap / Ask Kornel pgpsZfcG3ruzN.pgp Description: Digitale Signatur von OpenPGP -- lyx-devel mailing list lyx-devel@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-devel
Re: Make "wrap" the default in find for 2.4.0?
On Sat, Jul 17, 2021 at 02:08:57AM +0200, Kornel Benko wrote: > Am Fri, 16 Jul 2021 16:02:59 -0400 > schrieb Scott Kostyshak : > > > On Fri, Jul 16, 2021 at 04:30:07PM +0200, Kornel Benko wrote: > > > Am Fri, 16 Jul 2021 15:37:12 +0200 > > > schrieb Kornel Benko : > > > > > > > Am Thu, 15 Jul 2021 23:03:14 +0100 > > > > schrieb José Abílio Matos : > > > > > > > > > On Thursday, 15 July 2021 16.37.19 WEST Scott Kostyshak wrote: > > > > > > Bump. I know most people are lacking time, and I also have not been > > > > > > giving > > > > > > feedback on others' patches (sorry, racoon!). But I prefer not to > > > > > > push this > > > > > > change without at least a few more opinions. That said, I'm happy > > > > > > to wait > > > > > > until more people are around. > > > > > > > > > > > > Thanks, > > > > > > Scott > > > > > > > > > > I am used to emacs that also wraps by default. I have just tested > > > > > other > > > > > editors that have open at the moment like the octave editor, spyder > > > > > or R > > > > > Studio and all of them wrap. > > > > > > > > > > I can see why you do not want to wrap but I think that it should be > > > > > on by > > > > > default. > > > > > > > > > > Regards, > > > > > > > > No problems with a new default. > > > > > > > > Kornel > > > > > > OTOH, in advanced find there is no button to select wrap/nopwrap. > > > (And your patch does not touch this part) > > > > Indeed. I can work on this, although it might take me a bit. > > Thanks Scott. > > > Do you > > think the checkbox should go in the "Search" tab or in the "Settings" > > tab? My first thought is that it should got in "Settings" since from > > what I understand most users do not often toggle "wrap", as opposed to > > the other three check boxes; that is, I think that users either prefer > > to always wrap or to always not wrap. > > Some people don't even look into the settings tab, so to make it more > prominent > I'd prefer the button in the search tab. > Of course, it is OK in the settings tab too, that is I would not oppose. Search tab is fine with me. Thanks for the feedback. Scott > > > That said, if others prefer for the checkbox to go in "Search", that's > > also fine with me. > > > > Scott > > Kornel > -- > lyx-devel mailing list > lyx-devel@lists.lyx.org > http://lists.lyx.org/mailman/listinfo/lyx-devel signature.asc Description: PGP signature -- lyx-devel mailing list lyx-devel@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-devel
Re: Make "wrap" the default in find for 2.4.0?
Am Fri, 16 Jul 2021 16:02:59 -0400 schrieb Scott Kostyshak : > On Fri, Jul 16, 2021 at 04:30:07PM +0200, Kornel Benko wrote: > > Am Fri, 16 Jul 2021 15:37:12 +0200 > > schrieb Kornel Benko : > > > > > Am Thu, 15 Jul 2021 23:03:14 +0100 > > > schrieb José Abílio Matos : > > > > > > > On Thursday, 15 July 2021 16.37.19 WEST Scott Kostyshak wrote: > > > > > Bump. I know most people are lacking time, and I also have not been > > > > > giving > > > > > feedback on others' patches (sorry, racoon!). But I prefer not to > > > > > push this > > > > > change without at least a few more opinions. That said, I'm happy to > > > > > wait > > > > > until more people are around. > > > > > > > > > > Thanks, > > > > > Scott > > > > > > > > I am used to emacs that also wraps by default. I have just tested other > > > > editors that have open at the moment like the octave editor, spyder or > > > > R > > > > Studio and all of them wrap. > > > > > > > > I can see why you do not want to wrap but I think that it should be on > > > > by > > > > default. > > > > > > > > Regards, > > > > > > No problems with a new default. > > > > > > Kornel > > > > OTOH, in advanced find there is no button to select wrap/nopwrap. > > (And your patch does not touch this part) > > Indeed. I can work on this, although it might take me a bit. Thanks Scott. > Do you > think the checkbox should go in the "Search" tab or in the "Settings" > tab? My first thought is that it should got in "Settings" since from > what I understand most users do not often toggle "wrap", as opposed to > the other three check boxes; that is, I think that users either prefer > to always wrap or to always not wrap. Some people don't even look into the settings tab, so to make it more prominent I'd prefer the button in the search tab. Of course, it is OK in the settings tab too, that is I would not oppose. > That said, if others prefer for the checkbox to go in "Search", that's > also fine with me. > > Scott Kornel pgp2skBv9_wfP.pgp Description: Digitale Signatur von OpenPGP -- lyx-devel mailing list lyx-devel@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-devel
Re: Make "wrap" the default in find for 2.4.0?
On Fri, Jul 16, 2021 at 04:30:07PM +0200, Kornel Benko wrote: > Am Fri, 16 Jul 2021 15:37:12 +0200 > schrieb Kornel Benko : > > > Am Thu, 15 Jul 2021 23:03:14 +0100 > > schrieb José Abílio Matos : > > > > > On Thursday, 15 July 2021 16.37.19 WEST Scott Kostyshak wrote: > > > > Bump. I know most people are lacking time, and I also have not been > > > > giving > > > > feedback on others' patches (sorry, racoon!). But I prefer not to push > > > > this > > > > change without at least a few more opinions. That said, I'm happy to > > > > wait > > > > until more people are around. > > > > > > > > Thanks, > > > > Scott > > > > > > I am used to emacs that also wraps by default. I have just tested other > > > editors that have open at the moment like the octave editor, spyder or R > > > Studio and all of them wrap. > > > > > > I can see why you do not want to wrap but I think that it should be on by > > > default. > > > > > > Regards, > > > > No problems with a new default. > > > > Kornel > > OTOH, in advanced find there is no button to select wrap/nopwrap. > (And your patch does not touch this part) Indeed. I can work on this, although it might take me a bit. Do you think the checkbox should go in the "Search" tab or in the "Settings" tab? My first thought is that it should got in "Settings" since from what I understand most users do not often toggle "wrap", as opposed to the other three check boxes; that is, I think that users either prefer to always wrap or to always not wrap. That said, if others prefer for the checkbox to go in "Search", that's also fine with me. Scott signature.asc Description: PGP signature -- lyx-devel mailing list lyx-devel@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-devel
Re: Make "wrap" the default in find for 2.4.0?
On Fri, Jul 16, 2021 at 03:37:12PM +0200, Kornel Benko wrote: > Am Thu, 15 Jul 2021 23:03:14 +0100 > schrieb José Abílio Matos : > > > On Thursday, 15 July 2021 16.37.19 WEST Scott Kostyshak wrote: > > > Bump. I know most people are lacking time, and I also have not been giving > > > feedback on others' patches (sorry, racoon!). But I prefer not to push > > > this > > > change without at least a few more opinions. That said, I'm happy to wait > > > until more people are around. > > > > > > Thanks, > > > Scott > > > > I am used to emacs that also wraps by default. I have just tested other > > editors that have open at the moment like the octave editor, spyder or R > > Studio and all of them wrap. > > > > I can see why you do not want to wrap but I think that it should be on by > > default. > > > > Regards, > > No problems with a new default. Thanks all for the feedback! I pushed the set of commits to master at abc65d47, 47b0c338, and bea7ef04. Scott signature.asc Description: PGP signature -- lyx-devel mailing list lyx-devel@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-devel
Re: Make "wrap" the default in find for 2.4.0?
Am Fri, 16 Jul 2021 15:37:12 +0200 schrieb Kornel Benko : > Am Thu, 15 Jul 2021 23:03:14 +0100 > schrieb José Abílio Matos : > > > On Thursday, 15 July 2021 16.37.19 WEST Scott Kostyshak wrote: > > > Bump. I know most people are lacking time, and I also have not been giving > > > feedback on others' patches (sorry, racoon!). But I prefer not to push > > > this > > > change without at least a few more opinions. That said, I'm happy to wait > > > until more people are around. > > > > > > Thanks, > > > Scott > > > > I am used to emacs that also wraps by default. I have just tested other > > editors that have open at the moment like the octave editor, spyder or R > > Studio and all of them wrap. > > > > I can see why you do not want to wrap but I think that it should be on by > > default. > > > > Regards, > > No problems with a new default. > > Kornel OTOH, in advanced find there is no button to select wrap/nopwrap. (And your patch does not touch this part) Kornel pgpL60Ru9TMmS.pgp Description: Digitale Signatur von OpenPGP -- lyx-devel mailing list lyx-devel@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-devel
Re: Make "wrap" the default in find for 2.4.0?
Am 15.07.2021 um 17:37 schrieb Scott Kostyshak : > > On Wed, Jun 02, 2021 at 12:26:44AM -0400, Scott Kostyshak wrote: >> I've been using the new find bar in master and it's great! Thank you Jürgen >> for the nice feature. >> >> Is there any interest in enabling the "wrap" checkbox for find as default? I >> have no idea what most users prefer. I could make a poll on the lyx-users >> list if there is interest in considering it. >> >> I'm not sure how relevant the following comparison is given that LyX is >> different, but in case it is helpful for discussion: >> >> LibreOffice Writer, Gedit, Chromium, and Firefox automatically wrap. I'm not >> sure any of them even has an option to not wrap or to prompt. The only >> application I'm aware of that has wrap as an option is Vim (see config >> "wrapscan"), although the default is to wrap. >> >> I attach a small set of patches related to find. In addition to setting wrap >> as default, the patches introduce a status message when there is auto-wrap. > > Bump. I know most people are lacking time, and I also have not been giving > feedback on others' patches (sorry, racoon!). But I prefer not to push this > change without at least a few more opinions. That said, I'm happy to wait > until more people are around. I think it’s better to wrap around. Stephan -- lyx-devel mailing list lyx-devel@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-devel
Re: Make "wrap" the default in find for 2.4.0?
Le 02/06/2021 à 06:26, Scott Kostyshak a écrit : I've been using the new find bar in master and it's great! Thank you Jürgen for the nice feature. Is there any interest in enabling the "wrap" checkbox for find as default? I have no idea what most users prefer. I could make a poll on the lyx-users list if there is interest in considering it. I am all for it. JMarc -- lyx-devel mailing list lyx-devel@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-devel
Re: Make "wrap" the default in find for 2.4.0?
Am Thu, 15 Jul 2021 23:03:14 +0100 schrieb José Abílio Matos : > On Thursday, 15 July 2021 16.37.19 WEST Scott Kostyshak wrote: > > Bump. I know most people are lacking time, and I also have not been giving > > feedback on others' patches (sorry, racoon!). But I prefer not to push this > > change without at least a few more opinions. That said, I'm happy to wait > > until more people are around. > > > > Thanks, > > Scott > > I am used to emacs that also wraps by default. I have just tested other > editors that have open at the moment like the octave editor, spyder or R > Studio and all of them wrap. > > I can see why you do not want to wrap but I think that it should be on by > default. > > Regards, No problems with a new default. Kornel pgp_nn7EGjsAj.pgp Description: Digitale Signatur von OpenPGP -- lyx-devel mailing list lyx-devel@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-devel
Re: Make "wrap" the default in find for 2.4.0?
On Thursday, 15 July 2021 16.37.19 WEST Scott Kostyshak wrote: > Bump. I know most people are lacking time, and I also have not been giving > feedback on others' patches (sorry, racoon!). But I prefer not to push this > change without at least a few more opinions. That said, I'm happy to wait > until more people are around. > > Thanks, > Scott I am used to emacs that also wraps by default. I have just tested other editors that have open at the moment like the octave editor, spyder or R Studio and all of them wrap. I can see why you do not want to wrap but I think that it should be on by default. Regards, -- José Abílio-- lyx-devel mailing list lyx-devel@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-devel
Re: Make "wrap" the default in find for 2.4.0?
On Wed, Jun 02, 2021 at 12:26:44AM -0400, Scott Kostyshak wrote: > I've been using the new find bar in master and it's great! Thank you Jürgen > for the nice feature. > > Is there any interest in enabling the "wrap" checkbox for find as default? I > have no idea what most users prefer. I could make a poll on the lyx-users > list if there is interest in considering it. > > I'm not sure how relevant the following comparison is given that LyX is > different, but in case it is helpful for discussion: > > LibreOffice Writer, Gedit, Chromium, and Firefox automatically wrap. I'm not > sure any of them even has an option to not wrap or to prompt. The only > application I'm aware of that has wrap as an option is Vim (see config > "wrapscan"), although the default is to wrap. > > I attach a small set of patches related to find. In addition to setting wrap > as default, the patches introduce a status message when there is auto-wrap. Bump. I know most people are lacking time, and I also have not been giving feedback on others' patches (sorry, racoon!). But I prefer not to push this change without at least a few more opinions. That said, I'm happy to wait until more people are around. Thanks, Scott signature.asc Description: PGP signature -- lyx-devel mailing list lyx-devel@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-devel
Re: Make "wrap" the default in find for 2.4.0?
On Wed, Jun 02, 2021 at 09:31:43PM -0600, Joel Kulesza wrote: > On Wed, Jun 2, 2021 at 6:15 PM Scott Kostyshak wrote: > > > On Tue, Jun 01, 2021 at 11:04:00PM -0600, Joel Kulesza wrote: > > > On Tue, Jun 1, 2021 at 10:27 PM Scott Kostyshak > > wrote: > > > > > > > I've been using the new find bar in master and it's great! Thank you > > > > Jürgen for the nice feature. > > > > > > > > Is there any interest in enabling the "wrap" checkbox for find as > > default? > > > > I have no idea what most users prefer. I could make a poll on the > > lyx-users > > > > list if there is interest in considering it. > > > > > > > > > > One question on polls and because the ones hosted via email seem > > > potentially inconclusive and subject to distracting discussion: is there > > > merit in hosting the poll using a polling service (Google Forms, Quick > > > Survey [https://github.com/simonv3/quick-survey/] at lyx.org, etc.)? In > > > this way, I wonder if discussion could be separated from results. > > > > That is interesting. How are those more inclusive? > > > You may have misread: I wrote inconclusive. Indeed! > That is, email polls don't > automatically aggregate results and clear choices may be lost amongst > discussion. While the discussion is valuable, definitive outcomes from a > poll are also important. That makes sense. Thanks, Scott > > Sorry for any confusion. > > Thanks, > Joel > -- > lyx-devel mailing list > lyx-devel@lists.lyx.org > http://lists.lyx.org/mailman/listinfo/lyx-devel signature.asc Description: PGP signature -- lyx-devel mailing list lyx-devel@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-devel
Re: Make "wrap" the default in find for 2.4.0?
On Wed, Jun 2, 2021 at 6:15 PM Scott Kostyshak wrote: > On Tue, Jun 01, 2021 at 11:04:00PM -0600, Joel Kulesza wrote: > > On Tue, Jun 1, 2021 at 10:27 PM Scott Kostyshak > wrote: > > > > > I've been using the new find bar in master and it's great! Thank you > > > Jürgen for the nice feature. > > > > > > Is there any interest in enabling the "wrap" checkbox for find as > default? > > > I have no idea what most users prefer. I could make a poll on the > lyx-users > > > list if there is interest in considering it. > > > > > > > One question on polls and because the ones hosted via email seem > > potentially inconclusive and subject to distracting discussion: is there > > merit in hosting the poll using a polling service (Google Forms, Quick > > Survey [https://github.com/simonv3/quick-survey/] at lyx.org, etc.)? In > > this way, I wonder if discussion could be separated from results. > > That is interesting. How are those more inclusive? You may have misread: I wrote inconclusive. That is, email polls don't automatically aggregate results and clear choices may be lost amongst discussion. While the discussion is valuable, definitive outcomes from a poll are also important. Sorry for any confusion. Thanks, Joel -- lyx-devel mailing list lyx-devel@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-devel
Re: Make "wrap" the default in find for 2.4.0?
On Tue, Jun 01, 2021 at 11:04:00PM -0600, Joel Kulesza wrote: > On Tue, Jun 1, 2021 at 10:27 PM Scott Kostyshak wrote: > > > I've been using the new find bar in master and it's great! Thank you > > Jürgen for the nice feature. > > > > Is there any interest in enabling the "wrap" checkbox for find as default? > > I have no idea what most users prefer. I could make a poll on the lyx-users > > list if there is interest in considering it. > > > > One question on polls and because the ones hosted via email seem > potentially inconclusive and subject to distracting discussion: is there > merit in hosting the poll using a polling service (Google Forms, Quick > Survey [https://github.com/simonv3/quick-survey/] at lyx.org, etc.)? In > this way, I wonder if discussion could be separated from results. That is interesting. How are those more inclusive? Who would participate in those that would not participate in the mailing list poll? Perhaps the idea is we would announce the poll on Twitter and then anyone who sees it would be able to participate? I don't think it makes sense to do that for this particular issue, but I personally would be interested in polling users more often on issues (e.g., for example, I would have been interested in results on if users use continuous spellcheck). > > I'm not sure how relevant the following comparison is given that LyX is > > different, but in case it is helpful for discussion: > > > > LibreOffice Writer, Gedit, Chromium, and Firefox automatically wrap. I'm > > not sure any of them even has an option to not wrap or to prompt. The only > > application I'm aware of that has wrap as an option is Vim (see config > > "wrapscan"), although the default is to wrap. > > > > As a vim user, this capability would feel familiar, but I have no strong > preference one way or the other. > However, vim keybindings in LyX would be > a (substantially) different matter. That would indeed be nice. Scott signature.asc Description: PGP signature -- lyx-devel mailing list lyx-devel@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-devel
Re: Make "wrap" the default in find for 2.4.0?
On Tue, Jun 1, 2021 at 10:27 PM Scott Kostyshak wrote: > I've been using the new find bar in master and it's great! Thank you > Jürgen for the nice feature. > > Is there any interest in enabling the "wrap" checkbox for find as default? > I have no idea what most users prefer. I could make a poll on the lyx-users > list if there is interest in considering it. > One question on polls and because the ones hosted via email seem potentially inconclusive and subject to distracting discussion: is there merit in hosting the poll using a polling service (Google Forms, Quick Survey [https://github.com/simonv3/quick-survey/] at lyx.org, etc.)? In this way, I wonder if discussion could be separated from results. > I'm not sure how relevant the following comparison is given that LyX is > different, but in case it is helpful for discussion: > > LibreOffice Writer, Gedit, Chromium, and Firefox automatically wrap. I'm > not sure any of them even has an option to not wrap or to prompt. The only > application I'm aware of that has wrap as an option is Vim (see config > "wrapscan"), although the default is to wrap. > As a vim user, this capability would feel familiar, but I have no strong preference one way or the other. However, vim keybindings in LyX would be a (substantially) different matter. Thanks, Joel -- lyx-devel mailing list lyx-devel@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-devel
Make "wrap" the default in find for 2.4.0?
I've been using the new find bar in master and it's great! Thank you Jürgen for
the nice feature.
Is there any interest in enabling the "wrap" checkbox for find as default? I
have no idea what most users prefer. I could make a poll on the lyx-users list
if there is interest in considering it.
I'm not sure how relevant the following comparison is given that LyX is
different, but in case it is helpful for discussion:
LibreOffice Writer, Gedit, Chromium, and Firefox automatically wrap. I'm not
sure any of them even has an option to not wrap or to prompt. The only
application I'm aware of that has wrap as an option is Vim (see config
"wrapscan"), although the default is to wrap.
I attach a small set of patches related to find. In addition to setting wrap as
default, the patches introduce a status message when there is auto-wrap.
Scott
From a12dd7639fbf8fa86f51004cff7a3684d90724a0 Mon Sep 17 00:00:00 2001
From: Scott Kostyshak
Date: Tue, 1 Jun 2021 23:59:40 -0400
Subject: [PATCH 1/3] refactor: keep meaning of a variable consistent
We now use a new variable, "wrap", to track if a wrap should be
done, which is true either if "auto_wrap" is true or if the user
chooses to wrap in the dialog.
This preserves the meaning of the "auto_wrap" variable and also
removes the confusion of why the previous code of
if (!auto_wrap) {
...
}
if (auto_wrap) {
did not use an "else" instead of the second "if".
No change in functionality.
---
src/lyxfind.cpp | 7 ---
src/lyxfind.h | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/lyxfind.cpp b/src/lyxfind.cpp
index 444db69a98..820274e89c 100644
--- a/src/lyxfind.cpp
+++ b/src/lyxfind.cpp
@@ -276,7 +276,7 @@ bool searchAllowed(docstring const & str)
bool findOne(BufferView * bv, docstring const & searchstr,
bool case_sens, bool whole, bool forward,
- bool find_del, bool check_wrap, bool auto_wrap,
+ bool find_del, bool check_wrap, bool const auto_wrap,
bool instant, bool onlysel)
{
// Clean up previous selections with empty searchstr on instant
@@ -338,6 +338,7 @@ bool findOne(BufferView * bv, docstring const & searchstr,
}
else if (check_wrap) {
DocIterator cur_orig(bv->cursor());
+ bool wrap = auto_wrap;
if (!auto_wrap) {
docstring q;
if (forward)
@@ -348,9 +349,9 @@ bool findOne(BufferView * bv, docstring const & searchstr,
"Continue searching from the end?");
int wrap_answer = frontend::Alert::prompt(_("Wrap search?"),
q, 0, 1, _(""), _(""));
- auto_wrap = wrap_answer == 0;
+ wrap = wrap_answer == 0;
}
- if (auto_wrap) {
+ if (wrap) {
if (forward) {
bv->cursor().clear();
bv->cursor().push_back(CursorSlice(bv->buffer().inset()));
diff --git a/src/lyxfind.h b/src/lyxfind.h
index f79ef240cd..b700e0ce1a 100644
--- a/src/lyxfind.h
+++ b/src/lyxfind.h
@@ -74,7 +74,7 @@ bool lyxfind(BufferView * bv, FuncRequest const & ev);
bool findOne(BufferView * bv, docstring const & searchstr,
bool case_sens, bool whole, bool forward,
bool find_del = true, bool check_wrap = false,
- bool auto_wrap = false, bool instant = false,
+ bool const auto_wrap = false, bool instant = false,
bool onlysel = false);
/** Parse the string encoding of the replace request that is found in
--
2.20.1
From 0ac7f74348d5cfdad377ef6634dd06284ae1a104 Mon Sep 17 00:00:00 2001
From: Scott Kostyshak
Date: Tue, 1 Jun 2021 23:59:50 -0400
Subject: [PATCH 2/3] find: give status message when auto-wrapping
When auto-wrap is enabled, it is sometimes informative to know
when the search wraps.
A status message is consistent with LibreOffice and Vim.
---
src/lyxfind.cpp | 6 ++
1 file changed, 6 insertions(+)
diff --git a/src/lyxfind.cpp b/src/lyxfind.cpp
index 820274e89c..e9e1d0e016 100644
--- a/src/lyxfind.cpp
+++ b/src/lyxfind.cpp
@@ -359,6 +359,12 @@ bool findOne(BufferView * bv, docstring const & searchstr,
bv->cursor().setCursor(doc_iterator_end(>buffer()));
bv->cursor().backwardPos();
}
+ if (auto_wrap) {
+docstring const msg = forward
+ ? _("Search reached end of document, continuing from beginning.")
+ : _("Search reached beginning of document, continuing from end.");
+bv->message(msg);
+ }
bv->clearSelection();
if (findOne(bv, searchstr, case_sens, whole, forward,
find_del, false, false, false, false))
--
2.20.1
From e5c3505d17b1026f9f446c4e5be9cadf0eb09736 Mon Sep 17 00:00:00 2001
From: Scott Kostyshak
Date: Tue, 1 Jun 2021 23:59:57 -0400
Subject: [PATCH 3/3] find: auto-wrap by default
---
src/frontends/qt/ui/SearchUi.ui | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/frontends/qt/ui/SearchUi.ui b/src/frontends/qt/ui/SearchUi.ui
index ed6a4c8e10..1837d6ed2a 100644
--- a/src/frontends/qt/ui/SearchUi.ui
+++ b/src/frontends/qt/ui/SearchUi.ui
@@ -246,6 +246,9 @@
Wrap
+
+ true
+
