Commit Graph

63 Commits

Author SHA1 Message Date
Tommaso Cucinotta
c23eef3abf Still addressing #6560: instead of cloning the BufferParams, which might cause
a number of unforeseen issues (like the inheritance of the default master, as
pointed out in http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg168225.html),
now we simply set the language into the search & replace buffers.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38647 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-08 23:51:44 +00:00
Tommaso Cucinotta
8fd06ad27c Fixed overlapping of both Find Advanced and Spellchecker Dockwidgets (addressing #7375).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38133 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-29 20:51:40 +00:00
Tommaso Cucinotta
a17d3460f6 Implements functionality of the replaceAll button on Advanced F&R.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37853 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-04 22:19:19 +00:00
Tommaso Cucinotta
fcae022192 Search and replace buffers are now passed from the GUI to the Model
just by their file-name, and directly accessed there.
All string/latex exporting of those buffers is handled on the Model
side (lyxfind.cpp) according to the selected options.
Fixed bugs when searching with ignore-format disabled material
in the middle of a paragraph, and when using regular expressions.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37549 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-07 20:36:40 +00:00
Tommaso Cucinotta
fcd769c58c Fixed focusing issue when dialog already open on lyx start,
and added selection of entire find/replace WAs when switching
among them on Tab/Alt+Tab.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37413 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-02 08:55:59 +00:00
Enrico Forestieri
1ef605f625 Introduce a wrapper class for odocstream to help ensuring that no
blank lines may be inadvertently output. This is achieved by using two
special iomanip-like variables (breakln and safebreakln) in the lyx::
namespace. When they are inserted in the stream, a newline is output
only if not already at the beginning of a line. The difference between
breakln and safebreakln is that, if needed, the former outputs '\n'
and the latter "%\n".
In future, the new class will also be used for counting the number of
newlines issued. Even if the infractrure for doing that is already in
place, the counting is essentially still done the old way.
There are still places in the code where the functionality of the
class could be used, most probably. ATM, it is used for InsetTabular,
InsetListings, InsetFloat, and InsetText.
The Comment and GreyedOut insets required a special treatment and a
new InsetLayout parameter (Display) has been introduced. The default
for Display is "true", meaning that the corresponding latex
environment is of "display" type, i.e., it stands on its own, whereas
"false" means that the contents appear inline with the text. The
latter is the case for both Comment and GreyedOut insets.
Mostly, the only visible effects on latex exports should be the
disappearing of some redundant % chars and the appearing/disappearing
of null {} latex groups after a comment or lyxgreyedout environments
(they are related to the presence or absence of a space immediately
after those environments), as well as the fact that math environments
are now started on their own lines.
As a last thing, only the latex code between \begin{document} and
\end{document} goes through the new class, the preamble being directly
output through odocstream, as usual.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37360 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-29 02:41:13 +00:00
Vincent van Ravesteijn
3d08e82957 LyX remembers the state and geometry of the advanced find and replace dockview.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37121 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-06 00:52:46 +00:00
Tommaso Cucinotta
78eecdabf8 Avoid crash on exiting LyX while Adv Search is shown in full-screen mode.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37115 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-05 15:08:08 +00:00
Vincent van Ravesteijn
d23120b3ba Fix bug 7137: Main WA disappears on wrap-around dialog.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37085 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-03 20:04:03 +00:00
Tommaso Cucinotta
dbb3f12aa5 Also copying the document language to the find/replace WA cursors' current language. This avoids typing in the replace WA results in underscored text while editing non-English documents.
This addresses (and hopefully closes) #6171.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37058 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-31 15:07:03 +00:00
Tommaso Cucinotta
426c5671d5 Copy document params (including language settings) to find and replace WAs buffers on activation of Advanced Search.
This hopefully fixes #6171, i.e., when copying from main document with non-English language to find/replace WAs,
the pasted text is not underlined anymore.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37057 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-31 14:35:16 +00:00
Tommaso Cucinotta
fab8c264aa Applying (variation of) fix by stwitt to solve #7172.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37043 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-29 19:59:41 +00:00
Abdelrazak Younes
1614a64e15 TeXOnePar() simplification: use pit_type instead of iterator
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36936 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-18 15:57:27 +00:00
Pavel Sanda
8435660410 This string composition badly fails on some languages since as a translator
you have no clue about the context for the proper grammatical case.

I'm not particularly happy about the fix, but didn't see much better alternatives.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36532 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-27 03:04:56 +00:00
Tommaso Cucinotta
f8e4f97b67 Finalize macros that are being typed (both in main document WA and in search/replace one), right before starting an advanced search/replace operation.
Fixes #6887.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36423 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-21 15:45:35 +00:00
Richard Heck
346f3aa503 Clean up this code a little bit.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35540 a592a061-630c-0410-9148-cb99ea01b6c8
2010-09-29 13:14:20 +00:00
Richard Heck
d07c00032a Simplify some of the find and replace code now, since allRelatives() is
stable and always has the root document at the beginning.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35535 a592a061-630c-0410-9148-cb99ea01b6c8
2010-09-29 12:50:24 +00:00
Richard Heck
2291614a6c Introduce a typedef for vector<Buffer *>. No change in behavior
anticipated.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35529 a592a061-630c-0410-9148-cb99ea01b6c8
2010-09-29 11:55:10 +00:00
Pavel Sanda
62ca7f3ae5 Proper camel case for FileName.absFilename
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34234 a592a061-630c-0410-9148-cb99ea01b6c8
2010-04-21 01:19:09 +00:00
Edwin Leuven
b768107db9 adv search/replace: move insert regexp to context menu
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33871 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-26 14:46:51 +00:00
Edwin Leuven
e7b1808827 simplify adv search/replace layout
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33867 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-25 16:57:39 +00:00
Enrico Forestieri
d95b35dad8 Fix for Qt 4.2 (patch mostly from JMarc).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33848 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-24 08:50:06 +00:00
Edwin Leuven
ffaf512593 - make the advanced search/replace dialog play nice with size
- add frame

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33821 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-21 11:50:13 +00:00
Tommaso Cucinotta
57aa866a1c Fixed issues in backward search in various corner cases (fixed #6482 and #6596).
Now, when scope includes multiple documents, the switch_buffer LFUN is only issues if buffer actually changes.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33812 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-20 13:59:46 +00:00
Vincent van Ravesteijn
cabde10fa3 Adjust the window settings for MacOSX.
- No more Drawers,
- ProgressView and SourceView are docked at the bottom,
- SpellChecker, FindAndReplace and Outline are floating by default, but dockable.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33716 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-11 19:33:08 +00:00
Jürgen Spitzmüller
676aca028d * FindAndReplace.cpp:
- correct strings, following the attempt at r33252.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33255 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-29 08:59:09 +00:00
Vincent van Ravesteijn
347d4a7d3e Rewrite FindAndReplace::eventFilter() and make it more human-readable.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33238 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-27 19:17:18 +00:00
Tommaso Cucinotta
e6fbc8bc72 Get rid of non-existent slot warning after removal of Close button.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33237 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-27 18:38:43 +00:00
Jürgen Spitzmüller
e4f796aee7 FindAndReplace.cpp: line length and formatting blues
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33221 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-25 08:06:26 +00:00
Jürgen Spitzmüller
995471b16d * add forgotten l7n tags.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33218 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-25 07:23:58 +00:00
Jürgen Spitzmüller
138a4f8e9c * FindAndReplace{cpp,h,Ui.ui}: some UI plishment.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33217 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-25 06:58:54 +00:00
Jürgen Spitzmüller
b33608452a * FindReplace.cpp:
- de-modularize message. It's impossible to properly translate such LEGO-strings.
	  Also mark the scopes, due to their syntactic case.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33172 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-23 09:15:37 +00:00
Jürgen Spitzmüller
407b359809 * FindReplace: allow proper localization.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33166 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-22 17:57:16 +00:00
Tommaso Cucinotta
be7d7df5a3 Dispatch BUFFER_SWITCH only if buffer actually changed (avoids some flickering when buffer is unchanged).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33107 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-20 18:18:04 +00:00
Tommaso Cucinotta
62053efc70 Added hourglass cursor while searching.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32958 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-10 23:54:45 +00:00
Vincent van Ravesteijn
43c8de8138 Cosmetics mainly: Rename math.h to cmath, reorder some includes, remove some includes and remove some superfluous "lyx::".
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32934 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-10 12:37:50 +00:00
Tommaso Cucinotta
33e123a5cd Added ALL_MANUALS scope to Advanced Find & Replace.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32925 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-09 22:49:35 +00:00
Tommaso Cucinotta
5cc2d6d73c Advanced F&R rework:
- scopes now handled in FindAndReplaceWidget, while lyxfind.cpp only searches within single buffer
- cursor().result().dispatched() now encodes whether a match was found or not, after LFUN_WORD_FINDADV dispatch
- removed a few unneeded functions
- followed a few cosmetic advices


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32760 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-04 12:29:38 +00:00
Vincent van Ravesteijn
31d6e4a9fc Revert r32673 and remove the extra redraw and setFocus calls.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32710 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-31 19:46:26 +00:00
Tommaso Cucinotta
24e2c495fe Implemented S_OPEN_BUFFERS scope in Advanced Find feature (keep searching and find all occurrences within all open buffers).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32680 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-30 21:50:55 +00:00
Tommaso Cucinotta
5da4ccb931 Implemented the "Current Buffer" & "Current (Master) Document" scopes in the Advanced Find and Replace feature.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32678 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-30 18:40:18 +00:00
Tommaso Cucinotta
c1cd1fbe28 Now, on C-S-f, only the findWA cursor remains visible and blinking, as it should be
(formerly, the replaceWA cursor used to remain visible but non-blinking).


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32673 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-29 17:21:09 +00:00
Tommaso Cucinotta
019ffdd5f5 Removed unneeded commented code (fixing #6333).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32565 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-17 15:41:40 +00:00
Tommaso Cucinotta
d5b329502b Fix of bug #6333 (main document WA was entirely selected and cursor position lost if F&R dialog was floating - does not happen anymore).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32557 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-17 07:48:29 +00:00
Vincent van Ravesteijn
8f5c3b6219 Fix bug #6144: Remover RegExp from them Menu and give the user the possibility to insert an empty RegExp in the Search field by choosing User defined.. in the Match.. combobox (what use does this option have ?).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31825 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-02 06:55:40 +00:00
Enrico Forestieri
3f371011f9 Fix FindAndReplace dialog for Qt < 4.4.0.
For reasons unknown to me, this also fixes the scroll bar issue!


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31463 a592a061-630c-0410-9148-cb99ea01b6c8
2009-09-24 14:28:14 +00:00
Tommaso Cucinotta
ab06049950 Advanced Find and Replace turned to a NoBuffer dialog (however, it keeps being disabled if no buffer is open, needs fix).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31202 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-22 16:09:44 +00:00
Tommaso Cucinotta
0029b4a217 Advanced Search GUI enhancements (tooltips, navigation, shorter labels)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31179 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-21 16:51:07 +00:00
Tommaso Cucinotta
cf62c2d8e4 First implementation of feature in bug #3696
(missing files in commit, apologies).


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31160 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-19 23:05:31 +00:00
Tommaso Cucinotta
5b1e7027ba Fixed Find LyX with replace, in common use cases.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31141 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-19 15:14:28 +00:00