anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-07 02:28:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Attempt at "search as you type"

Browse Source
This commit is contained in:
Juergen Spitzmueller 2021-02-15 10:53:23 +01:00
parent 3841304f80
commit 22542700a7
3 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/frontends/qt/GuiSearch.cpp
View File

@ -173,22 +173,26 @@ void GuiSearchWidget::findBufferChanged()
void GuiSearchWidget::findChanged()
{
findPB->setEnabled(!findCO->currentText().isEmpty());
findPrevPB->setEnabled(!findCO->currentText().isEmpty());
bool const replace = !findCO->currentText().isEmpty()
&& bv_ && !bv_->buffer().isReadonly();
bool const emptytext = findCO->currentText().isEmpty();
findPB->setEnabled(!emptytext);
findPrevPB->setEnabled(!emptytext);
bool const replace = !emptytext && bv_ && !bv_->buffer().isReadonly();
replacePB->setEnabled(replace);
replacePrevPB->setEnabled(replace);
replaceallPB->setEnabled(replace);
if (instantSearchCB->isChecked() && !emptytext)
findClicked();
}
void GuiSearchWidget::findClicked(bool const backwards)
{
docstring const needle = qstring_to_ucs4(findCO->currentText());
find(needle, caseCB->isChecked(), wordsCB->isChecked(), !backwards);
find(needle, caseCB->isChecked(), wordsCB->isChecked(), !backwards,
instantSearchCB->isChecked());
uniqueInsert(findCO, findCO->currentText());
findCO->lineEdit()->selectAll();
if (!instantSearchCB->isChecked())
findCO->lineEdit()->selectAll();
}
@ -226,10 +230,14 @@ void GuiSearchWidget::replaceallClicked()
void GuiSearchWidget::find(docstring const & search, bool casesensitive,
bool matchword, bool forward)
bool matchword, bool forward, bool instant)
{
docstring const sdata =
find2string(search, casesensitive, matchword, forward);
if (instant)
// re-query current match
dispatch(FuncRequest(LFUN_WORD_BACKWARD));
dispatch(FuncRequest(LFUN_WORD_FIND, sdata));
}
@ -248,6 +256,7 @@ void GuiSearchWidget::saveSession(QSettings & settings, QString const & session_
{
settings.setValue(session_key + "/casesensitive", caseCB->isChecked());
settings.setValue(session_key + "/words", wordsCB->isChecked());
settings.setValue(session_key + "/instant", instantSearchCB->isChecked());
settings.setValue(session_key + "/minimized", minimized_);
}
@ -257,6 +266,7 @@ void GuiSearchWidget::restoreSession(QString const & session_key)
QSettings settings;
caseCB->setChecked(settings.value(session_key + "/casesensitive", false).toBool());
wordsCB->setChecked(settings.value(session_key + "/words", false).toBool());
instantSearchCB->setChecked(settings.value(session_key + "/instant", false).toBool());
minimized_ = settings.value(session_key + "/minimized", false).toBool();
// initialize hidings
minimizeClicked(false);

3
src/frontends/qt/GuiSearch.h
View File

@ -60,7 +60,8 @@ private:
void showEvent(QShowEvent * e) override;
/// Searches occurrence of string
void find(docstring const & search,
bool casesensitive, bool matchword, bool forward);
bool casesensitive, bool matchword,
bool forward, bool instant);
/// Replaces occurrence of string
void replace(docstring const & search, docstring const & replace,
bool casesensitive, bool matchword,

12
src/frontends/qt/ui/SearchUi.ui
View File

@ -208,7 +208,17 @@
<item>
<widget class="QCheckBox" name="wordsCB">
<property name="text">
<string>Match &amp;whole words only</string>
<string>&amp;Whole words</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="instantSearchCB">
<property name="toolTip">
<string>If this is checked, LyX will search forward immediately</string>
</property>
<property name="text">
<string>Search as you t&amp;ype</string>
</property>
</widget>
</item>