QDialogButtonBox for the remaining dialogs.

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

diff --git a/src/frontends/qt4/GuiThesaurus.cpp b/src/frontends/qt4/GuiThesaurus.cpp
index 86ed9598abf8424194e474dde5e6487068ee9755..dba18368138f219b2b052d457ddb0923a731146a 100644 (file)
--- a/src/frontends/qt4/GuiThesaurus.cpp
+++ b/src/frontends/qt4/GuiThesaurus.cpp
@@ -22,12 +22,15 @@
 #include "FuncRequest.h"
 #include "Language.h"
 #include "lyxfind.h"
+#include "WordLangTuple.h"
 
 #include "support/debug.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
 
 #include <QAbstractItemModel>
+#include <QCompleter>
+#include <QDialogButtonBox>
 #include <QHeaderView>
 #include <QLineEdit>
 #include <QPushButton>
@@ -49,8 +52,8 @@ GuiThesaurus::GuiThesaurus(GuiView & lv)
        meaningsTV->setColumnCount(1);
        meaningsTV->header()->hide();
 
-       connect(closePB, SIGNAL(clicked()),
-               this, SLOT(slotClose()));
+       connect(buttonBox, SIGNAL(clicked(QAbstractButton *)),
+               this, SLOT(slotButtonBox(QAbstractButton *)));
        connect(replaceED, SIGNAL(returnPressed()),
                this, SLOT(replaceClicked()));
        connect(replaceED, SIGNAL(textChanged(QString)),
@@ -79,7 +82,11 @@ GuiThesaurus::GuiThesaurus(GuiView & lv)
        languageCO->setModel(language_model);
        languageCO->setModelColumn(2);
 
-       bc().setCancel(closePB);
+       //bug #8138
+       if (entryCO->completer())
+               entryCO->completer()->setCompletionMode(QCompleter::PopupCompletion);
+
+       bc().setCancel(buttonBox->button(QDialogButtonBox::Close));
        bc().setApply(replacePB);
        bc().addReadOnly(replaceED);
        bc().addReadOnly(replacePB);
@@ -95,7 +102,7 @@ void GuiThesaurus::checkStatus()
        }
        updateView();
 }
-       
+
 void GuiThesaurus::change_adaptor()
 {
        changed();
@@ -173,11 +180,11 @@ void GuiThesaurus::updateLists()
 
        QString const lang = languageCO->itemData(
                languageCO->currentIndex()).toString();
-       docstring const lang_code =
-               from_ascii(lyx::languages.getLanguage(fromqstr(lang))->code());
+       Language * language = const_cast<Language*>(lyx::languages.getLanguage(fromqstr(lang)));
+       docstring const lang_code = from_ascii(language->code());
 
        Thesaurus::Meanings meanings =
-               getMeanings(qstring_to_ucs4(entryCO->currentText()), lang_code);
+               getMeanings(WordLangTuple(qstring_to_ucs4(entryCO->currentText()), language));
 
        for (Thesaurus::Meanings::const_iterator cit = meanings.begin();
                cit != meanings.end(); ++cit) {
@@ -231,15 +238,15 @@ void GuiThesaurus::replaceClicked()
 }
 
 
-bool GuiThesaurus::initialiseParams(string const & data)
+bool GuiThesaurus::initialiseParams(string const & sdata)
 {
        string arg;
-       string const lang = rsplit(data, arg, ' ');
+       string const lang = rsplit(sdata, arg, ' ');
        if (prefixIs(lang, "lang=")) {
                lang_ = from_utf8(split(lang, '='));
                text_ = from_utf8(arg);
        } else {
-               text_ = from_utf8(data);
+               text_ = from_utf8(sdata);
                if (bufferview())
                        lang_ = from_ascii(
                                bufferview()->buffer().params().language->lang());
@@ -261,21 +268,20 @@ void GuiThesaurus::replace(docstring const & newstr)
         * on a particular charpos in a paragraph that is broken on
         * deletion/change !
         */
-       docstring const data =
+       docstring const sdata =
                replace2string(newstr, text_,
                                     true,  // case sensitive
                                     true,  // match word
                                     false, // all words
                                     true); // forward
-       dispatch(FuncRequest(LFUN_WORD_REPLACE, data));
+       dispatch(FuncRequest(LFUN_WORD_REPLACE, sdata));
 }
 
 
-Thesaurus::Meanings const & GuiThesaurus::getMeanings(docstring const & str,
-       docstring const & lang)
+Thesaurus::Meanings const & GuiThesaurus::getMeanings(WordLangTuple const & wl)
 {
-       if (str != laststr_)
-               meanings_ = thesaurus.lookup(str, lang);
+       if (wl.word() != laststr_)
+               meanings_ = thesaurus.lookup(wl);
        return meanings_;
 }