QDialogButtonBox for the remaining dialogs.

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

diff --git a/src/frontends/qt4/FindAndReplace.cpp b/src/frontends/qt4/FindAndReplace.cpp
index 8898cd975d8f8aa3d0516e1aa52f405a98512466..607f1653aac7afd1d43235497d9884355d47649e 100644 (file)
--- a/src/frontends/qt4/FindAndReplace.cpp
+++ b/src/frontends/qt4/FindAndReplace.cpp
@@ -12,27 +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 "Buffer.h"
-#include "BufferParams.h"
 #include "BufferList.h"
+#include "BufferParams.h"
 #include "BufferView.h"
-#include "Text.h"
-#include "TextClass.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"
@@ -64,8 +65,8 @@ FindAndReplaceWidget::FindAndReplaceWidget(GuiView & view)
        replace_work_area_->setFrameStyle(QFrame::StyledPanel);
 
        // We don't want two cursors blinking.
-       find_work_area_->stopBlinkingCursor();
-       replace_work_area_->stopBlinkingCursor();
+       find_work_area_->stopBlinkingCaret();
+       replace_work_area_->stopBlinkingCaret();
 }
 
 
@@ -340,6 +341,8 @@ bool FindAndReplaceWidget::findAndReplaceScope(FindAndReplaceOptions & opt, bool
                }
        }
 
+       UndoGroupHelper helper(buf);
+
        do {
                LYXERR(Debug::FIND, "Dispatching LFUN_WORD_FINDADV");
                dispatch(cmd);
@@ -384,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();
@@ -397,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()));