* fix spelling in comments to please John.

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

diff --git a/src/frontends/qt4/GuiSpellchecker.cpp b/src/frontends/qt4/GuiSpellchecker.cpp
index 2700d9e5f84b19ca7953b81e29d0ad0db49d3e25..10edda44629b9b24705a5ed14d0113403dce9b3c 100644 (file)
--- a/src/frontends/qt4/GuiSpellchecker.cpp
+++ b/src/frontends/qt4/GuiSpellchecker.cpp
@@ -28,6 +28,7 @@
 #include "Language.h"
 #include "LyX.h"
 #include "LyXRC.h"
+#include "lyxfind.h"
 #include "Paragraph.h"
 #include "WordLangTuple.h"
 
@@ -40,6 +41,7 @@
 #include "support/textutils.h"
 
 #include <QListWidgetItem>
+#include <QKeyEvent>
 
 #include "SpellChecker.h"
 
@@ -76,6 +78,8 @@ GuiSpellchecker::GuiSpellchecker(GuiView & lv)
                this, SLOT(on_replacePB_clicked()));
 
        d->ui.wordED->setReadOnly(true);
+
+       d->ui.suggestionsLW->installEventFilter(this);
 }
 
 
@@ -91,7 +95,25 @@ void GuiSpellchecker::on_closePB_clicked()
 }
 
 
-void GuiSpellchecker::on_suggestionsLW_itemChanged(QListWidgetItem * item)
+bool GuiSpellchecker::eventFilter(QObject *obj, QEvent *event)
+{
+       if (obj == d->ui.suggestionsLW && event->type() == QEvent::KeyPress) {
+               QKeyEvent *e = static_cast<QKeyEvent *> (event);
+               if (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return) {
+                       on_suggestionsLW_itemClicked(d->ui.suggestionsLW->currentItem());
+                       on_replacePB_clicked();
+                       return true;
+               } else if (e->key() == Qt::Key_Right) {
+                       on_suggestionsLW_itemClicked(d->ui.suggestionsLW->currentItem());
+                       return true;
+               }
+       }
+       // standard event processing
+       return QWidget::eventFilter(obj, event);
+}
+
+
+void GuiSpellchecker::on_suggestionsLW_itemClicked(QListWidgetItem * item)
 {
        if (d->ui.replaceCO->count() != 0)
                d->ui.replaceCO->setItemText(0, item->text());
@@ -147,12 +169,23 @@ void GuiSpellchecker::on_ignorePB_clicked()
 }
 
 
+void GuiSpellchecker::on_findNextPB_clicked()
+{
+       docstring const data = find2string(
+                               qstring_to_ucs4(d->ui.wordED->text()),
+                               true, true, true);
+       dispatch(FuncRequest(LFUN_WORD_FIND, data));
+}
+
+
 void GuiSpellchecker::on_replacePB_clicked()
 {
        docstring const replacement = qstring_to_ucs4(d->ui.replaceCO->currentText());
 
        LYXERR(Debug::GUI, "Replace (" << replacement << ")");
        BufferView * bv = const_cast<BufferView *>(bufferview());
+       if (!bv->cursor().inTexted())
+               return;
        cap::replaceSelectionWithString(bv->cursor(), replacement, true);
        bv->buffer().markDirty();
        // If we used an LFUN, we would not need that
@@ -163,6 +196,17 @@ void GuiSpellchecker::on_replacePB_clicked()
 }
 
 
+void GuiSpellchecker::on_replaceAllPB_clicked()
+{
+       docstring const data = replace2string(
+               qstring_to_ucs4(d->ui.replaceCO->currentText()),
+               qstring_to_ucs4(d->ui.wordED->text()),
+               true, true, true, true);
+       dispatch(FuncRequest(LFUN_WORD_REPLACE, data));
+       check(); // continue spellchecking
+}
+
+
 void GuiSpellchecker::updateSuggestions(docstring_list & words)
 {
        QString const suggestion = toqstr(d->word_.word());
@@ -171,13 +215,13 @@ void GuiSpellchecker::updateSuggestions(docstring_list & words)
        lw->clear();
 
        if (words.empty()) {
-               on_suggestionsLW_itemChanged(new QListWidgetItem(suggestion));
+               on_suggestionsLW_itemClicked(new QListWidgetItem(suggestion));
                return;
        }
        for (size_t i = 0; i != words.size(); ++i)
                lw->addItem(toqstr(words[i]));
 
-       on_suggestionsLW_itemChanged(lw->item(0));
+       on_suggestionsLW_itemClicked(lw->item(0));
        lw->setCurrentRow(0);
 }