Assure long tooltip is correctly formatted.

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

diff --git a/src/frontends/qt4/qt_helpers.cpp b/src/frontends/qt4/qt_helpers.cpp
index a2c72172e1ec73caeb001eaddd9f2af7c5e62192..2237d7d50711dfcb74d28f1749b23cee805b387b 100644 (file)
--- a/src/frontends/qt4/qt_helpers.cpp
+++ b/src/frontends/qt4/qt_helpers.cpp
@@ -549,7 +549,7 @@ FileFilterList::FileFilterList(docstring const & qt_style_filter)
 
                // Everything from the start of the input to
                // the start of the match.
-               parse_filter(string(what[-1].first, what[-1].second));
+               parse_filter(string(it, what[0].first));
 
                // Increment the iterator to the end of the match.
                it += distance(it, what[0].second);
@@ -598,8 +598,18 @@ QStringList fileFilters(QString const & desc)
 
 QString guiName(string const & type, BufferParams const & bp)
 {
+       // Hardcoded types
        if (type == "tableofcontents")
                return qt_("Table of Contents");
+       if (type == "change")
+               return qt_("Changes");
+       if (type == "senseless")
+               return qt_("Senseless");
+       if (type == "citation")
+               return qt_("Citations");
+       if (type == "label")
+               return qt_("Labels and References");
+       // Customizable, but the corresponding insets have no layout definition
        if (type == "child")
                return qt_("Child Documents");
        if (type == "graphics")
@@ -608,30 +618,11 @@ QString guiName(string const & type, BufferParams const & bp)
                return qt_("Equations");
        if (type == "external")
                return qt_("External material");
-       if (type == "footnote")
-               return qt_("Footnotes");
-       if (type == "listing")
-               return qt_("Listings");
-       if (type == "index")
-               return qt_("Index Entries");
-       if (type == "marginalnote")
-               return qt_("Marginal notes");
        if (type == "math-macro")
                return qt_("Math macros");
        if (type == "nomencl")
                return qt_("Nomenclature Entries");
-       if (type == "note")
-               return qt_("Notes");
-       if (type == "citation")
-               return qt_("Citations");
-       if (type == "label")
-               return qt_("Labels and References");
-       if (type == "branch")
-               return qt_("Branches");
-       if (type == "change")
-               return qt_("Changes");
-       if (type == "senseless")
-               return qt_("Senseless");
+
        if (prefixIs(type, "index:")) {
                string const itype = split(type, ':');
                IndicesList const & indiceslist = bp.indiceslist();
@@ -642,11 +633,7 @@ QString guiName(string const & type, BufferParams const & bp)
                return toqstr(bformat(_("Index Entries (%1$s)"), indextype));
        }
 
-       FloatList const & floats = bp.documentClass().floats();
-       if (floats.typeExist(type))
-               return qt_(floats.getType(type).listName());
-
-       return qt_(type);
+       return toqstr(bp.documentClass().outlinerName(type));
 }
 
 
@@ -683,4 +670,14 @@ QString formatToolTip(QString text, int em)
 }
 
 
+QString qtHtmlToPlainText(QString const & html)
+{
+       if (!Qt::mightBeRichText(html))
+               return html;
+       QTextDocument td;
+       td.setHtml(html);
+       return td.toPlainText();
+}
+
+
 } // namespace lyx