#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"
void FindAndReplaceWidget::dockLocationChanged(Qt::DockWidgetArea area)
{
- if (area == Qt::RightDockWidgetArea || area == Qt::LeftDockWidgetArea) {
- dynamicLayout_->setDirection(QBoxLayout::TopToBottom);
- } else {
- dynamicLayout_->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);
+ }
}
// 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_){
}
-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) {
v.push_back(fname.absFileName());
}
}
+
return v;
}
**
** 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());
**
** 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());
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);
}
}
+ UndoGroupHelper helper(buf);
+
do {
LYXERR(Debug::FIND, "Dispatching LFUN_WORD_FINDADV");
dispatch(cmd);
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->clearSelection();
} while (wrap_answer != 1);
+
if (buf_orig != &view_.documentBufferView()->buffer())
lyx::dispatch(FuncRequest(LFUN_BUFFER_SWITCH,
buf_orig->absFileName()));
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
<< ", 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);
}
}
-void FindAndReplaceWidget::on_findNextPB_clicked()
+void FindAndReplaceWidget::on_findNextPB_clicked()
{
findAndReplace(searchbackCB->isChecked(), false);
find_work_area_->setFocus();
setFocusProxy(widget_);
connect(this, SIGNAL(dockLocationChanged(Qt::DockWidgetArea)),
- widget_, SLOT(dockLocationChanged(Qt::DockWidgetArea)));
+ widget_, SLOT(dockLocationChanged(Qt::DockWidgetArea)));
}
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