Give us some useful tooltips for modules.

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

diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp
index 045d0b9cd1ef16809c298f3cf09b5e49b9caabd3..5b07599360012ead1e2c23396d64cee6a4bd2363 100644 (file)
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -55,6 +55,11 @@
 
 #include <sstream>
 
+#ifdef IN
+#undef IN
+#endif
+
+
 using namespace std;
 using namespace lyx::support;
 
@@ -1296,6 +1301,10 @@ void GuiDocument::classChanged()
                        return;
                }
        }
+       // FIXME Note that by doing things this way, we load the TextClass
+       // as soon as it is selected. So, if you use the scroll wheel when
+       // sitting on the combo box, we'll load a lot of TextClass objects
+       // very quickly. This could be changed.
        if (!bp_.setBaseClass(classname)) {
                Alert::error(_("Error"), _("Unable to set document class."));
                return;
@@ -1512,25 +1521,25 @@ void GuiDocument::apply(BufferParams & params)
                                fromqstr(langModule->encodingCO->currentText());
        }
 
-       InsetQuotes::quote_language lga = InsetQuotes::EnglishQ;
+       InsetQuotes::QuoteLanguage lga = InsetQuotes::EnglishQuotes;
        switch (langModule->quoteStyleCO->currentIndex()) {
        case 0:
-               lga = InsetQuotes::EnglishQ;
+               lga = InsetQuotes::EnglishQuotes;
                break;
        case 1:
-               lga = InsetQuotes::SwedishQ;
+               lga = InsetQuotes::SwedishQuotes;
                break;
        case 2:
-               lga = InsetQuotes::GermanQ;
+               lga = InsetQuotes::GermanQuotes;
                break;
        case 3:
-               lga = InsetQuotes::PolishQ;
+               lga = InsetQuotes::PolishQuotes;
                break;
        case 4:
-               lga = InsetQuotes::FrenchQ;
+               lga = InsetQuotes::FrenchQuotes;
                break;
        case 5:
-               lga = InsetQuotes::DanishQ;
+               lga = InsetQuotes::DanishQuotes;
                break;
        }
        params.quotes_language = lga;
@@ -1622,9 +1631,9 @@ void GuiDocument::apply(BufferParams & params)
                InsetListingsParams(fromqstr(textLayoutModule->listingsED->toPlainText())).params();
 
        if (textLayoutModule->indentRB->isChecked())
-               params.paragraph_separation = BufferParams::PARSEP_INDENT;
+               params.paragraph_separation = BufferParams::ParagraphIndentSeparation;
        else
-               params.paragraph_separation = BufferParams::PARSEP_SKIP;
+               params.paragraph_separation = BufferParams::ParagraphSkipSeparation;
 
        switch (textLayoutModule->skipCO->currentIndex()) {
        case 0:
@@ -1806,17 +1815,17 @@ void GuiDocument::updateParams(BufferParams const & params)
 
        // biblio
        biblioModule->citeDefaultRB->setChecked(
-               params.getEngine() == biblio::ENGINE_BASIC);
+               params.citeEngine() == biblio::ENGINE_BASIC);
 
        biblioModule->citeNatbibRB->setChecked(
-               params.getEngine() == biblio::ENGINE_NATBIB_NUMERICAL ||
-               params.getEngine() == biblio::ENGINE_NATBIB_AUTHORYEAR);
+               params.citeEngine() == biblio::ENGINE_NATBIB_NUMERICAL ||
+               params.citeEngine() == biblio::ENGINE_NATBIB_AUTHORYEAR);
 
        biblioModule->citeStyleCO->setCurrentIndex(
-               params.getEngine() == biblio::ENGINE_NATBIB_NUMERICAL);
+               params.citeEngine() == biblio::ENGINE_NATBIB_NUMERICAL);
 
        biblioModule->citeJurabibRB->setChecked(
-               params.getEngine() == biblio::ENGINE_JURABIB);
+               params.citeEngine() == biblio::ENGINE_JURABIB);
 
        biblioModule->bibtopicCB->setChecked(
                params.use_bibtopic);
@@ -1907,7 +1916,7 @@ void GuiDocument::updateParams(BufferParams const & params)
        }
        setLSpacing(nitem);
 
-       if (params.paragraph_separation == BufferParams::PARSEP_INDENT)
+       if (params.paragraph_separation == BufferParams::ParagraphIndentSeparation)
                textLayoutModule->indentRB->setChecked(true);
        else
                textLayoutModule->skipRB->setChecked(true);
@@ -2084,11 +2093,12 @@ void GuiDocument::saveDocDefault()
 void GuiDocument::updateAvailableModules() 
 {
        modules_av_model_.clear();
-       vector<modInfoStruct> const modInfoList = getModuleInfo();
+       vector<modInfoStruct> const & modInfoList = getModuleInfo();
        int const mSize = modInfoList.size();
        for (int i = 0; i != mSize; ++i) {
                modInfoStruct const & modInfo = modInfoList[i];
-               modules_av_model_.insertRow(i, qt_(modInfo.name), modInfo.id);
+               modules_av_model_.insertRow(i, modInfo.name, modInfo.id, 
+                               modInfo.description);
        }
 }
 
@@ -2101,7 +2111,8 @@ void GuiDocument::updateSelectedModules()
        int const sSize = selModList.size();
        for (int i = 0; i != sSize; ++i) {
                modInfoStruct const & modInfo = selModList[i];
-               modules_sel_model_.insertRow(i, qt_(modInfo.name), modInfo.id);
+               modules_sel_model_.insertRow(i, modInfo.name, modInfo.id,
+                               modInfo.description);
        }
 }
 
@@ -2219,9 +2230,9 @@ vector<GuiDocument::modInfoStruct> const GuiDocument::getSelectedModules()
                m.id = *it;
                LyXModule * mod = moduleList[*it];
                if (mod)
-                       m.name = mod->getName();
+                       m.name = qt_(mod->getName());
                else 
-                       m.name = *it + " (Not Found)";
+                       m.name = toqstr(*it) + toqstr(" (") + qt_("Not Found") + toqstr(")");
                mInfo.push_back(m);
        }
        return mInfo;
@@ -2235,7 +2246,7 @@ DocumentClass const & GuiDocument::documentClass() const
 
 
 static void dispatch_bufferparams(Dialog const & dialog,
-       BufferParams const & bp, kb_action lfun)
+       BufferParams const & bp, FuncCode lfun)
 {
        ostringstream ss;
        ss << "\\begin_header\n";
@@ -2352,7 +2363,13 @@ void GuiDocument::loadModuleInfo()
        for (; it != end; ++it) {
                modInfoStruct m;
                m.id = it->getID();
-               m.name = it->getName();
+               m.name = qt_(it->getName());
+               // this is supposed to give us the first sentence of the description
+               QString desc = qt_(it->getDescription());
+               int const pos = desc.indexOf(".");
+               if (pos > 0)
+                       desc.truncate(pos + 1);
+               m.description = desc;
                moduleNames_.push_back(m);
        }
 }