]> git.lyx.org Git - lyx.git/blobdiff - src/frontends/qt4/FindAndReplace.cpp
rename buffer parameter math_number_before to math_numbering_side
[lyx.git] / src / frontends / qt4 / FindAndReplace.cpp
index dc409ba2cb312e860e5a64c7dc4f4b7e5fa15463..4411074de74749456528c8a19a860a9205cbee01 100644 (file)
 #include "GuiWorkArea.h"
 #include "qt_helpers.h"
 
-#include "buffer_funcs.h"
-#include "BufferParams.h"
+#include "Buffer.h"
 #include "BufferList.h"
+#include "BufferParams.h"
+#include "BufferView.h"
 #include "Cursor.h"
 #include "FuncRequest.h"
+#include "Language.h"
+#include "Lexer.h"
+#include "LyX.h"
 #include "lyxfind.h"
-#include "output_latex.h"
-#include "OutputParams.h"
-#include "TexRow.h"
+#include "Text.h"
+#include "TextClass.h"
 
 #include "frontends/alert.h"
 
 #include "support/debug.h"
+#include "support/docstream.h"
 #include "support/filetools.h"
 #include "support/FileName.h"
 #include "support/gettext.h"
 #include "support/lassert.h"
+#include "support/lstrings.h"
 
 #include <QCloseEvent>
 #include <QLineEdit>
-
-#include <iostream>
+#include <QMenu>
 
 using namespace std;
 using namespace lyx::support;
@@ -48,132 +52,137 @@ namespace frontend {
 
 
 FindAndReplaceWidget::FindAndReplaceWidget(GuiView & view)
-       :       view_(view)
+       : QTabWidget(&view), view_(view)
 {
        setupUi(this);
-#if QT_VERSION < 0x040400
-       scrollArea->setWidget(scrollAreaWidgetContents);
-#endif
        find_work_area_->setGuiView(view_);
        find_work_area_->init();
+       find_work_area_->setFrameStyle(QFrame::StyledPanel);
+
        setFocusProxy(find_work_area_);
        replace_work_area_->setGuiView(view_);
        replace_work_area_->init();
+       replace_work_area_->setFrameStyle(QFrame::StyledPanel);
+
        // We don't want two cursors blinking.
+       find_work_area_->stopBlinkingCursor();
        replace_work_area_->stopBlinkingCursor();
 }
 
 
-bool FindAndReplaceWidget::eventFilter(QObject *obj, QEvent *event)
+void FindAndReplaceWidget::dockLocationChanged(Qt::DockWidgetArea area)
 {
-       if (obj == find_work_area_ && event->type() == QEvent::KeyPress) {
-               QKeyEvent *e = static_cast<QKeyEvent *> (event);
-               if (e->key() == Qt::Key_Escape && e->modifiers() == Qt::NoModifier) {
-                       on_closePB_clicked();
-                       return true;
-               } else if (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return) {
-                       if (e->modifiers() == Qt::ShiftModifier) {
-                               on_findPrevPB_clicked();
-                               return true;
-                       } else if (e->modifiers() == Qt::NoModifier) {
-                               on_findNextPB_clicked();
-                               return true;
-                       }
-               } else if (e->key() == Qt::Key_Tab && e->modifiers() == Qt::NoModifier) {
-                       LYXERR(Debug::FIND, "Focusing replace WA");
-                       replace_work_area_->setFocus();
+       if (area == Qt::RightDockWidgetArea || area == Qt::LeftDockWidgetArea) {
+               dynamicLayoutBasic_->setDirection(QBoxLayout::TopToBottom);
+               dynamicLayoutAdvanced_->setDirection(QBoxLayout::TopToBottom);
+       } else {
+               dynamicLayoutBasic_->setDirection(QBoxLayout::LeftToRight);
+               dynamicLayoutAdvanced_->setDirection(QBoxLayout::LeftToRight);
+       }
+}
+
+
+bool FindAndReplaceWidget::eventFilter(QObject * obj, QEvent * event)
+{
+       if (event->type() != QEvent::KeyPress
+                 || (obj != find_work_area_ && obj != replace_work_area_))
+               return QWidget::eventFilter(obj, event);
+
+       QKeyEvent * e = static_cast<QKeyEvent *> (event);
+       switch (e->key()) {
+       case Qt::Key_Escape:
+               if (e->modifiers() == Qt::NoModifier) {
+                       hideDialog();
                        return true;
                }
+               break;
+
+       case Qt::Key_Enter:
+       case Qt::Key_Return: {
+               // with shift we (temporarily) change search/replace direction
+               bool const searchback = searchbackCB->isChecked();
+               if (e->modifiers() == Qt::ShiftModifier && !searchback)
+                       searchbackCB->setChecked(!searchback);
+
+               if (obj == find_work_area_)
+                       on_findNextPB_clicked();
+               else
+                       on_replacePB_clicked();
+               // back to how it was
+               searchbackCB->setChecked(searchback);
+               return true;
        }
-       if (obj == replace_work_area_ && event->type() == QEvent::KeyPress) {
-               QKeyEvent *e = static_cast<QKeyEvent *> (event);
-               if (e->key() == Qt::Key_Escape && e->modifiers() == Qt::NoModifier) {
-                       on_closePB_clicked();
-                       return true;
-               } else if (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return) {
-                       if (e->modifiers() == Qt::ShiftModifier) {
-                               on_replacePrevPB_clicked();
-                               return true;
-                       } else if (e->modifiers() == Qt::NoModifier) {
-                               on_replaceNextPB_clicked();
+
+       case Qt::Key_Tab:
+               if (e->modifiers() == Qt::NoModifier) {
+                       if (obj == find_work_area_){
+                               LYXERR(Debug::FIND, "Focusing replace WA");
+                               replace_work_area_->setFocus();
+                               LYXERR(Debug::FIND, "Selecting entire replace buffer");
+                               dispatch(FuncRequest(LFUN_BUFFER_BEGIN));
+                               dispatch(FuncRequest(LFUN_BUFFER_END_SELECT));
                                return true;
                        }
-               } else if (e->key() == Qt::Key_Backtab) {
+               }
+               break;
+
+       case Qt::Key_Backtab:
+               if (obj == replace_work_area_) {
                        LYXERR(Debug::FIND, "Focusing find WA");
                        find_work_area_->setFocus();
+                       LYXERR(Debug::FIND, "Selecting entire find buffer");
+                       dispatch(FuncRequest(LFUN_BUFFER_BEGIN));
+                       dispatch(FuncRequest(LFUN_BUFFER_END_SELECT));
                        return true;
                }
+               break;
+
+       default:
+               break;
        }
        // standard event processing
        return QWidget::eventFilter(obj, event);
 }
 
-static docstring buffer_to_latex(Buffer & buffer) {
-       OutputParams runparams(&buffer.params().encoding());
-       odocstringstream os;
-       runparams.nice = true;
-       runparams.flavor = OutputParams::LATEX;
-       runparams.linelen = 80; //lyxrc.plaintext_linelen;
-       // No side effect of file copying and image conversion
-       runparams.dryrun = true;
-       buffer.texrow().reset();
-       ParagraphList::const_iterator pit = buffer.paragraphs().begin();
-       ParagraphList::const_iterator const end = buffer.paragraphs().end();
-       for (; pit != end; ++pit) {
-               TeXOnePar(buffer, buffer.text(), pit, os, buffer.texrow(), runparams);
-               LYXERR(Debug::FIND, "searchString up to here: " << os.str());
-       }
-       return os.str();
-}
 
-
-static vector<string> const & allManualsFiles() {
-       static vector<string> v;
+static vector<string> const & allManualsFiles()
+{
        static const char * files[] = {
-               "Intro", "UserGuide", "Tutorial", "Additional", "EmbeddedObjects",
-               "Math", "Customization", "Shortcuts", "LFUNs", "LaTeXConfig"
+               "Intro", "UserGuide", "Tutorial", "Additional",
+               "EmbeddedObjects", "Math", "Customization", "Shortcuts",
+               "LFUNs", "LaTeXConfig"
        };
+
+       static vector<string> v;
        if (v.empty()) {
                FileName fname;
                for (size_t i = 0; i < sizeof(files) / sizeof(files[0]); ++i) {
                        fname = i18nLibFileSearch("doc", files[i], "lyx");
-                       v.push_back(fname.absFilename());
+                       v.push_back(fname.absFileName());
                }
        }
+
        return v;
 }
 
 
-/** Switch p_buf to point to next document buffer.
+/** Switch buf to point to next document buffer.
  **
  ** Return true if restarted from master-document buffer.
- **
- ** @note
- ** Not using p_buf->allRelatives() here, because I'm not sure
- ** whether or not the returned order is independent of p_buf.
  **/
-static bool next_document_buffer(Buffer * & p_buf) {
-       Buffer *p_master = p_buf;
-       Buffer *p_old;
-       do {
-               p_old = p_master;
-               p_master = const_cast<Buffer *>(p_master->masterBuffer());
-               LYXERR(Debug::FIND, "p_old=" << p_old << ", p_master=" << p_master);
-       } while (p_master != p_old);
-       LASSERT(p_master != NULL, /**/);
-       vector<Buffer *> v_children;
-       /* Root master added as first buffer in the vector */
-       v_children.push_back(p_master);
-       p_master->getChildren(v_children, true);
-       LYXERR(Debug::FIND, "v_children.size()=" << v_children.size());
-       vector<Buffer *>::const_iterator it = find(v_children.begin(), v_children.end(), p_buf);
-       LASSERT(it != v_children.end(), /**/)
+static bool nextDocumentBuffer(Buffer * & buf)
+{
+       ListOfBuffers const children = buf->allRelatives();
+       LYXERR(Debug::FIND, "children.size()=" << children.size());
+       ListOfBuffers::const_iterator it =
+               find(children.begin(), children.end(), buf);
+       LASSERT(it != children.end(), return false);
        ++it;
-       if (it == v_children.end()) {
-               p_buf = *v_children.begin();
+       if (it == children.end()) {
+               buf = *children.begin();
                return true;
        }
-       p_buf = *it;
+       buf = *it;
        return false;
 }
 
@@ -181,35 +190,22 @@ static bool next_document_buffer(Buffer * & p_buf) {
 /** Switch p_buf to point to previous document buffer.
  **
  ** Return true if restarted from last child buffer.
- **
- ** @note
- ** Not using p_buf->allRelatives() here, because I'm not sure
- ** whether or not the returned order is independent of p_buf.
  **/
-static bool prev_document_buffer(Buffer * & p_buf) {
-       Buffer *p_master = p_buf;
-       Buffer *p_old;
-       do {
-               p_old = p_master;
-               p_master = const_cast<Buffer *>(p_master->masterBuffer());
-               LYXERR(Debug::FIND, "p_old=" << p_old << ", p_master=" << p_master);
-       } while (p_master != p_old);
-       LASSERT(p_master != NULL, /**/);
-       vector<Buffer *> v_children;
-       /* Root master added as first buffer in the vector */
-       v_children.push_back(p_master);
-       p_master->getChildren(v_children, true);
-       LYXERR(Debug::FIND, "v_children.size()=" << v_children.size());
-       vector<Buffer *>::const_iterator it = find(v_children.begin(), v_children.end(), p_buf);
-       LASSERT(it != v_children.end(), /**/)
-       if (it == v_children.begin()) {
-               it = v_children.end();
+static bool prevDocumentBuffer(Buffer * & buf)
+{
+       ListOfBuffers const children = buf->allRelatives();
+       LYXERR(Debug::FIND, "children.size()=" << children.size());
+       ListOfBuffers::const_iterator it =
+               find(children.begin(), children.end(), buf);
+       LASSERT(it != children.end(), return false)
+       if (it == children.begin()) {
+               it = children.end();
                --it;
-               p_buf = *it;
+               buf = *it;
                return true;
        }
        --it;
-       p_buf = *it;
+       buf = *it;
        return false;
 }
 
@@ -218,7 +214,9 @@ static bool prev_document_buffer(Buffer * & p_buf) {
  **
  ** Return true if restarted from scratch.
  **/
-static bool next_prev_buffer(Buffer * & buf, FindAndReplaceOptions const & opt) {
+static bool nextPrevBuffer(Buffer * & buf,
+                            FindAndReplaceOptions const & opt)
+{
        bool restarted = false;
        switch (opt.scope) {
        case FindAndReplaceOptions::S_BUFFER:
@@ -226,40 +224,44 @@ static bool next_prev_buffer(Buffer * & buf, FindAndReplaceOptions const & opt)
                break;
        case FindAndReplaceOptions::S_DOCUMENT:
                if (opt.forward)
-                       restarted = next_document_buffer(buf);
+                       restarted = nextDocumentBuffer(buf);
                else
-                       restarted = prev_document_buffer(buf);
+                       restarted = prevDocumentBuffer(buf);
                break;
        case FindAndReplaceOptions::S_OPEN_BUFFERS:
                if (opt.forward) {
                        buf = theBufferList().next(buf);
-                       restarted = buf == *theBufferList().begin();
+                       restarted = (buf == *theBufferList().begin());
                } else {
                        buf = theBufferList().previous(buf);
-                       restarted = buf == *(theBufferList().end() - 1);
+                       restarted = (buf == *(theBufferList().end() - 1));
                }
                break;
        case FindAndReplaceOptions::S_ALL_MANUALS:
-               vector<string> const & v = allManualsFiles();
-               vector<string>::const_iterator it = find(v.begin(), v.end(), buf->absFileName());
-               if (it == v.end()) {
-                       it = v.begin();
-               } else if (opt.forward) {
+               vector<string> const & manuals = allManualsFiles();
+               vector<string>::const_iterator it =
+                       find(manuals.begin(), manuals.end(), buf->absFileName());
+               if (it == manuals.end())
+                       it = manuals.begin();
+               else if (opt.forward) {
                        ++it;
-                       if (it == v.end()) {
-                               it = v.begin();
+                       if (it == manuals.end()) {
+                               it = manuals.begin();
                                restarted = true;
                        }
                } else {
-                       if (it == v.begin()) {
-                               it = v.end();
+                       if (it == manuals.begin()) {
+                               it = manuals.end();
                                restarted = true;
                        }
                        --it;
                }
                FileName const & fname = FileName(*it);
-               if (!theBufferList().exists(fname))
+               if (!theBufferList().exists(fname)) {
+                       guiApp->currentView()->setBusy(false);
                        guiApp->currentView()->loadDocument(fname, false);
+                       guiApp->currentView()->setBusy(true);
+               }
                buf = theBufferList().getBuffer(fname);
                break;
        }
@@ -268,51 +270,69 @@ static bool next_prev_buffer(Buffer * & buf, FindAndReplaceOptions const & opt)
 
 
 /** Find the finest question message to post to the user */
-docstring question_string(FindAndReplaceOptions const & opt)
+docstring getQuestionString(FindAndReplaceOptions const & opt)
 {
-       docstring cur_pos = opt.forward ? _("End") : _("Begin");
-       docstring new_pos = opt.forward ? _("begin") : _("end");
        docstring scope;
        switch (opt.scope) {
        case FindAndReplaceOptions::S_BUFFER:
-               scope = _("file");
+               scope = _("File");
                break;
        case FindAndReplaceOptions::S_DOCUMENT:
-               scope = _("master document");
+               scope = _("Master document");
                break;
        case FindAndReplaceOptions::S_OPEN_BUFFERS:
-               scope = _("open files");
+               scope = _("Open files");
                break;
        case FindAndReplaceOptions::S_ALL_MANUALS:
-               scope = _("manuals");
+               scope = _("Manuals");
                break;
        }
-       docstring dir = opt.forward ? _("forward") : _("backwards");
-       return cur_pos + _(" of ") + scope
-               + _(" reached while searching ") + dir + ".\n"
-               + "\n"
-               + _("Continue searching from ") + new_pos + " ?";
+       docstring message = opt.forward ?
+               bformat(_("%1$s: the end was reached while searching forward.\n"
+                         "Continue searching from the beginning?"),
+                       scope) :
+               bformat(_("%1$s: the beginning was reached while searching backward.\n"
+                         "Continue searching from the end?"),
+                       scope);
+
+       return message;
 }
 
 
-void FindAndReplaceWidget::findAndReplaceScope(FindAndReplaceOptions & opt) {
+/// Return true if a match was found
+bool FindAndReplaceWidget::findAndReplaceScope(FindAndReplaceOptions & opt, bool replace_all)
+{
+       BufferView * bv = view_.documentBufferView();
+       if (!bv)
+               return false;
+       Buffer * buf = &bv->buffer();
+       Buffer * buf_orig = &bv->buffer();
+       DocIterator cur_orig(bv->cursor());
        int wrap_answer = -1;
        ostringstream oss;
        oss << opt;
        FuncRequest cmd(LFUN_WORD_FINDADV, from_utf8(oss.str()));
-       BufferView * bv = view_.documentBufferView();
-       Buffer * buf = &bv->buffer();
-
-       Buffer * buf_orig = &bv->buffer();
-       Cursor cur_orig(bv->cursor());
 
+       view_.message(_("Advanced search in progress (press ESC to cancel) . . ."));
+       theApp()->startLongOperation();
+       view_.setBusy(true);
        if (opt.scope == FindAndReplaceOptions::S_ALL_MANUALS) {
                vector<string> const & v = allManualsFiles();
                if (std::find(v.begin(), v.end(), buf->absFileName()) == v.end()) {
                        FileName const & fname = FileName(*v.begin());
-                       if (!theBufferList().exists(fname))
+                       if (!theBufferList().exists(fname)) {
+                               guiApp->currentView()->setBusy(false);
+                               theApp()->stopLongOperation();
                                guiApp->currentView()->loadDocument(fname, false);
+                               theApp()->startLongOperation();
+                               guiApp->currentView()->setBusy(true);
+                       }
                        buf = theBufferList().getBuffer(fname);
+                       if (!buf) {
+                               view_.setBusy(false);
+                               return false;
+                       }
+
                        lyx::dispatch(FuncRequest(LFUN_BUFFER_SWITCH,
                                                  buf->absFileName()));
                        bv = view_.documentBufferView();
@@ -321,85 +341,103 @@ void FindAndReplaceWidget::findAndReplaceScope(FindAndReplaceOptions & opt) {
                }
        }
 
+       UndoGroupHelper helper(buf);
+
        do {
                LYXERR(Debug::FIND, "Dispatching LFUN_WORD_FINDADV");
                dispatch(cmd);
+               LYXERR(Debug::FIND, "dispatched");
                if (bv->cursor().result().dispatched()) {
-                       // Match found, selected and replaced if needed
-                       return;
+                       // New match found and selected (old selection replaced if needed)
+                       if (replace_all)
+                               continue;
+                       view_.setBusy(false);
+                       theApp()->stopLongOperation();
+                       return true;
+               } else if (replace_all)
+                       bv->clearSelection();
+
+               if (theApp()->longOperationCancelled()) {
+                       // Search aborted by user
+                       view_.message(_("Advanced search cancelled by user"));
+                       view_.setBusy(false);
+                       theApp()->stopLongOperation();
+                       return false;
                }
 
-               // No match found in current buffer: select next buffer in scope, if any
-               bool prompt = next_prev_buffer(buf, opt);
+               // No match found in current buffer (however old selection might have been replaced)
+               // select next buffer in scope, if any
+               bool const prompt = nextPrevBuffer(buf, opt);
+               if (!buf)
+                       break;
                if (prompt) {
                        if (wrap_answer != -1)
                                break;
-                       docstring q = question_string(opt);
+                       docstring q = getQuestionString(opt);
+                       view_.setBusy(false);
+                       theApp()->stopLongOperation();
                        wrap_answer = frontend::Alert::prompt(
                                _("Wrap search?"), q,
                                0, 1, _("&Yes"), _("&No"));
+                       theApp()->startLongOperation();
+                       view_.setBusy(true);
                        if (wrap_answer == 1)
                                break;
                }
-               lyx::dispatch(FuncRequest(LFUN_BUFFER_SWITCH,
-                                         buf->absFileName()));
+               if (buf != &view_.documentBufferView()->buffer())
+                       lyx::dispatch(FuncRequest(LFUN_BUFFER_SWITCH,
+                                                 buf->absFileName()));
+
+               helper.resetBuffer(buf);
+
                bv = view_.documentBufferView();
                if (opt.forward) {
                        bv->cursor().clear();
                        bv->cursor().push_back(CursorSlice(buf->inset()));
                } else {
-                       lyx::dispatch(FuncRequest(LFUN_BUFFER_END));
+                       //lyx::dispatch(FuncRequest(LFUN_BUFFER_END));
                        bv->cursor().setCursor(doc_iterator_end(buf));
                        bv->cursor().backwardPos();
-                       LYXERR(Debug::FIND, "findBackAdv5: cur: " << bv->cursor());
+                       LYXERR(Debug::FIND, "findBackAdv5: cur: "
+                               << bv->cursor());
                }
                bv->clearSelection();
        } while (wrap_answer != 1);
-       lyx::dispatch(FuncRequest(LFUN_BUFFER_SWITCH,
-                                 buf_orig->absFileName()));
+
+       if (buf_orig != &view_.documentBufferView()->buffer())
+               lyx::dispatch(FuncRequest(LFUN_BUFFER_SWITCH,
+                                         buf_orig->absFileName()));
        bv = view_.documentBufferView();
-       bv->cursor() = cur_orig;
+       // This may happen after a replace occurred
+       if (cur_orig.pos() > cur_orig.lastpos())
+               cur_orig.pos() = cur_orig.lastpos();
+       bv->cursor().setCursor(cur_orig);
+       view_.setBusy(false);
+       theApp()->stopLongOperation();
+       return false;
 }
 
 
-void FindAndReplaceWidget::findAndReplace(
+/// Return true if a match was found
+bool FindAndReplaceWidget::findAndReplace(
        bool casesensitive, bool matchword, bool backwards,
        bool expandmacros, bool ignoreformat, bool replace,
-       bool keep_case)
+       bool keep_case, bool replace_all)
 {
-       Buffer & buffer = find_work_area_->bufferView().buffer();
-       docstring searchString;
-       if (!ignoreformat) {
-               searchString = buffer_to_latex(buffer);
-       } else {
-               ParIterator it = buffer.par_iterator_begin();
-               ParIterator end = buffer.par_iterator_end();
-               OutputParams runparams(&buffer.params().encoding());
-               odocstringstream os;
-               runparams.nice = true;
-               runparams.flavor = OutputParams::LATEX;
-               runparams.linelen = 100000; //lyxrc.plaintext_linelen;
-               runparams.dryrun = true;
-               for (; it != end; ++it) {
-                       LYXERR(Debug::FIND, "Adding to search string: '" << it->asString(false) << "'");
-                       searchString += it->stringify(pos_type(0), it->size(), AS_STR_INSETS, runparams);
-               }
-       }
-       if (to_utf8(searchString).empty()) {
-               buffer.message(_("Nothing to search"));
-               return;
-       }
-       bool const regexp = to_utf8(searchString).find("\\regexp") != std::string::npos;
-       docstring replaceString;
-       if (replace) {
-               Buffer & repl_buffer = replace_work_area_->bufferView().buffer();
-               ostringstream oss;
-               repl_buffer.write(oss);
-               replaceString = from_utf8(oss.str()); //buffer_to_latex(replace_buffer);
-       } else {
-               replaceString = from_utf8(LYX_FR_NULL_STRING);
+       Buffer & find_buf = find_work_area_->bufferView().buffer();
+       docstring const & find_buf_name = find_buf.fileName().absoluteFilePath();
+
+       if (find_buf.text().empty()) {
+               view_.message(_("Nothing to search"));
+               return false;
        }
-       FindAndReplaceOptions::SearchScope scope = FindAndReplaceOptions::S_BUFFER;
+
+       Buffer & repl_buf = replace_work_area_->bufferView().buffer();
+       docstring const & repl_buf_name = replace ?
+               repl_buf.fileName().absoluteFilePath() : docstring();
+
+       FindAndReplaceOptions::SearchScope scope =
+               FindAndReplaceOptions::S_BUFFER;
        if (CurrentDocument->isChecked())
                scope = FindAndReplaceOptions::S_BUFFER;
        else if (MasterDocument->isChecked())
@@ -409,105 +447,116 @@ void FindAndReplaceWidget::findAndReplace(
        else if (AllManualsRB->isChecked())
                scope = FindAndReplaceOptions::S_ALL_MANUALS;
        else
-               LASSERT(false, /**/);
+               LATTEST(false);
+
+       FindAndReplaceOptions::SearchRestriction restr =
+               OnlyMaths->isChecked()
+                       ? FindAndReplaceOptions::R_ONLY_MATHS
+                       : FindAndReplaceOptions::R_EVERYTHING;
+
        LYXERR(Debug::FIND, "FindAndReplaceOptions: "
-              << "searchstring=" << searchString
+              << "find_buf_name=" << find_buf_name
               << ", casesensitiv=" << casesensitive
               << ", matchword=" << matchword
               << ", backwards=" << backwards
               << ", expandmacros=" << expandmacros
               << ", ignoreformat=" << ignoreformat
-              << ", regexp=" << regexp
-              << ", replaceString" << replaceString
+              << ", repl_buf_name" << repl_buf_name
               << ", keep_case=" << keep_case
-              << ", scope=" << scope);
-       FindAndReplaceOptions opt(searchString, casesensitive, matchword, ! backwards,
-               expandmacros, ignoreformat, regexp, replaceString, keep_case, scope);
-       findAndReplaceScope(opt);
+              << ", scope=" << scope
+              << ", restr=" << restr);
+
+       FindAndReplaceOptions opt(find_buf_name, casesensitive, matchword,
+                                 !backwards, expandmacros, ignoreformat,
+                                 repl_buf_name, keep_case, scope, restr);
+       return findAndReplaceScope(opt, replace_all);
 }
 
 
-void FindAndReplaceWidget::findAndReplace(bool backwards, bool replace)
+bool FindAndReplaceWidget::findAndReplace(bool backwards, bool replace, bool replace_all)
 {
        if (! view_.currentMainWorkArea()) {
                view_.message(_("No open document(s) in which to search"));
-               return;
+               return false;
        }
-       // FIXME: create a Dialog::returnFocus() or something instead of this:
+       // Finalize macros that are being typed, both in main document and in search or replacement WAs
+       if (view_.currentWorkArea()->bufferView().cursor().macroModeClose())
+               view_.currentWorkArea()->bufferView().processUpdateFlags(Update::Force);
+       if (view_.currentMainWorkArea()->bufferView().cursor().macroModeClose())
+               view_.currentMainWorkArea()->bufferView().processUpdateFlags(Update::Force);
+
+       // FIXME: create a Dialog::returnFocus()
+       // or something instead of this:
        view_.setCurrentWorkArea(view_.currentMainWorkArea());
-       findAndReplace(caseCB->isChecked(),
+       return findAndReplace(caseCB->isChecked(),
                wordsCB->isChecked(),
                backwards,
                expandMacrosCB->isChecked(),
                ignoreFormatCB->isChecked(),
                replace,
-               keepCaseCB->isChecked());
-}
-
-
-void FindAndReplaceWidget::on_regexpInsertCombo_currentIndexChanged(int index)
-{
-       static char const * regexps[] = {
-               ".*", ".+", "[a-z]+", "[0-9]+", ""
-       };
-       LYXERR(Debug::FIND, "Index: " << index);
-       if (index >= 1 && index < 1 + int(sizeof(regexps)/sizeof(regexps[0]))) {
-               find_work_area_->setFocus();
-               Cursor & cur = find_work_area_->bufferView().cursor();
-               if (! cur.inRegexped())
-                       dispatch(FuncRequest(LFUN_REGEXP_MODE));
-               dispatch(FuncRequest(LFUN_SELF_INSERT, regexps[index - 1]));
-               regexpInsertCombo->setCurrentIndex(0);
-       }
+               keepCaseCB->isChecked(),
+               replace_all);
 }
 
 
-void FindAndReplaceWidget::on_closePB_clicked()
+void FindAndReplaceWidget::hideDialog()
 {
        dispatch(FuncRequest(LFUN_DIALOG_TOGGLE, "findreplaceadv"));
 }
 
 
-void FindAndReplaceWidget::on_findNextPB_clicked() {
-       findAndReplace(false, false);
-       find_work_area_->setFocus();
-}
-
-
-void FindAndReplaceWidget::on_findPrevPB_clicked() {
-       findAndReplace(true, false);
+void FindAndReplaceWidget::on_findNextPB_clicked()
+{
+       findAndReplace(searchbackCB->isChecked(), false);
        find_work_area_->setFocus();
 }
 
 
-void FindAndReplaceWidget::on_replaceNextPB_clicked()
+void FindAndReplaceWidget::on_replacePB_clicked()
 {
-       findAndReplace(false, true);
+       findAndReplace(searchbackCB->isChecked(), true);
        replace_work_area_->setFocus();
 }
 
 
-void FindAndReplaceWidget::on_replacePrevPB_clicked()
+void FindAndReplaceWidget::on_replaceallPB_clicked()
 {
-       findAndReplace(true, true);
+       findAndReplace(searchbackCB->isChecked(), true, true);
        replace_work_area_->setFocus();
 }
 
 
-void FindAndReplaceWidget::on_replaceallPB_clicked()
-{
-       replace_work_area_->setFocus();
+/** Copy selected elements from bv's BufferParams to the dest_bv's one
+ ** We don't want to copy'em all, e.g., not the default master **/
+static void copy_params(BufferView const & bv, BufferView & dest_bv) {
+       Buffer const & doc_buf = bv.buffer();
+       BufferParams const & doc_bp = doc_buf.params();
+       string const & lang = doc_bp.language->lang();
+       string const & doc_class = doc_bp.documentClass().name();
+       Buffer & dest_buf = dest_bv.buffer();
+       dest_buf.params().setLanguage(lang);
+       dest_buf.params().setBaseClass(doc_class);
+       dest_bv.makeDocumentClass();
+       dest_bv.cursor().current_font.setLanguage(doc_bp.language);
 }
 
 
 void FindAndReplaceWidget::showEvent(QShowEvent * /* ev */)
 {
+       LYXERR(Debug::DEBUG, "showEvent()" << endl);
+       BufferView * bv = view_.documentBufferView();
+       if (bv) {
+               copy_params(*bv, find_work_area_->bufferView());
+               copy_params(*bv, replace_work_area_->bufferView());
+       }
+
+       find_work_area_->installEventFilter(this);
+       replace_work_area_->installEventFilter(this);
+
        view_.setCurrentWorkArea(find_work_area_);
        LYXERR(Debug::FIND, "Selecting entire find buffer");
        dispatch(FuncRequest(LFUN_BUFFER_BEGIN));
        dispatch(FuncRequest(LFUN_BUFFER_END_SELECT));
-       find_work_area_->installEventFilter(this);
-       replace_work_area_->installEventFilter(this);
 }
 
 
@@ -519,19 +568,29 @@ void FindAndReplaceWidget::hideEvent(QHideEvent *ev)
 }
 
 
-bool FindAndReplaceWidget::initialiseParams(std::string const & /* params */)
+bool FindAndReplaceWidget::initialiseParams(std::string const & /*params*/)
 {
        return true;
 }
 
 
+void FindAndReplace::updateView()
+{
+       widget_->updateGUI();
+}
+
+
 FindAndReplace::FindAndReplace(GuiView & parent,
                Qt::DockWidgetArea area, Qt::WindowFlags flags)
-       : DockView(parent, "Find LyX", qt_("Find LyX Dialog"), area, flags)
+       : DockView(parent, "findreplaceadv", qt_("Advanced Find and Replace"),
+                  area, flags)
 {
        widget_ = new FindAndReplaceWidget(parent);
        setWidget(widget_);
        setFocusProxy(widget_);
+
+       connect(this, SIGNAL(dockLocationChanged(Qt::DockWidgetArea)),
+               widget_, SLOT(dockLocationChanged(Qt::DockWidgetArea)));
 }
 
 
@@ -548,9 +607,24 @@ bool FindAndReplace::initialiseParams(std::string const & params)
 }
 
 
+void FindAndReplaceWidget::updateGUI()
+{
+       bool replace_enabled = view_.documentBufferView()
+               && !view_.documentBufferView()->buffer().isReadonly();
+       replace_work_area_->setEnabled(replace_enabled);
+       replacePB->setEnabled(replace_enabled);
+       replaceallPB->setEnabled(replace_enabled);
+}
+
+
 Dialog * createGuiSearchAdv(GuiView & lv)
 {
-       return new FindAndReplace(lv, Qt::RightDockWidgetArea);
+       FindAndReplace * gui = new FindAndReplace(lv, Qt::RightDockWidgetArea);
+#ifdef Q_OS_MAC
+       // On Mac show and floating
+       gui->setFloating(true);
+#endif
+       return gui;
 }