Author: switt
Date: Wed May 18 22:33:57 2011
New Revision: 38781
URL: http://www.lyx.org/trac/changeset/38781
Log:
#7564 make the move forward to next match after text replacement optional and
suppress it when replace a word by selected suggestion
Modified:
lyx-devel/trunk/src/frontends/qt4/Menus.cpp
lyx-devel/trunk/src/lyxfind.cpp
lyx-devel/trunk/src/lyxfind.h
Modified: lyx-devel/trunk/src/frontends/qt4/Menus.cpp
==============================================================================
--- lyx-devel/trunk/src/frontends/qt4/Menus.cpp Tue May 17 23:53:05 2011
(r38780)
+++ lyx-devel/trunk/src/frontends/qt4/Menus.cpp Wed May 18 22:33:57 2011
(r38781)
@@ -789,7 +789,7 @@
MenuItem w(MenuItem::Command,
toqstr(suggestion),
FuncRequest(LFUN_WORD_REPLACE,
replace2string(suggestion,selection,
- true, true,
false, false)));
+ true, true,
false, false, false)));
if (i < m)
add(w);
else
Modified: lyx-devel/trunk/src/lyxfind.cpp
==============================================================================
--- lyx-devel/trunk/src/lyxfind.cpp Tue May 17 23:53:05 2011 (r38780)
+++ lyx-devel/trunk/src/lyxfind.cpp Wed May 18 22:33:57 2011 (r38781)
@@ -229,7 +229,7 @@
// whether anything at all was done.
pair<bool, int> replaceOne(BufferView * bv, docstring searchstr,
docstring const & replacestr, bool case_sens,
- bool whole, bool forward)
+ bool whole, bool forward, bool findnext)
{
Cursor & cur = bv->cursor();
if (!cur.selection()) {
@@ -278,7 +278,8 @@
cur.pos() -= replacestr.length();
LASSERT(cur.pos() >= 0, /* */);
}
- findOne(bv, searchstr, case_sens, whole, forward, false);
+ if (findnext)
+ findOne(bv, searchstr, case_sens, whole, forward, false);
return pair<bool, int>(true, 1);
}
@@ -300,7 +301,7 @@
docstring const replace2string(docstring const & replace,
docstring const & search, bool casesensitive, bool matchword,
- bool all, bool forward)
+ bool all, bool forward, bool findnext)
{
odocstringstream ss;
ss << replace << '\n'
@@ -308,7 +309,8 @@
<< int(casesensitive) << ' '
<< int(matchword) << ' '
<< int(all) << ' '
- << int(forward);
+ << int(forward) << ' '
+ << int(findnext);
return ss.str();
}
@@ -343,7 +345,7 @@
// data is of the form
// "<search>
// <replace>
- // <casesensitive> <matchword> <all> <forward>"
+ // <casesensitive> <matchword> <all> <forward> <findnext>"
docstring search;
docstring rplc;
docstring howto = split(ev.argument(), rplc, '\n');
@@ -353,6 +355,7 @@
bool matchword = parse_bool(howto);
bool all = parse_bool(howto);
bool forward = parse_bool(howto);
+ bool findnext = parse_bool(howto);
int replace_count = 0;
bool update = false;
@@ -363,7 +366,7 @@
update = replace_count > 0;
} else {
pair<bool, int> rv =
- replaceOne(bv, search, rplc, casesensitive,
matchword, forward);
+ replaceOne(bv, search, rplc, casesensitive,
matchword, forward, findnext);
update = rv.first;
replace_count = rv.second;
}
@@ -383,7 +386,7 @@
buf.message(str);
}
}
- } else {
+ } else if (findnext) {
// if we have deleted characters, we do not replace at all, but
// rather search for the next occurence
if (findOne(bv, search, casesensitive, matchword, forward))
Modified: lyx-devel/trunk/src/lyxfind.h
==============================================================================
--- lyx-devel/trunk/src/lyxfind.h Tue May 17 23:53:05 2011 (r38780)
+++ lyx-devel/trunk/src/lyxfind.h Wed May 18 22:33:57 2011 (r38781)
@@ -48,7 +48,8 @@
bool casesensitive,
bool matchword,
bool all,
- bool forward);
+ bool forward,
+ bool findnext = true);
/** Parse the string encoding of the find request that is found in
* \c ev.argument and act on it.
