rename buffer parameter math_number_before to math_numbering_side

[lyx.git] / src / frontends / qt4 / FindAndReplace.cpp

diff --git a/src/frontends/qt4/FindAndReplace.cpp b/src/frontends/qt4/FindAndReplace.cpp
index 3d3bfa7da24e4ea67c4045bea803ca5feb86d106..4411074de74749456528c8a19a860a9205cbee01 100644 (file)
--- a/src/frontends/qt4/FindAndReplace.cpp
+++ b/src/frontends/qt4/FindAndReplace.cpp
@@ -12,23 +12,28 @@
 
 #include "FindAndReplace.h"
 
-#include "Lexer.h"
 #include "GuiApplication.h"
 #include "GuiView.h"
 #include "GuiWorkArea.h"
 #include "qt_helpers.h"
-#include "Language.h"
 
-#include "BufferParams.h"
+#include "Buffer.h"
 #include "BufferList.h"
-#include "TextClass.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 "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"
@@ -67,13 +72,13 @@ FindAndReplaceWidget::FindAndReplaceWidget(GuiView & view)
 
 void FindAndReplaceWidget::dockLocationChanged(Qt::DockWidgetArea area)
 {
-       if (area == Qt::RightDockWidgetArea || area == Qt::LeftDockWidgetArea) {
-               dynamicLayoutBasic_->setDirection(QBoxLayout::TopToBottom);
-               dynamicLayoutAdvanced_->setDirection(QBoxLayout::TopToBottom);
-       } else {
-               dynamicLayoutBasic_->setDirection(QBoxLayout::LeftToRight);
-               dynamicLayoutAdvanced_->setDirection(QBoxLayout::LeftToRight);
-       }
+       if (area == Qt::RightDockWidgetArea || area == Qt::LeftDockWidgetArea) {
+               dynamicLayoutBasic_->setDirection(QBoxLayout::TopToBottom);
+               dynamicLayoutAdvanced_->setDirection(QBoxLayout::TopToBottom);
+       } else {
+               dynamicLayoutBasic_->setDirection(QBoxLayout::LeftToRight);
+               dynamicLayoutAdvanced_->setDirection(QBoxLayout::LeftToRight);
+       }
 }
 
 
@@ -106,8 +111,8 @@ bool FindAndReplaceWidget::eventFilter(QObject * obj, QEvent * event)
                // back to how it was
                searchbackCB->setChecked(searchback);
                return true;
-               break;
-               }
+       }
+
        case Qt::Key_Tab:
                if (e->modifiers() == Qt::NoModifier) {
                        if (obj == find_work_area_){
@@ -140,14 +145,15 @@ bool FindAndReplaceWidget::eventFilter(QObject * obj, QEvent * event)
 }
 
 
-static vector<string> const & allManualsFiles() 
+static vector<string> const & allManualsFiles()
 {
-       static vector<string> v;
        static const char * files[] = {
                "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) {
@@ -155,6 +161,7 @@ static vector<string> const & allManualsFiles()
                        v.push_back(fname.absFileName());
                }
        }
+
        return v;
 }
 
@@ -163,7 +170,7 @@ static vector<string> const & allManualsFiles()
  **
  ** Return true if restarted from master-document buffer.
  **/
-static bool nextDocumentBuffer(Buffer * & buf) 
+static bool nextDocumentBuffer(Buffer * & buf)
 {
        ListOfBuffers const children = buf->allRelatives();
        LYXERR(Debug::FIND, "children.size()=" << children.size());
@@ -184,7 +191,7 @@ static bool nextDocumentBuffer(Buffer * & buf)
  **
  ** Return true if restarted from last child buffer.
  **/
-static bool prevDocumentBuffer(Buffer * & buf) 
+static bool prevDocumentBuffer(Buffer * & buf)
 {
        ListOfBuffers const children = buf->allRelatives();
        LYXERR(Debug::FIND, "children.size()=" << children.size());
@@ -283,7 +290,7 @@ docstring getQuestionString(FindAndReplaceOptions const & opt)
        docstring message = opt.forward ?
                bformat(_("%1$s: the end was reached while searching forward.\n"
                          "Continue searching from the beginning?"),
-                       scope) : 
+                       scope) :
                bformat(_("%1$s: the beginning was reached while searching backward.\n"
                          "Continue searching from the end?"),
                        scope);
@@ -334,6 +341,8 @@ bool FindAndReplaceWidget::findAndReplaceScope(FindAndReplaceOptions & opt, bool
                }
        }
 
+       UndoGroupHelper helper(buf);
+
        do {
                LYXERR(Debug::FIND, "Dispatching LFUN_WORD_FINDADV");
                dispatch(cmd);
@@ -378,6 +387,9 @@ bool FindAndReplaceWidget::findAndReplaceScope(FindAndReplaceOptions & opt, bool
                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();
@@ -391,6 +403,7 @@ bool FindAndReplaceWidget::findAndReplaceScope(FindAndReplaceOptions & opt, bool
                }
                bv->clearSelection();
        } while (wrap_answer != 1);
+
        if (buf_orig != &view_.documentBufferView()->buffer())
                lyx::dispatch(FuncRequest(LFUN_BUFFER_SWITCH,
                                          buf_orig->absFileName()));
@@ -435,6 +448,12 @@ bool FindAndReplaceWidget::findAndReplace(
                scope = FindAndReplaceOptions::S_ALL_MANUALS;
        else
                LATTEST(false);
+
+       FindAndReplaceOptions::SearchRestriction restr =
+               OnlyMaths->isChecked()
+                       ? FindAndReplaceOptions::R_ONLY_MATHS
+                       : FindAndReplaceOptions::R_EVERYTHING;
+
        LYXERR(Debug::FIND, "FindAndReplaceOptions: "
               << "find_buf_name=" << find_buf_name
               << ", casesensitiv=" << casesensitive
@@ -444,10 +463,12 @@ bool FindAndReplaceWidget::findAndReplace(
               << ", ignoreformat=" << ignoreformat
               << ", repl_buf_name" << repl_buf_name
               << ", keep_case=" << keep_case
-              << ", scope=" << scope);
+              << ", scope=" << scope
+              << ", restr=" << restr);
+
        FindAndReplaceOptions opt(find_buf_name, casesensitive, matchword,
                                  !backwards, expandmacros, ignoreformat,
-                                 repl_buf_name, keep_case, scope);
+                                 repl_buf_name, keep_case, scope, restr);
        return findAndReplaceScope(opt, replace_all);
 }
 
@@ -484,7 +505,7 @@ void FindAndReplaceWidget::hideDialog()
 }
 
 
-void FindAndReplaceWidget::on_findNextPB_clicked() 
+void FindAndReplaceWidget::on_findNextPB_clicked()
 {
        findAndReplace(searchbackCB->isChecked(), false);
        find_work_area_->setFocus();
@@ -569,7 +590,7 @@ FindAndReplace::FindAndReplace(GuiView & parent,
        setFocusProxy(widget_);
 
        connect(this, SIGNAL(dockLocationChanged(Qt::DockWidgetArea)),
-               widget_, SLOT(dockLocationChanged(Qt::DockWidgetArea)));
+               widget_, SLOT(dockLocationChanged(Qt::DockWidgetArea)));
 }
 
 
@@ -599,7 +620,7 @@ void FindAndReplaceWidget::updateGUI()
 Dialog * createGuiSearchAdv(GuiView & lv)
 {
        FindAndReplace * gui = new FindAndReplace(lv, Qt::RightDockWidgetArea);
-#ifdef Q_WS_MACX
+#ifdef Q_OS_MAC
        // On Mac show and floating
        gui->setFloating(true);
 #endif